Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -98,6 +98,17 @@ } /// + /// Gets the variables to use during the calculation. + /// + public virtual IEnumerable NewVariables + { + get + { + yield break; + } + } + + /// /// Gets the profile points to use during the calculation. /// public virtual IEnumerable ProfilePoints Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -66,12 +66,11 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(26, 0); } } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -90,24 +90,24 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0.0, - 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 DeterministicHydraRingVariable(1, 0.0); + yield return new LogNormalHydraRingVariable(17, + HydraRingDeviationType.Standard, + criticalOvertoppingMean, + criticalOvertoppingStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -132,26 +132,16 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - 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(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); + yield return new DeterministicHydraRingVariable(8, modelFactorCriticalOvertopping); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation); + yield return new DeterministicHydraRingVariable(12, modelFactorOvertopping); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, modelFactorFrunupMean, modelFactorFrunupStandardDeviation); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -28,7 +28,8 @@ /// /// Container for all data necessary for performing an overtopping rate calculation via Hydra-Ring. /// - public class OvertoppingRateCalculationInput : HydraulicLoadsCalculationInput + public class + OvertoppingRateCalculationInput : HydraulicLoadsCalculationInput { private readonly double dikeHeight; @@ -87,23 +88,21 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.Deterministic, 0.0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(1, dikeHeight); + yield return new DeterministicHydraRingVariable(17, 0.0); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -66,12 +66,11 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(28, HydraRingDistributionType.Deterministic, 0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(28, 0); } } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -124,31 +124,18 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, dikeHeight, - 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); + yield return new DeterministicHydraRingVariable(1, dikeHeight); + yield return new DeterministicHydraRingVariable(8, modelFactorCriticalOvertopping); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, factorFbMean, factorFbStandardDeviation); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, factorFnMean, factorFnStandardDeviation); + yield return new DeterministicHydraRingVariable(12, modelFactorOvertopping); + yield return new LogNormalHydraRingVariable(17, HydraRingDeviationType.Standard, criticalOvertoppingMean, criticalOvertoppingStandardDeviation); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, modelFactorFrunupMean, modelFactorFrunupStandardDeviation); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -147,44 +147,24 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, failureProbabilityOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, failureProbabilityReparation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalApertures, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, - allowedLevelIncreaseStorageStandardDeviation, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, - modelFactorStorageVolumeStandardDeviation, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, storageStructureAreaMean, - storageStructureAreaVariation, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, - flowWidthAtBottomProtectionStandardDeviation, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, - criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stormDurationMean, - stormDurationVariation, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, probabilityOpenStructureBeforeFlooding, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(58, gravitationalAcceleration); + yield return new DeterministicHydraRingVariable(63, factorStormDurationOpenStructure); + yield return new DeterministicHydraRingVariable(68, failureProbabilityOpenStructure); + yield return new DeterministicHydraRingVariable(69, failureProbabilityReparation); + yield return new DeterministicHydraRingVariable(71, identicalApertures); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, storageStructureAreaMean, storageStructureAreaVariation); + yield return new DeterministicHydraRingVariable(97, modelFactorInflowVolume); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation); + yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation); + yield return new DeterministicHydraRingVariable(129, probabilityOpenStructureBeforeFlooding); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -114,11 +114,11 @@ this.insideWaterLevelStandardDeviation = insideWaterLevelStandardDeviation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -138,17 +138,11 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, drainCoefficientMean, - drainCoefficientStandardDeviation, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, areaFlowAperturesMean, - areaFlowAperturesStandardDeviation, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelMean, - insideWaterLevelStandardDeviation, double.NaN); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -128,11 +128,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -152,23 +152,13 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, - modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, - modelFactorSubCriticalFlowVariation, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, - thresholdHeightOpenWeirStandardDeviation, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelMean, - insideWaterLevelStandardDeviation, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, widthFlowAperturesMean, - widthFlowAperturesVariation, double.NaN); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -129,11 +129,11 @@ this.deviationWaveDirection = deviationWaveDirection; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -153,24 +153,14 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, - modelFactorOvertoppingFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, - modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(72, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, levelCrestStructureNotClosingMean, - levelCrestStructureNotClosingStandardDeviation, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, widthFlowAperturesMean, - widthFlowAperturesVariation, double.NaN); - yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, deviationWaveDirection, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation); + yield return new DeterministicHydraRingVariable(61, structureNormalOrientation); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); + yield return new NormalHydraRingVariable(72, HydraRingDeviationType.Standard, levelCrestStructureNotClosingMean, levelCrestStructureNotClosingStandardDeviation); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation); + yield return new DeterministicHydraRingVariable(107, deviationWaveDirection); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -163,50 +163,25 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, - modelFactorOvertoppingFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, levelCrestStructureMean, - levelCrestStructureStandardDeviation, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, - modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, - allowedLevelIncreaseStorageStandardDeviation, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, - modelFactorStorageVolumeStandardDeviation, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, storageStructureAreaMean, - storageStructureAreaVariation, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, - flowWidthAtBottomProtectionStandardDeviation, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, - criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, widthFlowAperturesMean, - widthFlowAperturesVariation, double.NaN); - yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, deviationWaveDirection, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stormDurationMean, - stormDurationVariation, double.NaN); + yield return new DeterministicHydraRingVariable(58, gravitationalAcceleration); + yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, levelCrestStructureMean, levelCrestStructureStandardDeviation); + yield return new DeterministicHydraRingVariable(61, structureNormalOrientation); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, storageStructureAreaMean, storageStructureAreaVariation); + yield return new DeterministicHydraRingVariable(97, modelFactorInflowVolume); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation); + yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation); + yield return new DeterministicHydraRingVariable(107, deviationWaveDirection); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -258,93 +258,42 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, volumicWeightWater, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, gravitationalAcceleration, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, levelCrestStructureMean, - levelCrestStructureStandardDeviation, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, structureNormalOrientation, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, - modelFactorSubCriticalFlowVariation, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, - thresholdHeightOpenWeirStandardDeviation, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelFailureConstructionMean, - insideWaterLevelFailureConstructionStandardDeviation, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, failureProbabilityRepairClosure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, failureCollisionEnergyMean, - failureCollisionEnergyVariation, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, modelFactorCollisionLoadMean, - modelFactorCollisionLoadVariation, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, shipMassMean, - shipMassVariation, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, shipVelocityMean, - shipVelocityVariation, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, levellingCount, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, probabilityCollisionSecondaryStructure, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, - flowVelocityStructureClosableStandardDeviation, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, insideWaterLevelMean, - insideWaterLevelStandardDeviation, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, - allowedLevelIncreaseStorageStandardDeviation, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, - modelFactorStorageVolumeStandardDeviation, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, storageStructureAreaMean, - storageStructureAreaVariation, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, modelFactorInflowVolume, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, - flowWidthAtBottomProtectionStandardDeviation, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, - criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stormDurationMean, - stormDurationVariation, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, bankWidthMean, - bankWidthStandardDeviation, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, evaluationLevel, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorLoadEffectMean, - modelFactorLoadEffectStandardDeviation, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, - HydraRingDeviationType.Standard, waveRatioMaxHStandardDeviation, - waveRatioMaxHN, double.NaN); // Note: Pass the N as "variability" and the standard deviation as "mean" - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, verticalDistance, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, modificationFactorWavesSlowlyVaryingPressureComponent, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, modificationFactorDynamicOrImpulsivePressureComponent, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, volumicWeightWater); + yield return new DeterministicHydraRingVariable(58, gravitationalAcceleration); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, levelCrestStructureMean, levelCrestStructureStandardDeviation); + yield return new DeterministicHydraRingVariable(61, structureNormalOrientation); + yield return new DeterministicHydraRingVariable(63, factorStormDurationOpenStructure); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, insideWaterLevelFailureConstructionMean, insideWaterLevelFailureConstructionStandardDeviation); + yield return new DeterministicHydraRingVariable(85, failureProbabilityRepairClosure); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, failureCollisionEnergyMean, failureCollisionEnergyVariation); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, modelFactorCollisionLoadMean, modelFactorCollisionLoadVariation); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, shipMassMean, shipMassVariation); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, shipVelocityMean, shipVelocityVariation); + yield return new DeterministicHydraRingVariable(90, levellingCount); + yield return new DeterministicHydraRingVariable(91, probabilityCollisionSecondaryStructure); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, flowVelocityStructureClosableStandardDeviation); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, storageStructureAreaMean, storageStructureAreaVariation); + yield return new DeterministicHydraRingVariable(97, modelFactorInflowVolume); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation); + yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, bankWidthMean, bankWidthStandardDeviation); + yield return new DeterministicHydraRingVariable(131, evaluationLevel); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, waveRatioMaxHStandardDeviation, waveRatioMaxHN); // Note: Pass the N as "variability" and the standard deviation as "mean" + yield return new DeterministicHydraRingVariable(134, verticalDistance); + yield return new DeterministicHydraRingVariable(135, modificationFactorWavesSlowlyVaryingPressureComponent); + yield return new DeterministicHydraRingVariable(136, modificationFactorDynamicOrImpulsivePressureComponent); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -188,11 +188,11 @@ this.stabilityLinearLoadModelVariation = stabilityLinearLoadModelVariation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,20 +216,12 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, drainCoefficientMean, - drainCoefficientStandardDeviation, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, areaFlowAperturesMean, - areaFlowAperturesStandardDeviation, double.NaN); - yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, - constructiveStrengthLinearLoadModelVariation, double.NaN); - yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, - stabilityLinearLoadModelVariation, double.NaN); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); + yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); + yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -188,11 +188,11 @@ this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,20 +216,12 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, drainCoefficientMean, - drainCoefficientStandardDeviation, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Standard, areaFlowAperturesMean, - areaFlowAperturesStandardDeviation, double.NaN); - yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, - constructiveStrengthQuadraticLoadModelVariation, double.NaN); - yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, - stabilityQuadraticLoadModelVariation, double.NaN); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); + yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); + yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -188,11 +188,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,20 +216,12 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, - modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, - constructiveStrengthLinearLoadModelVariation, double.NaN); - yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, - stabilityLinearLoadModelVariation, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, widthFlowAperturesMean, - widthFlowAperturesVariation, double.NaN); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); + yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); + yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -rd49770201655964042adccca08d2e9fb2217723d -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision d49770201655964042adccca08d2e9fb2217723d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -188,11 +188,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,20 +216,12 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, - modelFactorSuperCriticalFlowStandardDeviation, double.NaN); - yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, - constructiveStrengthQuadraticLoadModelVariation, double.NaN); - yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, - HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, - stabilityQuadraticLoadModelVariation, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, - HydraRingDeviationType.Variation, widthFlowAperturesMean, - widthFlowAperturesVariation, double.NaN); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); + yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); + yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -102,18 +102,14 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(113, waterLevel); + yield return new DeterministicHydraRingVariable(114, 1.0); + yield return new DeterministicHydraRingVariable(115, a); + yield return new DeterministicHydraRingVariable(116, b); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -67,14 +67,13 @@ this.c = c; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); - variables.Add(new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); + variables.Add(new DeterministicHydraRingVariable(119, c)); return variables; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -71,16 +71,14 @@ this.beta2 = beta2; } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - var variables = base.Variables.ToList(); + var variables = base.NewVariables.ToList(); - variables.Add(new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); - variables.Add(new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2, - HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); + variables.Add(new DeterministicHydraRingVariable(117, beta1)); + variables.Add(new DeterministicHydraRingVariable(118, beta2)); return variables; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 9fb229f4fc4fe2c11e79e344c76ceb220f2dc96a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -405,7 +405,7 @@ { FailureMechanismDefaults failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType); - foreach (HydraRingVariable hydraRingVariable in hydraRingCalculationInput.Variables) + foreach (HydraRingVariable2 hydraRingVariable in hydraRingCalculationInput.NewVariables) { var variableDefaults = variableDefaultsProvider.GetVariableDefaults(hydraRingCalculationInput.FailureMechanismType, hydraRingVariable.VariableId); @@ -433,32 +433,22 @@ "DistributionType", (int?) hydraRingVariable.DistributionType }, { - "Parameter1", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic - ? GetHydraRingValue(hydraRingVariable.Mean) - : defaultHydraRingValue + "Parameter1", hydraRingVariable.Parameter1 }, { - "Parameter2", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic && - hydraRingVariable.DeviationType == HydraRingDeviationType.Standard - ? GetHydraRingNullableValue(hydraRingVariable.Variability) - : defaultHydraRingNullValue + "Parameter2", hydraRingVariable.Parameter2 }, { - "Parameter3", hydraRingVariable.DistributionType == HydraRingDistributionType.LogNormal - ? GetHydraRingNullableValue(hydraRingVariable.Shift) - : defaultHydraRingNullValue + "Parameter3", hydraRingVariable.Parameter3 }, { - "Parameter4", defaultHydraRingNullValue // Fixed: Not relevant + "Parameter4", hydraRingVariable.Parameter4 }, { "DeviationType", (int?) hydraRingVariable.DeviationType }, { - "CoefficientOfVariation", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic && - hydraRingVariable.DeviationType == HydraRingDeviationType.Variation - ? GetHydraRingValue(hydraRingVariable.Variability) - : defaultHydraRingValue + "CoefficientOfVariation", hydraRingVariable.CoefficientOfVariation }, { "CorrelationLength", GetHydraRingValue(variableDefaults.CorrelationLength) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; using Core.Common.Utils; using NUnit.Framework; @@ -50,7 +51,6 @@ Assert.AreEqual(26, assessmentLevelCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, assessmentLevelCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(assessmentLevelCalculationInput.Section); - Assert.AreEqual(1, assessmentLevelCalculationInput.Variables.Count()); CollectionAssert.IsEmpty(assessmentLevelCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(assessmentLevelCalculationInput.ForelandsPoints); Assert.IsNull(assessmentLevelCalculationInput.BreakWater); @@ -61,14 +61,12 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - var waterLevelVariable = assessmentLevelCalculationInput.Variables.First(); + HydraRingVariable2[] variables = assessmentLevelCalculationInput.NewVariables.ToArray(); + Assert.AreEqual(1, variables.Length); + var waterLevelVariable = variables.First(); + Assert.IsInstanceOf(waterLevelVariable); Assert.AreEqual(26, waterLevelVariable.VariableId); - Assert.AreEqual(HydraRingDistributionType.Deterministic, waterLevelVariable.DistributionType); Assert.AreEqual(0.0, waterLevelVariable.Value); - Assert.AreEqual(HydraRingDeviationType.Standard, waterLevelVariable.DeviationType); - Assert.IsNaN(waterLevelVariable.Mean); - Assert.IsNaN(waterLevelVariable.Variability); - Assert.IsNaN(waterLevelVariable.Shift); } [Test] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -82,7 +82,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(1, input.VariableId); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), input.NewVariables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -111,16 +111,16 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultDikeHeightVariables() + private static IEnumerable GetDefaultDikeHeightVariables() { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 2.2, 3.3, double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 4.4, 5.5, double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); + yield return new DeterministicHydraRingVariable(1, 0.0); + yield return new DeterministicHydraRingVariable(8, 1.1); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, 2.2, 3.3); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 4.4, 5.5); + yield return new DeterministicHydraRingVariable(12, 6.6); + yield return new LogNormalHydraRingVariable(17, HydraRingDeviationType.Standard, 7.7, 8.8); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, 11.1, 12.2); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; using Core.Common.Utils; using NUnit.Framework; @@ -48,8 +49,7 @@ Assert.AreEqual(2, dunesBoundaryConditionsCalculationInput.CalculationTypeId); Assert.AreEqual(26, dunesBoundaryConditionsCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - Assert.IsNotNull(dunesBoundaryConditionsCalculationInput.Section); - Assert.AreEqual(1, dunesBoundaryConditionsCalculationInput.Variables.Count()); + Assert.IsNotNull(dunesBoundaryConditionsCalculationInput.Section); CollectionAssert.IsEmpty(dunesBoundaryConditionsCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(dunesBoundaryConditionsCalculationInput.ForelandsPoints); Assert.IsNull(dunesBoundaryConditionsCalculationInput.BreakWater); @@ -60,14 +60,12 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - var waterLevelVariable = dunesBoundaryConditionsCalculationInput.Variables.First(); + HydraRingVariable2[] hydraRingVariables = dunesBoundaryConditionsCalculationInput.NewVariables.ToArray(); + Assert.AreEqual(1, hydraRingVariables.Length); + var waterLevelVariable = hydraRingVariables.First(); Assert.AreEqual(26, waterLevelVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.Deterministic, waterLevelVariable.DistributionType); Assert.AreEqual(0.0, waterLevelVariable.Value); - Assert.AreEqual(HydraRingDeviationType.Standard, waterLevelVariable.DeviationType); - Assert.IsNaN(waterLevelVariable.Mean); - Assert.IsNaN(waterLevelVariable.Variability); - Assert.IsNaN(waterLevelVariable.Shift); } [Test] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -51,7 +51,7 @@ const double modelFactorFrunupMean = 7.7; const double modelFactorFrunupStandardDeviation = 8.8; const double exponentModelFactorShallowMean = 9.9; - const double exponentModelFactorShallowStandardDeviation = 10.10; + const double exponentModelFactorShallowStandardDeviation = 10.0; var expectedRingProfilePoints = new List { new HydraRingRoughnessProfilePoint(1.1, 2.2, 3.3) @@ -79,7 +79,7 @@ Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.NewVariables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -108,14 +108,14 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultHydraulicLoadsVariables() + private static IEnumerable GetDefaultHydraulicLoadsVariables() { - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 2.2, 3.3, double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 4.4, 5.5, double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.10, double.NaN); + yield return new DeterministicHydraRingVariable(8, 1.1); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, 2.2, 3.3); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 4.4, 5.5); + yield return new DeterministicHydraRingVariable(12, 6.6); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, 7.7, 8.8); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, 9.9, 10.0); } private class HydraulicLoadsCalculationInputImplementation : HydraulicLoadsCalculationInput Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -50,8 +50,8 @@ const double modelFactorOvertopping = 7.7; const double modelFactorFrunupMean = 8.8; const double modelFactorFrunupStandardDeviation = 9.9; - const double exponentModelFactorShallowMean = 10.10; - const double exponentModelFactorShallowStandardDeviation = 11.11; + const double exponentModelFactorShallowMean = 10.0; + const double exponentModelFactorShallowStandardDeviation = 11.1; var expectedRingProfilePoints = new List { new HydraRingRoughnessProfilePoint(1.1, 2.2, 3.3) @@ -81,7 +81,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(17, input.VariableId); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.NewVariables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -110,16 +110,16 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultOvertoppingRateVariables() + private static IEnumerable GetDefaultOvertoppingRateVariables() { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 5.5, 6.6, double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, 7.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.Deterministic, 0.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 10.10, 11.11, double.NaN); + yield return new DeterministicHydraRingVariable(1, 1.1); + yield return new DeterministicHydraRingVariable(8, 2.2); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 5.5, 6.6); + yield return new DeterministicHydraRingVariable(12, 7.7); + yield return new DeterministicHydraRingVariable(17, 0.0); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, 10.0, 11.1); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; using Core.Common.Utils; using NUnit.Framework; @@ -49,8 +50,7 @@ Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId); Assert.AreEqual(28, waveHeightCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveHeightCalculationInput.HydraulicBoundaryLocationId); - Assert.IsNotNull(waveHeightCalculationInput.Section); - Assert.AreEqual(1, waveHeightCalculationInput.Variables.Count()); + Assert.IsNotNull(waveHeightCalculationInput.Section); CollectionAssert.IsEmpty(waveHeightCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(waveHeightCalculationInput.ForelandsPoints); Assert.IsNull(waveHeightCalculationInput.BreakWater); @@ -61,14 +61,13 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - var waveHeightVariable = waveHeightCalculationInput.Variables.First(); + HydraRingVariable2[] variables = waveHeightCalculationInput.NewVariables.ToArray(); + Assert.AreEqual(1, variables.Length); + var waveHeightVariable = variables.First(); Assert.AreEqual(28, waveHeightVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.Deterministic, waveHeightVariable.DistributionType); Assert.AreEqual(0.0, waveHeightVariable.Value); Assert.AreEqual(HydraRingDeviationType.Standard, waveHeightVariable.DeviationType); - Assert.IsNaN(waveHeightVariable.Mean); - Assert.IsNaN(waveHeightVariable.Variability); - Assert.IsNaN(waveHeightVariable.Shift); } [Test] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs =================================================================== diff -u -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -84,7 +84,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, overtoppingCalculationInput.FailureMechanismType); Assert.AreEqual(expectedVariableId, overtoppingCalculationInput.VariableId); Assert.IsNotNull(overtoppingCalculationInput.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.NewVariables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, overtoppingCalculationInput.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, overtoppingCalculationInput.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, overtoppingCalculationInput.BreakWater); @@ -115,16 +115,16 @@ Assert.AreEqual(expectedSubMechanismModelId, overtoppingCalculationInput.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultOvertoppingVariables() { - yield return new HydraRingVariable(1, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(8, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(10, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(11, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 5.5, 6.6, double.NaN); - yield return new HydraRingVariable(12, HydraRingDistributionType.Deterministic, 7.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(17, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(120, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 10.0, 11.1, double.NaN); - yield return new HydraRingVariable(123, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 12.2, 13.3, double.NaN); + yield return new DeterministicHydraRingVariable(1, 1.1); + yield return new DeterministicHydraRingVariable(8, 2.2); + yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 5.5, 6.6); + yield return new DeterministicHydraRingVariable(12, 7.7); + yield return new LogNormalHydraRingVariable(17, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new NormalHydraRingVariable(120, HydraRingDeviationType.Standard, 10.0, 11.1); + yield return new NormalHydraRingVariable(123, HydraRingDeviationType.Standard, 12.2, 13.3); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -90,25 +90,25 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 10.0, 11.1, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(58, 1.1); + yield return new DeterministicHydraRingVariable(63, 2.2); + yield return new DeterministicHydraRingVariable(68, 3.3); + yield return new DeterministicHydraRingVariable(69, 4.4); + yield return new DeterministicHydraRingVariable(71, 5); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 6.6, 7.7); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 10.0, 11.1); + yield return new DeterministicHydraRingVariable(97, 12.2); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6); + yield return new DeterministicHydraRingVariable(105, 17.7); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new DeterministicHydraRingVariable(129, 20.0); } private class TestStructuresClosureCalculationInput : StructuresClosureCalculationInput Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -97,7 +97,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -121,25 +121,25 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 21.1, 22.2, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 23.3, 24.4, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 25.5, 26.6, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 10.0, 11.1, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(58, 1.1); + yield return new DeterministicHydraRingVariable(63, 2.2); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 21.1, 22.2); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 23.3, 24.4); + yield return new DeterministicHydraRingVariable(68, 3.3); + yield return new DeterministicHydraRingVariable(69, 4.4); + yield return new DeterministicHydraRingVariable(71, 5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 25.5, 26.6); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 6.6, 7.7); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 10.0, 11.1); + yield return new DeterministicHydraRingVariable(97, 12.2); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6); + yield return new DeterministicHydraRingVariable(105, 17.7); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new DeterministicHydraRingVariable(129, 20.0); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -103,7 +103,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -128,27 +128,27 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 21.1, 22.2, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 23.3, 24.4, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 25.5, 26.6, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 27.7, 28.8, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 10.0, 11.1, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 29.9, 30.0, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(58, 1.1); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 21.1, 22.2); + yield return new DeterministicHydraRingVariable(63, 2.2); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 23.3, 24.4); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 25.5, 26.6); + yield return new DeterministicHydraRingVariable(68, 3.3); + yield return new DeterministicHydraRingVariable(69, 4.4); + yield return new DeterministicHydraRingVariable(71, 5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 27.7, 28.8); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 6.6, 7.7); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 10.0, 11.1); + yield return new DeterministicHydraRingVariable(97, 12.2); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6); + yield return new DeterministicHydraRingVariable(105, 17.7); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 29.9, 30.0); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new DeterministicHydraRingVariable(129, 20.0); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -104,7 +104,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -129,28 +129,28 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 21.1, 22.2, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(72, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 10.0, 11.1, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, 30.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(58, 1.1); + yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, 21.1, 22.2); + yield return new DeterministicHydraRingVariable(61, 23.3); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new DeterministicHydraRingVariable(63, 2.2); + yield return new DeterministicHydraRingVariable(68, 3.3); + yield return new DeterministicHydraRingVariable(69, 4.4); + yield return new DeterministicHydraRingVariable(71, 5); + yield return new NormalHydraRingVariable(72, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 6.6, 7.7); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 8.8, 9.9); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 10.0, 11.1); + yield return new DeterministicHydraRingVariable(97, 12.2); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6); + yield return new DeterministicHydraRingVariable(105, 17.7); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 28.8, 29.9); + yield return new DeterministicHydraRingVariable(107, 30.0); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new DeterministicHydraRingVariable(129, 20.0); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs =================================================================== diff -u -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -98,26 +98,26 @@ Assert.AreEqual(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.NewVariables.ToArray()); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultOvertoppingVariables() { - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(59, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 2.2, 3.3, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 4.4, 5.5, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 13.3, 14.4, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 15.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 21.1, 22.2, double.NaN); - yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 24.4, 25.5, double.NaN); + yield return new DeterministicHydraRingVariable(58, 1.1); + yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, 2.2, 3.3); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 4.4, 5.5); + yield return new DeterministicHydraRingVariable(61, 6.6); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 7.7, 8.8); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 13.3, 14.4); + yield return new DeterministicHydraRingVariable(97, 15.5); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 16.6, 17.7); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new DeterministicHydraRingVariable(105, 20.0); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 21.1, 22.2); + yield return new DeterministicHydraRingVariable(107, 23.3); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 24.4, 25.5); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -139,43 +139,43 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 30.0, 31.1, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 32.2, 33.3, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 45.5, 46.6, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, HydraRingDeviationType.Standard, 48.8, 47.7, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, 49.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, 50.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, 51.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, 1.1); + yield return new DeterministicHydraRingVariable(58, 2.2); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new DeterministicHydraRingVariable(61, 5.5); + yield return new DeterministicHydraRingVariable(63, 6.6); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 7.7, 8.8); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new DeterministicHydraRingVariable(85, 13.3); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 14.4, 15.5); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 16.6, 17.7); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1); + yield return new DeterministicHydraRingVariable(90, 22); + yield return new DeterministicHydraRingVariable(91, 23.3); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 32.2, 33.3); + yield return new DeterministicHydraRingVariable(97, 34.4); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8); + yield return new DeterministicHydraRingVariable(105, 39.9); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3); + yield return new DeterministicHydraRingVariable(131, 44.4); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.5, 46.6); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 48.8, 47.7); + yield return new DeterministicHydraRingVariable(134, 49.9); + yield return new DeterministicHydraRingVariable(135, 50.0); + yield return new DeterministicHydraRingVariable(136, 51.1); } private class TestStructuresStabilityPointCalculationInput : StructuresStabilityPointCalculationInput Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -181,44 +181,44 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 52.2, 53.3, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 54.4, 55.5, double.NaN); - yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 30.0, 31.1, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 32.2, 33.3, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 45.5, 46.6, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, HydraRingDeviationType.Standard, 48.8, 47.7, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, 49.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, 50.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, 51.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, 1.1); + yield return new DeterministicHydraRingVariable(58, 2.2); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new DeterministicHydraRingVariable(61, 5.5); + yield return new DeterministicHydraRingVariable(63, 6.6); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 7.7, 8.8); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.2, 53.3); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.4, 55.5); + yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 56.6, 57.7); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, 58.8, 59.9); + yield return new DeterministicHydraRingVariable(85, 13.3); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 14.4, 15.5); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 16.6, 17.7); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1); + yield return new DeterministicHydraRingVariable(90, 22); + yield return new DeterministicHydraRingVariable(91, 23.3); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 32.2, 33.3); + yield return new DeterministicHydraRingVariable(97, 34.4); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8); + yield return new DeterministicHydraRingVariable(105, 39.9); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3); + yield return new DeterministicHydraRingVariable(131, 44.4); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.5, 46.6); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 48.8, 47.7); + yield return new DeterministicHydraRingVariable(134, 49.9); + yield return new DeterministicHydraRingVariable(135, 50.0); + yield return new DeterministicHydraRingVariable(136, 51.1); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -181,44 +181,44 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 52.2, 53.3, double.NaN); - yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 54.4, 55.5, double.NaN); - yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 30.0, 31.1, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 32.2, 33.3, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 45.5, 46.6, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, HydraRingDeviationType.Standard, 48.8, 47.7, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, 49.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, 50.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, 51.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, 1.1); + yield return new DeterministicHydraRingVariable(58, 2.2); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new DeterministicHydraRingVariable(61, 5.5); + yield return new DeterministicHydraRingVariable(63, 6.6); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 7.7, 8.8); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.2, 53.3); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.4, 55.5); + yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, 56.6, 57.7); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, 58.8, 59.9); + yield return new DeterministicHydraRingVariable(85, 13.3); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 14.4, 15.5); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 16.6, 17.7); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1); + yield return new DeterministicHydraRingVariable(90, 22); + yield return new DeterministicHydraRingVariable(91, 23.3); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 32.2, 33.3); + yield return new DeterministicHydraRingVariable(97, 34.4); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8); + yield return new DeterministicHydraRingVariable(105, 39.9); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3); + yield return new DeterministicHydraRingVariable(131, 44.4); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.5, 46.6); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 48.8, 47.7); + yield return new DeterministicHydraRingVariable(134, 49.9); + yield return new DeterministicHydraRingVariable(135, 50.0); + yield return new DeterministicHydraRingVariable(136, 51.1); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -181,44 +181,44 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 52.2, 53.3, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 54.4, 55.5, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 30.0, 31.1, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 32.2, 33.3, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 45.5, 46.6, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, HydraRingDeviationType.Standard, 48.8, 47.7, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, 49.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, 50.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, 51.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, 1.1); + yield return new DeterministicHydraRingVariable(58, 2.2); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new DeterministicHydraRingVariable(61, 5.5); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 52.2, 53.3); + yield return new DeterministicHydraRingVariable(63, 6.6); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 7.7, 8.8); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 54.4, 55.5); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, 56.6, 57.7); + yield return new DeterministicHydraRingVariable(85, 13.3); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 14.4, 15.5); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 16.6, 17.7); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1); + yield return new DeterministicHydraRingVariable(90, 22); + yield return new DeterministicHydraRingVariable(91, 23.3); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 32.2, 33.3); + yield return new DeterministicHydraRingVariable(97, 34.4); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8); + yield return new DeterministicHydraRingVariable(105, 39.9); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 58.8, 59.9); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3); + yield return new DeterministicHydraRingVariable(131, 44.4); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.5, 46.6); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 48.8, 47.7); + yield return new DeterministicHydraRingVariable(134, 49.9); + yield return new DeterministicHydraRingVariable(135, 50.0); + yield return new DeterministicHydraRingVariable(136, 51.1); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); } [Test] @@ -181,44 +181,44 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { - yield return new HydraRingVariable(43, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(60, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 3.3, 4.4, double.NaN); - yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 52.2, 53.3, double.NaN); - yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 6.6, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); - yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); - yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 54.4, 55.5, double.NaN); - yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); - yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); - yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); - yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); - yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); - yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 30.0, 31.1, double.NaN); - yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 32.2, 33.3, double.NaN); - yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); - yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); - yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); - yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(132, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 45.5, 46.6, double.NaN); - yield return new HydraRingVariable(133, HydraRingDistributionType.RayleighN, double.NaN, HydraRingDeviationType.Standard, 48.8, 47.7, double.NaN); - yield return new HydraRingVariable(134, HydraRingDistributionType.Deterministic, 49.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(135, HydraRingDistributionType.Deterministic, 50.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(136, HydraRingDistributionType.Deterministic, 51.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(43, 1.1); + yield return new DeterministicHydraRingVariable(58, 2.2); + yield return new NormalHydraRingVariable(60, HydraRingDeviationType.Standard, 3.3, 4.4); + yield return new DeterministicHydraRingVariable(61, 5.5); + yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 52.2, 53.3); + yield return new DeterministicHydraRingVariable(63, 6.6); + yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, 7.7, 8.8); + yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 9.9, 10.0); + yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, 54.4, 55.5); + yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 11.1, 12.2); + yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, 56.6, 57.7); + yield return new DeterministicHydraRingVariable(85, 13.3); + yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 14.4, 15.5); + yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 16.6, 17.7); + yield return new NormalHydraRingVariable(88, HydraRingDeviationType.Variation, 18.8, 19.9); + yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1); + yield return new DeterministicHydraRingVariable(90, 22); + yield return new DeterministicHydraRingVariable(91, 23.3); + yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5); + yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7); + yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9); + yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1); + yield return new LogNormalHydraRingVariable(96, HydraRingDeviationType.Variation, 32.2, 33.3); + yield return new DeterministicHydraRingVariable(97, 34.4); + yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6); + yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8); + yield return new DeterministicHydraRingVariable(105, 39.9); + yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 58.8, 59.9); + yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3); + yield return new DeterministicHydraRingVariable(131, 44.4); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.5, 46.6); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 48.8, 47.7); + yield return new DeterministicHydraRingVariable(134, 49.9); + yield return new DeterministicHydraRingVariable(135, 50.0); + yield return new DeterministicHydraRingVariable(136, 51.1); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -68,7 +68,7 @@ Assert.IsNotNull(waveConditionsCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsCalculationInput.Section.SectionId); Assert.AreEqual(sectionNormal, waveConditionsCalculationInput.Section.CrossSectionNormal); - HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b).ToArray(), waveConditionsCalculationInput.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b).ToArray(), waveConditionsCalculationInput.NewVariables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsCalculationInput.Beta); @@ -96,12 +96,12 @@ b) {} } - private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b) + private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b) { - yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(113, waterLevel); + yield return new DeterministicHydraRingVariable(114, 1.0); + yield return new DeterministicHydraRingVariable(115, a); + yield return new DeterministicHydraRingVariable(116, b); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -70,7 +70,7 @@ Assert.IsNotNull(waveConditionsCosineCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsCosineCalculationInput.Section.SectionId); Assert.AreEqual(sectionNormal, waveConditionsCosineCalculationInput.Section.CrossSectionNormal); - HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, c).ToArray(), waveConditionsCosineCalculationInput.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, c).ToArray(), waveConditionsCosineCalculationInput.NewVariables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsCosineCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsCosineCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsCosineCalculationInput.Beta); @@ -98,13 +98,13 @@ Assert.AreEqual(expectedSubMechanismModelId, waveConditionsCosineCalculationInput.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b, double c) + private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b, double c) { - yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(113, waterLevel); + yield return new DeterministicHydraRingVariable(114, 1.0); + yield return new DeterministicHydraRingVariable(115, a); + yield return new DeterministicHydraRingVariable(116, b); + yield return new DeterministicHydraRingVariable(119, c); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs =================================================================== diff -u -r24e18b63dccdb718dac61c69cc55289553cbaa47 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 24e18b63dccdb718dac61c69cc55289553cbaa47) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -71,7 +71,7 @@ Assert.IsNotNull(waveConditionsTrapezoidCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsTrapezoidCalculationInput.Section.SectionId); Assert.AreEqual(sectionNormal, waveConditionsTrapezoidCalculationInput.Section.CrossSectionNormal); - HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, beta1, beta2).ToArray(), waveConditionsTrapezoidCalculationInput.Variables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, beta1, beta2).ToArray(), waveConditionsTrapezoidCalculationInput.NewVariables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsTrapezoidCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsTrapezoidCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsTrapezoidCalculationInput.Beta); @@ -100,14 +100,14 @@ Assert.AreEqual(expectedSubMechanismModelId, waveConditionsTrapezoidCalculationInput.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b, double beta1, double beta2) + private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b, double beta1, double beta2) { - yield return new HydraRingVariable(113, HydraRingDistributionType.Deterministic, waterLevel, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(114, HydraRingDistributionType.Deterministic, 1.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(115, HydraRingDistributionType.Deterministic, a, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(116, HydraRingDistributionType.Deterministic, b, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new DeterministicHydraRingVariable(113, waterLevel); + yield return new DeterministicHydraRingVariable(114, 1.0); + yield return new DeterministicHydraRingVariable(115, a); + yield return new DeterministicHydraRingVariable(116, b); + yield return new DeterministicHydraRingVariable(117, beta1); + yield return new DeterministicHydraRingVariable(118, beta2); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -ra6cc123a10630d78e283e2fab0f491804b6047e6 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision a6cc123a10630d78e283e2fab0f491804b6047e6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -120,11 +120,11 @@ Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 0, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 222.2, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 2222.2, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22222.2, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 222222.2, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + "INSERT INTO [CalculationProfiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + @@ -249,23 +249,23 @@ Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 0, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 222.2, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 2222.2, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22222.2, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 222222.2, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 0, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 222.2, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 2222.2, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 22222.2, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 222222.2, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 0, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 222.2, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 2222.2, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 22222.2, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 222222.2, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 2, 333.3, 444.4, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 2, 3333.3, NULL, NULL, NULL, 0, 4444.4, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 4, 33333.3, 44444.4, 55555.5, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 4, 333333.3, NULL, 555555.5, NULL, 0, 444444.4, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + "INSERT INTO [CalculationProfiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + @@ -389,16 +389,16 @@ } } - public override IEnumerable Variables + public override IEnumerable NewVariables { get { - yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, 3.3, 4.4, 5.5); - yield return new HydraRingVariable(26, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Variation, 33.3, 44.4, 55.5); - yield return new HydraRingVariable(26, HydraRingDistributionType.Normal, 222.2, HydraRingDeviationType.Standard, 333.3, 444.4, 555.5); - yield return new HydraRingVariable(26, HydraRingDistributionType.Normal, 2222.2, HydraRingDeviationType.Variation, 3333.3, 4444.4, 5555.5); - yield return new HydraRingVariable(26, HydraRingDistributionType.LogNormal, 22222.2, HydraRingDeviationType.Standard, 33333.3, 44444.4, 55555.5); - yield return new HydraRingVariable(26, HydraRingDistributionType.LogNormal, 222222.2, HydraRingDeviationType.Variation, 333333.3, 444444.4, 555555.5); + yield return new DeterministicHydraRingVariable(26, 2.2); + yield return new DeterministicHydraRingVariable(26, 22.2); + yield return new NormalHydraRingVariable(26, HydraRingDeviationType.Standard, 333.3, 444.4); + yield return new NormalHydraRingVariable(26, HydraRingDeviationType.Variation, 3333.3, 4444.4); + yield return new LogNormalHydraRingVariable(26, HydraRingDeviationType.Standard, 33333.3, 44444.4, 55555.5); + yield return new LogNormalHydraRingVariable(26, HydraRingDeviationType.Variation, 333333.3, 444444.4, 555555.5); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -30,16 +30,16 @@ [Test] public void AreEqual_EqualHydraRingVariables_DoesNotThrowAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; HydraRingDataEqualityHelper.AreEqual(expected, actual); @@ -48,15 +48,15 @@ [Test] public void AreEqual_DifferentNumberOfHydraRingVariables_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -65,16 +65,16 @@ [Test] public void AreEqual_DifferentVariableIds_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(111, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(111, HydraRingDeviationType.Standard, 22.22, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -83,16 +83,16 @@ [Test] public void AreEqual_DifferentDistributionTypes_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Deterministic, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new DeterministicHydraRingVariable(11, 22.22), }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -101,16 +101,16 @@ [Test] public void AreEqual_DifferentValues_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 222.222, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.222, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -119,16 +119,16 @@ [Test] public void AreEqual_DifferentDeviationTypes_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Variation, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Variation, 22.22, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -137,16 +137,16 @@ [Test] public void AreEqual_DifferentMeans_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 333.333, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.222, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -155,16 +155,16 @@ [Test] public void AreEqual_DifferentVariabilities_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 444.444, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.333) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); @@ -173,16 +173,16 @@ [Test] public void AreEqual_DifferentShifts_ThrowsAssertionException() { - var expected = new[] + var expected = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 55.55) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new[] + var actual = new HydraRingVariable2[] { - new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5), - new HydraRingVariable(11, HydraRingDistributionType.Normal, 22.22, HydraRingDeviationType.Standard, 33.33, 44.44, 555.555) + new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.44), + new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; Assert.Throws(() => HydraRingDataEqualityHelper.AreEqual(expected, actual)); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r077ced627bcacbf6095471e30af352fbf2e4298d --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) @@ -54,7 +54,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -76,7 +76,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -98,7 +98,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// @@ -120,15 +120,15 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); + AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); } /// /// Asserts whether or not and are equal to eachother. /// /// The array of expected . /// The array of actual . - public static void AreEqual(HydraRingVariable[] expected, HydraRingVariable[] actual) + public static void AreEqual(HydraRingVariable2[] expected, HydraRingVariable2[] actual) { Assert.AreEqual(expected.Length, actual.Length); @@ -169,15 +169,17 @@ } } - private static void AreEqual(HydraRingVariable expected, HydraRingVariable actual) + private static void AreEqual(HydraRingVariable2 expected, HydraRingVariable2 actual) { Assert.AreEqual(expected.DeviationType, actual.DeviationType); Assert.AreEqual(expected.DistributionType, actual.DistributionType); Assert.AreEqual(expected.Value, actual.Value, accuracy); - Assert.AreEqual(expected.Mean, actual.Mean, accuracy); - Assert.AreEqual(expected.Shift, actual.Shift, accuracy); - Assert.AreEqual(expected.Variability, actual.Variability, accuracy); + Assert.AreEqual(expected.Parameter1, actual.Parameter1, accuracy); + Assert.AreEqual(expected.Parameter2, actual.Parameter2); + Assert.AreEqual(expected.Parameter3, actual.Parameter3); + Assert.AreEqual(expected.Parameter4, actual.Parameter4); Assert.AreEqual(expected.VariableId, actual.VariableId, accuracy); + Assert.AreEqual(expected.CoefficientOfVariation, actual.CoefficientOfVariation, accuracy); } } } \ No newline at end of file