-
Notifications
You must be signed in to change notification settings - Fork 7
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
Support for petab v2 experiments #332
Conversation
a28dc47
to
c471ee8
Compare
d2715e9
to
fae03d1
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #332 +/- ##
===========================================
+ Coverage 74.56% 74.66% +0.09%
===========================================
Files 56 56
Lines 5521 5573 +52
Branches 959 976 +17
===========================================
+ Hits 4117 4161 +44
- Misses 1039 1040 +1
- Partials 365 372 +7 ☔ View full report in Codecov by Sentry. |
fae03d1
to
5df89d1
Compare
8806a8e
to
a426ac8
Compare
a426ac8
to
d6f071b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
if exp_id in experiments: # noqa: B023 | ||
i = 1 | ||
while f"{exp_id}_{i}" in experiments: # noqa: B023 | ||
i += 1 | ||
exp_id = f"{exp_id}_{i}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would this occur? Ah, because no symbol is inserted between preeq_cond_id
and sim_cond_id
? Then maybe my suggestion with __
means you can remove this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There might be measurements for ('foo', 'bar')
and (None, 'foo__bar')
which would result in colliding experiment IDs. You never know...
petab/v2/petab1to2.py
Outdated
{ | ||
v2.C.EXPERIMENT_ID: exp_id, | ||
v2.C.CONDITION_ID: preeq_cond_id, | ||
v2.C.TIME: float("-inf"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could use -TIME_STEADY_STATE
, or add some TIME_PREEQUILIBRATION
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added TIME_PREEQUILIBRATION
Co-authored-by: Dilan Pathirana <[email protected]>
Add basic support for PEtab version 2 experiments (see also PEtab-dev/PEtab#586, and PEtab-dev/PEtab#581). Follow-up to #334.
Partially supersedes #263, which was started before petab.v1/petab.v2 were introduced and before PEtab-dev/PEtab#586.
simulationConditionId
s (but does not do full validation yet)