diff --git a/DAS/simulator.py b/DAS/simulator.py index 07cd5d4..c048104 100644 --- a/DAS/simulator.py +++ b/DAS/simulator.py @@ -111,14 +111,18 @@ class Simulator: while(True): missingVector.append(missingSamples) oldMissingSamples = missingSamples + self.logger.debug("PHASE SEND %d" % steps, extra=self.format) for i in range(0,self.shape.numberValidators): self.validators[i].sendRows() self.validators[i].sendColumns() + self.logger.debug("PHASE RECEIVE %d" % steps, extra=self.format) for i in range(1,self.shape.numberValidators): self.validators[i].receiveRowsColumns() + self.logger.debug("PHASE RESTORE %d" % steps, extra=self.format) for i in range(1,self.shape.numberValidators): self.validators[i].restoreRows() self.validators[i].restoreColumns() + self.logger.debug("PHASE LOG %d" % steps, extra=self.format) for i in range(0,self.shape.numberValidators): self.validators[i].logRows() self.validators[i].logColumns() diff --git a/study.py b/study.py index 68663b8..25e8735 100644 --- a/study.py +++ b/study.py @@ -37,7 +37,7 @@ def study(): sim.initValidators() sim.initNetwork() result = sim.run() - sim.logger.info("Shape: %s ... Block Available: %d" % (str(sim.shape.__dict__), result.blockAvailable), extra=sim.format) + sim.logger.info("Shape: %s ... Block Available: %d in %d steps" % (str(sim.shape.__dict__), result.blockAvailable, len(result.missingVector)), extra=sim.format) results.append(copy.deepcopy(result)) simCnt += 1