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

Add properties for fixed/free and scaled values #268

Merged
merged 7 commits into from
Feb 7, 2020
Merged

Conversation

yannikschaelte
Copy link
Member

No description provided.

@yannikschaelte yannikschaelte self-assigned this Feb 6, 2020
petab/problem.py Outdated Show resolved Hide resolved
yannikschaelte and others added 2 commits February 6, 2020 23:37
Co-Authored-By: Daniel Weindl <dweindl@users.noreply.github.com>
@codecov-io
Copy link

codecov-io commented Feb 6, 2020

Codecov Report

Merging #268 into develop will decrease coverage by <.01%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           develop    #268      +/-   ##
==========================================
- Coverage     71.2%   71.2%   -0.01%     
==========================================
  Files           22      22              
  Lines         1688    1691       +3     
  Branches       364     365       +1     
==========================================
+ Hits          1202    1204       +2     
- Misses         407     408       +1     
  Partials        79      79
Impacted Files Coverage Δ
petab/visualize/helper_functions.py 89.47% <0%> (-0.53%) ⬇️
petab/measurements.py 74.48% <100%> (+0.53%) ⬆️

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 f62b7ad...50512ab. Read the comment docs.

@yannikschaelte yannikschaelte merged commit f766a50 into develop Feb 7, 2020
@yannikschaelte yannikschaelte deleted the fixes_ys branch February 7, 2020 05:10
LeonardSchmiester added a commit that referenced this pull request Feb 11, 2020
* Add pylint config

* Fixes ys (#237)

* fix merge error

* add petablint yaml test

* add parameters test

* Parameter mapping should include all model parameters (#235)

Closes #103

* Parameter mapping should include all model parameters
* Known values should be filled in
* Extend and update tests
* Refactor parameter mapping
* properly handle estimated and non-estimated parameters
* Fix wrong parameter scale returned from mapping
* ...

* Allow initial concentrations / sizes in condition table (#238)

* Allow species and compartments in condition table

* Updated doc allowing for states etc in condition file

* Update pylint: allow lower-case constants

* Export __format_version__

* Fix returning floats as strings in case there are parameter names in the condition table

Co-authored-by: LeonardSchmiester <leonard.schmiester@helmholtz-muenchen.de>

* Barplots and Replicates with Simulation data (#214)

Fixes #196, fixes #210, fixes #213

* Cleanup visualization (#240)

* Add constants for visualization field IDs
* .. and some others
* start using them
* formatting, ...

* Observables table instead of SBML assignment rules (#244)

Closes #201, closes #241 

* Update data format doc for observable table

* Add field name constants for observable table

* Add observables table to petab.Problem

* Update YAML schema and CompositeProblem

* Add functions for writing PEtab dataframes to files

* Deprecate SBML-observable functions

* Implement validation for observable table

* Add function for converting SBML-observable models to observable table

* Use costants for PEtab table fields

* Update PEtab files illustration

* Fix most pylint issues (Closes #234)

* Update vis to observalble table (Closes #246)

  No need to check for equal NOISE_DISTRIBUTION and OBSERVABLE_TRANSFORMATION anymore, so they are no longer included in the measurement table, and cannot differ for the same observableId

* Fix and update flatten_timepoint_specific_output_overrides

  Closes #247

  Was creating wrong observables before

* Address review comments

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

* Release 0.1.0; file format version 1

* Fix parameter mapping: include output parameters not present in SBML model

* Add convenience functions to petab.Problem

* get_optimization_parameter_scales
* get_optimization_to_simulation_scale_mapping
* add tests

* Fix petab/petab_schema.yaml missing in pypi package

* Update pylint ignorelist

* Update README

* Remove obsolete functions

... related to hierarchical optimization, which should be kept outside PEtab

* Let get_placeholders return an (ordered) list of placeholders

because it is much more useful

* Add check for valid identifiers (Closes #179) (#253)

Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>

* Deprecate petab.problem.from_folder (Closes #245)

... as well as get_default_*_file_name

* Release 0.1.1

* Barplot uniform coloring & yScale=log fix #196 (#255)


* resolves #197

* small fix

* change all barplot colors to blue

* allow to extract only estimate parameters (#256)

* allow to extract only estimate parameters

* add docstrings

* Visu callobs par (#262)

* fix #261

* corrected flake8 error - line too long

* deleted white space

* add F403 to falke8 tests

* Fix handling of numeric observable/noiseFormula in observable table (Fixes #264)

* Add properties for fixed/free and scaled values (#268)

* allow to extract only estimate parameters

* add docstrings

* return scaled versions of arrays

* Update petab/problem.py

Co-Authored-By: Daniel Weindl <dweindl@users.noreply.github.com>

Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>

* Observables function (#269)

* allow to extract only estimate parameters

* add docstrings

* return scaled versions of arrays

* Update petab/problem.py

Co-Authored-By: Daniel Weindl <dweindl@users.noreply.github.com>

* add get_observables function

* add observables test; use observables file in petab test

* fix typo

* move get_observables to ..._ids

* remove unused arg

* add docstring

* fix lint

* fix pylint

* fix flake8

Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>

* Fix documentation hierarchy

* Add functions to get all of fixed|free, scaled parameter values (#273)

* allow to extract only estimate parameters

* add docstrings

* return scaled versions of arrays

* Update petab/problem.py

Co-Authored-By: Daniel Weindl <dweindl@users.noreply.github.com>

* add get_observables function

* add observables test; use observables file in petab test

* fix typo

* move get_observables to ..._ids

* remove unused arg

* add docstring

* fix lint

* fix pylint

* fix flake8

* fix typo

* streamline fixed|free|all, and scaled values

* fix default args

* fix codacy

* address reviewer comment: return empty list

* add docstring#

* add more docstrings

* fix var type error

* address reviewer comments

Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>

* Default column to look for simulation results should be 'simulation'

* PEtab COMBINE archives (#271)

* Add create_combine_archive for generation of COMBINE archives

* Add support for reading PEtab COMBINE archives

* Add tests for COMBINE archive r/w

* Fix sbml_observables_to_table - got broken in eb5453

* Increase test coverage (#278)

* allow to extract only estimate parameters

* add docstrings

* return scaled versions of arrays

* Update petab/problem.py

Co-Authored-By: Daniel Weindl <dweindl@users.noreply.github.com>

* add get_observables function

* add observables test; use observables file in petab test

* fix typo

* move get_observables to ..._ids

* remove unused arg

* add docstring

* fix lint

* fix pylint

* fix flake8

* fix typo

* streamline fixed|free|all, and scaled values

* fix default args

* fix codacy

* address reviewer comment: return empty list

* add docstring#

* add more docstrings

* fix var type error

* address reviewer comments

* add parameter properties test

* add tests for get/write_parameter_df

* add measurements tests

* add conditions tests

* fix conditions create function

* add parameter tests

* add observables tests

* fixup

* add docstrings

* address reviewer comments

* random edit to see if codacy is happy

* random stuff to annoy codecov

Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>

Co-authored-by: Daniel Weindl <dweindl@users.noreply.github.com>
Co-authored-by: Yannik Schälte <31767307+yannikschaelte@users.noreply.github.com>
Co-authored-by: LeonardSchmiester <leonard.schmiester@helmholtz-muenchen.de>
Co-authored-by: Simon Merkt <49190262+MerktSimon@users.noreply.github.com>
Co-authored-by: Polina Lakrisenko <p.lakrisenko@gmail.com>
Co-authored-by: LaraFuhrmann <55209716+LaraFuhrmann@users.noreply.github.com>
@yannikschaelte yannikschaelte mentioned this pull request Feb 20, 2020
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