Fix off-by-one error in heap extract experiments

prac/generate_raw_data_heap.sh

@@ -10,20 +10,8 @@ fi
 cd ..
 mkdir -p prac/data
 for itr in $(seq 1 $nitrs); do
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^16 ..."
-    ./docker/run-experiment 16 96 >> "prac/data/log_16_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^18 ..."
-    ./docker/run-experiment 18 108 >> "prac/data/log_18_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^20 ..."
-    ./docker/run-experiment 20 120 >> "prac/data/log_20_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^22 ..."
-    ./docker/run-experiment 22 132 >> "prac/data/log_22_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^24 ..."
-    ./docker/run-experiment 24 144 >> "prac/data/log_24_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^26 ..."
-    ./docker/run-experiment 26 156 >> "prac/data/log_26_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^28 ..."
-    ./docker/run-experiment 28 168 >> "prac/data/log_28_1_heap.out"
-    now=`date`; echo "$now: Running heap extract on heapsize of 2^30 ..."
-    ./docker/run-experiment 30 180 >> "prac/data/log_30_1_heap.out"
+    for size in 16 18 20 22 24 26 28 30; do
+        now=`date`; echo "$now: Running heap extract on heapsize of 2^${size} ..."
+        ./docker/run-experiment $size $((6*(size-1))) >> "prac/data/log_${size}_1_heap.out"
+    done
 done

prac/generate_raw_data_heap_const_db.sh

@@ -10,12 +10,8 @@ fi
 cd ..
 mkdir -p prac/data
 for itr in $(seq 1 $nitrs); do
-    now=`date`; echo "$now: Running 4 Heap Extracts ..."
-    ./docker/run-experiment 20 480 >> "prac/data/log_20_4_heap.out"
-    now=`date`; echo "$now: Running 8 Heap Extracts ..."
-    ./docker/run-experiment 20 960 >> "prac/data/log_20_8_heap.out"
-    now=`date`; echo "$now: Running 16 Heap Extracts ..."
-    ./docker/run-experiment 20 1920 >> "prac/data/log_20_16_heap.out"
-    now=`date`; echo "$now: Running 32 Heap Extracts ..."
-    ./docker/run-experiment 20 3840 >> "prac/data/log_20_32_heap.out"
+    for n in 4 8 16 32; do
+        now=`date`; echo "$now: Running $n Heap Extracts ..."
+        ./docker/run-experiment 20 $((n*19*6)) >> "prac/data/log_20_${n}_heap.out"
+    done
 done 

prac/repro

@@ -151,19 +151,19 @@ echo
 egrep 'CircuitORAMTotl read ([0-9]+) \1 .* KiB$' data/oram.dat | sort -k3 -n
 echo
 echo "# Figure 8(a)"
-egrep 'CircuitORAMOnln read 20 (480|960|1920|3840) .* s$' data/oram.dat | sort -k4 -n
+egrep 'CircuitORAMOnln read 20 (456|912|1824|3648) .* s$' data/oram.dat | sort -k4 -n
 echo
-egrep 'CircuitORAMTotl read 20 (480|960|1920|3840) .* s$' data/oram.dat | sort -k4 -n
+egrep 'CircuitORAMTotl read 20 (456|912|1824|3648) .* s$' data/oram.dat | sort -k4 -n
 echo
 echo "# Figure 8(b)"
-egrep 'CircuitORAMOnln read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* s$' data/oram.dat | sort -k3 -n
+egrep 'CircuitORAMOnln read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* s$' data/oram.dat | sort -k3 -n
 echo
-egrep 'CircuitORAMTotl read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* s$' data/oram.dat | sort -k3 -n
+egrep 'CircuitORAMTotl read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* s$' data/oram.dat | sort -k3 -n
 echo
 echo "# Figure 8(c)"
-egrep 'CircuitORAMOnln read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* KiB$' data/oram.dat | sort -k3 -n
+egrep 'CircuitORAMOnln read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* KiB$' data/oram.dat | sort -k3 -n
 echo
-egrep 'CircuitORAMTotl read (16 96|18 108|20 120|22 132|24 144|26 156|28 168|30 180) .* KiB$' data/oram.dat | sort -k3 -n
+egrep 'CircuitORAMTotl read (16 90|18 102|20 114|22 126|24 138|26 150|28 162|30 174) .* KiB$' data/oram.dat | sort -k3 -n
 echo
 echo "# End figures"