Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r91357549bf6b91dbd7bdea07ec5ca6059527254c --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs (.../AggregatedDuneLocationFactory.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs (.../AggregatedDuneLocationFactory.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) @@ -71,6 +71,15 @@ .ToArray(), calculationsForLocation.Select(c => new Tuple( c.Item1, GetWavePeriod(c.Item2))) + .ToArray(), + calculationsForLocation.Select(c => new Tuple( + c.Item1, GetMeanTidalAmplitude(c.Item2))) + .ToArray(), + calculationsForLocation.Select(c => new Tuple( + c.Item1, GetWaveDirectionalSpread(c.Item2))) + .ToArray(), + calculationsForLocation.Select(c => new Tuple( + c.Item1, GetTideSurgePhaseDifference(c.Item2))) .ToArray()); }) .ToArray(); @@ -90,5 +99,20 @@ { return calculation.Output?.WavePeriod ?? RoundedDouble.NaN; } + + private static RoundedDouble GetMeanTidalAmplitude(DuneLocationCalculation calculation) + { + return calculation.Output?.MeanTidalAmplitude ?? RoundedDouble.NaN; + } + + private static RoundedDouble GetWaveDirectionalSpread(DuneLocationCalculation calculation) + { + return calculation.Output?.WaveDirectionalSpread ?? RoundedDouble.NaN; + } + + private static RoundedDouble GetTideSurgePhaseDifference(DuneLocationCalculation calculation) + { + return calculation.Output?.TideSurgePhaseDifference ?? RoundedDouble.NaN; + } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r91357549bf6b91dbd7bdea07ec5ca6059527254c --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/DuneLocationsTestHelper.cs (.../DuneLocationsTestHelper.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) @@ -97,9 +97,8 @@ { foreach (DuneLocationCalculation duneLocationCalculation in calculations) { - duneLocationCalculation.Output = new TestDuneLocationCalculationOutput(random.NextDouble(), - random.NextDouble(), - random.NextDouble()); + duneLocationCalculation.Output = new TestDuneLocationCalculationOutput(random.NextDouble(),random.NextDouble(),random.NextDouble(), + random.NextDouble(),random.NextDouble(), random.NextDouble()); } } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r91357549bf6b91dbd7bdea07ec5ca6059527254c --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs (.../TestDuneLocationCalculationOutput.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.TestUtil/TestDuneLocationCalculationOutput.cs (.../TestDuneLocationCalculationOutput.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) @@ -33,20 +33,28 @@ /// Creates a new instance of . /// public TestDuneLocationCalculationOutput() - : this(0, 0, 0) {} + : this(0, 0, 0, 0, 0, 0) {} /// /// Creates a new instance of . /// /// The water level of the calculation. /// The wave height of the calculation. /// The wave period of the calculation. - public TestDuneLocationCalculationOutput(double waterLevel, double waveHeight, double wavePeriod) + /// The mean tidal amplitude of the calculation. + /// The wave directional spread of the calculation. + /// The tide surge phase difference of the calculation. + public TestDuneLocationCalculationOutput( + double waterLevel, double waveHeight, double wavePeriod, + double meanTidalAmplitude, double waveDirectionalSpread, double tideSurgePhaseDifference) : base(CalculationConvergence.CalculatedConverged, new ConstructionProperties { WaterLevel = waterLevel, WavePeriod = wavePeriod, WaveHeight = waveHeight, + MeanTidalAmplitude = meanTidalAmplitude, + WaveDirectionalSpread = waveDirectionalSpread, + TideSurgePhaseDifference = tideSurgePhaseDifference, TargetProbability = 0, CalculatedReliability = 0, TargetReliability = 0, Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs =================================================================== diff -u -r1c207aa5e5e0b61746ecae385b29235d553f00fc -r91357549bf6b91dbd7bdea07ec5ca6059527254c --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision 1c207aa5e5e0b61746ecae385b29235d553f00fc) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs (.../AggregatedDuneLocationFactoryTest.cs) (revision 91357549bf6b91dbd7bdea07ec5ca6059527254c) @@ -76,11 +76,13 @@ { new DuneLocationCalculation(duneLocations[0]) { - Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble()) + Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), random.NextDouble()) }, new DuneLocationCalculation(duneLocations[1]) { - Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble()) + Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), random.NextDouble()) } } }, @@ -90,7 +92,8 @@ { new DuneLocationCalculation(duneLocations[0]) { - Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble()) + Output = new TestDuneLocationCalculationOutput(random.NextDouble(), random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), random.NextDouble()) }, new DuneLocationCalculation(duneLocations[1]) } @@ -120,11 +123,17 @@ Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.WaterLevelCalculationsForTargetProbabilities.ElementAt(j).Item1); Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.WaveHeightCalculationsForTargetProbabilities.ElementAt(j).Item1); Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.WavePeriodCalculationsForTargetProbabilities.ElementAt(j).Item1); + Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.MeanTidalAmplitudeCalculationsForTargetProbabilities.ElementAt(j).Item1); + Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.WaveDirectionalSpreadCalculationsForTargetProbabilities.ElementAt(j).Item1); + Assert.AreEqual(targetProbabilities[j].TargetProbability, aggregatedLocation.TideSurgePhaseDifferenceCalculationsForTargetProbabilities.ElementAt(j).Item1); DuneLocationCalculationOutput output = GetOutput(targetProbabilities[j].DuneLocationCalculations, duneLocations[i]); Assert.AreEqual(output?.WaterLevel ?? RoundedDouble.NaN, aggregatedLocation.WaterLevelCalculationsForTargetProbabilities.ElementAt(j).Item2); Assert.AreEqual(output?.WaveHeight ?? RoundedDouble.NaN, aggregatedLocation.WaveHeightCalculationsForTargetProbabilities.ElementAt(j).Item2); Assert.AreEqual(output?.WavePeriod ?? RoundedDouble.NaN, aggregatedLocation.WavePeriodCalculationsForTargetProbabilities.ElementAt(j).Item2); + Assert.AreEqual(output?.MeanTidalAmplitude ?? RoundedDouble.NaN, aggregatedLocation.MeanTidalAmplitudeCalculationsForTargetProbabilities.ElementAt(j).Item2); + Assert.AreEqual(output?.WaveDirectionalSpread ?? RoundedDouble.NaN, aggregatedLocation.WaveDirectionalSpreadCalculationsForTargetProbabilities.ElementAt(j).Item2); + Assert.AreEqual(output?.TideSurgePhaseDifference ?? RoundedDouble.NaN, aggregatedLocation.TideSurgePhaseDifferenceCalculationsForTargetProbabilities.ElementAt(j).Item2); } } }