diff --git a/DAS/simulator.py b/DAS/simulator.py index 3701167..6a369a6 100644 --- a/DAS/simulator.py +++ b/DAS/simulator.py @@ -61,8 +61,8 @@ class Simulator: for u, v in G.edges: val1=rowChannels[id][u] val2=rowChannels[id][v] - val1.rowNeighbors[id].append(val2) - val2.rowNeighbors[id].append(val1) + val1.rowNeighbors[id].append(Neighbor(val2)) + val2.rowNeighbors[id].append(Neighbor(val1)) if (len(columnChannels[id]) < self.shape.netDegree): self.logger.error("Graph degree higher than %d" % len(columnChannels[id]), extra=self.format) @@ -72,8 +72,8 @@ class Simulator: for u, v in G.edges: val1=columnChannels[id][u] val2=columnChannels[id][v] - val1.columnNeighbors[id].append(val2) - val2.columnNeighbors[id].append(val1) + val1.columnNeighbors[id].append(Neighbor(val2)) + val2.columnNeighbors[id].append(Neighbor(val1)) def initLogger(self): logger = logging.getLogger("DAS") diff --git a/DAS/validator.py b/DAS/validator.py index 278c7cd..c2c0124 100644 --- a/DAS/validator.py +++ b/DAS/validator.py @@ -7,6 +7,14 @@ from DAS.block import * from bitarray import bitarray from bitarray.util import zeros +class Neighbor: + + def __repr__(self): + return str(self.node.ID) + + def __init__(self, v): + self.node = v + class Validator: ID = 0 @@ -122,14 +130,14 @@ class Validator: if line.any(): self.logger.debug("col %d -> %s", columnID, self.columnNeighbors[columnID] , extra=self.format) for n in self.columnNeighbors[columnID]: - n.receiveColumn(columnID, line) + n.node.receiveColumn(columnID, line) def sendRow(self, rowID): line = self.getRow(rowID) if line.any(): self.logger.debug("row %d -> %s", rowID, self.rowNeighbors[rowID], extra=self.format) for n in self.rowNeighbors[rowID]: - n.receiveRow(rowID, line) + n.node.receiveRow(rowID, line) def sendRows(self): if self.amIproposer == 1: