Change benchmark script to test log flock of birds up to large c

benchmarks/generate_protocols.sh

@@ -7,43 +7,63 @@ protocols_dir='protocols'
 mkdir -p $benchmark_dir/$protocols_dir
 
 # majority
-echo "generating majority protocol"
-mkdir -p $benchmark_dir/$protocols_dir/majority
-$executable majorityPP >$benchmark_dir/$protocols_dir/majority/majority_m1_.pp
+#echo "generating majority protocol"
+#mkdir -p $benchmark_dir/$protocols_dir/majority
+#$executable majorityPP >$benchmark_dir/$protocols_dir/majority/majority_m1_.pp
 
 # broadcast
-echo "generating broadcast protocol"
-mkdir -p $benchmark_dir/$protocols_dir/broadcast
-$executable broadCastPP >$benchmark_dir/$protocols_dir/broadcast/broadcast_m1_.pp
+#echo "generating broadcast protocol"
+#mkdir -p $benchmark_dir/$protocols_dir/broadcast
+#$executable broadCastPP >$benchmark_dir/$protocols_dir/broadcast/broadcast_m1_.pp
 
 # threshold
-echo "generating threshold protocols"
-mkdir -p $benchmark_dir/$protocols_dir/threshold
-for l in 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-    for c in 1; do
-        $executable oldThresholdPP $l $c >$benchmark_dir/$protocols_dir/threshold/threshold_l${l}_c${c}_.pp
-    done
-done
+#echo "generating threshold protocols"
+#mkdir -p $benchmark_dir/$protocols_dir/threshold
+#for l in 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+#    for c in 1; do
+#        $executable oldThresholdPP $l $c >$benchmark_dir/$protocols_dir/threshold/threshold_l${l}_c${c}_.pp
+#    done
+#done
 
 # modulo
-echo "generating modulo protocols"
-mkdir -p $benchmark_dir/$protocols_dir/modulo
-for m in 2 3 4 5 6 7 8 9 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150; do
-    for c in 1; do
-        $executable moduloPP $m $c >$benchmark_dir/$protocols_dir/modulo/modulo_m${m}_c${c}_.pp
-    done
-done
+#echo "generating modulo protocols"
+#mkdir -p $benchmark_dir/$protocols_dir/modulo
+#for m in 2 3 4 5 6 7 8 9 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150; do
+#    for c in 1; do
+#        $executable moduloPP $m $c >$benchmark_dir/$protocols_dir/modulo/modulo_m${m}_c${c}_.pp
+#    done
+#done
 
 # flock of birds
-echo "generating flockofbirds protocols"
-mkdir -p $benchmark_dir/$protocols_dir/flockofbirds
-for c in 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100; do
-    $executable flockOfBirdsPP $c >$benchmark_dir/$protocols_dir/flockofbirds/flockofbirds_c${c}_.pp
-done
+#echo "generating flockofbirds protocols"
+#mkdir -p $benchmark_dir/$protocols_dir/flockofbirds
+#for c in 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100; do
+#    $executable flockOfBirdsPP $c >$benchmark_dir/$protocols_dir/flockofbirds/flockofbirds_c${c}_.pp
+#done
 
 # new birds
-echo "generating newbirds protocols"
-mkdir -p $benchmark_dir/$protocols_dir/newbirds
-for c in 10 20 25 30 40 50 75 100 125 150 175 200 225 250 275 300 325 350; do
-    $executable newBirdsPP $c >$benchmark_dir/$protocols_dir/newbirds/newbirds_c${c}_.pp
+#echo "generating newbirds protocols"
+#mkdir -p $benchmark_dir/$protocols_dir/newbirds
+#for c in 10 20 25 30 40 50 75 100 125 150 175 200 225 250 275 300 325 350; do
+#    $executable newBirdsPP $c >$benchmark_dir/$protocols_dir/newbirds/newbirds_c${c}_.pp
+#done
+
+# efficient threshold
+#echo "generating efficient threshold protocols"
+#mkdir -p $benchmark_dir/$protocols_dir/effthreshold
+#for c in 10 100 1000 1000 10000 100000 1000000 10000000 100000000; do
+#for c in 10000 20000 25000 40000 50000 60000 70000 80000 90000 100000; do
+#    $executable effThresholdPP $c >$benchmark_dir/$protocols_dir/effthreshold/effthreshold_c${c}_.pp
+#done
+
+# log-birds protocol
+echo "generating efficient threshold protocols"
+mkdir -p $benchmark_dir/$protocols_dir/logbirds
+for exp in $(seq 33 50); do
+    c="1"
+    for i in $(seq 1 $exp); do
+        c=${c}"0"
+    done
+    echo "Generating protocol for c = $c"
+    $executable logFlockOfBirdsPP $c >$benchmark_dir/$protocols_dir/logbirds/logbirds_c${c}_.pp
 done

benchmarks/run_benchmarks.sh

@@ -44,7 +44,18 @@ for protocol_dir in $(find $protocols_dir -mindepth 1 -maxdepth 1 -type d); do
 
     mkdir -p $out_dir/$protocol
     timeout_reached='false'
-    for param in $(seq 1 1000); do
+    params=()
+    for param in $(seq 1 10000); do
+        params+=($param)
+    done
+    for exp in $(seq 6 50); do
+        c="1"
+        for i in $(seq 1 $exp); do
+            c=${c}"0"
+        done
+        params+=($c)
+    done
+    for param in ${params[@]}; do
         if [ $timeout_reached == 'false' ]; then
             for filename in $(find $protocol_dir -mindepth 1 -maxdepth 1 -name "${protocol}_?${param}_*.$extension"); do
                 file=$(basename $filename)