Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs
===================================================================
diff -u -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -117,7 +117,7 @@
///
/// Gets the reliability index to use during the calculation.
///
- /// Only relevant for type 2 computations.
+ /// Only relevant for type II computations.
public virtual double Beta
{
get
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -47,7 +47,7 @@
/// The standard deviation of the critical overtopping to use during the calculation.
/// The profile points to use during the calculation.
/// The foreland points to use during the calculation.
- /// The break water to use during the calculation.
+ /// The break waters to use during the calculation.
public OvertoppingCalculationInput(int hydraulicBoundaryLocationId, HydraRingSection hydraRingSection,
double hydraRingDikeHeight, double hydraRingCriticalOvertoppingMean,
double hydraRingCriticalOvertoppingStandardDeviation,
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingVariableCriticalOvertopping.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingVariableCriticalOvertopping.cs (.../OvertoppingVariableCriticalOvertopping.cs) (revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingVariableCriticalOvertopping.cs (.../OvertoppingVariableCriticalOvertopping.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -29,8 +29,8 @@
///
/// Creates a new instance of the class.
///
- /// The mean value in case the variable is random.
- /// The variability in case the variable is random.
+ /// The mean value.
+ /// The variability.
public OvertoppingVariableCriticalOvertopping(double mean, double variability)
: base(17, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard,
!double.IsNaN(mean) ? mean : 0.004,
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs
===================================================================
diff -u -r8b314e225c508616076c3cd8345286505711981f -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs (.../FailureMechanismSettings.cs) (revision 8b314e225c508616076c3cd8345286505711981f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs (.../FailureMechanismSettings.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -46,7 +46,7 @@
///
/// Gets the minimum value to use while iterating to a target probability.
///
- /// This property is only applicable in case of type 2 computations.
+ /// This property is only applicable in case of type II computations.
public double ValueMin
{
get
@@ -58,7 +58,7 @@
///
/// Gets the maximum value to use while iterating to a target probability.
///
- /// This property is only applicable in case of type 2 computations.
+ /// This property is only applicable in case of type II computations.
public double ValueMax
{
get
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -269,13 +269,13 @@
"LoadVariableId", defaultHydraRingValue // Fixed: not relevant
},
{
- "TableMin", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method")
+ "TableMin", defaultHydraRingValue // Fixed: no support for type III computations (see "Method")
},
{
- "TableMax", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method")
+ "TableMax", defaultHydraRingValue // Fixed: no support for type III computations (see "Method")
},
{
- "TableStepSize", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method")
+ "TableStepSize", defaultHydraRingValue // Fixed: no support for type III computations (see "Method")
},
{
"ValueMin", GetHydraRingValue(failureMechanismSettings.ValueMin)
@@ -524,7 +524,7 @@
"SectionId", hydraRingCalculationInput.Section.SectionId
},
{
- "Type", GetHydraRingValue(breakWater.Type)
+ "Type", breakWater.Type
},
{
"Height", GetHydraRingValue(breakWater.Height)
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs (.../OvertoppingCalculationInputTest.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -100,6 +100,7 @@
Assert.AreEqual(expected.Length, actual.Length);
for (int i = 0; i < expected.Length; i++)
{
+ Assert.AreEqual(expected[i].Value, actual[i].Value);
Assert.AreEqual(expected[i].DeviationType, actual[i].DeviationType);
Assert.AreEqual(expected[i].DistributionType, actual[i].DistributionType);
Assert.AreEqual(expected[i].Mean, actual[i].Mean);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingVariableCriticalOvertoppingTest.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -r4a37c3e7379dd57eaa3a2057809dec67261a07dd
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingVariableCriticalOvertoppingTest.cs (.../OvertoppingVariableCriticalOvertoppingTest.cs) (revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingVariableCriticalOvertoppingTest.cs (.../OvertoppingVariableCriticalOvertoppingTest.cs) (revision 4a37c3e7379dd57eaa3a2057809dec67261a07dd)
@@ -38,8 +38,8 @@
OvertoppingVariableCriticalOvertopping criticalOvertopping = new OvertoppingVariableCriticalOvertopping(mean, standardDeviation);
// Assert
- Assert.AreEqual(criticalOvertopping.Mean, expectedMean);
- Assert.AreEqual(criticalOvertopping.Variability, expectedStandardDeviation);
+ Assert.AreEqual(expectedMean, criticalOvertopping.Mean);
+ Assert.AreEqual(expectedStandardDeviation, criticalOvertopping.Variability);
}
}
}
\ No newline at end of file