Fix row and column distribution

DAS/visualizor.py

@@ -5,18 +5,22 @@ import os
 
 def plotData(conf):
     plt.clf()
-    fig = plt.figure("6, 3")
+    fig = plt.figure("9, 3")
     if conf["desLoc"] == 1:
         xDes = 0
     else:
         xDes = conf["xdots"][-1] * 0.6
     props = dict(boxstyle='round', facecolor='wheat', alpha=0.5)
-    plt.text(xDes, max(conf["data"][0])/4, conf["textBox"], fontsize=10, verticalalignment='top', bbox=props)
+    plt.text(xDes, conf["yaxismax"]/4, conf["textBox"], fontsize=10, verticalalignment='top', bbox=props)
     for i in range(len(conf["data"])):
-        plt.plot(conf["xdots"], conf["data"][i], conf["colors"][i], label=conf["labels"][i])
+        if conf["type"] == "plot":
+            plt.plot(conf["xdots"], conf["data"][i], conf["colors"][i], label=conf["labels"][i])
+        if conf["type"] == "bar":
+            plt.bar(conf["xdots"], conf["data"][i], label=conf["labels"][i])
     plt.title(conf["title"])
     plt.ylabel(conf["ylabel"])
     plt.xlabel(conf["xlabel"])
+    plt.ylim(0, conf["yaxismax"]*1.1)
     plt.legend(loc=conf["legLoc"])
     plt.savefig(conf["path"], bbox_inches="tight")
 
@@ -36,6 +40,10 @@ class Visualizor:
         for result in self.results:
             self.plotMissingSamples(result)
             self.plotProgress(result)
+            self.plotSentData(result)
+            self.plotRecvData(result)
+            self.plotDupData(result)
+            self.plotRowCol(result)
 
     def plotMissingSamples(self, result):
         """Plots the missing samples in the network"""
@@ -44,6 +52,7 @@ class Visualizor:
         conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
         +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
         conf["title"] = "Missing Samples"
+        conf["type"] = "plot"
         conf["legLoc"] = 1
         conf["desLoc"] = 1
         conf["colors"] = ["m-"]
@@ -53,6 +62,11 @@ class Visualizor:
         conf["data"] = [result.missingVector]
         conf["xdots"] = [x*self.config.stepDuration for x in range(len(result.missingVector))]
         conf["path"] = "results/"+self.execID+"/plots/missingSamples-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
         plotData(conf)
         print("Plot %s created." % conf["path"])
 
@@ -66,6 +80,7 @@ class Visualizor:
         conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
         +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
         conf["title"] = "Nodes/validators ready"
+        conf["type"] = "plot"
         conf["legLoc"] = 2
         conf["desLoc"] = 2
         conf["colors"] = ["g-", "b-", "r-"]
@@ -75,6 +90,130 @@ class Visualizor:
         conf["data"] = [vector1, vector2, vector3]
         conf["xdots"] = [x*self.config.stepDuration for x in range(len(vector1))]
         conf["path"] = "results/"+self.execID+"/plots/nodesReady-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
+        plotData(conf)
+        print("Plot %s created." % conf["path"])
+
+    def plotSentData(self, result):
+        """Plots the percentage of nodes ready in the network"""
+        vector1 = result.metrics["progress"]["TX builder mean"]
+        vector2 = result.metrics["progress"]["TX class1 mean"]
+        vector3 = result.metrics["progress"]["TX class2 mean"]
+        for i in range(len(vector1)):
+            vector1[i] = (vector1[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+            vector2[i] = (vector2[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+            vector3[i] = (vector3[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+        conf = {}
+        text = str(result.shape).split("-")
+        conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
+        +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
+        conf["title"] = "Sent data"
+        conf["type"] = "plot"
+        conf["legLoc"] = 2
+        conf["desLoc"] = 2
+        conf["colors"] = ["y-", "c-", "m-"]
+        conf["labels"] = ["Block Builder", "Solo stakers", "Staking pools"]
+        conf["xlabel"] = "Time (ms)"
+        conf["ylabel"] = "Bandwidth (MBits/s)"
+        conf["data"] = [vector1, vector2, vector3]
+        conf["xdots"] = [x*self.config.stepDuration for x in range(len(vector1))]
+        conf["path"] = "results/"+self.execID+"/plots/sentData-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
+        plotData(conf)
+        print("Plot %s created." % conf["path"])
+
+    def plotRecvData(self, result):
+        """Plots the percentage of nodes ready in the network"""
+        vector1 = result.metrics["progress"]["RX class1 mean"]
+        vector2 = result.metrics["progress"]["RX class2 mean"]
+        for i in range(len(vector1)):
+            vector1[i] = (vector1[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+            vector2[i] = (vector2[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+        conf = {}
+        text = str(result.shape).split("-")
+        conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
+        +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
+        conf["title"] = "Received data"
+        conf["type"] = "plot"
+        conf["legLoc"] = 2
+        conf["desLoc"] = 2
+        conf["colors"] = ["c-", "m-"]
+        conf["labels"] = ["Solo stakers", "Staking pools"]
+        conf["xlabel"] = "Time (ms)"
+        conf["ylabel"] = "Bandwidth (MBits/s)"
+        conf["data"] = [vector1, vector2]
+        conf["xdots"] = [x*self.config.stepDuration for x in range(len(vector1))]
+        conf["path"] = "results/"+self.execID+"/plots/recvData-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
+        plotData(conf)
+        print("Plot %s created." % conf["path"])
+
+    def plotDupData(self, result):
+        """Plots the percentage of nodes ready in the network"""
+        vector1 = result.metrics["progress"]["Dup class1 mean"]
+        vector2 = result.metrics["progress"]["Dup class2 mean"]
+        for i in range(len(vector1)):
+            vector1[i] = (vector1[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+            vector2[i] = (vector2[i] * 8 * (1000/self.config.stepDuration) * self.config.segmentSize) / 1000000
+        conf = {}
+        text = str(result.shape).split("-")
+        conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
+        +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
+        conf["title"] = "Duplicated data"
+        conf["type"] = "plot"
+        conf["legLoc"] = 2
+        conf["desLoc"] = 2
+        conf["colors"] = ["c-", "m-"]
+        conf["labels"] = ["Solo stakers", "Staking pools"]
+        conf["xlabel"] = "Time (ms)"
+        conf["ylabel"] = "Bandwidth (MBits/s)"
+        conf["data"] = [vector1, vector2]
+        conf["xdots"] = [x*self.config.stepDuration for x in range(len(vector1))]
+        conf["path"] = "results/"+self.execID+"/plots/dupData-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
+        plotData(conf)
+        print("Plot %s created." % conf["path"])
+
+    def plotRowCol(self, result):
+        """Plots the percentage of nodes ready in the network"""
+        vector1 = result.metrics["rowDist"]
+        vector2 = result.metrics["columnDist"]
+        conf = {}
+        text = str(result.shape).split("-")
+        conf["textBox"] = "Block Size: "+text[1]+"\nNumber of nodes: "+text[3]\
+        +"\nFailure rate: "+text[7]+" \nNetwork degree: "+text[23]+"\nX: "+text[11]+" rows/columns"
+        conf["title"] = "Row/Column distribution"
+        conf["type"] = "bar"
+        conf["legLoc"] = 2
+        conf["desLoc"] = 2
+        conf["colors"] = ["r+", "b+"]
+        conf["labels"] = ["Rows", "Columns"]
+        conf["xlabel"] = "Row/Column ID"
+        conf["ylabel"] = "Validators subscribed"
+        conf["data"] = [vector1, vector2]
+        conf["xdots"] = range(len(vector1))
+        conf["path"] = "results/"+self.execID+"/plots/RowColDist-"+str(result.shape)+".png"
+        maxi = 0
+        for v in conf["data"]:
+            if max(v) > maxi:
+                maxi = max(v)
+        conf["yaxismax"] = maxi
         plotData(conf)
         print("Plot %s created." % conf["path"])