Index: Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs =================================================================== diff -u -r95072939afd1772892c79416dc2e9f747a8fe000 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs (.../RoundedPoint2DCollectionTest.cs) (revision 95072939afd1772892c79416dc2e9f747a8fe000) +++ Core/Common/test/Core.Common.Base.Test/Data/RoundedPoint2DCollectionTest.cs (.../RoundedPoint2DCollectionTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -51,7 +51,7 @@ new Point2D(4.63, 2.10), new Point2D(6.74, 1.59), }; - CollectionAssert.AreEqual(expectedPoints, collection.ToList()); + CollectionAssert.AreEqual(expectedPoints, collection); } [Test] Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs =================================================================== diff -u -rba00ac482d95f158a6f51caec7b0de3d1e1ecc4c -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision ba00ac482d95f158a6f51caec7b0de3d1e1ecc4c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -106,13 +106,13 @@ /// /// Gets the geometry of the foreshore. /// - public Point2D[] ForeshoreGeometry + public RoundedPoint2DCollection ForeshoreGeometry { get { return dikeProfile != null - ? dikeProfile.ForeshoreGeometry.ToArray() - : new Point2D[0]; + ? dikeProfile.ForeshoreGeometry + : new RoundedPoint2DCollection(2, Enumerable.Empty()); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs =================================================================== diff -u -rb491d48a58b48c595ac55d80c1885137a585b331 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs (.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs) (revision b491d48a58b48c595ac55d80c1885137a585b331) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs (.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -20,6 +20,7 @@ // All rights reserved. using System.ComponentModel; +using System.Linq; using Core.Common.Base.Geometry; using Core.Common.Gui.Attributes; using Core.Common.Gui.Converters; @@ -64,14 +65,14 @@ { get { - return data.WrappedData.ForeshoreGeometry; + return data.WrappedData.ForeshoreGeometry.ToArray(); } } [DynamicReadOnlyValidationMethod] public bool DynamicReadOnlyValidationMethod(string propertyName) { - return data.WrappedData.DikeProfile == null || data.WrappedData.ForeshoreGeometry.Length < 2; + return data.WrappedData.DikeProfile == null || data.WrappedData.ForeshoreGeometry.Count() < 2; } public override string ToString() Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs =================================================================== diff -u -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -73,7 +73,7 @@ /// based on the . /// Thrown when /// is null. - public static ChartData Create(Point2D[] foreshoreGeometry, string name) + public static ChartData Create(RoundedPoint2DCollection foreshoreGeometry, string name) { if (foreshoreGeometry == null) { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeProfileTest.cs =================================================================== diff -u -r886c94611e3a5cc72a9e134a7fb02ba617fe7f38 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision 886c94611e3a5cc72a9e134a7fb02ba617fe7f38) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -67,6 +67,7 @@ CollectionAssert.AreEqual(foreshoreGeometry, dikeProfile.ForeshoreGeometry); Assert.AreEqual(0.0, dikeProfile.DikeHeight.Value); Assert.AreEqual(2, dikeProfile.DikeHeight.NumberOfDecimalPlaces); + Assert.AreEqual(2, dikeProfile.ForeshoreGeometry.NumberOfDecimalPlaces); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs =================================================================== diff -u -rba00ac482d95f158a6f51caec7b0de3d1e1ecc4c -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision ba00ac482d95f158a6f51caec7b0de3d1e1ecc4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -78,7 +78,7 @@ public void Create_DikeProfileForshoreGeometryNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => GrassCoverErosionInwardsChartDataFactory.Create((Point2D[]) null, "dike profile name"); + TestDelegate call = () => GrassCoverErosionInwardsChartDataFactory.Create((RoundedPoint2DCollection) null, "dike profile name"); // Assert var exception = Assert.Throws(call); @@ -94,7 +94,7 @@ }; // Call - ChartData data = GrassCoverErosionInwardsChartDataFactory.Create(dikeProfile.ForeshoreGeometry.ToArray(), dikeProfile.Name); + ChartData data = GrassCoverErosionInwardsChartDataFactory.Create(dikeProfile.ForeshoreGeometry, dikeProfile.Name); // Assert Assert.IsInstanceOf(data); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u -rba00ac482d95f158a6f51caec7b0de3d1e1ecc4c -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision ba00ac482d95f158a6f51caec7b0de3d1e1ecc4c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -486,8 +486,8 @@ Assert.IsInstanceOf(chartData); ChartLineData foreshoreChartData = (ChartLineData) chartData; - Point2D[] foreshoreGeometry = dikeProfile.ForeshoreGeometry.ToArray(); - Assert.AreEqual(foreshoreGeometry.Length, foreshoreChartData.Points.Count()); + RoundedPoint2DCollection foreshoreGeometry = dikeProfile.ForeshoreGeometry; + Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Count()); CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points); string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs =================================================================== diff -u -re62502b93eb5144e00dcba97a69b6c6088b99656 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision e62502b93eb5144e00dcba97a69b6c6088b99656) +++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/RingtoetsPipingSurfaceLine.cs (.../RingtoetsPipingSurfaceLine.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -246,7 +246,7 @@ /// intersection point at have a significant difference in their y coordinate. /// is not in range of the LZ-projected . /// is empty. - public RoundedDouble GetZAtL(double l) + public double GetZAtL(double l) { ValidateHasPoints(); @@ -267,7 +267,7 @@ if (equalIntersections) { - return new RoundedDouble(2, intersectionPoints.First().Y); + return intersectionPoints.First().Y; } var message = string.Format(Resources.RingtoetsPipingSurfaceLine_Cannot_determine_reliable_z_when_surface_line_is_vertical_in_l, l); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -re62502b93eb5144e00dcba97a69b6c6088b99656 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision e62502b93eb5144e00dcba97a69b6c6088b99656) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -183,7 +183,7 @@ RoundedPoint2DCollection localGeometry = pipingInput.SurfaceLine.ProjectGeometryToLZ(); // Assert - Assert.AreEqual(pipingInput.ExitPointL.NumberOfDecimalPlaces, localGeometry.NumberOfDecimalPlaces); + Assert.AreEqual(localGeometry.NumberOfDecimalPlaces, pipingInput.ExitPointL.NumberOfDecimalPlaces); } [Test] @@ -290,7 +290,7 @@ RoundedPoint2DCollection localGeometry = pipingInput.SurfaceLine.ProjectGeometryToLZ(); // Assert - Assert.AreEqual(pipingInput.EntryPointL.NumberOfDecimalPlaces, localGeometry.NumberOfDecimalPlaces); + Assert.AreEqual(localGeometry.NumberOfDecimalPlaces, pipingInput.EntryPointL.NumberOfDecimalPlaces); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs =================================================================== diff -u -re62502b93eb5144e00dcba97a69b6c6088b99656 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision e62502b93eb5144e00dcba97a69b6c6088b99656) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineTest.cs (.../RingtoetsPipingSurfaceLineTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Base.Storage; using Core.Common.TestUtil; @@ -138,10 +139,11 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - IEnumerable lzCoordinates = surfaceLine.ProjectGeometryToLZ(); + RoundedPoint2DCollection lzCoordinates = surfaceLine.ProjectGeometryToLZ(); // Assert CollectionAssert.IsEmpty(lzCoordinates); + Assert.AreEqual(2, lzCoordinates.NumberOfDecimalPlaces); } [Test] @@ -156,13 +158,14 @@ }); // Call - Point2D[] lzCoordinates = surfaceLine.ProjectGeometryToLZ().ToArray(); + RoundedPoint2DCollection lzCoordinates = surfaceLine.ProjectGeometryToLZ(); // Assert CollectionAssert.AreEqual(new[] { new Point2D(0.0, originalZ) }, lzCoordinates); + Assert.AreEqual(2, lzCoordinates.NumberOfDecimalPlaces); } [Test] @@ -178,7 +181,7 @@ }); // Call - Point2D[] actual = surfaceLine.ProjectGeometryToLZ().ToArray(); + RoundedPoint2DCollection actual = surfaceLine.ProjectGeometryToLZ(); // Assert var length = Math.Sqrt(2*2 + 3*3); @@ -189,8 +192,9 @@ secondCoordinateFactor*length, length }; - CollectionAssert.AreEqual(expectedCoordinatesX, actual.Select(p => p.X).ToArray(), new DoubleWithToleranceComparer(1e-2)); + CollectionAssert.AreEqual(expectedCoordinatesX, actual.Select(p => p.X).ToArray(), new DoubleWithToleranceComparer(Math.Pow(10.0, -actual.NumberOfDecimalPlaces))); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Select(p => p.Y).ToArray()); + Assert.AreEqual(2, actual.NumberOfDecimalPlaces); } [Test] @@ -258,7 +262,7 @@ var result = surfaceLine.GetZAtL(l); // Assert - Assert.AreEqual(testZ, result, 1e-3); + Assert.AreEqual(testZ, result, 1e-2); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r558605d41d8d3a54d2d8b5aee1ace1a36cb64214 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 558605d41d8d3a54d2d8b5aee1ace1a36cb64214) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -222,9 +222,9 @@ { Assert.Fail("Expected value for otherPoint."); } - Assert.AreEqual(point.X, otherPoint.X, 1e-6); - Assert.AreEqual(point.Y, otherPoint.Y, 1e-6); - Assert.AreEqual(point.Z, otherPoint.Z, 1e-6); + Assert.AreEqual(point.X, otherPoint.X, 1e-2); + Assert.AreEqual(point.Y, otherPoint.Y, 1e-2); + Assert.AreEqual(point.Z, otherPoint.Z, 1e-2); } private static void AssertEqualSoilProfiles(PipingSoilProfile pipingProfile, PipingProfile otherPipingProfile) Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs =================================================================== diff -u -r558605d41d8d3a54d2d8b5aee1ace1a36cb64214 -rfa851b16b32a7255c860355147a3ed4deaa10cef --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision 558605d41d8d3a54d2d8b5aee1ace1a36cb64214) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision fa851b16b32a7255c860355147a3ed4deaa10cef) @@ -61,7 +61,7 @@ // Assert var expectedCoordinatesX = surfaceLine.Points.Select(p => p.X - firstX).ToArray(); Assert.AreEqual(name, actual.Name); - CollectionAssert.AreEqual(expectedCoordinatesX, actual.Points.Select(p => p.X).ToArray(), new DoubleWithToleranceComparer(1e-6)); + CollectionAssert.AreEqual(expectedCoordinatesX, actual.Points.Select(p => p.X).ToArray(), new DoubleWithToleranceComparer(1e-2)); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Y).ToArray(), actual.Points.Select(p => p.Y).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Points.Select(p => p.Z).ToArray()); CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Length), actual.Points.Select(p => p.Type));