Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/DuneLocationsReader.cs =================================================================== diff -u -rb9a69e4be3cde5f554041df691cfc55b35f27adb -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/DuneLocationsReader.cs (.../DuneLocationsReader.cs) (revision b9a69e4be3cde5f554041df691cfc55b35f27adb) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/DuneLocationsReader.cs (.../DuneLocationsReader.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -80,7 +80,7 @@ int coastalAreaId = Convert.ToInt32(locationData.MetaData[coastalAreaIdKey]); double offset = Convert.ToDouble(locationData.MetaData[offsetKey]); - yield return new ReadDuneLocation(name, location, coastalAreaId, offset, double.NaN, double.NaN); + yield return new ReadDuneLocation(name, location, coastalAreaId, offset); } } } Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs (.../ReadDuneLocation.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.IO/ReadDuneLocation.cs (.../ReadDuneLocation.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -37,10 +37,8 @@ /// The coordinate of the . /// Coastal area id of the . /// Offset of the . - /// Orientation of the . - /// D50 of the . /// Thrown when is null. - public ReadDuneLocation(string name, Point2D location, int coastalAreaId, double offset, double orientation, double d50) + public ReadDuneLocation(string name, Point2D location, int coastalAreaId, double offset) { if (name == null) { @@ -51,8 +49,6 @@ Location = location; CoastalAreaId = coastalAreaId; Offset = new RoundedDouble(2, offset); - Orientation = new RoundedDouble(1, orientation); - D50 = new RoundedDouble(6, d50); } /// @@ -74,15 +70,5 @@ /// Gets the offset of the dune location. /// public RoundedDouble Offset { get; } - - /// - /// Gets the orientation of the dune location. - /// - public RoundedDouble Orientation { get; } - - /// - /// Gets the D50 of the dune location. - /// - public RoundedDouble D50 { get; } } } \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs =================================================================== diff -u -rf86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2 -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision f86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneErosionDataSynchronizationService.cs (.../DuneErosionDataSynchronizationService.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -87,9 +87,7 @@ new DuneLocation.ConstructionProperties { CoastalAreaId = readDuneLocation.CoastalAreaId, - Offset = readDuneLocation.Offset, - Orientation = readDuneLocation.Orientation, - D50 = readDuneLocation.D50 + Offset = readDuneLocation.Offset }); correspondingDuneLocations.Add(duneLocation); } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationsReaderTest.cs =================================================================== diff -u -rb9a69e4be3cde5f554041df691cfc55b35f27adb -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationsReaderTest.cs (.../DuneLocationsReaderTest.cs) (revision b9a69e4be3cde5f554041df691cfc55b35f27adb) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/DuneLocationsReaderTest.cs (.../DuneLocationsReaderTest.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -45,8 +45,6 @@ Assert.IsNotNull(duneLocation.Location); Assert.AreNotEqual(0, duneLocation.CoastalAreaId); Assert.IsTrue(duneLocation.Offset >= 0); - Assert.IsNaN(duneLocation.Orientation); - Assert.IsNaN(duneLocation.D50); } } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs (.../ReadDuneLocationTest.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.IO.Test/ReadDuneLocationTest.cs (.../ReadDuneLocationTest.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -33,10 +33,10 @@ public void Constructor_NameNull_ThrowArgumentNullException() { // Call - TestDelegate test = () => new ReadDuneLocation(null, new Point2D(0.0, 0.0), 0, 0.0, 0.0, 0.0); + void Call() => new ReadDuneLocation(null, new Point2D(0.0, 0.0), 0, 0.0); // Assert - var exception = Assert.Throws(test); + var exception = Assert.Throws(Call); Assert.AreEqual("name", exception.ParamName); } @@ -48,52 +48,26 @@ var location = new Point2D(10.0, 12.0); const int coastalAreaId = 3; const double offset = 4.29; - const double orientation = 4.2; - const double d50 = 0.123456; // Call - var duneLocation = new ReadDuneLocation(name, location, coastalAreaId, offset, orientation, d50); + var duneLocation = new ReadDuneLocation(name, location, coastalAreaId, offset); // Assert Assert.AreEqual(name, duneLocation.Name); Assert.AreSame(location, duneLocation.Location); Assert.AreEqual(coastalAreaId, duneLocation.CoastalAreaId); Assert.AreEqual(offset, duneLocation.Offset.Value); - Assert.AreEqual(orientation, duneLocation.Orientation.Value); - Assert.AreEqual(d50, duneLocation.D50.Value); } [Test] public void Constructor_WithOffset_OffsetRounded() { // Call - var duneLocation = new ReadDuneLocation("dune", new Point2D(0.0, 0.0), 0, 4.298, 0.0, 0.0); + var duneLocation = new ReadDuneLocation("dune", new Point2D(0.0, 0.0), 0, 4.298); // Assert Assert.AreEqual(2, duneLocation.Offset.NumberOfDecimalPlaces); Assert.AreEqual(4.30, duneLocation.Offset, duneLocation.Offset.GetAccuracy()); } - - [Test] - public void Constructor_WithOrientation_OrientationRounded() - { - // Call - var duneLocation = new ReadDuneLocation("dune", new Point2D(0.0, 0.0), 0, 0.0, 8.214, 0.0); - - // Assert - Assert.AreEqual(1, duneLocation.Orientation.NumberOfDecimalPlaces); - Assert.AreEqual(8.2, duneLocation.Orientation, duneLocation.Orientation.GetAccuracy()); - } - - [Test] - public void Constructor_WithD50_D50Rounded() - { - // Call - var duneLocation = new ReadDuneLocation("dune", new Point2D(0.0, 0.0), 0, 0.0, 0.0, 0.1234567); - - // Assert - Assert.AreEqual(6, duneLocation.D50.NumberOfDecimalPlaces); - Assert.AreEqual(0.123457, duneLocation.D50, duneLocation.D50.GetAccuracy()); - } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs =================================================================== diff -u -rf86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2 -r0f1da42fd70d94dcf45cc9bb94011a98e935283e --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision f86a0fa3e10e4c856ed487aa00c5fe3b22f1bbd2) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneErosionDataSynchronizationServiceTest.cs (.../DuneErosionDataSynchronizationServiceTest.cs) (revision 0f1da42fd70d94dcf45cc9bb94011a98e935283e) @@ -41,11 +41,11 @@ get { yield return new TestCaseData( - new ReadDuneLocation("dune location 1", new Point2D(1.0, 2.0), 0, 0, 0, 0), + new ReadDuneLocation("dune location 1", new Point2D(1.0, 2.0), 0, 0), new HydraulicBoundaryLocation(1, "hydraulic location 1", 2.0, 1.0)).SetName("DifferentCoordinates"); yield return new TestCaseData( - new ReadDuneLocation("dune location 1", new Point2D(1.0, 2.0), 0, 2.2, 0, 0), + new ReadDuneLocation("dune location 1", new Point2D(1.0, 2.0), 0, 2.2), new HydraulicBoundaryLocation(1, "hydraulic_location_1.1", 1.0, 2.0)).SetName("DifferentOffset"); } } @@ -100,7 +100,7 @@ { // Setup var failureMechanism = new DuneErosionFailureMechanism(); - var readDuneLocation = new ReadDuneLocation("dune location 1", new Point2D(1.0, 5.3), 8, 1.1, 2.2, 3.3); + var readDuneLocation = new ReadDuneLocation("dune location 1", new Point2D(1.0, 5.3), 8, 1.1); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Location_2_1.1", 1.0, 5.3); // Precondition @@ -125,8 +125,6 @@ Assert.AreEqual(readDuneLocation.Name, duneLocation.Name); Assert.AreEqual(readDuneLocation.Location, duneLocation.Location); Assert.AreEqual(readDuneLocation.Offset, duneLocation.Offset); - Assert.AreEqual(readDuneLocation.Orientation, duneLocation.Orientation); - Assert.AreEqual(readDuneLocation.D50, duneLocation.D50); } [Test] @@ -141,7 +139,7 @@ var locationName = $"Location_{offset}"; var failureMechanism = new DuneErosionFailureMechanism(); - var readDuneLocation = new ReadDuneLocation("dune location 1", new Point2D(1.0, 5.3), 8, offset, 2.2, 3.3); + var readDuneLocation = new ReadDuneLocation("dune location 1", new Point2D(1.0, 5.3), 8, offset); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 1.0, 5.3); // Precondition