Direct TS generating does not support to load partially precomputed TS (

#14)
sybila · Jun 24, 2021 · f505d87 · f505d87
1 parent ef1a47a
commit f505d87
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/Core/Model.py b/Core/Model.py
@@ -341,23 +341,19 @@ def compute_bound(self):
             bound = max(rule.lhs.most_frequent(), rule.rhs.most_frequent())
         return max(bound, Side(self.init).most_frequent())
 
-    def generate_direct_transition_system(self, ts=None, max_time: float = np.inf, max_size: float = np.inf, bound=None):
-        if not ts:
-            ts = DirectTS()
-            if self.regulation:
-                if self.regulation.memory == 0:
-                    ts.init = MultisetState(self.init)
-                elif self.regulation.memory == 1:
-                    ts.init = OneStepMemoryState(self.init)
-                else:
-                    ts.init = FullMemoryState(self.init)
-            else:
+    def generate_direct_transition_system(self, max_time: float = np.inf, max_size: float = np.inf, bound=None):
+        ts = DirectTS()
+        if self.regulation:
+            if self.regulation.memory == 0:
                 ts.init = MultisetState(self.init)
-            ts.unprocessed = {ts.init}
-            ts.unique_complexes.update(set(ts.init.multiset))
+            elif self.regulation.memory == 1:
+                ts.init = OneStepMemoryState(self.init)
+            else:
+                ts.init = FullMemoryState(self.init)
         else:
-            pass
-            # TODO: if a TS is given, extract all the data
+            ts.init = MultisetState(self.init)
+        ts.unprocessed = {ts.init}
+        ts.unique_complexes.update(set(ts.init.multiset))
 
         for rule in self.rules:
             # precompute complexes for each rule