Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs
===================================================================
diff -u -r7042 -r7044
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs (.../GeometryHelper.cs) (revision 7042)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryHelper.cs (.../GeometryHelper.cs) (revision 7044)
@@ -22,7 +22,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Deltares.DamEngine.Data.Standard;
namespace Deltares.DamEngine.Data.Geometry;
@@ -86,13 +85,13 @@
var p1 = new Point2D(geometryCurve.HeadPoint.X, geometryCurve.HeadPoint.Z);
var p2 = new Point2D(geometryCurve.EndPoint.X, geometryCurve.EndPoint.Z);
// If head or endpoint is at atX, add this existing point to the local list
- if (p1.X.AlmostEquals(atX))
+ if (Math.Abs(p1.X - atX) < GeometryConstants.Tolerance)
{
splitPoints.Add(p1);
}
else
{
- if (p2.X.AlmostEquals(atX))
+ if (Math.Abs(p2.X - atX) < GeometryConstants.Tolerance)
{
splitPoints.Add(p2);
}
@@ -153,13 +152,13 @@
var p1 = new Point2D(geometryCurve.HeadPoint.X, geometryCurve.HeadPoint.Z);
var p2 = new Point2D(geometryCurve.EndPoint.X, geometryCurve.EndPoint.Z);
- if (p1.X.AlmostEquals(atX))
+ if (Math.Abs(p1.X - atX) < GeometryConstants.Tolerance)
{
splitPoints.Add(p1);
}
else
{
- if (p2.X.AlmostEquals(atX))
+ if (Math.Abs(p2.X - atX) < GeometryConstants.Tolerance)
{
splitPoints.Add(p2);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs
===================================================================
diff -u -r7042 -r7044
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs (.../GeometryCurve.cs) (revision 7042)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs (.../GeometryCurve.cs) (revision 7044)
@@ -166,7 +166,7 @@
/// The point.
/// The tolerance.
///
- public bool ContainsPoint(Point2D point, double tolerance = GeometryConstants.Accuracy * 0.5)
+ public bool ContainsPoint(Point2D point, double tolerance = GeometryConstants.Tolerance)
{
return HeadPoint != null && EndPoint != null &&
Routines2D.DoesPointExistInLine(HeadPoint, EndPoint, point, tolerance);
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs
===================================================================
diff -u -r6560 -r7044
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs (.../GeometrySurface.cs) (revision 6560)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometrySurface.cs (.../GeometrySurface.cs) (revision 7044)
@@ -171,7 +171,6 @@
/// Determines a point within the outer loop of the new surface and that is not in an inner loop of that surface
/// so it can be used to determine the old surface.
///
- ///
/// The point or null when no valid point is found.
public Point2D DetermineValidTestPointBasedOnNewSurface()
{