Merge pull request #1 from AAU-Dat/Maltesius-patch-1

Update AarhusShuffle.py

Author: Maltesius

AarhusShuffle.py

@@ -1,6 +1,7 @@
 import random
 import numpy as np
 
+
 def honest_shuffle(ciphertexts, water, indices, active_set):
     """Fair shuffle and average water among active cups only."""
     active_indices = [i for i in indices if i in active_set]
@@ -10,20 +11,22 @@ def honest_shuffle(ciphertexts, water, indices, active_set):
     for i in active_indices:
         water[i] = average
 
-    #waterclone = water.copy()
+    # waterclone = water.copy()
 
     # Shuffle ciphertexts
     sublist = [ciphertexts[i] for i in indices]
     random.shuffle(sublist)
     for idx, val in zip(indices, sublist):
         ciphertexts[idx] = val
-        #water[idx] = waterclone[val]
+        # water[idx] = waterclone[val]
+
 
 def adversarial_shuffle(ciphertexts, water, indices):
     """Adversarial shuffler does nothing."""
     pass
 
-def distributed_shuffle_with_water(n, k, T, beta, alpha):
+
+def distributed_shuffle_with_water(n, k, T, alpha):
     ciphertexts = list(range(0, n))
     water = [0.0] * n
     water[0] = 1.0  # Initial water in cup 0
@@ -32,7 +35,7 @@ def distributed_shuffle_with_water(n, k, T, beta, alpha):
     threshold = 2 / (n - alpha)
 
     res = []
-    while True:  #for t in range(T):
+    while True:
 
         indices = random.sample(range(n), k)
         honest_shuffle(ciphertexts, water, indices, active_set)
@@ -45,25 +48,39 @@ def distributed_shuffle_with_water(n, k, T, beta, alpha):
 
     return res
 
+    # Return True if successful
 
-      # Return True if successful
 
 # Run 100 trials
-def run_experiments(num_trials=100, n=16384, k=128, T=8192, beta=7112, alpha=8192):
+def run_experiments(num_trials=1000, n=16384, k=128, T=8192, alpha=8192):
     successes = 0
     result = [[] for i in range(num_trials)]
     for i in range(num_trials):
-        res = distributed_shuffle_with_water(n, k, T, beta, alpha)
-        for j,elem in enumerate(res):
+        res = distributed_shuffle_with_water(n, k, T, alpha)
+        for j, elem in enumerate(res):
             result[i].append(elem)
 
     first_success_indices = [lst.index("success") for lst in result]
 
-    pcts = [20,40,60,80,100]
+    pcts = [20, 40, 60, 80, 100]
 
     ps = np.percentile(first_success_indices, pcts, method='nearest').astype(int)
 
+    res = ""
     for p, idx in zip(pcts, ps):
-        print(f"{p}% of runs have succeeded by step {idx}")
+        res += str(idx) + ","
+    with open("results.txt", "a") as f:
+        f.write(f"{k},{alpha}," + res + "\n")
+
+
+def benchmark_run():
+    with open("results.txt", "a") as f:
+        f.write("k,alpha,20pt,40pt,60pt,80pt,100pt,\n")
+    for k in range(64, 129):
+        for alpha in [4096, 5462, 8192]:
+            run_experiments(k=k, alpha=alpha)
+
+
 if __name__ == "__main__":
-    run_experiments()
+    # run_experiments()
+    benchmark_run()