diff --git a/figures/sp-fd-rust-vs-c.svg b/figures/sp-fd-rust-vs-c.svg index 57e41b9..3d5d4d4 100644 --- a/figures/sp-fd-rust-vs-c.svg +++ b/figures/sp-fd-rust-vs-c.svg @@ -6,7 +6,7 @@ - 2023-03-17T21:13:46.394313 + 2023-03-17T21:47:50.660553 image/svg+xml @@ -41,12 +41,12 @@ z - - + @@ -91,7 +91,7 @@ z - + @@ -132,7 +132,7 @@ z - + @@ -168,7 +168,7 @@ z - + @@ -215,7 +215,7 @@ z - + @@ -271,7 +271,7 @@ z - + @@ -457,12 +457,12 @@ z - - + @@ -490,7 +490,7 @@ z - + @@ -533,7 +533,7 @@ z - + @@ -549,7 +549,7 @@ z - + @@ -565,7 +565,7 @@ z - + @@ -613,7 +613,7 @@ z - + @@ -629,7 +629,7 @@ z - + @@ -645,7 +645,7 @@ z - + @@ -822,7 +822,7 @@ L 388.649256 290.246443 L 391.928595 292.151486 L 395.207934 295.488 L 398.487273 293.708953 -" clip-path="url(#p3666199b34)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/> +" clip-path="url(#p64819cf2ed)" style="fill: none; stroke: #1f77b4; stroke-width: 1.5; stroke-linecap: square"/> +" clip-path="url(#p64819cf2ed)" style="fill: none; stroke: #ff7f0e; stroke-width: 1.5; stroke-linecap: square"/> + diff --git a/notebooks/sp-fd-rust-vs-c.py b/notebooks/sp-fd-rust-vs-c.py index 9e60a25..8cfa92c 100644 --- a/notebooks/sp-fd-rust-vs-c.py +++ b/notebooks/sp-fd-rust-vs-c.py @@ -1,32 +1,14 @@ import numpy as np from matplotlib import pyplot as plt -from notebooks.lib import read_sp - - -def process_sp(sp): - by_run = sp.groupby(['probability', 'N']) - - by_probability = by_run.agg( - overall_fd=('fd', lambda fd: np.mean(fd[-100:])), - overall_fd_std=('fd', 'std') - ).reset_index().groupby('probability') - - ggg = by_probability.agg( - fd=('overall_fd', 'mean'), - # TODO Check stats, do we need to do /sqrt(n) here? - fd_std=('overall_fd_std', lambda std: np.sqrt(np.mean(np.square(std)))) - ) - - return ggg - +from notebooks.lib import read_sp, aggregate_sp_fd c_sp = read_sp("../data/stick-probability") rust_sp = read_sp("../data/rust-sticking-probability") # %% -c_data = process_sp(c_sp) -rust_data = process_sp(rust_sp) +c_data = aggregate_sp_fd(c_sp) +rust_data = aggregate_sp_fd(rust_sp) # %%