Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -r589d56ba6dc9217ff4b68ea15df5a513576a25d1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 589d56ba6dc9217ff4b68ea15df5a513576a25d1) @@ -56,10 +56,9 @@ /// public HeightStructuresInput() { - failureProbabilityStructureWithErosion = 1.0; - levelCrestStructure = new NormalDistribution(2) { + Mean = (RoundedDouble) double.NaN, StandardDeviation = (RoundedDouble) 0.05 }; @@ -79,7 +78,7 @@ storageStructureArea = new VariationCoefficientLogNormalDistribution(2) { - Mean = (RoundedDouble) 1.0, + Mean = (RoundedDouble) double.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; @@ -91,16 +90,19 @@ criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) { - Mean = (RoundedDouble) 1.0, + Mean = (RoundedDouble) double.NaN, CoefficientOfVariation = (RoundedDouble) 0.15 }; + failureProbabilityStructureWithErosion = double.NaN; + widthFlowApertures = new VariationCoefficientNormalDistribution(2) { + Mean = (RoundedDouble) double.NaN, CoefficientOfVariation = (RoundedDouble) 0.05 }; - deviationWaveDirection = new RoundedDouble(2); + deviationWaveDirection = new RoundedDouble(2, double.NaN); stormDuration = new VariationCoefficientLogNormalDistribution(2) { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -re390f6a1553c21ed32ebf3426f35cc0924a9900c -r589d56ba6dc9217ff4b68ea15df5a513576a25d1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision e390f6a1553c21ed32ebf3426f35cc0924a9900c) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 589d56ba6dc9217ff4b68ea15df5a513576a25d1) @@ -58,15 +58,23 @@ AssertAreEqual(double.NaN, input.StructureNormalOrientation); Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - + AssertAreEqual(double.NaN, input.LevelCrestStructure.Mean); AssertAreEqual(0.05, input.LevelCrestStructure.StandardDeviation); AssertAreEqual(1.1, input.ModelFactorSuperCriticalFlow.Mean); AssertAreEqual(0.03, input.ModelFactorSuperCriticalFlow.StandardDeviation); + AssertAreEqual(double.NaN, input.AllowedLevelIncreaseStorage.Mean); AssertAreEqual(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation); + AssertAreEqual(double.NaN, input.StorageStructureArea.Mean); AssertAreEqual(0.1, input.StorageStructureArea.CoefficientOfVariation); + AssertAreEqual(double.NaN, input.FlowWidthAtBottomProtection.Mean); AssertAreEqual(0.05, input.FlowWidthAtBottomProtection.StandardDeviation); + AssertAreEqual(double.NaN, input.CriticalOvertoppingDischarge.Mean); AssertAreEqual(0.15, input.CriticalOvertoppingDischarge.CoefficientOfVariation); + Assert.IsNaN(input.FailureProbabilityStructureWithErosion); + AssertAreEqual(double.NaN, input.WidthFlowApertures.Mean); AssertAreEqual(0.05, input.WidthFlowApertures.CoefficientOfVariation); + Assert.IsNaN(input.DeviationWaveDirection); + Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); AssertAreEqual(6.0, input.StormDuration.Mean); AssertAreEqual(0.25, input.StormDuration.CoefficientOfVariation); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs =================================================================== diff -u -rc3c2bba57ff003c569aefa73e42ac6122fcf5bfa -r589d56ba6dc9217ff4b68ea15df5a513576a25d1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs (.../TestHeightStructuresCalculation.cs) (revision c3c2bba57ff003c569aefa73e42ac6122fcf5bfa) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs (.../TestHeightStructuresCalculation.cs) (revision 589d56ba6dc9217ff4b68ea15df5a513576a25d1) @@ -28,11 +28,13 @@ public TestHeightStructuresCalculation() { InputParameters.LevelCrestStructure.Mean = (RoundedDouble) 5.74; + InputParameters.StorageStructureArea.Mean = (RoundedDouble) 1.0; InputParameters.StructureNormalOrientation = (RoundedDouble) 115; InputParameters.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) 1.0; InputParameters.FlowWidthAtBottomProtection.Mean = (RoundedDouble) 18; InputParameters.CriticalOvertoppingDischarge.Mean = (RoundedDouble) 1; InputParameters.WidthFlowApertures.Mean = (RoundedDouble) 18; + InputParameters.FailureProbabilityStructureWithErosion = 1.0; InputParameters.DeviationWaveDirection = (RoundedDouble) 0; } }