Fixes #326 PI: random start values are not generated (#354)

* Fixes #326 PI: random start values are not generated * Also bump version to 7.2.2
Open-Systems-Pharmacology · Feb 20, 2018 · eef9a67 · eef9a67
1 parent c8192ca
commit eef9a67
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 25 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ configuration: Debug
 image: Visual Studio 2017
 
 environment:
-  app_version: '7.2.0'
+  app_version: '7.2.2'
 
 version: '%app_version%.{build}'
 
@@ -38,7 +38,7 @@ skip_branch_with_pr: true
 
 branches:
   only:
-    - develop
+    - hotfix/7.2.2
 test:
   assemblies:
     - OSPSuite.Core.Tests.dll

diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj
@@ -75,8 +75,8 @@
     <Reference Include="OSPSuite.Utility, Version=2.0.1.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.6.5.7, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.6.6.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config
@@ -8,7 +8,7 @@
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
   <package id="NHibernate" version="4.1.1.4000" targetFramework="net452" />
-  <package id="OSPSuite.SmartXLS" version="2.6.5.7" targetFramework="net452" />
+  <package id="OSPSuite.SmartXLS" version="2.6.6.4" targetFramework="net452" />
   <package id="OSPSuite.TeXReporting" version="2.0.1.7" targetFramework="net452" />
   <package id="OSPSuite.Utility" version="2.0.1.4" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />

