Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/AggregatedDuneLocation.cs =================================================================== diff -u -r131748c042f125579102df4dae69838503c1ed6f -rcd3083fd075e017ee0ed87cbb22c463c087e965b --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/AggregatedDuneLocation.cs (.../AggregatedDuneLocation.cs) (revision 131748c042f125579102df4dae69838503c1ed6f) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/AggregatedDuneLocation.cs (.../AggregatedDuneLocation.cs) (revision cd3083fd075e017ee0ed87cbb22c463c087e965b) @@ -39,27 +39,26 @@ /// The location of the dune location /// The coastal area id of the dune location. /// The offset of the dune location. - /// The d50 of the dune location. /// The results of the - /// water level calculations for different target probabilities. + /// water level calculations for different target probabilities. /// The results of the - /// wave height calculations for different target probabilities. + /// wave height calculations for different target probabilities. /// The results of the - /// wave period calculations for different target probabilities. + /// wave period calculations for different target probabilities. /// The results of the - /// mean tide calculations for different target probabilities. + /// mean tide calculations for different target probabilities. /// The results of the - /// wave directional spread calculations for different target probabilities. + /// wave directional spread calculations for different target probabilities. /// The results of the - /// tide surge phase difference calculations for different target probabilities. + /// tide surge phase difference calculations for different target probabilities. /// Thrown when , /// , , /// , /// , /// , /// or /// is null. - public AggregatedDuneLocation(long id, string name, Point2D location, int coastalAreaId, RoundedDouble offset, RoundedDouble d50, + public AggregatedDuneLocation(long id, string name, Point2D location, int coastalAreaId, RoundedDouble offset, IEnumerable> waterLevelCalculationsForTargetProbabilities, IEnumerable> waveHeightCalculationsForTargetProbabilities, IEnumerable> wavePeriodCalculationsForTargetProbabilities, @@ -112,7 +111,6 @@ Location = location; CoastalAreaId = coastalAreaId; Offset = offset; - D50 = d50; WaterLevelCalculationsForTargetProbabilities = waterLevelCalculationsForTargetProbabilities; WaveHeightCalculationsForTargetProbabilities = waveHeightCalculationsForTargetProbabilities; WavePeriodCalculationsForTargetProbabilities = wavePeriodCalculationsForTargetProbabilities; @@ -147,11 +145,6 @@ public RoundedDouble Offset { get; } /// - /// Gets the d50 of the dune location. - /// - public RoundedDouble D50 { get; } - - /// /// Gets the results of the water level calculations for different target probabilities. /// public IEnumerable> WaterLevelCalculationsForTargetProbabilities { get; } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/AggregatedDuneLocationTest.cs =================================================================== diff -u -r131748c042f125579102df4dae69838503c1ed6f -rcd3083fd075e017ee0ed87cbb22c463c087e965b --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/AggregatedDuneLocationTest.cs (.../AggregatedDuneLocationTest.cs) (revision 131748c042f125579102df4dae69838503c1ed6f) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/AggregatedDuneLocationTest.cs (.../AggregatedDuneLocationTest.cs) (revision cd3083fd075e017ee0ed87cbb22c463c087e965b) @@ -37,7 +37,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, null, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -55,7 +55,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, null, 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -73,7 +73,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, null, + RoundedDouble.NaN, null, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -90,7 +90,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), null, Array.Empty>(), @@ -108,7 +108,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), null, @@ -126,7 +126,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -144,7 +144,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -162,7 +162,7 @@ { // Call void Call() => new AggregatedDuneLocation(0, string.Empty, new Point2D(0, 0), 0, - RoundedDouble.NaN, RoundedDouble.NaN, + RoundedDouble.NaN, Array.Empty>(), Array.Empty>(), Array.Empty>(), @@ -186,7 +186,6 @@ var location = new Point2D(random.NextDouble(), random.NextDouble()); int coastalAreaId = random.Next(); RoundedDouble offset = random.NextRoundedDouble(); - RoundedDouble d50 = random.NextRoundedDouble(); var waterLevelCalculationsForTargetProbabilities = new List>(); var waveHeightCalculationsForTargetProbabilities = new List>(); @@ -196,7 +195,7 @@ var tideSurgePhaseDifferenceCalculationsForTargetProbabilities = new List>(); // Call - var aggregatedDuneLocation = new AggregatedDuneLocation(id, name, location, coastalAreaId, offset, d50, + var aggregatedDuneLocation = new AggregatedDuneLocation(id, name, location, coastalAreaId, offset, waterLevelCalculationsForTargetProbabilities, waveHeightCalculationsForTargetProbabilities, wavePeriodCalculationsForTargetProbabilities, @@ -210,7 +209,6 @@ Assert.AreSame(location, aggregatedDuneLocation.Location); Assert.AreEqual(coastalAreaId, aggregatedDuneLocation.CoastalAreaId); Assert.AreEqual(offset, aggregatedDuneLocation.Offset); - Assert.AreEqual(d50, aggregatedDuneLocation.D50); Assert.AreSame(waterLevelCalculationsForTargetProbabilities, aggregatedDuneLocation.WaterLevelCalculationsForTargetProbabilities); Assert.AreSame(waveHeightCalculationsForTargetProbabilities, aggregatedDuneLocation.WaveHeightCalculationsForTargetProbabilities); Assert.AreSame(wavePeriodCalculationsForTargetProbabilities, aggregatedDuneLocation.WavePeriodCalculationsForTargetProbabilities);