Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs =================================================================== diff -u -r5121 -r5127 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 5121) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 5127) @@ -1100,7 +1100,7 @@ SoilLayer2D soilLayer2 = CreatePentagonSoilLayer2D(new Point2D(-20, 10), new Point2D(0, 10), new Point2D(0, 0), new Point2D(-10, 0), new Point2D(-20, 0), soil2, soilProfile2D); var soil3 = new Soil("Soil3"); SoilLayer2D soilLayer3 = CreatePentagonSoilLayer2D(new Point2D(0, 10), new Point2D(60, 10), new Point2D(60, 0), new Point2D(35, 0), new Point2D(0, 0), soil3, soilProfile2D); - var soil4 = new Soil("Soil"); + var soil4 = new Soil("Soil4"); SoilLayer2D soilLayer4 = CreatePentagonSoilLayer2D(new Point2D(-50, 0), new Point2D(-20, 0), new Point2D(-10, 0), new Point2D(-10, -15), new Point2D(-50, -15), soil4, soilProfile2D); var soil5 = new Soil("Soil5"); SoilLayer2D soilLayer5 = CreatePentagonSoilLayer2D(new Point2D(-10, 0), new Point2D(0, 0), new Point2D(35, 0), new Point2D(35, -15), new Point2D(-10, -15), soil5, soilProfile2D); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs =================================================================== diff -u -r5124 -r5127 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs (.../SoilProfile2DSurfaceLineHelper.cs) (revision 5124) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilProfile2DSurfaceLineHelper.cs (.../SoilProfile2DSurfaceLineHelper.cs) (revision 5127) @@ -385,7 +385,7 @@ var rightPoint = new Point2D { - X = xMin[^1] - 0.1, + X = xMin[^1] + 0.1, Z = zMin[0] + 0.1 }; Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs =================================================================== diff -u -r5122 -r5127 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs (.../SoilProfile2DSurfaceLineHelperTests.cs) (revision 5122) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs (.../SoilProfile2DSurfaceLineHelperTests.cs) (revision 5127) @@ -210,22 +210,6 @@ new TestCaseZigZagSurfaceLine { TestNumber = 5, - GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(-50, -15), - ExpectedSurfaceCount = 0 - }).SetName("Test 5: Surface line partly below soil profile (and shift = 0)"); - - yield return new TestCaseData( - new TestCaseZigZagSurfaceLine - { - TestNumber = 6, - GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(-50, -20), - ExpectedSurfaceCount = 0 - }).SetName("Test 6: Surface line completely below soil profile (and shift = 0)"); - - yield return new TestCaseData( - new TestCaseZigZagSurfaceLine - { - TestNumber = 7, GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(-40, 10), ExpectedSurfaceCount = 10, // Only few surfaces are tested @@ -241,12 +225,12 @@ ExpectedSurface4 = FactoryForSoilProfiles.CreatePentagonSoilLayer2D(new Point2D(-40, 0), new Point2D(-20, 0), new Point2D(-10, 0), new Point2D(-10, -15), new Point2D(-40, -15), soil4), ExpectedSurface5 = null, // not null but not tested ExpectedSurface6 = null // not null but not tested - }).SetName("Test 7: Surface line intersects the original surface line of soil profile (and shift = +10)"); + }).SetName("Test 5: Surface line intersects the original surface line of soil profile (and shift = +10)"); yield return new TestCaseData( new TestCaseZigZagSurfaceLine { - TestNumber = 8, + TestNumber = 6, GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(10, 10), ExpectedSurfaceCount = 7, // Only few surfaces are tested @@ -262,12 +246,12 @@ ExpectedSurface4 = null, ExpectedSurface5 = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(0, -15, 10, 35, soil5), ExpectedSurface6 = null // not null but not tested - }).SetName("Test 8: Surface line intersects the original surface line of soil profile (and shift = +60)"); + }).SetName("Test 6: Surface line intersects the original surface line of soil profile (and shift = +60)"); yield return new TestCaseData( new TestCaseZigZagSurfaceLine { - TestNumber = 9, + TestNumber = 7, GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(-60, 10), ExpectedSurfaceCount = 10, // Only few surfaces are tested @@ -283,12 +267,12 @@ ExpectedSurface4 = null, // not null but not tested ExpectedSurface5 = null, // not null but not tested ExpectedSurface6 = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(0, -15, 35, 60, soil6) - }).SetName("Test 9: Surface line intersects the original surface line of soil profile (and shift = -10)"); + }).SetName("Test 7: Surface line intersects the original surface line of soil profile (and shift = -10)"); yield return new TestCaseData( new TestCaseZigZagSurfaceLine { - TestNumber = 10, + TestNumber = 8, GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(-110, 10), ExpectedSurfaceCount = 9, // Only few surfaces are tested @@ -304,12 +288,12 @@ ExpectedSurface4 = null, //not null but not tested ExpectedSurface5 = FactoryForSoilProfiles.CreatePentagonSoilLayer2D(new Point2D(-10, 0), new Point2D(0, 0), new Point2D(10, 0), new Point2D(10, -15), new Point2D(-10, -15), soil5), ExpectedSurface6 = null - }).SetName("Test 10: Surface line intersects the original surface line of soil profile (and shift = -60)"); + }).SetName("Test 8: Surface line intersects the original surface line of soil profile (and shift = -60)"); yield return new TestCaseData( new TestCaseZigZagSurfaceLine { - TestNumber = 11, + TestNumber = 9, GivenZigZagSurfaceLine = FactoryForSurfaceLines.CreateSurfaceLineInZigZag(50, -5), ExpectedSurfaceCount = 2, ExpectedFilling1 = null, @@ -324,7 +308,7 @@ ExpectedSurface4 = null, ExpectedSurface5 = null, ExpectedSurface6 = FactoryForSoilProfiles.CreateQuadrilateralSoilLayer2D(new Point2D(50, -5), new Point2D(60, -4), new Point2D(60, -15), new Point2D(50, -15), soil6) - }).SetName("Test 11: Surface line starts inside surface line 6 (right bottom) of soil profile"); + }).SetName("Test 9: Surface line starts inside surface line 6 (right bottom) of soil profile"); } } @@ -368,7 +352,6 @@ } [Test, TestCaseSource(nameof(ZigZagSurfaceLinesTestCases))] - [Ignore("Work in progress")] public void GivenComplexSoilProfile2D_WhenCombiningWithZigZagSurfaceLine_ThenCorrectNewSoilProfile2DIsCreated(TestCaseZigZagSurfaceLine testCaseSurfaceLine) { // Given