Fixes #2331 hiearchy of parmaeter value does not work with distribute… #2332
Conversation
This file contains 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
msevestre
commented
Oct 5, 2024
| @@ -13,7 +13,8 @@ public DiscreteDistributionFormula() : base(DistributionType.Discrete) | |||
| protected override double CalculateFor(IReadOnlyList<IObjectReference> usedObjects, IUsingFormula dependentObject) | |||
| { | |||
| var distributedParameter = dependentObject.ConvertedTo<IDistributedParameter>(); | |||
| return CalculateValueFromPercentile(distributedParameter.Percentile, distributedParameter); | |||
| //percentile not used in this formula | |||
| return CalculateValueFromPercentile(Constants.DEFAULT_PERCENTILE, distributedParameter); | |||
There was a problem hiding this comment.
the parameter is not used. might was well not retrieve it (not related to this error)
| @@ -111,24 +111,44 @@ private IParameter getOrAddModelParameter(ValueUpdaterParams valueUpdater, Param | |||
| parameter = _parameterValueToParameterMapper.MapFrom(parameterValue); | |||
|
|
|||
| simulationBuilder.AddBuilderReference(parameter, parameterValue); | |||
|
|
|||
| //now we remove the parameter by name from the parent container just in case it already exists but with a different type (distributed vs not distributed) | |||
| var potentialParameter = parentContainer.Parameter(parameterValue.Name); | |||
There was a problem hiding this comment.
before we were only landing in this code if a parameter did not exist. Now we also land there if it exists but with a different type
| public void should_overwrite_the_parameter_value_with_the_value_of_the_parameter() | ||
| { | ||
| var parameter = _model.Root.EntityAt<IParameter>("Liver", "Param"); | ||
| parameter.Value.ShouldBeEqualTo(24.28, 1e-2); |
There was a problem hiding this comment.
value of the distribution using the percentile of 0.8 (assuming this is right, I did not verify...)
rwmcintosh
approved these changes
Oct 6, 2024
Yuri05
reviewed
Oct 6, 2024
| //now we remove the parameter by name from the parent container just in case it already exists but with a different type (distributed vs not distributed) | ||
| var potentialParameter = parentContainer.Parameter(parameterValue.Name); | ||
| parentContainer.RemoveChild(potentialParameter); | ||
|
|
There was a problem hiding this comment.
RemoveChild will not crash if potentialParameter is null?
There was a problem hiding this comment.
I certainly hope not but this is something I just assumed lol
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.
…d parameters
Fixes #2331
Description
Well this was a tricky one! As I expected, the issue is because we are updating a NON_DISTRIBUTED Parameter by a DISTRIBUTED_PARAMETER. it works if the parameter does not exist because it's created. But in the case outlined by @PavelBal , the parameter was created by the other Module and therefore the update routine did not work. This PR removes the existing parameters if they don't have the same structure and add them again
Spent most of the time trying to reproduce the bug.. as always :)
Type of change
Please mark relevant options with an
xin the brackets.How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Reviewer checklist
Mark everything that needs to be checked before merging the PR.
This change requires a documentation updateabove is selectedScreenshots (if appropriate):
Questions (if appropriate):