Skip to content

Commit

Permalink
add and re-arrange raw data
Browse files Browse the repository at this point in the history
  • Loading branch information
@Y0dler
Y0dler committed Oct 13, 2024
1 parent a833893 commit 4fbaf03
Show file tree
Hide file tree
Showing 13 changed files with 1,525 additions and 38 deletions.
1,487 changes: 1,487 additions & 0 deletions docs/source/notebooks/Create_results_in_figure_2.ipynb
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions docs/source/notebooks/Create_validation_plot_from_raw_data.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -36,11 +36,11 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
"with open('test1_all_data.txt', 'r') as file:\n",
"with open(Path(\"./paper raw data/test1_all_data.txt\"), \"r\") as file:\n",
" all_data = json.loads(file.read())"
]
},
Expand All @@ -53,11 +53,11 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
"df = pandas.read_excel(\"test2_summary.xlsx\")\n",
"df = pandas.read_excel(Path(\"./paper raw data/test2_summary.xlsx\"))\n",
"df_normal = df[(df.loc[:, \"model\"] == \"normal\") & (df.loc[:, \"Unnamed: 0\"].isin([\"area\", \"height\"]))]\n",
"df_normal.reset_index(inplace=True)\n",
"df_skew = df[(df.loc[:, \"model\"] == \"skew_normal\") & (df.loc[:, \"Unnamed: 0\"].isin([\"area\", \"height\"]))]\n",
Expand All @@ -83,11 +83,11 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 6,
"metadata": {},
"outputs": [],
"source": [
"df_comparison_total = pandas.read_excel(\"test3_df_comparison.xlsx\")\n",
"df_comparison_total = pandas.read_excel(Path(\"./paper raw data/test3_df_comparison.xlsx\"))\n",
"df_comparison_single = df_comparison_total[~df_comparison_total[\"PP experiment\"].isin([23, 24])]\n",
"df_comparison_double = df_comparison_total[df_comparison_total[\"PP experiment\"].isin([23, 24])]"
]
Expand All @@ -101,7 +101,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 7,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -224,14 +224,14 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 8,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Last updated: 2024-10-11T17:56:34.996952+02:00\n",
"Last updated: 2024-10-13T15:10:41.315414+02:00\n",
"\n"
]
}
Expand Down
56 changes: 28 additions & 28 deletions docs/source/notebooks/Processing_test_1_raw_data.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
"raw_data_files = [\n",
" \"Normal model_normal data_noise level 0.6.xlsx\",\n",
" \"Normal model_normal data_noise level 1.2.xlsx\",\n",
" \"Normal model_skew normal data_noise level 0.6.xlsx\",\n",
" \"Skew normal model_skew normal data_noise level 0.6.xlsx\",\n",
" \"Skew normal model_skew normal data_noise level 1.2.xlsx\",\n",
" \"Skew normal model_normal data_noise level 0.6.xlsx\",\n",
" Path(\"./paper raw data/synthetic data sets for validation/Normal model_normal data_noise level 0.6.xlsx\"),\n",
" Path(\"./paper raw data/synthetic data sets for validation/Normal model_normal data_noise level 1.2.xlsx\"),\n",
" Path(\"./paper raw data/synthetic data sets for validation/Normal model_skew normal data_noise level 0.6.xlsx\"),\n",
" Path(\"./paper raw data/synthetic data sets for validation/Skew normal model_skew normal data_noise level 0.6.xlsx\"),\n",
" Path(\"./paper raw data/synthetic data sets for validation/Skew normal model_skew normal data_noise level 1.2.xlsx\"),\n",
" Path(\"./paper raw data/synthetic data sets for validation/Skew normal model_normal data_noise level 0.6.xlsx\"),\n",
"]\n",
"\n",
"parameters = [\"mean\", \"std\", \"area\", \"height\", \"alpha\", \"baseline_intercept\", \"baseline_slope\"]"
Expand All @@ -45,7 +45,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 5,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -149,7 +149,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 6,
"metadata": {},
"outputs": [
{
Expand All @@ -159,9 +159,9 @@
"model: normal, data: normal, noise level: 0.6\n",
"model: normal, data: normal, noise level: 1.2\n",
"model: normal, data: skew normal, noise level: 0.6\n",
"model: skew normal, data: normal, noise level: 0.6\n",
"model: skew normal, data: skew normal, noise level: 0.6\n",
"model: skew normal, data: skew normal, noise level: 1.2\n"
"model: skew normal, data: skew normal, noise level: 1.2\n",
"model: skew normal, data: normal, noise level: 0.6\n"
]
}
],
Expand All @@ -180,7 +180,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 7,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -191,7 +191,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 8,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -221,14 +221,6 @@
" 0.1425229338854569,\n",
" 0.029251994462966387,\n",
" 0.02178598822049324]],\n",
" 'normal data, skew normal model': [[0.9993873333333333,\n",
" 1.145324094260921,\n",
" 1.0038603930164334,\n",
" 1.0021702322498285],\n",
" [0.025492314214288193,\n",
" 0.06460165579288266,\n",
" 0.0295645094605588,\n",
" 0.022277250178015084]],\n",
" 'skew normal data, skew normal model': [[1.0003276666666665,\n",
" 1.0178059537564914,\n",
" 0.9995769654521169,\n",
Expand All @@ -244,10 +236,18 @@
" [0.029588612507556917,\n",
" 0.13828870506270582,\n",
" 0.050852728197426554,\n",
" 0.03782158437972263]]}"
" 0.03782158437972263]],\n",
" 'normal data, skew normal model': [[0.9993873333333333,\n",
" 1.145324094260921,\n",
" 1.0038603930164334,\n",
" 1.0021702322498285],\n",
" [0.025492314214288193,\n",
" 0.06460165579288266,\n",
" 0.0295645094605588,\n",
" 0.022277250178015084]]}"
]
},
"execution_count": 6,
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
Expand Down Expand Up @@ -275,7 +275,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 9,
"metadata": {},
"outputs": [
{
Expand All @@ -284,7 +284,7 @@
"dict_keys(['normal data, normal model', 'normal data (higher noise), normal model', 'skew normal data, normal model', 'skew normal data, skew normal model', 'skew normal data (higher noise), skew normal model', 'normal data, skew normal model'])"
]
},
"execution_count": 7,
"execution_count": 9,
"metadata": {},
"output_type": "execute_result"
}
Expand All @@ -297,7 +297,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 10,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -309,14 +309,14 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 11,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Last updated: 2024-10-11T18:34:57.629742+02:00\n",
"Last updated: 2024-10-13T15:03:43.532805+02:00\n",
"\n"
]
}
Expand Down
Binary file added ...source/notebooks/paper raw data/raw data set for validation with MultiQuant/Template.xlsx
View file
Binary file not shown.
0 ...al model_normal data_noise level 0.6.xlsx → ...al model_normal data_noise level 0.6.xlsx
View file
File renamed without changes.
0 ...al model_normal data_noise level 1.2.xlsx → ...al model_normal data_noise level 1.2.xlsx
View file
File renamed without changes.
0 ...del_skew normal data_noise level 0.6.xlsx → ...del_skew normal data_noise level 0.6.xlsx
View file
File renamed without changes.
0 ...al model_normal data_noise level 0.6.xlsx → ...al model_normal data_noise level 0.6.xlsx
View file
File renamed without changes.
0 ...del_skew normal data_noise level 0.6.xlsx → ...del_skew normal data_noise level 0.6.xlsx
View file
File renamed without changes.
0 ...del_skew normal data_noise level 1.2.xlsx → ...del_skew normal data_noise level 1.2.xlsx
View file
File renamed without changes.
0 docs/source/notebooks/test1_all_data.txt → ...tebooks/paper raw data/test1_all_data.txt
View file
File renamed without changes.
0 docs/source/notebooks/test2_summary.xlsx → ...tebooks/paper raw data/test2_summary.xlsx
View file
File renamed without changes.
0 ...source/notebooks/test3_df_comparison.xlsx → ...s/paper raw data/test3_df_comparison.xlsx
View file
File renamed without changes.

0 comments on commit 4fbaf03

Please sign in to comment.