Fixes #2424 output mapping serialization

Open-Systems-Pharmacology · Nov 11, 2022 · 1d80c47 · 1d80c47
1 parent 06df03b
commit 1d80c47
Show file tree

Hide file tree

Showing 21 changed files with 55 additions and 54 deletions.
diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj
@@ -59,8 +59,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj
@@ -61,9 +61,9 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj
@@ -30,10 +30,10 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.46" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/PKSim.Core/Services/ParameterTask.cs b/src/PKSim.Core/Services/ParameterTask.cs
@@ -452,12 +452,12 @@ public ICommand UpdateDistributedTableFormula(IParameter tableParameter, IDistri
          return executeAndUpdatedDefaultStateAndValue(new UpdateDistributedTableFormulaPercentileCommand(tableParameter, distributedParameter.Percentile), tableParameter);
       }
 
-      public ICommand SetParameterValue(IParameter parameter, double value, ISimulation simulation)
+      public ICommand SetParameterValue(IParameter parameter, double value, IModelCoreSimulation simulation)
       {
          return SetParameterValue(parameter, value);
       }
 
-      public ICommand UpdateParameterValueOrigin(IParameter parameter, ValueOrigin valueOrigin, ISimulation simulation)
+      public ICommand UpdateParameterValueOrigin(IParameter parameter, ValueOrigin valueOrigin, IModelCoreSimulation simulation)
       {
          return SetParameterValueOrigin(parameter, valueOrigin);
       }

diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
@@ -41,15 +41,15 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.46" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
   </ItemGroup>
 

diff --git a/src/PKSim.Infrastructure/Services/MoBiExportTask.cs b/src/PKSim.Infrastructure/Services/MoBiExportTask.cs
@@ -114,6 +114,7 @@ private void exportSimulationToFile(Simulation simulation, string moBiFile)
          var simulationTransfer = new SimulationTransfer
          {
             Simulation = moBiSimulation,
+            OutputMappings = simulation.OutputMappings,
             JournalPath = _journalRetriever.JournalFullPath
          };
 

diff --git a/src/PKSim.Infrastructure/Services/SimulationTransferLoader.cs b/src/PKSim.Infrastructure/Services/SimulationTransferLoader.cs
@@ -27,7 +27,7 @@ public SimulationTransfer Load(string pkmlFileFullPath)
       {
          var project = _projectRetriever.CurrentProject;
 
-         //use new ObjectBaseRepository here as the resulting simulation will be registered later on when added to the project
+         //use new WithIdRepository here as the resulting simulation will be registered later on when added to the project
          var simulationTransfer = _simulationPersister.Load(pkmlFileFullPath, new WithIdRepository());
 
          project?.Favorites.AddFavorites(simulationTransfer.Favorites);

diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj
@@ -27,11 +27,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj
@@ -49,9 +49,9 @@
 
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj
@@ -60,14 +60,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.DataBinding" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="6.0.0.2" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim/PKSim.csproj b/src/PKSim/PKSim.csproj
@@ -76,14 +76,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.45" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.46" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
@@ -22,9 +22,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.R.Tests/PKSim.R.Tests.csproj b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj
@@ -22,9 +22,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.Tests/Core/DomainHelperForSpecs.cs b/tests/PKSim.Tests/Core/DomainHelperForSpecs.cs
@@ -291,7 +291,7 @@ public static SensitivityParameter SensitivityParameter(string name = "Sensitivi
 
       public static DataRepository IndividualSimulationDataRepositoryFor(string simulationName)
       {
-         var simulationResults = new DataRepository("Results");
+         var simulationResults = new DataRepository();
          var baseGrid = new BaseGrid("Time", TimeDimensionForSpecs())
          {
             Values = new[] {1.0f, 2.0f, 3.0f}

diff --git a/tests/PKSim.Tests/PKSim.Tests.csproj b/tests/PKSim.Tests/PKSim.Tests.csproj
@@ -20,9 +20,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
@@ -56,14 +56,14 @@
   </ItemGroup>
 
   <ItemGroup>
-  <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
+  <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.45" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.46" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
@@ -17,10 +17,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.46" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.45" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.45" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.46" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.46" />
   </ItemGroup>
 
   <ItemGroup>