diff --git a/.../Mappers/ParameterIdentifications/ParameterIdentificationRunResultToRunResultDTOMapper.cs b/.../Mappers/ParameterIdentifications/ParameterIdentificationRunResultToRunResultDTOMapper.cs
@@ -33,7 +33,7 @@ public ParameterIdentificationRunResultDTO MapFrom(ParameterIdentification param
 
          parameterIdentification.AllFixedIdentificationParameters.Each(x =>
          {
-            var fixedParameterDTO = mapFrom(x, x.StartValue);
+            var fixedParameterDTO = mapFrom(x, x.StartValue, x.StartValue);
             addOptimizedParameterDTOTo(runResultDTO, fixedParameterDTO);
          });
 
@@ -56,16 +56,16 @@ private OptimizedParameterDTO mapFrom(OptimizedParameterValue optimizedParameter
          if (identificationParameter == null)
             return null;
 
-         return mapFrom(identificationParameter, optimizedParameterValue.Value);
+         return mapFrom(identificationParameter, optimizedParameterValue.Value, optimizedParameterValue.StartValue);
       }
 
-      private OptimizedParameterDTO mapFrom(IdentificationParameter identificationParameter, double optimalValue)
+      private OptimizedParameterDTO mapFrom(IdentificationParameter identificationParameter, double optimalValue, double startValue)
       {
          var dto = new OptimizedParameterDTO
          {
             Name = identificationParameter.Name,
             OptimalValue = mapFrom(optimalValue, identificationParameter.StartValueParameter),
-            StartValue = mapFrom(identificationParameter.StartValue, identificationParameter.StartValueParameter),
+            StartValue = mapFrom(startValue, identificationParameter.StartValueParameter),
             MinValue = mapFrom(identificationParameter.MinValue, identificationParameter.MinValueParameter),
             MaxValue = mapFrom(identificationParameter.MaxValue, identificationParameter.MaxValueParameter),
             Scaling = identificationParameter.Scaling

diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj
@@ -51,8 +51,8 @@
     <Reference Include="OSPSuite.Utility, Version=2.0.1.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.6.5.7, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.6.6.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="OSPSuite.DevExpress.Presentation" version="17.1.5" targetFramework="net452" />
   <package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net452" />
-  <package id="OSPSuite.SmartXLS" version="2.6.5.7" targetFramework="net452" />
+  <package id="OSPSuite.SmartXLS" version="2.6.6.4" targetFramework="net452" />
   <package id="OSPSuite.TeXReporting" version="2.0.1.7" targetFramework="net452" />
   <package id="OSPSuite.Utility" version="2.0.1.4" targetFramework="net452" />
 </packages>
diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj
@@ -112,8 +112,8 @@
     <Reference Include="OSPSuite.Utility, Version=2.0.1.4, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.6.5.7, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.6.6.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">

diff --git a/...uite.Core.Tests/Presentation/ParameterIdentificationRunResultToRunResultDTOMapperSpecs.cs b/...uite.Core.Tests/Presentation/ParameterIdentificationRunResultToRunResultDTOMapperSpecs.cs
@@ -1,10 +1,9 @@
 using System.Drawing;
 using System.Linq;
-using OSPSuite.BDDHelper;
-using OSPSuite.BDDHelper.Extensions;
 using FakeItEasy;
 using OSPSuite.Assets;
-using OSPSuite.Core;
+using OSPSuite.BDDHelper;
+using OSPSuite.BDDHelper.Extensions;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.ParameterIdentifications;
 using OSPSuite.Helpers;
@@ -24,6 +23,8 @@ public abstract class concern_for_ParameterIdentificationRunResultToRunResultDTO
       protected IdentificationParameter _identificationParameter3;
       protected OptimizationRunResult _optimizationRunResult;
       protected IOptimizedParameterRangeImageCreator _rangeImageCreator;
+      protected OptimizedParameterValue _optimizedParameterValue1;
+      protected OptimizedParameterValue _optimizedParameterValue2;
 
       protected override void Context()
       {
@@ -58,8 +59,10 @@ protected override void Context()
          _parameterIdentification.AddIdentificationParameter(_identificationParameter2);
          _parameterIdentification.AddIdentificationParameter(_identificationParameter3);
 
-         _optimizationRunResult.AddValue(new OptimizedParameterValue("P1", 2.5, 2));
-         _optimizationRunResult.AddValue(new OptimizedParameterValue("P2", 5.5, 5));
+         _optimizedParameterValue1 = new OptimizedParameterValue("P1", 2.5, 2.1);
+         _optimizationRunResult.AddValue(_optimizedParameterValue1);
+         _optimizedParameterValue2 = new OptimizedParameterValue("P2", 5.5, 5.2);
+         _optimizationRunResult.AddValue(_optimizedParameterValue2);
          //does not exist in PI anymore
          _optimizationRunResult.AddValue(new OptimizedParameterValue("P DOES NOT EXIST", 50, 60));
 
@@ -101,16 +104,16 @@ public void should_save_a_reference_to_the_original_run_result()
       public void should_have_created_one_optimized_parameter_dto_for_each_identification_parameter()
       {
          _dto.OptimizedParameters.Count.ShouldBeEqualTo(3);
-         validateIdentificationParameter(_dto.OptimizedParameters[0], _identificationParameter1, 2.5);
-         validateIdentificationParameter(_dto.OptimizedParameters[1], _identificationParameter2, 5.5);
-         validateIdentificationParameter(_dto.OptimizedParameters[2], _identificationParameter3, _identificationParameter3.StartValue);
+         validateIdentificationParameter(_dto.OptimizedParameters[0], _identificationParameter1, _optimizedParameterValue1.Value, _optimizedParameterValue1.StartValue);
+         validateIdentificationParameter(_dto.OptimizedParameters[1], _identificationParameter2, _optimizedParameterValue2.Value, _optimizedParameterValue2.StartValue);
+         validateIdentificationParameter(_dto.OptimizedParameters[2], _identificationParameter3, _identificationParameter3.StartValue, _identificationParameter3.StartValue);
       }
 
-      private void validateIdentificationParameter(OptimizedParameterDTO optimizedParameterDTO, IdentificationParameter identificationParameter, double optimalValue)
+      private void validateIdentificationParameter(OptimizedParameterDTO optimizedParameterDTO, IdentificationParameter identificationParameter, double optimalValue, double startValue)
       {
          optimizedParameterDTO.Name.ShouldBeEqualTo(identificationParameter.Name);
          optimizedParameterDTO.OptimalValue.DisplayValue.ShouldBeEqualTo(identificationParameter.StartValueParameter.ConvertToDisplayUnit(optimalValue));
-         optimizedParameterDTO.StartValue.DisplayValue.ShouldBeEqualTo(identificationParameter.StartValueParameter.ValueInDisplayUnit);
+         optimizedParameterDTO.StartValue.DisplayValue.ShouldBeEqualTo(identificationParameter.StartValueParameter.ConvertToDisplayUnit(startValue));
          optimizedParameterDTO.MinValue.DisplayValue.ShouldBeEqualTo(identificationParameter.MinValueParameter.ValueInDisplayUnit);
          optimizedParameterDTO.MaxValue.DisplayValue.ShouldBeEqualTo(identificationParameter.MaxValueParameter.ValueInDisplayUnit);
          optimizedParameterDTO.ValueIsCloseToBoundary.ShouldBeFalse();

diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config
@@ -15,7 +15,7 @@
   <package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net452" />
   <package id="OSPSuite.SimModel" version="2.2.0.6" targetFramework="net452" />
   <package id="OSPSuite.SimModelSolver_CVODES282" version="2.0.0.1" />
-  <package id="OSPSuite.SmartXLS" version="2.6.5.7" targetFramework="net452" />
+  <package id="OSPSuite.SmartXLS" version="2.6.6.4" targetFramework="net452" />
   <package id="OSPSuite.TeXReporting" version="2.0.1.7" targetFramework="net452" />
   <package id="OSPSuite.Utility" version="2.0.1.4" targetFramework="net452" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />