Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs
===================================================================
diff -u -rbc5e613a18bbcf1309b2b54ab2de35e5d03ca960 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs (.../WaveConditionsService.cs) (revision bc5e613a18bbcf1309b2b54ab2de35e5d03ca960)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs (.../WaveConditionsService.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -22,6 +22,7 @@
using System;
using Core.Common.Utils;
using Ringtoets.Common.Service;
+using Ringtoets.HydraRing.Data;
using Ringtoets.Revetment.Data;
namespace Ringtoets.Revetment.Service
@@ -42,8 +43,6 @@
/// The target norm to calculate for.
/// The calculated reliability.
/// The calculated .
- /// Thrown when the target probability or
- /// calculated probability lies outside [0, 1] and is not .
public static WaveConditionsOutput Calculate(double waterLevel, double waveHeight, double wavePeakPeriod,
double waveAngle, double waveDirection,
double norm, double calculatedReliability)
@@ -53,11 +52,10 @@
double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculatedReliability);
+ CalculationConvergence convergence = RingtoetsCommonDataCalculationService.CalculationConverged(calculatedReliability, norm);
+
return new WaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection, targetProbability,
- targetReliability, calculatedProbability, calculatedReliability)
- {
- CalculationConvergence = RingtoetsCommonDataCalculationService.CalculationConverged(calculatedReliability, norm)
- };
+ targetReliability, calculatedProbability, calculatedReliability, convergence);
}
}
}
\ No newline at end of file