Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryDataTests.cs =================================================================== diff -u -r5526 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 5526) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geometry/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 5527) @@ -24,7 +24,7 @@ using Deltares.DamEngine.Data.Geometry; using NUnit.Framework; -namespace Deltares.DamEngine.Data.Tests.General; +namespace Deltares.DamEngine.Data.Tests.Geometry; [TestFixture] public class GeometryDataTests @@ -103,20 +103,20 @@ GeometryData gData = CreateGeometrySurface(); Assert.Multiple(() => { - Assert.That(gData.Points.Count, Is.EqualTo(6)); - Assert.That(gData.Curves.Count, Is.EqualTo(7)); - Assert.That(gData.Loops.Count, Is.EqualTo(2)); - Assert.That(gData.Surfaces.Count, Is.EqualTo(2)); + Assert.That(gData.Points, Has.Count.EqualTo(6)); + Assert.That(gData.Curves, Has.Count.EqualTo(7)); + Assert.That(gData.Loops, Has.Count.EqualTo(2)); + Assert.That(gData.Surfaces, Has.Count.EqualTo(2)); }); gData.Clear(); Assert.Multiple(() => { - Assert.That(gData.Points.Count, Is.EqualTo(0)); - Assert.That(gData.Curves.Count, Is.EqualTo(0)); - Assert.That(gData.Loops.Count, Is.EqualTo(0)); - Assert.That(gData.Surfaces.Count, Is.EqualTo(0)); - Assert.That(gData.NewlyEffectedPoints.Count, Is.EqualTo(0)); - Assert.That(gData.NewlyEffectedCurves.Count, Is.EqualTo(0)); + Assert.That(gData.Points, Has.Count.EqualTo(0)); + Assert.That(gData.Curves, Has.Count.EqualTo(0)); + Assert.That(gData.Loops, Has.Count.EqualTo(0)); + Assert.That(gData.Surfaces, Has.Count.EqualTo(0)); + Assert.That(gData.NewlyEffectedPoints, Has.Count.EqualTo(0)); + Assert.That(gData.NewlyEffectedCurves, Has.Count.EqualTo(0)); }); } @@ -127,7 +127,7 @@ var rightCurves = gData.GetRightCurves(); Assert.Multiple(() => { - Assert.That(rightCurves.Count, Is.EqualTo(5)); + Assert.That(rightCurves, Has.Count.EqualTo(5)); Assert.That(rightCurves[0].HeadPoint.X, Is.EqualTo(1.0)); Assert.That(rightCurves[0].EndPoint.X, Is.EqualTo(10.0)); Assert.That(rightCurves[1].HeadPoint.X, Is.EqualTo(10.0)); @@ -146,7 +146,7 @@ var leftCurves = gData.GetLeftCurves(); Assert.Multiple(() => { - Assert.That(leftCurves.Count, Is.EqualTo(5)); + Assert.That(leftCurves, Has.Count.EqualTo(5)); Assert.That(leftCurves[0].HeadPoint.X, Is.EqualTo(1.0)); Assert.That(leftCurves[0].EndPoint.X, Is.EqualTo(10.0)); Assert.That(leftCurves[1].HeadPoint.X, Is.EqualTo(10.0)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs =================================================================== diff -u -r5487 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs (.../GeometryLoop.cs) (revision 5487) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryLoop.cs (.../GeometryLoop.cs) (revision 5527) @@ -219,18 +219,7 @@ } else { - // Compare by reference (is faster then by value) - // if (CurveList[index].HeadPoint == calcPoints[calcPoints.Count - 1]) - // { - // calcPoints.Add(CurveList[index].EndPoint); - // } - // else if (CurveList[index].EndPoint == calcPoints[calcPoints.Count - 1]) - // { - // calcPoints.Add(CurveList[index].HeadPoint); - // } - //else if (!AddEitherHeadOrEndPointOfCurveToCalcPoints(index)) - { if (calcPoints.Count == 2) { @@ -247,6 +236,7 @@ private bool AddEitherHeadOrEndPointOfCurveToCalcPoints(int index) { + // Compare by reference (is faster then by value) if (CurveList[index].HeadPoint == calcPoints[calcPoints.Count - 1]) { calcPoints.Add(CurveList[index].EndPoint); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs =================================================================== diff -u -r5498 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs (.../GeometryHelper.cs) (revision 5498) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs (.../GeometryHelper.cs) (revision 5527) @@ -21,11 +21,13 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; namespace Deltares.DamEngine.Data.Geometry; +/// +/// Offers helper methods for geometry operations. +/// public static class GeometryHelper { /// @@ -84,16 +86,16 @@ var newTopPoint = new Point2D(toX, edgePoints[i].Z); geometry.Points.Add(newTopPoint); - var newhorizontalCurve2 = new GeometryCurve(edgePoints[i], newTopPoint); - geometry.Curves.Add(newhorizontalCurve2); + var newHorizontalCurve2 = new GeometryCurve(edgePoints[i], newTopPoint); + geometry.Curves.Add(newHorizontalCurve2); var newVerticalCurve = new GeometryCurve(newBottomPoint, newTopPoint); geometry.Curves.Add(newVerticalCurve); var newLoop = new GeometryLoop(); newLoop.CurveList.Add(newhorizontalCurve1); newLoop.CurveList.Add(newVerticalCurve); - newhorizontalCurve2.Reverse(); - newLoop.CurveList.Add(newhorizontalCurve2); + newHorizontalCurve2.Reverse(); + newLoop.CurveList.Add(newHorizontalCurve2); var existingVerticalCurve = GetCurvesWithPoints(edgePoints[i], edgePoints[i - 1], edgeCurves); newLoop.CurveList.Add(existingVerticalCurve); if (newLoop.IsContinuous()) @@ -108,7 +110,7 @@ throw new ArgumentException("The new loop is not a real continuous loop."); } newBottomPoint = newTopPoint; - newhorizontalCurve1 = newhorizontalCurve2; + newhorizontalCurve1 = newHorizontalCurve2; } } @@ -297,7 +299,7 @@ private static bool IsCurveAnExistingCurve(GeometryCurve curve, GeometrySurface aData) { - return ((curve.SurfaceAtLeft == null ? (true ? 1 : 0) : (curve.SurfaceAtLeft == aData ? 1 : 0)) & + return ((curve.SurfaceAtLeft == null ? (1) : (curve.SurfaceAtLeft == aData ? 1 : 0)) & (curve.SurfaceAtRight == null ? 1 : (curve.SurfaceAtRight == aData ? 1 : 0))) != 0; } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs =================================================================== diff -u -r5511 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 5511) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/IssuesTests.cs (.../IssuesTests.cs) (revision 5527) @@ -77,7 +77,7 @@ Assert.Multiple(() => { Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); - Assert.That(engineInterface.DamProjectData.DesignCalculations.Count, Is.EqualTo(1), "There should be one design calculation."); + Assert.That(engineInterface.DamProjectData.DesignCalculations, Has.Count.EqualTo(1), "There should be one design calculation."); Assert.That(engineInterface.DamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(safetyFactor).Within(0.001), "The safety factor should be 1.110."); }); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs =================================================================== diff -u -r5526 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 5526) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs (.../GeometryData.cs) (revision 5527) @@ -894,12 +894,9 @@ { for (int j = i; j < curvesAsArray.Length; j++) { - if (i != j && curvesAsArray[i].LocationEquals(curvesAsArray[j])) + if ((i != j && curvesAsArray[i].LocationEquals(curvesAsArray[j])) && !curvesToDelete.Contains(curvesAsArray[j])) { - if (!curvesToDelete.Contains(curvesAsArray[j])) - { - curvesToDelete.Add(curvesAsArray[j]); - } + curvesToDelete.Add(curvesAsArray[j]); } } } @@ -937,12 +934,9 @@ { for (int j = i; j < pointsAsArray.Length; j++) { - if (i != j && pointsAsArray[i].LocationEquals(pointsAsArray[j])) + if (i != j && pointsAsArray[i].LocationEquals(pointsAsArray[j]) && !pointsToDelete.Contains(pointsAsArray[j])) { - if (!pointsToDelete.Contains(pointsAsArray[j])) - { - pointsToDelete.Add(pointsAsArray[j]); - } + pointsToDelete.Add(pointsAsArray[j]); } } } @@ -1087,12 +1081,9 @@ else if (geometryObject.GetType() == typeof(GeometryCurve)) { var geometryCurve = (GeometryCurve) geometryObject; - if (Curves.IndexOf(geometryCurve) > -1) + if ((Curves.IndexOf(geometryCurve) > -1) && Curves.Remove(geometryCurve)) { - if (Curves.Remove(geometryCurve)) - { - RemoveDeletedCurveFromIsUsedCurveLists(geometryCurve); - } + RemoveDeletedCurveFromIsUsedCurveLists(geometryCurve); } } else if (geometryObject.GetType() == typeof(GeometryLoop)) Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs =================================================================== diff -u -r5449 -r5527 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs (.../SurfaceLine2Validator.cs) (revision 5449) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SurfaceLine2Validator.cs (.../SurfaceLine2Validator.cs) (revision 5527) @@ -94,12 +94,9 @@ /// public static bool AreAllPointsXCoordinatesAscending(SurfaceLine2 line) { - if (line.Geometry.Points.Count == line.Geometry.CalcPoints.Count) + if ((line.Geometry.Points.Count == line.Geometry.CalcPoints.Count) && ArePointsAndCalcPointEqual(line)) { - if (ArePointsAndCalcPointEqual(line)) - { - return AreGeometryPointsXCoordinatesAscending(line.Geometry.Points); - } + return AreGeometryPointsXCoordinatesAscending(line.Geometry.Points); } return false; }