Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs =================================================================== diff -u -ra8ffe20fbe684f5020f5158354b33fad488baac9 -r67d6a305cec6967c1247f3d9cba8a817499d2a1d --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs (.../ClosingStructuresCalculation.cs) (revision a8ffe20fbe684f5020f5158354b33fad488baac9) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs (.../ClosingStructuresCalculation.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d) @@ -26,8 +26,14 @@ namespace Ringtoets.ClosingStructures.Data { + /// + /// This class holds information about a calculation for the . + /// public class ClosingStructuresCalculation : Observable, ICalculation { + /// + /// Creates a new instance of . + /// public ClosingStructuresCalculation() { InputParameters = new ClosingStructuresInput(); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs =================================================================== diff -u -ra4f9fbdb0da67d01240f563576818cea46a68fb5 -r67d6a305cec6967c1247f3d9cba8a817499d2a1d --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision a4f9fbdb0da67d01240f563576818cea46a68fb5) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d) @@ -25,7 +25,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.HydraRing.Data; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.ClosingStructures.Data @@ -49,7 +48,6 @@ ClosingStructures = new ObservableList(); sectionResults = new List(); ForeshoreProfiles = new ObservableList(); - HydraulicBoundaryLocations = new ObservableList(); } public override IEnumerable Calculations @@ -71,11 +69,6 @@ public ObservableList ClosingStructures { get; private set; } /// - /// Gets the available hydraulic boundary locations for this instance. - /// - public ObservableList HydraulicBoundaryLocations { get; private set; } - - /// /// Gets the available foreshore profiles for this instance. /// public ObservableList ForeshoreProfiles { get; private set; } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs =================================================================== diff -u -ra4f9fbdb0da67d01240f563576818cea46a68fb5 -r67d6a305cec6967c1247f3d9cba8a817499d2a1d --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision a4f9fbdb0da67d01240f563576818cea46a68fb5) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs (.../ClosingStructuresFailureMechanismTest.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d) @@ -52,7 +52,6 @@ CollectionAssert.IsEmpty(failureMechanism.ClosingStructures); CollectionAssert.IsEmpty(failureMechanism.Calculations); CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); - CollectionAssert.IsEmpty(failureMechanism.HydraulicBoundaryLocations); } [Test] Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -r7a7964c2eb9844cb44c4c02a807bae60e67c4bfe -r67d6a305cec6967c1247f3d9cba8a817499d2a1d --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 7a7964c2eb9844cb44c4c02a807bae60e67c4bfe) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d) @@ -50,36 +50,37 @@ Assert.IsNull(input.HydraulicBoundaryLocation); Assert.IsNull(input.ClosingStructure); - AssertEqualValues(0, input.StructureNormalOrientation); + AssertEqualValue(0, input.StructureNormalOrientation); Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); Assert.IsNull(input.ForeshoreProfile); Assert.IsFalse(input.UseBreakWater); Assert.AreEqual(BreakWaterType.Dam, input.BreakWater.Type); - Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height); + Assert.AreEqual(0, input.BreakWater.Height.Value); + Assert.AreEqual(2, input.BreakWater.Height.NumberOfDecimalPlaces); Assert.IsFalse(input.UseForeshore); CollectionAssert.IsEmpty(input.ForeshoreGeometry); - AssertEqualValues(1.1, input.ModelFactorSuperCriticalFlow.Mean); - AssertEqualValues(0.03, input.ModelFactorSuperCriticalFlow.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.LevelCrestStructureNotClosing.StandardDeviation); - AssertEqualValues(0.1, input.InsideWaterLevel.StandardDeviation); - AssertEqualValues(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation); - AssertEqualValues(0.05, input.FlowWidthAtBottomProtection.StandardDeviation); - AssertEqualValues(6.0, input.StormDuration.Mean); - AssertEqualValues(0.25, input.StormDuration.GetVariationCoefficient()); + AssertEqualValue(1.1, input.ModelFactorSuperCriticalFlow.Mean); + AssertEqualValue(0.03, input.ModelFactorSuperCriticalFlow.StandardDeviation); + AssertEqualValue(0.1, input.ThresholdHeightOpenWeir.StandardDeviation); + AssertEqualValue(1, input.DrainCoefficient.Mean); + AssertEqualValue(0.2, input.DrainCoefficient.StandardDeviation); + AssertEqualValue(0.01, input.AreaFlowApertures.StandardDeviation); + AssertEqualValue(0.05, input.LevelCrestStructureNotClosing.StandardDeviation); + AssertEqualValue(0.1, input.InsideWaterLevel.StandardDeviation); + AssertEqualValue(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation); + AssertEqualValue(0.05, input.FlowWidthAtBottomProtection.StandardDeviation); + AssertEqualValue(6.0, input.StormDuration.Mean); + AssertEqualValue(0.25, input.StormDuration.GetVariationCoefficient()); Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding); } [Test] [TestCase(ClosingStructureType.VerticalWall)] [TestCase(ClosingStructureType.LowSill)] [TestCase(ClosingStructureType.FloodedCulvert)] - public void Properties_Type_ExpectedValues(ClosingStructureType type) + public void ClosingStructureType_SetValue_ReturnSetValue(ClosingStructureType type) { // Setup var input = new ClosingStructuresInput(); @@ -221,7 +222,7 @@ // Assert Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - AssertEqualValues(orientation, input.StructureNormalOrientation); + AssertEqualValue(orientation, input.StructureNormalOrientation); } [Test] @@ -239,7 +240,7 @@ // Assert Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - AssertEqualValues(validValue, input.StructureNormalOrientation); + AssertEqualValue(validValue, input.StructureNormalOrientation); } [Test] @@ -256,7 +257,7 @@ //Assert Assert.AreEqual(modelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.Mean); - AssertEqualValues(initialStd, input.ModelFactorSuperCriticalFlow.StandardDeviation); + AssertEqualValue(initialStd, input.ModelFactorSuperCriticalFlow.StandardDeviation); } [Test] @@ -273,7 +274,7 @@ // Assert Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); - AssertEqualValues(factorStormDuration, input.FactorStormDurationOpenStructure); + AssertEqualValue(factorStormDuration, input.FactorStormDurationOpenStructure); } [Test] @@ -305,7 +306,7 @@ //Assert Assert.AreEqual(drainCoefficient.Mean, input.DrainCoefficient.Mean); - AssertEqualValues(initialStd, input.DrainCoefficient.StandardDeviation); + AssertEqualValue(initialStd, input.DrainCoefficient.StandardDeviation); } [Test] @@ -320,12 +321,13 @@ //Assert Assert.AreEqual(areaFlowApertures.Mean, input.AreaFlowApertures.Mean); - AssertEqualValues(areaFlowApertures.StandardDeviation, input.AreaFlowApertures.StandardDeviation); + AssertEqualValue(areaFlowApertures.StandardDeviation, input.AreaFlowApertures.StandardDeviation); } [Test] [TestCase(-1.1)] [TestCase(2)] + [TestCase(double.NaN)] public void Properties_FailureProbablityOpenStructure_ThrowArgumentException(double probability) { // Setup @@ -357,6 +359,7 @@ [Test] [TestCase(-1.1)] [TestCase(2)] + [TestCase(double.NaN)] public void Properties_FailureProbablityReparation_ThrowArgumentException(double probability) { // Setup @@ -488,12 +491,13 @@ //Assert Assert.AreEqual(criticalOverToppingDischarge.Mean, input.CriticalOverToppingDischarge.Mean); - AssertEqualValues(criticalOverToppingDischarge.StandardDeviation, input.CriticalOverToppingDischarge.StandardDeviation); + AssertEqualValue(criticalOverToppingDischarge.StandardDeviation, input.CriticalOverToppingDischarge.StandardDeviation); } [Test] [TestCase(-1.1)] [TestCase(2)] + [TestCase(double.NaN)] public void Properties_FailureProbabilityStructureWithErosion_ThrowArgumentException(double probability) { // Setup @@ -551,7 +555,7 @@ // Assert Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); - AssertEqualValues(deviationWaveDirection, input.DeviationWaveDirection); + AssertEqualValue(deviationWaveDirection, input.DeviationWaveDirection); } [Test] @@ -568,12 +572,13 @@ //Assert Assert.AreEqual(stormDuration.Mean, input.StormDuration.Mean); - AssertEqualValues(initialStd, input.StormDuration.StandardDeviation); + AssertEqualValue(initialStd, input.StormDuration.StandardDeviation); } [Test] [TestCase(-1.1)] [TestCase(2)] + [TestCase(double.NaN)] public void Properties_ProbabilityOpenStructureBeforeFlooding_ThrowArgumentException(double probability) { // Setup @@ -602,7 +607,7 @@ Assert.AreEqual(probability, input.ProbabilityOpenStructureBeforeFlooding); } - private void AssertEqualValues(double expectedValue, RoundedDouble actualValue) + private void AssertEqualValue(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs =================================================================== diff -u -r516d8aa614cb162c87b4ea643977500c7ac99023 -r67d6a305cec6967c1247f3d9cba8a817499d2a1d --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 516d8aa614cb162c87b4ea643977500c7ac99023) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d) @@ -37,30 +37,30 @@ // Assert Assert.AreEqual(2, inputParameters.C.NumberOfDecimalPlaces); - AssertEqualValues(0.5, inputParameters.C); + AssertEqualValue(0.5, inputParameters.C); Assert.AreEqual(1, inputParameters.N2A); Assert.AreEqual(2, inputParameters.N.NumberOfDecimalPlaces); - AssertEqualValues(1, inputParameters.N); + AssertEqualValue(1, inputParameters.N); Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces); - AssertEqualValues(9.81, inputParameters.GravitationalAcceleration); + AssertEqualValue(9.81, inputParameters.GravitationalAcceleration); Assert.IsInstanceOf(inputParameters.ModelFactorOvertoppingFlow); - AssertEqualValues(0.09, inputParameters.ModelFactorOvertoppingFlow.Mean); - AssertEqualValues(0.06, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation); + AssertEqualValue(0.09, inputParameters.ModelFactorOvertoppingFlow.Mean); + AssertEqualValue(0.06, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation); Assert.IsInstanceOf(inputParameters.ModelFactorSubCriticalFlow); - AssertEqualValues(1, inputParameters.ModelFactorSubCriticalFlow.Mean); - AssertEqualValues(0.1, inputParameters.ModelFactorSubCriticalFlow.GetVariationCoefficient()); + AssertEqualValue(1, inputParameters.ModelFactorSubCriticalFlow.Mean); + AssertEqualValue(0.1, inputParameters.ModelFactorSubCriticalFlow.GetVariationCoefficient()); Assert.IsInstanceOf(inputParameters.ModelFactorStorageVolume); - AssertEqualValues(1.0, inputParameters.ModelFactorStorageVolume.Mean); - AssertEqualValues(0.2, inputParameters.ModelFactorStorageVolume.StandardDeviation); + AssertEqualValue(1.0, inputParameters.ModelFactorStorageVolume.Mean); + AssertEqualValue(0.2, inputParameters.ModelFactorStorageVolume.StandardDeviation); Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces); - AssertEqualValues(1.0, inputParameters.ModelFactorInflowVolume); + AssertEqualValue(1.0, inputParameters.ModelFactorInflowVolume); } [Test] @@ -83,7 +83,7 @@ Assert.AreEqual(expected, n, n.GetAccuracy()); } - private void AssertEqualValues(double expected, RoundedDouble actual) + private void AssertEqualValue(double expected, RoundedDouble actual) { Assert.AreEqual(expected, actual, actual.GetAccuracy()); }