ready to put on server

devstone/pythonpdevs/devstone.py

@@ -157,25 +157,6 @@ class DEVStoneWrapper(CoupledDEVS, ABC):
                                            add_out_port=add_atomic_out_ports, prep_time=1.0 + (idx * 1e-6), mode=mode)
                 self.models.append(self.addSubModel(atomic))
 
-    def extend(self, string: str, width: int):
-        length = len(string)
-        return string + " "*(width - length)
-
-    def __str__(self):
-        result = [self.extend(self.name, 16) + "\n", "-" * 20 + "\n"]
-
-        first = self.component_set[0]
-        coupled = ""
-        if isinstance(first, CoupledDEVS):
-            result.append("| " + self.extend(first.name, 16) + " |\n")
-            coupled = "\n\n" + first.__str__()
-
-        for model in self.models:
-            result.append("| " + self.extend(model.name, 16) + " |\n")
-        result.append("-"*20 + "\n")
-        result.append(coupled)
-        return "".join(result)
-
     def dot(self, name) -> None:
         result = ("\n\ndigraph {\n\tlayout=dot;"
                   "\n\tnodesep=0.25;"
@@ -405,13 +386,11 @@ class DynamicGenerator(AtomicDEVS):
         self.repeat = repeat
 
         self._counter = 0
-        self._active = True
 
     def intTransition(self):
         return "passive" # state is unimportant
 
     def timeAdvance(self):
-        # stop when counter >= repeat
         if self._counter >= self.repeat:
             return INFINITY
         return self.period

devstone/pythonpdevs/main.py

@@ -77,7 +77,6 @@ if __name__ == '__main__':
     env = DEVStoneEnvironment("DEVStoneEnvironment", devstone_model)
     model_created_time = time.time()
 
-    # print(devstone_model)
     # devstone_model.dot(f"{args.model_type}-before")
 
     sim = Simulator(env)
@@ -92,7 +91,6 @@ if __name__ == '__main__':
     sim.simulate()
     sim_time = time.time()
 
-    # print(devstone_model)
     # devstone_model.dot(f"{args.model_type}-after")
 
     print("Model creation time: {}".format(model_created_time - start_time))

devstone/testPyPDEVS.py

@@ -45,7 +45,7 @@ def run_devstone(model_type, depth, width, minimal=False, classic=False, dynamic
         cmd.extend(["-C"])
     result = subprocess.run(cmd, capture_output=True, text=True)
     output = result.stdout.strip()
-    print(output)
+    # print(output)
     errors = result.stderr.strip()
     match = TIME_PATTERN.search(output)