Fix "Database Size (bits)" -> "Database Size (#records)"
This commit is contained in:
parent
10f6bb5ac2
commit
3f1312c945
|
@ -194,7 +194,7 @@ def plot_scheme_heatmap(results: list, title: str, bandwidth: int):
|
||||||
data,
|
data,
|
||||||
[f"$2^{{{int(math.log2(y))}}}$" for y in y_labels],
|
[f"$2^{{{int(math.log2(y))}}}$" for y in y_labels],
|
||||||
[f"$2^{{{int(math.log2(x))}}}$" for x in x_labels],
|
[f"$2^{{{int(math.log2(x))}}}$" for x in x_labels],
|
||||||
xlabel="Database Size (bits)",
|
xlabel="Database Size (#records)",
|
||||||
ylabel="Block Size (bits)",
|
ylabel="Block Size (bits)",
|
||||||
cbarlabel="Time (ms)",
|
cbarlabel="Time (ms)",
|
||||||
logcolor=True,
|
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)]),
|
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(y))}}}$" for y in y_labels],
|
||||||
[f"$2^{{{int(math.log2(x))}}}$" for x in x_labels],
|
[f"$2^{{{int(math.log2(x))}}}$" for x in x_labels],
|
||||||
xlabel="Database Size (bits)",
|
xlabel="Database Size (#records)",
|
||||||
ylabel="Block Size (bits)",
|
ylabel="Block Size (bits)",
|
||||||
cbarlabel="Time Difference (ms)",
|
cbarlabel="Time Difference (ms)",
|
||||||
sym_logcolor=True,
|
sym_logcolor=True,
|
||||||
|
@ -257,7 +257,7 @@ def main():
|
||||||
# ... with simulated bandwidth, e.g. estimated total real time
|
# ... with simulated bandwidth, e.g. estimated total real time
|
||||||
plot_3x_with_simulated_bandwidth(
|
plot_3x_with_simulated_bandwidth(
|
||||||
filter_results(clean_results(load_results("results_combined.log")), lambda r: r["block_size"] == 1),
|
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
|
# 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
|
# 2D Heatmap of CPU time for Simple/XOR/Balanced XOR - varying both database size and block size
|
||||||
plot_scheme_heatmap(
|
plot_scheme_heatmap(
|
||||||
clean_results(load_results("results_fast_var-bs_var-db.log"))["Send_All"],
|
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
|
bandwidth=10
|
||||||
)
|
)
|
||||||
plt.close()
|
plt.close()
|
||||||
plot_scheme_heatmap(
|
plot_scheme_heatmap(
|
||||||
clean_results(load_results("results_fast_var-bs_var-db.log"))["XOR"],
|
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
|
bandwidth=10
|
||||||
)
|
)
|
||||||
plt.close()
|
plt.close()
|
||||||
plot_scheme_heatmap(
|
plot_scheme_heatmap(
|
||||||
clean_results(load_results("results_fast_var-bs_var-db.log"))["Balanced_XOR"],
|
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
|
bandwidth=10
|
||||||
)
|
)
|
||||||
plt.close()
|
plt.close()
|
||||||
|
@ -316,14 +316,14 @@ def main():
|
||||||
clean_results(load_results("results_fast_var-bs_var-db.log")),
|
clean_results(load_results("results_fast_var-bs_var-db.log")),
|
||||||
old_func=lambda rs: rs["Send_All"],
|
old_func=lambda rs: rs["Send_All"],
|
||||||
new_func=lambda rs: rs["Balanced_XOR"],
|
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()
|
plt.close()
|
||||||
plot_old_vs_new_heatmap(
|
plot_old_vs_new_heatmap(
|
||||||
clean_results(load_results("results_fast_var-bs_var-db.log")),
|
clean_results(load_results("results_fast_var-bs_var-db.log")),
|
||||||
old_func=lambda rs: rs["XOR"],
|
old_func=lambda rs: rs["XOR"],
|
||||||
new_func=lambda rs: rs["Balanced_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()
|
plt.close()
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue