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.calculate: compare all common columns #347

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

dweindl
Copy link
Member

@dweindl dweindl commented Dec 18, 2024

For computing residuals, ... from measurement + simulation tables, we need to match the corresponding rows. Previously, this was done using a subset of PEtab measurement table columns and checking whether all values in these columns match.

This changes it to using the full set of overlapping columns, not only the known measurement columns.
With that, the same functions can be used for PEtab v2 measurement/simulation tables.

For computing residuals, ... from measurement + simulation tables,
we need to match the corresponding rows. Previously, this was done
using a subset of PEtab measurement table columns and checking
whether all values in these columns match.

This changes it to using the full set of overlapping columns,
not only the known measurement columns.
With that, the same functions can be used for PEtab v2
measurement/simulation tables.
@dweindl dweindl requested a review from a team as a code owner December 18, 2024 21:46
Copy link
Member

@dilpath dilpath left a comment

Choose a reason for hiding this comment

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

👍

Could make sense to only check official PEtab columns and avoid custom ones, but I don't see a reason why the custom columns would differ either, so fine 👍

@codecov-commenter
Copy link

codecov-commenter commented Dec 18, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 74.61%. Comparing base (cc33da2) to head (82f392d).

Files with missing lines Patch % Lines
petab/v1/calculate.py 50.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #347      +/-   ##
===========================================
- Coverage    74.67%   74.61%   -0.06%     
===========================================
  Files           56       56              
  Lines         5575     5571       -4     
  Branches       977      978       +1     
===========================================
- Hits          4163     4157       -6     
- Misses        1040     1041       +1     
- Partials       372      373       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dweindl dweindl merged commit e7edebf into PEtab-dev:develop Dec 18, 2024
7 checks passed
@dweindl dweindl deleted the calculate_all_cols branch December 18, 2024 22:20
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.

3 participants