Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs =================================================================== diff -u -r655bf07f2f48502ad49bb0980514db70dbe71704 -ra99b18246b00d4c622d0fe932c35ff5454339f8b --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 655bf07f2f48502ad49bb0980514db70dbe71704) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision a99b18246b00d4c622d0fe932c35ff5454339f8b) @@ -450,6 +450,23 @@ #region Schematization /// + /// Gets or sets the level crest of the structure. + /// [m+NAP] + /// + public NormalDistribution LevelCrestStructure + { + get + { + return levelCrestStructure; + } + set + { + levelCrestStructure.Mean = value.Mean; + levelCrestStructure.StandardDeviation = value.StandardDeviation; + } + } + + /// /// Gets or sets the orientation of the normal of the structure. /// [degrees] /// @@ -478,26 +495,9 @@ } /// - /// Gets or sets the level crest of the structure. + /// Gets or sets the threshold height of the open weir. /// [m+NAP] /// - public NormalDistribution LevelCrestStructure - { - get - { - return levelCrestStructure; - } - set - { - levelCrestStructure.Mean = value.Mean; - levelCrestStructure.StandardDeviation = value.StandardDeviation; - } - } - - /// - /// Gets or sets the threshold height of the open weir. - /// [m+MAP] - /// public NormalDistribution ThresholdHeightOpenWeir { get @@ -581,7 +581,7 @@ /// /// Gets or sets the stability properties of the quadratic model. - /// [kN/m^2] + /// [kN/m] /// public VariationCoefficientLogNormalDistribution StabilityQuadraticModel { @@ -671,7 +671,7 @@ /// Gets or sets the levelling count. /// [1/year] /// - public int LevellingCount { get; set; } + public int LevelingCount { get; set; } /// /// Gets or sets the probability of a secondary collision on the structure. Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs =================================================================== diff -u -r655bf07f2f48502ad49bb0980514db70dbe71704 -ra99b18246b00d4c622d0fe932c35ff5454339f8b --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 655bf07f2f48502ad49bb0980514db70dbe71704) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision a99b18246b00d4c622d0fe932c35ff5454339f8b) @@ -81,43 +81,29 @@ Assert.IsNaN(input.LevelCrestStructure.Mean); AssertEqualValue(0.05, input.LevelCrestStructure.StandardDeviation); - Assert.IsNaN(input.ThresholdHeightOpenWeir.Mean); AssertEqualValue(0.1, input.ThresholdHeightOpenWeir.StandardDeviation); - Assert.IsNaN(input.AreaFlowApertures.Mean); AssertEqualValue(0.01, input.AreaFlowApertures.StandardDeviation); - Assert.IsNaN(input.ConstructiveStrengthLinearLoadModel.Mean); AssertEqualValue(0.1, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation); - Assert.IsNaN(input.ConstructiveStrengthQuadraticLoadModel.Mean); AssertEqualValue(0.1, input.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation); - Assert.IsNaN(input.StabilityLinearModel.Mean); AssertEqualValue(0.1, input.StabilityLinearModel.CoefficientOfVariation); - Assert.IsNaN(input.StabilityQuadraticModel.Mean); AssertEqualValue(0.1, input.StabilityQuadraticModel.CoefficientOfVariation); - Assert.IsNaN(input.FailureProbabilityRepairClosure); - Assert.IsNaN(input.FailureCollisionEnergy.Mean); AssertEqualValue(0.3, input.FailureCollisionEnergy.CoefficientOfVariation); - Assert.IsNaN(input.ShipMass.Mean); AssertEqualValue(0.2, input.ShipMass.CoefficientOfVariation); - Assert.IsNaN(input.ShipVelocity.Mean); AssertEqualValue(0.2, input.ShipVelocity.CoefficientOfVariation); - - Assert.AreEqual(0, input.LevellingCount); - + Assert.AreEqual(0, input.LevelingCount); Assert.AreEqual(double.NaN, input.ProbabilityCollisionSecondaryStructure); - AssertEqualValue(double.NaN, input.AllowedLevelIncreaseStorage.Mean); AssertEqualValue(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation); - Assert.IsNaN(input.StorageStructureArea.Mean); AssertEqualValue(0.1, input.StorageStructureArea.CoefficientOfVariation); AssertEqualValue(double.NaN, input.FlowWidthAtBottomProtection.Mean); @@ -135,6 +121,10 @@ AssertEqualValue(double.NaN, input.VerticalDistance); } + # region Calculation inputs + + #endregion + #region Hydraulic loads and data [Test] @@ -612,19 +602,19 @@ } [Test] - public void Properties_IdenticalApertures_ExpectedValues() + public void Properties_LevelingCount_ExpectedValues() { // Setup var input = new StabilityPointStructuresInput(); var random = new Random(22); - int levellingCount = random.Next(); + int levelingCount = random.Next(); // Call - input.LevellingCount = levellingCount; + input.LevelingCount = levelingCount; // Assert - Assert.AreEqual(levellingCount, input.LevellingCount); + Assert.AreEqual(levelingCount, input.LevelingCount); } [Test]