Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs =================================================================== diff -u -rcdf8d6210440a5ab6aa416a0a8f15150bfdb7740 -ra9f70d39c270923fa120d64dc1c9d9e1752fd42d --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision cdf8d6210440a5ab6aa416a0a8f15150bfdb7740) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision a9f70d39c270923fa120d64dc1c9d9e1752fd42d) @@ -69,29 +69,14 @@ drainCoefficient = new NormalDistribution(2) { - Mean = (RoundedDouble) 1.0, + Mean = (RoundedDouble) 1.0, StandardDeviation = (RoundedDouble) 0.20 }; - insideWaterLevelFailureConstruction = new NormalDistribution(2) - { - Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 - }; + insideWaterLevelFailureConstruction = new NormalDistribution(2); + insideWaterLevel = new NormalDistribution(2); + flowVelocityStructureClosable = new NormalDistribution(2); - insideWaterLevel = new NormalDistribution(2) - { - Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 - - }; - - flowVelocityStructureClosable = new NormalDistribution(2) - { - Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 1 - }; - levelCrestStructure = new NormalDistribution(2); thresholdHeightOpenWeir = new NormalDistribution(2); areaFlowApertures = new LogNormalDistribution(2); @@ -146,80 +131,98 @@ private void SetDefaultSchematizationProperties() { - EvaluationLevel = (RoundedDouble) 0.0; + EvaluationLevel = (RoundedDouble) double.NaN; FailureProbabilityRepairClosure = (RoundedDouble) 0.0; InflowModelType = 0; LoadSchematizationType = 0; StructureNormalOrientation = (RoundedDouble) double.NaN; VerticalDistance = (RoundedDouble) double.NaN; LevellingCount = 0; ProbabilityCollisionSecondaryStructure = 0.0; - + LevelCrestStructure = new NormalDistribution { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = RoundedDouble.NaN }; ThresholdHeightOpenWeir = new NormalDistribution { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = RoundedDouble.NaN }; AreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.01 + StandardDeviation = RoundedDouble.NaN }; ConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; ConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; StabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; StabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; FailureCollisionEnergy = new VariationCoefficientLogNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.3 + CoefficientOfVariation = RoundedDouble.NaN }; ShipMass = new VariationCoefficientNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; ShipVelocity = new VariationCoefficientNormalDistribution { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; BankWidth = new NormalDistribution { Mean = RoundedDouble.NaN, StandardDeviation = RoundedDouble.NaN }; + + InsideWaterLevel = new NormalDistribution + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + + InsideWaterLevelFailureConstruction = new NormalDistribution + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + + FlowVelocityStructureClosable = new NormalDistribution + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; } #region Structure / calculation Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs =================================================================== diff -u -r048a25c14a65ee63063d044a152f32dca20cbe15 -ra9f70d39c270923fa120d64dc1c9d9e1752fd42d --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 048a25c14a65ee63063d044a152f32dca20cbe15) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision a9f70d39c270923fa120d64dc1c9d9e1752fd42d) @@ -48,13 +48,13 @@ var expectedInsideWaterLevelFailureConstruction = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = RoundedDouble.NaN }; var expectedInsideWaterLevel = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = RoundedDouble.NaN }; var expectedDrainCoefficient = new NormalDistribution(2) @@ -66,67 +66,67 @@ var expectedFlowVelocityStructureClosable = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 1 + StandardDeviation = RoundedDouble.NaN }; var expectedLevelCrestStructure = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = RoundedDouble.NaN }; var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = RoundedDouble.NaN }; var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.01 + StandardDeviation = RoundedDouble.NaN }; var expectedConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedStabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedStabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedFailureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.3 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedShipMass = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedShipVelocity = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedBankWidth = new NormalDistribution(2) @@ -158,7 +158,7 @@ Assert.AreEqual(0, input.ProbabilityCollisionSecondaryStructure); DistributionAssert.AreEqual(expectedBankWidth, input.BankWidth); Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); - AssertAreEqual(0, input.EvaluationLevel); + AssertAreEqual(double.NaN, input.EvaluationLevel); Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); AssertAreEqual(double.NaN, input.VerticalDistance); @@ -202,76 +202,70 @@ // Then AssertAreEqual(expectedVolumicWeightWater, input.VolumicWeightWater); - DistributionAssert.AreEqual(structure.InsideWaterLevelFailureConstruction, - input.InsideWaterLevelFailureConstruction); - DistributionAssert.AreEqual(structure.InsideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); Assert.AreEqual(expectedFactorStormDurationOpenStructure, input.FactorStormDurationOpenStructure, input.FactorStormDurationOpenStructure.GetAccuracy()); - DistributionAssert.AreEqual(structure.FlowVelocityStructureClosable, input.FlowVelocityStructureClosable); DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient); - Assert.AreEqual(expectedFailureProbabilityStructureWithErosion, - input.FailureProbabilityStructureWithErosion); + Assert.AreEqual(expectedFailureProbabilityStructureWithErosion, input.FailureProbabilityStructureWithErosion); var expectedLevelCrestStructure = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = RoundedDouble.NaN }; var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = RoundedDouble.NaN }; var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.01 + StandardDeviation = RoundedDouble.NaN }; var expectedConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedStabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedStabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedFailureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.3 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedShipMass = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedShipVelocity = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = RoundedDouble.NaN }; var expectedBankWidth = new NormalDistribution(2) @@ -280,6 +274,24 @@ StandardDeviation = RoundedDouble.NaN }; + var expectedInsideWaterLevelFailureConstruction = new NormalDistribution(2) + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + + var expectedInsideWaterLevel = new NormalDistribution(2) + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + + var expectedFlowVelocityStructureClosable = new NormalDistribution(2) + { + Mean = RoundedDouble.NaN, + StandardDeviation = RoundedDouble.NaN + }; + DistributionAssert.AreEqual(expectedLevelCrestStructure, input.LevelCrestStructure); DistributionAssert.AreEqual(expectedThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); @@ -294,8 +306,11 @@ Assert.AreEqual(0, input.LevellingCount); Assert.AreEqual(0, input.ProbabilityCollisionSecondaryStructure); DistributionAssert.AreEqual(expectedBankWidth, input.BankWidth); + DistributionAssert.AreEqual(expectedInsideWaterLevelFailureConstruction, input.InsideWaterLevelFailureConstruction); + DistributionAssert.AreEqual(expectedInsideWaterLevel, input.InsideWaterLevel); + DistributionAssert.AreEqual(expectedFlowVelocityStructureClosable, input.FlowVelocityStructureClosable); Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); - AssertAreEqual(0, input.EvaluationLevel); + AssertAreEqual(double.NaN, input.EvaluationLevel); Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); AssertAreEqual(double.NaN, input.VerticalDistance);