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 reinitialization cases. Closes #30 #35

Merged
merged 5 commits into from
Nov 26, 2020

Conversation

LeonardSchmiester
Copy link
Collaborator

I added a Case for NaN's in the condition table. Also changed Case 10 to have different values for preeq and sim conditions for species B as the previous implementation did not catch all cases, where reinitialization did not work properly (see AMICI-dev/AMICI#1319).

@LeonardSchmiester
Copy link
Collaborator Author

Might be good to also add a case similar to 10, just with the init parameters instead of the species in the condition table?!

For preequilibration, species `B` is initialized with `0`. For simulation,
`B` is set to `NaN`, meaning that it is initialized with the result from
preequilibration.
For `A` the preequilibration result is to be used.
Copy link
Member

Choose a reason for hiding this comment

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

What about changing the test to reinitializing A (and continuing B) to ensure, that not just everything is continued from steadystate if there is a NaN somewhere? Looks good otherwise, thanks.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sounds good. I changed it accordingly.

@dweindl dweindl linked an issue Nov 25, 2020 that may be closed by this pull request
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 good to me. Maybe change target to develop as a test gets changed and one added, and discuss to update the test suite in the next PEtab meeting?

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.

Thanks, looks good to me.

@LeonardSchmiester LeonardSchmiester changed the base branch from master to develop November 26, 2020 09:35
@LeonardSchmiester LeonardSchmiester merged commit 7f62360 into develop Nov 26, 2020
@LeonardSchmiester LeonardSchmiester deleted the feature_reinitialization_cases branch November 26, 2020 09:38
dweindl added a commit to AMICI-dev/AMICI that referenced this pull request Feb 18, 2021
…fixes (#1417)

Adds possibility to provide state indices for selective reinitialization based on fixed parameters.

The previous `ExpData::reinitializeFixedParameterInitialStates` is still there, but will be removed in an upcoming version.


Addresses #1345, #1396, #1319

Supersedes #1344 

Include new test cases from PEtab-dev/petab_test_suite#35
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.

Add further tests for preequilibration and reinitialization
3 participants