Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs =================================================================== diff -u -rea797223dd831d567cbb669bb80f61c276e0b566 -r18e230605af8cda1d527525691b2ba9597bf1464 --- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs (.../RingtoetsCommonDataCalculationService.cs) (revision ea797223dd831d567cbb669bb80f61c276e0b566) +++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs (.../RingtoetsCommonDataCalculationService.cs) (revision 18e230605af8cda1d527525691b2ba9597bf1464) @@ -20,6 +20,9 @@ // All rights reserved. using System; +using System.Globalization; +using Core.Common.Base; +using Core.Common.Base.Data; using Core.Common.Utils; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Service.Properties; @@ -31,6 +34,9 @@ /// public static class RingtoetsCommonDataCalculationService { + private static readonly Range normValidityRange = new Range(0, 1); + private static readonly Range contributionValidityRange = new Range(0, 100); + /// /// Determines whether the calculated output is converged, /// based on the and the . @@ -62,16 +68,19 @@ /// public static double ProfileSpecificRequiredProbability(double norm, double failureMechanismContribution, int n) { - if (double.IsNaN(norm) || norm < 0.0 || norm > 1.0) + if (!normValidityRange.InRange(norm)) { - throw new ArgumentOutOfRangeException(nameof(norm), norm, - Resources.RingtoetsCommonDataCalculationService_ProfileSpecificRequiredProbability_Norm_must_be_in_interval_0_1); + string message = string.Format(Resources.RingtoetsCommonDataCalculationService_ProfileSpecificRequiredProbability_Norm_must_be_in_Range_0_, + normValidityRange.ToString(FormattableConstants.ShowAtLeastOneDecimal, CultureInfo.CurrentCulture)); + throw new ArgumentOutOfRangeException(nameof(norm), norm, message); } - if (double.IsNaN(failureMechanismContribution) || failureMechanismContribution < 0 || failureMechanismContribution > 100) + if (!contributionValidityRange.InRange(failureMechanismContribution)) { + string message = string.Format(Resources.RingtoetsCommonDataCalculationService_ProfileSpecificRequiredProbability_Contribution_must_be_in_Range_0_, + contributionValidityRange.ToString(FormattableConstants.ShowAtLeastOneDecimal, CultureInfo.CurrentCulture)); throw new ArgumentOutOfRangeException(nameof(failureMechanismContribution), failureMechanismContribution, - Resources.RingtoetsCommonDataCalculationService_ProfileSpecificRequiredProbability_Contribution_must_be_in_interval_0_100); + message); } if (n <= 0)