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

PEtab import: Fix potentially incorrect sensitivities with state-depe… #2562

Merged
merged 1 commit into from
Oct 24, 2024

Conversation

dweindl
Copy link
Member

@dweindl dweindl commented Oct 23, 2024

…ndent sigmas

Due to PEtab not allowing and observables in noiseFormula and AMICI not allowing state variables in sigma expressions, we are trying to replace any state variables by matching observables during PEtab import.

However, if there were multiple observables with the same observableFormula, or one observableFormula was contained in another one, the substition of observableFormula for observableId could - depending on the ordering - result in noiseFormulas depending on other observables, which could lead to incorrect sensitivities due to #2561.

This change ensures that we are only using the observableId from the same row of the observable table as the noiseFormula.

…ndent sigmas

Due to PEtab not allowing and observables in noiseFormula and
AMICI not allowing state variables in sigma expressions, we are trying
to replace any state variables by matching observables during PEtab import.

However, if there were multiple observables with the same observableFormula,
or one observableFormula was contained in another one, the substition
of observableFormula for observableId could - depending on the ordering -
result in noiseFormulas depending on other observables, which could lead to
incorrect sensivities due to AMICI-dev#2561.

This change ensures that we are only using the observableId from the same
row of the observable table as the noiseFormula.

---------

Co-authored-by: Dilan Pathirana <[email protected]>
Copy link

codecov bot commented Oct 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.75%. Comparing base (638c3ee) to head (f4cee4a).
Report is 2 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2562      +/-   ##
===========================================
- Coverage    77.76%   77.75%   -0.01%     
===========================================
  Files          325      325              
  Lines        21858    21857       -1     
  Branches      1473     1473              
===========================================
- Hits         16997    16996       -1     
  Misses        4834     4834              
  Partials        27       27              
Flag Coverage Δ
cpp 73.63% <0.00%> (+<0.01%) ⬆️
cpp_python 34.20% <100.00%> (-0.01%) ⬇️
petab 37.07% <100.00%> (-0.01%) ⬇️
python 72.41% <100.00%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
python/sdist/amici/petab/import_helpers.py 85.93% <100.00%> (-0.22%) ⬇️

@dweindl dweindl marked this pull request as ready for review October 23, 2024 16:39
@dweindl dweindl requested a review from a team as a code owner October 23, 2024 16:39
@dweindl dweindl self-assigned this Oct 23, 2024
@dweindl dweindl merged commit 9c603e1 into AMICI-dev:develop Oct 24, 2024
20 checks passed
@dweindl dweindl deleted the fix_observable_dependent_noise branch October 24, 2024 08: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.

2 participants