summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Guegan <manzerbredes@mailbox.org>2022-09-11 14:56:10 +0200
committerLoic Guegan <manzerbredes@mailbox.org>2022-09-11 14:56:10 +0200
commit918cc9a4481149912027485ea10cc45f55334d1b (patch)
treeba154669aa6ca4a036cbf3bfa78e8ee6acae1248
parenta8281ebfd3f3a3c67e4a022ce59450146c90fb6e (diff)
Cleaning
-rw-r--r--esds/simulator.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/esds/simulator.py b/esds/simulator.py
index 2e69884..4713fa5 100644
--- a/esds/simulator.py
+++ b/esds/simulator.py
@@ -26,7 +26,7 @@ class Simulator:
be handle before any other one. That way after a wait, nodes a ready perform receivet() with timeout=0.
"""
- def __init__(self,netmat,debug_file_path="./esds.debug"):
+ def __init__(self,netmat):
"""
Format of netmat: { "interface": {"bandwidth": numpy_matrix_2D, "latency": numpy_matrix_2D, "is_wired":bool}}
For wireless interfaces the diagonals of the bandwidth and latency matrices are very important.
@@ -45,7 +45,7 @@ class Simulator:
self.events_dirty=True # For optimization reasons
self.startat=-1
self.time=0
- self.debug_file_path=debug_file_path
+ self.debug_file_path="./esds.debug"
self.precision=".3f"
self.interferences=True
self.wait_end_nodes=list() # Keep track of nodes that wait for the end of the simulation
@@ -354,13 +354,14 @@ class Simulator:
self.events=np.concatenate([self.events,[np.array([event_type,event_ts,np.array(event,dtype=object),priority],dtype=object)]]) # Add new events
self.sort_events()
- def run(self, breakpoints=[],breakpoint_callback=lambda s:None,breakpoints_every=None,debug=False,interferences=True):
+ def run(self, breakpoints=[],breakpoint_callback=lambda s:None,breakpoints_every=None,debug=False,interferences=True,debug_file_path="./esds.debug"):
"""
Run the simulation with the created nodes
"""
##### Setup simulation
self.startat=time.time()
self.interferences=interferences
+ self.debug_file_path=debug_file_path
for bp in breakpoints:
self.add_event(2,bp,0,1)
if breakpoints_every != None: