Result normalization added.

Author: gsvgit

cfpq_add_context/add_contexts.py

@@ -127,6 +127,22 @@ def add_context(file_path):
     decomposition_end = time.perf_counter()
     print("Graph decomposition competed in ", decomposition_end - intersection_end)
 
-    return decomposed_result
+    return (decomposed_result, graph.ncols)
+
+def normalize(solver_result, initial_graph_nvertices):
+    
+    normalization_start = time.perf_counter()
+    
+    c = solver_result.ncols // initial_graph_nvertices
+    start_vertices = set([i * c for i in range(0,initial_graph_nvertices)])
+    edges = solver_result.to_edgelist()
+    edges = zip(edges[0], edges[1])
+    new_edges = set([(_edg[0] // c, _edg[1] // c) for (_edg, _lbl) in edges if _edg[0] in start_vertices])
+    result = Matrix.from_edgelist(new_edges, values=True, dtype=BOOL, nrows = initial_graph_nvertices,
+                                             ncols=initial_graph_nvertices, name = "normalized_solver_result")
+    normalization_end = time.perf_counter()
+    print("Normalization of solver result done in ", normalization_end - normalization_start)
+    
+    return result
 
 

cfpq_cli/run_all_pairs_cflr.py

@@ -13,7 +13,7 @@
 from cfpq_cli.time_limit import time_limit, TimeoutException
 from cfpq_model.cnf_grammar_template import CnfGrammarTemplate
 from cfpq_model.label_decomposed_graph import LabelDecomposedGraph
-from cfpq_add_context.add_contexts import add_context
+from cfpq_add_context.add_contexts import add_context, normalize
 
 
 def run_all_pairs_cflr(
@@ -27,16 +27,20 @@ def run_all_pairs_cflr(
 ):
     algo = get_all_pairs_cfl_reachability_algo(algo_name)
     if add_contexts:
-        graph = add_context(graph_path)
+        graph,initial_graph_nvertices = add_context(graph_path)
     else:
         graph = LabelDecomposedGraph.read_from_pocr_graph_file(graph_path)
+    print ("graph = ", graph)
     grammar = CnfGrammarTemplate.read_from_pocr_cnf_file(grammar_path)
     graph, grammar = preprocess_graph_and_grammar(graph, grammar, settings)
     try:
         with time_limit(time_limit_sec):
             start = time()
             res = algo.solve(graph=graph, grammar=grammar, settings=settings)
+            if add_contexts:
+                res = normalize(res, initial_graph_nvertices)
             finish = time()
+            print("result: ", res)
             print(f"AnalysisTime\t{finish - start}")
             print(f"#SEdges\t{res.nvals}")
             if out_path is not None: