Fixes #2030 Weird "differences" when applying an expression profile (#…

…2031) * Fixes #2030 Weird "differences" when applying an expression profile * PR feedback
Open-Systems-Pharmacology · Jun 9, 2023 · 5b61b0d · 5b61b0d
1 parent d60f0cd
commit 5b61b0d
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 15 deletions.
diff --git a/src/OSPSuite.Core/Comparison/ComparisonExtensions.cs b/src/OSPSuite.Core/Comparison/ComparisonExtensions.cs
@@ -1,11 +1,17 @@
 using System;
 using OSPSuite.Core.Domain;
 using OSPSuite.Core.Domain.Formulas;
+using OSPSuite.Core.Domain.UnitSystem;
 
 namespace OSPSuite.Core.Comparison
 {
    public static class ComparisonExtensions
    {
+      public static IComparison<IDimension> DimensionComparison<TObject>(this IComparison<TObject> comparison) where TObject : class, IWithDimension
+      {
+         return ChildComparison(comparison, x => x.Dimension);
+      }
+
       public static IComparison<IFormula> FormulaComparison<TObject>(this IComparison<TObject> comparison) where TObject : class, IUsingFormula
       {
          return ChildComparison(comparison, x => x.Formula);

diff --git a/src/OSPSuite.Core/Comparison/ConstantFormulaDiffBuilder.cs b/src/OSPSuite.Core/Comparison/ConstantFormulaDiffBuilder.cs
@@ -5,18 +5,20 @@ namespace OSPSuite.Core.Comparison
 {
    public class ConstantFormulaDiffBuilder : DiffBuilder<ConstantFormula>
    {
+      private readonly IObjectComparer _objectComparer;
       private readonly IDisplayUnitRetriever _displayUnitRetriever;
 
-      public ConstantFormulaDiffBuilder(IDisplayUnitRetriever displayUnitRetriever)
+      public ConstantFormulaDiffBuilder(IObjectComparer objectComparer, IDisplayUnitRetriever displayUnitRetriever)
       {
+         _objectComparer = objectComparer;
          _displayUnitRetriever = displayUnitRetriever;
       }
 
       public override void Compare(IComparison<ConstantFormula> comparison)
       {
          if (!comparison.Settings.CompareHiddenEntities) return;
          CompareDoubleValues(x => x.Value, x => x.Value, comparison,x=> _displayUnitRetriever.PreferredUnitFor(x));
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
       }
    }
 }
diff --git a/src/OSPSuite.Core/Comparison/DimensionDiffBuilder.cs b/src/OSPSuite.Core/Comparison/DimensionDiffBuilder.cs
@@ -0,0 +1,13 @@
+using OSPSuite.Assets;
+using OSPSuite.Core.Domain.UnitSystem;
+
+namespace OSPSuite.Core.Comparison
+{
+   internal class DimensionDiffBuilder : DiffBuilder<Dimension>
+   {
+      public override void Compare(IComparison<Dimension> comparison)
+      {
+         CompareValues(x => x.Name, x => Captions.Dimension, comparison);
+      }
+   }
+}
diff --git a/src/OSPSuite.Core/Comparison/EventAssignmentBuilderDiffBuilder.cs b/src/OSPSuite.Core/Comparison/EventAssignmentBuilderDiffBuilder.cs
@@ -17,7 +17,7 @@ public override void Compare(IComparison<EventAssignmentBuilder> comparison)
       {
          _entityDiffBuilder.Compare(comparison);
          CompareValues(x => x.UseAsValue, x => x.UseAsValue, comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          _objectComparer.Compare(comparison.FormulaComparison());
       }
    }

diff --git a/src/OSPSuite.Core/Comparison/FormulaUsablePathDiffBuilder.cs b/src/OSPSuite.Core/Comparison/FormulaUsablePathDiffBuilder.cs
@@ -4,18 +4,20 @@ namespace OSPSuite.Core.Comparison
 {
    public class FormulaUsablePathDiffBuilder : DiffBuilder<FormulaUsablePath>
    {
+      private readonly IObjectComparer _objectComparer;
       private readonly ObjectPathDiffBuilder _objectPathDiffBuilder;
 
-      public FormulaUsablePathDiffBuilder(ObjectPathDiffBuilder objectPathDiffBuilder)
+      public FormulaUsablePathDiffBuilder(IObjectComparer objectComparer, ObjectPathDiffBuilder objectPathDiffBuilder)
       {
+         _objectComparer = objectComparer;
          _objectPathDiffBuilder = objectPathDiffBuilder;
       }
 
       public override void Compare(IComparison<FormulaUsablePath> comparison)
       {
          _objectPathDiffBuilder.Compare(comparison);
          CompareStringValues(x => x.Alias, x => x.Alias, comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
       }
    }
 }
diff --git a/src/OSPSuite.Core/Comparison/FormulaWithFormulaStringDiffBuilder.cs b/src/OSPSuite.Core/Comparison/FormulaWithFormulaStringDiffBuilder.cs
@@ -4,16 +4,18 @@ namespace OSPSuite.Core.Comparison
 {
    public class FormulaWithFormulaStringDiffBuilder : DiffBuilder<FormulaWithFormulaString>
    {
+      private readonly IObjectComparer _objectComparer;
       private readonly EnumerableComparer _enumerableComparer;
 
-      public FormulaWithFormulaStringDiffBuilder(EnumerableComparer enumerableComparer)
+      public FormulaWithFormulaStringDiffBuilder(IObjectComparer objectComparer, EnumerableComparer enumerableComparer)
       {
+         _objectComparer = objectComparer;
          _enumerableComparer = enumerableComparer;
       }
 
       public override void Compare(IComparison<FormulaWithFormulaString> comparison)
       {
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          CompareStringValues(x => x.FormulaString, x => x.FormulaString, comparison);
          _enumerableComparer.CompareEnumerables(comparison, x => x.ObjectPaths, x => x.Alias);
       }

diff --git a/src/OSPSuite.Core/Comparison/ObserverBuilderDiffBuilder.cs b/src/OSPSuite.Core/Comparison/ObserverBuilderDiffBuilder.cs
@@ -20,7 +20,7 @@ public override void Compare(IComparison<ObserverBuilder> comparison)
          _entityDiffBuilder.Compare(comparison);
          _moleculeDependentDiffBuilder.Compare(comparison);
          CompareValues(x => x.ContainerCriteria, x => x.ContainerCriteria, comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          _objectComparer.Compare(comparison.FormulaComparison());
       }
    }

diff --git a/src/OSPSuite.Core/Comparison/QuantityDiffBuilder.cs b/src/OSPSuite.Core/Comparison/QuantityDiffBuilder.cs
@@ -25,7 +25,7 @@ public override void Compare(IComparison<IQuantity> comparison)
       private void compareQuantities(IComparison<IQuantity> comparison)
       {
          _entityDiffBuilder.Compare(comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          CompareValues(x => x.QuantityType, x => x.QuantityType, comparison);
          CompareValues(x => x.NegativeValuesAllowed, x => x.NegativeValuesAllowed, comparison);
 

diff --git a/src/OSPSuite.Core/Comparison/ReactionBuilderDiffBuilder.cs b/src/OSPSuite.Core/Comparison/ReactionBuilderDiffBuilder.cs
@@ -24,7 +24,7 @@ public override void Compare(IComparison<ReactionBuilder> comparison)
          _enumerableComparer.CompareEnumerables(comparison, x => x.Products, item => item.MoleculeName);
          _enumerableComparer.CompareEnumerables(comparison, x => x.ModifierNames, item => item, missingItemType: ObjectTypes.Modifier);
          CompareValues(x => x.ContainerCriteria, x => x.ContainerCriteria, comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
       }
    }
 }
diff --git a/src/OSPSuite.Core/Comparison/StartValueDiffBuilder.cs b/src/OSPSuite.Core/Comparison/StartValueDiffBuilder.cs
@@ -22,7 +22,8 @@ public override void Compare(IComparison<T> comparison)
       protected virtual void ComparePathAndEntityValues(IComparison<T> comparison)
       {
          _entityDiffBuilder.Compare(comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
+
          CompareValues(x => x.ContainerPath, x => x.ContainerPath, comparison);
 
          // Always Compare Value and Formula, independent from settings as these are two different properties of a start value

diff --git a/src/OSPSuite.Core/Comparison/TableFormulaDiffBuilder.cs b/src/OSPSuite.Core/Comparison/TableFormulaDiffBuilder.cs
@@ -8,12 +8,14 @@ namespace OSPSuite.Core.Comparison
 {
    public class TableFormulaDiffBuilder : DiffBuilder<TableFormula>
    {
+      private readonly IObjectComparer _objectComparer;
       private readonly ObjectBaseDiffBuilder _objectBaseDiffBuilder;
       private readonly EnumerableComparer _enumerableComparer;
       private readonly IDisplayNameProvider _displayNameProvider;
 
-      public TableFormulaDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer, IDisplayNameProvider displayNameProvider)
+      public TableFormulaDiffBuilder(IObjectComparer objectComparer, ObjectBaseDiffBuilder objectBaseDiffBuilder, EnumerableComparer enumerableComparer, IDisplayNameProvider displayNameProvider)
       {
+         _objectComparer = objectComparer;
          _objectBaseDiffBuilder = objectBaseDiffBuilder;
          _enumerableComparer = enumerableComparer;
          _displayNameProvider = displayNameProvider;
@@ -22,7 +24,7 @@ public TableFormulaDiffBuilder(ObjectBaseDiffBuilder objectBaseDiffBuilder, Enum
       public override void Compare(IComparison<TableFormula> comparison)
       {
          _objectBaseDiffBuilder.Compare(comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          CompareStringValues(x => x.XName, x => x.XName, comparison);
          CompareStringValues(x => x.YName, x => x.YName, comparison);
          CompareValues(x => x.UseDerivedValues, x => x.UseDerivedValues, comparison);

diff --git a/src/OSPSuite.Core/Comparison/TransporterBuilderDiffBuilder.cs b/src/OSPSuite.Core/Comparison/TransporterBuilderDiffBuilder.cs
@@ -20,7 +20,7 @@ public override void Compare(IComparison<TransportBuilder> comparison)
          _containerDiffBuilder.Compare(comparison);
          CompareValues(x => x.SourceCriteria, x => x.SourceCriteria, comparison);
          CompareValues(x => x.TargetCriteria, x => x.TargetCriteria, comparison);
-         CompareValues(x => x.Dimension, x => x.Dimension, comparison);
+         _objectComparer.Compare(comparison.DimensionComparison());
          _moleculeDependentBuilderDiffBuilder.Compare(comparison);
          _objectComparer.Compare(comparison.FormulaComparison());
       }

diff --git a/tests/OSPSuite.Core.IntegrationTests/DiffBuilders/StartValueDiffBuilderSpecs.cs b/tests/OSPSuite.Core.IntegrationTests/DiffBuilders/StartValueDiffBuilderSpecs.cs
@@ -280,7 +280,7 @@ protected override void Context()
          var dim = A.Fake<IDimension>();
          var msv1 = new ParameterValue().WithName("Tada").WithFormula(new ConstantFormula(2)).WithDimension(dim);
          msv1.Path = new ObjectPath("Root", "Liver", "Plasma");
-         var dim2 = A.Fake<IDimension>();
+         var dim2 = new Dimension(new BaseDimensionRepresentation(), "name", "name");
          var msv2 = new ParameterValue().WithName("Tada").WithFormula(new ConstantFormula(2)).WithDimension(dim2);
          msv2.Path = new ObjectPath("Root", "Liver", "Plasma");
          _object1 = msv1;