Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlane.cs =================================================================== diff -u -r2a3bbcc3e2174b2c9b8ceb6123cef7d3d1bf69fe -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlane.cs (.../UpliftVanSlipPlane.cs) (revision 2a3bbcc3e2174b2c9b8ceb6123cef7d3d1bf69fe) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlane.cs (.../UpliftVanSlipPlane.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -39,11 +39,10 @@ /// is set to true; /// is set to ; /// is set to ; - /// is set to 0; - /// is set to . + /// is set to 0. /// /// - public UpliftVanSlipPlane() : this(double.NaN, double.NaN, 0, double.NaN) + public UpliftVanSlipPlane() : this(double.NaN, double.NaN, 0) { GridAutomaticDetermined = true; TangentLinesAutomaticAtBoundaries = true; @@ -60,12 +59,11 @@ /// is set to true; /// is set to ; /// is set to ; - /// is set to 0; - /// is set to . + /// is set to 0. /// /// public UpliftVanSlipPlane(UpliftVanGrid leftGrid, UpliftVanGrid rightGrid) - : this(double.NaN, double.NaN, 0, double.NaN) + : this(double.NaN, double.NaN, 0) { SetGrids(leftGrid, rightGrid); TangentLinesAutomaticAtBoundaries = true; @@ -83,18 +81,17 @@ /// /// public UpliftVanSlipPlane(UpliftVanGrid leftGrid, UpliftVanGrid rightGrid, double tangentZTop, - double tangentZBottom, int tangentLineNumber, double maxSpacingBetweenBoundaries) - : this(tangentZTop, tangentZBottom, tangentLineNumber, maxSpacingBetweenBoundaries) + double tangentZBottom, int tangentLineNumber) + : this(tangentZTop, tangentZBottom, tangentLineNumber) { SetGrids(leftGrid, rightGrid); } - private UpliftVanSlipPlane(double tangentZTop, double tangentZBottom, int tangentLineNumber, double maxSpacingBetweenBoundaries) + private UpliftVanSlipPlane(double tangentZTop, double tangentZBottom, int tangentLineNumber) { TangentZTop = tangentZTop; TangentZBottom = tangentZBottom; TangentLineNumber = tangentLineNumber; - MaxSpacingBetweenBoundaries = maxSpacingBetweenBoundaries; } /// @@ -134,11 +131,6 @@ /// public int TangentLineNumber { get; } - /// - /// Gets the max spacing between boundaries. - /// - public double MaxSpacingBetweenBoundaries { get; } - private void SetGrids(UpliftVanGrid leftGrid, UpliftVanGrid rightGrid) { if (leftGrid == null) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs =================================================================== diff -u -r55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs (.../SlipPlaneUpliftVanCreator.cs) (revision 55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs (.../SlipPlaneUpliftVanCreator.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -71,8 +71,7 @@ AutomaticAtBoundaries = slipPlane.TangentLinesAutomaticAtBoundaries, TangentLineZTop = slipPlane.TangentZTop, TangentLineZBottom = slipPlane.TangentZBottom, - TangentLineNumber = slipPlane.TangentLineNumber, - MaxSpacingBetweenBoundaries = slipPlane.MaxSpacingBetweenBoundaries + TangentLineNumber = slipPlane.TangentLineNumber }; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs =================================================================== diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs (.../UpliftVanSlipPlaneConverter.cs) (revision 59adecfc7f82ab8277440ecae147453f5cbddbbf) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs (.../UpliftVanSlipPlaneConverter.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -56,7 +56,7 @@ UpliftVanGrid rightGrid = ConvertGrid(input.RightGrid); return input.TangentLineDeterminationType == MacroStabilityInwardsTangentLineDeterminationType.Specified - ? new UpliftVanSlipPlane(leftGrid, rightGrid, input.TangentLineZTop, input.TangentLineZBottom, 1, 10) + ? new UpliftVanSlipPlane(leftGrid, rightGrid, input.TangentLineZTop, input.TangentLineZBottom, 1) : new UpliftVanSlipPlane(leftGrid, rightGrid); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneTest.cs =================================================================== diff -u -r2a3bbcc3e2174b2c9b8ceb6123cef7d3d1bf69fe -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneTest.cs (.../UpliftVanSlipPlaneTest.cs) (revision 2a3bbcc3e2174b2c9b8ceb6123cef7d3d1bf69fe) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneTest.cs (.../UpliftVanSlipPlaneTest.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -44,7 +44,6 @@ Assert.IsNaN(slipPlane.TangentZTop); Assert.IsNaN(slipPlane.TangentZBottom); Assert.AreEqual(0, slipPlane.TangentLineNumber); - Assert.IsNaN(slipPlane.MaxSpacingBetweenBoundaries); } [Test] @@ -93,7 +92,6 @@ Assert.IsNaN(slipPlane.TangentZTop); Assert.IsNaN(slipPlane.TangentZBottom); Assert.AreEqual(0, slipPlane.TangentLineNumber); - Assert.IsNaN(slipPlane.MaxSpacingBetweenBoundaries); } [Test] @@ -103,7 +101,7 @@ UpliftVanGrid grid = UpliftVanGridTestFactory.Create(); // Call - TestDelegate test = () => new UpliftVanSlipPlane(null, grid, 0, 0, 0, 0); + TestDelegate test = () => new UpliftVanSlipPlane(null, grid, 0, 0, 0); // Assert var exception = Assert.Throws(test); @@ -117,7 +115,7 @@ UpliftVanGrid grid = UpliftVanGridTestFactory.Create(); // Call - TestDelegate test = () => new UpliftVanSlipPlane(grid, null, 0, 0, 0, 0); + TestDelegate test = () => new UpliftVanSlipPlane(grid, null, 0, 0, 0); // Assert var exception = Assert.Throws(test); @@ -132,13 +130,12 @@ double tangentZTop = random.NextDouble(); double tangentZBottom = random.NextDouble(); int tangentLineNumber = random.Next(); - double maxSpacingBetweenBoundaries = random.NextDouble(); UpliftVanGrid leftGrid = UpliftVanGridTestFactory.Create(); UpliftVanGrid rightGrid = UpliftVanGridTestFactory.Create(); // Call - var slipPlane = new UpliftVanSlipPlane(leftGrid, rightGrid, tangentZTop, tangentZBottom, tangentLineNumber, maxSpacingBetweenBoundaries); + var slipPlane = new UpliftVanSlipPlane(leftGrid, rightGrid, tangentZTop, tangentZBottom, tangentLineNumber); // Assert Assert.IsFalse(slipPlane.GridAutomaticDetermined); @@ -148,7 +145,6 @@ Assert.AreEqual(tangentZTop, slipPlane.TangentZTop); Assert.AreEqual(tangentZBottom, slipPlane.TangentZBottom); Assert.AreEqual(tangentLineNumber, slipPlane.TangentLineNumber); - Assert.AreEqual(maxSpacingBetweenBoundaries, slipPlane.MaxSpacingBetweenBoundaries); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs =================================================================== diff -u -r55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs (.../SlipPlaneUpliftVanCreatorTest.cs) (revision 55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs (.../SlipPlaneUpliftVanCreatorTest.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -63,11 +63,10 @@ double tangentLineZTop = random.NextDouble(); double tangentLineZBottom = random.NextDouble(); int tangentLineNumber = random.Next(); - double maxSpacingBetweenBoundaries = random.NextDouble(); var leftGrid = new UpliftVanGrid(leftGridXLeft, leftGridXRight, leftGridZTop, leftGridZBottom, leftGridXNumber, leftGridZNumber); var rightGrid = new UpliftVanGrid(rightGridXLeft, rightGridXRight, rightGridZTop, rightGridZBottom, rightGridXNumber, rightGridZNumber); - var slipPlane = new UpliftVanSlipPlane(leftGrid, rightGrid, tangentLineZTop, tangentLineZBottom, tangentLineNumber, maxSpacingBetweenBoundaries); + var slipPlane = new UpliftVanSlipPlane(leftGrid, rightGrid, tangentLineZTop, tangentLineZBottom, tangentLineNumber); // Call SlipPlaneUpliftVan slipPlaneUpliftVan = SlipPlaneUpliftVanCreator.Create(slipPlane); @@ -92,8 +91,8 @@ Assert.AreEqual(tangentLineZTop, slipPlaneUpliftVan.SlipPlaneTangentLine.TangentLineZTop); Assert.AreEqual(tangentLineZBottom, slipPlaneUpliftVan.SlipPlaneTangentLine.TangentLineZBottom); Assert.AreEqual(tangentLineNumber, slipPlaneUpliftVan.SlipPlaneTangentLine.TangentLineNumber); - Assert.AreEqual(maxSpacingBetweenBoundaries, slipPlaneUpliftVan.SlipPlaneTangentLine.MaxSpacingBetweenBoundaries); Assert.AreSame(slipPlaneUpliftVan, slipPlaneUpliftVan.SlipCircleTangentLine.TangentLinesBoundaries); // Automatically synced + Assert.AreEqual(10, slipPlaneUpliftVan.SlipPlaneTangentLine.MaxSpacingBetweenBoundaries); // Only used in case of auto grid determination combined with specified tangent lines (unsupported by calculator) } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs =================================================================== diff -u -r55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs (.../UpliftVanSlipPlaneConverterTest.cs) (revision 55f1926dba5945d7b2ef8adabb2ba3c8ad6c21ce) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs (.../UpliftVanSlipPlaneConverterTest.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -71,7 +71,6 @@ Assert.IsNaN(slipPlane.TangentZTop); Assert.IsNaN(slipPlane.TangentZBottom); Assert.AreEqual(0, slipPlane.TangentLineNumber); - Assert.IsNaN(slipPlane.MaxSpacingBetweenBoundaries); } [Test] @@ -116,7 +115,6 @@ Assert.IsNaN(slipPlane.TangentZTop); Assert.IsNaN(slipPlane.TangentZBottom); Assert.AreEqual(0, slipPlane.TangentLineNumber); - Assert.IsNaN(slipPlane.MaxSpacingBetweenBoundaries); } [Test] @@ -161,7 +159,6 @@ Assert.AreEqual(input.TangentLineZTop, slipPlane.TangentZTop); Assert.AreEqual(input.TangentLineZBottom, slipPlane.TangentZBottom); Assert.AreEqual(1, slipPlane.TangentLineNumber); - Assert.AreEqual(10, slipPlane.MaxSpacingBetweenBoundaries); } private static void AssertGrid(MacroStabilityInwardsGrid expectedGrid, UpliftVanGrid actualGrid) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe -r566943640717a91ff377a58a341bbbe1bcd2e516 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 566943640717a91ff377a58a341bbbe1bcd2e516) @@ -657,7 +657,6 @@ Assert.AreEqual(originalInput.TangentLineZTop, actualInput.TangentZTop); Assert.AreEqual(originalInput.TangentLineZBottom, actualInput.TangentZBottom); Assert.AreEqual(1, actualInput.TangentLineNumber); - Assert.AreEqual(10, actualInput.MaxSpacingBetweenBoundaries); } private static void AssertOutput(UpliftVanCalculatorResult expectedOutput, MacroStabilityInwardsOutput actualOutput)