Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -25,7 +25,6 @@ using Core.Common.Base.Data; using Riskeer.MacroStabilityInwards.CalculatedInput.Converters; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; -using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Output; @@ -202,7 +201,6 @@ { return new WaternetCalculatorInput.ConstructionProperties { - PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017, SurfaceLine = input.SurfaceLine, SoilProfile = SoilProfileConverter.Convert(input.SoilProfileUnderSurfaceLine), DrainageConstruction = DrainageConstructionConverter.Convert(input), Fisheye: Tag 25a925a4c8abc38a558698fd67efecaede992b2d refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Input/PlLineCreationMethod.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -83,7 +83,6 @@ throw new ArgumentException("SlipPlane must be set."); } - PlLineCreationMethod = properties.PlLineCreationMethod; AssessmentLevel = properties.AssessmentLevel; SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; @@ -121,7 +120,6 @@ /// public ConstructionProperties() { - PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017; AssessmentLevel = double.NaN; WaterLevelRiverAverage = double.NaN; WaterLevelPolderExtreme = double.NaN; @@ -143,11 +141,6 @@ #region Properties /// - /// Gets or sets the pl line creation method. - /// - public PlLineCreationMethod PlLineCreationMethod { internal get; set; } - - /// /// Gets or sets the outside high water level. /// [m+NAP] /// @@ -293,11 +286,6 @@ #region Properties /// - /// Gets the pl line creation method. - /// - public PlLineCreationMethod PlLineCreationMethod { get; } - - /// /// Gets the outside high water level. /// [m+NAP] /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -71,7 +71,6 @@ throw new ArgumentException("PhreaticLineOffsets must be set."); } - PlLineCreationMethod = properties.PlLineCreationMethod; AssessmentLevel = properties.AssessmentLevel; SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; @@ -102,7 +101,6 @@ /// public ConstructionProperties() { - PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017; AssessmentLevel = double.NaN; WaterLevelRiverAverage = double.NaN; WaterLevelPolder = double.NaN; @@ -121,11 +119,6 @@ #region Properties /// - /// Gets or sets the pl line creation method. - /// - public PlLineCreationMethod PlLineCreationMethod { internal get; set; } - - /// /// Gets or sets the outside high water level. /// [m+NAP] /// @@ -233,11 +226,6 @@ #region Properties /// - /// Gets the pl line creation method. - /// - public PlLineCreationMethod PlLineCreationMethod { get; } - - /// /// Gets the outside high water level. /// [m+NAP] /// Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -30,7 +30,6 @@ using Riskeer.MacroStabilityInwards.CalculatedInput.Converters; using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; -using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output; @@ -235,7 +234,6 @@ return new UpliftVanCalculatorInput( new UpliftVanCalculatorInput.ConstructionProperties { - PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017, AssessmentLevel = effectiveAssessmentLevel, SurfaceLine = inputParameters.SurfaceLine, SoilProfile = SoilProfileConverter.Convert(inputParameters.SoilProfileUnderSurfaceLine), Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -30,7 +30,6 @@ using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Data.TestUtil; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; -using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators; @@ -383,7 +382,6 @@ { CalculatorInputAssert.AssertSoilProfile(originalInput.SoilProfileUnderSurfaceLine, actualInput.SoilProfile); CalculatorInputAssert.AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario); Assert.AreEqual(originalInput.WaterLevelRiverAverage, actualInput.WaterLevelRiverAverage); Fisheye: Tag 25a925a4c8abc38a558698fd67efecaede992b2d refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Input/PlLineCreationMethodTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -56,7 +56,6 @@ var phreaticLineOffsets = new PhreaticLineOffsets(); var slipPlane = new UpliftVanSlipPlane(); var slipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(), random.NextDouble()); - var plLineCreationMethod = random.NextEnumValue(); double waterLevelRiverAverage = random.NextDouble(); double waterLevelPolderExtreme = random.NextDouble(); double waterLevelPolderDaily = random.NextDouble(); @@ -79,7 +78,6 @@ var input = new UpliftVanCalculatorInput( new UpliftVanCalculatorInput.ConstructionProperties { - PlLineCreationMethod = plLineCreationMethod, AssessmentLevel = hRiverValue, SurfaceLine = surfaceLine, SoilProfile = soilProfile, @@ -108,7 +106,6 @@ }); // Assert - Assert.AreEqual(plLineCreationMethod, input.PlLineCreationMethod); Assert.AreEqual(hRiverValue, input.AssessmentLevel); Assert.AreSame(surfaceLine, input.SurfaceLine); Assert.AreSame(soilProfile, input.SoilProfile); @@ -182,7 +179,6 @@ Assert.IsFalse(input.AdjustPhreaticLine3And4ForUplift); Assert.IsFalse(input.MoveGrid); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, input.DikeSoilScenario); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -55,7 +55,6 @@ var drainageConstruction = new DrainageConstruction(); var phreaticLineOffsets = new PhreaticLineOffsets(); - var plLineCreationMethod = random.NextEnumValue(); double waterLevelRiverAverage = random.NextDouble(); double waterLevelPolder = random.NextDouble(); double minimumLevelPhreaticLineAtDikeTopRiver = random.NextDouble(); @@ -74,7 +73,6 @@ var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { - PlLineCreationMethod = plLineCreationMethod, AssessmentLevel = assessmentLevel, SurfaceLine = surfaceLine, SoilProfile = soilProfile, @@ -96,7 +94,6 @@ }); // Assert - Assert.AreEqual(plLineCreationMethod, input.PlLineCreationMethod); Assert.AreEqual(assessmentLevel, input.AssessmentLevel); Assert.AreSame(surfaceLine, input.SurfaceLine); Assert.AreSame(soilProfile, input.SoilProfile); @@ -153,7 +150,6 @@ Assert.IsNaN(input.PenetrationLength); Assert.IsFalse(input.AdjustPhreaticLine3And4ForUplift); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, input.DikeSoilScenario); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -58,7 +58,6 @@ AssertSurfaceLine(input.SurfaceLine); AssertSoilProfile(input.SoilProfile, input.SurfaceLine); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } @@ -87,7 +86,6 @@ AssertSurfaceLine(input.SurfaceLine); AssertSoilProfile(input.SoilProfile, input.SurfaceLine); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rfb28e8a8ebbe1645f52806c788195fd49444626a -r25a925a4c8abc38a558698fd67efecaede992b2d --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision fb28e8a8ebbe1645f52806c788195fd49444626a) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 25a925a4c8abc38a558698fd67efecaede992b2d) @@ -32,7 +32,6 @@ using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Data.TestUtil; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators; -using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output; @@ -821,7 +820,6 @@ CalculatorInputAssert.AssertPhreaticLineOffsets(originalInput.LocationInputDaily, actualInput.PhreaticLineOffsetsDaily); AssertSlipPlaneInput(originalInput, actualInput.SlipPlane); AssertSlipPlaneConstraints(originalInput, actualInput.SlipPlaneConstraints); - Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); Assert.AreEqual(expectedAssessmentLevel, actualInput.AssessmentLevel); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario);