Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs
===================================================================
diff -u -r5acabb007f107c284b99ef7140fb127da93fb7f7 -r15be27c72577eaed0ee4b04c9c78ef14938cabe4
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs (.../MacroStabilityInputCreator.cs) (revision 5acabb007f107c284b99ef7140fb127da93fb7f7)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs (.../MacroStabilityInputCreator.cs) (revision 15be27c72577eaed0ee4b04c9c78ef14938cabe4)
@@ -288,7 +288,7 @@
return new PreConstructionStage
{
WaternetCreationMode = WaternetCreationMode.FillInWaternetValues,
- SurfaceLine = surfaceLine,
+ SurfaceLine = surfaceLine
};
}
}
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs
===================================================================
diff -u
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs (revision 0)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs (revision 15be27c72577eaed0ee4b04c9c78ef14938cabe4)
@@ -0,0 +1,423 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Deltares.MacroStability.CSharpWrapper;
+using Deltares.MacroStability.CSharpWrapper.Input;
+using Deltares.MacroStability.CSharpWrapper.Output;
+using NUnit.Framework;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Waternet.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.UpliftVan.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.Waternet.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input;
+using SoilProfile = Deltares.MacroStability.CSharpWrapper.Input.SoilProfile;
+using WaternetCreationMode = Deltares.MacroStability.CSharpWrapper.Input.WaternetCreationMode;
+
+namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
+{
+ [TestFixture]
+ public class MacroStabilityInputCreatorTest
+ {
+ #region CreateUpliftVan
+
+ [Test]
+ public void CreateUpliftVan_upliftVanInputNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ null, new List(), new Dictionary(),
+ new SurfaceLine(), new SoilProfile(), new Waternet(), new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("upliftVanInput", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_SoilsNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(),
+ null, new Dictionary(),
+ new SurfaceLine(), new SoilProfile(), new Waternet(), new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soils", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_LayerLookupNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(),
+ null, new SurfaceLine(), new SoilProfile(), new Waternet(), new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("layerLookup", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_SurfaceLineNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(),
+ new Dictionary(), null, new SoilProfile(),
+ new Waternet(), new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("surfaceLine", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_SoilProfileNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(),
+ new Dictionary(), new SurfaceLine(),
+ null, new Waternet(), new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soilProfile", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_DailyWaternetNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(),
+ new Dictionary(), new SurfaceLine(),
+ new SoilProfile(), null, new Waternet());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("dailyWaternet", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_ExtremeWaternetNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(),
+ new Dictionary(), new SurfaceLine(),
+ new SoilProfile(), new Waternet(), null);
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("extremeWaternet", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateUpliftVan_WithData_ReturnMacroStabilityInput()
+ {
+ // Setup
+ UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create();
+
+ LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(input.SoilProfile, out IDictionary layerLookup);
+ List soils = layersWithSoil.Select(lws => lws.Soil).ToList();
+
+ SurfaceLine surfaceLine = SurfaceLineCreator.Create(input.SurfaceLine);
+ SoilProfile soilProfile = SoilProfileCreator.Create(layersWithSoil);
+
+ var dailyWaternet = new Waternet();
+ var extremeWaternet = new Waternet();
+
+ // Call
+ MacroStabilityInput macroStabilityInput = MacroStabilityInputCreator.CreateUpliftVan(
+ input, soils, layerLookup, surfaceLine, soilProfile, dailyWaternet, extremeWaternet);
+
+ // Assert
+ StabilityInput stabilityModel = macroStabilityInput.StabilityModel;
+
+ Assert.AreEqual(Orientation.Inwards, stabilityModel.Orientation);
+ Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm);
+ Assert.AreEqual(StabilityModelOptionType.UpliftVan, stabilityModel.ModelOption);
+
+ CollectionAssert.AreEqual(soils, stabilityModel.Soils, new SoilComparer());
+ Assert.AreEqual(input.MoveGrid, stabilityModel.MoveGrid);
+ Assert.AreEqual(input.MaximumSliceWidth, stabilityModel.MaximumSliceWidth);
+
+ UpliftVanKernelInputAssert.AssertUpliftVanCalculationGrid(
+ UpliftVanCalculationGridCreator.Create(input.SlipPlane), stabilityModel.UpliftVanCalculationGrid);
+
+ UpliftVanKernelInputAssert.AssertSlipPlaneConstraints(
+ SlipPlaneConstraintsCreator.Create(input.SlipPlaneConstraints), stabilityModel.SlipPlaneConstraints);
+
+ AssertConstructionStages(input, stabilityModel, soilProfile, dailyWaternet, extremeWaternet, layerLookup);
+
+ SearchAreaConditions searchAreaConditions = macroStabilityInput.PreprocessingInput.SearchAreaConditions;
+ Assert.AreEqual(0.8, searchAreaConditions.MaxSpacingBetweenBoundaries);
+ Assert.IsTrue(searchAreaConditions.OnlyAbovePleistoceen);
+ Assert.AreEqual(input.SlipPlane.GridAutomaticDetermined, searchAreaConditions.AutoSearchArea);
+ Assert.AreEqual(input.SlipPlane.TangentLinesAutomaticAtBoundaries, searchAreaConditions.AutoTangentLines);
+ Assert.AreEqual(input.SlipPlane.TangentLineNumber, searchAreaConditions.TangentLineNumber);
+ Assert.AreEqual(input.SlipPlane.TangentZTop, searchAreaConditions.TangentLineZTop);
+ Assert.AreEqual(input.SlipPlane.TangentZBottom, searchAreaConditions.TangentLineZBottom);
+ Assert.AreEqual(input.SlipPlaneConstraints.AutomaticForbiddenZones, searchAreaConditions.AutomaticForbiddenZones);
+
+ Assert.AreEqual(2, macroStabilityInput.PreprocessingInput.PreConstructionStages.Count);
+
+ foreach (PreConstructionStage preConstructionStage in macroStabilityInput.PreprocessingInput.PreConstructionStages)
+ {
+ Assert.AreEqual(WaternetCreationMode.FillInWaternetValues, preConstructionStage.WaternetCreationMode);
+ Assert.AreSame(surfaceLine, preConstructionStage.SurfaceLine);
+ Assert.IsNull(preConstructionStage.WaternetCreatorInput); // Not needed as Waternet is already calculated
+ }
+ }
+
+ private static void AssertConstructionStages(
+ UpliftVanCalculatorInput input, StabilityInput stabilityModel, SoilProfile soilProfile,
+ Waternet dailyWaternet, Waternet extremeWaternet, IDictionary layerLookup)
+ {
+ Assert.AreEqual(2, stabilityModel.ConstructionStages.Count);
+
+ ConstructionStage dailyConstructionStage = stabilityModel.ConstructionStages.ElementAt(0);
+ Assert.AreSame(soilProfile, dailyConstructionStage.SoilProfile);
+ Assert.AreSame(dailyWaternet, dailyConstructionStage.Waternet);
+ CollectionAssert.AreEqual(FixedSoilStressCreator.Create(layerLookup),
+ dailyConstructionStage.FixedSoilStresses, new FixedSoilStressComparer());
+ CollectionAssert.AreEqual(PreconsolidationStressCreator.Create(input.SoilProfile.PreconsolidationStresses),
+ dailyConstructionStage.PreconsolidationStresses, new PreconsolidationStressComparer());
+ AssertMultiplicationFactors(dailyConstructionStage.MultiplicationFactorsCPhiForUplift.Single());
+
+ ConstructionStage extremeConstructionStage = stabilityModel.ConstructionStages.ElementAt(1);
+ Assert.AreSame(soilProfile, extremeConstructionStage.SoilProfile);
+ Assert.AreSame(extremeWaternet, extremeConstructionStage.Waternet);
+ CollectionAssert.IsEmpty(extremeConstructionStage.FixedSoilStresses);
+ CollectionAssert.IsEmpty(extremeConstructionStage.PreconsolidationStresses);
+ AssertMultiplicationFactors(extremeConstructionStage.MultiplicationFactorsCPhiForUplift.Single());
+ }
+
+ private static void AssertMultiplicationFactors(MultiplicationFactorsCPhiForUplift multiplicationFactors)
+ {
+ Assert.AreEqual(0.0, multiplicationFactors.MultiplicationFactor);
+ Assert.AreEqual(1.2, multiplicationFactors.UpliftFactor);
+ }
+
+ #endregion
+
+ #region CreateDailyWaternetForUpliftVan
+
+ [Test]
+ public void CreateDailyWaternetForUpliftVan_upliftVanInputNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan(
+ null, new List(), new SurfaceLine(), new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("upliftVanInput", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateDailyWaternetForUpliftVan_SoilsNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), null, new SurfaceLine(), new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soils", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateDailyWaternetForUpliftVan_SurfaceLineNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(), null, new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("surfaceLine", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateDailyWaternetForUpliftVan_SoilProfileNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(), new SurfaceLine(), null);
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soilProfile", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateDailyWaternetForUpliftVan_WithData_ReturnMacroStabilityInput()
+ {
+ // Setup
+ UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create();
+
+ LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(input.SoilProfile, out IDictionary _);
+ List soils = layersWithSoil.Select(lws => lws.Soil).ToList();
+
+ SurfaceLine surfaceLine = SurfaceLineCreator.Create(input.SurfaceLine);
+ SoilProfile soilProfile = SoilProfileCreator.Create(layersWithSoil);
+
+ // Call
+ MacroStabilityInput macroStabilityInput = MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan(
+ input, soils, surfaceLine, soilProfile);
+
+ // Assert
+ CollectionAssert.AreEqual(soils, macroStabilityInput.StabilityModel.Soils, new SoilComparer());
+ Assert.AreSame(soilProfile, macroStabilityInput.StabilityModel.ConstructionStages.Single().SoilProfile);
+
+ PreConstructionStage preConstructionStage = macroStabilityInput.PreprocessingInput.PreConstructionStages.Single();
+ Assert.AreSame(surfaceLine, preConstructionStage.SurfaceLine);
+ Assert.AreEqual(WaternetCreationMode.CreateWaternet, preConstructionStage.WaternetCreationMode);
+ KernelInputAssert.AssertWaternetCreatorInput(UpliftVanWaternetCreatorInputCreator.CreateDaily(input), preConstructionStage.WaternetCreatorInput);
+ }
+
+ #endregion
+
+ #region CreateExtremeWaternetForUpliftVan
+
+ [Test]
+ public void CreateExtremeWaternetForUpliftVan_upliftVanInputNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan(
+ null, new List(), new SurfaceLine(), new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("upliftVanInput", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateExtremeWaternetForUpliftVan_SoilsNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), null, new SurfaceLine(), new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soils", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateExtremeWaternetForUpliftVan_SurfaceLineNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(), null, new SoilProfile());
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("surfaceLine", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateExtremeWaternetForUpliftVan_SoilProfileNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan(
+ UpliftVanCalculatorInputTestFactory.Create(), new List(), new SurfaceLine(), null);
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("soilProfile", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateExtremeWaternetForUpliftVan_WithData_ReturnMacroStabilityInput()
+ {
+ // Setup
+ UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create();
+
+ LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(input.SoilProfile, out IDictionary _);
+ List soils = layersWithSoil.Select(lws => lws.Soil).ToList();
+
+ SurfaceLine surfaceLine = SurfaceLineCreator.Create(input.SurfaceLine);
+ SoilProfile soilProfile = SoilProfileCreator.Create(layersWithSoil);
+
+ // Call
+ MacroStabilityInput macroStabilityInput = MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan(
+ input, soils, surfaceLine, soilProfile);
+
+ // Assert
+ CollectionAssert.AreEqual(soils, macroStabilityInput.StabilityModel.Soils, new SoilComparer());
+ Assert.AreSame(soilProfile, macroStabilityInput.StabilityModel.ConstructionStages.Single().SoilProfile);
+
+ PreConstructionStage preConstructionStage = macroStabilityInput.PreprocessingInput.PreConstructionStages.Single();
+ Assert.AreSame(surfaceLine, preConstructionStage.SurfaceLine);
+ Assert.AreEqual(WaternetCreationMode.CreateWaternet, preConstructionStage.WaternetCreationMode);
+ KernelInputAssert.AssertWaternetCreatorInput(UpliftVanWaternetCreatorInputCreator.CreateExtreme(input), preConstructionStage.WaternetCreatorInput);
+ }
+
+ #endregion
+
+ #region CreateWaternet
+
+ [Test]
+ public void CreateWaternet_waternetInputNull_ThrowsArgumentNullException()
+ {
+ // Call
+ void Call() => MacroStabilityInputCreator.CreateWaternet(null);
+
+ // Assert
+ var exception = Assert.Throws(Call);
+ Assert.AreEqual("waternetInput", exception.ParamName);
+ }
+
+ [Test]
+ public void CreateWaternet_WithData_ReturnMacroStabilityInput()
+ {
+ // Setup
+ WaternetCalculatorInput input = WaternetCalculatorInputTestFactory.CreateValidCalculatorInput();
+
+ // Call
+ MacroStabilityInput macroStabilityInput = MacroStabilityInputCreator.CreateWaternet(input);
+
+ // Assert
+ LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(input.SoilProfile, out IDictionary _);
+ CollectionAssert.AreEqual(layersWithSoil.Select(lws => lws.Soil).ToList(), macroStabilityInput.StabilityModel.Soils, new SoilComparer());
+ KernelInputAssert.AssertSoilProfile(SoilProfileCreator.Create(layersWithSoil),
+ macroStabilityInput.StabilityModel.ConstructionStages.Single().SoilProfile);
+
+ PreConstructionStage preConstructionStage = macroStabilityInput.PreprocessingInput.PreConstructionStages.Single();
+ KernelInputAssert.AssertSurfaceLine(SurfaceLineCreator.Create(input.SurfaceLine), preConstructionStage.SurfaceLine);
+ Assert.AreEqual(WaternetCreationMode.CreateWaternet, preConstructionStage.WaternetCreationMode);
+ KernelInputAssert.AssertWaternetCreatorInput(WaternetCreatorInputCreator.Create(input), preConstructionStage.WaternetCreatorInput);
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs
===================================================================
diff -u -rb4ae581ac0d728500cbb4b92ef747de0c6fafb07 -r15be27c72577eaed0ee4b04c9c78ef14938cabe4
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs (.../UpliftVanKernelInputAssert.cs) (revision b4ae581ac0d728500cbb4b92ef747de0c6fafb07)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/UpliftVanKernelInputAssert.cs (.../UpliftVanKernelInputAssert.cs) (revision 15be27c72577eaed0ee4b04c9c78ef14938cabe4)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2019. All rights reserved.
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
//
// This file is part of Riskeer.
//
@@ -49,6 +49,35 @@
///
/// Asserts whether is equal to .
///
+ /// The expected .
+ /// The actual .
+ /// Thrown when
+ /// is not equal to .
+ public static void AssertUpliftVanCalculationGrid(UpliftVanCalculationGrid expected, UpliftVanCalculationGrid actual)
+ {
+ AssertCalculationGrid(expected.LeftGrid, actual.LeftGrid);
+ AssertCalculationGrid(expected.RightGrid, actual.RightGrid);
+ CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines);
+ }
+
+ ///
+ /// Asserts whether is equal to .
+ ///
+ /// The expected .
+ /// The actual .
+ /// Thrown when
+ /// is not equal to .
+ public static void AssertSlipPlaneConstraints(SlipPlaneConstraints expected, SlipPlaneConstraints actual)
+ {
+ Assert.AreEqual(expected.SlipPlaneMinDepth, actual.SlipPlaneMinDepth);
+ Assert.AreEqual(expected.SlipPlaneMinLength, actual.SlipPlaneMinLength);
+ Assert.AreEqual(expected.XEntryMin, actual.XEntryMin);
+ Assert.AreEqual(expected.XEntryMax, actual.XEntryMax);
+ }
+
+ ///
+ /// Asserts whether is equal to .
+ ///
/// The expected .
/// The actual .
/// Thrown when
@@ -112,35 +141,6 @@
///
/// Asserts whether is equal to .
///
- /// The expected .
- /// The actual .
- /// Thrown when
- /// is not equal to .
- private static void AssertUpliftVanCalculationGrid(UpliftVanCalculationGrid expected, UpliftVanCalculationGrid actual)
- {
- AssertCalculationGrid(expected.LeftGrid, actual.LeftGrid);
- AssertCalculationGrid(expected.RightGrid, actual.RightGrid);
- CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines);
- }
-
- ///
- /// Asserts whether is equal to .
- ///
- /// The expected .
- /// The actual .
- /// Thrown when
- /// is not equal to .
- private static void AssertSlipPlaneConstraints(SlipPlaneConstraints expected, SlipPlaneConstraints actual)
- {
- Assert.AreEqual(expected.SlipPlaneMinDepth, actual.SlipPlaneMinDepth);
- Assert.AreEqual(expected.SlipPlaneMinLength, actual.SlipPlaneMinLength);
- Assert.AreEqual(expected.XEntryMin, actual.XEntryMin);
- Assert.AreEqual(expected.XEntryMax, actual.XEntryMax);
- }
-
- ///
- /// Asserts whether is equal to .
- ///
/// The expected .
/// The actual .
/// Thrown when