diff --git a/figures/sp-fd.png b/figures/sp-fd.png index 771cc26..c3761b9 100644 Binary files a/figures/sp-fd.png and b/figures/sp-fd.png differ diff --git a/figures/sp-fd.svg b/figures/sp-fd.svg index ca1f38a..f221f99 100644 --- a/figures/sp-fd.svg +++ b/figures/sp-fd.svg @@ -6,11 +6,11 @@ - 2023-03-17T21:40:06.539395 + 2023-03-19T22:54:37.871412 image/svg+xml - Matplotlib v3.7.0, https://matplotlib.org/ + Matplotlib v3.7.1, https://matplotlib.org/ @@ -39,225 +39,405 @@ z +" clip-path="url(#p303af259e6)" style="fill: #1f77b4; fill-opacity: 0.2"/> - - + - + - + - + - + - + - + - + - + - + - + @@ -663,17 +843,17 @@ z - - + - + - + - + @@ -710,12 +890,12 @@ z - + - + - + - + @@ -772,12 +952,12 @@ z - + - + @@ -848,107 +1028,189 @@ z - + - - - + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/graphs/sp-fd.py b/graphs/sp-fd.py index 10e51f3..c011c98 100644 --- a/graphs/sp-fd.py +++ b/graphs/sp-fd.py @@ -1,10 +1,12 @@ +import pandas as pd from matplotlib import pyplot as plt from lib.lib import read_sp, aggregate_sp_fd -data_2d_sp = read_sp("../data/rust-stick-probability") +data_2d_sp = read_sp("../data/rust-sticking-probability") data_2d_sp_low_p = read_sp("../data/rust-sp-low-p") -sp_fd_data = aggregate_sp_fd(data_2d_sp) +full_data = pd.concat([data_2d_sp_low_p, data_2d_sp]) +sp_fd_data = aggregate_sp_fd(full_data) # %% plt.fill_between(sp_fd_data.index, sp_fd_data.fd - sp_fd_data.fd_std, sp_fd_data.fd + sp_fd_data.fd_std, alpha=0.2, label=f"Standard error band") @@ -13,6 +15,9 @@ plt.plot(sp_fd_data.index, sp_fd_data.fd, color='tab:blue', label='NF, fd mean, plt.xlabel("$p_{stick}$") plt.ylabel("$fd$") plt.legend() +# plt.show() +# plt.loglog(sp_fd_data.index, sp_fd_data.fd, color='tab:blue', label='NF, fd mean, seeds = 100') +# plt.show() # %% plt.savefig('../figures/sp-fd.svg')