updated plots for thesis following Urs' feedback

prsona/plt/plots.json

@@ -7,32 +7,12 @@
         "whichGraph": "overall_epoch_cpu",
         "xLabel": "Number of clients",
         "yLabel": "CPU time per server to calculate an epoch (s)",
-        "title": "Comparing CPU time for covert security\nepoch calculations across workloads",
-        "fileNameStr": "epoch-workloads-cpu-2-50",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["", "2", "", "50"],
-        "lineVariable": "workload",
-        "xVariable": "numClients",
-        "whichGraph": "overall_epoch_cpu",
-        "xLabel": "Number of clients",
-        "yLabel": "CPU time per server to calculate an epoch (s)",
+        "yLim": [0.2, 5000],
         "loglog": true,
         "title": "Comparing CPU time for covert security\nepoch calculations across workloads (in log-log)",
         "fileNameStr": "epoch-workloads-cpu-2-50-loglog",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["", "2", "", "0"],
-        "lineVariable": "workload",
-        "xVariable": "numClients",
-        "whichGraph": "overall_epoch_cpu",
-        "xLabel": "Number of clients",
-        "yLabel": "CPU time per server to calculate an epoch (s)",
-        "title": "Comparing CPU time for HbC security\nepoch calculations across workloads",
-        "fileNameStr": "hbc-epoch-workloads-cpu-2-0",
-        "legendLoc": "upper left"
+        "legendLoc": "lower right",
+        "legendBBoxAnchor": [1,0]
     }, {
         "data": "server",
         "dataParts": ["", "2", "", "0"],
@@ -41,6 +21,7 @@
         "whichGraph": "overall_epoch_cpu",
         "xLabel": "Number of clients",
         "yLabel": "CPU time per server to calculate an epoch (s)",
+        "yLim": [0.2, 5000],
         "loglog": true,
         "title": "Comparing CPU time for HbC security\nepoch calculations across workloads (in log-log)",
         "fileNameStr": "hbc-epoch-workloads-cpu-2-0-loglog",
@@ -53,35 +34,13 @@
         "whichGraph": "overall_epoch_total",
         "xLabel": "Number of clients",
         "yLabel": "Server-to-server outgoing bandwidth per\nserver used to calculate an epoch (MB)",
-        "yUnit": "MB",
-        "title": "Comparing bandwidth for covert security\nepoch calculations across workloads",
-        "fileNameStr": "epoch-workloads-bandwidth-2-50",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["", "2", "", "50"],
-        "lineVariable": "workload",
-        "xVariable": "numClients",
-        "whichGraph": "overall_epoch_total",
-        "xLabel": "Number of clients",
-        "yLabel": "Server-to-server outgoing bandwidth per\nserver used to calculate an epoch (MB)",
+        "yLim": [0.02, 1500],
         "yUnit": "MB",
         "loglog": true,
         "title": "Comparing bandwidth for covert security\nepoch calculations across workloads (in log-log)",
         "fileNameStr": "epoch-workloads-bandwidth-2-50-loglog",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["", "2", "", "0"],
-        "lineVariable": "workload",
-        "xVariable": "numClients",
-        "whichGraph": "overall_epoch_total",
-        "xLabel": "Number of clients",
-        "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
-        "yUnit": "MB",
-        "title": "Comparing bandwidth for HbC security\nepoch calculations across workloads",
-        "fileNameStr": "hbc-epoch-workloads-bandwidth-2-0",
-        "legendLoc": "upper left"
+        "legendLoc": "lower right",
+        "legendBBoxAnchor": [1,0]
     }, {
         "data": "server",
         "dataParts": ["", "2", "", "0"],
@@ -90,76 +49,12 @@
         "whichGraph": "overall_epoch_total",
         "xLabel": "Number of clients",
         "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
+        "yLim": [0.02, 1500],
         "yUnit": "MB",
         "loglog": true,
         "title": "Comparing bandwidth for HbC security\nepoch calculations across workloads (in log-log)",
         "fileNameStr": "hbc-epoch-workloads-bandwidth-2-0-loglog",
         "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["half", "", "", "50"],
-        "lineVariable": "numServers",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_cpu",
-        "xLabel": "Number of clients",
-        "yLabel": "CPU time per server to calculate an epoch (s)",
-        "title": "Comparing CPU time for covert security\nepoch calculations across numbers of servers",
-        "fileNameStr": "epoch-servers-cpu-any-50",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["half", "", "", "50"],
-        "lineVariable": "numServers",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_cpu",
-        "xLabel": "Number of clients",
-        "yLabel": "CPU time per server to calculate an epoch (s)",
-        "loglog": true,
-        "title": "Comparing CPU time for covert security\nepoch calculations across numbers of servers (in log-log)",
-        "fileNameStr": "epoch-servers-cpu-any-50-loglog",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["half", "", "", "50"],
-        "lineVariable": "numServers",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_total",
-        "xLabel": "Number of clients",
-        "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
-        "yUnit": "MB",
-        "title": "Comparing bandwidth for covert security\nepoch calculations across numbers of servers",
-        "fileNameStr": "epoch-servers-bandwidth-any-50",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["half", "", "", "50"],
-        "lineVariable": "numServers",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_total",
-        "xLabel": "Number of clients",
-        "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
-        "yUnit": "MB",
-        "loglog": true,
-        "title": "Comparing bandwidth for covert security\nepoch calculations across numbers of servers (in log-log)",
-        "fileNameStr": "epoch-servers-bandwidth-any-50-loglog",
-        "legendLoc": "upper left"
-    }, {
-
-        "data": "server",
-        "dataParts": ["all", "2", "", ""],
-        "lineVariable": "lambda",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_cpu",
-        "xLabel": "Number of clients",
-        "yLabel": "CPU time per server to calculate an epoch (s)",
-        "title": "Comparing CPU time for covert security\nepoch calculations across different values of lambda",
-        "fileNameStr": "epoch-lambda-cpu-all-2",
-        "legendLoc": "upper left"
     }, {
         "data": "server",
         "dataParts": ["all", "2", "", ""],
@@ -169,23 +64,12 @@
         "whichGraph": "overall_epoch_cpu",
         "xLabel": "Number of clients",
         "yLabel": "CPU time per server to calculate an epoch (s)",
+        "yLim": [0.2, 5000],
         "loglog": true,
         "title": "Comparing CPU time for covert security\nepoch calculations across different values of lambda\n(in log-log)",
         "fileNameStr": "epoch-lambda-cpu-all-2-loglog",
-        "legendLoc": "upper left"
-    }, {
-        "data": "server",
-        "dataParts": ["all", "2", "", ""],
-        "lineVariable": "lambda",
-        "xVariable": "numClients",
-        "ignoreWorkload": true,
-        "whichGraph": "overall_epoch_total",
-        "xLabel": "Number of clients",
-        "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
-        "yUnit": "MB",
-        "title": "Comparing bandwidth for covert security\nepoch calculations across different values of lambda",
-        "fileNameStr": "epoch-lambda-bandwidth-all-2",
-        "legendLoc": "upper left"
+        "legendLoc": "lower right",
+        "legendBBoxAnchor": [1,0]
     }, {
         "data": "server",
         "dataParts": ["all", "2", "", ""],
@@ -195,13 +79,14 @@
         "whichGraph": "overall_epoch_total",
         "xLabel": "Number of clients",
         "yLabel": "Server-to-server bandwidth per server\nused to calculate an epoch (MB)",
+        "yLim": [0.02, 1500],
         "yUnit": "MB",
         "loglog": true,
         "title": "Comparing bandwidth for covert security\nepoch calculations across different values of lambda\n(in log-log)",
         "fileNameStr": "epoch-lambda-bandwidth-all-2-loglog",
-        "legendLoc": "upper left"
+        "legendLoc": "lower right",
+        "legendBBoxAnchor": [1,0]
     }, {
-
         "data": "client",
         "dataParts": ["vote", "2", "", "50"],
         "lineVariable": "lambda",
@@ -219,13 +104,12 @@
         "xVariable": "numClients",
         "whichGraph": "vote_sent",
         "xLabel": "Number of clients",
-        "yLabel": "Client-to-server bandwidth\nused to make a new vote row (KB)",
+        "yLabel": "Size of proof used when\nmaking a new vote row (KB)",
         "yUnit": "KB", 
-        "title": "Measuring bandwidth for making vote rows\n(in linear scale)",
+        "title": "Measuring proof size for making vote rows\n(in linear scale)",
         "fileNameStr": "vote-lambda-bandwidth-2",
         "legendLoc": "upper left"
     }, {
-
         "data": "client",
         "dataParts": ["rep", "2", "", "50"],
         "lineVariable": "lambda",
@@ -244,9 +128,9 @@
         "xVariable": "numClients",
         "whichGraph": "rep_prove_sent",
         "xLabel": "Number of clients",
-        "yLabel": "Client-to-client bandwidth\nused to make a new reputation proof (KB)",
+        "yLabel": "Size of proof used when\nmaking a new reputation proof (KB)",
         "yUnit": "KB", 
-        "title": "Measuring bandwidth for making reputation proofs\n(in linear scale)",
+        "title": "Measuring proof size for making reputation proofs\n(in linear scale)",
         "fileNameStr": "rep_prove-lambda-bandwidth-2",
         "legendLoc": "lower right",
         "legendBBoxAnchor": [1, 0]
@@ -263,18 +147,5 @@
         "fileNameStr": "rep_verify-lambda-cpu-2",
         "legendLoc": "lower right",
         "legendBBoxAnchor": [1, 0]
-    }, {
-        "data": "client",
-        "dataParts": ["rep", "2", "", "50"],
-        "lineVariable": "lambda",
-        "xVariable": "numClients",
-        "whichGraph": "rep_verify_recv",
-        "xLabel": "Number of clients",
-        "yLabel": "Client-to-client bandwidth\nused to verify a new reputation proof (KB)",
-        "yUnit": "KB", 
-        "title": "Measuring bandwidth for verifying reputation proofs\n(in linear scale)",
-        "fileNameStr": "rep_verify-lambda-bandwidth-2",
-        "legendLoc": "lower right",
-        "legendBBoxAnchor": [1, 0]
     }
 ]

prsona/scripts/make_graphs.py

@@ -408,7 +408,7 @@ def plotComparison(data, dataParts, xVariable, lineVariable, whichGraph, **kwarg
         ignoreWorkload = False
     elif lineVariable == 'numServers':
         whichLines = 1
-        lineSelection = [int(x) for x in data['no'].keys()]
+        lineSelection = [int(x) for x in data['all'].keys()]
         lineSelection.sort()
     elif lineVariable == 'numClients':
         whichLines = 2