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

Fix resetting ReturnData::numstepsB when re-using Solver #1841

Merged
merged 10 commits into from
Aug 6, 2022
Merged

Conversation

dweindl
Copy link
Member

@dweindl dweindl commented Aug 1, 2022

Fixes #1813

@codecov
Copy link

codecov bot commented Aug 1, 2022

Codecov Report

Merging #1841 (16cb3cb) into develop (3fecfd7) will increase coverage by 0.67%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1841      +/-   ##
===========================================
+ Coverage    76.32%   77.00%   +0.67%     
===========================================
  Files           74       74              
  Lines        12834    13879    +1045     
===========================================
+ Hits          9796    10687     +891     
- Misses        3038     3192     +154     
Flag Coverage Δ
cpp 72.97% <100.00%> (+0.18%) ⬆️
petab 59.40% <ø> (ø)
python 69.17% <ø> (ø)

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

Impacted Files Coverage Δ
src/amici.cpp 72.53% <100.00%> (+0.79%) ⬆️
src/backwardproblem.cpp 65.42% <100.00%> (+0.65%) ⬆️
python/amici/sbml_import.py 86.62% <0.00%> (-7.20%) ⬇️
python/amici/ode_export.py 91.96% <0.00%> (-0.95%) ⬇️
src/solver_cvodes.cpp 70.23% <0.00%> (+0.16%) ⬆️
src/sundials_matrix_wrapper.cpp 80.57% <0.00%> (+0.40%) ⬆️
src/exception.cpp 81.08% <0.00%> (+5.40%) ⬆️
ThirdParty/gsl/gsl/gsl-lite.hpp 86.44% <0.00%> (+5.48%) ⬆️
src/spline.cpp 72.04% <0.00%> (+6.45%) ⬆️

@FFroehlich FFroehlich marked this pull request as ready for review August 6, 2022 08:12
@FFroehlich
Copy link
Member

sounds like numsteps is also not properly ordered in some cases?

@dweindl
Copy link
Member Author

dweindl commented Aug 6, 2022

sounds like numsteps is also not properly ordered in some cases?

The last one seems to be 0 sometimes 🤔

@dweindl
Copy link
Member Author

dweindl commented Aug 6, 2022

sounds like numsteps is also not properly ordered in some cases?

The last one seems to be 0 sometimes thinking

Ah, for t=inf it should just copy the previous value, as it's supposed to be the cumulative sum.

@FFroehlich
Copy link
Member

FFroehlich commented Aug 6, 2022

sounds like numsteps is also not properly ordered in some cases?

The last one seems to be 0 sometimes thinking

Ah, for t=inf it should just copy the previous value, as it's supposed to be the cumulative sum.

would keep the numbers as is, as otherwise we would also have to carry over numbers from pre-equilibration and it's probably less confusing if these values are kept separate.

@dweindl
Copy link
Member Author

dweindl commented Aug 6, 2022

would keep the numbers as is, as otherwise we would also have to carry over numbers from pre-equilibration and it's probably less confusing if these values are kept separate.

Ok. Could consider changing from cumulative sum to deltas, at some point...

@sonarqubecloud
Copy link

sonarqubecloud bot commented Aug 6, 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 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@dweindl dweindl merged commit 933137f into develop Aug 6, 2022
@dweindl dweindl deleted the fix_1813 branch August 6, 2022 15:53
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.

ReturnData::numstepsB is not set correctly when re-using the same Solver instance
2 participants