diff --git a/graph/graph.py b/graph/graph.py index 022ab6e..fb227bb 100644 --- a/graph/graph.py +++ b/graph/graph.py @@ -194,7 +194,7 @@ def plot_scheme_heatmap(results: list, title: str, bandwidth: int): data, [f"$2^{{{int(math.log2(y))}}}$" for y in y_labels], [f"$2^{{{int(math.log2(x))}}}$" for x in x_labels], - xlabel="Database Size (bits)", + xlabel="Database Size (#records)", ylabel="Block Size (bits)", cbarlabel="Time (ms)", logcolor=True, @@ -232,7 +232,7 @@ def plot_old_vs_new_heatmap(all_results: dict, old_func: callable, new_func: cal np.array([[calc(i, j) for j, y in enumerate(x)] for i, x in enumerate(data_new)]), [f"$2^{{{int(math.log2(y))}}}$" for y in y_labels], [f"$2^{{{int(math.log2(x))}}}$" for x in x_labels], - xlabel="Database Size (bits)", + xlabel="Database Size (#records)", ylabel="Block Size (bits)", cbarlabel="Time Difference (ms)", sym_logcolor=True, @@ -257,7 +257,7 @@ def main(): # ... with simulated bandwidth, e.g. estimated total real time plot_3x_with_simulated_bandwidth( filter_results(clean_results(load_results("results_combined.log")), lambda r: r["block_size"] == 1), - title="Time per bit with Simulated Bandwidth - 1-bit Block Size" + title="Total Time with Simulated Bandwidth - 1-bit Block Size" ) # CPU Time per bit as a function of block/database-ratio @@ -294,19 +294,19 @@ def main(): # 2D Heatmap of CPU time for Simple/XOR/Balanced XOR - varying both database size and block size plot_scheme_heatmap( clean_results(load_results("results_fast_var-bs_var-db.log"))["Send_All"], - title="Simulated Time per bit Heatmap: Send All - Varying Database Size and Block Size - 10Mbit/s", + title="Total Simulated Time Heatmap: Send All - Varying Database Size and Block Size - 10Mbit/s", bandwidth=10 ) plt.close() plot_scheme_heatmap( clean_results(load_results("results_fast_var-bs_var-db.log"))["XOR"], - title="Simulated Time per bit Heatmap: XOR - Varying Database Size and Block Size - 10Mbit/s", + title="Total Simulated Time Heatmap: XOR - Varying Database Size and Block Size - 10Mbit/s", bandwidth=10 ) plt.close() plot_scheme_heatmap( clean_results(load_results("results_fast_var-bs_var-db.log"))["Balanced_XOR"], - title="Simulated Time per bit Heatmap: Balanced XOR - Varying Database Size and Block Size - 10Mbit/s", + title="Total Simulated Time Heatmap: Balanced XOR - Varying Database Size and Block Size - 10Mbit/s", bandwidth=10 ) plt.close() @@ -316,14 +316,14 @@ def main(): clean_results(load_results("results_fast_var-bs_var-db.log")), old_func=lambda rs: rs["Send_All"], new_func=lambda rs: rs["Balanced_XOR"], - title="Simulated Time per bit Heatmap: Send All vs Balanced XOR - Varying Database Size and Block Size - 10 Mbit/s" + title="Total Simulated Time Heatmap: Send All vs Balanced XOR - Varying Database Size and Block Size - 10 Mbit/s" ) plt.close() plot_old_vs_new_heatmap( clean_results(load_results("results_fast_var-bs_var-db.log")), old_func=lambda rs: rs["XOR"], new_func=lambda rs: rs["Balanced_XOR"], - title="Simulated Time per bit Heatmap: XOR vs Balanced XOR - Varying Database Size and Block Size - 10 Mbit/s" + title="Total Simulated Time Heatmap: XOR vs Balanced XOR - Varying Database Size and Block Size - 10 Mbit/s" ) plt.close() diff --git a/graph/plots/Computation_Time___1_bit_Block_Size.pdf b/graph/plots/Computation_Time___1_bit_Block_Size.pdf index 6436ec9..c555e40 100644 Binary files a/graph/plots/Computation_Time___1_bit_Block_Size.pdf and b/graph/plots/Computation_Time___1_bit_Block_Size.pdf differ diff --git a/graph/plots/Network_Traffic___1_bit_Block_Size.pdf b/graph/plots/Network_Traffic___1_bit_Block_Size.pdf index bd4b395..0a7074e 100644 Binary files a/graph/plots/Network_Traffic___1_bit_Block_Size.pdf and b/graph/plots/Network_Traffic___1_bit_Block_Size.pdf differ diff --git a/graph/plots/Simulated_Time_per_bit_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Simulated_Time_per_bit_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf index 70312b0..7872f1f 100644 Binary files a/graph/plots/Simulated_Time_per_bit_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Simulated_Time_per_bit_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ diff --git a/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf index 8e00156..56e3498 100644 Binary files a/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ diff --git a/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf b/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf index 0960afd..f10f566 100644 Binary files a/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf and b/graph/plots/Simulated_Time_per_bit_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf differ diff --git a/graph/plots/Simulated_Time_per_bit_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Simulated_Time_per_bit_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf index 4613eae..1093bfd 100644 Binary files a/graph/plots/Simulated_Time_per_bit_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Simulated_Time_per_bit_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ diff --git a/graph/plots/Simulated_Time_per_bit_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf b/graph/plots/Simulated_Time_per_bit_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf index da8fca4..e57f438 100644 Binary files a/graph/plots/Simulated_Time_per_bit_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf and b/graph/plots/Simulated_Time_per_bit_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf differ diff --git a/graph/plots/Time_per_bit_with_Simulated_Bandwidth___1_bit_Block_Size.pdf b/graph/plots/Time_per_bit_with_Simulated_Bandwidth___1_bit_Block_Size.pdf index b73ad89..6ca39af 100644 Binary files a/graph/plots/Time_per_bit_with_Simulated_Bandwidth___1_bit_Block_Size.pdf and b/graph/plots/Time_per_bit_with_Simulated_Bandwidth___1_bit_Block_Size.pdf differ