Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r512177cc50d892bede45024499342a94ae867cfb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) @@ -151,7 +151,27 @@ { get { - return GetVariables(); + yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, + double.NaN); + yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, + double.NaN); + yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, + HydraRingDeviationType.Standard, criticalOvertoppingMean, + criticalOvertoppingStandardDeviation, double.NaN); + yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, modelFactorFrunupMean, + modelFactorFrunupStandardDeviation, double.NaN); + yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, + HydraRingDeviationType.Standard, exponentModelFactorShallowMean, + exponentModelFactorShallowStandardDeviation, double.NaN); } } @@ -167,30 +187,5 @@ return null; } } - - private IEnumerable GetVariables() - { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, modelFactorCriticalOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation, - double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation, - double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, modelFactorOvertopping, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, criticalOvertoppingMean, - criticalOvertoppingStandardDeviation, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorFrunupMean, - modelFactorFrunupStandardDeviation, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, exponentModelFactorShallowMean, - exponentModelFactorShallowStandardDeviation, double.NaN); - } } } \ No newline at end of file