Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -re25d1dff1132d88462399833e9a76b1dc6b8b785 -rbf651e17f58d959e7c792c4923e08820f8ae5f45 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision e25d1dff1132d88462399833e9a76b1dc6b8b785) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision bf651e17f58d959e7c792c4923e08820f8ae5f45) @@ -136,7 +136,8 @@ Assert.AreEqual("New name", dataGridView.Rows[0].Cells[nameColumnIndex].FormattedValue); // Change an input parameter of the second calculation and ensure the data grid view is updated - calculation2.InputParameters.ExitPointL = (RoundedDouble) 111.11; + calculation2.InputParameters.UseAssessmentLevelManualInput = true; + calculation2.InputParameters.AssessmentLevel = (RoundedDouble) 111.11; calculation2.InputParameters.NotifyObservers(); Assert.AreEqual(111.11.ToString(CultureInfo.CurrentCulture), dataGridView.Rows[1].Cells[exitPointLColumnIndex].FormattedValue); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -r167a3dea1765ff31bf419babe966745d5a527ea3 -rbf651e17f58d959e7c792c4923e08820f8ae5f45 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 167a3dea1765ff31bf419babe966745d5a527ea3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision bf651e17f58d959e7c792c4923e08820f8ae5f45) @@ -137,14 +137,8 @@ Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); Assert.AreEqual(double.NaN, calculation.InputParameters.AssessmentLevel.Value); Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); - Assert.AreEqual(double.NaN, calculation.InputParameters.EntryPointL.Value); - Assert.AreEqual(double.NaN, calculation.InputParameters.ExitPointL.Value); Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); - Assert.AreEqual(double.NaN, calculation.InputParameters.PhreaticLevelExit.Mean.Value); - Assert.AreEqual(double.NaN, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); - Assert.AreEqual(double.NaN, calculation.InputParameters.DampingFactorExit.Mean.Value); - Assert.AreEqual(double.NaN, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); } [Test] @@ -157,14 +151,8 @@ Assert.AreEqual("PK001_0001 W1-6_0_1D1", calculation.Name); Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.AssessmentLevel.Value); Assert.AreEqual("PK001_0001", calculation.InputParameters.SurfaceLine.Name); - Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.EntryPointL.Value); - Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.ExitPointL.Value); Assert.AreEqual("PK001_0001_Piping", calculation.InputParameters.StochasticSoilModel.Name); Assert.AreEqual("W1-6_0_1D1", calculation.InputParameters.StochasticSoilProfile.SoilProfile.Name); - Assert.AreEqual(double.NegativeInfinity, calculation.InputParameters.PhreaticLevelExit.Mean.Value); - Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); - Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.DampingFactorExit.Mean.Value); - Assert.AreEqual(double.PositiveInfinity, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); } private static void AssertCalculation(MacroStabilityInwardsCalculation calculation, @@ -223,11 +211,6 @@ Assert.IsNull(calculation.InputParameters.StochasticSoilModel); Assert.IsNull(calculation.InputParameters.StochasticSoilProfile); } - - Assert.AreEqual(0, calculation.InputParameters.PhreaticLevelExit.Mean.Value); - Assert.AreEqual(0.1, calculation.InputParameters.PhreaticLevelExit.StandardDeviation.Value); - Assert.AreEqual(0.7, calculation.InputParameters.DampingFactorExit.Mean.Value); - Assert.AreEqual(0.1, calculation.InputParameters.DampingFactorExit.StandardDeviation.Value); } private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r167a3dea1765ff31bf419babe966745d5a527ea3 -rbf651e17f58d959e7c792c4923e08820f8ae5f45 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 167a3dea1765ff31bf419babe966745d5a527ea3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtils/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision bf651e17f58d959e7c792c4923e08820f8ae5f45) @@ -23,7 +23,6 @@ using Core.Common.Base.Geometry; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; @@ -142,16 +141,6 @@ { new MacroStabilityInwardsSoilLayer(0) }, SoilProfileType.SoilProfile1D, 0) - }, - PhreaticLevelExit = - { - Mean = (RoundedDouble) 0, - StandardDeviation = (RoundedDouble) 0.1 - }, - DampingFactorExit = - { - Mean = (RoundedDouble) 0.7, - StandardDeviation = (RoundedDouble) 0.1 } } }; @@ -167,18 +156,6 @@ { MacroStabilityInwardsCalculation calculation = GetMacroStabilityInwardsCalculationWithAssessmentLevel(); calculation.InputParameters.AssessmentLevel = RoundedDouble.NaN; - calculation.InputParameters.EntryPointL = RoundedDouble.NaN; - calculation.InputParameters.ExitPointL = RoundedDouble.NaN; - calculation.InputParameters.PhreaticLevelExit = new NormalDistribution - { - Mean = RoundedDouble.NaN, - StandardDeviation = RoundedDouble.NaN - }; - calculation.InputParameters.DampingFactorExit = new LogNormalDistribution - { - Mean = RoundedDouble.NaN, - StandardDeviation = RoundedDouble.NaN - }; return calculation; } @@ -198,18 +175,6 @@ }); calculation.InputParameters.AssessmentLevel = (RoundedDouble) double.NegativeInfinity; - calculation.InputParameters.EntryPointL = (RoundedDouble) double.NegativeInfinity; - calculation.InputParameters.ExitPointL = (RoundedDouble) double.PositiveInfinity; - calculation.InputParameters.PhreaticLevelExit = new NormalDistribution - { - Mean = (RoundedDouble) double.NegativeInfinity, - StandardDeviation = (RoundedDouble) double.PositiveInfinity - }; - calculation.InputParameters.DampingFactorExit = new LogNormalDistribution - { - Mean = (RoundedDouble) double.PositiveInfinity, - StandardDeviation = (RoundedDouble) double.PositiveInfinity - }; return calculation; }