1748 output mapping wrong namespace (#1756)

* Fixes #1748 output mapping wrong namespace * Fixes #1748 output mapping wrong namespace
Open-Systems-Pharmacology · Nov 29, 2022 · fed6391 · fed6391
1 parent 26d5e58
commit fed6391
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 87 deletions.
diff --git a/...ParameterIdentifications/OutputMapping.cs → src/OSPSuite.Core/Domain/OutputMapping.cs b/...ParameterIdentifications/OutputMapping.cs → src/OSPSuite.Core/Domain/OutputMapping.cs
@@ -1,15 +1,18 @@
 using OSPSuite.Core.Domain.Data;
+using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Core.Domain.UnitSystem;
-using OSPSuite.Core.Extensions;
 
-namespace OSPSuite.Core.Domain.ParameterIdentifications
+namespace OSPSuite.Core.Domain
 {
    public class OutputMapping
    {
       public virtual WeightedObservedData WeightedObservedData { get; set; }
+
       public virtual SimulationQuantitySelection OutputSelection { get; set; }
+
       public virtual Scalings Scaling { get; set; }
-      public float Weight { get; set; }
+
+      public float Weight { get; set; } = Constants.DEFAULT_WEIGHT;
 
       /// <summary>
       ///    Returns the consolidated path of the mapped output (e.g without the name of the simulation)
@@ -21,34 +24,21 @@ public class OutputMapping
       /// </summary>
       public virtual string FullOutputPath => OutputSelection?.FullQuantityPath ?? string.Empty;
 
-
       /// <summary>
       ///    Returns the underlying mapped output (Molecule Amount or Observer)
       /// </summary>
       public virtual IQuantity Output => OutputSelection?.Quantity;
 
-      public OutputMapping()
-      {
-         Weight = Constants.DEFAULT_WEIGHT;
-      }
-
       public virtual ISimulation Simulation => OutputSelection?.Simulation;
+
       public IDimension Dimension => OutputSelection?.Quantity?.Dimension;
 
-      public virtual bool UsesObservedData(DataRepository observerData)
-      {
-         return Equals(WeightedObservedData.ObservedData, observerData);
-      }
+      public virtual bool UsesObservedData(DataRepository observerData) => Equals(WeightedObservedData.ObservedData, observerData);
 
-      public virtual bool UsesSimulation(ISimulation simulation)
-      {
-         return Equals(OutputSelection.Simulation, simulation);
-      }
+      public virtual bool UsesSimulation(ISimulation simulation) => Equals(OutputSelection.Simulation, simulation);
 
       public virtual bool IsValid => Output != null && WeightedObservedData != null;
 
-
-
       public virtual OutputMapping Clone()
       {
          return new OutputMapping

diff --git a/...e/Serialization/ParameterIdentificationExport/Serializer/OutputMappingExportSerializer.cs b/...e/Serialization/ParameterIdentificationExport/Serializer/OutputMappingExportSerializer.cs
@@ -1,4 +1,5 @@
-using OSPSuite.Serializer;
+using OSPSuite.Core.Domain;
+using OSPSuite.Serializer;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 
 namespace OSPSuite.Core.Serialization.ParameterIdentificationExport.Serializer

diff --git a/src/OSPSuite.Core/Serialization/Xml/OutputMappingXmlSerializer.cs b/src/OSPSuite.Core/Serialization/Xml/OutputMappingXmlSerializer.cs
@@ -1,4 +1,5 @@
-using OSPSuite.Core.Domain.ParameterIdentifications;
+using OSPSuite.Core.Domain;
+using OSPSuite.Core.Domain.ParameterIdentifications;
 
 namespace OSPSuite.Core.Serialization.Xml
 {

diff --git a/src/OSPSuite.Core/Services/ResidualsVsTimeChartService.cs b/src/OSPSuite.Core/Services/ResidualsVsTimeChartService.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using OSPSuite.Core.Chart;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Core.Domain.UnitSystem;
 using OSPSuite.Core.Extensions;
+using OSPSuite.Utility.Extensions;
+using static OSPSuite.Assets.Captions.ParameterIdentification;
 
 namespace OSPSuite.Core.Services
 {
@@ -27,12 +30,19 @@ public interface IResidualsVsTimeChartService
       ///    <paramref name="id" /> and <paramref name="repositoryName" />
       /// </summary>
       DataRepository CreateScatterDataRepository(string id, string repositoryName, OutputResiduals outputResidual);
+
+      void ConfigureChartAxis(AnalysisChartWithLocalRepositories chart);
+
+      /// <summary>
+      ///    Get or creates the DataRepository for the given residuals <paramref name="outputResidual" /> for the given chart.
+      ///    If it already exists, update the values with the output residuals values (update of chart)
+      /// </summary>
+      DataRepository GetOrCreateScatterDataRepositoryInChart(AnalysisChartWithLocalRepositories chart, OutputResiduals outputResidual, int? runIndex = null);
    }
 
    public class ResidualsVsTimeChartService : IResidualsVsTimeChartService
    {
       private const string ZERO = "Zero";
-      private string _markerCurveId = string.Empty;
       private readonly IDimensionFactory _dimensionFactory;
 
       public ResidualsVsTimeChartService(IDimensionFactory dimensionFactory)
@@ -45,11 +55,7 @@ public ResidualsVsTimeChartService(IDimensionFactory dimensionFactory)
       public DataRepository AddZeroMarkerCurveToChart(AnalysisChartWithLocalRepositories chart, float minObservedDataTime, float maxObservedDataTime)
       {
          var markerRepository = createMarkerRepository(minObservedDataTime, maxObservedDataTime, chart);
-         AddCurvesFor(markerRepository, (column, curve) =>
-         {
-            curve.UpdateMarkerCurve(ZERO);
-            _markerCurveId = curve.Id;
-         }, chart);
+         AddCurvesFor(markerRepository, (column, curve) => { curve.UpdateMarkerCurve(ZERO); }, chart);
 
          return markerRepository;
       }
@@ -58,17 +64,17 @@ private DataRepository createMarkerRepository(float minObservedDataTime, float m
       {
          var id = $"{chart.Id}-{ZERO}";
          var dataRepository = createEmptyRepository(id, ZERO, ZERO);
-         dataRepository.BaseGrid.Values = new[] { minObservedDataTime, maxObservedDataTime };
-         dataRepository.FirstDataColumn().Values = new[] { 0f, 0f };
+         dataRepository.BaseGrid.Values = new[] {minObservedDataTime, maxObservedDataTime};
+         dataRepository.FirstDataColumn().Values = new[] {0f, 0f};
          return dataRepository;
       }
 
       private DataRepository createEmptyRepository(string id, string name, string valueName)
       {
-         var dataRepository = new DataRepository(id) { Name = name };
+         var dataRepository = new DataRepository(id) {Name = name};
          var baseGrid = new BaseGrid($"{id}-Time", "Time", _dimensionFactory.Dimension(Constants.Dimension.TIME));
          var values = new DataColumn($"{id}-{valueName}", valueName, _dimensionFactory.NoDimension, baseGrid)
-            { DataInfo = { Origin = ColumnOrigins.CalculationAuxiliary } };
+            {DataInfo = {Origin = ColumnOrigins.CalculationAuxiliary}};
          dataRepository.Add(values);
          return dataRepository;
       }
@@ -90,5 +96,31 @@ public DataRepository CreateScatterDataRepository(string id, string repositoryNa
          scatterColumn.QuantityInfo.Path = outputPath;
          return dataRepository;
       }
+
+      public void ConfigureChartAxis(AnalysisChartWithLocalRepositories chart)
+      {
+         chart.AxisBy(AxisTypes.Y).Caption = Residuals;
+         chart.AxisBy(AxisTypes.Y).Scaling = Scalings.Linear;
+      }
+
+      public DataRepository GetOrCreateScatterDataRepositoryInChart(AnalysisChartWithLocalRepositories chart, OutputResiduals outputResidual, int? runIndex = null)
+      {
+         var repositoryName = runIndex.HasValue ? SimulationResultsForRun(runIndex.Value) : "Simulation Results";
+         var idSuffix = runIndex.HasValue ? $"-{runIndex}" : "";
+         var residuals = outputResidual.Residuals;
+         var id = $"{chart.Id}-{outputResidual.FullOutputPath}-{outputResidual.ObservedData.Id}{idSuffix}";
+
+         var dataRepository = chart.DataRepositories.FindById(id);
+         if (dataRepository == null)
+         {
+            dataRepository = CreateScatterDataRepository(id, repositoryName, outputResidual);
+            chart.AddRepository(dataRepository);
+         }
+
+         dataRepository.BaseGrid.Values = residuals.Select(x => x.Time).ToFloatArray();
+         dataRepository.FirstDataColumn().Values = residuals.Select(x => x.Value).ToFloatArray();
+
+         return dataRepository;
+      }
    }
 }
diff --git a/...te.Presentation/Mappers/ParameterIdentifications/OutputMappingToOutputMappingDTOMapper.cs b/...te.Presentation/Mappers/ParameterIdentifications/OutputMappingToOutputMappingDTOMapper.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Presentation.DTO;
 using OSPSuite.Presentation.DTO.ParameterIdentifications;

diff --git a/src/OSPSuite.Presentation/Mappers/SimulationOutputMappingToOutputMappingDTOMapper.cs b/src/OSPSuite.Presentation/Mappers/SimulationOutputMappingToOutputMappingDTOMapper.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Presentation.DTO;
 

diff --git a/src/OSPSuite.Presentation/Presenters/Charts/SimulationAnalysisChartPresenter.cs b/src/OSPSuite.Presentation/Presenters/Charts/SimulationAnalysisChartPresenter.cs
@@ -5,7 +5,6 @@
 using OSPSuite.Core.Chart;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
-using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Core.Extensions;
 using OSPSuite.Presentation.Extensions;
 using OSPSuite.Presentation.Services.Charts;

diff --git a/...resenters/ParameterIdentifications/ParameterIdentificationResidualVsTimeChartPresenter.cs b/...resenters/ParameterIdentifications/ParameterIdentificationResidualVsTimeChartPresenter.cs
@@ -3,10 +3,8 @@
 using OSPSuite.Assets;
 using OSPSuite.Core.Chart;
 using OSPSuite.Core.Chart.ParameterIdentifications;
-using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Core.Domain.ParameterIdentifications;
-using OSPSuite.Core.Extensions;
 using OSPSuite.Core.Services;
 using OSPSuite.Presentation.Services.Charts;
 using OSPSuite.Presentation.Views.ParameterIdentifications;
@@ -23,7 +21,10 @@ public class ParameterIdentificationResidualVsTimeChartPresenter : ParameterIden
       private readonly IResidualsVsTimeChartService _residualsVsTimeChartService;
       private DataRepository _zeroRepository;
 
-      public ParameterIdentificationResidualVsTimeChartPresenter(IParameterIdentificationSingleRunAnalysisView view, ChartPresenterContext chartPresenterContext, IResidualsVsTimeChartService residualsVsTimeChartService) :
+      public ParameterIdentificationResidualVsTimeChartPresenter(
+         IParameterIdentificationSingleRunAnalysisView view,
+         ChartPresenterContext chartPresenterContext,
+         IResidualsVsTimeChartService residualsVsTimeChartService) :
          base(view, chartPresenterContext, ApplicationIcons.ResidualVsTimeAnalysis, PresenterConstants.PresenterKeys.ParameterIdentificationResidualVsTimeChartPresenter)
       {
          _residualsVsTimeChartService = residualsVsTimeChartService;
@@ -36,13 +37,10 @@ protected override void UpdateAnalysisBasedOn(IReadOnlyList<ParameterIdentificat
             return;
 
          _zeroRepository = _residualsVsTimeChartService.AddZeroMarkerCurveToChart(Chart, _parameterIdentification.MinObservedDataTime, _parameterIdentification.MaxObservedDataTime);
-         AddDataRepositoriesToEditor(new[] { _zeroRepository });
+         AddDataRepositoriesToEditor(new[] {_zeroRepository});
 
          if (ChartIsBeingCreated)
-         {
-            Chart.AxisBy(AxisTypes.Y).Caption = Captions.ParameterIdentification.Residuals;
-            Chart.AxisBy(AxisTypes.Y).Scaling = Scalings.Linear;
-         }
+            _residualsVsTimeChartService.ConfigureChartAxis(Chart);
 
          UpdateChartFromTemplate();
       }
@@ -55,7 +53,7 @@ protected override void AddRunResultToChart(ParameterIdentificationRunResult run
       private void addOutputToScatter(IGrouping<string, OutputResiduals> outputMappingsByOutput, ParameterIdentificationRunResult runResult)
       {
          var fullOutputPath = outputMappingsByOutput.Key;
-         bool shouldShowInLegend = true;
+         var shouldShowInLegend = true;
          foreach (var outputMapping in outputMappingsByOutput)
          {
             var dataRepository = getOrCreateScatterDataRepositoryFor(runResult.Index, outputMapping);
@@ -77,27 +75,8 @@ private void addOutputToScatter(IGrouping<string, OutputResiduals> outputMapping
          }
       }
 
-
-      private DataRepository getOrCreateScatterDataRepositoryFor(int runIndex, OutputResiduals outputResidual)
-      {
-         var repositoryName = Captions.ParameterIdentification.SimulationResultsForRun(runIndex);
-         var id = $"{Chart.Id}-{outputResidual.FullOutputPath}-{outputResidual.ObservedData.Id}-{runIndex}";
-
-         var timeValues = outputResidual.Residuals.Select(x => x.Time).ToList();
-         var outputValues = outputResidual.Residuals.Select(x => x.Value).ToList();
-
-         var dataRepository = Chart.DataRepositories.FindById(id);
-         if (dataRepository == null)
-         {
-            dataRepository = _residualsVsTimeChartService.CreateScatterDataRepository(id, repositoryName, outputResidual);
-            Chart.AddRepository(dataRepository);
-         }
-
-         dataRepository.BaseGrid.Values = timeValues.ToFloatArray();
-         dataRepository.FirstDataColumn().Values = outputValues.ToFloatArray();
-
-         return dataRepository;
-      }
+      private DataRepository getOrCreateScatterDataRepositoryFor(int runIndex, OutputResiduals outputResidual) =>
+         _residualsVsTimeChartService.GetOrCreateScatterDataRepositoryInChart(Chart, outputResidual, runIndex);
 
       public override void Clear()
       {

diff --git a/src/OSPSuite.Presentation/Presenters/SimulationResidualVsTimeChartPresenter.cs b/src/OSPSuite.Presentation/Presenters/SimulationResidualVsTimeChartPresenter.cs
@@ -52,11 +52,8 @@ protected override void UpdateAnalysis()
          _zeroRepository = _residualsVsTimeChartService.AddZeroMarkerCurveToChart(Chart, minObservedDataTime(), maxObservedDataTime());
          AddDataRepositoriesToEditor(new[] { _zeroRepository });
 
-         if (ChartIsBeingCreated)
-         {
-            Chart.AxisBy(AxisTypes.Y).Caption = Captions.ParameterIdentification.Residuals;
-            Chart.AxisBy(AxisTypes.Y).Scaling = Scalings.Linear;
-         }
+         if (ChartIsBeingCreated) 
+            _residualsVsTimeChartService.ConfigureChartAxis(Chart);
 
          UpdateChartFromTemplate();
          View.SetTotalError(simulationResidual.TotalError);
@@ -102,26 +99,8 @@ private float maxObservedDataTime()
          return getAllAvailableObservedData().Select(x => x.BaseGrid.Values.Last()).Max();
       }
 
-      private DataRepository getOrCreateScatterDataRepositoryFor(OutputResiduals outputResidual)
-      {
-         var repositoryName = "Simulation Results";
-         var id = $"{Chart.Id}-{outputResidual.FullOutputPath}-{outputResidual.ObservedData.Id}";
-
-         var timeValues = outputResidual.Residuals.Select(x => x.Time).ToList();
-         var outputValues = outputResidual.Residuals.Select(x => x.Value).ToList();
-
-         var dataRepository = Chart.DataRepositories.FindById(id);
-         if (dataRepository == null)
-         {
-            dataRepository = _residualsVsTimeChartService.CreateScatterDataRepository(id, repositoryName, outputResidual);
-            Chart.AddRepository(dataRepository);
-         }
-
-         dataRepository.BaseGrid.Values = timeValues.ToFloatArray();
-         dataRepository.FirstDataColumn().Values = outputValues.ToFloatArray();
-
-         return dataRepository;
-      }
+      private DataRepository getOrCreateScatterDataRepositoryFor(OutputResiduals outputResidual) =>
+         _residualsVsTimeChartService.GetOrCreateScatterDataRepositoryInChart(Chart, outputResidual);
 
       private IEnumerable<DataRepository> getAllAvailableObservedData()
       {

diff --git a/...esentation.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs b/...esentation.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs
@@ -5,6 +5,7 @@
 using OSPSuite.BDDHelper.Extensions;
 using OSPSuite.Core.Chart;
 using OSPSuite.Core.Chart.ParameterIdentifications;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Core.Domain.Mappers;
 using OSPSuite.Core.Domain.ParameterIdentifications;

diff --git a/....Presentation.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs b/....Presentation.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs
@@ -4,6 +4,7 @@
 using OSPSuite.BDDHelper;
 using OSPSuite.BDDHelper.Extensions;
 using OSPSuite.Core.Chart.ParameterIdentifications;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Core.Domain.Mappers;
 using OSPSuite.Core.Domain.ParameterIdentifications;

diff --git a/....Tests/Presentation/ParameterIdentificationWeightedObservedDataCollectorPresenterSpecs.cs b/....Tests/Presentation/ParameterIdentificationWeightedObservedDataCollectorPresenterSpecs.cs
@@ -1,5 +1,6 @@
 using FakeItEasy;
 using OSPSuite.BDDHelper;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Helpers;
 using OSPSuite.Presentation.Core;

diff --git a/tests/OSPSuite.Presentation.Tests/Presentation/WeightedObservedDataFormatterSpecs.cs b/tests/OSPSuite.Presentation.Tests/Presentation/WeightedObservedDataFormatterSpecs.cs
@@ -1,5 +1,6 @@
 using OSPSuite.BDDHelper;
 using OSPSuite.BDDHelper.Extensions;
+using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Data;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Helpers;