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

Feature cmaes #457

Merged
merged 32 commits into from
Sep 16, 2020
Merged

Feature cmaes #457

merged 32 commits into from
Sep 16, 2020

Conversation

PhilippStaedter
Copy link
Contributor

branch with integrated optimizer cma-es

setup.py Outdated Show resolved Hide resolved
test/test_optimize.py Outdated Show resolved Hide resolved
pypesto/optimize/optimizer.py Outdated Show resolved Hide resolved
PhilippStaedter and others added 3 commits September 8, 2020 16:47
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
@yannikschaelte yannikschaelte changed the base branch from master to develop September 8, 2020 14:56
setup.py Outdated Show resolved Hide resolved
pypesto/optimize/optimizer.py Outdated Show resolved Hide resolved
pypesto/optimize/optimizer.py Show resolved Hide resolved
pypesto/optimize/optimizer.py Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Sep 8, 2020

Codecov Report

Merging #457 into develop will increase coverage by 0.00%.
The diff coverage is 80.76%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #457   +/-   ##
========================================
  Coverage    91.06%   91.06%           
========================================
  Files           69       69           
  Lines         3971     3997   +26     
========================================
+ Hits          3616     3640   +24     
- Misses         355      357    +2     
Impacted Files Coverage Δ
pypesto/optimize/__init__.py 100.00% <ø> (ø)
pypesto/optimize/optimizer.py 89.37% <80.76%> (-0.99%) ⬇️
pypesto/objective/amici_util.py 89.81% <0.00%> (+0.92%) ⬆️
pypesto/sample/geweke_test.py 94.36% <0.00%> (+2.81%) ⬆️

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 2ea8e67...01b602b. Read the comment docs.

pypesto/optimize/optimizer.py Outdated Show resolved Hide resolved
pypesto/optimize/optimizer.py Outdated Show resolved Hide resolved
@dweindl
Copy link
Member

dweindl commented Sep 16, 2020

Codacy Here is an overview of what got changed by this pull request:

Complexity increasing per file
==============================
- test/test_optimize.py  1
         

See the complete overview on Codacy

@PhilippStaedter PhilippStaedter merged commit f53a9ec into develop Sep 16, 2020
@PhilippStaedter PhilippStaedter deleted the feature_cmaes branch September 16, 2020 11:46
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>
m-philipps pushed a commit that referenced this pull request Jun 14, 2022
* saving visu spec

* unnecessary imports removed


Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
m-philipps pushed a commit that referenced this pull request Jun 14, 2022
Release 0.1.9

Library:

* Allow URL as filenames for YAML files and SBML models (Closes #187) (#459)
* Allow model time in observable formulas (#445)
* Make float parsing from CSV round-trip (#444)
* Validator: Error message for missing IDs, with line numbers. (#467)
* Validator: Detect duplicated observable IDs (#446)
* Some documentation and CI fixes / updates
* Visualization: Add option to save visualization specification (#457)
* Visualization: Column XValue not mandatory anymore (#429)
* Visualization: Add sorting of indices of dataframes for the correct sorting
  of x-values (#430)
* Visualization: Default value for the column x_label in vis_spec (#431)
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.

6 participants