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

Steady state tolerance factor #1758

Merged
merged 18 commits into from
Apr 7, 2022
Merged

Conversation

dilpath
Copy link
Member

@dilpath dilpath commented Apr 4, 2022

Closes #1755, thanks for the feedback there.

operator== is left unchanged as it (practically) already covers the new settings [1]

An alternative to these new settings would be to simply add a fixed multiplier e.g. * 100.0 at [2]

I didn't test extensively, but a factor of 1e1 was sufficient for the single problem I looked at. The default factors in this PR are set to 1e2.

[1] https:/AMICI-dev/AMICI/blob/3d4975cd7fbffd9be588bc8b8f1e925590b3931f/src/solver.cpp#L500-L507=
[2] https:/AMICI-dev/AMICI/blob/3d4975cd7fbffd9be588bc8b8f1e925590b3931f/src/solver.cpp#L796=

Copy link
Member

@dweindl dweindl left a comment

Choose a reason for hiding this comment

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

Looks good to me.

include/amici/solver.h Outdated Show resolved Hide resolved
include/amici/solver.h Outdated Show resolved Hide resolved
include/amici/solver.h Outdated Show resolved Hide resolved
include/amici/solver.h Outdated Show resolved Hide resolved
src/hdf5.cpp Show resolved Hide resolved
Copy link
Member

@FFroehlich FFroehlich left a comment

Choose a reason for hiding this comment

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

👍

@codecov
Copy link

codecov bot commented Apr 7, 2022

Codecov Report

Merging #1758 (dac6c6c) into develop (f6ee397) will decrease coverage by 4.38%.
The diff coverage is 93.61%.

❗ Current head dac6c6c differs from pull request most recent head bf98ae3. Consider uploading reports for the commit bf98ae3 to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1758      +/-   ##
===========================================
- Coverage    78.01%   73.62%   -4.39%     
===========================================
  Files           74       71       -3     
  Lines        12116    12050      -66     
===========================================
- Hits          9452     8872     -580     
- Misses        2664     3178     +514     
Flag Coverage Δ
cpp 75.01% <93.33%> (-0.02%) ⬇️
petab ?
python 68.80% <93.75%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
include/amici/solver.h 83.33% <ø> (ø)
python/amici/petab_import_pysb.py 0.00% <0.00%> (-92.46%) ⬇️
python/amici/sbml_import.py 93.22% <ø> (ø)
src/steadystateproblem.cpp 85.57% <ø> (ø)
src/solver.cpp 77.63% <90.90%> (+0.20%) ⬆️
python/amici/ode_model.py 95.65% <96.00%> (ø)
python/amici/ode_export.py 92.36% <100.00%> (-0.13%) ⬇️
python/amici/pysb_import.py 91.81% <100.00%> (-2.73%) ⬇️
src/hdf5.cpp 90.69% <100.00%> (+0.12%) ⬆️
python/amici/petab_simulate.py 0.00% <0.00%> (-100.00%) ⬇️
... and 15 more

dweindl and others added 8 commits April 7, 2022 13:47
* implement speedup dtotal_cldx_rdata, dx_rdatadx_solver

* fixup flattening

* fixup

* speedup dwdx

* simplify flattening

* cleanup sbml import

* Apply suggestions from code review

Co-authored-by: Daniel Weindl <[email protected]>

* fixup merge

Co-authored-by: Daniel Weindl <[email protected]>
Adapt to separate sbml and pysb test suite (PEtab-dev/petab_test_suite#47)
@dweindl
Copy link
Member

dweindl commented Apr 7, 2022

Remaining PEtab test failure will be fixed by #1753

@dweindl dweindl merged commit 6879ccd into develop Apr 7, 2022
@dweindl dweindl deleted the feature_steady_state_tolerance_factor branch April 7, 2022 21:08
@sonarcloud
Copy link

sonarcloud bot commented Apr 7, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 8 Code Smells

0.0% 0.0% Coverage
2.2% 2.2% Duplication

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.

Default steady-state-by-simulation tolerances should be higher
3 participants