Change row and column custody. Rename blockSizeR and blockSizeC
This commit is contained in:
Leonardo Bautista-Gomez
parent
d1d81a23cf
commit
a1f43578db
90
DAS/node.py
90
DAS/node.py
|
|
@ -36,9 +36,9 @@ class Validator:
|
|||
self.rowIDs = rowIDs
|
||||
self.columnIDs = columnIDs
|
||||
|
||||
def initValidator(blockSizeC, custodyRows, blockSizeR, custodyCols):
|
||||
rowIDs = set(random.sample(range(blockSizeC), custodyRows))
|
||||
columnIDs = set(random.sample(range(blockSizeR), custodyCols))
|
||||
def initValidator(nbRows, custodyRows, nbCols, custodyCols):
|
||||
rowIDs = set(random.sample(range(nbRows), custodyRows))
|
||||
columnIDs = set(random.sample(range(nbCols), custodyCols))
|
||||
return Validator(rowIDs, columnIDs)
|
||||
|
||||
class Node:
|
||||
|
|
@ -60,8 +60,8 @@ class Node:
|
|||
FORMAT = "%(levelname)s : %(entity)s : %(message)s"
|
||||
self.ID = ID
|
||||
self.format = {"entity": "Val "+str(self.ID)}
|
||||
self.block = Block(self.shape.blockSizeR, self.shape.blockSizeRK, self.shape.blockSizeC, self.shape.blockSizeCK)
|
||||
self.receivedBlock = Block(self.shape.blockSizeR, self.shape.blockSizeRK, self.shape.blockSizeC, self.shape.blockSizeCK)
|
||||
self.block = Block(self.shape.nbCols, self.shape.nbColsK, self.shape.nbRows, self.shape.nbRowsK)
|
||||
self.receivedBlock = Block(self.shape.nbCols, self.shape.nbColsK, self.shape.nbRows, self.shape.nbRowsK)
|
||||
self.receivedQueue = deque()
|
||||
self.sendQueue = deque()
|
||||
self.amIproposer = amIproposer
|
||||
|
|
@ -70,17 +70,29 @@ class Node:
|
|||
|
||||
if amIproposer:
|
||||
self.nodeClass = 0
|
||||
self.rowIDs = range(shape.blockSizeC)
|
||||
self.columnIDs = range(shape.blockSizeR)
|
||||
self.rowIDs = range(shape.nbRows)
|
||||
self.columnIDs = range(shape.nbCols)
|
||||
else:
|
||||
self.nodeClass = 1 if (self.ID <= shape.numberNodes * shape.class1ratio) else 2
|
||||
self.vpn = len(validators) #TODO: needed by old code, change to fn
|
||||
|
||||
self.rowIDs = set(rows)
|
||||
self.columnIDs = set(columns)
|
||||
for v in validators:
|
||||
self.rowIDs = self.rowIDs.union(v.rowIDs)
|
||||
self.columnIDs = self.columnIDs.union(v.columnIDs)
|
||||
if (self.vpn * self.shape.custodyRows) > self.shape.nbRows:
|
||||
self.logger.warning("Row custody (*vpn) larger than number of rows!", extra=self.format)
|
||||
self.rowIDs = range(nbRows)
|
||||
else:
|
||||
self.rowIDs = set(random.sample(range(self.shape.nbRows), self.vpn*self.shape.custodyRows))
|
||||
|
||||
if (self.vpn * self.shape.custodyCols) > self.shape.nbCols:
|
||||
self.logger.warning("Column custody (*vpn) larger than number of columns!", extra=self.format)
|
||||
self.columnIDs = range(nbCols)
|
||||
else:
|
||||
self.columnIDs = set(random.sample(range(self.shape.nbCols), self.vpn*self.shape.custodyCols))
|
||||
|
||||
#for v in validators:
|
||||
# self.rowIDs = self.rowIDs.union(v.rowIDs)
|
||||
# self.columnIDs = self.columnIDs.union(v.columnIDs)
|
||||
|
||||
self.rowNeighbors = collections.defaultdict(dict)
|
||||
self.columnNeighbors = collections.defaultdict(dict)
|
||||
|
|
@ -105,8 +117,8 @@ class Node:
|
|||
self.bwUplink *= 1e3 / 8 * config.stepDuration / config.segmentSize
|
||||
|
||||
self.repairOnTheFly = True
|
||||
self.sendLineUntilR = self.shape.blockSizeRK # stop sending on a p2p link if at least this amount of samples passed
|
||||
self.sendLineUntilC = self.shape.blockSizeCK # stop sending on a p2p link if at least this amount of samples passed
|
||||
self.sendLineUntilR = self.shape.nbColsK # stop sending on a p2p link if at least this amount of samples passed
|
||||
self.sendLineUntilC = self.shape.nbRowsK # stop sending on a p2p link if at least this amount of samples passed
|
||||
self.perNeighborQueue = True # queue incoming messages to outgoing connections on arrival (as typical GossipSub impl)
|
||||
self.shuffleQueues = True # shuffle the order of picking from active queues of a sender node
|
||||
self.perNodeQueue = False # keep a global queue of incoming messages for later sequential dispatch
|
||||
|
|
@ -131,53 +143,53 @@ class Node:
|
|||
else:
|
||||
self.logger.debug("Creating block...", extra=self.format)
|
||||
if self.shape.failureModel == "random":
|
||||
order = [i for i in range(self.shape.blockSizeR * self.shape.blockSizeC)]
|
||||
order = [i for i in range(self.shape.nbCols * self.shape.nbRows)]
|
||||
order = random.sample(order, int((1 - self.shape.failureRate/100) * len(order)))
|
||||
for i in order:
|
||||
self.block.data[i] = 1
|
||||
elif self.shape.failureModel == "sequential":
|
||||
order = [i for i in range(self.shape.blockSizeR * self.shape.blockSizeC)]
|
||||
order = [i for i in range(self.shape.nbCols * self.shape.nbRows)]
|
||||
order = order[:int((1 - self.shape.failureRate/100) * len(order))]
|
||||
for i in order:
|
||||
self.block.data[i] = 1
|
||||
elif self.shape.failureModel == "MEP": # Minimal size non-recoverable Erasure Pattern
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if r > self.shape.blockSizeRK or c > self.shape.blockSizeCK:
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if r > self.shape.nbColsK or c > self.shape.nbRowsK:
|
||||
self.block.setSegment(r,c)
|
||||
elif self.shape.failureModel == "MEP+1": # MEP +1 segment to make it recoverable
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if r > self.shape.blockSizeRK or c > self.shape.blockSizeCK:
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if r > self.shape.nbColsK or c > self.shape.nbRowsK:
|
||||
self.block.setSegment(r,c)
|
||||
self.block.setSegment(0, 0)
|
||||
elif self.shape.failureModel == "DEP":
|
||||
assert(self.shape.blockSizeR == self.shape.blockSizeC and self.shape.blockSizeRK == self.shape.blockSizeCK)
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if (r+c) % self.shape.blockSizeR > self.shape.blockSizeRK:
|
||||
assert(self.shape.nbCols == self.shape.nbRows and self.shape.nbColsK == self.shape.nbRowsK)
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if (r+c) % self.shape.nbCols > self.shape.nbColsK:
|
||||
self.block.setSegment(r,c)
|
||||
elif self.shape.failureModel == "DEP+1":
|
||||
assert(self.shape.blockSizeR == self.shape.blockSizeC and self.shape.blockSizeRK == self.shape.blockSizeCK)
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if (r+c) % self.shape.blockSizeR > self.shape.blockSizeRK:
|
||||
assert(self.shape.nbCols == self.shape.nbRows and self.shape.nbColsK == self.shape.nbRowsK)
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if (r+c) % self.shape.nbCols > self.shape.nbColsK:
|
||||
self.block.setSegment(r,c)
|
||||
self.block.setSegment(0, 0)
|
||||
elif self.shape.failureModel == "MREP": # Minimum size Recoverable Erasure Pattern
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if r < self.shape.blockSizeRK or c < self.shape.blockSizeCK:
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if r < self.shape.nbColsK or c < self.shape.nbRowsK:
|
||||
self.block.setSegment(r,c)
|
||||
elif self.shape.failureModel == "MREP-1": # make MREP non-recoverable
|
||||
for r in range(self.shape.blockSizeR):
|
||||
for c in range(self.shape.blockSizeC):
|
||||
if r < self.shape.blockSizeRK or c < self.shape.blockSizeCK:
|
||||
for r in range(self.shape.nbCols):
|
||||
for c in range(self.shape.nbRows):
|
||||
if r < self.shape.nbColsK or c < self.shape.nbRowsK:
|
||||
self.block.setSegment(r,c)
|
||||
self.block.setSegment(0, 0, 0)
|
||||
|
||||
nbFailures = self.block.data.count(0)
|
||||
measuredFailureRate = nbFailures * 100 / (self.shape.blockSizeR * self.shape.blockSizeC)
|
||||
measuredFailureRate = nbFailures * 100 / (self.shape.nbCols * self.shape.nbRows)
|
||||
self.logger.debug("Number of failures: %d (%0.02f %%)", nbFailures, measuredFailureRate, extra=self.format)
|
||||
|
||||
def getColumn(self, index):
|
||||
|
|
@ -351,7 +363,7 @@ class Node:
|
|||
segmentsToSend = []
|
||||
for rID, neighs in self.rowNeighbors.items():
|
||||
line = self.getRow(rID)
|
||||
needed = zeros(self.shape.blockSizeR)
|
||||
needed = zeros(self.shape.nbCols)
|
||||
for neigh in neighs.values():
|
||||
sentOrReceived = neigh.received | neigh.sent
|
||||
if sentOrReceived.count(1) < self.sendLineUntilR:
|
||||
|
|
@ -364,7 +376,7 @@ class Node:
|
|||
|
||||
for cID, neighs in self.columnNeighbors.items():
|
||||
line = self.getColumn(cID)
|
||||
needed = zeros(self.shape.blockSizeC)
|
||||
needed = zeros(self.shape.nbRows)
|
||||
for neigh in neighs.values():
|
||||
sentOrReceived = neigh.received | neigh.sent
|
||||
if sentOrReceived.count(1) < self.sendLineUntilC:
|
||||
|
|
@ -426,7 +438,7 @@ class Node:
|
|||
while t:
|
||||
if self.rowIDs:
|
||||
rID = random.choice(self.rowIDs)
|
||||
cID = random.randrange(0, self.shape.blockSizeR)
|
||||
cID = random.randrange(0, self.shape.nbCols)
|
||||
if self.block.getSegment(rID, cID) :
|
||||
neigh = random.choice(list(self.rowNeighbors[rID].values()))
|
||||
if self.checkSegmentToNeigh(rID, cID, neigh):
|
||||
|
|
@ -434,7 +446,7 @@ class Node:
|
|||
t = tries
|
||||
if self.columnIDs:
|
||||
cID = random.choice(self.columnIDs)
|
||||
rID = random.randrange(0, self.shape.blockSizeC)
|
||||
rID = random.randrange(0, self.shape.nbRows)
|
||||
if self.block.getSegment(rID, cID) :
|
||||
neigh = random.choice(list(self.columnNeighbors[cID].values()))
|
||||
if self.checkSegmentToNeigh(rID, cID, neigh):
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ class Observer:
|
|||
self.config = config
|
||||
self.format = {"entity": "Observer"}
|
||||
self.logger = logger
|
||||
self.block = [0] * self.config.blockSizeR * self.config.blockSizeC
|
||||
self.rows = [0] * self.config.blockSizeC
|
||||
self.columns = [0] * self.config.blockSizeR
|
||||
self.broadcasted = Block(self.config.blockSizeR, self.config.blockSizeRK,
|
||||
self.config.blockSizeC, self.config.blockSizeCK)
|
||||
self.block = [0] * self.config.nbCols * self.config.nbRows
|
||||
self.rows = [0] * self.config.nbRows
|
||||
self.columns = [0] * self.config.nbCols
|
||||
self.broadcasted = Block(self.config.nbCols, self.config.nbColsK,
|
||||
self.config.nbRows, self.config.nbRowsK)
|
||||
|
||||
|
||||
def checkRowsColumns(self, validators):
|
||||
|
|
@ -27,7 +27,7 @@ class Observer:
|
|||
for c in val.columnIDs:
|
||||
self.columns[c] += 1
|
||||
|
||||
for i in range(self.config.blockSizeC):
|
||||
for i in range(self.config.nbRows):
|
||||
self.logger.debug("Row/Column %d have %d and %d validators assigned." % (i, self.rows[i], self.columns[i]), extra=self.format)
|
||||
if self.rows[i] == 0 or self.columns[i] == 0:
|
||||
self.logger.warning("There is a row/column that has not been assigned", extra=self.format)
|
||||
|
|
@ -35,7 +35,7 @@ class Observer:
|
|||
def checkBroadcasted(self):
|
||||
"""It checks how many broadcasted samples are still missing in the network."""
|
||||
zeros = 0
|
||||
for i in range(self.blockSizeR * self.blockSizeC):
|
||||
for i in range(self.nbCols * self.nbRows):
|
||||
if self.broadcasted.data[i] == 0:
|
||||
zeros += 1
|
||||
if zeros > 0:
|
||||
|
|
|
|||
28
DAS/shape.py
28
DAS/shape.py
|
|
@ -3,21 +3,21 @@
|
|||
class Shape:
|
||||
"""This class represents a set of parameters for a specific simulation."""
|
||||
|
||||
def __init__(self, blockSizeR, blockSizeRK, blockSizeC, blockSizeCK,
|
||||
numberNodes, failureModel, failureRate, class1ratio, chiR, chiC, vpn1, vpn2, netDegree, bwUplinkProd, bwUplink1, bwUplink2, run):
|
||||
def __init__(self, nbCols, nbColsK, nbRows, nbRowsK,
|
||||
numberNodes, failureModel, failureRate, class1ratio, custodyRows, custodyCols, vpn1, vpn2, netDegree, bwUplinkProd, bwUplink1, bwUplink2, run):
|
||||
"""Initializes the shape with the parameters passed in argument."""
|
||||
self.run = run
|
||||
self.numberNodes = numberNodes
|
||||
self.blockSizeR = blockSizeR
|
||||
self.blockSizeRK = blockSizeRK
|
||||
self.blockSizeC = blockSizeC
|
||||
self.blockSizeCK = blockSizeCK
|
||||
self.nbCols = nbCols
|
||||
self.nbColsK = nbColsK
|
||||
self.nbRows = nbRows
|
||||
self.nbRowsK = nbRowsK
|
||||
self.failureModel = failureModel
|
||||
self.failureRate = failureRate
|
||||
self.netDegree = netDegree
|
||||
self.class1ratio = class1ratio
|
||||
self.chiR = chiR
|
||||
self.chiC = chiC
|
||||
self.custodyRows = custodyRows
|
||||
self.custodyCols = custodyCols
|
||||
self.vpn1 = vpn1
|
||||
self.vpn2 = vpn2
|
||||
self.bwUplinkProd = bwUplinkProd
|
||||
|
|
@ -28,16 +28,16 @@ class Shape:
|
|||
def __repr__(self):
|
||||
"""Returns a printable representation of the shape"""
|
||||
shastr = ""
|
||||
shastr += "bsrn-"+str(self.blockSizeR)
|
||||
shastr += "bsrk-"+str(self.blockSizeRK)
|
||||
shastr += "bscn-"+str(self.blockSizeC)
|
||||
shastr += "bsck-"+str(self.blockSizeCK)
|
||||
shastr += "bsrn-"+str(self.nbCols)
|
||||
shastr += "bsrk-"+str(self.nbColsK)
|
||||
shastr += "bscn-"+str(self.nbRows)
|
||||
shastr += "bsck-"+str(self.nbRowsK)
|
||||
shastr += "-nn-"+str(self.numberNodes)
|
||||
shastr += "-fm-"+str(self.failureModel)
|
||||
shastr += "-fr-"+str(self.failureRate)
|
||||
shastr += "-c1r-"+str(self.class1ratio)
|
||||
shastr += "-chir-"+str(self.chiR)
|
||||
shastr += "-chic-"+str(self.chiC)
|
||||
shastr += "-cusr-"+str(self.custodyRows)
|
||||
shastr += "-cusc-"+str(self.custodyCols)
|
||||
shastr += "-vpn1-"+str(self.vpn1)
|
||||
shastr += "-vpn2-"+str(self.vpn2)
|
||||
shastr += "-bwupprod-"+str(self.bwUplinkProd)
|
||||
|
|
|
|||
|
|
@ -54,20 +54,20 @@ class Simulator:
|
|||
lightVal = lightNodes * self.shape.vpn1
|
||||
heavyVal = heavyNodes * self.shape.vpn2
|
||||
totalValidators = lightVal + heavyVal
|
||||
totalRows = totalValidators * self.shape.chiR
|
||||
totalColumns = totalValidators * self.shape.chiC
|
||||
rows = list(range(self.shape.blockSizeC)) * (int(totalRows/self.shape.blockSizeC)+1)
|
||||
columns = list(range(self.shape.blockSizeR)) * (int(totalColumns/self.shape.blockSizeR)+1)
|
||||
totalRows = totalValidators * self.shape.custodyRows
|
||||
totalColumns = totalValidators * self.shape.custodyCols
|
||||
rows = list(range(self.shape.nbRows)) * (int(totalRows/self.shape.nbRows)+1)
|
||||
columns = list(range(self.shape.nbCols)) * (int(totalColumns/self.shape.nbCols)+1)
|
||||
rows = rows[0:totalRows]
|
||||
columns = columns[0:totalRows]
|
||||
random.shuffle(rows)
|
||||
random.shuffle(columns)
|
||||
offsetR = lightVal*self.shape.chiR
|
||||
offsetC = lightVal*self.shape.chiC
|
||||
offsetR = lightVal*self.shape.custodyRows
|
||||
offsetC = lightVal*self.shape.custodyCols
|
||||
self.logger.debug("There is a total of %d nodes, %d light and %d heavy." % (self.shape.numberNodes, lightNodes, heavyNodes), extra=self.format)
|
||||
self.logger.debug("There is a total of %d validators, %d in light nodes and %d in heavy nodes" % (totalValidators, lightVal, heavyVal), extra=self.format)
|
||||
self.logger.debug("Shuffling a total of %d rows to be assigned (X=%d)" % (len(rows), self.shape.chiR), extra=self.format)
|
||||
self.logger.debug("Shuffling a total of %d columns to be assigned (X=%d)" % (len(columns), self.shape.chiC), extra=self.format)
|
||||
self.logger.debug("Shuffling a total of %d rows to be assigned (X=%d)" % (len(rows), self.shape.custodyRows), extra=self.format)
|
||||
self.logger.debug("Shuffling a total of %d columns to be assigned (X=%d)" % (len(columns), self.shape.custodyCols), extra=self.format)
|
||||
self.logger.debug("Shuffled rows: %s" % str(rows), extra=self.format)
|
||||
self.logger.debug("Shuffled columns: %s" % str(columns), extra=self.format)
|
||||
|
||||
|
|
@ -76,16 +76,16 @@ class Simulator:
|
|||
for i in range(self.shape.numberNodes):
|
||||
if self.config.evenLineDistribution:
|
||||
if i < int(lightVal/self.shape.vpn1): # First start with the light nodes
|
||||
startR = i *self.shape.chiR*self.shape.vpn1
|
||||
endR = (i+1)*self.shape.chiR*self.shape.vpn1
|
||||
startC = i *self.shape.chiC*self.shape.vpn1
|
||||
endC = (i+1)*self.shape.chiC*self.shape.vpn1
|
||||
startR = i *self.shape.custodyRows*self.shape.vpn1
|
||||
endR = (i+1)*self.shape.custodyRows*self.shape.vpn1
|
||||
startC = i *self.shape.custodyCols*self.shape.vpn1
|
||||
endC = (i+1)*self.shape.custodyCols*self.shape.vpn1
|
||||
else:
|
||||
j = i - int(lightVal/self.shape.vpn1)
|
||||
startR = offsetR+( j *self.shape.chiR*self.shape.vpn2)
|
||||
endR = offsetR+((j+1)*self.shape.chiR*self.shape.vpn2)
|
||||
startC = offsetC+( j *self.shape.chiC*self.shape.vpn2)
|
||||
endC = offsetC+((j+1)*self.shape.chiC*self.shape.vpn2)
|
||||
startR = offsetR+( j *self.shape.custodyRows*self.shape.vpn2)
|
||||
endR = offsetR+((j+1)*self.shape.custodyRows*self.shape.vpn2)
|
||||
startC = offsetC+( j *self.shape.custodyCols*self.shape.vpn2)
|
||||
endC = offsetC+((j+1)*self.shape.custodyCols*self.shape.vpn2)
|
||||
r = rows[startR:endR]
|
||||
c = columns[startC:endC]
|
||||
val = Node(i, int(not i!=0), self.logger, self.shape, self.config, r, c)
|
||||
|
|
@ -97,16 +97,16 @@ class Simulator:
|
|||
self.nodeColumns.append(val.columnIDs)
|
||||
|
||||
else:
|
||||
if self.shape.chiC > self.shape.blockSizeR:
|
||||
self.logger.error("ChiC has to be smaller than %d" % self.shape.blockSizeR)
|
||||
elif self.shape.chiR > self.shape.blockSizeC:
|
||||
self.logger.error("ChiR has to be smaller than %d" % self.shape.blockSizeC)
|
||||
if self.shape.custodyCols > self.shape.nbCols:
|
||||
self.logger.error("custodyCols has to be smaller than %d" % self.shape.nbCols)
|
||||
elif self.shape.custodyRows > self.shape.nbRows:
|
||||
self.logger.error("custodyRows has to be smaller than %d" % self.shape.nbRows)
|
||||
|
||||
vs = []
|
||||
nodeClass = 1 if (i <= self.shape.numberNodes * self.shape.class1ratio) else 2
|
||||
vpn = self.shape.vpn1 if (nodeClass == 1) else self.shape.vpn2
|
||||
for v in range(vpn):
|
||||
vs.append(initValidator(self.shape.blockSizeC, self.shape.chiR, self.shape.blockSizeR, self.shape.chiC))
|
||||
vs.append(initValidator(self.shape.nbRows, self.shape.custodyRows, self.shape.nbCols, self.shape.custodyCols))
|
||||
val = Node(i, int(not i!=0), self.logger, self.shape, self.config, vs)
|
||||
if i == self.proposerID:
|
||||
val.initBlock()
|
||||
|
|
@ -122,8 +122,8 @@ class Simulator:
|
|||
|
||||
def initNetwork(self):
|
||||
"""It initializes the simulated network."""
|
||||
rowChannels = [[] for i in range(self.shape.blockSizeC)]
|
||||
columnChannels = [[] for i in range(self.shape.blockSizeR)]
|
||||
rowChannels = [[] for i in range(self.shape.nbRows)]
|
||||
columnChannels = [[] for i in range(self.shape.nbCols)]
|
||||
for v in self.validators:
|
||||
if not (self.proposerPublishOnly and v.amIproposer):
|
||||
for id in v.rowIDs:
|
||||
|
|
@ -139,7 +139,7 @@ class Simulator:
|
|||
self.logger.debug("Number of validators per row; Min: %d, Max: %d" % (min(self.distR), max(self.distR)), extra=self.format)
|
||||
self.logger.debug("Number of validators per column; Min: %d, Max: %d" % (min(self.distC), max(self.distC)), extra=self.format)
|
||||
|
||||
for id in range(self.shape.blockSizeC):
|
||||
for id in range(self.shape.nbRows):
|
||||
|
||||
# If the number of nodes in a channel is smaller or equal to the
|
||||
# requested degree, a fully connected graph is used. For n>d, a random
|
||||
|
|
@ -157,10 +157,10 @@ class Simulator:
|
|||
for u, v in G.edges:
|
||||
val1=rowChannels[id][u]
|
||||
val2=rowChannels[id][v]
|
||||
val1.rowNeighbors[id].update({val2.ID : Neighbor(val2, 0, self.shape.blockSizeR)})
|
||||
val2.rowNeighbors[id].update({val1.ID : Neighbor(val1, 0, self.shape.blockSizeR)})
|
||||
val1.rowNeighbors[id].update({val2.ID : Neighbor(val2, 0, self.shape.nbCols)})
|
||||
val2.rowNeighbors[id].update({val1.ID : Neighbor(val1, 0, self.shape.nbCols)})
|
||||
|
||||
for id in range(self.shape.blockSizeR):
|
||||
for id in range(self.shape.nbCols):
|
||||
|
||||
if not columnChannels[id]:
|
||||
self.logger.error("No nodes for column %d !" % id, extra=self.format)
|
||||
|
|
@ -175,8 +175,8 @@ class Simulator:
|
|||
for u, v in G.edges:
|
||||
val1=columnChannels[id][u]
|
||||
val2=columnChannels[id][v]
|
||||
val1.columnNeighbors[id].update({val2.ID : Neighbor(val2, 1, self.shape.blockSizeC)})
|
||||
val2.columnNeighbors[id].update({val1.ID : Neighbor(val1, 1, self.shape.blockSizeC)})
|
||||
val1.columnNeighbors[id].update({val2.ID : Neighbor(val2, 1, self.shape.nbRows)})
|
||||
val2.columnNeighbors[id].update({val1.ID : Neighbor(val1, 1, self.shape.nbRows)})
|
||||
|
||||
for v in self.validators:
|
||||
if (self.proposerPublishOnly and v.amIproposer):
|
||||
|
|
@ -184,12 +184,12 @@ class Simulator:
|
|||
count = min(self.proposerPublishTo, len(rowChannels[id]))
|
||||
publishTo = random.sample(rowChannels[id], count)
|
||||
for vi in publishTo:
|
||||
v.rowNeighbors[id].update({vi.ID : Neighbor(vi, 0, self.shape.blockSizeR)})
|
||||
v.rowNeighbors[id].update({vi.ID : Neighbor(vi, 0, self.shape.nbCols)})
|
||||
for id in v.columnIDs:
|
||||
count = min(self.proposerPublishTo, len(columnChannels[id]))
|
||||
publishTo = random.sample(columnChannels[id], count)
|
||||
for vi in publishTo:
|
||||
v.columnNeighbors[id].update({vi.ID : Neighbor(vi, 1, self.shape.blockSizeC)})
|
||||
v.columnNeighbors[id].update({vi.ID : Neighbor(vi, 1, self.shape.nbRows)})
|
||||
|
||||
if self.logger.isEnabledFor(logging.DEBUG):
|
||||
for i in range(0, self.shape.numberNodes):
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class Visualizer:
|
|||
self.execID = execID
|
||||
self.config = config
|
||||
self.folderPath = "results/"+self.execID
|
||||
self.parameters = ['run', 'blockSize', 'failureRate', 'numberNodes', 'netDegree', 'chi', 'vpn1', 'vpn2', 'class1ratio', 'bwUplinkProd', 'bwUplink1', 'bwUplink2']
|
||||
self.parameters = ['run', 'blockSize', 'failureRate', 'numberNodes', 'netDegree', 'cus', 'vpn1', 'vpn2', 'class1ratio', 'bwUplinkProd', 'bwUplink1', 'bwUplink2']
|
||||
self.minimumDataPoints = 2
|
||||
self.maxTTA = 11000
|
||||
|
||||
|
|
@ -32,12 +32,12 @@ class Visualizer:
|
|||
tree = ET.parse(os.path.join(self.folderPath, filename))
|
||||
root = tree.getroot()
|
||||
run = int(root.find('run').text)
|
||||
blockSize = int(root.find('blockSizeR').text) # TODO: maybe we want both dimensions
|
||||
blockSize = int(root.find('nbCols').text) # TODO: maybe we want both dimensions
|
||||
failureRate = int(root.find('failureRate').text)
|
||||
numberNodes = int(root.find('numberNodes').text)
|
||||
class1ratio = float(root.find('class1ratio').text)
|
||||
netDegree = int(root.find('netDegree').text)
|
||||
chi = int(root.find('chiR').text) # TODO: maybe we want both dimensions
|
||||
custodyRows = int(root.find('custodyRows').text) # TODO: maybe we want both dimensions
|
||||
vpn1 = int(root.find('vpn1').text)
|
||||
vpn2 = int(root.find('vpn2').text)
|
||||
bwUplinkProd = int(root.find('bwUplinkProd').text)
|
||||
|
|
@ -53,7 +53,7 @@ class Visualizer:
|
|||
# Get the indices and values of the parameters in the combination
|
||||
|
||||
indices = [self.parameters.index(element) for element in combination]
|
||||
selectedValues = [run, blockSize, failureRate, numberNodes, netDegree, chi, vpn1, vpn2, class1ratio, bwUplinkProd, bwUplink1, bwUplink2]
|
||||
selectedValues = [run, blockSize, failureRate, numberNodes, netDegree, custodyRows, vpn1, vpn2, class1ratio, bwUplinkProd, bwUplink1, bwUplink2]
|
||||
values = [selectedValues[index] for index in indices]
|
||||
names = [self.parameters[i] for i in indices]
|
||||
keyComponents = [f"{name}_{value}" for name, value in zip(names, values)]
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ blockSizes = range(64, 113, 128)
|
|||
netDegrees = range(8, 9, 2)
|
||||
|
||||
# number of rows and columns a validator is interested in
|
||||
custody = range(2, 3, 2)
|
||||
custody = [2]
|
||||
|
||||
# ratio of class1 nodes (see below for parameters per class)
|
||||
class1ratios = [0.8]
|
||||
|
|
@ -106,8 +106,8 @@ def nextShape():
|
|||
runs, failureModels, failureRates, class1ratios, custody, validatorsPerNode1, validatorsPerNode2, blockSizes, numberNodes, netDegrees, bwUplinksProd, bwUplinks1, bwUplinks2):
|
||||
# Network Degree has to be an even number
|
||||
if netDegree % 2 == 0:
|
||||
blockSizeR = blockSizeC = blockSize
|
||||
blockSizeRK = blockSizeCK = blockSize // 2
|
||||
nbCols = nbRows = blockSize
|
||||
nbColsK = nbRowsK = blockSize // 2
|
||||
custodyRows = custodyCols = cust
|
||||
shape = Shape(blockSizeR, blockSizeRK, blockSizeC, blockSizeCK, nn, fm, fr, class1ratio, custodyRows, custodyCols, vpn1, vpn2, netDegree, bwUplinkProd, bwUplink1, bwUplink2, run)
|
||||
shape = Shape(nbCols, nbColsK, nbRows, nbRowsK, nn, fm, fr, class1ratio, custodyRows, custodyCols, vpn1, vpn2, netDegree, bwUplinkProd, bwUplink1, bwUplink2, run)
|
||||
yield shape
|
||||
|
|
|
|||
Loading…
Reference in New Issue