Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs =================================================================== diff -u -rc6c1bd3e608d35c5fb707033534b5aff950ff55d -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision c6c1bd3e608d35c5fb707033534b5aff950ff55d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -41,8 +41,7 @@ /// ; /// ; /// ; - /// ; - /// ; + /// . /// /// public WaternetCalculatorInput(ConstructionProperties properties) @@ -64,14 +63,10 @@ { throw new ArgumentException("DrainageConstruction must be set."); } - if (properties.PhreaticLineOffsetsExtreme == null) + if (properties.PhreaticLineOffsets == null) { - throw new ArgumentException("PhreaticLineOffsetsExtreme must be set."); + throw new ArgumentException("PhreaticLineOffsets must be set."); } - if (properties.PhreaticLineOffsetsDaily == null) - { - throw new ArgumentException("PhreaticLineOffsetsDaily must be set."); - } WaternetCreationMode = properties.WaternetCreationMode; PlLineCreationMethod = properties.PlLineCreationMethod; @@ -80,11 +75,9 @@ SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; DrainageConstruction = properties.DrainageConstruction; - PhreaticLineOffsetsExtreme = properties.PhreaticLineOffsetsExtreme; - PhreaticLineOffsetsDaily = properties.PhreaticLineOffsetsDaily; + PhreaticLineOffsets = properties.PhreaticLineOffsets; WaterLevelRiverAverage = properties.WaterLevelRiverAverage; - WaterLevelPolderExtreme = properties.WaterLevelPolderExtreme; - WaterLevelPolderDaily = properties.WaterLevelPolderDaily; + WaterLevelPolder = properties.WaterLevelPolder; MinimumLevelPhreaticLineAtDikeTopRiver = properties.MinimumLevelPhreaticLineAtDikeTopRiver; MinimumLevelPhreaticLineAtDikeTopPolder = properties.MinimumLevelPhreaticLineAtDikeTopPolder; LeakageLengthOutwardsPhreaticLine3 = properties.LeakageLengthOutwardsPhreaticLine3; @@ -113,8 +106,7 @@ AssessmentLevel = double.NaN; LandwardDirection = LandwardDirection.PositiveX; WaterLevelRiverAverage = double.NaN; - WaterLevelPolderExtreme = double.NaN; - WaterLevelPolderDaily = double.NaN; + WaterLevelPolder = double.NaN; MinimumLevelPhreaticLineAtDikeTopRiver = double.NaN; MinimumLevelPhreaticLineAtDikeTopPolder = double.NaN; LeakageLengthOutwardsPhreaticLine3 = double.NaN; @@ -166,16 +158,11 @@ public DrainageConstruction DrainageConstruction { internal get; set; } /// - /// Gets or sets the phreatic line offsets under extreme circumstances. + /// Gets or sets the phreatic line offsets. /// - public PhreaticLineOffsets PhreaticLineOffsetsExtreme { internal get; set; } + public PhreaticLineOffsets PhreaticLineOffsets { internal get; set; } /// - /// Gets or sets the phreatic line offsets under daily circumstances. - /// - public PhreaticLineOffsets PhreaticLineOffsetsDaily { internal get; set; } - - /// /// Gets or sets the dike soil scenario. /// public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { internal get; set; } @@ -187,18 +174,12 @@ public double WaterLevelRiverAverage { internal get; set; } /// - /// Gets or sets the polder water level under extreme circumstances. + /// Gets or sets the polder water level. /// [m+NAP] /// - public double WaterLevelPolderExtreme { internal get; set; } + public double WaterLevelPolder { internal get; set; } /// - /// Gets or sets the polder water level under daily circumstances. - /// [m+NAP] - /// - public double WaterLevelPolderDaily { internal get; set; } - - /// /// Gets or sets the minimum level phreatic line at dike top river. /// [m+NAP] /// @@ -299,16 +280,11 @@ public DrainageConstruction DrainageConstruction { get; } /// - /// Gets the phreatic line offsets under extreme circumstances. + /// Gets the phreatic line offsets. /// - public PhreaticLineOffsets PhreaticLineOffsetsExtreme { get; } + public PhreaticLineOffsets PhreaticLineOffsets { get; } /// - /// Gets the phreatic line offsets under daily circumstances. - /// - public PhreaticLineOffsets PhreaticLineOffsetsDaily { get; } - - /// /// Gets the dike soil scenario. /// public MacroStabilityInwardsDikeSoilScenario DikeSoilScenario { get; } @@ -320,18 +296,12 @@ public double WaterLevelRiverAverage { get; } /// - /// Gets the polder water level under extreme circumstances. + /// Gets the polder water level. /// [m+NAP] /// - public double WaterLevelPolderExtreme { get; } + public double WaterLevelPolder { get; } /// - /// Gets the polder water level under daily circumstances. - /// [m+NAP] - /// - public double WaterLevelPolderDaily { get; } - - /// /// Gets the minimum level phreatic line at dike top river. /// [m+NAP] /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetDailyCalculator.cs =================================================================== diff -u -r1ac34cc0c84df6f54d67ab8c1886ca96387dd7dd -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetDailyCalculator.cs (.../WaternetDailyCalculator.cs) (revision 1ac34cc0c84df6f54d67ab8c1886ca96387dd7dd) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetDailyCalculator.cs (.../WaternetDailyCalculator.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -63,7 +63,7 @@ waternetKernel.SoilModel = SoilModelCreator.Create(soils); waternetKernel.SoilProfile = SoilProfileCreator.Create(Input.SoilProfile, layersWithSoils); - waternetKernel.Location = WaternetStabilityLocationCreator.CreateDaily(Input); + waternetKernel.Location = WaternetStabilityLocationCreator.Create(Input); waternetKernel.SurfaceLine = SurfaceLineCreator.Create(Input.SurfaceLine, Input.LandwardDirection); return waternetKernel; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetExtremeCalculator.cs =================================================================== diff -u -rf2eea656d0dcf8ed238cad8822bd7310840b45c4 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetExtremeCalculator.cs (.../WaternetExtremeCalculator.cs) (revision f2eea656d0dcf8ed238cad8822bd7310840b45c4) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetExtremeCalculator.cs (.../WaternetExtremeCalculator.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -63,7 +63,7 @@ waternetKernel.SoilModel = SoilModelCreator.Create(soils); waternetKernel.SoilProfile = SoilProfileCreator.Create(Input.SoilProfile, layersWithSoils); - waternetKernel.Location = WaternetStabilityLocationCreator.CreateExtreme(Input); + waternetKernel.Location = WaternetStabilityLocationCreator.Create(Input); waternetKernel.SurfaceLine = SurfaceLineCreator.Create(Input.SurfaceLine, Input.LandwardDirection); return waternetKernel; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/WaternetStabilityLocationCreator.cs =================================================================== diff -u -rcf4437d42715feee4622c9ae57fb9920485fb13f -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/WaternetStabilityLocationCreator.cs (.../WaternetStabilityLocationCreator.cs) (revision cf4437d42715feee4622c9ae57fb9920485fb13f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/WaternetStabilityLocationCreator.cs (.../WaternetStabilityLocationCreator.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -33,7 +33,7 @@ internal static class WaternetStabilityLocationCreator { /// - /// Creates a based on the given under extreme circumstances, + /// Creates a based on the given /// which can be used by . /// /// The to get the information from. @@ -45,7 +45,7 @@ /// Thrown when , /// or /// is a valid value but unsupported. - public static StabilityLocation CreateExtreme(WaternetCalculatorInput input) + public static StabilityLocation Create(WaternetCalculatorInput input) { if (input == null) { @@ -59,17 +59,17 @@ PlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(input.PlLineCreationMethod), WaterLevelRiver = input.AssessmentLevel, WaterLevelRiverAverage = input.WaterLevelRiverAverage, - WaterLevelPolder = input.WaterLevelPolderExtreme, + WaterLevelPolder = input.WaterLevelPolder, DrainageConstructionPresent = input.DrainageConstruction.IsPresent, XCoordMiddleDrainageConstruction = input.DrainageConstruction.XCoordinate, ZCoordMiddleDrainageConstruction = input.DrainageConstruction.ZCoordinate, MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver, MinimumLevelPhreaticLineAtDikeTopPolder = input.MinimumLevelPhreaticLineAtDikeTopPolder, - UseDefaultOffsets = input.PhreaticLineOffsetsExtreme.UseDefaults, - PlLineOffsetBelowPointBRingtoetsWti2017 = input.PhreaticLineOffsetsExtreme.BelowDikeTopAtRiver, - PlLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsetsExtreme.BelowDikeTopAtPolder, - PlLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsetsExtreme.BelowShoulderBaseInside, - PlLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsetsExtreme.BelowDikeToeAtPolder, + UseDefaultOffsets = input.PhreaticLineOffsets.UseDefaults, + PlLineOffsetBelowPointBRingtoetsWti2017 = input.PhreaticLineOffsets.BelowDikeTopAtRiver, + PlLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsets.BelowDikeTopAtPolder, + PlLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsets.BelowShoulderBaseInside, + PlLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsets.BelowDikeToeAtPolder, AdjustPl3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift, LeakageLengthOutwardsPl3 = input.LeakageLengthOutwardsPhreaticLine3, LeakageLengthInwardsPl3 = input.LeakageLengthInwardsPhreaticLine3, @@ -80,54 +80,5 @@ PenetrationLength = input.PenetrationLength }; } - - /// - /// Creates a based on the given under daily circumstances, - /// which can be used by . - /// - /// The to get the information from. - /// A new with the given information from . - /// Thrown when is null. - /// Thrown when , - /// or - /// is an invalid value. - /// Thrown when , - /// or - /// is a valid value but unsupported. - public static StabilityLocation CreateDaily(WaternetCalculatorInput input) - { - if (input == null) - { - throw new ArgumentNullException(nameof(input)); - } - - return new StabilityLocation - { - DikeSoilScenario = StabilityLocationCreatorHelper.ConvertDikeSoilScenario(input.DikeSoilScenario), - WaternetCreationMode = StabilityLocationCreatorHelper.ConvertWaternetCreationMode(input.WaternetCreationMode), - PlLineCreationMethod = StabilityLocationCreatorHelper.ConvertPlLineCreationMethod(input.PlLineCreationMethod), - WaterLevelRiver = input.WaterLevelRiverAverage, - WaterLevelRiverAverage = input.WaterLevelRiverAverage, - WaterLevelPolder = input.WaterLevelPolderDaily, - DrainageConstructionPresent = input.DrainageConstruction.IsPresent, - XCoordMiddleDrainageConstruction = input.DrainageConstruction.XCoordinate, - ZCoordMiddleDrainageConstruction = input.DrainageConstruction.ZCoordinate, - MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver, - MinimumLevelPhreaticLineAtDikeTopPolder = input.MinimumLevelPhreaticLineAtDikeTopPolder, - UseDefaultOffsets = input.PhreaticLineOffsetsDaily.UseDefaults, - PlLineOffsetBelowPointBRingtoetsWti2017 = input.PhreaticLineOffsetsDaily.BelowDikeTopAtRiver, - PlLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsetsDaily.BelowDikeTopAtPolder, - PlLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsetsDaily.BelowShoulderBaseInside, - PlLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsetsDaily.BelowDikeToeAtPolder, - AdjustPl3And4ForUplift = input.AdjustPhreaticLine3And4ForUplift, - LeakageLengthOutwardsPl3 = input.LeakageLengthOutwardsPhreaticLine3, - LeakageLengthInwardsPl3 = input.LeakageLengthInwardsPhreaticLine3, - LeakageLengthOutwardsPl4 = input.LeakageLengthOutwardsPhreaticLine4, - LeakageLengthInwardsPl4 = input.LeakageLengthInwardsPhreaticLine4, - HeadInPlLine2Outwards = input.PiezometricHeadPhreaticLine2Outwards, - HeadInPlLine2Inwards = input.PiezometricHeadPhreaticLine2Inwards, - PenetrationLength = 0.0 - }; - } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs =================================================================== diff -u -r63f6b06168b756e6bd94c7b764c2c6e426a5badb -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs (.../MacroStabilityInwardsCalculatorFactoryTest.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs (.../MacroStabilityInwardsCalculatorFactoryTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -109,8 +109,7 @@ { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), }), new TestMacroStabilityInwardsKernelFactory()); @@ -130,8 +129,7 @@ { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), }), new TestMacroStabilityInwardsKernelFactory()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs =================================================================== diff -u -rc6c1bd3e608d35c5fb707033534b5aff950ff55d -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision c6c1bd3e608d35c5fb707033534b5aff950ff55d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -59,8 +59,7 @@ var plLineCreationMethod = random.NextEnumValue(); var landwardDirection = random.NextEnumValue(); double waterLevelRiverAverage = random.Next(); - double waterLevelPolderExtreme = random.Next(); - double waterLevelPolderDaily = random.Next(); + double waterLevelPolder = random.Next(); double minimumLevelPhreaticLineAtDikeTopRiver = random.Next(); double minimumLevelPhreaticLineAtDikeTopPolder = random.Next(); double leakageLengthOutwardsPhreaticLine3 = random.Next(); @@ -84,11 +83,9 @@ SurfaceLine = surfaceLine, SoilProfile = soilProfile, DrainageConstruction = drainageConstruction, - PhreaticLineOffsetsExtreme = phreaticLineOffsets, - PhreaticLineOffsetsDaily = phreaticLineOffsets, + PhreaticLineOffsets = phreaticLineOffsets, WaterLevelRiverAverage = waterLevelRiverAverage, - WaterLevelPolderExtreme = waterLevelPolderExtreme, - WaterLevelPolderDaily = waterLevelPolderDaily, + WaterLevelPolder = waterLevelPolder, MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver, MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder, LeakageLengthOutwardsPhreaticLine3 = leakageLengthOutwardsPhreaticLine3, @@ -110,12 +107,10 @@ Assert.AreEqual(landwardDirection, input.LandwardDirection); Assert.AreSame(soilProfile, input.SoilProfile); Assert.AreSame(drainageConstruction, input.DrainageConstruction); - Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsetsDaily); - Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsetsExtreme); + Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsets); Assert.AreEqual(waterLevelRiverAverage, input.WaterLevelRiverAverage); - Assert.AreEqual(waterLevelPolderExtreme, input.WaterLevelPolderExtreme); - Assert.AreEqual(waterLevelPolderDaily, input.WaterLevelPolderDaily); + Assert.AreEqual(waterLevelPolder, input.WaterLevelPolder); Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, input.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, input.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.AreEqual(leakageLengthOutwardsPhreaticLine3, input.LeakageLengthOutwardsPhreaticLine3); @@ -146,15 +141,13 @@ SurfaceLine = surfaceLine, SoilProfile = soilProfile, DrainageConstruction = drainageConstruction, - PhreaticLineOffsetsExtreme = phreaticLineOffsets, - PhreaticLineOffsetsDaily = phreaticLineOffsets + PhreaticLineOffsets = phreaticLineOffsets }); // Assert Assert.IsNaN(input.AssessmentLevel); Assert.IsNaN(input.WaterLevelRiverAverage); - Assert.IsNaN(input.WaterLevelPolderExtreme); - Assert.IsNaN(input.WaterLevelPolderDaily); + Assert.IsNaN(input.WaterLevelPolder); Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.IsNaN(input.LeakageLengthOutwardsPhreaticLine3); @@ -180,8 +173,7 @@ new WaternetCalculatorInput.ConstructionProperties { SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction() }); @@ -197,8 +189,7 @@ new WaternetCalculatorInput.ConstructionProperties { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction() }); @@ -215,16 +206,15 @@ { SoilProfile = new TestSoilProfile(), SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets() + PhreaticLineOffsets = new PhreaticLineOffsets(), }); // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "DrainageConstruction must be set."); } [Test] - public void Constructor_PhreaticLineOffsetsExtremeNull_ThrowsArgumentException() + public void Constructor_PhreaticLineOffsetsNull_ThrowsArgumentException() { // Call TestDelegate test = () => new WaternetCalculatorInput( @@ -233,28 +223,10 @@ SoilProfile = new TestSoilProfile(), SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets() }); // Assert - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "PhreaticLineOffsetsExtreme must be set."); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "PhreaticLineOffsets must be set."); } - - [Test] - public void Constructor_PhreaticLineOffsetsDailyNull_ThrowsArgumentException() - { - // Call - TestDelegate test = () => new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - SoilProfile = new TestSoilProfile(), - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets() - }); - - // Assert - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "PhreaticLineOffsetsDaily must be set."); - } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs =================================================================== diff -u -r0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs (.../WaternetDailyCalculatorTest.cs) (revision 0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs (.../WaternetDailyCalculatorTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -84,7 +84,7 @@ KernelInputAssert.AssertSoilModels(SoilModelCreator.Create(soils), waternetKernel.SoilModel); KernelInputAssert.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile, layersWithSoils), waternetKernel.SoilProfile); - KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.CreateDaily(input), waternetKernel.Location); + KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.Create(input), waternetKernel.Location); KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection), waternetKernel.SurfaceLine); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs =================================================================== diff -u -r0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs (.../WaternetExtremeCalculatorTest.cs) (revision 0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs (.../WaternetExtremeCalculatorTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -84,7 +84,7 @@ KernelInputAssert.AssertSoilModels(SoilModelCreator.Create(soils), waternetKernel.SoilModel); KernelInputAssert.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile, layersWithSoils), waternetKernel.SoilProfile); - KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.CreateExtreme(input), waternetKernel.Location); + KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.Create(input), waternetKernel.Location); KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection), waternetKernel.SurfaceLine); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs =================================================================== diff -u -r9f35261205f8f664dc06e652f6d264ad9fee7bd9 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs (.../WaternetStabilityLocationCreatorTest.cs) (revision 9f35261205f8f664dc06e652f6d264ad9fee7bd9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetStabilityLocationCreatorTest.cs (.../WaternetStabilityLocationCreatorTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -41,33 +41,32 @@ public class WaternetStabilityLocationCreatorTest { [Test] - public void CreateExtreme_InputNull_ThrowsArgumentNullException() + public void Create_InputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => WaternetStabilityLocationCreator.CreateExtreme(null); + TestDelegate call = () => WaternetStabilityLocationCreator.Create(null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("input", exception.ParamName); } [Test] - public void CreateExtreme_InvalidDikeSoilScenario_ThrowInvalidEnumArgumentException() + public void Create_InvalidDikeSoilScenario_ThrowInvalidEnumArgumentException() { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), DikeSoilScenario = (MacroStabilityInwardsDikeSoilScenario) 99 }); // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateExtreme(input); + TestDelegate test = () => WaternetStabilityLocationCreator.Create(input); // Assert string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{typeof(MacroStabilityInwardsDikeSoilScenario).Name}'."; @@ -79,45 +78,43 @@ [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void CreateExtreme_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, + public void Create_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, DikeSoilScenario expectedDikeSoilScenario) { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), DikeSoilScenario = macroStabilityInwardsDikeSoilScenario }); // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateExtreme(input); + StabilityLocation location = WaternetStabilityLocationCreator.Create(input); // Assert Assert.AreEqual(expectedDikeSoilScenario, location.DikeSoilScenario); } [Test] - public void CreateExtreme_InvalidWaternetCreationMode_ThrowInvalidEnumArgumentException() + public void Create_InvalidWaternetCreationMode_ThrowInvalidEnumArgumentException() { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), WaternetCreationMode = (WaternetCreationMode) 99 }); // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateExtreme(input); + TestDelegate test = () => WaternetStabilityLocationCreator.Create(input); // Assert string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{typeof(WaternetCreationMode).Name}'."; @@ -127,45 +124,43 @@ [Test] [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)] [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)] - public void CreateExtreme_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode, + public void Create_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode, WtiStabilityWaternetCreationMethod expectedWaternetCreationMode) { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), WaternetCreationMode = waternetCreationMode }); // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateExtreme(input); + StabilityLocation location = WaternetStabilityLocationCreator.Create(input); // Assert Assert.AreEqual(expectedWaternetCreationMode, location.WaternetCreationMode); } [Test] - public void CreateExtreme_InvalidPlLineCreationMethod_ThrowInvalidEnumArgumentException() + public void Create_InvalidPlLineCreationMethod_ThrowInvalidEnumArgumentException() { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), PlLineCreationMethod = (PlLineCreationMethod) 99 }); // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateExtreme(input); + TestDelegate test = () => WaternetStabilityLocationCreator.Create(input); // Assert string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{typeof(PlLineCreationMethod).Name}'."; @@ -180,31 +175,30 @@ [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)] [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)] [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)] - public void CreateExtreme_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod, + public void Create_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod, WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod) { // Setup var input = new WaternetCalculatorInput( new WaternetCalculatorInput.ConstructionProperties { DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), PlLineCreationMethod = plLineCreationMethod }); // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateExtreme(input); + StabilityLocation location = WaternetStabilityLocationCreator.Create(input); // Assert Assert.AreEqual(expectedPlLineCreationMethod, location.PlLineCreationMethod); } [Test] [Combinatorial] - public void CreateExtreme_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent, + public void Create_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent, [Values(true, false)] bool useDefaultOffsets) { // Setup @@ -239,10 +233,9 @@ DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, AssessmentLevel = assessmentLevel, WaterLevelRiverAverage = waterLevelRiverAverage, - WaterLevelPolderExtreme = waterLevelPolderExtreme, + WaterLevelPolder = waterLevelPolderExtreme, DrainageConstruction = drainageConstruction, - PhreaticLineOffsetsExtreme = phreaticLineOffsets, - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = phreaticLineOffsets, MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver, MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder, AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift, @@ -256,7 +249,7 @@ }); // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateExtreme(input); + StabilityLocation location = WaternetStabilityLocationCreator.Create(input); // Assert Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario); @@ -289,254 +282,6 @@ AssertIrrelevantValues(location); } - [Test] - public void CreateDaily_InputNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => WaternetStabilityLocationCreator.CreateDaily(null); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("input", exception.ParamName); - } - - [Test] - public void CreateDaily_InvalidDikeSoilScenario_ThrowInvalidEnumArgumentException() - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - DrainageConstruction = new DrainageConstruction(), - DikeSoilScenario = (MacroStabilityInwardsDikeSoilScenario) 99 - }); - - // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - string message = $"The value of argument 'dikeSoilScenario' ({99}) is invalid for Enum type '{typeof(MacroStabilityInwardsDikeSoilScenario).Name}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); - } - - [Test] - [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay)] - [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] - [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] - [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void CreateDaily_ValidDikeSoilScenario_ReturnStabilityLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, - DikeSoilScenario expectedDikeSoilScenario) - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - DikeSoilScenario = macroStabilityInwardsDikeSoilScenario - }); - - // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - Assert.AreEqual(expectedDikeSoilScenario, location.DikeSoilScenario); - } - - [Test] - public void CreateDaily_InvalidWaternetCreationMode_ThrowInvalidEnumArgumentException() - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - DrainageConstruction = new DrainageConstruction(), - WaternetCreationMode = (WaternetCreationMode) 99 - }); - - // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - string message = $"The value of argument 'waternetCreationMode' ({99}) is invalid for Enum type '{typeof(WaternetCreationMode).Name}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); - } - - [Test] - [TestCase(WaternetCreationMode.CreateWaternet, WtiStabilityWaternetCreationMethod.CreateWaternet)] - [TestCase(WaternetCreationMode.FillInWaternetValues, WtiStabilityWaternetCreationMethod.FillInWaternetValues)] - public void CreateDaily_ValidWaternetCreationMode_ReturnStabilityLocationWithWaternetCreationMode(WaternetCreationMode waternetCreationMode, - WtiStabilityWaternetCreationMethod expectedWaternetCreationMode) - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - WaternetCreationMode = waternetCreationMode - }); - - // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - Assert.AreEqual(expectedWaternetCreationMode, location.WaternetCreationMode); - } - - [Test] - public void CreateDaily_InvalidPlLineCreationMethod_ThrowInvalidEnumArgumentException() - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - DrainageConstruction = new DrainageConstruction(), - PlLineCreationMethod = (PlLineCreationMethod) 99 - }); - - // Call - TestDelegate test = () => WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - string message = $"The value of argument 'plLineCreationMethod' ({99}) is invalid for Enum type '{typeof(PlLineCreationMethod).Name}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); - } - - [Test] - [TestCase(PlLineCreationMethod.ExpertKnowledgeRrd, WtiStabilityPlLineCreationMethod.ExpertKnowledgeRrd)] - [TestCase(PlLineCreationMethod.ExpertKnowledgeLinearInDike, WtiStabilityPlLineCreationMethod.ExpertKnowledgeLinearInDike)] - [TestCase(PlLineCreationMethod.RingtoetsWti2017, WtiStabilityPlLineCreationMethod.RingtoetsWti2017)] - [TestCase(PlLineCreationMethod.DupuitStatic, WtiStabilityPlLineCreationMethod.DupuitStatic)] - [TestCase(PlLineCreationMethod.DupuitDynamic, WtiStabilityPlLineCreationMethod.DupuitDynamic)] - [TestCase(PlLineCreationMethod.Sensors, WtiStabilityPlLineCreationMethod.Sensors)] - [TestCase(PlLineCreationMethod.None, WtiStabilityPlLineCreationMethod.None)] - public void CreateDaily_ValidPlLineCreationMethod_ReturnStabilityLocationWithWaternetCreationMode(PlLineCreationMethod plLineCreationMethod, - WtiStabilityPlLineCreationMethod expectedPlLineCreationMethod) - { - // Setup - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - PlLineCreationMethod = plLineCreationMethod - }); - - // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - Assert.AreEqual(expectedPlLineCreationMethod, location.PlLineCreationMethod); - } - - [Test] - [Combinatorial] - public void CreateDaily_WithInput_ReturnStabilityLocation([Values(true, false)] bool drainageConstructionPresent, - [Values(true, false)] bool useDefaultOffsets) - { - // Setup - var random = new Random(21); - double assessmentLevel = random.Next(); - double waterLevelRiverAverage = random.Next(); - double waterLevelPolderDaily = random.Next(); - double minimumLevelPhreaticLineAtDikeTopRiver = random.Next(); - double minimumLevelPhreaticLineAtDikeTopPolder = random.Next(); - bool adjustPhreaticLine3And4ForUplift = random.NextBoolean(); - double leakageLengthOutwardsPhreaticLine3 = random.Next(); - double leakageLengthInwardsPhreaticLine3 = random.Next(); - double leakageLengthOutwardsPhreaticLine4 = random.Next(); - double leakageLengthInwardsPhreaticLine4 = random.Next(); - double piezometricHeadPhreaticLine2Outwards = random.Next(); - double piezometricHeadPhreaticLine2Inwards = random.Next(); - - DrainageConstruction drainageConstruction = drainageConstructionPresent - ? new DrainageConstruction(random.Next(), random.Next()) - : new DrainageConstruction(); - PhreaticLineOffsets phreaticLineOffsets = useDefaultOffsets - ? new PhreaticLineOffsets() - : new PhreaticLineOffsets(random.Next(), random.Next(), - random.Next(), random.Next()); - - var input = new WaternetCalculatorInput( - new WaternetCalculatorInput.ConstructionProperties - { - SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), - SoilProfile = new TestSoilProfile(), - DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, - AssessmentLevel = assessmentLevel, - WaterLevelRiverAverage = waterLevelRiverAverage, - WaterLevelPolderDaily = waterLevelPolderDaily, - DrainageConstruction = drainageConstruction, - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = phreaticLineOffsets, - MinimumLevelPhreaticLineAtDikeTopRiver = minimumLevelPhreaticLineAtDikeTopRiver, - MinimumLevelPhreaticLineAtDikeTopPolder = minimumLevelPhreaticLineAtDikeTopPolder, - AdjustPhreaticLine3And4ForUplift = adjustPhreaticLine3And4ForUplift, - LeakageLengthOutwardsPhreaticLine3 = leakageLengthOutwardsPhreaticLine3, - LeakageLengthInwardsPhreaticLine3 = leakageLengthInwardsPhreaticLine3, - LeakageLengthOutwardsPhreaticLine4 = leakageLengthOutwardsPhreaticLine4, - LeakageLengthInwardsPhreaticLine4 = leakageLengthInwardsPhreaticLine4, - PiezometricHeadPhreaticLine2Outwards = piezometricHeadPhreaticLine2Outwards, - PiezometricHeadPhreaticLine2Inwards = piezometricHeadPhreaticLine2Inwards, - PenetrationLength = random.Next() - }); - - // Call - StabilityLocation location = WaternetStabilityLocationCreator.CreateDaily(input); - - // Assert - Assert.AreEqual(DikeSoilScenario.SandDikeOnClay, location.DikeSoilScenario); - Assert.AreEqual(WtiStabilityWaternetCreationMethod.CreateWaternet, location.WaternetCreationMode); - Assert.AreEqual(WtiStabilityPlLineCreationMethod.RingtoetsWti2017, location.PlLineCreationMethod); - Assert.AreEqual(waterLevelRiverAverage, location.WaterLevelRiver); - Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine3); - Assert.AreEqual(waterLevelRiverAverage, location.HeadInPlLine4); - Assert.AreEqual(waterLevelRiverAverage, location.WaterLevelRiverAverage); - Assert.AreEqual(waterLevelPolderDaily, location.WaterLevelPolder); - Assert.AreEqual(drainageConstruction.IsPresent, location.DrainageConstructionPresent); - Assert.AreEqual(drainageConstruction.XCoordinate, location.XCoordMiddleDrainageConstruction); - Assert.AreEqual(drainageConstruction.ZCoordinate, location.ZCoordMiddleDrainageConstruction); - Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopRiver, location.MinimumLevelPhreaticLineAtDikeTopRiver); - Assert.AreEqual(minimumLevelPhreaticLineAtDikeTopPolder, location.MinimumLevelPhreaticLineAtDikeTopPolder); - Assert.AreEqual(phreaticLineOffsets.UseDefaults, location.UseDefaultOffsets); - Assert.AreEqual(phreaticLineOffsets.BelowDikeTopAtRiver, location.PlLineOffsetBelowPointBRingtoetsWti2017); - Assert.AreEqual(phreaticLineOffsets.BelowDikeTopAtPolder, location.PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(phreaticLineOffsets.BelowShoulderBaseInside, location.PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(phreaticLineOffsets.BelowDikeToeAtPolder, location.PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(adjustPhreaticLine3And4ForUplift, location.AdjustPl3And4ForUplift); - Assert.AreEqual(leakageLengthOutwardsPhreaticLine3, location.LeakageLengthOutwardsPl3); - Assert.AreEqual(leakageLengthInwardsPhreaticLine3, location.LeakageLengthInwardsPl3); - Assert.AreEqual(leakageLengthOutwardsPhreaticLine4, location.LeakageLengthOutwardsPl4); - Assert.AreEqual(leakageLengthInwardsPhreaticLine4, location.LeakageLengthInwardsPl4); - Assert.AreEqual(piezometricHeadPhreaticLine2Outwards, location.HeadInPlLine2Outwards); - Assert.AreEqual(piezometricHeadPhreaticLine2Inwards, location.HeadInPlLine2Inwards); - Assert.AreEqual(0.0, location.PenetrationLength); - - AssertIrrelevantValues(location); - } - private static void AssertIrrelevantValues(StabilityLocation location) { Assert.IsNaN(location.WaterLevelRiverLow); // Only for macro stability outwards Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs =================================================================== diff -u -r63f6b06168b756e6bd94c7b764c2c6e426a5badb -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -81,8 +81,7 @@ { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), }); @@ -103,8 +102,7 @@ { SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), DrainageConstruction = new DrainageConstruction(), }); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs =================================================================== diff -u -r0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -40,12 +40,10 @@ // Assert Assert.IsNotNull(input.DrainageConstruction); - Assert.IsNotNull(input.PhreaticLineOffsetsExtreme); - Assert.IsNotNull(input.PhreaticLineOffsetsDaily); + Assert.IsNotNull(input.PhreaticLineOffsets); Assert.IsFalse(double.IsNaN(input.AssessmentLevel)); Assert.IsFalse(double.IsNaN(input.WaterLevelRiverAverage)); - Assert.IsFalse(double.IsNaN(input.WaterLevelPolderExtreme)); - Assert.IsFalse(double.IsNaN(input.WaterLevelPolderDaily)); + Assert.IsFalse(double.IsNaN(input.WaterLevelPolder)); Assert.IsFalse(double.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopRiver)); Assert.IsFalse(double.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopPolder)); Assert.IsFalse(double.IsNaN(input.LeakageLengthOutwardsPhreaticLine3)); @@ -70,12 +68,10 @@ // Assert Assert.IsNotNull(input.DrainageConstruction); - Assert.IsNotNull(input.PhreaticLineOffsetsExtreme); - Assert.IsNotNull(input.PhreaticLineOffsetsDaily); + Assert.IsNotNull(input.PhreaticLineOffsets); Assert.IsNaN(input.AssessmentLevel); Assert.IsNaN(input.WaterLevelRiverAverage); - Assert.IsNaN(input.WaterLevelPolderExtreme); - Assert.IsNaN(input.WaterLevelPolderDaily); + Assert.IsNaN(input.WaterLevelPolder); Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopRiver); Assert.IsNaN(input.MinimumLevelPhreaticLineAtDikeTopPolder); Assert.IsNaN(input.LeakageLengthOutwardsPhreaticLine3); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Input/WaternetCalculatorInputTestFactory.cs =================================================================== diff -u -r0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2 -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Input/WaternetCalculatorInputTestFactory.cs (.../WaternetCalculatorInputTestFactory.cs) (revision 0c1db0b8d8ed69192d22aa164be95f2c6c21aaf2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Input/WaternetCalculatorInputTestFactory.cs (.../WaternetCalculatorInputTestFactory.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) @@ -46,11 +46,9 @@ SurfaceLine = surfaceLine, SoilProfile = CreateValidSoilProfile(surfaceLine), DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets(), + PhreaticLineOffsets = new PhreaticLineOffsets(), WaterLevelRiverAverage = random.Next(), - WaterLevelPolderExtreme = random.Next(), - WaterLevelPolderDaily = random.Next(), + WaterLevelPolder = random.Next(), MinimumLevelPhreaticLineAtDikeTopRiver = random.Next(), MinimumLevelPhreaticLineAtDikeTopPolder = random.Next(), LeakageLengthOutwardsPhreaticLine3 = random.Next(), @@ -73,8 +71,7 @@ SurfaceLine = surfaceLine, SoilProfile = CreateValidSoilProfile(surfaceLine), DrainageConstruction = new DrainageConstruction(), - PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(), - PhreaticLineOffsetsDaily = new PhreaticLineOffsets() + PhreaticLineOffsets = new PhreaticLineOffsets() }); }