Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r133c79b0999dee3f9c2f02c5382687c0a173d2a4 -rad17f1b8f41d6b4b75c9f39b427dddf31b47cef0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 133c79b0999dee3f9c2f02c5382687c0a173d2a4) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision ad17f1b8f41d6b4b75c9f39b427dddf31b47cef0) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.IO; using Ringtoets.Common.IO.FileImporters; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.IO.Properties; @@ -280,73 +281,18 @@ { var distribution = (LogNormalDistribution) calculation.InputParameters.CriticalFlowRate.Clone(); - if (readCalculation.CriticalFlowRateMean.HasValue) + if (!distribution.TrySetDistributionProperties(readCalculation.CriticalFlowRateMean, + readCalculation.CriticalFlowRateStandardDeviation, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName, + calculation.Name)) { - double criticalFlowRateMean = readCalculation.CriticalFlowRateMean.Value; - - if (!SetMean(distribution, criticalFlowRateMean, calculation.Name)) - { - return false; - } + return false; } - if (readCalculation.CriticalFlowRateStandardDeviation.HasValue) - { - double criticalFlowRateStandardDeviation = readCalculation.CriticalFlowRateStandardDeviation.Value; - if (!SetStandardDeviation(distribution, criticalFlowRateStandardDeviation, calculation.Name)) - { - return false; - } - } - calculation.InputParameters.CriticalFlowRate = distribution; return true; } - private bool SetMean(LogNormalDistribution distribution, double criticalFlowRateMean, string calculationName) - { - try - { - distribution.Mean = (RoundedDouble) criticalFlowRateMean; - } - catch (ArgumentOutOfRangeException e) - { - string errorMessage = string.Format( - Resources.GrassCoverErosionInwardsCalculationConfigurationImporter_ReadCriticalWaveReduction_ReadCriticalWaveReductionMean_0_invalid, - criticalFlowRateMean); - - LogOutOfRangeException( - errorMessage, - calculationName, - e); - - return false; - } - return true; - } - - private bool SetStandardDeviation(LogNormalDistribution distribution, double criticalFlowRateStandardDeviation, string calculationName) - { - try - { - distribution.StandardDeviation = (RoundedDouble) criticalFlowRateStandardDeviation; - } - catch (ArgumentOutOfRangeException e) - { - string errorMessage = string.Format( - Resources.GrassCoverErosionInwardsCalculationConfigurationImporter_ReadCriticalWaveReduction_ReadCriticalWaveReductionStandardDeviation_0_invalid, - criticalFlowRateStandardDeviation); - - LogOutOfRangeException( - errorMessage, - calculationName, - e); - - return false; - } - return true; - } - /// /// Validation to check if the defined wave reduction parameters are valid. ///