From 186d430ad12f3b8a6e51e4d05545fb2c0c550b59 Mon Sep 17 00:00:00 2001 From: Csaba Kiraly Date: Thu, 23 Feb 2023 12:55:19 +0100 Subject: [PATCH] consider shuffleLines in segmentShuffleScheduler Signed-off-by: Csaba Kiraly --- DAS/validator.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/DAS/validator.py b/DAS/validator.py index bfd1109..dc19ed7 100644 --- a/DAS/validator.py +++ b/DAS/validator.py @@ -10,13 +10,16 @@ from bitarray.util import zeros from collections import deque -def shuffled(lis): +def shuffled(lis, shuffle=True): ''' Generator yielding list in shuffled order ''' # based on https://stackoverflow.com/a/60342323 - for index in random.sample(range(len(lis)), len(lis)): - yield lis[index] - + if shuffle: + for index in random.sample(range(len(lis)), len(lis)): + yield lis[index] + else: + for v in lis: + yield v def shuffledDict(d, shuffle=True): ''' Generator yielding dictionary in shuffled order @@ -479,7 +482,7 @@ class Validator: if not self.segmentsToSend: break else: - self.segmentShuffleGen = shuffled(self.segmentsToSend) + self.segmentShuffleGen = shuffled(self.segmentsToSend, self.shuffleLines) if self.dumbRandomScheduler: # dumb random scheduler picking segments at random and trying to send it