Bladeren bron

changes to repro scripts

user avadapal 9 maanden geleden
bovenliggende
commit
6885bb524e
6 gewijzigde bestanden met toevoegingen van 134 en 117 verwijderingen
  1. 6 5
      online.cpp
  2. 74 76
      repro/generate_raw_data.sh
  3. 8 8
      repro/generate_raw_data_bs.sh
  4. 29 22
      repro/generate_raw_data_const_db.sh
  5. 16 5
      repro/reproduce_plots
  6. 1 1
      repro/reproduce_plots_bs

+ 6 - 5
online.cpp

@@ -1258,7 +1258,7 @@ static void bsearch_test(MPCIO &mpcio,
         mpcio.reset_stats();
         tio.reset_lamport();
         // Create a random database and sort it
-        // size_t &aes_ops = tio.aes_ops();
+        //size_t &aes_ops = tio.aes_ops();
         Duoram<RegAS> oram(tio.player(), len);
         auto A = oram.flat(tio, yield);
         A.explicitonly(true);
@@ -1266,15 +1266,16 @@ static void bsearch_test(MPCIO &mpcio,
         std::vector<coro_t> coroutines;
         for (address_t i=0; i<len; ++i) {
             coroutines.emplace_back(
-                [&A, i](yield_t &yield) {
+                [&A, i, &tio](yield_t &yield) {
                     auto Acoro = A.context(yield);
                     RegAS v;
-                    v.randomize(62);
-                    Acoro[i] += v;
+                    //v.randomize(62);
+                    v.ashare = tio.player() * i;
+		    Acoro[i] = v;
                 });
         }
         run_coroutines(yield, coroutines);
-        A.bitonic_sort(0, len);
+        //A.bitonic_sort(0, len);
         A.explicitonly(false);
 
         tio.sync_lamport();

+ 74 - 76
repro/generate_raw_data.sh

@@ -11,7 +11,7 @@ for itr in $(seq 1 $nitrs); do
     ./docker/run-experiment heap -m 16 -d 16 -i 0 -e 1 -opt 0 -s 0 -itr itr >> "repro/data/log_basic_heap_extract_online_16_itr_$itr"
     echo "preprocessing_heap_16 (basic online) - iteration $itr"
 done    
-  
+ 
 nitrs=10
 for itr in $(seq 1 $nitrs); do
     echo "heapsize: 18\nis_optimized: 0\n" > 		            "repro/data/log_basic_heap_extract_preproc_18_itr_$itr"	
@@ -42,7 +42,7 @@ for itr in $(seq 1 $nitrs); do
    echo "preprocessing_heap_22 (basic online)"
 done
 
-nitrs=10
+nitrs=5
 for itr in $(seq 1 $nitrs); do
   echo "heapsize: 24\nis_optimized: 0\n" > "repro/data/log_basic_heap_extract_preproc_24_itr_$itr"
   ./docker/run-experiment -p m:69 a:23 s:22 r24:132 c:46 >>  "repro/data/log_basic_heap_extract_preproc_24_itr_$itr"
@@ -52,7 +52,7 @@ for itr in $(seq 1 $nitrs); do
   echo "preprocessing_heap_24 (basic online)"
 done
 
-nitrs=0
+nitrs=5
 for itr in $(seq 1 $nitrs); do
   echo "heapsize: 26\nis_optimized: 0\n" > "repro/data/log_basic_heap_extract_preproc_26_itr_$itr"
   ./docker/run-experiment -p m:75 a:25 s:24 r26:100 c:50 p:8 >>  "repro/data/log_basic_heap_extract_preproc_26_itr_$itr"
@@ -66,86 +66,84 @@ done
 
 
 echo "Running the Heap Extract Experiments (Optimized)"
-
+nitrs=0
 for itr in $(seq 1 $nitrs); do
-   echo "heapsize: 16\nis_optimized: 1\n" 				  >  "repro/data/log_opt_heap_extract_preproc_16_itr_$itr"	 
-  ./docker/run-experiment -p  m:63 a:16 s:15  i15.3:1 c:32 p:128 	  >> "repro/data/log_opt_heap_extract_preproc_16_itr_$itr"
-  echo "preprocessing_heap_16 (opt preproc)"
-   echo "heapsize: 16\nis_optimized: 1\n" 				     > "repro/data/log_opt_heap_extract_online_16_itr_$itr"
-  ./docker/run-experiment heap  -m 16 -d 16 -i 0 -e 1 -opt 1 -s 0 -itr itr  >> "repro/data/log_opt_heap_extract_online_16_itr_$itr"
-  echo "preprocessing_heap_16 (opt online)"
-
-   echo "heapsize: 18\nis_optimized: 1\n" 		     	              > "repro/data/log_opt_heap_extract_preproc_18_itr_$itr"	
-  ./docker/run-experiment -p m:71 a:18 s:17 i17.3:1 c:36 p:128               >> "repro/data/log_opt_heap_extract_preproc_18_itr_$itr"
-   echo "preprocessing_heap_18 (opt preproc)"
-   echo "heapsize: 18\nis_optimized: 1\n"                                    > "repro/data/log_opt_heap_extract_online_18_itr_$itr"
-  ./docker/run-experiment heap  -m 18 -d 18 -i 0 -e 1 -opt 1 -s 0 -itr itr  >> "repro/data/log_opt_heap_extract_online_18_itr_$itr"
-  echo "preprocessing_heap_18 (opt online)"
-
- echo "heapsize: 20\nis_optimized: 1\n"                         > "repro/data/log_opt_heap_extract_preproc_20_itr_$itr"
-  ./docker/run-experiment -p m:80 a:20 s:19 i19.3:1 c:40 p:128 >> "repro/data/log_opt_heap_extract_preproc_20_itr_$itr"
-  echo "preprocessing_heap_20 (opt preproc)"
-   echo "heapsize: 20\nis_optimized: 1\n"                                   > "repro/data/log_opt_heap_extract_online_20_itr_$itr"
-  ./docker/run-experiment heap  -m 20 -d 20 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_20_itr_$itr"
-  echo "preprocessing_heap_20 (opt online)"
-
-   echo "heapsize: 22\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_22_itr_$itr"
- ./docker/run-experiment -p m:87 a:22 s:21 i21.3:1 c:44 p:128  >> "repro/data/log_opt_heap_extract_preproc_22_itr_$itr"
-  echo "preprocessing_heap_22 (opt preproc)"
-   echo "heapsize: 22\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_22_itr_$itr"
- ./docker/run-experiment -t 16 heap  -m 22 -d 22 -i 0 -e 1 -opt 1 -s 1 -itr itr >> "repro/data/log_opt_heap_extract_online_22_itr_$itr"
-  echo "preprocessing_heap_22 (opt online)"
-
- echo "heapsize: 24\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_24_itr_$itr"
- ./docker/run-experiment -p m:95 a:24 s:23 i23.3:1 c:48 p:128 >> "repro/data/log_opt_heap_extract_preproc_24_itr_$itr"
-  echo "preprocessing_heap_24 (opt preproc)"
-   echo "heapsize: 24\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_24_itr_$itr"
- ./docker/run-experiment -t 32 heap  -m 24 -d 24 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_24_itr_$itr"
-  echo "preprocessing_heap_24 (opt online)"
-
-  echo "heapsize: 26\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_26_itr_$itr"
- ./docker/run-experiment -p m:103 a:26 s:25 i25.3:1 c:52 p:128 >> "repro/data/log_opt_heap_extract_preproc_26_itr_$itr"
-  echo "preprocessing_heap_26 (opt preproc)"
-  echo "heapsize: 26\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_26_itr_$itr"
-  ./docker/run-experiment -t 64 heap  -m 26 -d 26 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_26_itr_$itr"
-  echo "preprocessing_heap_26 (opt online)"
+     echo "heapsize: 16\nis_optimized: 1\n" 				  >  "repro/data/log_opt_heap_extract_preproc_16_itr_$itr"	 
+     ./docker/run-experiment -p  m:63 a:16 s:15  i15.3:1 c:32 p:128 	  >> "repro/data/log_opt_heap_extract_preproc_16_itr_$itr"
+     echo "preprocessing_heap_16 (opt preproc)"
+     echo "heapsize: 16\nis_optimized: 1\n" 				     > "repro/data/log_opt_heap_extract_online_16_itr_$itr"
+     ./docker/run-experiment heap  -m 16 -d 16 -i 0 -e 1 -opt 1 -s 0 -itr itr  >> "repro/data/log_opt_heap_extract_online_16_itr_$itr"
+     echo "preprocessing_heap_16 (opt online)"
+
+     echo "heapsize: 18\nis_optimized: 1\n" 		     	              > "repro/data/log_opt_heap_extract_preproc_18_itr_$itr"	
+     ./docker/run-experiment -p m:71 a:18 s:17 i17.3:1 c:36 p:128               >> "repro/data/log_opt_heap_extract_preproc_18_itr_$itr"
+     echo "preprocessing_heap_18 (opt preproc)"
+     echo "heapsize: 18\nis_optimized: 1\n"                                    > "repro/data/log_opt_heap_extract_online_18_itr_$itr"
+     ./docker/run-experiment heap  -m 18 -d 18 -i 0 -e 1 -opt 1 -s 0 -itr itr  >> "repro/data/log_opt_heap_extract_online_18_itr_$itr"
+     echo "preprocessing_heap_18 (opt online)"
+
+     echo "heapsize: 20\nis_optimized: 1\n"                         > "repro/data/log_opt_heap_extract_preproc_20_itr_$itr"
+     ./docker/run-experiment -p m:80 a:20 s:19 i19.3:1 c:40 p:128 >> "repro/data/log_opt_heap_extract_preproc_20_itr_$itr"
+     echo "preprocessing_heap_20 (opt preproc)"
+     echo "heapsize: 20\nis_optimized: 1\n"                                   > "repro/data/log_opt_heap_extract_online_20_itr_$itr"
+     ./docker/run-experiment heap  -m 20 -d 20 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_20_itr_$itr"
+     echo "preprocessing_heap_20 (opt online)"
+
+     echo "heapsize: 22\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_22_itr_$itr"
+     ./docker/run-experiment -p m:87 a:22 s:21 i21.3:1 c:44 p:128  >> "repro/data/log_opt_heap_extract_preproc_22_itr_$itr"
+     echo "preprocessing_heap_22 (opt preproc)"
+     echo "heapsize: 22\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_22_itr_$itr"
+     ./docker/run-experiment -t 16 heap  -m 22 -d 22 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_22_itr_$itr"
+     echo "preprocessing_heap_22 (opt online)"
+
+     echo "heapsize: 24\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_24_itr_$itr"
+     ./docker/run-experiment -p m:95 a:24 s:23 i23.3:1 c:48 p:128 >> "repro/data/log_opt_heap_extract_preproc_24_itr_$itr"
+     echo "preprocessing_heap_24 (opt preproc)"
+     echo "heapsize: 24\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_24_itr_$itr"
+     ./docker/run-experiment -t 32 heap  -m 24 -d 24 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_24_itr_$itr"
+     echo "preprocessing_heap_24 (opt online)"
+
+     echo "heapsize: 26\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_preproc_26_itr_$itr"
+     ./docker/run-experiment -p m:103 a:26 s:25 i25.3:1 c:52 p:128 >> "repro/data/log_opt_heap_extract_preproc_26_itr_$itr"
+     echo "preprocessing_heap_26 (opt preproc)"
+     echo "heapsize: 26\nis_optimized: 1\n" > "repro/data/log_opt_heap_extract_online_26_itr_$itr"
+     ./docker/run-experiment -t 64 heap  -m 26 -d 26 -i 0 -e 1 -opt 1 -s 0 -itr itr >> "repro/data/log_opt_heap_extract_online_26_itr_$itr"
+     echo "preprocessing_heap_26 (opt online)"
 done
 
 
 echo "Basic Insert Experiments\n"
 
 for itr in $(seq 1 $nitrs); do
-
-echo "heapsize: 16\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_16_itr_$itr"
-./docker/run-experiment -p m:16 c:16 >>  "repro/data/log_basic_heap_insert_preproc_16_itr_$itr"
- echo "heapsize: 16\nis_optimized: 0\n" >                                         "repro/data/log_basic_heap_insert_online_16_itr_$itr"
- ./docker/run-experiment -t 64 heap -m 17 -d 16 -i 1 -e 0 -opt 0 -s 0 -itr itr >> "repro/data/log_basic_heap_insert_online_16_itr_$itr"
-
-echo "heapsize: 18\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_18_itr_$itr"
- ./docker/run-experiment -p m:18 c:18 >> "repro/data/log_basic_heap_insert_preproc_18_itr_$itr"
- echo "heapsize: 18\nis_optimized: 0\n" >                                           "repro/data/log_basic_heap_insert_online_18_itr_$itr"
- ./docker/run-experiment -t 64 heap -m 19 -d 18 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_18_itr_$itr"
-
-echo "heapsize: 20\nis_optimized: 0\n" >       "repro/data/log_basic_heap_insert_preproc_20_itr_$itr"
- ./docker/run-experiment -p  m:60 a:20 c:40 >> "repro/data/log_basic_heap_insert_preproc_20_itr_$itr"
- echo "heapsize: 20\nis_optimized: 0\n" >                           "repro/data/log_basic_heap_insert_online_20_itr_$itr"
- ./docker/run-experiment heap -m 21 -d 20 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_20_itr_$itr"
-
-echo "heapsize: 22\nis_optimized: 0\n" >                              "repro/data/log_basic_heap_insert_preproc_22_itr_$itr"
- ./docker/run-experiment -p m:22 c:22 >>                              "repro/data/log_basic_heap_insert_preproc_22_itr_$itr"
- echo "heapsize: 22\nis_optimized: 0\n" >                             "repro/data/log_basic_heap_insert_online_22_itr_$itr"
- ./docker/run-experiment  heap -m 23 -d 22 -i 1 -e 0 -opt 0 -s 0  -itr itr  >>  "repro/data/log_basic_heap_insert_online_22_itr_$itr"
-
-echo "heapsize: 24\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_24_itr_$itr"
- ./docker/run-experiment -p m:24 c:24 >> "repro/data/log_basic_heap_insert_preproc_24_itr_$itr"
- echo "heapsize: 24\nis_optimized: 0\n" >                          "repro/data/log_basic_heap_insert_online_24_itr_$itr"
-./docker/run-experiment heap -m 25 -d 24 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_24_itr_$itr"
-
- echo "heapsize: 26\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_26_itr_$itr"
- ./docker/run-experiment -p m:26 c:26 >>  "repro/data/log_basic_heap_insert_preproc_26_itr_$itr"
- echo "heapsize: 26\nis_optimized: 0\n" >                           "repro/data/log_basic_heap_insert_online_26_itr_$itr"
- ./docker/run-experiment heap -m 27 -d 26 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_26_itr_$itr"
-
+  echo "heapsize: 16\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_16_itr_$itr"
+  ./docker/run-experiment -p m:16 c:16 >>  "repro/data/log_basic_heap_insert_preproc_16_itr_$itr"
+  echo "heapsize: 16\nis_optimized: 0\n" >                                         "repro/data/log_basic_heap_insert_online_16_itr_$itr"
+  ./docker/run-experiment -t 64 heap -m 17 -d 16 -i 1 -e 0 -opt 0 -s 0 -itr itr >> "repro/data/log_basic_heap_insert_online_16_itr_$itr"
+ 
+  echo "heapsize: 18\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_18_itr_$itr"
+  ./docker/run-experiment -p m:18 c:18 >> "repro/data/log_basic_heap_insert_preproc_18_itr_$itr"
+   echo "heapsize: 18\nis_optimized: 0\n" >                                           "repro/data/log_basic_heap_insert_online_18_itr_$itr"
+  ./docker/run-experiment -t 64 heap -m 19 -d 18 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_18_itr_$itr"
+
+  echo "heapsize: 20\nis_optimized: 0\n" >       "repro/data/log_basic_heap_insert_preproc_20_itr_$itr"
+  ./docker/run-experiment -p  m:60 a:20 c:40 >> "repro/data/log_basic_heap_insert_preproc_20_itr_$itr"
+  echo "heapsize: 20\nis_optimized: 0\n" >                           "repro/data/log_basic_heap_insert_online_20_itr_$itr"
+  ./docker/run-experiment heap -m 21 -d 20 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_20_itr_$itr"
+
+  echo "heapsize: 22\nis_optimized: 0\n" >                              "repro/data/log_basic_heap_insert_preproc_22_itr_$itr"
+  ./docker/run-experiment -p m:22 c:22 >>                              "repro/data/log_basic_heap_insert_preproc_22_itr_$itr"
+  echo "heapsize: 22\nis_optimized: 0\n" >                             "repro/data/log_basic_heap_insert_online_22_itr_$itr"
+  ./docker/run-experiment  heap -m 23 -d 22 -i 1 -e 0 -opt 0 -s 0  -itr itr  >>  "repro/data/log_basic_heap_insert_online_22_itr_$itr"
+
+  echo "heapsize: 24\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_24_itr_$itr"
+  ./docker/run-experiment -p m:24 c:24 >> "repro/data/log_basic_heap_insert_preproc_24_itr_$itr"
+  echo "heapsize: 24\nis_optimized: 0\n" >                          "repro/data/log_basic_heap_insert_online_24_itr_$itr"
+  ./docker/run-experiment heap -m 25 -d 24 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_24_itr_$itr"
+
+  echo "heapsize: 26\nis_optimized: 0\n" > "repro/data/log_basic_heap_insert_preproc_26_itr_$itr"
+  ./docker/run-experiment -p m:26 c:26 >>  "repro/data/log_basic_heap_insert_preproc_26_itr_$itr"
+  echo "heapsize: 26\nis_optimized: 0\n" >                           "repro/data/log_basic_heap_insert_online_26_itr_$itr"
+  ./docker/run-experiment heap -m 27 -d 26 -i 1 -e 0 -opt 0 -s 0  -itr itr  >> "repro/data/log_basic_heap_insert_online_26_itr_$itr"
 done
 
 

+ 8 - 8
repro/generate_raw_data_bs.sh

@@ -1,7 +1,7 @@
 
 echo "Running the Binary Experiments (Basic)"
 cd ..
-nitrs=0
+nitrs=20
 for itr in $(seq 1 $nitrs); do
     echo $itr
     echo "bssize: 16\nis_optimized: 0\n" > "repro/data/log_basic_bs_preproc_16_itr_$itr"	
@@ -12,7 +12,7 @@ for itr in $(seq 1 $nitrs); do
     echo "preprocessing_bs_16 (basic online) - iteration $itr"
 done    
   
-nitrs=0
+nitrs=20
 for itr in $(seq 1 $nitrs); do
     echo "bssize: 18\nis_optimized: 0\n" > 		            "repro/data/log_basic_bs_preproc_18_itr_$itr"	
     ./docker/run-experiment -p m:19 r19:19 c:19 p:64 >> "repro/data/log_basic_bs_preproc_18_itr_$itr"
@@ -22,7 +22,7 @@ for itr in $(seq 1 $nitrs); do
     echo "preprocessing_bs_18 (basic online)"	
 done
 
-nitrs=0
+nitrs=20
 for itr in $(seq 1 $nitrs); do
     echo "bssize: 20\nis_optimized: 0\n" > "repro/data/log_basic_bs_preproc_20_itr_$itr"	
     ./docker/run-experiment -p m:21 r21:21 c:21 p:64 >> "repro/data/log_basic_bs_preproc_20_itr_$itr"
@@ -32,7 +32,7 @@ for itr in $(seq 1 $nitrs); do
     echo "preprocessing_bs_20 (basic online)"
 done
 
-nitrs=0
+nitrs=10
 for itr in $(seq 1 $nitrs); do
     echo "bssize: 22\nis_optimized: 0\n" > "repro/data/log_basic_bs_preproc_22_itr_$itr"	
    ./docker/run-experiment -p m:23 r23:23 c:23 p:64 >> "repro/data/log_basic_bs_preproc_22_itr_$itr"
@@ -42,7 +42,7 @@ for itr in $(seq 1 $nitrs); do
    echo "preprocessing_bs_22 (basic online)"
 done
 
-nitrs=0
+nitrs=10
 for itr in $(seq 1 $nitrs); do
   echo "bssize: 24\nis_optimized: 0\n" > "repro/data/log_basic_bs_preproc_24_itr_$itr"
   ./docker/run-experiment -p m:25 r25:25 c:25 p:64 >>  "repro/data/log_basic_bs_preproc_24_itr_$itr"
@@ -52,7 +52,7 @@ for itr in $(seq 1 $nitrs); do
   echo "preprocessing_bs_24 (basic online)"
 done
 
-nitrs=0
+nitrs=5
 for itr in $(seq 1 $nitrs); do
   echo "bssize: 26\nis_optimized: 0\n" > "repro/data/log_basic_bs_preproc_26_itr_$itr"
   ./docker/run-experiment -p m:27 r27:27 c:27 p:64 >>  "repro/data/log_basic_bs_preproc_26_itr_$itr"
@@ -62,8 +62,8 @@ for itr in $(seq 1 $nitrs); do
 done
 
 
-echo "Running the Heap Extract Experiments (Optimized)"
-nitrs=2
+echo "Running the Binary Search Experiments (Optimized)"
+nitrs=10
 for itr in $(seq 1 $nitrs); do
    echo "bssize: 16\nis_optimized: 1\n" 			  >  "repro/data/log_opt_bs_preproc_16_itr_$itr"	 
   ./docker/run-experiment -p  i16:1 c:17 p:64 	  >> "repro/data/log_opt_bs_preproc_16_itr_$itr"

+ 29 - 22
repro/generate_raw_data_const_db.sh

@@ -1,52 +1,59 @@
-./run-experiment -p  m:316 a:80 s:76 r20:456 c:160 p:128 > log_heap_extract_basic_pre_20_4
-echo "preprocessing_heap_16 (basic preproc)"
-./run-experiment -t 16 heap 20 20 0 4 0 > log_heap_extract_basic_online_20_4
- echo "preprocessing_heap_16 (basic online)"
 
-./run-experiment -p  m:316 a:80 s:76 i19.3:4 c:160 p:128 > log_heap_extract_opt_pre_20_4
+cd ..
+nitrs=10
+for itr in $(seq 1 $nitrs); do
+echo "heapsize: 4\nis_optimized: 0\n" > "repro/data/log_heap_extract_basic_pre_20_4_itr_$itr"
+./run-experiment -p  m:316 a:80 s:76 r20:456 c:160 p:128 >> "repro/data/log_heap_extract_basic_pre_20_4_itr_$itr"
+echo "preprocessing_heap_16 (basic preproc)"
+echo "heapsize: 4\nis_optimized: 0\n" > "repro/data/log_heap_extract_basic_pre_20_4_itr_$itr"
+./run-experiment -t 16 heap 20 20 0 4 0 >> "repro/data/log_heap_extract_basic_online_20_4_itr_$itr"
+echo "preprocessing_heap_16 (basic online)"
+echo "heapsize: 4\nis_optimized: 0\n" > "repro/data/log_heap_extract_basic_pre_20_4_itr_$itr"
+./run-experiment -p  m:316 a:80 s:76 i19.3:4 c:160 p:128 >> "repro/data/log_heap_extract_opt_pre_20_4_itr_$itr"
  echo "preprocessing_heap_16 (opt preproc)"
-./run-experiment -t 16 heap 20 20 0 4 1 > log_heap_extract_opt_online_20_4
-echo "preprocessing_heap_16 (opt online)":
+ echo "heapsize: 4\nis_optimized: 0\n" > "repro/data/log_heap_extract_basic_pre_20_4_itr_$itr"
+ ./run-experiment -t 16 heap 20 20 0 4 1 >> "repro/data/log_heap_extract_opt_online_20_4_itr_$itr"
+ echo "preprocessing_heap_16 (opt online)":
 
 
-./run-experiment -p m:632 a:160 s:152 r20:912 c:320 p:128 > log_heap_extract_basic_pre_20_8
+./run-experiment -p m:632 a:160 s:152 r20:912 c:320 p:128 >> "repro/data/log_heap_extract_basic_pre_20_8_itr_$itr"
 echo "preprocessing_heap_16 (basic preproc)"
-./run-experiment -t 16 heap 20 20 0 8 0 > log_heap_extract_basic_online_20_8
+./run-experiment -t 16 heap 20 20 0 8 0 >> "repro/data/log_heap_extract_basic_online_20_8_itr_$itr"
 echo "preprocessing_heap_16 (basic online)"
 
-./run-experiment -p  m:632 a:160 s:152 i19.3:8 c:320 p:128 > log_heap_extract_opt_pre_20_8
+./run-experiment -p  m:632 a:160 s:152 i19.3:8 c:320 p:128 >> "repro/data/log_heap_extract_opt_pre_20_8_itr_$itr"
  echo "preprocessing_heap_16 (opt preproc)"
-./run-experiment -t 16 heap 20 20 0 8 1 > log_heap_extract_opt_online_20_8
+./run-experiment -t 16 heap 20 20 0 8 1 >> "repro/data/log_heap_extract_opt_online_20_8_itr_$itr"
  echo "preprocessing_heap_16 (opt online)":
 
 
 
-./run-experiment -p  m:1264 a:320 s:304 r20:1824 c:640 p:128 > log_heap_extract_basic_pre_20_16
+./run-experiment -p  m:1264 a:320 s:304 r20:1824 c:640 p:128 >> "repro/data/log_heap_extract_basic_pre_20_16_itr_$itr"
  echo "preprocessing_heap_16 (basic preproc)"
-./run-experiment -t 16 heap 20 20 0 16 0 > log_heap_extract_basic_online_20_16
+./run-experiment -t 16 heap 20 20 0 16 0 >> "repro/data/log_heap_extract_basic_online_20_16_itr_$itr"
  echo "preprocessing_heap_16 (basic online)"
 
-./run-experiment -p  m:1264 a:320 s:304 i19.3:16 c:640 p:128 > log_heap_extract_opt_pre_20_16
+./run-experiment -p  m:1264 a:320 s:304 i19.3:16 c:640 p:128 >> "repro/data/log_heap_extract_opt_pre_20_16_itr_$itr"
  echo "preprocessing_heap_16 (opt preproc)"
-./run-experiment -t 16 heap 20 20 0 16 1 > log_heap_extract_opt_online_20_16
+./run-experiment -t 16 heap 20 20 0 16 1 >> "repro/data/log_heap_extract_opt_online_20_16_itr_$itr"
  echo "preprocessing_heap_16 (opt online)":
 
 
 
- ./run-experiment -p m:2528 a:640 s:608 r20:3648 c:1280 p:128 > log_heap_extract_basic_pre_20_32
+ ./run-experiment -p m:2528 a:640 s:608 r20:3648 c:1280 p:128 >> "repro/data/log_heap_extract_basic_pre_20_32_itr_$itr"
   echo "preprocessing_heap_32 (basic preproc)"
- ./run-experiment -t 16 heap 20 20 0 32 0 > log_heap_extract_basic_online_20_32
+ ./run-experiment -t 16 heap 20 20 0 32 0 >> "repro/data/log_heap_extract_basic_online_20_32_itr_$itr"
  echo "preprocessing_heap_32 (basic online)"
 
-./run-experiment -p  m:2528 a:640 s:608 i19.3:32 c:1280 p:128 > log_heap_extract_opt_pre_20_32
+ ./run-experiment -p  m:2528 a:640 s:608 i19.3:32 c:1280 p:128 >> "repro/data/log_heap_extract_opt_pre_20_32_itr_$itr"
  echo "preprocessing_heap_32 (opt preproc)"
- ./run-experiment -t 16 heap 20 20 0 32 1 > log_heap_extract_opt_online_20_32
+ ./run-experiment -t 16 heap 20 20 0 32 1 >> "repro/data/log_heap_extract_opt_online_20_32_itr_$itr"
  echo "preprocessing_heap_32 (opt online)":  
-
+done
 
 echo "Running the Heap Extract Experiments (Basic)"
-cd ..
-nitrs=10
+
+
 for itr in $(seq 1 $nitrs); do
     echo $itr
     echo "heapsize: 16\nis_optimized: 0\n" > "repro/data/log_basic_heap_extract_preproc_16_itr_$itr"	

+ 16 - 5
repro/reproduce_plots

@@ -7,8 +7,8 @@ cd ..
 
 rm "repro/experimentaldata_preproc_wallclock"  "repro/experimentaldata_wallclock"
 touch "repro/experimentaldata_preproc_wallclock"  "repro/experimentaldata_wallclock"
-nitrs=2
-minsize=18
+nitrs=10
+minsize=16
 maxsize=26
 stepsize=2
 for itr in $(seq 1 $nitrs); do
@@ -23,8 +23,16 @@ for itr in $(seq 1 $nitrs); do
 	 # Store each value in different variables
 	 heapsize=${values[0]}  
  	 optimization_flag=${values[1]} 
-	 extract_wc=${values[4]} 
+	 milliseconds=${values[4]}
+         #seconds=$((milliseconds / 1000))
+	 seconds=$(echo "scale=3; $milliseconds / 1000" | bc)  # Use bc for decimal division
+	 extract_wc=$seconds
  
+	 echo $optimization_flag 
+	 echo $heapsize 
+	 echo $milliseconds
+	 echo "$extract_wc"
+
 	 datafile="repro/experimentaldata_wallclock"
  	 python3 repro/append-experiment-results.py $datafile $DS $Operation $optimization_flag $heapsize $extract_wc
 
@@ -36,7 +44,9 @@ for itr in $(seq 1 $nitrs); do
  	 IFS=$'\n' read -d '' -r -a values <<< "$output"
 
  	# Store each value in different variables
-	 heapsize=${values[0]}  optimization_flag=${values[1]} extract_wc=${values[4]}
+	 milliseconds=${values[4]}
+	 seconds=$(echo "scale=3; $milliseconds / 1000" | bc)  # Use bc for decimal division
+	 heapsize=${values[0]}  optimization_flag=${values[1]} extract_wc=$seconds
  	 datafile="repro/experimentaldata_wallclock"
  	 python3 repro/append-experiment-results.py $datafile $DS $Operation $optimization_flag $heapsize $extract_wc
  done	
@@ -45,6 +55,7 @@ echo "OnlineTable"
 cat $datafile
 echo -e "\n\n"
 
+nitrs=2
 for itr in $(seq 1 $nitrs); do
   for heapsize in $(seq $minsize $stepsize $maxsize); do
 	input_file="repro/data/log_basic_heap_extract_preproc_${heapsize}_itr_$itr"
@@ -74,7 +85,7 @@ done
 echo "Preproc Table"
 cat $datafile
 echo -e "\n\n"
-
+nitrs=0
 # Replace "python3" with your Python interpreter if needed
 DS="Heap"
 Operation="Insert"

+ 1 - 1
repro/reproduce_plots_bs

@@ -7,7 +7,7 @@ cd ..
 touch "repro/experimentaldata_bs_preproc_wallclock"  "repro/experimentaldata_bs_wallclock"
 rm "repro/experimentaldata_bs_preproc_wallclock"  "repro/experimentaldata_bs_wallclock"
 touch "repro/experimentaldata_bs_preproc_wallclock"  "repro/experimentaldata_bs_wallclock"
-nitrs=1
+nitrs=2
 minsize=16
 maxsize=24
 stepsize=2