Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r3009 -r3029 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 3009) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 3029) @@ -79,7 +79,7 @@ // Given DamEngine data (DamProjectData) DamProjectData expectedDamProjectData = CreateExampleDamProjectData(); Waternet expectedWaternet = CreateExampleWaternet(); - //UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = CreateExampleUpliftVanCalculationGrid(); + UpliftVanCalculationGrid expectedUpliftVanCalculationGrid = CreateExampleUpliftVanCalculationGrid(); Location expectedLocation = expectedDamProjectData.Dike.Locations[0]; SoilList expectedSoilList = expectedDamProjectData.Dike.SoilList; @@ -94,7 +94,7 @@ }; var fillMacroStabilityWrapperInputFromEngine = new FillMacroStabilityWrapperInputFromEngine { - //UpliftVanCalculationGrid = expectedUpliftVanCalculationGrid, + UpliftVanCalculationGrid = expectedUpliftVanCalculationGrid, TrafficLoad = expectedTrafficLoad }; var damKernelInput = new DamKernelInput @@ -119,11 +119,37 @@ var expectedUpliftVanCalculationGridSettings = expectedParametersMStab.MStabParameters.SlipCircleDefinition; CompareUpliftVanCalculationGridSettings(expectedUpliftVanCalculationGridSettings, fillEngineFromMacroStabilityWrapperInput.SlipCircleDefinition); - //CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fillEngineFromMacroStabilityWrapperInput.UpliftVanCalculationGrid); + CompareUpliftVanCalculationGrid(expectedUpliftVanCalculationGrid, fillEngineFromMacroStabilityWrapperInput.UpliftVanCalculationGrid); CompareWaternet(expectedWaternet, fillEngineFromMacroStabilityWrapperInput.Waternet); //Todo : add and or implement comparer per item as these are added to the code } + private static UpliftVanCalculationGrid CreateExampleUpliftVanCalculationGrid() + { + var random = new Random(21); + var upliftVanCalculationGrid = new UpliftVanCalculationGrid + { + LeftGridXLeft = random.NextDouble(), + LeftGridXRight = random.NextDouble(), + LeftGridZTop = random.NextDouble(), + LeftGridZBottom = random.NextDouble(), + LeftGridXCount = random.Next(), + LeftGridZCount = random.Next(), + + RightGridXLeft = random.NextDouble(), + RightGridXRight = random.NextDouble(), + RightGridZTop = random.NextDouble(), + RightGridZBottom = random.NextDouble(), + RightGridXCount = random.Next(), + RightGridZCount = random.Next(), + + TangentLineZBottom = 0, + TangentLineZTop = 10, + TangentLineCount = 10 + }; + return upliftVanCalculationGrid; + } + private static Waternet CreateExampleWaternet() { var waterNet = new Waternet @@ -201,6 +227,28 @@ } + private void CompareUpliftVanCalculationGrid(UpliftVanCalculationGrid expectedSlipPlaneUpliftVan, + UpliftVanCalculationGrid actualSlipPlaneUpliftVan) + { + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXLeft, actualSlipPlaneUpliftVan.LeftGridXLeft); + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXRight, actualSlipPlaneUpliftVan.LeftGridXRight); + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZTop, actualSlipPlaneUpliftVan.LeftGridZTop); + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZBottom, actualSlipPlaneUpliftVan.LeftGridZBottom); + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridXCount, actualSlipPlaneUpliftVan.LeftGridXCount); + Assert.AreEqual(expectedSlipPlaneUpliftVan.LeftGridZCount, actualSlipPlaneUpliftVan.LeftGridZCount); + + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXLeft, actualSlipPlaneUpliftVan.RightGridXLeft); + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXRight, actualSlipPlaneUpliftVan.RightGridXRight); + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZTop, actualSlipPlaneUpliftVan.RightGridZTop); + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZBottom, actualSlipPlaneUpliftVan.RightGridZBottom); + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridXCount, actualSlipPlaneUpliftVan.RightGridXCount); + Assert.AreEqual(expectedSlipPlaneUpliftVan.RightGridZCount, actualSlipPlaneUpliftVan.RightGridZCount); + + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZTop, actualSlipPlaneUpliftVan.TangentLineZTop); + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineZBottom, actualSlipPlaneUpliftVan.TangentLineZBottom); + Assert.AreEqual(expectedSlipPlaneUpliftVan.TangentLineCount, actualSlipPlaneUpliftVan.TangentLineCount); + } + private static void CompareWaternet(Waternet expectedWaternet, Waternet actualWaternet) { Assert.AreEqual(expectedWaternet.Name, actualWaternet.Name);