fixed cidonDfs algorithm

cengwins · May 6, 2022 · f2833ed · f2833ed
1 parent 669b389
commit f2833ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/adhoccomputing/DistributedAlgorithms/Waves/CidonDFS.py b/adhoccomputing/DistributedAlgorithms/Waves/CidonDFS.py
@@ -35,8 +35,6 @@ class NodeMark(Enum):
   father = "father"
   son = "son"
 
-topo = Topology()
-
 # define your own message header structure
 class ApplicationLayerMessageHeader(GenericMessageHeader):
   pass
@@ -51,7 +49,7 @@ class ApplicationLayerComponent_Cidon(GenericModel):
 
   def on_init(self, eventobj: Event):
     print(f"Initializing {self.componentname}.{self.componentinstancenumber}")
-    self.NeighbourList = topo.get_neighbors(self.componentinstancenumber)
+    self.NeighbourList = self.topology.get_neighbors(self.componentinstancenumber)
     self.state = NodeState.IDLE
     self.mark = {}
     for i in self.NeighbourList:
@@ -160,10 +158,11 @@ def Search(self):
           print(f"I am Node-{self.componentinstancenumber} local number messages sent is {self.numMesg}")
           return
 
-  def __init__(self, componentname, componentinstancenumber):
+  def __init__(self, componentname, componentinstancenumber, topology=None):
     super().__init__(componentname, componentinstancenumber)
     self.eventhandlers["start"] = self.on_start
     self.eventhandlers["token"] = self.on_token
     self.eventhandlers["visited"] = self.on_visited
+    self.topology = topology
 
 
diff --git a/adhoccomputing/Experimentation/Topology.py b/adhoccomputing/Experimentation/Topology.py
@@ -8,6 +8,7 @@
 class Topology:
   nodes = {}
   channels = {}
+  G = None
 
   def __init__(self, name=None) -> None:
 #      print("Constructing topology", name)