Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -r573900f6a5c0131bac790e0a06d038bc2111cb6f -r1dc7aca66fba19cdc15c81d6b5d2d48f2625ebc0 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 573900f6a5c0131bac790e0a06d038bc2111cb6f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 1dc7aca66fba19cdc15c81d6b5d2d48f2625ebc0) @@ -24,6 +24,7 @@ using System.Linq; using Core.Common.Base.Data; using Ringtoets.Common.Service; +using Ringtoets.Common.Service.ValidationRules; using Ringtoets.Piping.Data; using Ringtoets.Piping.KernelWrapper; using Ringtoets.Piping.KernelWrapper.SubCalculator; @@ -153,7 +154,7 @@ { validationResults.AddRange(ValidateAssessmentLevel(inputParameters)); - if (IsInconcreteValue(inputParameters.PiezometricHeadExit)) + if (double.IsNaN(inputParameters.PiezometricHeadExit) || double.IsInfinity(inputParameters.PiezometricHeadExit)) { validationResults.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_PiezometricHeadExit); } @@ -168,11 +169,7 @@ if (inputParameters.UseAssessmentLevelManualInput) { - if (IsInconcreteValue(inputParameters.AssessmentLevel)) - { - validationResult.Add(string.Format(RingtoetsCommonServiceResources.Validation_ValidateInput_No_concrete_value_entered_for_ParameterName_0_, - ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonFormsResources.AssessmentLevel_DisplayName))); - } + validationResult.AddRange(new NumericInputRule(inputParameters.AssessmentLevel, ParameterNameExtractor.GetFromDisplayName(RingtoetsCommonFormsResources.AssessmentLevel_DisplayName)).Validate()); } else { @@ -185,11 +182,6 @@ return validationResult; } - private static bool IsInconcreteValue(RoundedDouble parameter) - { - return double.IsNaN(parameter) || double.IsInfinity(parameter); - } - private static IEnumerable ValidateCoreSurfaceLineAndSoilProfileProperties(PipingInput inputParameters) { var validationResults = new List();