Skip to content

Commit 9f4949e

Browse files
rwmcintoshrwmcintosh
committed
Merge branch 'develop' into V13
# Conflicts: # src/PKSim.Assets.Images/PKSim.Assets.Images.csproj # src/PKSim.Assets/PKSim.Assets.csproj # src/PKSim.BatchTool/PKSim.BatchTool.csproj # src/PKSim.CLI.Core/PKSim.CLI.Core.csproj # src/PKSim.CLI/PKSim.CLI.csproj # src/PKSim.Core/PKSim.Core.csproj # src/PKSim.Infrastructure/PKSim.Infrastructure.csproj # src/PKSim.Presentation/PKSim.Presentation.csproj # src/PKSim.R/PKSim.R.csproj # src/PKSim.Starter/PKSim.Starter.csproj # src/PKSim.UI/PKSim.UI.csproj # src/PKSim/PKSim.csproj # src/PKSimRDependencyResolution/PKSimRDependencyResolution.csproj # tests/PKSim.R.Tests/PKSim.R.Tests.csproj # tests/PKSim.Tests/PKSim.Tests.csproj # tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
2 parents ccde155 + 446963b commit 9f4949e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+352
-330
lines changed

‎src/PKSim.Assets.Images/PKSim.Assets.Images.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="OSPSuite.Assets" Version="13.0.77" />
32-
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.77" />
31+
<PackageReference Include="OSPSuite.Assets" Version="13.0.82" />
32+
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.82" />
3333
<PackageReference Include="System.Resources.Extensions" Version="9.0.2" />
3434
</ItemGroup>
3535

‎src/PKSim.Assets/PKSim.Assets.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="OSPSuite.Assets" Version="13.0.77" />
26-
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.77" />
27-
<PackageReference Include="OSPSuite.Core" Version="13.0.77" />
25+
<PackageReference Include="OSPSuite.Assets" Version="13.0.82" />
26+
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.82" />
27+
<PackageReference Include="OSPSuite.Core" Version="13.0.82" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/PKSim.Assets/PKSimConstants.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,9 @@ public static class UI
15901590
public static readonly string ModelParameters = "Model Parameters";
15911591
public static readonly string DefaultSpecies = "Species";
15921592
public static readonly string DefaultPopulation = "Population";
1593-
public static readonly string DefaultParameterGroupLayout = "Parameter layout";
1593+
public static readonly string ParameterView = "Parameter view";
1594+
public static readonly string ForParameterIdentificationAndSensitivityAnalysis = "For Parameter Identification and Sensitivity Analysis";
1595+
public static readonly string ForOthers = "For all others";
15941596
public static readonly string DefaultLipophilicityName = "Lipophilicity";
15951597
public static readonly string DefaultFractionUnboundName = "Fraction unbound";
15961598
public static readonly string DefaultSolubilityName = "Solubility";

‎src/PKSim.BatchTool/BatchUserSettings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class BatchUserSettings : CLIUserSettings, IUserSettings
3939
public DisplayUnitsManager DisplayUnits { get; set; } = new DisplayUnitsManager();
4040
public Color DisabledColor { get; set; }
4141
public ParameterGroupingModeId DefaultParameterGroupingMode { get; set; }
42+
public ParameterGroupingModeIdForParameterAnalyzable DefaultParameterGroupingModeForPIAndSA { get; set; }
4243
public string LastIgnoredVersion { get; set; }
4344

4445
public IDiagramOptions DiagramOptions { get; set; }

‎src/PKSim.BatchTool/PKSim.BatchTool.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</ItemGroup>
5050
<ItemGroup>
5151
<PackageReference Include="DevExpress.Win.Design" Version="21.2.15" Condition="'$(ExcludeDesigner)' != 'true'" />
52-
<PackageReference Include="OSPSuite.Core" Version="13.0.77" />
53-
<PackageReference Include="OSPSuite.Assets" Version="13.0.77" />
52+
<PackageReference Include="OSPSuite.Core" Version="13.0.82" />
53+
<PackageReference Include="OSPSuite.Assets" Version="13.0.82" />
5454
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.15.1" />
5555
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.75" GeneratePathProperty="true" />
5656
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.79" GeneratePathProperty="true" />

‎src/PKSim.CLI.Core/MinimalImplementations/CLIUserSettings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class CLIUserSettings : Notifier, ICoreUserSettings
1313
public IBusinessRuleSet Rules { get; private set; }
1414
public int NumberOfBins { get; set; }
1515
public int NumberOfIndividualsPerBin { get; set; }
16+
public bool WarnForNonFiniteQuantities { get; set; }
1617
public string DefaultSpecies { get; set; } = CoreConstants.Species.HUMAN;
1718
public string DefaultPopulation { get; set; } = CoreConstants.Population.ICRP;
1819
public double AbsTol { get; set; }

‎src/PKSim.CLI.Core/PKSim.CLI.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="OSPSuite.Assets" Version="13.0.77" />
26+
<PackageReference Include="OSPSuite.Assets" Version="13.0.82" />
2727
<PackageReference Include="OSPSuite.Utility" Version="4.1.1.5" />
28-
<PackageReference Include="OSPSuite.Core" Version="13.0.77" />
29-
<PackageReference Include="OSPSuite.CLI.Core" Version="13.0.77" />
28+
<PackageReference Include="OSPSuite.Core" Version="13.0.82" />
29+
<PackageReference Include="OSPSuite.CLI.Core" Version="13.0.82" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

‎src/PKSim.CLI/PKSim.CLI.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<ItemGroup>
5858
<PackageReference Include="CommandLineParser" Version="2.9.1" />
5959
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.2" />
60-
<PackageReference Include="OSPSuite.Core" Version="13.0.77" />
61-
<PackageReference Include="OSPSuite.Presentation" Version="13.0.77" />
62-
<PackageReference Include="OSPSuite.Assets" Version="13.0.77" />
60+
<PackageReference Include="OSPSuite.Core" Version="13.0.82" />
61+
<PackageReference Include="OSPSuite.Presentation" Version="13.0.82" />
62+
<PackageReference Include="OSPSuite.Assets" Version="13.0.82" />
6363
<PackageReference Include="OSPSuite.Utility" Version="4.1.1.5" />
6464
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.75" GeneratePathProperty="true" />
6565
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.79" GeneratePathProperty="true" />

‎src/PKSim.Core/Chart/BoxWhiskerValue.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public ValueWithIndividualId(float value)
2020
Value = value;
2121
}
2222

23-
public bool IsValid => Value.IsValid();
23+
public bool IsValid => Value.IsFinite();
2424

2525
public static implicit operator float(ValueWithIndividualId valueWithIndividualId)
2626
{

‎src/PKSim.Core/Chart/ObservedCurveData.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class ObservedDataYValue : ITimeProfileYValue
1515

1616
public AuxiliaryType ErrorType { get; set; }
1717

18-
public bool IsValid => Mean.IsValid();
18+
public bool IsValid => Mean.IsFinite();
1919

2020
public ObservedDataYValue()
2121
{
@@ -63,7 +63,7 @@ public float UpperValue
6363
}
6464
}
6565

66-
private bool hasError => Error.IsValid() && Error > 0 && ErrorType != AuxiliaryType.Undefined;
66+
private bool hasError => Error.IsFinite() && Error > 0 && ErrorType != AuxiliaryType.Undefined;
6767
}
6868

6969
public class ObservedCurveData : CurveData<TimeProfileXValue, ObservedDataYValue>

0 commit comments

Comments
 (0)