diff options
Diffstat (limited to 'esds/helpers/platform.py')
| -rw-r--r-- | esds/helpers/platform.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/esds/helpers/platform.py b/esds/helpers/platform.py index 99b6986..c236e60 100644 --- a/esds/helpers/platform.py +++ b/esds/helpers/platform.py @@ -50,7 +50,7 @@ class YAMLPlatformFile: "breakpoints": [], "breakpoints_every": None, "breakpoints_file": None, - "breakpoints_callback": None, + "breakpoints_callback": lambda s:None, "debug": False, "debug_file": "./esds.debug", "interferences": True, @@ -198,7 +198,7 @@ class YAMLPlatformFile: self.parsing_error("debug should be on or off") self.default["debug"]=general["debug"] if "debug_file" in general: - self.default["debug_file"]=general["debug"] + self.default["debug_file"]=general["debug_file"] if "interferences" in general: if type(general["interferences"]) != bool: self.parsing_error("interferences should be on or off") @@ -206,14 +206,21 @@ class YAMLPlatformFile: def run(self): ##### First load callback from file if any - callback=None if self.default["breakpoints_file"] != None: module, ext=os.path.splitext(self.default["breakpoints_file"]) imported=importlib.import_module(module) callback=getattr(imported, self.default["breakpoints_callback"]) + self.default["breakpoints_callback"]=callback ##### Create simulator simulator=Simulator(self.default["interfaces"]) for node_id in range(0,self.default["node_count"]): simulator.create_node(self.default["implementations"][node_id], args=self.default["arguments"][node_id]) - simulator.run() + ##### Run simulation + simulator.run( + breakpoints=self.default["breakpoints"], + breakpoints_every=self.default["breakpoints_every"], + breakpoint_callback=self.default["breakpoints_callback"], + debug=self.default["debug"], + debug_file_path=self.default["debug_file"], + interferences=self.default["interferences"])
\ No newline at end of file |