Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brushing over notebook #1470

Merged
merged 29 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
aa88768
shortening many optimizations. Replacing Boehm with conversion reacti…
PaulJonasJost Sep 18, 2024
7fb1b5a
Correctly install pyswarms in notebooks1
PaulJonasJost Sep 18, 2024
a1a54f7
renamed "model_conversion_reaction" to "conversion_reaction" accordin…
PaulJonasJost Sep 18, 2024
8dced60
Revert "renamed "model_conversion_reaction" to "conversion_reaction" …
PaulJonasJost Sep 19, 2024
646b7fe
reverted changes and kept original structure. adjusted amici.ipynb
PaulJonasJost Sep 19, 2024
667199d
changed directory
PaulJonasJost Sep 19, 2024
bfac160
changed directory II
PaulJonasJost Sep 19, 2024
b6c1624
Start out with boehm, for optimization etc change to conversion reaction
PaulJonasJost Sep 19, 2024
0e9d274
fixed custom_objective_function
PaulJonasJost Sep 19, 2024
cbf26b8
for now: more starts with pyswarms.
PaulJonasJost Sep 19, 2024
ad8e004
changed julia notebooks ever so slightly.
PaulJonasJost Sep 20, 2024
4e2a9e4
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Sep 24, 2024
cc64fb7
Revert changes to julia notebook
PaulJonasJost Sep 24, 2024
3b2b6a0
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Sep 25, 2024
c42094c
Integrate comments
PaulJonasJost Sep 26, 2024
683ea43
Merge remote-tracking branch 'origin/brush_over_notebooks' into brush…
PaulJonasJost Sep 26, 2024
0268a7d
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Sep 30, 2024
eab1bbe
Correct PEtab logo now.
PaulJonasJost Oct 1, 2024
19798a2
Update doc/example/getting_started.ipynb
PaulJonasJost Oct 1, 2024
ec9ce42
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Oct 1, 2024
bcd88ee
Update doc/example/getting_started.ipynb
PaulJonasJost Oct 1, 2024
b71ad29
Adjusted amici logo
PaulJonasJost Oct 2, 2024
de2beb7
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Oct 2, 2024
a7b5124
Removed pyswarms from waterfall visualization
PaulJonasJost Oct 7, 2024
1c7c33d
Merge remote-tracking branch 'origin/brush_over_notebooks' into brush…
PaulJonasJost Oct 7, 2024
4b2ef65
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Oct 8, 2024
e12f884
Fixed a random seed for sampling notebook
PaulJonasJost Oct 8, 2024
cf4aa31
Merge remote-tracking branch 'origin/brush_over_notebooks' into brush…
PaulJonasJost Oct 8, 2024
db1168a
Merge branch 'develop' into brush_over_notebooks
PaulJonasJost Oct 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
296 changes: 269 additions & 27 deletions doc/example/amici.ipynb
PaulJonasJost marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions doc/example/censored_data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "dev_venv",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -251,7 +251,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.2"
"version": "3.12.3"
},
"vscode": {
"interpreter": {
Expand All @@ -260,5 +260,5 @@
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
9 changes: 5 additions & 4 deletions doc/example/conversion_reaction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
},
"outputs": [],
"source": [
"%%time\n",
"# create objective function from amici model\n",
"# pesto.AmiciObjective is derived from pesto.Objective,\n",
"# the general pesto objective function class\n",
Expand All @@ -157,7 +158,7 @@
"\n",
"# do the optimization\n",
"result = optimize.minimize(\n",
" problem=problem, optimizer=optimizer, n_starts=100, filename=None\n",
" problem=problem, optimizer=optimizer, n_starts=10, filename=None\n",
PaulJonasJost marked this conversation as resolved.
Show resolved Hide resolved
")"
]
},
Expand Down Expand Up @@ -221,7 +222,7 @@
" problem=problem,\n",
" result=result,\n",
" optimizer=optimizer,\n",
" profile_index=np.array([1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0]),\n",
" profile_index=np.array([0,1]),\n",
" result_index=0,\n",
" profile_options=profile_options,\n",
" filename=None,\n",
Expand Down Expand Up @@ -270,7 +271,7 @@
")\n",
"\n",
"result = sample.sample(\n",
" problem, n_samples=10000, sampler=sampler, result=result, filename=None\n",
" problem, n_samples=1000, sampler=sampler, result=result, filename=None\n",
PaulJonasJost marked this conversation as resolved.
Show resolved Hide resolved
")"
]
},
Expand Down Expand Up @@ -425,7 +426,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.7"
"version": "3.12.3"
}
},
"nbformat": 4,
Expand Down
Loading