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

numpy based subindexing in amici_util #462

Merged
merged 9 commits into from
Sep 25, 2020
Merged

Conversation

FFroehlich
Copy link
Contributor

@FFroehlich FFroehlich commented Sep 17, 2020

Substantially improves efficiency for higher dimensional problems.

Copy link
Member

@yannikschaelte yannikschaelte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

pypesto/objective/amici_util.py Show resolved Hide resolved
@yannikschaelte
Copy link
Member

Substantially improves efficiency for higher dimensional problems.

Do you have any numbers by chance?

@FFroehlich
Copy link
Contributor Author

Substantially improves efficiency for higher dimensional problems.

Do you have any numbers by chance?

Substantially improves efficiency for higher dimensional problems.

Do you have any numbers by chance?

For a problem 1599x1599 Hessian I waited multiple minutes and the index based implementation didn't finish. With this, evaluation is <1s and loading/reshaping the hessian from AMICI actually becomes rate limiting.

@yannikschaelte
Copy link
Member

Good to know. So for problems of that size, we may want to keep in mind that some routines in pyPESTO can become limiting, not AMICI, so good to always keep an eye on performance ...

@codecov-commenter
Copy link

Codecov Report

Merging #462 into develop will decrease coverage by 0.11%.
The diff coverage is 71.42%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #462      +/-   ##
===========================================
- Coverage    91.03%   90.91%   -0.12%     
===========================================
  Files           70       70              
  Lines         4015     4018       +3     
