Clean

Author: SebVde

bafna_fvs.py

@@ -78,7 +78,7 @@ def get_fvs(og_G):
     return F
 
 
-def get_decycling_number_2_approx(G):
+def approx_decycling_number_bafna(G):
     clean_G = cleanup(G.copy())
     fvs = get_fvs(clean_G)
     return len(fvs)

constr_heur.py

@@ -17,5 +17,5 @@ def find_min_fvs(G):
     return fvs
 
 
-def get_decycling_number_constr_heur(G):
+def approx_decycling_number_stanojevic(G):
     return len(find_min_fvs(G.copy()))

exact_mif.py

@@ -173,5 +173,5 @@ def get_mif_len(G, K):
         )
 
 
-def get_decycling_number_mif(G):
+def get_decycling_number_razgon(G):
     return len(set(G.nodes)) - get_mif_len(G, set())

exact_mif_v2.py

@@ -1,10 +1,6 @@
-import io
-
 import networkx as nx
 import itertools
 
-import numpy as np
-
 
 def sort_nodes(node):
     is_tuple = isinstance(node, tuple)
@@ -288,35 +284,8 @@ def main_procedure(G, F, active_v):
         return Exception("No suitable v found")
 
 
-def get_decycling_number_mif_v2(G):
+def get_decycling_number_fomin(G):
     if nx.is_forest(G):
         return 0
 
     return len(G.nodes) - get_mif_len(G, set(), None)
-
-
-# if __name__ == "__main__":
-#     block = """0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 1 0 1 1
-# 0 0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 1 1 1
-# 0 0 0 0 0 0 0 1 0 1 1 1 0 0 0 0 1 0 0 1
-# 0 0 0 0 0 0 1 0 1 0 1 1 0 0 0 0 0 1 1 0
-# 0 0 0 0 0 1 1 0 0 0 1 0 1 0 0 0 1 0 1 0
-# 0 0 0 0 1 0 0 1 0 0 0 1 0 1 0 0 0 1 0 1
-# 0 0 0 1 1 0 0 1 0 0 0 0 0 1 1 0 0 0 0 1
-# 0 0 1 0 0 1 1 0 0 0 0 0 1 0 0 1 0 0 1 0
-# 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0 1 1 0 0 1
-# 0 0 1 0 0 0 0 0 1 0 0 0 0 1 1 0 0 1 1 0
-# 0 0 1 1 1 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0
-# 0 0 1 1 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 0
-# 0 1 0 0 1 0 0 1 1 0 0 1 0 1 0 0 0 0 0 0
-# 1 0 0 0 0 1 1 0 0 1 1 0 1 0 0 0 0 0 0 0
-# 0 1 0 0 0 0 1 0 0 1 1 1 0 0 0 0 1 0 0 0
-# 1 0 0 0 0 0 0 1 1 0 1 1 0 0 0 0 0 1 0 0
-# 1 0 1 0 1 0 0 0 1 0 0 0 0 0 1 0 0 1 0 0
-# 0 1 0 1 0 1 0 0 0 1 0 0 0 0 0 1 1 0 0 0
-# 1 1 0 1 1 0 0 1 0 1 0 0 0 0 0 0 0 0 0 0
-# 1 1 1 0 0 1 1 0 1 0 0 0 0 0 0 0 0 0 0 0"""
-#
-#     np_matrix = np.loadtxt(io.StringIO(block), dtype=int)
-#     G = nx.from_numpy_array(np_matrix)
-#     print(get_decycling_number_mif_v2(G))

exact_mif_v3.py

@@ -294,7 +294,7 @@ def get_mif_len(G, F, active_v):
         return len(S) + main_procedure(new_G, new_F, active_v)
 
 
-def get_decycling_number_mif_v3(G):
+def get_decycling_number_xiao(G):
     if nx.is_forest(G):
         return 0
 

naive.py

@@ -16,5 +16,5 @@ def naive_fvs(graph):
     return None
 
 
-def get_decycling_number(graph):
+def get_decycling_number_naive(graph):
     return len(naive_fvs(graph))