Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs
===================================================================
diff -u -r5641 -r5742
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs (.../GeometryHelperTests.cs) (revision 5641)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs (.../GeometryHelperTests.cs) (revision 5742)
@@ -246,7 +246,7 @@
[TestCase(20, 3, 10, 12, 0)]
[TestCase(40, 3, 10, 12, 0)]
[TestCase(45, 3, 10, 11, 2)]
- public void GivenInnerLoopLayerGeometryWithConnectedLoopsWhenCuttingRightThenLeftBoundaryIsChanged(double atX, int surfacesCount, int pointsCount, int curvesCount, int innerLoopsCount)
+ public void GivenInnerLoopLayerGeometryWithConnectedLoopsWhenCuttingRightThenRightBoundaryIsChanged(double atX, int surfacesCount, int pointsCount, int curvesCount, int innerLoopsCount)
{
// Given
SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithThreeLayersOfWhichTwoAreConnectedInnerLoops();
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs
===================================================================
diff -u -r5691 -r5742
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs (.../GeometryGenerator.cs) (revision 5691)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryGenerator.cs (.../GeometryGenerator.cs) (revision 5742)
@@ -900,7 +900,6 @@
}
//Add New Loop as inner loop to the existing Surface
- //#BKA: Temp code to be tested as replacement: if ((innerPointCount == newPointCount) || ((innerPointCount > 0) && (newPointCount == (innerPointCount + isOnPointCount))))
if (innerPointCount == newPointCount)
{
geometryData.Surfaces[index].AddInnerLoop(newLoop);
@@ -1096,7 +1095,7 @@
///
///
///
- private bool RegenerateParallelCurves(GeometryCurve line1, GeometryCurve line2, ref bool isCurveInserted)
+ protected internal bool RegenerateParallelCurves(GeometryCurve line1, GeometryCurve line2, ref bool isCurveInserted)
{
// check if the lines are parallel and on
// |----o------|----o or o----|------o----| or