From fa1818a43b314d67035c025a8b409ad389912c00 Mon Sep 17 00:00:00 2001 From: Csaba Kiraly Date: Fri, 24 Feb 2023 08:43:18 +0100 Subject: [PATCH] simplify code Signed-off-by: Csaba Kiraly --- DAS/validator.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/DAS/validator.py b/DAS/validator.py index 00acc91..25ca426 100644 --- a/DAS/validator.py +++ b/DAS/validator.py @@ -8,7 +8,7 @@ from DAS.block import * from bitarray import bitarray from bitarray.util import zeros from collections import deque - +from itertools import chain def shuffled(lis, shuffle=True): ''' Generator yielding list in shuffled order @@ -236,12 +236,7 @@ class Validator: self.block.merge(self.receivedBlock) - for neighs in self.rowNeighbors.values(): - for neigh in neighs.values(): - neigh.received |= neigh.receiving - neigh.receiving.setall(0) - - for neighs in self.columnNeighbors.values(): + for neighs in chain (self.rowNeighbors.values(), self.columnNeighbors.values()): for neigh in neighs.values(): neigh.received |= neigh.receiving neigh.receiving.setall(0) @@ -332,17 +327,15 @@ class Validator: if s.dim == 0: for _, neigh in shuffledDict(self.rowNeighbors[s.id], self.shuffleNeighbors): self.logger.debug("%d or %d", neigh.sent[s.i], neigh.received[s.i], extra=self.format) - if not neigh.sent[s.i] and not neigh.received[s.i]: - if self.sendSegmentToNeigh(s.id, s.i, neigh): - self.logger.debug("sending to %d", neigh.node.ID, extra=self.format) - break + if self.sendSegmentToNeigh(s.id, s.i, neigh): + self.logger.debug("sending to %d", neigh.node.ID, extra=self.format) + break else: for _, neigh in shuffledDict(self.columnNeighbors[s.id], self.shuffleNeighbors): self.logger.debug("%d or %d", neigh.sent[s.i], neigh.received[s.i], extra=self.format) - if not neigh.sent[s.i] and not neigh.received[s.i]: - if self.sendSegmentToNeigh(s.i, s.id, neigh): - self.logger.debug("sending to %d", neigh.node.ID, extra=self.format) - break + if self.sendSegmentToNeigh(s.i, s.id, neigh): + self.logger.debug("sending to %d", neigh.node.ID, extra=self.format) + break if self.statsTxInSlot >= self.bwUplink: if not self.segmentShuffleSchedulerPersist: