Merge d3fa4706aef2309b8a7b3d96c154c321389bcf82 into f36c3c85ba31ed0fd27c3650794a511ad994a661

DAS/requirements.txt

@@ -6,3 +6,4 @@ networkx==3.0
 numpy==1.23.5
 seaborn==0.13.0
 joblib==1.2.0
+pillow==10.2.0

DAS/simulator.py

@@ -271,6 +271,7 @@ class Simulator:
         missingVector = []
         progressVector = []
         trafficStatsVector = []
+        stepCustodyCountsRow, stepCustodyCountsCol = [], [] # Count of custody in each step
         malicious_nodes_not_added_count = 0
         steps = 0
 
@@ -279,6 +280,7 @@ class Simulator:
             self.logger.debug("Expected Samples: %d" % expected, extra=self.format)
             self.logger.debug("Missing Samples: %d" % missingSamples, extra=self.format)
             oldMissingSamples = missingSamples
+            custodyCountsRow, custodyCountsCol = [[], []], [[], []] # Count of custody of current step
             self.logger.debug("PHASE SEND %d" % steps, extra=self.format)
             for i in range(0,self.shape.numberNodes):
                 if not self.validators[i].amImalicious:
@@ -294,7 +296,24 @@ class Simulator:
             for i in range(0,self.shape.numberNodes):
                 self.validators[i].logRows()
                 self.validators[i].logColumns()
