Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #2424 output mapping serialization #2425

Merged
merged 1 commit into from
Nov 11, 2022
Merged

Fixes #2424 output mapping serialization #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/PKSim.Assets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.CLI/PKSim.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Core/Services/ParameterTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change related to the change of interface

{
return SetParameterValueOrigin(parameter, valueOrigin);
}
Expand Down
18 changes: 9 additions & 9 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions src/PKSim.Infrastructure/Services/MoBiExportTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ private void exportSimulationToFile(Simulation simulation, string moBiFile)
var simulationTransfer = new SimulationTransfer
{
Simulation = moBiSimulation,
OutputMappings = simulation.OutputMappings,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saving the actual output mapping when exporting

JournalPath = _journalRetriever.JournalFullPath
};

Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Infrastructure/Services/SimulationTransferLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interestingly, we do not load obs data when loading from MoBi (this is not really a use case that is done often). So I am not going to tackle this for now


project?.Favorites.AddFavorites(simulationTransfer.Favorites);
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Matlab/PKSim.Matlab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.R/PKSim.R.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim/PKSim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.R.Tests/PKSim.R.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion tests/PKSim.Tests/Core/DomainHelperForSpecs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Id was fixed here. Letting the code create the id automatically

var baseGrid = new BaseGrid("Time", TimeDimensionForSpecs())
{
Values = new[] {1.0f, 2.0f, 3.0f}
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.Tests/PKSim.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down