Update protocol generation and table creation

benchmarks/generate_protocols.sh

@@ -33,7 +33,7 @@ done
 # Remainder
 echo "generating remainder protocols"
 mkdir -p $benchmark_dir/$protocols_dir/remainder
-for m in 2 3 4 5 6 7 8 9 10 20 25 30 35 40 45 50 55 60 70 80 90 100 110 120 130 140 150; do
+for m in 2 3 4 5 6 7 8 9 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 90 100 110 120 130 140 150; do
     for c in 1; do
         $executable moduloPP $m $c >$benchmark_dir/$protocols_dir/remainder/remainder_m${m}_c${c}_.pp
     done
@@ -42,7 +42,7 @@ done
 # Flock of Birds from Chatzigianniks, Michail, Spirakis: Algorithmic verification of population protocols
 echo "generating flockofbirds protocols"
 mkdir -p $benchmark_dir/$protocols_dir/flockofbirds
-for c in 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150; do
+for c in 10 15 20 25 30 35 40 45 50 55 60 65 70 80 90 100 110 120 130 140 150; do
     $executable flockOfBirdsPP $c >$benchmark_dir/$protocols_dir/flockofbirds/flockofbirds_c${c}_.pp
 done
 
@@ -64,7 +64,7 @@ done
 # Tower Flock of Birds
 echo "generating tower flock of birds protocols"
 mkdir -p $benchmark_dir/$protocols_dir/towerflockofbirds
-for c in 50 100 150 200 250 350 400 425 450 475 500 525 550 575 600; do
+for c in 25 50 75 100 125 150 175 200 225 250 275 300 325 350 375 400 425 450 475 500 525 550 575 600; do
     python python/execprotocol.py python/flock_of_birds_-_tower.py "{\"scheme\": { \"c\": { \"value\": ${c} } } }" >$benchmark_dir/$protocols_dir/towerflockofbirds/towerflockofbirds_c${c}_.pp
 done
 
@@ -72,7 +72,8 @@ done
 echo "generating average and conquer protocol"
 mkdir -p $benchmark_dir/$protocols_dir/avc
 n_lower=2
-for m in 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 46 51 56 61 66 71 76 81 86 91 96 101; do
+#for m in 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 45 51 55 61 65 71 75 81 85 91 95 101; do
+for m in 15 25 35 45 55 65 75 85 95 105; do
     n_upper=10000000
 ##     while [[ $(($n_upper - $n_lower)) -gt 1 ]]; do
 ##         n=$(((n_upper + n_lower) / 2))

benchmarks/make_table.py

@@ -26,7 +26,7 @@ if len(sys.argv) >= 2:
                 print("unknown argument: %s" % arg, file=sys.stderr)
                 sys.exit(-1)
         else:
-            results_file = sys.argv[1]
+            results_file = arg
 
 # long table
 
@@ -136,7 +136,6 @@ if long_table:
 # short table
 
 if short_table:
-    results_file='results.csv'
 
     results = pd.read_csv(results_file)