Code cleanup.

Author: gsvgit

cfpq_add_context/add_contexts.py

@@ -31,7 +31,6 @@ def to_label_decomposed_graph(graph):
     print("Boolean matrix for alloc nvals: ", alloc.nvals)
 
     alloc_r = Matrix(BOOL, graph.ncols, graph.nrows, name = "alloc_r_after_intersection")
-    #alloc_r << graph.select(graphblas.select.select_alloc_r)
     alloc_r << alloc.T
     print("Boolean matrix for alloc_r nvals: ", alloc_r.nvals)
 
@@ -40,8 +39,6 @@ def to_label_decomposed_graph(graph):
     print("Boolean matrix for assign nvals: ", assign.nvals)
 
     assign_r = Matrix(BOOL, graph.ncols, graph.nrows, name = "assign_r_after_intersection")
-    #assign_r << graph.select(graphblas.select.select_assign_r)
-    #assign_r << assign_r + graph.select(graphblas.select.select_pass_and_return).T
     assign_r << assign.T
     print("Boolean matrix for assign_r nvals: ", assign_r.nvals)
 
@@ -51,14 +48,12 @@ def to_label_decomposed_graph(graph):
     load_i << graph.select(graphblas.select.select_load).apply(graphblas.unary.decode_load)
 
     load_r_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "load_r_i_after_intersection")
-    #load_r_i << graph.select(graphblas.select.select_load_r).apply(graphblas.unary.decode_load_r)
     load_r_i << load_i.T
 
     store_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "store_i_after_intersection")
     store_i << graph.select(graphblas.select.select_store).apply(graphblas.unary.decode_store)
 
     store_r_i = Matrix(UINT64, graph.ncols, graph.nrows, name = "store_r_i_after_intersection")
-    #store_r_i << graph.select(graphblas.select.select_store_r).apply(graphblas.unary.decode_store_r)
     store_r_i << store_i.T
 
     store_block_count = store_i.reduce_scalar("max").get(0) + 1

cfpq_add_context/intersection.py

@@ -66,15 +66,7 @@ def intersection (graph, automata) :
 
     #print_matrix_to_dot(intersection, "kron.dot")
 
-    #entrypoints = Vector(bool,graph.nrows, name="entrypoints")
-    #entrypoints << graph.select(graphblas.select.select_not_reversed).reduce_columnwise(graphblas.monoid.lor)
-    #entrypoints = set(range(0,graph.nrows)).difference(entrypoints.to_coo(values=False)[0])
-
-    #print("entypoints:", entrypoints)
-    
-    sources = [i * automata.nrows for i in range(0,graph.nrows)]
-    #sources = [i * automata.nrows for i in entrypoints]
-    
+    sources = [i * automata.nrows for i in range(0, graph.nrows)]    
 
     reachable_vertices_mask = bfs(intersection, sources).diag(name="reachable_vertices_mask")
 
@@ -84,7 +76,7 @@ def intersection (graph, automata) :
     unreachable_vertices_removing_end = time.perf_counter()
     print("Removing of unreachable vertices done in ", unreachable_vertices_removing_end - zeroes_removing_from_intersection_end)
 
-    print_matrix_to_dot(result, "kron_filtered.dot")
+    #print_matrix_to_dot(result, "kron_filtered.dot")
     return result
 
 

cfpq_add_context/load_graph.py

@@ -52,10 +52,6 @@ def get_raw_edge(line):
 
     with open (file_path,'r') as file:
         raw_edges = [get_raw_edge(line) for line in file if len(line.strip()) > 0 and not("_r") in line]
-        #nvertices = 0
-        #for (_from, _to, line) in raw_edges:
-        #    _max = max(_from,_to)
-        #    nvertices = max(nvertices, _max)
 
         nvertices = nvertices + 1
 
@@ -75,8 +71,6 @@ def get_raw_edge(line):
                 edges[(v_from, v_to)] = get_edge_lbl(terminal)
 
         edges = [(i[0],i[1],edges[i]) for i in edges]
-        #TODO Remove dup_op! It is a hack to avoid edges duplication.
-        #result = Matrix.from_edgelist(edges, dtype=UINT64, nrows=nvertices + 1, ncols=nvertices + 1, name="graph",dup_op="max")
 
         result = Matrix.from_edgelist(edges, dtype=UINT64, nrows=nvertices, ncols=nvertices, name="graph")
         #print_matrix_to_dot(result, "graph.dot")

cfpq_cli/run_all_pairs_cflr.py

@@ -40,10 +40,10 @@ def run_all_pairs_cflr(
             res = algo.solve(graph=graph, grammar=grammar, settings=settings)
             if add_contexts:
                 res = normalize(res, initial_graph_nvertices)
-            if not ((len(expected_path) > 0) and (verify(res, expected_path))):
-                print("Incorrect result !!!")
+            if (len(expected_path) > 0)   and not (verify(res, expected_path)):
+                print("!!! Incorrect result !!!")
             finish = time()
-            print("result: ", res)
+            #print("result: ", res)
             print(f"AnalysisTime\t{finish - start}")
             print(f"#SEdges\t{res.nvals}")
             if out_path is not None: