Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/DeterministicHydraRingVariable.cs =================================================================== diff -u -r6fa6777d83fb74d42f0584ec98f04f1fbede993c -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/DeterministicHydraRingVariable.cs (.../DeterministicHydraRingVariable.cs) (revision 6fa6777d83fb74d42f0584ec98f04f1fbede993c) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/DeterministicHydraRingVariable.cs (.../DeterministicHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -24,7 +24,7 @@ /// /// Class for Deterministic Hydra-Ring variable related data. /// - public class DeterministicHydraRingVariable : HydraRingVariable2 + public class DeterministicHydraRingVariable : HydraRingVariable { private readonly double value; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs =================================================================== diff -u -r315378ecfaa9a06a553863ca91b8f4d6252e7bae -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs (.../HydraRingVariable.cs) (revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs (.../HydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -22,37 +22,25 @@ namespace Ringtoets.HydraRing.Calculation.Data { /// - /// Class for Hydra-Ring variable related data. + /// Abstract base class for Hydra-Ring variable related data. /// - public class HydraRingVariable + public abstract class HydraRingVariable { + private const double defaultHydraRingValue = 0.0; + private readonly double? defaultHydraRingNullValue = null; + private readonly int variableId; - private readonly HydraRingDistributionType distributionType; - private readonly double value; private readonly HydraRingDeviationType deviationType; - private readonly double mean; - private readonly double variability; - private readonly double shift; /// /// Creates a new instance of the class. /// /// The Hydra-Ring id corresponding to the variable that is considered. - /// The probability distribution of the variable. - /// The value in case the variable is deterministic. /// The deviation type in case the variable is random. - /// The mean value in case the variable is random. - /// The variability in case the variable is random. - /// The shift in case the variable is random. - public HydraRingVariable(int variableId, HydraRingDistributionType distributionType, double value, HydraRingDeviationType deviationType, double mean, double variability, double shift) + protected HydraRingVariable(int variableId, HydraRingDeviationType deviationType) { this.variableId = variableId; - this.distributionType = distributionType; - this.value = value; this.deviationType = deviationType; - this.mean = mean; - this.variability = variability; - this.shift = shift; } /// @@ -67,31 +55,25 @@ } /// - /// Gets the probability distribution of the variable. - /// - public HydraRingDistributionType DistributionType - { - get - { - return distributionType; - } - } - - /// /// Gets the value in case the variable is deterministic. /// /// /// This property is only relevant when equals . /// - public double Value + public virtual double Value { get { - return value; + return defaultHydraRingValue; } } /// + /// Gets the probability distribution of the variable. + /// + public abstract HydraRingDistributionType DistributionType { get; } + + /// /// Gets the deviation type in case the variable is random. /// /// @@ -106,46 +88,58 @@ } /// - /// Gets the mean value in case the variable is random. + /// Gets the parameter 1 value in case the variable is random. /// - /// - /// This property is only relevant when is not equal to . - /// - public double Mean + public virtual double Parameter1 { get { - return mean; + return defaultHydraRingValue; } } /// - /// Gets the variability in case the variable is random. + /// Gets the parameter 2 value in case the variable is random. /// - /// - /// The value represents a standard deviation in case the equals . - /// The value represents a variation coefficient in case the equals . - /// - public double Variability + public virtual double? Parameter2 { get { - return variability; + return defaultHydraRingNullValue; } } /// - /// Gets the shift in case the variable is random. + /// Gets the parameter 3 value in case the variable is random. /// - /// - /// This property is only relevant when equals . - /// - public double Shift + public virtual double? Parameter3 { get { - return shift; + return defaultHydraRingNullValue; } } + + /// + /// Gets the parameter 4 value in case the variable is random. + /// + public virtual double? Parameter4 + { + get + { + return defaultHydraRingNullValue; + } + } + + /// + /// Gets the coefficientOfVariation in case the variable is random. + /// + public virtual double CoefficientOfVariation + { + get + { + return defaultHydraRingValue; + } + } } } \ No newline at end of file Fisheye: Tag 365b392c739a678d44c4d0de3c8cb8c3e0684229 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable2.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -98,17 +98,6 @@ } /// - /// 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 -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/AssessmentLevelCalculationInput.cs (.../AssessmentLevelCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -66,7 +66,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -90,18 +90,18 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new DeterministicHydraRingVariable(1, 0.0); yield return new LogNormalHydraRingVariable(17, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -132,7 +132,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -88,18 +88,18 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new DeterministicHydraRingVariable(1, dikeHeight); yield return new DeterministicHydraRingVariable(17, 0.0); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/WaveHeightCalculationInput .cs (.../WaveHeightCalculationInput .cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -66,7 +66,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -124,7 +124,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -147,7 +147,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -114,11 +114,11 @@ this.insideWaterLevelStandardDeviation = insideWaterLevelStandardDeviation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -138,7 +138,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -128,11 +128,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -152,7 +152,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -129,11 +129,11 @@ this.deviationWaveDirection = deviationWaveDirection; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -153,7 +153,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation); yield return new DeterministicHydraRingVariable(61, structureNormalOrientation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -163,7 +163,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -258,7 +258,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -188,11 +188,11 @@ this.stabilityLinearLoadModelVariation = stabilityLinearLoadModelVariation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,7 +216,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -188,11 +188,11 @@ this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,7 +216,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation); yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -188,11 +188,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,7 +216,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -188,11 +188,11 @@ this.widthFlowAperturesVariation = widthFlowAperturesVariation; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.AddRange(GetVariables()); return variables.OrderBy(v => v.VariableId); @@ -216,7 +216,7 @@ } } - private IEnumerable GetVariables() + private IEnumerable GetVariables() { yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation); yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -102,7 +102,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineCalculationInput.cs (.../WaveConditionsCosineCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -67,11 +67,11 @@ this.c = c; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.Add(new DeterministicHydraRingVariable(119, c)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInput.cs (.../WaveConditionsTrapezoidCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -71,11 +71,11 @@ this.beta2 = beta2; } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { - var variables = base.NewVariables.ToList(); + var variables = base.Variables.ToList(); variables.Add(new DeterministicHydraRingVariable(117, beta1)); variables.Add(new DeterministicHydraRingVariable(118, beta2)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/LogNormalHydraRingVariable.cs =================================================================== diff -u -rd7f9fa1b5ef1b172cb485ce18df5ce690deb7e56 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/LogNormalHydraRingVariable.cs (.../LogNormalHydraRingVariable.cs) (revision d7f9fa1b5ef1b172cb485ce18df5ce690deb7e56) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/LogNormalHydraRingVariable.cs (.../LogNormalHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -24,7 +24,7 @@ /// /// Class for LogNormal Hydra-Ring variable related data. /// - public class LogNormalHydraRingVariable : HydraRingVariable2 + public class LogNormalHydraRingVariable : HydraRingVariable { private readonly double mean; private readonly double variance; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/NormalHydraRingVariable.cs =================================================================== diff -u -rd7f9fa1b5ef1b172cb485ce18df5ce690deb7e56 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/NormalHydraRingVariable.cs (.../NormalHydraRingVariable.cs) (revision d7f9fa1b5ef1b172cb485ce18df5ce690deb7e56) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/NormalHydraRingVariable.cs (.../NormalHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -24,7 +24,7 @@ /// /// Class for Normal Hydra-Ring variable related data. /// - public class NormalHydraRingVariable : HydraRingVariable2 + public class NormalHydraRingVariable : HydraRingVariable { private readonly double mean; private readonly double variance; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/RayleighNHydraRingVariable.cs =================================================================== diff -u -rd7f9fa1b5ef1b172cb485ce18df5ce690deb7e56 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision d7f9fa1b5ef1b172cb485ce18df5ce690deb7e56) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -24,7 +24,7 @@ /// /// Class for Rayleigh N Hydra-Ring variable related data. /// - public class RayleighNHydraRingVariable : HydraRingVariable2 + public class RayleighNHydraRingVariable : HydraRingVariable { private readonly double mean; private readonly double variance; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/TruncatedNormalHydraRingVariable.cs =================================================================== diff -u -rd7f9fa1b5ef1b172cb485ce18df5ce690deb7e56 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/TruncatedNormalHydraRingVariable.cs (.../TruncatedNormalHydraRingVariable.cs) (revision d7f9fa1b5ef1b172cb485ce18df5ce690deb7e56) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/TruncatedNormalHydraRingVariable.cs (.../TruncatedNormalHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -21,7 +21,7 @@ namespace Ringtoets.HydraRing.Calculation.Data { - public class TruncatedNormalHydraRingVariable : HydraRingVariable2 + public class TruncatedNormalHydraRingVariable : HydraRingVariable { private readonly double mean; private readonly double variance; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj =================================================================== diff -u -r60e174ac1074b55dd4751edfe140a6531bed339b -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 60e174ac1074b55dd4751edfe140a6531bed339b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -69,7 +69,7 @@ - + @@ -121,7 +121,6 @@ - Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -405,7 +405,7 @@ { FailureMechanismDefaults failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType); - foreach (HydraRingVariable2 hydraRingVariable in hydraRingCalculationInput.NewVariables) + foreach (HydraRingVariable hydraRingVariable in hydraRingCalculationInput.Variables) { var variableDefaults = variableDefaultsProvider.GetVariableDefaults(hydraRingCalculationInput.FailureMechanismType, hydraRingVariable.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/DeterministicHydraRingVariableTest.cs =================================================================== diff -u -r359027c5043e8eddd84cbd99fd5b6a603e391fe6 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/DeterministicHydraRingVariableTest.cs (.../DeterministicHydraRingVariableTest.cs) (revision 359027c5043e8eddd84cbd99fd5b6a603e391fe6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/DeterministicHydraRingVariableTest.cs (.../DeterministicHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -34,7 +34,7 @@ var hydraRingVariable = new DeterministicHydraRingVariable(1, 2.2); // Assert - Assert.IsInstanceOf(hydraRingVariable); + Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(1, hydraRingVariable.VariableId); Assert.AreEqual(2.2, hydraRingVariable.Value); Assert.AreEqual(HydraRingDistributionType.Deterministic, hydraRingVariable.DistributionType); Fisheye: Tag 365b392c739a678d44c4d0de3c8cb8c3e0684229 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariable2Test.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs =================================================================== diff -u -r315378ecfaa9a06a553863ca91b8f4d6252e7bae -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs (.../HydraRingVariableTest.cs) (revision 315378ecfaa9a06a553863ca91b8f4d6252e7bae) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingVariableTest.cs (.../HydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -31,16 +31,31 @@ public void Constructor_ExpectedValues() { // Call - var hydraRingVariable = new HydraRingVariable(1, HydraRingDistributionType.LogNormal, 2.2, HydraRingDeviationType.Variation, 3.3, 4.4, 5.5); + var hydraRingVariable = new TestHydraRingVariable(1, HydraRingDeviationType.Variation); // Assert Assert.AreEqual(1, hydraRingVariable.VariableId); - Assert.AreEqual(HydraRingDistributionType.LogNormal, hydraRingVariable.DistributionType); - Assert.AreEqual(2.2, hydraRingVariable.Value); + Assert.AreEqual(0, hydraRingVariable.Value); Assert.AreEqual(HydraRingDeviationType.Variation, hydraRingVariable.DeviationType); - Assert.AreEqual(3.3, hydraRingVariable.Mean); - Assert.AreEqual(4.4, hydraRingVariable.Variability); - Assert.AreEqual(5.5, hydraRingVariable.Shift); + Assert.AreEqual(0, hydraRingVariable.Parameter1); + Assert.IsNull(hydraRingVariable.Parameter2); + Assert.IsNull(hydraRingVariable.Parameter3); + Assert.IsNull(hydraRingVariable.Parameter4); + Assert.AreEqual(0, hydraRingVariable.CoefficientOfVariation); } + + private class TestHydraRingVariable : HydraRingVariable + { + public TestHydraRingVariable(int variableId, HydraRingDeviationType deviationType) + : base(variableId, deviationType) {} + + public override HydraRingDistributionType DistributionType + { + get + { + return HydraRingDistributionType.Normal; + } + } + } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -61,7 +61,7 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - HydraRingVariable2[] variables = assessmentLevelCalculationInput.NewVariables.ToArray(); + HydraRingVariable[] variables = assessmentLevelCalculationInput.Variables.ToArray(); Assert.AreEqual(1, variables.Length); var waterLevelVariable = variables.First(); Assert.IsInstanceOf(waterLevelVariable); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -82,7 +82,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(1, input.VariableId); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), input.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -111,7 +111,7 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultDikeHeightVariables() + private static IEnumerable GetDefaultDikeHeightVariables() { yield return new DeterministicHydraRingVariable(1, 0.0); yield return new DeterministicHydraRingVariable(8, 1.1); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -60,7 +60,7 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - HydraRingVariable2[] hydraRingVariables = dunesBoundaryConditionsCalculationInput.NewVariables.ToArray(); + HydraRingVariable[] hydraRingVariables = dunesBoundaryConditionsCalculationInput.Variables.ToArray(); Assert.AreEqual(1, hydraRingVariables.Length); var waterLevelVariable = hydraRingVariables.First(); Assert.AreEqual(26, waterLevelVariable.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -79,7 +79,7 @@ Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -108,7 +108,7 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultHydraulicLoadsVariables() + private static IEnumerable GetDefaultHydraulicLoadsVariables() { yield return new DeterministicHydraRingVariable(8, 1.1); yield return new NormalHydraRingVariable(10, HydraRingDeviationType.Standard, 2.2, 3.3); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -81,7 +81,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.AreEqual(17, input.VariableId); Assert.IsNotNull(input.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, input.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, input.BreakWater); @@ -110,7 +110,7 @@ Assert.AreEqual(expectedSubMechanismModelId, input.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultOvertoppingRateVariables() + private static IEnumerable GetDefaultOvertoppingRateVariables() { yield return new DeterministicHydraRingVariable(1, 1.1); yield return new DeterministicHydraRingVariable(8, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -61,7 +61,7 @@ Assert.IsNaN(section.SectionLength); Assert.IsNaN(section.CrossSectionNormal); - HydraRingVariable2[] variables = waveHeightCalculationInput.NewVariables.ToArray(); + HydraRingVariable[] variables = waveHeightCalculationInput.Variables.ToArray(); Assert.AreEqual(1, variables.Length); var waveHeightVariable = variables.First(); Assert.AreEqual(28, waveHeightVariable.VariableId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -84,7 +84,7 @@ Assert.AreEqual(HydraRingFailureMechanismType.DikesOvertopping, overtoppingCalculationInput.FailureMechanismType); Assert.AreEqual(expectedVariableId, overtoppingCalculationInput.VariableId); Assert.IsNotNull(overtoppingCalculationInput.Section); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, overtoppingCalculationInput.ProfilePoints); CollectionAssert.AreEqual(expectedRingForelandPoints, overtoppingCalculationInput.ForelandsPoints); Assert.AreEqual(expectedRingBreakWater, overtoppingCalculationInput.BreakWater); @@ -115,7 +115,7 @@ Assert.AreEqual(expectedSubMechanismModelId, overtoppingCalculationInput.GetSubMechanismModelId(subMechanismModelId)); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultOvertoppingVariables() { yield return new DeterministicHydraRingVariable(1, 1.1); yield return new DeterministicHydraRingVariable(8, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -90,10 +90,10 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(58, 1.1); yield return new DeterministicHydraRingVariable(63, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -97,7 +97,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -121,7 +121,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(58, 1.1); yield return new DeterministicHydraRingVariable(63, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -103,7 +103,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -128,7 +128,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(58, 1.1); yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, 21.1, 22.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -104,7 +104,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -129,7 +129,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(58, 1.1); yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, 21.1, 22.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -98,10 +98,10 @@ Assert.AreEqual(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingVariables().ToArray(), input.Variables.ToArray()); } - private static IEnumerable GetDefaultOvertoppingVariables() + private static IEnumerable GetDefaultOvertoppingVariables() { yield return new DeterministicHydraRingVariable(58, 1.1); yield return new LogNormalHydraRingVariable(59, HydraRingDeviationType.Standard, 2.2, 3.3); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -139,10 +139,10 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(43, 1.1); yield return new DeterministicHydraRingVariable(58, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -181,7 +181,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(43, 1.1); yield return new DeterministicHydraRingVariable(58, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -181,7 +181,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(43, 1.1); yield return new DeterministicHydraRingVariable(58, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -181,7 +181,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(43, 1.1); yield return new DeterministicHydraRingVariable(58, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -149,7 +149,7 @@ Assert.AreSame(section, input.Section); Assert.AreSame(forelandPoints, input.ForelandsPoints); Assert.AreSame(breakWater, input.BreakWater); - HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetDefaultVariables().ToArray(), input.Variables.ToArray()); } [Test] @@ -181,7 +181,7 @@ Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId); } - private static IEnumerable GetDefaultVariables() + private static IEnumerable GetDefaultVariables() { yield return new DeterministicHydraRingVariable(43, 1.1); yield return new DeterministicHydraRingVariable(58, 2.2); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -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.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b).ToArray(), waveConditionsCalculationInput.Variables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsCalculationInput.Beta); @@ -96,7 +96,7 @@ b) {} } - private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b) + private static IEnumerable GetExpectedVariables(double waterLevel, double a, double b) { yield return new DeterministicHydraRingVariable(113, waterLevel); yield return new DeterministicHydraRingVariable(114, 1.0); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -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.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, c).ToArray(), waveConditionsCosineCalculationInput.Variables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsCosineCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsCosineCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsCosineCalculationInput.Beta); @@ -98,7 +98,7 @@ 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 DeterministicHydraRingVariable(113, waterLevel); yield return new DeterministicHydraRingVariable(114, 1.0); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -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.NewVariables.ToArray()); + HydraRingDataEqualityHelper.AreEqual(GetExpectedVariables(waterLevel, a, b, beta1, beta2).ToArray(), waveConditionsTrapezoidCalculationInput.Variables.ToArray()); Assert.AreSame(forelandPoints, waveConditionsTrapezoidCalculationInput.ForelandsPoints); Assert.AreSame(breakWater, waveConditionsTrapezoidCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, waveConditionsTrapezoidCalculationInput.Beta); @@ -100,7 +100,7 @@ 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 DeterministicHydraRingVariable(113, waterLevel); yield return new DeterministicHydraRingVariable(114, 1.0); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/LogNormalHydraRingVariableTest.cs =================================================================== diff -u -rd7f9fa1b5ef1b172cb485ce18df5ce690deb7e56 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/LogNormalHydraRingVariableTest.cs (.../LogNormalHydraRingVariableTest.cs) (revision d7f9fa1b5ef1b172cb485ce18df5ce690deb7e56) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/LogNormalHydraRingVariableTest.cs (.../LogNormalHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -36,7 +36,7 @@ var hydraRingVariable = new LogNormalHydraRingVariable(1, deviationType, 2.2, 3.3, 4.4); // Assert - Assert.IsInstanceOf(hydraRingVariable); + Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(1, hydraRingVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.LogNormal, hydraRingVariable.DistributionType); Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/NormalHydraRingVariableTest.cs =================================================================== diff -u -r6fa6777d83fb74d42f0584ec98f04f1fbede993c -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/NormalHydraRingVariableTest.cs (.../NormalHydraRingVariableTest.cs) (revision 6fa6777d83fb74d42f0584ec98f04f1fbede993c) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/NormalHydraRingVariableTest.cs (.../NormalHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -36,7 +36,7 @@ var hydraRingVariable = new NormalHydraRingVariable(1, deviationType, 2.2, 3.3); // Assert - Assert.IsInstanceOf(hydraRingVariable); + Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(1, hydraRingVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.Normal, hydraRingVariable.DistributionType); Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs =================================================================== diff -u -r60e174ac1074b55dd4751edfe140a6531bed339b -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 60e174ac1074b55dd4751edfe140a6531bed339b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -36,7 +36,7 @@ var hydraRingVariable = new RayleighNHydraRingVariable(1, deviationType, 2.2, 3.3); // Assert - Assert.IsInstanceOf(hydraRingVariable); + Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(1, hydraRingVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.RayleighN, hydraRingVariable.DistributionType); Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/TruncatedNormalHydraRingVariableTest.cs =================================================================== diff -u -r6e84ae6a581e86f0b7bbedda8a503091e7153b58 -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/TruncatedNormalHydraRingVariableTest.cs (.../TruncatedNormalHydraRingVariableTest.cs) (revision 6e84ae6a581e86f0b7bbedda8a503091e7153b58) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/TruncatedNormalHydraRingVariableTest.cs (.../TruncatedNormalHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -36,7 +36,7 @@ var hydraRingVariable = new TruncatedNormalHydraRingVariable(1, deviationType, 2.2, 3.3, 4.4, 5.5); // Assert - Assert.IsInstanceOf(hydraRingVariable); + Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(1, hydraRingVariable.VariableId); Assert.AreEqual(HydraRingDistributionType.TruncatedNormal, hydraRingVariable.DistributionType); Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj =================================================================== diff -u -r60e174ac1074b55dd4751edfe140a6531bed339b -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 60e174ac1074b55dd4751edfe140a6531bed339b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -67,7 +67,7 @@ - + @@ -111,7 +111,6 @@ - Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -389,7 +389,7 @@ } } - public override IEnumerable NewVariables + public override IEnumerable Variables { get { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingDataEqualityHelperTest.cs (.../HydraRingDataEqualityHelperTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -30,13 +30,13 @@ [Test] public void AreEqual_EqualHydraRingVariables_DoesNotThrowAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) @@ -48,12 +48,12 @@ [Test] public void AreEqual_DifferentNumberOfHydraRingVariables_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) @@ -65,13 +65,13 @@ [Test] public void AreEqual_DifferentVariableIds_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(111, HydraRingDeviationType.Standard, 22.22, 33.33) @@ -83,13 +83,13 @@ [Test] public void AreEqual_DifferentDistributionTypes_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new DeterministicHydraRingVariable(11, 22.22), @@ -101,13 +101,13 @@ [Test] public void AreEqual_DifferentValues_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.222, 33.33) @@ -119,13 +119,13 @@ [Test] public void AreEqual_DifferentDeviationTypes_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Variation, 22.22, 33.33) @@ -137,13 +137,13 @@ [Test] public void AreEqual_DifferentMeans_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.222, 33.33) @@ -155,13 +155,13 @@ [Test] public void AreEqual_DifferentVariabilities_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.333) @@ -173,13 +173,13 @@ [Test] public void AreEqual_DifferentShifts_ThrowsAssertionException() { - var expected = new HydraRingVariable2[] + var expected = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.4), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) }; - var actual = new HydraRingVariable2[] + var actual = new HydraRingVariable[] { new LogNormalHydraRingVariable(1, HydraRingDeviationType.Variation, 2.2, 3.3, 4.44), new NormalHydraRingVariable(11, HydraRingDeviationType.Standard, 22.22, 33.33) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs =================================================================== diff -u -r077ced627bcacbf6095471e30af352fbf2e4298d -r365b392c739a678d44c4d0de3c8cb8c3e0684229 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 077ced627bcacbf6095471e30af352fbf2e4298d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingDataEqualityHelper.cs (.../HydraRingDataEqualityHelper.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229) @@ -54,7 +54,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); + AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); } /// @@ -76,7 +76,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); + AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); } /// @@ -98,7 +98,7 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); + AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); } /// @@ -120,15 +120,15 @@ AreEqual(expectedInput.BreakWater, actualInput.BreakWater); AreEqual(expectedInput.Section, actualInput.Section); AreEqual(expectedInput.ForelandsPoints.ToArray(), actualInput.ForelandsPoints.ToArray()); - AreEqual(expectedInput.NewVariables.ToArray(), actualInput.NewVariables.ToArray()); + AreEqual(expectedInput.Variables.ToArray(), actualInput.Variables.ToArray()); } /// /// Asserts whether or not and are equal to eachother. /// /// The array of expected . /// The array of actual . - public static void AreEqual(HydraRingVariable2[] expected, HydraRingVariable2[] actual) + public static void AreEqual(HydraRingVariable[] expected, HydraRingVariable[] actual) { Assert.AreEqual(expected.Length, actual.Length); @@ -169,7 +169,7 @@ } } - private static void AreEqual(HydraRingVariable2 expected, HydraRingVariable2 actual) + private static void AreEqual(HydraRingVariable expected, HydraRingVariable actual) { Assert.AreEqual(expected.DeviationType, actual.DeviationType); Assert.AreEqual(expected.DistributionType, actual.DistributionType);