-
+            self.logger.debug("PHASE CUSTODY %d" % steps, extra=self.format)
+            for i in range(0,self.shape.numberNodes):
+                if not self.validators[i].amIproposer:
+                    nodeType = 0 if i < (self.shape.numberNodes * self.shape.class1ratio) else 1
+                    _count = 0
+                    for id in self.validators[i].columnIDs:
+                        line = self.validators[i].getColumn(id)
+                        if line.count(1) == len(line): _count += 1
+                    custodyCountsCol[nodeType].append(_count)
+                    _count = 0
+                    for id in self.validators[i].rowIDs:
+                        line = self.validators[i].getRow(id)
+                        if line.count(1) == len(line): _count += 1
+                    custodyCountsRow[nodeType].append(_count)
+            
+            stepCustodyCountsRow.append(custodyCountsRow)
+            stepCustodyCountsCol.append(custodyCountsCol)
+            
             # log TX and RX statistics
             trafficStats = self.glob.getTrafficStats(self.validators)
             self.logger.debug("step %d: %s" %
@@ -352,6 +371,10 @@ class Simulator:
                 missingVector.append(missingSamples)
                 break
             steps += 1
+        
+        # adding custody stats in result
+        self.result.addMetric("rowCustody", stepCustodyCountsRow)
+        self.result.addMetric("colCustody", stepCustodyCountsCol)
 
 
         for i in range(0,self.shape.numberNodes):

DAS/visualizor.py

@@ -5,6 +5,7 @@ import seaborn as sns
 import numpy as np
 import os
 import pandas as pd
+from PIL import Image
 
 def plotData(conf):
     plt.clf()
@@ -161,9 +162,101 @@ class Visualizor:
             self.plotECDFRestoreRowCount(result, plotPath)
             self.plotECDFRestoreColumnCount(result, plotPath)
             if self.config.saveRCdist:
-                self.plotECDFRowColDist(result, plotPath)        
+                self.plotECDFRowColDist(result, plotPath)
-
+            
-
+            self.plotCustodyStatsCol(result, plotPath)
+            self.plotCustodyStatsRow(result, plotPath)
+    
+    def plotCustodyStatsCol(self, result, plotPath):
+        """line plot of col custody requirement fulfilled in each step"""
+        types = ["Type 1", "Type 2"]
+        colCustody = result.metrics["colCustody"]
+        
+        for i in range(2):
+            medians = [np.median(l[i]) for l in colCustody]
+            q25s = [np.percentile(l[i], 25) for l in colCustody]
+            q75s = [np.percentile(l[i], 75) for l in colCustody]
+            
+            plt.clf()
+            conf = {}
+            conf["type"] = "plot"
+            attrbs = self.__get_attrbs__(result)
+            conf["textBox"] = "Row Size (N, K): "+attrbs['bsrn']+ ", "+attrbs['bsrk']\
+            +"\nColumn Size: (N, K): "+attrbs['bscn']+ ", "+attrbs['bsck']\
+            +"\nNumber of nodes: "+attrbs['nn']+"\nFailure rate: "+attrbs['fr']+"\nMalicious Node: "+attrbs['mn']+"\nNetwork degree: "+attrbs['nd']\
+            +"\nCustody Rows: "+attrbs['cusr']+"\nCustody Cols: "+attrbs['cusc']+"\nCustody 1: "+attrbs['vpn1']+"\nCustody 2: "+attrbs['vpn2']
+            conf["title"] = f"Column Custody Requirements Fulfilled ({types[i]})"
+            conf["xlabel"] = "Time (ms)"
+            conf["ylabel"] = "Custody Fulfilled"
+            conf["labels"] = ["Median", "Quartile (25%)", "Quartile (75)%"]
+            conf["colors"] = ["g-", "b-", "r-"]
+            conf["legLoc"] = 2
+            conf["path"] = plotPath + f"/temp_custodyStatCol_{i}.png"
+            conf['data'] = [medians, q25s, q75s]
+            conf["xdots"] = [x * self.config.stepDuration for x in range(len(medians))]
+            maxi = 0
+            for v in conf["data"]:
+                if np.nanmax(v) > maxi:
+                    maxi = max(v)
+            conf["yaxismax"] = maxi
+            
+            plotData(conf)
+        
+        ims = []
+        for i in range(2):
+            ims.append(Image.open(plotPath + f"/temp_custodyStatCol_{i}.png"))
+            os.remove(plotPath + f"/temp_custodyStatCol_{i}.png")
+        im = Image.new('RGB', (max(ims[0].width, ims[1].width), ims[0].height + ims[1].height))
+        im.paste(ims[0], (0, 0))
+        im.paste(ims[1], (0, ims[0].height))
+        im.save(plotPath + f"/custodyStatCol.png")
+        print("Plot %s created." % conf["path"])
+    
+    def plotCustodyStatsRow(self, result, plotPath):
+        """line plot of row custody requirement fulfilled in each step"""
+        types = ["Type 1", "Type 2"]
+        rowCustodys = result.metrics["rowCustody"]
+        
+        for i in range(2):
+            medians = [np.median(l[i]) for l in rowCustodys]
+            q25s = [np.percentile(l[i], 25) for l in rowCustodys]
+            q75s = [np.percentile(l[i], 75) for l in rowCustodys]
+            
+            plt.clf()
+            conf = {}
+            conf["type"] = "plot"
+            attrbs = self.__get_attrbs__(result)
+            conf["textBox"] = "Row Size (N, K): "+attrbs['bsrn']+ ", "+attrbs['bsrk']\
+            +"\nColumn Size: (N, K): "+attrbs['bscn']+ ", "+attrbs['bsck']\
+            +"\nNumber of nodes: "+attrbs['nn']+"\nFailure rate: "+attrbs['fr']+"\nMalicious Node: "+attrbs['mn']+"\nNetwork degree: "+attrbs['nd']\
+            +"\nCustody Rows: "+attrbs['cusr']+"\nCustody Cols: "+attrbs['cusc']+"\nCustody 1: "+attrbs['vpn1']+"\nCustody 2: "+attrbs['vpn2']
+            conf["title"] = f"Row Custody Requirements Fulfilled ({types[i]})"
+            conf["xlabel"] = "Time (ms)"
+            conf["ylabel"] = "Custody Fulfilled"
+            conf["labels"] = ["Median", "Quartile (25%)", "Quartile (75)%"]
+            conf["colors"] = ["g-", "b-", "r-"]
+            conf["legLoc"] = 2
+            conf["path"] = plotPath + f"/temp_custodyStatRow_{i}.png"
+            conf['data'] = [medians, q25s, q75s]
+            conf["xdots"] = [x * self.config.stepDuration for x in range(len(medians))]
+            maxi = 0
+            for v in conf["data"]:
+                if np.nanmax(v) > maxi:
+                    maxi = max(v)
+            conf["yaxismax"] = maxi
+            
+            plotData(conf)
+        
+        ims = []
+        for i in range(2):
+            ims.append(Image.open(plotPath + f"/temp_custodyStatRow_{i}.png"))
+            os.remove(plotPath + f"/temp_custodyStatRow_{i}.png")
+        im = Image.new('RGB', (max(ims[0].width, ims[1].width), ims[0].height + ims[1].height))
+        im.paste(ims[0], (0, 0))
+        im.paste(ims[1], (0, ims[0].height))
+        im.save(plotPath + f"/custodyStatRow.png")
+        print("Plot %s created." % conf["path"])
+    
     def plotBoxRestoreRowCount(self, result, plotPath):
         """Box Plot of restoreRowCount for all nodes"""
         plt.clf()