Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -290,7 +290,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, waveRatioMaxHN, waveRatioMaxHStandardDeviation);
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/RayleighNHydraRingVariable.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -26,29 +26,29 @@
///
public class RayleighNHydraRingVariable : HydraRingVariable
{
- private readonly double mean;
- private readonly double variance;
+ private readonly double standardDeviation;
+ private readonly double n;
///
/// Creates a new instance of .
///
/// The Hydra-Ring id corresponding to the variable that is considered.
- /// The deviation type in case the variable is random.
- /// The mean value of the variable.
- /// The variance value of the variable.
+ /// The deviation type of the variable.
+ /// The n value of the variable.
+ /// The standardDeviation value of the variable.
public RayleighNHydraRingVariable(int variableId, HydraRingDeviationType deviationType,
- double mean, double variance)
+ double n, double standardDeviation)
: base(variableId, deviationType)
{
- this.mean = mean;
- this.variance = variance;
+ this.standardDeviation = standardDeviation;
+ this.n = n;
}
public override double Parameter1
{
get
{
- return mean;
+ return standardDeviation;
}
}
@@ -57,7 +57,7 @@
get
{
return DeviationType == HydraRingDeviationType.Standard
- ? variance
+ ? n
: base.Parameter2;
}
}
@@ -67,7 +67,7 @@
get
{
return DeviationType == HydraRingDeviationType.Variation
- ? variance
+ ? n
: base.CoefficientOfVariation;
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -172,7 +172,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.7, 48.8);
yield return new DeterministicHydraRingVariable(134, 49.9);
yield return new DeterministicHydraRingVariable(135, 50.0);
yield return new DeterministicHydraRingVariable(136, 51.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -215,7 +215,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.7, 48.8);
yield return new DeterministicHydraRingVariable(134, 49.9);
yield return new DeterministicHydraRingVariable(135, 50.0);
yield return new DeterministicHydraRingVariable(136, 51.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -215,7 +215,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.7, 48.8);
yield return new DeterministicHydraRingVariable(134, 49.9);
yield return new DeterministicHydraRingVariable(135, 50.0);
yield return new DeterministicHydraRingVariable(136, 51.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -215,7 +215,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.7, 48.8);
yield return new DeterministicHydraRingVariable(134, 49.9);
yield return new DeterministicHydraRingVariable(135, 50.0);
yield return new DeterministicHydraRingVariable(136, 51.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -215,7 +215,7 @@
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 RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.7, 48.8);
yield return new DeterministicHydraRingVariable(134, 49.9);
yield return new DeterministicHydraRingVariable(135, 50.0);
yield return new DeterministicHydraRingVariable(136, 51.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b941ffb54d681a83d93f7ab35f7d80cf0489478
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 2b941ffb54d681a83d93f7ab35f7d80cf0489478)
@@ -33,7 +33,7 @@
public void Constructor_ExpectedValues(HydraRingDeviationType deviationType, double? expectedParameter2, double expectedCoefficientOfVariation)
{
// Call
- var hydraRingVariable = new RayleighNHydraRingVariable(1, deviationType, 2.2, 3.3);
+ var hydraRingVariable = new RayleighNHydraRingVariable(1, deviationType, 3.3, 2.2);
// Assert
Assert.IsInstanceOf(hydraRingVariable);