===========================================
- Hits          3655     3653       -2     
- Misses         360      365       +5     
Impacted Files Coverage Δ
pypesto/optimize/optimize.py 97.50% <ø> (ø)
pypesto/optimize/optimizer.py 89.32% <ø> (-0.05%) ⬇️
pypesto/objective/amici_util.py 83.03% <71.42%> (-5.86%) ⬇️
pypesto/engine/multi_process.py 92.30% <0.00%> (+7.69%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4a10ffd...52dc2b9. Read the comment docs.

@FFroehlich FFroehlich merged commit 1dba11f into develop Sep 25, 2020
@FFroehlich FFroehlich deleted the feature_amici_npslicing branch September 25, 2020 17:30
jvanhoefer added a commit that referenced this pull request Oct 5, 2020
* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* V 021 (#455) (#456)

* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* prepare version 0.2.1

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Feature cmaes (#457)

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* integration of cma-es optimizer

* updated version

* updated version

* Update setup.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* fix flake8

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>

* Plot convergence summary and update outdated notebook (#446)

* update severely outdated example notebook

* add convergence visualization

* fix nans

* fix flake

* update docstring

* use problem.get_reduced_vector

* fix typehints + docstring

* Update pypesto/visualize/optimizer_convergence.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* add to notebook, fix scale, add grad to vis test

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix type checks visualization reference points (#460)

* fix for new amici release (#469)

* fix for new amici release

* update amici requirement

* allow longer travis wait time

Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>

* fix arguments dlib (#466) (closes #465)

* fix arguments ipopt

* update docu minimize fct.

* fix test_sbml_conversion.py

Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>

* numpy based subindexing in amici_util (#462)

* Update amici_util.py

* add return doc

* fixups

* fix test

* fix for non-unique par_opt_slice

* reduce function complexity

* add check for installation ipopt (#470) closes #468

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>

* check optional requirements amici/petab in PEtab import (#477)

* add maxiter to Dlibs default options fixes #474 (#476)

* add maxiter to Dlibs default options

* Update pypesto/optimize/optimizer.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix y_limits in waterfall plot for list of result objects (#475)

* prepare v022 (#479)

* prepare v022

* fix review suggestions

* Fix merge conflicts (#481)

* V 021 (#455)

* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* prepare version 0.2.1

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* fix flake8

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>
Co-authored-by: PhilippStaedter <42141163+PhilippStaedter@users.noreply.github.com>
Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>
jvanhoefer added a commit that referenced this pull request Jan 18, 2021
* release v0.2.2 (#480)

* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* V 021 (#455) (#456)

* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* prepare version 0.2.1

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Feature cmaes (#457)

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* updated python script with not yet finished integration of cma-es optimizer

* integration of cma-es optimizer

* updated version

* updated version

* Update setup.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* updated version

* fix flake8

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>

* Plot convergence summary and update outdated notebook (#446)

* update severely outdated example notebook

* add convergence visualization

* fix nans

* fix flake

* update docstring

* use problem.get_reduced_vector

* fix typehints + docstring

* Update pypesto/visualize/optimizer_convergence.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* add to notebook, fix scale, add grad to vis test

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix type checks visualization reference points (#460)

* fix for new amici release (#469)

* fix for new amici release

* update amici requirement

* allow longer travis wait time

Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>

* fix arguments dlib (#466) (closes #465)

* fix arguments ipopt

* update docu minimize fct.

* fix test_sbml_conversion.py

Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>

* numpy based subindexing in amici_util (#462)

* Update amici_util.py

* add return doc

* fixups

* fix test

* fix for non-unique par_opt_slice

* reduce function complexity

* add check for installation ipopt (#470) closes #468

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>

* check optional requirements amici/petab in PEtab import (#477)

* add maxiter to Dlibs default options fixes #474 (#476)

* add maxiter to Dlibs default options

* Update pypesto/optimize/optimizer.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix y_limits in waterfall plot for list of result objects (#475)

* prepare v022 (#479)

* prepare v022

* fix review suggestions

* Fix merge conflicts (#481)

* V 021 (#455)

* Parameters plot, #418 (#425)

* parameters plot, plotting a subset of parameters (#418)
* "Variable used before assignment" fixed for parameters plot (#364)

* Feature autocorrelation - close #251 (#426)

* autocorrelation calculation by sokal

* docs

* notebook using ess

* added ess and ac in result

* created ess calculation

* rename variable

* docs

* fix

* remove print from test

* parameter index in 1d marginal plot

* added type

* added type

* docu

* flake8

* Update pypesto/sample/diagnostics.py

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* docs

* docs

* grammar thingy

* handle in get_data_to_plot in visu

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* fix display for least squares solver (#430)

fix #429

* basic sanity checking for parameter fixing (#420)

* basic sanity checking for parameter fixing

* fixup type checks

* fixup

* fix typehints

* fixup & refactor

* update doc

* fixup

* Fix amici error output, fixes #427 (#428)

* initial fix

* add filter function

* unify error and base initialization of return values

* Profile options (#419)

* change profile indexing to parameter indices instead of boolean indexing

* adapt also approximation and test to new profile api

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Prior Example, closes # 434 (#438)

* Add notebook prior definition

* fix sphinx

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/example/prior_definition.ipynb

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Improve notebook

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Fix offset_y and scale_y in waterfal plot (#441)

* Correct offset_y for waterfall plots of result lists

* enforce y_limits which show whole data when plotting result lists, if no explicit user input was given

* fix nans and infs, deal with possibly different number of optiimzation runs in different result objects

* fix 2 typos (#444)

Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* Update priors.py (#448)

* Fix optimization with priors (#452)

* Update priors.py

* Update priors.py

* Fix PEtab import (Priors) (#454), closes #447

* bugfix + compliance to current PEtab version in prior import

* resolve review + flake8

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* prepare version 0.2.1

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

* Update doc/releasenotes.rst

Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

* fix flake8

Co-authored-by: Jakob Vanhoefer <38346459+jvanhoefer@users.noreply.github.com>
Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>
Co-authored-by: PhilippStaedter <42141163+PhilippStaedter@users.noreply.github.com>
Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>

* fix dublicate

* rerun github actions

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: Elba Raimúndez Alvarez <elba.raimundez@helmholtz-muenchen.de>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: Fabian Fröhlich <fabian@schaluck.com>
Co-authored-by: Paul Stapor <paul.stapor@helmholtz-muenchen.de>
Co-authored-by: Thomas S. Ligon <tom@thomassligon.info>
Co-authored-by: PhilippStaedter <42141163+PhilippStaedter@users.noreply.github.com>
Co-authored-by: yannikschaelte <yannik.schaelte@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants