Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e -r52d85f2cd90bbcdc99dda93f70daf1edae435516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 52d85f2cd90bbcdc99dda93f70daf1edae435516) @@ -201,6 +201,9 @@ Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder); Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside); Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder); + + Assert.IsNaN(input.ZoneBoundaryLeft); + Assert.IsNaN(input.ZoneBoundaryRight); } [Test] @@ -260,6 +263,9 @@ Assert.AreEqual(double.NegativeInfinity, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder); Assert.AreEqual(double.PositiveInfinity, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside); Assert.AreEqual(double.PositiveInfinity, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder); + + Assert.AreEqual(double.NegativeInfinity, input.ZoneBoundaryLeft); + Assert.AreEqual(double.PositiveInfinity, input.ZoneBoundaryRight); } private static void AssertCalculation(MacroStabilityInwardsCalculationScenario calculation, @@ -356,6 +362,11 @@ Assert.AreEqual(15.22, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); Assert.AreEqual(15.23, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); Assert.AreEqual(15.24, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); + + Assert.IsTrue(input.CreateZones); + Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, input.ZoningBoundariesDeterminationType); + Assert.AreEqual(0.0, input.ZoneBoundaryLeft, input.ZoneBoundaryLeft.GetAccuracy()); + Assert.AreEqual(100.0, input.ZoneBoundaryRight, input.ZoneBoundaryRight.GetAccuracy()); } private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs =================================================================== diff -u -r7b8a021f38d77546b7c3318f5f0dedda63168f91 -r52d85f2cd90bbcdc99dda93f70daf1edae435516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs (.../MacroStabilityInwardsCloneAssert.cs) (revision 7b8a021f38d77546b7c3318f5f0dedda63168f91) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCloneAssert.cs (.../MacroStabilityInwardsCloneAssert.cs) (revision 52d85f2cd90bbcdc99dda93f70daf1edae435516) @@ -126,6 +126,9 @@ CoreCloneAssert.AreObjectClones(original.RightGrid, clone.RightGrid, AreClones); Assert.AreEqual(original.CreateZones, clone.CreateZones); + Assert.AreEqual(original.ZoningBoundariesDeterminationType, clone.ZoningBoundariesDeterminationType); + Assert.AreEqual(original.ZoneBoundaryLeft, clone.ZoneBoundaryLeft); + Assert.AreEqual(original.ZoneBoundaryRight, clone.ZoneBoundaryRight); } /// Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e -r52d85f2cd90bbcdc99dda93f70daf1edae435516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 52d85f2cd90bbcdc99dda93f70daf1edae435516) @@ -189,7 +189,11 @@ MaximumSliceWidth = (RoundedDouble) 0.6, TangentLineZTop = (RoundedDouble) 10, TangentLineZBottom = (RoundedDouble) 1, - TangentLineNumber = 5 + TangentLineNumber = 5, + CreateZones = true, + ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, + ZoneBoundaryLeft = (RoundedDouble) 0, + ZoneBoundaryRight = (RoundedDouble) 100 } }; @@ -254,6 +258,9 @@ inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside = RoundedDouble.NaN; inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder = RoundedDouble.NaN; + input.ZoneBoundaryLeft = RoundedDouble.NaN; + input.ZoneBoundaryRight = RoundedDouble.NaN; + return calculation; } @@ -323,6 +330,9 @@ inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) double.PositiveInfinity; inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) double.PositiveInfinity; + input.ZoneBoundaryLeft = (RoundedDouble) double.NegativeInfinity; + input.ZoneBoundaryRight = (RoundedDouble) double.PositiveInfinity; + return calculation; } @@ -586,6 +596,9 @@ input.RightGrid.NumberOfVerticalPoints = random.Next(1, 100); input.CreateZones = random.NextBoolean(); + input.ZoningBoundariesDeterminationType = random.NextEnumValue(); + input.ZoneBoundaryLeft = random.NextRoundedDouble(); + input.ZoneBoundaryRight = random.NextRoundedDouble(); } } } \ No newline at end of file