Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/DeterministicHydraRingVariable.cs
===================================================================
diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -rb600ee186729ba8742b05408fbb2101f33f200ee
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/DeterministicHydraRingVariable.cs (.../DeterministicHydraRingVariable.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/DeterministicHydraRingVariable.cs (.../DeterministicHydraRingVariable.cs) (revision b600ee186729ba8742b05408fbb2101f33f200ee)
@@ -34,7 +34,7 @@
/// The Hydra-Ring id corresponding to the variable that is considered.
/// The value of the variable.
public DeterministicHydraRingVariable(int variableId, double value)
- : base(variableId, HydraRingDeviationType.Standard)
+ : base(variableId)
{
this.value = value;
}
@@ -54,5 +54,13 @@
return HydraRingDistributionType.Deterministic;
}
}
+
+ public override HydraRingDeviationType DeviationType
+ {
+ get
+ {
+ return HydraRingDeviationType.Standard;
+ }
+ }
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/HydraRingVariable.cs
===================================================================
diff -u -re4b650bcd7124669562f76ab715f8efa97691d80 -rb600ee186729ba8742b05408fbb2101f33f200ee
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/HydraRingVariable.cs (.../HydraRingVariable.cs) (revision e4b650bcd7124669562f76ab715f8efa97691d80)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/HydraRingVariable.cs (.../HydraRingVariable.cs) (revision b600ee186729ba8742b05408fbb2101f33f200ee)
@@ -30,17 +30,14 @@
private readonly double? defaultHydraRingNullValue = null;
private readonly int variableId;
- private readonly HydraRingDeviationType deviationType;
///
/// Creates a new instance of the class.
///
/// The Hydra-Ring id corresponding to the variable that is considered.
- /// The deviation type in case the variable is random.
- protected HydraRingVariable(int variableId, HydraRingDeviationType deviationType)
+ protected HydraRingVariable(int variableId)
{
this.variableId = variableId;
- this.deviationType = deviationType;
}
///
@@ -71,15 +68,9 @@
public abstract HydraRingDistributionType DistributionType { get; }
///
- /// Gets the deviation type in case the variable is random.
+ /// Gets the deviation type of the variable..
///
- public HydraRingDeviationType DeviationType
- {
- get
- {
- return deviationType;
- }
- }
+ public abstract HydraRingDeviationType DeviationType { get; }
///
/// Gets the parameter 1 value in case the variable is random.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs
===================================================================
diff -u -r69ae0d0b75f56831b0058a4fcac37442a998e84e -rb600ee186729ba8742b05408fbb2101f33f200ee
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs (.../RandomHydraRingVariable.cs) (revision 69ae0d0b75f56831b0058a4fcac37442a998e84e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs (.../RandomHydraRingVariable.cs) (revision b600ee186729ba8742b05408fbb2101f33f200ee)
@@ -26,6 +26,7 @@
///
public abstract class RandomHydraRingVariable : HydraRingVariable
{
+ private readonly HydraRingDeviationType deviationType;
private readonly double mean;
private readonly double variance;
@@ -37,8 +38,9 @@
/// The mean value of the variable.
/// The variance value of the variable.
protected RandomHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double mean, double variance)
- : base(variableId, deviationType)
+ : base(variableId)
{
+ this.deviationType = deviationType;
this.mean = mean;
this.variance = variance;
}
@@ -70,5 +72,13 @@
: base.CoefficientOfVariation;
}
}
+
+ public override HydraRingDeviationType DeviationType
+ {
+ get
+ {
+ return deviationType;
+ }
+ }
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/HydraRingVariableTest.cs
===================================================================
diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -rb600ee186729ba8742b05408fbb2101f33f200ee
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/HydraRingVariableTest.cs (.../HydraRingVariableTest.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/HydraRingVariableTest.cs (.../HydraRingVariableTest.cs) (revision b600ee186729ba8742b05408fbb2101f33f200ee)
@@ -32,12 +32,11 @@
public void Constructor_ExpectedValues()
{
// Call
- var hydraRingVariable = new TestHydraRingVariable(1, HydraRingDeviationType.Variation);
+ var hydraRingVariable = new TestHydraRingVariable(1);
// Assert
Assert.AreEqual(1, hydraRingVariable.VariableId);
Assert.AreEqual(0, hydraRingVariable.Value);
- Assert.AreEqual(HydraRingDeviationType.Variation, hydraRingVariable.DeviationType);
Assert.AreEqual(0, hydraRingVariable.Parameter1);
Assert.IsNull(hydraRingVariable.Parameter2);
Assert.IsNull(hydraRingVariable.Parameter3);
@@ -47,8 +46,8 @@
private class TestHydraRingVariable : HydraRingVariable
{
- public TestHydraRingVariable(int variableId, HydraRingDeviationType deviationType)
- : base(variableId, deviationType) {}
+ public TestHydraRingVariable(int variableId)
+ : base(variableId) {}
public override HydraRingDistributionType DistributionType
{
@@ -57,6 +56,14 @@
return HydraRingDistributionType.Normal;
}
}
+
+ public override HydraRingDeviationType DeviationType
+ {
+ get
+ {
+ return HydraRingDeviationType.Standard;
+ }
+ }
}
}
}
\ No newline at end of file