Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -54,7 +54,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -76,7 +76,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -98,7 +98,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -120,15 +120,15 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// /// Asserts whether or not and are equal to eachother. /// /// The array of expected . /// The array of actual . - public static void AreEqual(HydraRingVariable[] expected, HydraRingVariable[] actual) + public static void AreEqual(HydraRingVariable2[] expected, HydraRingVariable2[] actual) { Assert.AreEqual(expected.Length, actual.Length); @@ -169,15 +169,17 @@ } } - private static void AreEqual(HydraRingVariable expected, HydraRingVariable actual) + private static void AreEqual(HydraRingVariable2 expected, HydraRingVariable2 actual) { Assert.AreEqual(expected.DeviationType, actual.DeviationType); Assert.AreEqual(expected.DistributionType, actual.DistributionType); Assert.AreEqual(expected.Value, actual.Value, accuracy); - Assert.AreEqual(expected.Mean, actual.Mean, accuracy); - Assert.AreEqual(expected.Shift, actual.Shift, accuracy); - Assert.AreEqual(expected.Variability, actual.Variability, accuracy); + Assert.AreEqual(expected.Parameter1, actual.Parameter1, accuracy); + Assert.AreEqual(expected.Parameter2, actual.Parameter2); + Assert.AreEqual(expected.Parameter3, actual.Parameter3); + Assert.AreEqual(expected.Parameter4, actual.Parameter4); Assert.AreEqual(expected.VariableId, actual.VariableId, accuracy); + Assert.AreEqual(expected.CoefficientOfVariation, actual.CoefficientOfVariation, accuracy); } } } \ No newline at end of file