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

Fixing Aggregated Objective Visualisations #1411

Merged
merged 14 commits into from
Jun 13, 2024
Merged

Conversation

arrjon
Copy link
Contributor

@arrjon arrjon commented Jun 7, 2024

Fixes the isses mentioned in #1410 so AggregatedObjective can be used in the visualize.model_fit function.

@arrjon arrjon self-assigned this Jun 7, 2024
@arrjon arrjon added bug Something isn't working AMICI labels Jun 7, 2024
@codecov-commenter
Copy link

codecov-commenter commented Jun 10, 2024

Codecov Report

Attention: Patch coverage is 65.21739% with 16 lines in your changes missing coverage. Please review.

Project coverage is 83.85%. Comparing base (f183b3c) to head (0f63738).

Files Patch % Lines
pypesto/visualize/model_fit.py 64.44% 16 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1411      +/-   ##
===========================================
- Coverage    83.89%   83.85%   -0.05%     
===========================================
  Files          160      160              
  Lines        13067    13096      +29     
===========================================
+ Hits         10963    10982      +19     
- Misses        2104     2114      +10     

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

@arrjon
Copy link
Contributor Author

arrjon commented Jun 10, 2024

For the moment I iterate over the objectives in AggregatedObjectives to find all amici models and plot them individually. For the case with only one model and a NegLogPrior objective this works fine.

However, I did not test the function using a petab problem with multiple amici models. Potentially, one needs to extract information from the petab measurement file specific to the corresponding model.

@arrjon arrjon marked this pull request as ready for review June 10, 2024 09:33
@arrjon arrjon requested a review from dweindl June 10, 2024 09:34
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.

pypesto/visualize/model_fit.py Outdated Show resolved Hide resolved
pypesto/visualize/model_fit.py Outdated Show resolved Hide resolved
pypesto/visualize/model_fit.py Outdated Show resolved Hide resolved
pypesto/visualize/model_fit.py Outdated Show resolved Hide resolved
Copy link
Contributor

@Doresic Doresic 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! Thanks
Might be good to add a test in test/test_visualize.py testing a case with an aggregated objective (similar to test_visualize_optimized_model_fit() or an extension of it).

@arrjon arrjon merged commit 0bf7f36 into develop Jun 13, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AMICI bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants