Skip to content

Commit

Permalink
Fixes #2141 Extract mapper to create parameters from individual param…
Browse files Browse the repository at this point in the history
…eters (#2142)

* Fixes #2141 Extract mapper to create parameters from individual parameters

* Add pr checklist

* PR feedback
  • Loading branch information
rwmcintosh authored Oct 14, 2023
1 parent b5741c5 commit a61c702
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 15 deletions.
39 changes: 39 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
Fixes #

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

## Type of change

Please mark relevant options with an `x` in the brackets.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update
- [ ] Algorithm update - updates algorithm documentation/questions/answers etc.
- [ ] Other (please describe):

# 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

- [ ] Integration tests
- [ ] Unit tests
- [ ] Manual tests
- [ ] No tests required

# Reviewer checklist

Mark everything that needs to be checked before merging the PR.

- [ ] Check if the code is well documented
- [ ] Check if the behavior is what is expected
- [ ] Check if the code is well tested
- [ ] Check if the code is readable and well formatted
- [ ] Additional checks (document below if any)

# Screenshots (if appropriate):

# Questions (if appropriate):
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using OSPSuite.Core.Domain.Builder;
using OSPSuite.Utility;

namespace OSPSuite.Core.Domain.Mappers
{
public interface IIndividualParameterToParameterMapper : IMapper<IndividualParameter, IParameter>
{
}

public class IndividualParameterToParameterMapper : IIndividualParameterToParameterMapper
{
private readonly IParameterFactory _parameterFactory;

public IndividualParameterToParameterMapper(IParameterFactory parameterFactory)
{
_parameterFactory = parameterFactory;
}

public IParameter MapFrom(IndividualParameter individualParameter)
{
var name = individualParameter.Name;
var dimension = individualParameter.Dimension;
var displayUnit = individualParameter.DisplayUnit;
var distributionType = individualParameter.DistributionType;

//if the distribution is undefined or the value is set, we create a default parameter to ensure that the value will take precedence.
//Otherwise, we create a distributed parameter and assume that required sub-parameters will be created as well
var parameter = distributionType == null || individualParameter.Value != null ?
_parameterFactory.CreateParameter(name, dimension: dimension, displayUnit: displayUnit) :
_parameterFactory.CreateDistributedParameter(name, distributionType.Value, dimension: dimension, displayUnit: displayUnit);

return parameter.WithUpdatedMetaFrom(individualParameter);
}
}
}
21 changes: 6 additions & 15 deletions src/OSPSuite.Core/Domain/Services/QuantityValuesUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using OSPSuite.Assets;
using OSPSuite.Core.Domain.Builder;
using OSPSuite.Core.Domain.Formulas;
using OSPSuite.Core.Domain.Mappers;
using OSPSuite.Utility.Extensions;

namespace OSPSuite.Core.Domain.Services
Expand All @@ -29,20 +30,20 @@ internal class QuantityValuesUpdater : IQuantityValuesUpdater
private readonly ICloneManagerForModel _cloneManagerForModel;
private readonly IFormulaFactory _formulaFactory;
private readonly IConcentrationBasedFormulaUpdater _concentrationBasedFormulaUpdater;
private readonly IParameterFactory _parameterFactory;
private readonly IIndividualParameterToParameterMapper _individualParameterToParameterMapper;

public QuantityValuesUpdater(
IKeywordReplacerTask keywordReplacerTask,
ICloneManagerForModel cloneManagerForModel,
IFormulaFactory formulaFactory,
IConcentrationBasedFormulaUpdater concentrationBasedFormulaUpdater,
IParameterFactory parameterFactory)
IIndividualParameterToParameterMapper individualParameterToParameterMapper)
{
_keywordReplacerTask = keywordReplacerTask;
_cloneManagerForModel = cloneManagerForModel;
_formulaFactory = formulaFactory;
_concentrationBasedFormulaUpdater = concentrationBasedFormulaUpdater;
_parameterFactory = parameterFactory;
_individualParameterToParameterMapper = individualParameterToParameterMapper;
}

public void UpdateQuantitiesValues(ModelConfiguration modelConfiguration)
Expand Down Expand Up @@ -92,20 +93,10 @@ private IParameter getOrAddModelParameter(ModelConfiguration modelConfiguration,
if (parentContainer == null)
return null;

var name = individualParameter.Name;
var dimension = individualParameter.Dimension;
var displayUnit = individualParameter.DisplayUnit;
var distributionType = individualParameter.DistributionType;

//if the distribution is undefined or the value is set, we create a default parameter to ensure that the value will take precedence.
//Otherwise, we create a distributed parameter and assume that required sub-parameters will be created as well
parameter = distributionType == null || individualParameter.Value != null ?
_parameterFactory.CreateParameter(name, dimension: dimension, displayUnit: displayUnit) :
_parameterFactory.CreateDistributedParameter(name, distributionType.Value, dimension: dimension, displayUnit: displayUnit);
parameter = _individualParameterToParameterMapper.MapFrom(individualParameter);

simulationConfiguration.AddBuilderReference(parameter, individualParameter);
return parameter.WithUpdatedMetaFrom(individualParameter)
.WithParentContainer(parentContainer);
return parameter.WithParentContainer(parentContainer);
}

private IParameter getParameter(ModelConfiguration modelConfiguration, PathAndValueEntity pathAndValueEntity)
Expand Down

0 comments on commit a61c702

Please sign in to comment.