Fixes #1115 error with pop snapshot

Open-Systems-Pharmacology · Feb 28, 2019 · 9bd7888 · 9bd7888
1 parent 22bbbd2
commit 9bd7888
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/PKSim.Core/Snapshots/Mappers/PopulationAnalysisFieldMapper.cs b/src/PKSim.Core/Snapshots/Mappers/PopulationAnalysisFieldMapper.cs
@@ -121,8 +121,8 @@ private void mapNumericFieldToSnapshot(PopulationAnalysisField snapshot, INumeri
       private void mapNumericFieldToModel(PopulationAnalysisField snapshot, INumericValueField field)
       {
          field.Dimension = _dimensionFactory.Dimension(snapshot.Dimension);
-         field.Dimension = _dimensionFactory.OptimalDimension(field.Dimension);
-         field.DisplayUnit = field.Dimension.Unit(ModelValueFor(snapshot.Unit));
+         var optimalDimension = _dimensionFactory.OptimalDimension(field.Dimension);
+         field.DisplayUnit = optimalDimension.Unit(ModelValueFor(snapshot.Unit));
          field.Scaling = ModelValueFor(snapshot.Scaling, field.Scaling);
       }
 

diff --git a/tests/PKSim.Tests/Core/PopulationAnalysisFieldMapperSpecs.cs b/tests/PKSim.Tests/Core/PopulationAnalysisFieldMapperSpecs.cs
@@ -29,12 +29,14 @@ public abstract class concern_for_PopulationAnalysisFieldMapper : ContextSpecifi
       private GroupingDefinition _groupingDefinition;
       protected Snapshots.GroupingDefinition _snapshotGroupingDefinition;
       private IDimensionFactory _dimensionFactory;
+      private IDimension _mergedDimension;
 
       protected override Task Context()
       {
          _groupingDefinitionMapper = A.Fake<GroupingDefinitionMapper>();
-         _dimension = DomainHelperForSpecs.TimeDimensionForSpecs();
-         _unit = _dimension.Unit("h");
+         _dimension = DomainHelperForSpecs.ConcentrationDimensionForSpecs();
+         _mergedDimension = DomainHelperForSpecs.TimeDimensionForSpecs();
+         _unit = _mergedDimension.Unit("h"); // this unit is defined in the merged dimension but not in the field dimension
          _dimensionFactory = A.Fake<IDimensionFactory>();
 
          sut = new PopulationAnalysisFieldMapper(_groupingDefinitionMapper, _dimensionFactory);
@@ -88,7 +90,7 @@ protected override Task Context()
          A.CallTo(() => _groupingDefinitionMapper.MapToSnapshot(_groupingDefinition)).Returns(_snapshotGroupingDefinition);
 
          A.CallTo(() => _dimensionFactory.Dimension(_dimension.Name)).Returns(_dimension);
-         A.CallTo(() => _dimensionFactory.MergedDimensionFor(A<DataColumn>._)).Returns(_dimension);
+         A.CallTo(() => _dimensionFactory.MergedDimensionFor(A<DataColumn>._)).Returns(_mergedDimension);
          return _completed;
       }
    }