Fixes #2480 individual serialization #2494
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| using System.Collections.Generic; | ||
| using OSPSuite.Core; | ||
| using OSPSuite.Core.Domain; | ||
| using OSPSuite.Core.Domain.Builder; | ||
| using OSPSuite.Core.Domain.Formulas; | ||
| using OSPSuite.Core.Domain.Services; | ||
| using OSPSuite.Utility; | ||
| using OSPSuite.Utility.Collections; | ||
| using PKSim.Core.Model; | ||
|
|
||
| namespace PKSim.Core.Mappers | ||
| { | ||
| public interface IPathAndValueBuildingBlockMapper<in T, out TBuildingBlock> : IMapper<T, TBuildingBlock> | ||
| { | ||
| } | ||
|
|
||
| public abstract class PathAndValueBuildingBlockMapper<T, TBuildingBlock, TBuilder> : IPathAndValueBuildingBlockMapper<T, TBuildingBlock> where T : PKSimBuildingBlock where TBuildingBlock : PathAndValueEntityBuildingBlockFromPKSim<TBuilder> where TBuilder : PathAndValueEntity | ||
| { | ||
| protected IObjectBaseFactory _objectBaseFactory; | ||
| protected IEntityPathResolver _entityPathResolver; | ||
| protected IApplicationConfiguration _applicationConfiguration; | ||
| private readonly ILazyLoadTask _lazyLoadTask; | ||
| private readonly Cache<string, IFormula> _formulaCache = new Cache<string, IFormula>(x => x.Name); | ||
|
|
||
| protected PathAndValueBuildingBlockMapper(IObjectBaseFactory objectBaseFactory, IEntityPathResolver entityPathResolver, IApplicationConfiguration applicationConfiguration, ILazyLoadTask lazyLoadTask) | ||
| { | ||
| _objectBaseFactory = objectBaseFactory; | ||
| _entityPathResolver = entityPathResolver; | ||
| _applicationConfiguration = applicationConfiguration; | ||
| _lazyLoadTask = lazyLoadTask; | ||
| } | ||
|
|
||
| protected TBuildingBlock CreateBaseObject(T pkSimBuildingBlock) | ||
| { | ||
| var buildingBlock = _objectBaseFactory.Create<TBuildingBlock>(); | ||
|
|
||
| buildingBlock.Name = pkSimBuildingBlock.Name; | ||
| buildingBlock.PKSimVersion = _applicationConfiguration.Version; | ||
| buildingBlock.Description = pkSimBuildingBlock.Description; | ||
| return buildingBlock; | ||
| } | ||
|
|
||
| private TBuilder mapBuilderParameter(IParameter parameter) | ||
| { | ||
| var builderParameter = _objectBaseFactory.Create<TBuilder>(); | ||
|
|
||
| if (parameter.Formula != null && parameter.Formula.IsCachable()) | ||
| { | ||
| if (!_formulaCache.Contains(parameter.Formula.Name)) | ||
|
There was a problem hiding this comment. I could not understand how to use the formula factory in this more generalized case. We had previously hard-coded the category to EXPRESSION_PARAMETERS but I couldn't generalize it. In the end, I just did my own uniqueness cache scheme There was a problem hiding this comment. We did something like this before But this 'EXPRESSION_PARAMETERS' value was just hard coded. I didn't know what to use to make it more general, so I just created my own Cache scheme to make sure the formulae were unique by name instead of using _formulaFactory There was a problem hiding this comment. yeah but the code is not equivalent. One you were creating anew instance, here you are adding the same reference There was a problem hiding this comment. plus you are not adding it to the building block FormulaCache. they won';t be serialized There was a problem hiding this comment. They are copied over to the bb somewhere else |
||
| _formulaCache.Add(parameter.Formula); | ||
|
|
||
| builderParameter.Formula = _formulaCache[parameter.Formula.Name]; | ||
| } | ||
| else | ||
| { | ||
| (builderParameter.Value, _) = parameter.TryGetValue(); | ||
| } | ||
|
|
||
| builderParameter.Name = parameter.Name; | ||
|
|
||
| builderParameter.Path = _entityPathResolver.ObjectPathFor(parameter); | ||
| builderParameter.Dimension = parameter.Dimension; | ||
| builderParameter.DisplayUnit = parameter.DisplayUnit; | ||
| return builderParameter; | ||
| } | ||
|
|
||
| protected void MapAllParameters(T sourcePKSimBuildingBlock, TBuildingBlock buildingBlock) | ||
| { | ||
| var allParameters = AllParametersFor(sourcePKSimBuildingBlock); | ||
|
|
||
| foreach (var parameter in allParameters) | ||
| { | ||
| var builderParameter = mapBuilderParameter(parameter); | ||
| buildingBlock.Add(builderParameter); | ||
| } | ||
|
|
||
| foreach (var formula in _formulaCache) | ||
|
There was a problem hiding this comment. Here we copy all the formulae into the BB for serialization |
||
| { | ||
| buildingBlock.FormulaCache.Add(formula); | ||
| } | ||
| } | ||
|
|
||
| protected abstract IReadOnlyList<IParameter> AllParametersFor(T sourcePKSimBuildingBlock); | ||
|
|
||
| public virtual TBuildingBlock MapFrom(T input) | ||
| { | ||
| _lazyLoadTask.Load(input); | ||
|
|
||
| var buildingBlock = CreateBaseObject(input); | ||
| MapAllParameters(input, buildingBlock); | ||
| return buildingBlock; | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename the parameter here. No need to keep using the generic name of the base class IMO