-
Notifications
You must be signed in to change notification settings - Fork 47
Multivariate parameters #862
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
Open
SarahRo
wants to merge
12
commits into
develop
Choose a base branch
from
multivariate-parameters
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #862 +/- ##
===========================================
+ Coverage 89.41% 90.89% +1.47%
===========================================
Files 63 66 +3
Lines 4857 5291 +434
===========================================
+ Hits 4343 4809 +466
+ Misses 514 482 -32 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Introduces a MarginalDistribution class (subclass of Distribution) that is constructed from a BaseMultivariateDistribution. This is achieved by adding a method called 'marginal' to the multivariate distributions that returns the marginal distribution. The pybop.MarginalDistribution retains the original multivariate distribution in the parent_distribution attribute.
The MultivariateParameters class is removed. Instead, a check_multivariate method is added to pybop.Parameters() that checks whether a MarginalDistribution is present and if so whether all parameters have a MarginalDistribution with the same parent_distribution. This method is called in the constructor, the set method and the add method. The call to the method can be disabled in the add and set method by setting the parameter check_multivariate to false. This is, for example, used in the constructor in order to only call the method once all parameters have been added.
The edits to the Parameters class are a little bit hacky. However, this approach means the Problem and Simulator classes do not explicitly need to be aware whether they are dealing with mulitvariate parameters.
An alternative approach would be to discard the changes to pybop.Parameters, reintroduce the MultivariateParameters class and construct the MulitvariateParameters class in pybop.pybamm.Simulator if any parameters of type MultivariateParameter are provided to the constructor as part of the ParameterValues object. This means that Problem and MetaProblem need to distinguish between MultivariateParameters and Parameters as well (this would only require minor edits).
Fixes #856
Type of change
Please add a line in the relevant section of CHANGELOG.md to document the change (include PR #).
Important checks:
Please confirm the following before marking the PR as ready for review:
$ pre-commit runor$ nox -s pre-commit(see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)nox -s testsnox -s doctest