Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs =================================================================== diff -u -re678af24e939bdb6b49294b16b06af9565bef9b1 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision e678af24e939bdb6b49294b16b06af9565bef9b1) +++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -60,7 +60,7 @@ { throw new ArgumentException(Resources.Math2D_SplitLineAtLengths_Not_enough_points_to_make_line, nameof(linePoints)); } - Segment2D[] lineSegments = ConvertLinePointsToLineSegments(linePoints).ToArray(); + Segment2D[] lineSegments = ConvertPointsToLineSegments(linePoints).ToArray(); if (Math.Abs(lengths.Sum(l => l) - lineSegments.Sum(s => s.Length)) > epsilonForComparisons) { @@ -71,15 +71,16 @@ } /// - /// Creates an enumerator that converts a sequence of line points to a sequence of line segments. + /// Creates an enumerator that converts a sequence of points to a sequence of segments that represent a line. /// - /// The line points. - /// A sequence of N elements, where N is the number of elements in - /// - 1, or 0 if only has one or no elements. - public static IEnumerable ConvertLinePointsToLineSegments(IEnumerable linePoints) + /// A sequence of points to convert. + /// A sequence of N elements, where N is the number of elements in + /// - 1, or 0 if only has one or no elements. + /// The converted points do not form a closed loop. + public static IEnumerable ConvertPointsToLineSegments(IEnumerable points) { Point2D endPoint = null; - foreach (Point2D linePoint in linePoints) + foreach (Point2D linePoint in points) { Point2D startPoint = endPoint; endPoint = linePoint; @@ -92,29 +93,30 @@ } /// - /// Creates an enumerator that converts a sequence of line points to a sequence of line segments - /// and adds a segment between the last and the first point of the sequence. + /// Creates an enumerator that converts a sequence of points to a sequence of segments + /// that represent a polygon. /// - /// The line points. - /// A sequence of N elements, where N is the number of elements in , - /// or 0 if has one or no elements. - public static IEnumerable ConvertLinePointsToClosingLineSegments(IEnumerable linePoints) + /// A sequence of points to convert. + /// A sequence of N elements, where N is the number of elements in , + /// or 0 if has one or no elements. + /// The converted points form a closed loop. + public static IEnumerable ConvertPointsToPolygonSegments(IEnumerable points) { - if (linePoints.Count() < 2) + Point2D[] pointsArray = points.ToArray(); + int nrOfPoints = pointsArray.Length; + if (nrOfPoints < 2) { yield break; } - Point2D endPoint = linePoints.Last(); - foreach (Point2D linePoint in linePoints) + for (var i = 0; i < nrOfPoints; i++) { - Point2D startPoint = endPoint; - endPoint = linePoint; + Point2D startPoint = pointsArray[i]; + Point2D endPoint = i != nrOfPoints - 1 + ? pointsArray[i + 1] + : pointsArray[0]; - if (startPoint != null) - { - yield return new Segment2D(startPoint, endPoint); - } + yield return new Segment2D(startPoint, endPoint); } } Index: Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs =================================================================== diff -u -re678af24e939bdb6b49294b16b06af9565bef9b1 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs (.../Math2DTest.cs) (revision e678af24e939bdb6b49294b16b06af9565bef9b1) +++ Core/Common/test/Core.Common.Base.Test/Geometry/Math2DTest.cs (.../Math2DTest.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -169,20 +169,20 @@ [Test] [TestCase(0)] [TestCase(1)] - public void ConvertLinePointsToLineSegments_TooFewPoints_ReturnEmpty(int pointCount) + public void ConvertPointsToLineSegments_TooFewPoints_ReturnEmpty(int pointCount) { // Setup IEnumerable linePoints = Enumerable.Repeat(new Point2D(0, 0), pointCount); // Call - IEnumerable segments = Math2D.ConvertLinePointsToLineSegments(linePoints); + IEnumerable segments = Math2D.ConvertPointsToLineSegments(linePoints); // Assert CollectionAssert.IsEmpty(segments); } [Test] - public void ConvertLinePointsToLineSegments_TwoPoints_ReturnOneSegmentOfThoseTwoPoints() + public void ConvertPointsToLineSegments_TwoPoints_ReturnOneSegmentOfThoseTwoPoints() { // Setup var linePoints = new[] @@ -192,31 +192,31 @@ }; // Call - Segment2D[] segments = Math2D.ConvertLinePointsToLineSegments(linePoints).ToArray(); + Segment2D[] segments = Math2D.ConvertPointsToLineSegments(linePoints).ToArray(); // Assert Assert.AreEqual(1, segments.Length); - Assert.AreEqual(linePoints[0], segments[0].FirstPoint); - Assert.AreEqual(linePoints[1], segments[0].SecondPoint); + Assert.AreSame(linePoints[0], segments[0].FirstPoint); + Assert.AreSame(linePoints[1], segments[0].SecondPoint); } [Test] [TestCase(0)] [TestCase(1)] - public void ConvertLinePointsToClosingLineSegments_TooFewPoints_ReturnEmpty(int pointCount) + public void ConvertPointsToPolygonSegments_TooFewPoints_ReturnEmpty(int pointCount) { // Setup IEnumerable linePoints = Enumerable.Repeat(new Point2D(0, 0), pointCount); // Call - IEnumerable segments = Math2D.ConvertLinePointsToClosingLineSegments(linePoints); + IEnumerable segments = Math2D.ConvertPointsToPolygonSegments(linePoints); // Assert CollectionAssert.IsEmpty(segments); } [Test] - public void ConvertLinePointsToClosingLineSegments_TwoPoints_ReturnsExpectedSegments() + public void ConvertPointsToPolygonSegments_TwoPoints_ReturnsExpectedSegments() { // Setup var linePoints = new[] @@ -226,18 +226,18 @@ }; // Call - Segment2D[] segments = Math2D.ConvertLinePointsToClosingLineSegments(linePoints).ToArray(); + Segment2D[] segments = Math2D.ConvertPointsToPolygonSegments(linePoints).ToArray(); // Assert Assert.AreEqual(2, segments.Length); Segment2D firstSegment = segments[0]; - Assert.AreEqual(linePoints[1], firstSegment.FirstPoint); - Assert.AreEqual(linePoints[0], firstSegment.SecondPoint); + Assert.AreSame(linePoints[0], firstSegment.FirstPoint); + Assert.AreSame(linePoints[1], firstSegment.SecondPoint); Segment2D secondSegment = segments[1]; - Assert.AreEqual(linePoints[0], secondSegment.FirstPoint); - Assert.AreEqual(linePoints[1], secondSegment.SecondPoint); + Assert.AreSame(linePoints[1], secondSegment.FirstPoint); + Assert.AreSame(linePoints[0], secondSegment.SecondPoint); } [Test] @@ -1293,7 +1293,7 @@ private static double[] GetLengthsBasedOnRelative(double[] relativeLengths, IEnumerable lineGeometryPoints) { - double lineLength = Math2D.ConvertLinePointsToLineSegments(lineGeometryPoints).Sum(s => s.Length); + double lineLength = Math2D.ConvertPointsToLineSegments(lineGeometryPoints).Sum(s => s.Length); return relativeLengths.Select(l => lineLength * l).ToArray(); } Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSection.cs =================================================================== diff -u -r831379390ac72116a2f1c3a014063bbd60ab928d -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSection.cs (.../FailureMechanismSection.cs) (revision 831379390ac72116a2f1c3a014063bbd60ab928d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismSection.cs (.../FailureMechanismSection.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -107,7 +107,7 @@ /// public double GetSectionLength() { - return Math2D.ConvertLinePointsToLineSegments(Points).Sum(segment => segment.Length); + return Math2D.ConvertPointsToPolygonSegments(Points).Sum(segment => segment.Length); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs =================================================================== diff -u -rd1bf253a0e3f11a168b4e185c4413c23995a1e8b -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision d1bf253a0e3f11a168b4e185c4413c23995a1e8b) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/FailureMechanismSectionsImporter.cs (.../FailureMechanismSectionsImporter.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -316,7 +316,7 @@ private static IEnumerable GetLineSegments(IEnumerable linePoints) { - return Math2D.ConvertLinePointsToLineSegments(linePoints); + return Math2D.ConvertPointsToLineSegments(linePoints); } private static List CreateFailureMechanismSectionsSnappedOnReferenceLine(IList orderedReadSections, Point2D[][] splitResults) Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs =================================================================== diff -u -r00da0d2f72214f140bceff0eaae5f14172c587de -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision 00da0d2f72214f140bceff0eaae5f14172c587de) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ProfilesImporter.cs (.../ProfilesImporter.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -333,7 +333,7 @@ private static IEnumerable GetLineSegments(IEnumerable linePoints) { - return Math2D.ConvertLinePointsToLineSegments(linePoints); + return Math2D.ConvertPointsToPolygonSegments(linePoints); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/StructuresImporter.cs (.../StructuresImporter.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -410,7 +410,7 @@ private static IEnumerable GetLineSegments(IEnumerable linePoints) { - return Math2D.ConvertLinePointsToLineSegments(linePoints); + return Math2D.ConvertPointsToLineSegments(linePoints); } /// Index: Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs (.../SurfaceLineExtensions.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SurfaceLines/SurfaceLineExtensions.cs (.../SurfaceLineExtensions.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -89,8 +89,8 @@ private static ReferenceLineIntersectionResult GetReferenceLineIntersections(ReferenceLine referenceLine, SurfaceLine surfaceLine) { - IEnumerable surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))); - Segment2D[] referenceLineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points).ToArray(); + IEnumerable surfaceLineSegments = Math2D.ConvertPointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))); + Segment2D[] referenceLineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points).ToArray(); return GetReferenceLineIntersectionsResult(surfaceLineSegments, referenceLineSegments); } Index: Ringtoets/Common/src/Ringtoets.Common.Utils/SectionSegments.cs =================================================================== diff -u -r6ef5e439a6d9f40ebd9926251945e0935fbbc314 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Common/src/Ringtoets.Common.Utils/SectionSegments.cs (.../SectionSegments.cs) (revision 6ef5e439a6d9f40ebd9926251945e0935fbbc314) +++ Ringtoets/Common/src/Ringtoets.Common.Utils/SectionSegments.cs (.../SectionSegments.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -47,7 +47,7 @@ throw new ArgumentNullException(nameof(section)); } Section = section; - segments = Math2D.ConvertLinePointsToLineSegments(section.Points); + segments = Math2D.ConvertPointsToLineSegments(section.Points); } /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -r00da0d2f72214f140bceff0eaae5f14172c587de -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 00da0d2f72214f140bceff0eaae5f14172c587de) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -72,7 +72,7 @@ public static IEnumerable GetCalculationScenarios(this MacroStabilityInwardsFailureMechanismSectionResult macroStabilityInwardsFailureMechanismSectionResult, IEnumerable calculations) { - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(macroStabilityInwardsFailureMechanismSectionResult.Section.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(macroStabilityInwardsFailureMechanismSectionResult.Section.Points); return calculations .Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments)); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModelExtensions.cs =================================================================== diff -u -r78382ec129ddc7537096860680cef36f3796700d -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModelExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelExtensions.cs) (revision 78382ec129ddc7537096860680cef36f3796700d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsStochasticSoilModelExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelExtensions.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -52,13 +52,13 @@ throw new ArgumentNullException(nameof(surfaceLine)); } - Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))).ToArray(); + Segment2D[] surfaceLineSegments = Math2D.ConvertPointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))).ToArray(); return DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(stochasticSoilModel, surfaceLineSegments); } private static bool DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, Segment2D[] surfaceLineSegments) { - IEnumerable soilProfileGeometrySegments = Math2D.ConvertLinePointsToLineSegments(stochasticSoilModel.Geometry); + IEnumerable soilProfileGeometrySegments = Math2D.ConvertPointsToLineSegments(stochasticSoilModel.Geometry); return soilProfileGeometrySegments.Any(s => DoesSegmentIntersectWithSegmentArray(s, surfaceLineSegments)); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs =================================================================== diff -u -r40f05a03e0bbab79f2a27f3cd966642f5dc5a1ad -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision 40f05a03e0bbab79f2a27f3cd966642f5dc5a1ad) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs (.../MacroStabilityInwardsChartDataPointsFactory.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -576,8 +576,8 @@ double leftX = waternetZoneAsPolygon.Min(p => p.X); double rightX = waternetZoneAsPolygon.Max(p => p.X); - Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(surfaceLineLocalGeometry).ToArray(); - Segment2D[] waternetZoneSegments = Math2D.ConvertLinePointsToLineSegments(waternetZoneAsPolygon).ToArray(); + Segment2D[] surfaceLineSegments = Math2D.ConvertPointsToLineSegments(surfaceLineLocalGeometry).ToArray(); + Segment2D[] waternetZoneSegments = Math2D.ConvertPointsToLineSegments(waternetZoneAsPolygon).ToArray(); var intersectionPoints = new List(); @@ -671,8 +671,8 @@ { var areas = new List>(); - Segment2D[] phreaticLineSegments = Math2D.ConvertLinePointsToLineSegments(phreaticLineGeometry).ToArray(); - Segment2D[] waternetLineSegments = Math2D.ConvertLinePointsToLineSegments(waternetLineGeometry).ToArray(); + Segment2D[] phreaticLineSegments = Math2D.ConvertPointsToLineSegments(phreaticLineGeometry).ToArray(); + Segment2D[] waternetLineSegments = Math2D.ConvertPointsToLineSegments(waternetLineGeometry).ToArray(); var intersectionPoints = new List(); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs =================================================================== diff -u -r66893bb1248edc38de9409e959984dad5a4a6af6 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 66893bb1248edc38de9409e959984dad5a4a6af6) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -303,7 +303,7 @@ return; } - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(failureMechanismSection.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(failureMechanismSection.Points); IEnumerable calculations = calculationGroup .GetCalculations() .OfType() Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs (.../MacroStabilityInwardsScenariosView.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -157,7 +157,7 @@ return; } - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(failureMechanismSection.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(failureMechanismSection.Points); IEnumerable calculations = calculationGroup .GetCalculations() .OfType() Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputValidator.cs =================================================================== diff -u -rad1b57853b8a157bc8ba9815c89271eab8f67ad0 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputValidator.cs (.../MacroStabilityInwardsInputValidator.cs) (revision ad1b57853b8a157bc8ba9815c89271eab8f67ad0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputValidator.cs (.../MacroStabilityInwardsInputValidator.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -148,7 +148,7 @@ foreach (Point2D surfaceLinePoint in surfaceLineWithInterpolations) { bool isNear = IsPointNearSoilSegments(surfaceLinePoint, - Math2D.ConvertLinePointsToClosingLineSegments(maximumYCoordinates)); + Math2D.ConvertPointsToPolygonSegments(maximumYCoordinates)); if (!isNear) { return false; @@ -197,7 +197,7 @@ private static IEnumerable GetSurfaceLineWithInterpolations(MacroStabilityInwardsInput inputParameters, IEnumerable uniqueXs) { - Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(inputParameters.SurfaceLine.LocalGeometry).ToArray(); + Segment2D[] surfaceLineSegments = Math2D.ConvertPointsToLineSegments(inputParameters.SurfaceLine.LocalGeometry).ToArray(); foreach (double x in uniqueXs) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs =================================================================== diff -u -rd619624819b7200ac55b357b0a0c54d198fc20e4 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioExtensionsTest.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -107,7 +107,7 @@ } }; - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points); // Call TestDelegate call = () => calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments); @@ -145,7 +145,7 @@ } }; - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments); @@ -183,7 +183,7 @@ } }; - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs =================================================================== diff -u -re5364ac1dd155a3e329529af8a542625ada547cf -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision e5364ac1dd155a3e329529af8a542625ada547cf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -630,17 +630,12 @@ { new MacroStabilityInwardsSoilLayer2D(new Ring(new[] { - new Point2D(0.2, 0), + new Point2D(0.2, 10), new Point2D(0.0, 10), new Point2D(0.1, 20) - })), - new MacroStabilityInwardsSoilLayer2D(new Ring(new[] - { - new Point2D(0.0, 10.0), - new Point2D(0.1, 20) })) }, new MacroStabilityInwardsPreconsolidationStress[0])) - .SetName("SoilLayer X start- and endpoint on right side of surfaceline"); + .SetName("SoilLayer X start and end point on right side of surfaceline"); yield return new TestCaseData( new MacroStabilityInwardsSoilProfile2D( @@ -652,14 +647,9 @@ new Point2D(0.1, 20), new Point2D(0.2, 10), new Point2D(0.0, 10) - })), - new MacroStabilityInwardsSoilLayer2D(new Ring(new[] - { - new Point2D(0.0, 10.0), - new Point2D(0.1, 20) })) }, new MacroStabilityInwardsPreconsolidationStress[0])) - .SetName("SoilLayer X start- and endpoint on left side of surfaceline"); + .SetName("SoilLayer X start and end point on left side of surfaceline"); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -r00da0d2f72214f140bceff0eaae5f14172c587de -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 00da0d2f72214f140bceff0eaae5f14172c587de) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -72,7 +72,7 @@ public static IEnumerable GetCalculationScenarios(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, IEnumerable calculations) { - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(pipingFailureMechanismSectionResult.Section.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(pipingFailureMechanismSectionResult.Section.Points); return calculations .Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments)); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelExtensions.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelExtensions.cs (.../PipingStochasticSoilModelExtensions.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelExtensions.cs (.../PipingStochasticSoilModelExtensions.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -53,7 +53,7 @@ throw new ArgumentNullException(nameof(surfaceLine)); } - Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(GetSurfaceLine2DGeometry(surfaceLine)).ToArray(); + Segment2D[] surfaceLineSegments = Math2D.ConvertPointsToLineSegments(GetSurfaceLine2DGeometry(surfaceLine)).ToArray(); return DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(stochasticSoilModel, surfaceLineSegments); } @@ -65,7 +65,7 @@ private static bool DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(PipingStochasticSoilModel stochasticSoilModel, Segment2D[] surfaceLineSegments) { - IEnumerable soilProfileGeometrySegments = Math2D.ConvertLinePointsToLineSegments(stochasticSoilModel.Geometry); + IEnumerable soilProfileGeometrySegments = Math2D.ConvertPointsToLineSegments(stochasticSoilModel.Geometry); return soilProfileGeometrySegments.Any(s => DoesSegmentIntersectWithSegmentArray(s, surfaceLineSegments)); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs =================================================================== diff -u -r08dff03b25288c1b1614c2b9486430ec22425933 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 08dff03b25288c1b1614c2b9486430ec22425933) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs (.../PipingCalculationsView.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -324,7 +324,7 @@ return; } - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(failureMechanismSection.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(failureMechanismSection.Points); IEnumerable pipingCalculations = calculationGroup .GetCalculations() .OfType() Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenariosView.cs (.../PipingScenariosView.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -169,7 +169,7 @@ return; } - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(failureMechanismSection.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(failureMechanismSection.Points); IEnumerable pipingCalculations = calculationGroup .GetCalculations() .OfType() Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r28326633ec4e625d2b1a2a7fae7cb617f820eb4b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 28326633ec4e625d2b1a2a7fae7cb617f820eb4b) @@ -110,7 +110,7 @@ } }; - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments); @@ -148,7 +148,7 @@ } }; - IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(referenceLine.Points); + IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(referenceLine.Points); // Call bool intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments);