Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs =================================================================== diff -u -rc51034a5f036c03b70e9c9a8a50b18575e686277 -ref75a2d8ecfda6d981fc26de5425ac5744359a45 --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs (.../HydraulicBoundaryLocationOutput.cs) (revision c51034a5f036c03b70e9c9a8a50b18575e686277) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs (.../HydraulicBoundaryLocationOutput.cs) (revision ef75a2d8ecfda6d981fc26de5425ac5744359a45) @@ -21,6 +21,7 @@ using System; using Core.Common.Base.Data; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; using Ringtoets.Common.Data.Probability; namespace Ringtoets.Common.Data.Hydraulics @@ -44,6 +45,27 @@ public HydraulicBoundaryLocationOutput(double result, double targetProbability, double targetReliability, double calculatedProbability, double calculatedReliability, CalculationConvergence calculationConvergence) + : this(result, targetProbability, targetReliability, calculatedProbability, calculatedReliability, calculationConvergence, null) {} + + /// + /// Creates a new instance of . + /// + /// The calculation result. + /// The norm used during the calculation. + /// The reliability index used during the calculation. + /// the calculated probability. + /// The calculated reliability. + /// The convergence status of the calculation. + /// The general illustration point result. + /// Thrown when + /// or falls outside the [0.0, 1.0] range and is not . + public HydraulicBoundaryLocationOutput(double result, + double targetProbability, + double targetReliability, + double calculatedProbability, + double calculatedReliability, + CalculationConvergence calculationConvergence, + GeneralResult generalResult) { ProbabilityHelper.ValidateProbability(targetProbability, nameof(targetProbability), true); ProbabilityHelper.ValidateProbability(calculatedProbability, nameof(calculatedProbability), true); @@ -55,7 +77,7 @@ CalculatedProbability = calculatedProbability; CalculatedReliability = new RoundedDouble(5, calculatedReliability); CalculationConvergence = calculationConvergence; - HasIllustrationPoints = false; + GeneralResult = generalResult; } /// @@ -94,8 +116,19 @@ public CalculationConvergence CalculationConvergence { get; } /// + /// Gets the general illustration points result. + /// + public GeneralResult GeneralResult { get; } + + /// /// Gets if the output contains illustration points. /// - public bool HasIllustrationPoints { get; } + public bool HasIllustrationPoints + { + get + { + return GeneralResult != null; + } + } } } \ No newline at end of file