Supported discovery_time iteration in benchmark scripts. Added algorithms names

Author: jkomyno

process.py

@@ -22,17 +22,20 @@
     k = parse('k: {}', k_raw)[0]
     k = int(k)
 
-    if measure_full_contraction:
-        full_contraction_times = [0] * k
-        for i in range(k):
-            full_contraction_raw = next(lines)
-            full_contraction = parse('full_contraction: {}', full_contraction_raw)[0]
-            full_contraction_times[i] = int(full_contraction)
-
+    try:
+        if measure_full_contraction:
+            full_contraction_times = []
+            for _ in range(k):
+                full_contraction_raw = next(lines)
+                full_contraction = parse('full_contraction: {}', full_contraction_raw)[0]
+                full_contraction_times.append(int(full_contraction))
+
+        min_cut_raw = next(lines)
+    except TypeError:
+        min_cut_raw = full_contraction_raw
+    finally:
         full_contraction_mean = math.floor(statistics.mean(full_contraction_times))
-
-    min_cut_raw = next(lines)
-    min_cut = parse('min_cut: {}', min_cut_raw)[0]
+        min_cut = parse('min_cut: {}', min_cut_raw)[0]
 
     program_time_raw = next(lines)
     program_time = parse('program_time: {}', program_time_raw)[0]
@@ -41,8 +44,11 @@
         discovery_time_raw = next(lines)
         discovery_time = parse('discovery_time: {}', discovery_time_raw)[0]
 
+        discovery_iteration_raw = next(lines)
+        discovery_iteration = parse('discovery_iteration: {}', discovery_iteration_raw)[0]
+
     csv_line = f'{filename};{nodes};{k};{expected_min_cut};{min_cut};{program_time}'
     if measure_full_contraction:
-        csv_line = f'{csv_line};{discovery_time};{full_contraction_mean}'
+        csv_line = f'{csv_line};{discovery_time};{discovery_iteration};{full_contraction_mean}'
 
     print(csv_line)

run.sh

@@ -12,7 +12,7 @@ dataset="dataset"
 header="filename;nodes;k;expected_min_cut;min_cut;program_time"
 
 if [ $measure_full_contraction -eq "1" ]; then
-    header="${header};discovery_time;full_contraction"
+    header="${header};discovery_time;discovery_iteration;full_contraction"
 fi
 
 echo $header

runall.sh

@@ -35,7 +35,7 @@ for algorithm in ${algorithms}; do
 
     full_contraction=${full_contractions[$n]}
 
-    ./${run_script} "${exe_folder}/${program}" ${full_contraction} > "benchmark/${output_file}.csv"
+    ./${run_script} "${exe_folder}/${program}" ${full_contraction} > "benchmark/${algorithm}_${output_file}.csv"
 
     n=$(($n+1))
 done