run zero handling experiment

brunorijsman · Jan 24, 2020 · 9a0f5eb · 9a0f5eb
1 parent 5c79162
commit 9a0f5eb
Show file tree

Hide file tree

Showing 8 changed files with 405 additions and 223 deletions.
diff --git a/study/data/zero_handling/data__algorithm=biconf;key_size=10000;error_rate=vary b/study/data/zero_handling/data__algorithm=biconf;key_size=10000;error_rate=vary
diff --git a/study/data/zero_handling/data__algorithm=biconf;key_size=1000;error_rate=vary b/study/data/zero_handling/data__algorithm=biconf;key_size=1000;error_rate=vary
diff --git a/study/data/zero_handling/data__algorithm=original;key_size=10000;error_rate=vary b/study/data/zero_handling/data__algorithm=original;key_size=10000;error_rate=vary
diff --git a/study/data/zero_handling/data__algorithm=original;key_size=1000;error_rate=vary b/study/data/zero_handling/data__algorithm=original;key_size=1000;error_rate=vary
diff --git a/study/experiments_papers.json b/study/experiments_papers.json
@@ -2,13 +2,12 @@
     {
         "independent_variable": "error_rate",
         "algorithm": "all",
-        "error_rate": {
-            "start": 0.00,
-            "end": 0.11,
-            "step_size": 0.001
-        },
+        "error_rate": [
+            {"start": 0.0000, "end": 0.0050, "step_size": 0.00005},
+            {"start": 0.0050, "end": 0.1100, "step_size": 0.00050}
+        ],
         "key_size": [1000, 2000, 10000],
-        "runs": 100
+        "runs": 1000
     },
     {
         "independent_variable": "key_size",
@@ -17,9 +16,9 @@
         "key_size": {
             "start": 1e3,
             "end": 1e5,
-            "step_factor": 1.1
+            "step_factor": 1.05
         },
-        "runs": 100
+        "runs": 1000
     },
     {
         "independent_variable": "key_size",
@@ -28,8 +27,8 @@
         "key_size": {
             "start": 1e3,
             "end": 1e5,
-            "step_factor": 1.1
+            "step_factor": 1.05
         },
-        "runs": 100
+        "runs": 1000
     }
 ]
diff --git a/study/experiments_zero_handling.json b/study/experiments_zero_handling.json
@@ -2,12 +2,11 @@
     {
         "independent_variable": "error_rate",
         "algorithm": ["original", "biconf"],
-        "error_rate": {
-            "start": 0.00,
-            "end": 0.005,
-            "step_size": 0.00005
-        },
-        "key_size": 1000,
+        "error_rate": [
+            {"start": 0.000, "end": 0.005, "step_size": 0.00005},
+            {"start": 0.005, "end": 0.050, "step_size": 0.00050}
+        ],
+        "key_size": 10000,
         "runs": 100
     }
 ]
diff --git a/study/graphs_zero_handling.json b/study/graphs_zero_handling.json
@@ -8,17 +8,18 @@
         },
         "y_axis": {
             "title": "Efficiency",
-            "variable": "unrealistic_efficiency"
+            "variable": "unrealistic_efficiency",
+            "range": [0.5, 2.0]
         },
         "series": [
             {
-                "data_file": "data__algorithm=original;key_size=1000;error_rate=vary",
+                "data_file": "data__algorithm=original;key_size=10000;error_rate=vary",
                 "legend": "original",
                 "line_color": "black",
                 "deviation_color": "lightgray"
             },
             {
-                "data_file": "data__algorithm=biconf;key_size=1000;error_rate=vary",
+                "data_file": "data__algorithm=biconf;key_size=10000;error_rate=vary",
                 "legend": "biconf",
                 "line_color": "red",
                 "deviation_color": "lightsalmon"

diff --git a/study/run_experiments.py b/study/run_experiments.py
@@ -82,7 +82,10 @@ def make_list(value, do_round=False):
     if isinstance(value, (int, float, str)):
         return [value]
     if isinstance(value, list):
-        return value
+        result = []
+        for item in value:
+            result += make_list(item)
+        return result
     if isinstance(value, dict):
         start = value['start']
         end = value['end']
@@ -151,7 +154,7 @@ def report_data_point_done(data_point):
     print(f"data_point={DATA_POINTS_PROCESSED}/{TOTAL_NR_DATA_POINTS} "
           f"algorithm={data_point.algorithm_name} "
           f"key_size={data_point.key_size} "
-          f"error_rate={data_point.requested_bit_error_rate:.4f} "
+          f"error_rate={data_point.requested_bit_error_rate:.6f} "
           f"runs={data_point.reconciliations}")
 
 def produce_data_point(reconciliation_params):