Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -rd1d2891c5ef9ceabd6b9b19b12b292d11aad041e -r3e2b23a30146a72cc9a7c4d58f87699a6c67a60b --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision d1d2891c5ef9ceabd6b9b19b12b292d11aad041e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 3e2b23a30146a72cc9a7c4d58f87699a6c67a60b) @@ -517,7 +517,44 @@ } else { - IEnumerable validationRules = GetValidationRules(inputParameters, validationResults); + IEnumerable validationRules; + switch (inputParameters.InflowModelType) + { + case StabilityPointStructureInflowModelType.LowSill: + switch (inputParameters.LoadSchematizationType) + { + case LoadSchematizationType.Linear: + validationRules = GetLowSillLinearValidationRules(inputParameters); + break; + case LoadSchematizationType.Quadratic: + validationRules = GetLowSillQuadraticValidationRules(inputParameters); + break; + default: + validationResults.Add(Resources.StabilityPointStructuresCalculationService_ValidateInput_No_LoadSchematizationType_selected); + validationRules = Enumerable.Empty(); + break; + } + break; + case StabilityPointStructureInflowModelType.FloodedCulvert: + switch (inputParameters.LoadSchematizationType) + { + case LoadSchematizationType.Linear: + validationRules = GetFloodedCulvertLinearValidationRules(inputParameters); + break; + case LoadSchematizationType.Quadratic: + validationRules = GetFloodedCulvertQuadraticValidationRules(inputParameters); + break; + default: + validationResults.Add(Resources.StabilityPointStructuresCalculationService_ValidateInput_No_LoadSchematizationType_selected); + validationRules = Enumerable.Empty(); + break; + } + break; + default: + throw new InvalidEnumArgumentException("inputParameters", + (int) inputParameters.InflowModelType, + typeof(StabilityPointStructureInflowModelType)); + } foreach (var validationRule in validationRules) { @@ -527,49 +564,6 @@ return validationResults.ToArray(); } - private static IEnumerable GetValidationRules(StabilityPointStructuresInput inputParameters, List validationResults) - { - IEnumerable validationRules; - switch (inputParameters.InflowModelType) - { - case StabilityPointStructureInflowModelType.LowSill: - switch (inputParameters.LoadSchematizationType) - { - case LoadSchematizationType.Linear: - validationRules = GetLowSillLinearValidationRules(inputParameters); - break; - case LoadSchematizationType.Quadratic: - validationRules = GetLowSillQuadraticValidationRules(inputParameters); - break; - default: - validationResults.Add(Resources.StabilityPointStructuresCalculationService_ValidateInput_No_LoadSchematizationType_selected); - validationRules = Enumerable.Empty(); - break; - } - break; - case StabilityPointStructureInflowModelType.FloodedCulvert: - switch (inputParameters.LoadSchematizationType) - { - case LoadSchematizationType.Linear: - validationRules = GetFloodedCulvertLinearValidationRules(inputParameters); - break; - case LoadSchematizationType.Quadratic: - validationRules = GetFloodedCulvertQuadraticValidationRules(inputParameters); - break; - default: - validationResults.Add(Resources.StabilityPointStructuresCalculationService_ValidateInput_No_LoadSchematizationType_selected); - validationRules = Enumerable.Empty(); - break; - } - break; - default: - throw new InvalidEnumArgumentException("inputParameters", - (int) inputParameters.InflowModelType, - typeof(StabilityPointStructureInflowModelType)); - } - return validationRules; - } - private static ValidationRule[] GetLowSillLinearValidationRules(StabilityPointStructuresInput input) { return new ValidationRule[]