Using new safe sequence computation also for DAGs

Author: alexandrutomescu

examples/inexact_flow_solver.py

@@ -129,8 +129,7 @@ def get_solution(self):
         if self._solution is not None:
             return self._solution
 
-        solution_weights_dict = self.solver.get_variable_values("w", [int])
-        # solution_weights_dict = self.solver.get_values(self.path_weights_vars)
+        solution_weights_dict = self.solver.get_values(self.path_weights_vars)
         self._solution = {
             "paths": self.get_solution_paths(),
             "weights": [solution_weights_dict[i] for i in range(self.k)],

flowpaths/abstractpathmodeldag.py

@@ -1,5 +1,6 @@
 import flowpaths.stdag as stdag
 from flowpaths.utils import safetypathcovers
+from flowpaths.utils import safetypathcoverscycles
 from flowpaths.utils import solverwrapper as sw
 import flowpaths.utils as utils
 import time
@@ -248,11 +249,15 @@ def __init__(
 
         if self.optimize_with_safe_sequences and not self.is_solved():
             start_time = time.perf_counter()
-            self.safe_lists += safetypathcovers.safe_sequences(
+            # self.safe_lists += safetypathcovers.safe_sequences(
+            #     G=self.G,
+            #     edges_or_subpath_constraints_to_cover=self.trusted_edges_for_safety,
+            #     no_duplicates=False,
+            #     threads=self.threads,
+            # )
+            self.safe_lists += safetypathcoverscycles.maximal_safe_sequences_via_dominators(
                 G=self.G,
-                edges_or_subpath_constraints_to_cover=self.trusted_edges_for_safety,
-                no_duplicates=False,
-                threads=self.threads,
+                X=self.trusted_edges_for_safety,
             )
             self.solve_statistics["safe_sequences_time"] = time.perf_counter() - start_time
 

flowpaths/utils/safetypathcoverscycles.py

@@ -1,4 +1,6 @@
 import flowpaths.stdigraph as stdigraph
+import flowpaths.stdag as stdag
+import flowpaths.abstractsourcesinkgraph as abssg
 import flowpaths.utils.dominators as dominators
 from queue import Queue
 
@@ -69,7 +71,7 @@ def find_idom(adj_dict, s, t) -> list:
 
     return first_bridge
 
-def maximal_safe_sequences_via_dominators(G : stdigraph.stDiGraph, X = set()) -> list :
+def maximal_safe_sequences_via_dominators(G : abssg.AbstractSourceSinkGraph, X = set()) -> list :
 
     if X == None or len(X) == 0:
         return []