Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureType.cs
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureType.cs (.../ClosingStructureType.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureType.cs (.../ClosingStructureType.cs) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -19,6 +19,9 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Core.Common.Utils.Attributes;
+using Ringtoets.ClosingStructures.Data.Properties;
+
namespace Ringtoets.ClosingStructures.Data
{
///
@@ -29,16 +32,19 @@
///
/// A vertical wall.
///
+ [ResourcesDisplayName(typeof(Resources), "ClosingStructureType_VerticalWall_DisplayName")]
VerticalWall = 1,
///
/// A low sill structure.
///
+ [ResourcesDisplayName(typeof(Resources), "ClosingStructureType_LowSill_DisplayName")]
LowSill = 2,
///
/// A flooded culvert structure.
///
+ [ResourcesDisplayName(typeof(Resources), "ClosingStructureType_FloodedCulvert_DisplayName")]
FloodedCulvert = 3
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -31,28 +31,28 @@
public class ClosingStructuresInput : Observable, ICalculationInput
{
private readonly NormalDistribution modelFactorSuperCriticalFlow;
- private readonly NormalDistribution thresholdLowWeirHeight;
+ private readonly NormalDistribution thresholdHeightOpenWeir;
private readonly NormalDistribution drainCoefficient;
private readonly LogNormalDistribution areaFlowApertures;
private readonly NormalDistribution levelCrestOfStructureNotClosing;
- private readonly NormalDistribution waterLevelInside;
+ private readonly NormalDistribution insideWaterLevel;
private readonly LogNormalDistribution storageStructureArea;
- private readonly LogNormalDistribution allowableIncreaseOfLevelForStorage;
+ private readonly LogNormalDistribution allowedLevelIncreaseStorage;
private readonly LogNormalDistribution flowWidthAtBottomProtection;
- private readonly NormalDistribution widthOfFlowApertures;
+ private readonly NormalDistribution widthFlowApertures;
private readonly LogNormalDistribution stormDuration;
private readonly LogNormalDistribution criticalOverToppingDischarge;
- private RoundedDouble orientationOfTheNormalOfTheStructure;
+ private RoundedDouble structureNormalOrientation;
private RoundedDouble factorStormDurationOpenStructure;
private double failureProbablityOpenStructure;
private double failureProbabilityReparation;
- private double failureProbabilityOfStructureGivenErosion;
+ private double failureProbabilityStructureWithErosion;
private double probabilityOpenStructureBeforeFlooding;
private RoundedDouble wavedirectionDeviation;
public ClosingStructuresInput()
{
- orientationOfTheNormalOfTheStructure = new RoundedDouble(2);
+ structureNormalOrientation = new RoundedDouble(2);
factorStormDurationOpenStructure = new RoundedDouble(2);
wavedirectionDeviation = new RoundedDouble(2);
probabilityOpenStructureBeforeFlooding = 1.0;
@@ -63,7 +63,7 @@
StandardDeviation = (RoundedDouble) 0.03
};
- thresholdLowWeirHeight = new NormalDistribution(2)
+ thresholdHeightOpenWeir = new NormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
StandardDeviation = (RoundedDouble) 0.1
@@ -87,42 +87,42 @@
StandardDeviation = (RoundedDouble) 0.05
};
- waterLevelInside = new NormalDistribution(2)
+ insideWaterLevel = new NormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
StandardDeviation = (RoundedDouble) 0.1
};
- allowableIncreaseOfLevelForStorage = new LogNormalDistribution(2)
+ allowedLevelIncreaseStorage = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
StandardDeviation = (RoundedDouble) 0.1
};
storageStructureArea = new LogNormalDistribution(2)
{
- Mean = (RoundedDouble) double.NaN,
- StandardDeviation = (RoundedDouble) 0.1
+ Mean = (RoundedDouble) double.NaN
};
+ storageStructureArea.SetStandardDeviationFromVariationCoefficient(0.1);
flowWidthAtBottomProtection = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN,
StandardDeviation = (RoundedDouble) 0.05
};
- widthOfFlowApertures = new NormalDistribution(2)
- {
- Mean = (RoundedDouble) double.NaN,
- };
- widthOfFlowApertures.SetStandardDeviationFromVariationCoefficient(0.05);
-
criticalOverToppingDischarge = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) double.NaN
};
criticalOverToppingDischarge.SetStandardDeviationFromVariationCoefficient(0.15);
+ widthFlowApertures = new NormalDistribution(2)
+ {
+ Mean = (RoundedDouble) double.NaN,
+ };
+ widthFlowApertures.SetStandardDeviationFromVariationCoefficient(0.05);
+
stormDuration = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) 7.5
@@ -159,15 +159,15 @@
///
/// Gets or sets the orientation of the normal of the structure.
///
- public RoundedDouble OrientationOfTheNormalOfTheStructure
+ public RoundedDouble StructureNormalOrientation
{
get
{
- return orientationOfTheNormalOfTheStructure;
+ return structureNormalOrientation;
}
set
{
- orientationOfTheNormalOfTheStructure = value.ToPrecision(orientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces);
+ structureNormalOrientation = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces);
}
}
@@ -223,19 +223,19 @@
///
/// Thrown when the value of the probability
/// is not between [0, 1].
- public double FailureProbabilityOfStructureGivenErosion
+ public double FailureProbabilityStructureWithErosion
{
get
{
- return failureProbabilityOfStructureGivenErosion;
+ return failureProbabilityStructureWithErosion;
}
set
{
if (value < 0 || value > 1)
{
throw new ArgumentException(RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_between_0_and_1);
}
- failureProbabilityOfStructureGivenErosion = value;
+ failureProbabilityStructureWithErosion = value;
}
}
@@ -312,15 +312,16 @@
///
/// Gets the threshold low weir height normal distribution and sets the threshold low weir height mean.
///
- public NormalDistribution ThresholdLowWeirHeight
+ public NormalDistribution ThresholdHeightOpenWeir
{
get
{
- return thresholdLowWeirHeight;
+ return thresholdHeightOpenWeir;
}
set
{
- thresholdLowWeirHeight.Mean = value.Mean;
+ thresholdHeightOpenWeir.Mean = value.Mean;
+ thresholdHeightOpenWeir.StandardDeviation = value.StandardDeviation;
}
}
@@ -359,32 +360,32 @@
///
/// Gets or sets the water level inside normal distribution.
///
- public NormalDistribution WaterLevelInside
+ public NormalDistribution InsideWaterLevel
{
get
{
- return waterLevelInside;
+ return insideWaterLevel;
}
set
{
- waterLevelInside.Mean = value.Mean;
- waterLevelInside.StandardDeviation = value.StandardDeviation;
+ insideWaterLevel.Mean = value.Mean;
+ insideWaterLevel.StandardDeviation = value.StandardDeviation;
}
}
///
/// Gets or sets the allowable increase of level for storage log normal distribution.
///
- public LogNormalDistribution AllowableIncreaseOfLevelForStorage
+ public LogNormalDistribution AllowedLevelIncreaseStorage
{
get
{
- return allowableIncreaseOfLevelForStorage;
+ return allowedLevelIncreaseStorage;
}
set
{
- allowableIncreaseOfLevelForStorage.Mean = value.Mean;
- allowableIncreaseOfLevelForStorage.StandardDeviation = value.StandardDeviation;
+ allowedLevelIncreaseStorage.Mean = value.Mean;
+ allowedLevelIncreaseStorage.StandardDeviation = value.StandardDeviation;
}
}
@@ -421,34 +422,34 @@
}
///
- /// Gets or sets the width of flow apertures normal distribution.
+ /// Gets or sets the critical overtopping discharge normal distribution.
///
- public NormalDistribution WidthOfFlowApertures
+ public LogNormalDistribution CriticalOverToppingDischarge
{
get
{
- return widthOfFlowApertures;
+ return criticalOverToppingDischarge;
}
set
{
- widthOfFlowApertures.Mean = value.Mean;
- widthOfFlowApertures.StandardDeviation = value.StandardDeviation;
+ criticalOverToppingDischarge.Mean = value.Mean;
+ criticalOverToppingDischarge.StandardDeviation = value.StandardDeviation;
}
}
///
- /// Gets or sets the critical overtopping discharge.
+ /// Gets or sets the width of flow apertures normal distribution.
///
- public LogNormalDistribution CriticalOverToppingDischarge
+ public NormalDistribution WidthFlowApertures
{
get
{
- return criticalOverToppingDischarge;
+ return widthFlowApertures;
}
set
{
- criticalOverToppingDischarge.Mean = value.Mean;
- criticalOverToppingDischarge.StandardDeviation = value.StandardDeviation;
+ widthFlowApertures.Mean = value.Mean;
+ widthFlowApertures.StandardDeviation = value.StandardDeviation;
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -82,6 +82,15 @@
}
///
+ /// Looks up a localized string similar to Verdronken koker.
+ ///
+ public static string ClosingStructure_Type_FloodedCulvert_DisplayName {
+ get {
+ return ResourceManager.GetString("ClosingStructure_Type_FloodedCulvert_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to BSKW.
///
public static string ClosingStructuresFailureMechanism_Code {
@@ -98,5 +107,23 @@
return ResourceManager.GetString("ClosingStructuresFailureMechanism_DisplayName", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Lage drempel.
+ ///
+ public static string ClosingStructureType_LowSill_DisplayName {
+ get {
+ return ResourceManager.GetString("ClosingStructureType_LowSill_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Verticale wand.
+ ///
+ public static string ClosingStructureType_VerticalWall_DisplayName {
+ get {
+ return ResourceManager.GetString("ClosingStructureType_VerticalWall_DisplayName", resourceCulture);
+ }
+ }
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx
===================================================================
diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -123,4 +123,13 @@
Kunstwerken - Betrouwbaarheid sluiting kunstwerk
+
+ Lage drempel
+
+
+ Verticale wand
+
+
+ Verdronken koker
+
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -63,6 +63,11 @@
Core.Common.Base
False
+
+ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}
+ Core.Common.Utils
+ False
+
{D4200F43-3F72-4F42-AF0A-8CED416A38EC}
Ringtoets.Common.Data
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r64b78f0ebd8e643a4285789d096e9c2a8c8a39af
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 64b78f0ebd8e643a4285789d096e9c2a8c8a39af)
@@ -45,20 +45,14 @@
AssertEqualValues(1.1, input.ModelFactorSuperCriticalFlow.Mean);
AssertEqualValues(0.03, input.ModelFactorSuperCriticalFlow.StandardDeviation);
-
- AssertEqualValues(0.1, input.ThresholdLowWeirHeight.StandardDeviation);
-
+ AssertEqualValues(0.1, input.ThresholdHeightOpenWeir.StandardDeviation);
AssertEqualValues(1, input.DrainCoefficient.Mean);
AssertEqualValues(0.2, input.DrainCoefficient.StandardDeviation);
-
AssertEqualValues(0.01, input.AreaFlowApertures.StandardDeviation);
AssertEqualValues(0.05, input.LevelCrestOfStructureNotClosing.StandardDeviation);
- AssertEqualValues(0.1, input.WaterLevelInside.StandardDeviation);
-
- AssertEqualValues(0.1, input.AllowableIncreaseOfLevelForStorage.StandardDeviation);
- AssertEqualValues(0.1, input.StorageStructureArea.StandardDeviation);
+ AssertEqualValues(0.1, input.InsideWaterLevel.StandardDeviation);
+ AssertEqualValues(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation);
AssertEqualValues(0.05, input.FlowWidthAtBottomProtection.StandardDeviation);
-
AssertEqualValues(7.5, input.StormDuration.Mean);
AssertEqualValues(0.25, input.StormDuration.GetVariationCoefficient());
Assert.AreEqual(1, input.ProbabilityOpenStructureBeforeFlooding);
@@ -81,40 +75,23 @@
}
[Test]
- public void Properties_OrientationOfTheNormalStructure_ExpectedValues()
+ public void Properties_StructureNormalOrientation_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
var random = new Random(22);
- var orientationOfTheNormalStructure = new RoundedDouble(5, random.NextDouble());
+ var orientation = new RoundedDouble(5, random.NextDouble());
// Call
- input.OrientationOfTheNormalOfTheStructure = orientationOfTheNormalStructure;
+ input.StructureNormalOrientation = orientation;
// Assert
- Assert.AreEqual(2, input.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces);
- AssertEqualValues(orientationOfTheNormalStructure, input.OrientationOfTheNormalOfTheStructure);
+ Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces);
+ AssertEqualValues(orientation, input.StructureNormalOrientation);
}
[Test]
- public void Properties_FactorStormDurationOpenStructure_ExpectedValues()
- {
- // Setup
- var input = new ClosingStructuresInput();
- var random = new Random(22);
-
- var factorStormDuration = new RoundedDouble(5, random.NextDouble());
-
- // Call
- input.FactorStormDurationOpenStructure = factorStormDuration;
-
- // Assert
- Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces);
- AssertEqualValues(factorStormDuration, input.FactorStormDurationOpenStructure);
- }
-
- [Test]
public void Properties_ModelFactorSuperCriticalFlow_ExpectedValues()
{
// Setup
@@ -132,20 +109,35 @@
}
[Test]
- public void Properties_ThresholdLowWeirHeight_ExpectedValues()
+ public void Properties_FactorStormDurationOpenStructure_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
- NormalDistribution thresholdLowWeirHeight = GenerateNormalDistribution();
+ var random = new Random(22);
- RoundedDouble initialStd = input.ThresholdLowWeirHeight.StandardDeviation;
+ var factorStormDuration = new RoundedDouble(5, random.NextDouble());
+ // Call
+ input.FactorStormDurationOpenStructure = factorStormDuration;
+
+ // Assert
+ Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces);
+ AssertEqualValues(factorStormDuration, input.FactorStormDurationOpenStructure);
+ }
+
+ [Test]
+ public void Properties_ThresholdHeightOpenWeir_ExpectedValues()
+ {
+ // Setup
+ var input = new ClosingStructuresInput();
+ NormalDistribution thresholdHeightOpenWeir = GenerateNormalDistribution();
+
//Call
- input.ThresholdLowWeirHeight = thresholdLowWeirHeight;
+ input.ThresholdHeightOpenWeir = thresholdHeightOpenWeir;
//Assert
- Assert.AreEqual(thresholdLowWeirHeight.Mean, input.ThresholdLowWeirHeight.Mean);
- AssertEqualValues(initialStd, input.ThresholdLowWeirHeight.StandardDeviation);
+ Assert.AreEqual(thresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.Mean);
+ Assert.AreEqual(thresholdHeightOpenWeir.StandardDeviation, input.ThresholdHeightOpenWeir.StandardDeviation);
}
[Test]
@@ -274,33 +266,33 @@
}
[Test]
- public void Properties_WaterLevelInside_ExpectedValues()
+ public void Properties_InsideWaterLevel_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
- NormalDistribution waterLevelInside = GenerateNormalDistribution();
+ NormalDistribution insideWaterLevel = GenerateNormalDistribution();
//Call
- input.WaterLevelInside = waterLevelInside;
+ input.InsideWaterLevel = insideWaterLevel;
//Assert
- Assert.AreEqual(waterLevelInside.Mean, input.WaterLevelInside.Mean);
- Assert.AreEqual(waterLevelInside.StandardDeviation, input.WaterLevelInside.StandardDeviation);
+ Assert.AreEqual(insideWaterLevel.Mean, input.InsideWaterLevel.Mean);
+ Assert.AreEqual(insideWaterLevel.StandardDeviation, input.InsideWaterLevel.StandardDeviation);
}
[Test]
- public void Properties_AllowableIncreaseOfLevelForStorage_ExpectedValues()
+ public void Properties_AllowedLevelIncreaseStorage_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
- LogNormalDistribution allowableIncreaseOfLevelForStorage = GenerateLogNormalDistribution();
+ LogNormalDistribution allowedIncrease = GenerateLogNormalDistribution();
//Call
- input.AllowableIncreaseOfLevelForStorage = allowableIncreaseOfLevelForStorage;
+ input.AllowedLevelIncreaseStorage = allowedIncrease;
//Assert
- Assert.AreEqual(allowableIncreaseOfLevelForStorage.Mean, input.AllowableIncreaseOfLevelForStorage.Mean);
- Assert.AreEqual(allowableIncreaseOfLevelForStorage.StandardDeviation, input.AllowableIncreaseOfLevelForStorage.StandardDeviation);
+ Assert.AreEqual(allowedIncrease.Mean, input.AllowedLevelIncreaseStorage.Mean);
+ Assert.AreEqual(allowedIncrease.StandardDeviation, input.AllowedLevelIncreaseStorage.StandardDeviation);
}
[Test]
@@ -334,15 +326,30 @@
}
[Test]
+ public void Properties_CriticalOvertoppingDischarge_ExpectedValues()
+ {
+ // Setup
+ var input = new ClosingStructuresInput();
+ LogNormalDistribution criticalOverToppingDischarge = GenerateLogNormalDistribution();
+
+ //Call
+ input.CriticalOverToppingDischarge = criticalOverToppingDischarge;
+
+ //Assert
+ Assert.AreEqual(criticalOverToppingDischarge.Mean, input.CriticalOverToppingDischarge.Mean);
+ AssertEqualValues(criticalOverToppingDischarge.StandardDeviation, input.CriticalOverToppingDischarge.StandardDeviation);
+ }
+
+ [Test]
[TestCase(-1.1)]
[TestCase(2)]
- public void Properties_FailureProbabilityOfStructureGivenErosion_ThrowArgumentException(double probability)
+ public void Properties_FailureProbabilityStructureWithErosion_ThrowArgumentException(double probability)
{
// Setup
var input = new ClosingStructuresInput();
// Call
- TestDelegate call = () => input.FailureProbabilityOfStructureGivenErosion = probability;
+ TestDelegate call = () => input.FailureProbabilityStructureWithErosion = probability;
// Assert
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen.");
@@ -352,46 +359,48 @@
[TestCase(0)]
[TestCase(0.5)]
[TestCase(1.0)]
- public void Properties_FailureProbabilityOfStructureGivenErosion_ExpectedValues(double probability)
+ public void Properties_FailureProbabilityStructureWithErosion_ExpectedValues(double probability)
{
// Setup
var input = new ClosingStructuresInput();
// Call
- input.FailureProbabilityOfStructureGivenErosion = probability;
+ input.FailureProbabilityStructureWithErosion = probability;
// Assert
- Assert.AreEqual(probability, input.FailureProbabilityOfStructureGivenErosion);
+ Assert.AreEqual(probability, input.FailureProbabilityStructureWithErosion);
}
[Test]
- public void Properties_WidthOfFlowApertures_ExpectedValues()
+ public void Properties_WidthFlowApertures_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
- NormalDistribution widthOfFlowApertures = GenerateNormalDistribution();
+ NormalDistribution widthApertures = GenerateNormalDistribution();
//Call
- input.WidthOfFlowApertures = widthOfFlowApertures;
+ input.WidthFlowApertures = widthApertures;
//Assert
- Assert.AreEqual(widthOfFlowApertures.Mean, input.WidthOfFlowApertures.Mean);
- Assert.AreEqual(widthOfFlowApertures.StandardDeviation, input.WidthOfFlowApertures.StandardDeviation);
+ Assert.AreEqual(widthApertures.Mean, input.WidthFlowApertures.Mean);
+ Assert.AreEqual(widthApertures.StandardDeviation, input.WidthFlowApertures.StandardDeviation);
}
[Test]
- public void Properties_CriticalOvertoppingDischarge_ExpectedValues()
+ public void Properties_WaveDirectionDeviation_ExpectedValues()
{
// Setup
var input = new ClosingStructuresInput();
- LogNormalDistribution criticalOverToppingDischarge = GenerateLogNormalDistribution();
+ var random = new Random(22);
- //Call
- input.CriticalOverToppingDischarge = criticalOverToppingDischarge;
+ var wavedirectionDeviation = new RoundedDouble(5, random.NextDouble());
- //Assert
- Assert.AreEqual(criticalOverToppingDischarge.Mean, input.CriticalOverToppingDischarge.Mean);
- AssertEqualValues(criticalOverToppingDischarge.StandardDeviation, input.CriticalOverToppingDischarge.StandardDeviation);
+ // Call
+ input.WavedirectionDeviation = wavedirectionDeviation;
+
+ // Assert
+ Assert.AreEqual(2, input.WavedirectionDeviation.NumberOfDecimalPlaces);
+ AssertEqualValues(wavedirectionDeviation, input.WavedirectionDeviation);
}
[Test]
@@ -427,23 +436,6 @@
}
[Test]
- public void Properties_WaveDirectionDeviation_ExpectedValues()
- {
- // Setup
- var input = new ClosingStructuresInput();
- var random = new Random(22);
-
- var wavedirectionDeviation = new RoundedDouble(5, random.NextDouble());
-
- // Call
- input.WavedirectionDeviation = wavedirectionDeviation;
-
- // Assert
- Assert.AreEqual(2, input.WavedirectionDeviation.NumberOfDecimalPlaces);
- AssertEqualValues(wavedirectionDeviation, input.WavedirectionDeviation);
- }
-
- [Test]
[TestCase(0)]
[TestCase(0.5)]
[TestCase(1.0)]