Change Path to graphs

pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/generate_graphs.py

@@ -27,9 +27,9 @@ def main():
 
     # generally they both only seconds for graphs when not generating for single algorithms
     # plot_general_plots()  # takes about 4 seconds
-    plot_lines(data)  # takes about 1:50 min
+    # plot_lines(data)  # takes about 1:50 min
     # plot_static_data(data)  # takes about 4 min
-    # plot_distributions(data)
+    plot_distributions(data)
 
 
 def load_data():
@@ -679,7 +679,7 @@ def plot_lines(data):
         data, line_type="median", combined_with_hybrids: bool = False
     ):
         os.makedirs(
-            f"{PLOTS_DIR}/lines/{line_type}s-of-sec-level/combined-with-hybrids",
+            f"{PLOTS_DIR}/lines/per-protocol/{line_type}s-of-sec-level/combined-with-hybrids",
             mode=0o777,
             exist_ok=True,
         )
@@ -747,13 +747,13 @@ def plot_lines(data):
                 subdir = "combined-with-hybrids/"
                 appendix = "-combined-with-hybrids"
             plt.savefig(
-                f"{PLOTS_DIR}/lines/{line_type}s-of-sec-level/{subdir}{line_type}-{row['scenario']}-{row['protocol']}-{row['sec_level']}{appendix}.pdf"
+                f"{PLOTS_DIR}/lines/per-protocol/{line_type}s-of-sec-level/{subdir}{line_type}-{row['scenario']}-{row['protocol']}-{row['sec_level']}{appendix}.pdf"
             )
             plt.close()
 
     def plot_lines_for_comparisons_between_protocols(data, line_type="median"):
         os.makedirs(
-            f"{PLOTS_DIR}/lines/comparison-between-protocols/comparison-of-{line_type}s",
+            f"{PLOTS_DIR}/lines/between-protocols/comparison-of-{line_type}s",
             mode=0o777,
             exist_ok=True,
         )
@@ -796,7 +796,7 @@ def plot_lines(data):
             subdir = ""
             appendix = ""
             plt.savefig(
-                f"{PLOTS_DIR}/lines/comparison-between-protocols/comparison-of-{line_type}s/{subdir}{line_type}-{row['scenario']}-{row['sec_level']}-{row['kem_alg']}{appendix}.pdf"
+                f"{PLOTS_DIR}/lines/between-protocols/comparison-of-{line_type}s/{subdir}{line_type}-{row['scenario']}-{row['sec_level']}-{row['kem_alg']}{appendix}.pdf"
             )
             plt.close()
 
@@ -854,12 +854,12 @@ def plot_lines(data):
     ]
     for statistical_measurement in statistical_measurements:
         print(f"Generating graphs for {statistical_measurement}")
-        # plot_lines_for_sec_level(
-        #     data, line_type=statistical_measurement, combined_with_hybrids=False
-        # )
-        # plot_lines_for_sec_level(
-        #     data, line_type=statistical_measurement, combined_with_hybrids=True
-        # )
+        plot_lines_for_sec_level(
+            data, line_type=statistical_measurement, combined_with_hybrids=False
+        )
+        plot_lines_for_sec_level(
+            data, line_type=statistical_measurement, combined_with_hybrids=True
+        )
         plot_lines_for_comparisons_between_protocols(
             data, line_type=statistical_measurement
         )
@@ -1014,7 +1014,7 @@ def plot_distributions(data):
                 plt.close()
                 # return
 
-    # plot_multiple_violin_plots(data, filtered=False)
+    plot_multiple_violin_plots(data, filtered=False)
     plot_multiple_violin_plots(data, filtered=True)
     # plot_single_violin_plot(data)  # takes an age
 

pq-tls-benchmark-framework/emulation-exp/code/kex/scripts/helper_scripts/helper_functions.py

@@ -208,9 +208,9 @@ def prepare_kem_performance_data_for_plotting(df):
 def get_kem_characteristics():
     def match_name(name):
         mapping = {
-            "ML-KEM-512-ipd": "mlkem512",
-            "ML-KEM-768-ipd": "mlkem768",
-            "ML-KEM-1024-ipd": "mlkem1024",
+            "ML-KEM-512": "mlkem512",
+            "ML-KEM-768": "mlkem768",
+            "ML-KEM-1024": "mlkem1024",
             "BIKE-L1": "bikel1",
             "BIKE-L3": "bikel3",
             "BIKE-L5": "bikel5",