Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra16989b635b3770eb1bbf10c47e41eef796ce2fa -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -192,18 +192,18 @@ /// /// Looks up a localized string similar to Kans op open staan bij naderend hoogwater.. /// - public static string ProbabilityOpenStructureBeforeFlooding_Description { + public static string ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description { get { - return ResourceManager.GetString("ProbabilityOpenStructureBeforeFlooding_Description", resourceCulture); + return ResourceManager.GetString("ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description", resourceCulture); } } /// /// Looks up a localized string similar to Kans op open staan bij naderend hoogwater [1/jaar]. /// - public static string ProbabilityOpenStructureBeforeFlooding_DisplayName { + public static string ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName { get { - return ResourceManager.GetString("ProbabilityOpenStructureBeforeFlooding_DisplayName", resourceCulture); + return ResourceManager.GetString("ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName", resourceCulture); } } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx =================================================================== diff -u -ra16989b635b3770eb1bbf10c47e41eef796ce2fa -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a16989b635b3770eb1bbf10c47e41eef796ce2fa) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -129,10 +129,10 @@ Kruinhoogte niet gesloten kering [m+NAP] - + Kans op open staan bij naderend hoogwater. - + Kans op open staan bij naderend hoogwater [1/jaar] Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -53,7 +53,7 @@ private const int thresholdHeightOpenWeirPropertyIndex = 12; private const int insideWaterLevelPropertyIndex = 13; private const int criticalOvertoppingDischargePropertyIndex = 14; - private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 15; + private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 15; private const int failureProbabilityOpenStructurePropertyIndex = 16; private const int failureProbabilityReparationPropertyIndex = 17; @@ -263,11 +263,11 @@ } } - [PropertyOrder(probabilityOpenStructureBeforeFloodingPropertyIndex)] + [PropertyOrder(probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "ProbabilityOpenStructureBeforeFlooding_DisplayName")] - [ResourcesDescription(typeof(Resources), "ProbabilityOpenStructureBeforeFlooding_Description")] - public string ProbabilityOpenStructureBeforeFlooding + [ResourcesDisplayName(typeof(Resources), "ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName")] + [ResourcesDescription(typeof(Resources), "ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description")] + public string ProbabilityOrFrequencyOpenStructureBeforeFlooding { get { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -62,7 +62,7 @@ private const int levelCrestStructureNotClosingPropertyIndex = 14; private const int thresholdHeightOpenWeirPropertyIndex = 15; private const int criticalOvertoppingDischargePropertyIndex = 16; - private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 17; + private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 17; private const int failureProbabilityOpenStructurePropertyIndex = 18; private const int failureProbabilityReparationPropertyIndex = 19; private const int failureProbabilityStructureWithErosionPropertyIndex = 20; @@ -365,11 +365,11 @@ } } - [PropertyOrder(probabilityOpenStructureBeforeFloodingPropertyIndex)] + [PropertyOrder(probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "ProbabilityOpenStructureBeforeFlooding_DisplayName")] - [ResourcesDescription(typeof(Resources), "ProbabilityOpenStructureBeforeFlooding_Description")] - public string ProbabilityOpenStructureBeforeFlooding + [ResourcesDisplayName(typeof(Resources), "ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName")] + [ResourcesDescription(typeof(Resources), "ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description")] + public string ProbabilityOrFrequencyOpenStructureBeforeFlooding { get { Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -48,7 +48,7 @@ private const int thresholdHeightOpenWeirPropertyIndex = 11; private const int insideWaterLevelPropertyIndex = 12; private const int criticalOvertoppingDischargePropertyIndex = 13; - private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 14; + private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 14; private const int failureProbabilityOpenStructurePropertyIndex = 15; private const int failureProbabilityReparationPropertyIndex = 16; @@ -127,7 +127,7 @@ Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean")); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); - Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding), properties.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding), properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityOpenStructure), properties.FailureProbabilityOpenStructure); Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityReparation), properties.FailureProbabilityReparation); } @@ -260,8 +260,8 @@ "Kritiek instromend debiet directe invoer per strekkende meter.", true); - PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOpenStructureBeforeFloodingPropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty, + PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOrFrequencyOpenStructureBeforeFloodingProperty, schematizationCategory, "Kans op open staan bij naderend hoogwater [1/jaar]", "Kans op open staan bij naderend hoogwater.", Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -rd641f7a03b05f5d7e48f9adeffabafdcb48e1c14 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision d641f7a03b05f5d7e48f9adeffabafdcb48e1c14) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -89,7 +89,7 @@ // Assert ClosingStructuresInput input = calculation.InputParameters; - var expectedProbabilityOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + var expectedProbabilityOrFrequencyOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); var expectedFailureProbabilityOpenStructure = ProbabilityFormattingHelper.Format(input.FailureProbabilityOpenStructure); var expectedFailureProbabilityReparation = ProbabilityFormattingHelper.Format(input.FailureProbabilityReparation); @@ -101,7 +101,7 @@ Assert.AreEqual(input.IdenticalApertures, properties.IdenticalApertures); Assert.AreSame(input.LevelCrestStructureNotClosing, properties.LevelCrestStructureNotClosing.Data); Assert.AreSame(input.ThresholdHeightOpenWeir, properties.ThresholdHeightOpenWeir.Data); - Assert.AreEqual(expectedProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(expectedProbabilityOrFrequencyOpenStructureBeforeFlooding, properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(expectedFailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure); Assert.AreEqual(expectedFailureProbabilityReparation, properties.FailureProbabilityReparation); Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data); @@ -208,30 +208,31 @@ // Call properties.FactorStormDurationOpenStructure = (RoundedDouble) newFactorStormDurationOpenStructure; properties.InflowModelType = newInflowModelType; - properties.FailureProbabilityOpenStructure = "1e-2"; - properties.FailureProbabilityReparation = "1e-3"; + properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = "1e-2"; + properties.FailureProbabilityOpenStructure = "1e-3"; + properties.FailureProbabilityReparation = "1e-4"; properties.IdenticalApertures = newIdenticalApertures; - properties.ProbabilityOpenStructureBeforeFlooding = "1e-4"; + // Assert - var expectedProbabilityOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(0.01); + var expectedProbabilityOrFrequencyOpenStructureBeforeFlooding = ProbabilityFormattingHelper.Format(0.01); var expectedFailureProbabilityOpenStructure = ProbabilityFormattingHelper.Format(0.001); var expectedFailureProbabilityReparation = ProbabilityFormattingHelper.Format(0.0001); Assert.AreEqual(newFactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure, properties.FactorStormDurationOpenStructure.GetAccuracy()); Assert.AreEqual(newInflowModelType, properties.InflowModelType); - Assert.AreEqual(expectedProbabilityOpenStructureBeforeFlooding, properties.FailureProbabilityOpenStructure); - Assert.AreEqual(expectedFailureProbabilityOpenStructure, properties.FailureProbabilityReparation); + Assert.AreEqual(expectedProbabilityOrFrequencyOpenStructureBeforeFlooding, properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedFailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure); + Assert.AreEqual(expectedFailureProbabilityReparation, properties.FailureProbabilityReparation); Assert.AreEqual(newIdenticalApertures, properties.IdenticalApertures); - Assert.AreEqual(expectedFailureProbabilityReparation, properties.ProbabilityOpenStructureBeforeFlooding); mockRepository.VerifyAll(); } [Test] [TestCase(double.MinValue)] [TestCase(double.MaxValue)] - public void SetProbabilityOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentException(double newValue) + public void SetProbabilityOrFrequencyOpenStructureBeforeFlooding_InvalidDoubleValues_ThrowsArgumentException(double newValue) { // Setup var assessmentSectionStub = mockRepository.Stub(); @@ -249,20 +250,56 @@ Data = inputContext }; + const int overflow = 1; + string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.InvariantCulture), overflow); + // Call - TestDelegate call = () => properties.ProbabilityOpenStructureBeforeFlooding = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = newProbabilityString; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); mockRepository.VerifyAll(); } + + [Test] + [TestCase(double.MinValue)] + [TestCase(-1e-8)] + public void SetProbabilityOrFrequencyOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentOutOfRangeException(double newValue) + { + // Setup + var assessmentSectionStub = mockRepository.Stub(); + mockRepository.ReplayAll(); + var failureMechanism = new ClosingStructuresFailureMechanism(); + var calculation = new StructuresCalculation(); + var input = calculation.InputParameters; + var inputContext = new ClosingStructuresInputContext(input, + calculation, + failureMechanism, + assessmentSectionStub); + var properties = new ClosingStructuresInputContextProperties + { + Data = inputContext + }; + + string newProbabilityString = newValue.ToString("r", CultureInfo.InvariantCulture); + + // Call + TestDelegate call = () => properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = newProbabilityString; + + // Assert + var expectedMessage = "De waarde moet groter dan of gelijk aan 0 zijn."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); + + mockRepository.VerifyAll(); + } + [Test] [TestCase("no double value")] [TestCase("")] - public void SetProbabilityOpenStructureBeforeFlooding_ValuesUnableToParse_ThrowsArgumentException(string newValue) + public void SetProbabilityOrFrequencyOpenStructureBeforeFlooding_ValuesUnableToParse_ThrowsArgumentException(string newValue) { // Setup var assessmentSectionStub = mockRepository.Stub(); @@ -281,7 +318,7 @@ }; // Call - TestDelegate call = () => properties.ProbabilityOpenStructureBeforeFlooding = newValue; + TestDelegate call = () => properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = newValue; // Assert var expectedMessage = "De waarde voor de faalkans kon niet geïnterpreteerd worden als een getal."; @@ -291,7 +328,7 @@ } [Test] - public void SetProbabilityOpenStructureBeforeFlooding_NullValue_ThrowsArgumentNullException() + public void SetProbabilityOrFrequencyOpenStructureBeforeFlooding_NullValue_ThrowsArgumentNullException() { // Setup var assessmentSectionStub = mockRepository.Stub(); @@ -310,7 +347,7 @@ }; // Call - TestDelegate call = () => properties.ProbabilityOpenStructureBeforeFlooding = null; + TestDelegate call = () => properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = null; // Assert var expectedMessage = "De waarde voor de faalkans moet ingevuld zijn."; @@ -340,8 +377,11 @@ Data = inputContext }; + const int overflow = 1; + string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.InvariantCulture), overflow); + // Call - TestDelegate call = () => properties.FailureProbabilityOpenStructure = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => properties.FailureProbabilityOpenStructure = newProbabilityString; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein."; @@ -431,8 +471,15 @@ Data = inputContext }; + const int overflow = 1; + string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.InvariantCulture),overflow); + // Call - TestDelegate call = () => properties.FailureProbabilityReparation = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => + { + + properties.FailureProbabilityReparation = newProbabilityString; + }; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein."; @@ -556,11 +603,11 @@ Assert.AreEqual("Kruinhoogte niet gesloten kering [m+NAP]", levelCrestStructureNotClosingProperty.DisplayName); Assert.AreEqual("Niveau kruin bij niet gesloten maximaal kerende keermiddelen.", levelCrestStructureNotClosingProperty.Description); - PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[verticalWallProbabilityOpenStructureBeforeFloodingPropertyIndex]; - Assert.IsFalse(probabilityOpenStructureBeforeFloodingProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, probabilityOpenStructureBeforeFloodingProperty.Category); - Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOpenStructureBeforeFloodingProperty.DisplayName); - Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOpenStructureBeforeFloodingProperty.Description); + PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[verticalWallProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex]; + Assert.IsFalse(probabilityOrFrequencyOpenStructureBeforeFloodingProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Category); + Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.DisplayName); + Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Description); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[verticalWallFailureProbabilityOpenStructurePropertyIndex]; Assert.IsFalse(failureProbabilityOpenStructureProperty.IsReadOnly); @@ -662,11 +709,11 @@ Assert.AreEqual("Aantal identieke doorstroomopeningen [-]", identicalAperturesProperty.DisplayName); Assert.AreEqual("Aantal identieke doorstroomopeningen.", identicalAperturesProperty.Description); - PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[floodedCulvertProbabilityOpenStructureBeforeFloodingPropertyIndex]; - Assert.IsFalse(probabilityOpenStructureBeforeFloodingProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, probabilityOpenStructureBeforeFloodingProperty.Category); - Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOpenStructureBeforeFloodingProperty.DisplayName); - Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOpenStructureBeforeFloodingProperty.Description); + PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[floodedCulvertProbabilityOpenOrFrequencyStructureBeforeFloodingPropertyIndex]; + Assert.IsFalse(probabilityOrFrequencyOpenStructureBeforeFloodingProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Category); + Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.DisplayName); + Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Description); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[floodedCulvertFailureProbabilityOpenStructurePropertyIndex]; Assert.IsFalse(failureProbabilityOpenStructureProperty.IsReadOnly); @@ -771,11 +818,11 @@ Assert.AreEqual("Drempelhoogte [m+NAP]", thresholdHeightOpenWeirProperty.DisplayName); Assert.AreEqual("Drempelhoogte niet gesloten kering of hoogte van de onderkant van de wand/drempel.", thresholdHeightOpenWeirProperty.Description); - PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[lowSillProbabilityOpenStructureBeforeFloodingPropertyIndex]; - Assert.IsFalse(probabilityOpenStructureBeforeFloodingProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, probabilityOpenStructureBeforeFloodingProperty.Category); - Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOpenStructureBeforeFloodingProperty.DisplayName); - Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOpenStructureBeforeFloodingProperty.Description); + PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[lowSillProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex]; + Assert.IsFalse(probabilityOrFrequencyOpenStructureBeforeFloodingProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Category); + Assert.AreEqual("Kans op open staan bij naderend hoogwater [1/jaar]", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.DisplayName); + Assert.AreEqual("Kans op open staan bij naderend hoogwater.", probabilityOrFrequencyOpenStructureBeforeFloodingProperty.Description); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[lowSillFailureProbabilityOpenStructurePropertyIndex]; Assert.IsFalse(failureProbabilityOpenStructureProperty.IsReadOnly); @@ -1005,7 +1052,7 @@ private const int verticalWallAllowedLevelIncreaseStoragePropertyIndex = 10; private const int verticalWallLevelCrestStructureNotClosingPropertyIndex = 11; private const int verticalWallCriticalOvertoppingDischargePropertyIndex = 12; - private const int verticalWallProbabilityOpenStructureBeforeFloodingPropertyIndex = 13; + private const int verticalWallProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 13; private const int verticalWallFailureProbabilityOpenStructurePropertyIndex = 14; private const int verticalWallFailureProbabilityReparationPropertyIndex = 15; private const int verticalWallFailureProbabilityStructureWithErosionPropertyIndex = 16; @@ -1032,7 +1079,7 @@ private const int lowSillAllowedLevelIncreaseStoragePropertyIndex = 10; private const int lowSillThresholdHeightOpenWeirPropertyIndex = 11; private const int lowSillCriticalOvertoppingDischargePropertyIndex = 12; - private const int lowSillProbabilityOpenStructureBeforeFloodingPropertyIndex = 13; + private const int lowSillProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 13; private const int lowSillFailureProbabilityOpenStructurePropertyIndex = 14; private const int lowSillFailureProbabilityReparationPropertyIndex = 15; private const int lowSillFailureProbabilityStructureWithErosionPropertyIndex = 16; @@ -1058,7 +1105,7 @@ private const int floodedCulvertStorageStructureAreaPropertyIndex = 9; private const int floodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 10; private const int floodedCulvertCriticalOvertoppingDischargePropertyIndex = 11; - private const int floodedCulvertProbabilityOpenStructureBeforeFloodingPropertyIndex = 12; + private const int floodedCulvertProbabilityOpenOrFrequencyStructureBeforeFloodingPropertyIndex = 12; private const int floodedCulvertFailureProbabilityOpenStructurePropertyIndex = 13; private const int floodedCulvertFailureProbabilityReparationPropertyIndex = 14; private const int floodedCulvertFailureProbabilityStructureWithErosionPropertyIndex = 15; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -51,7 +51,7 @@ private readonly double failureProbabilityStructureWithErosion; private readonly double stormDurationMean; private readonly double stormDurationVariation; - private readonly double probabilityOpenStructureBeforeFlooding; + private readonly double probabilityOrFrequencyOpenStructureBeforeFlooding; /// /// Creates a new instance of . @@ -79,7 +79,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability of an open structure before flooding. + /// The probability or frequency of an open structure before flooding. protected StructuresClosureCalculationInput(long hydraulicBoundaryLocationId, HydraRingSection section, IEnumerable forelandPoints, HydraRingBreakWater breakWater, @@ -96,7 +96,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOpenStructureBeforeFlooding) + double probabilityOrFrequencyOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId) { this.section = section; @@ -121,7 +121,7 @@ this.failureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; this.stormDurationMean = stormDurationMean; this.stormDurationVariation = stormDurationVariation; - this.probabilityOpenStructureBeforeFlooding = probabilityOpenStructureBeforeFlooding; + this.probabilityOrFrequencyOpenStructureBeforeFlooding = probabilityOrFrequencyOpenStructureBeforeFlooding; } public override HydraRingFailureMechanismType FailureMechanismType @@ -165,7 +165,7 @@ yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation); yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation); - yield return new DeterministicHydraRingVariable(129, probabilityOpenStructureBeforeFlooding); + yield return new DeterministicHydraRingVariable(129, probabilityOrFrequencyOpenStructureBeforeFlooding); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -63,7 +63,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability of an open structure before flooding. + /// The probability of an open structure before flooding. /// The mean of the drain coefficient. /// The standard deviation of the drain coefficient. /// The mean of the area of flow apertures. @@ -86,7 +86,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOpenStructureBeforeFlooding, + double probabilityOrFrequencyOpenStructureBeforeFlooding, double drainCoefficientMean, double drainCoefficientStandardDeviation, double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation) @@ -105,7 +105,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding) + probabilityOrFrequencyOpenStructureBeforeFlooding) { this.drainCoefficientMean = drainCoefficientMean; this.drainCoefficientStandardDeviation = drainCoefficientStandardDeviation; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -67,7 +67,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability of an open structure before flooding. + /// The probability or frequency of an open structure before flooding. /// The mean of the model factor super critical flow. /// The standard deviation of the model factor super critical flow. /// The mean of the model factor sub critical flow. @@ -94,7 +94,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOpenStructureBeforeFlooding, + double probabilityOrFrequencyOpenStructureBeforeFlooding, double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, double modelFactorSubCriticalFlowMean, double modelFactorSubCriticalFlowVariation, double thresholdHeightOpenWeirMean, double thresholdHeightOpenWeirStandardDeviation, @@ -115,7 +115,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding) + probabilityOrFrequencyOpenStructureBeforeFlooding) { this.modelFactorSuperCriticalFlowMean = modelFactorSuperCriticalFlowMean; this.modelFactorSuperCriticalFlowStandardDeviation = modelFactorSuperCriticalFlowStandardDeviation; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -67,7 +67,7 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. - /// The probability of an open structure before flooding. + /// The probability or frequency of an open structure before flooding. /// The mean of the model factor overtopping flow. /// The standard deviation of the model factor overtopping flow. /// The orientation of the normal of the structure. @@ -94,7 +94,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOpenStructureBeforeFlooding, + double probabilityOrFrequencyOpenStructureBeforeFlooding, double modelFactorOvertoppingFlowMean, double modelFactorOvertoppingFlowStandardDeviation, double structureNormalOrientation, double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation, @@ -116,7 +116,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding) + probabilityOrFrequencyOpenStructureBeforeFlooding) { this.modelFactorOvertoppingFlowMean = modelFactorOvertoppingFlowMean; this.modelFactorOvertoppingFlowStandardDeviation = modelFactorOvertoppingFlowStandardDeviation; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -62,7 +62,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOpenStructureBeforeFlooding = 20.0; + const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; // Call var input = new TestStructuresClosureCalculationInput(hydraulicBoundaryLocationId, section, @@ -80,7 +80,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding); + probabilityOrFrequencyOpenStructureBeforeFlooding); // Assert Assert.IsInstanceOf(input); @@ -130,7 +130,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, - double probabilityOpenStructureBeforeFlooding) + double probabilityOrFrequencyOpenStructureBeforeFlooding) : base(hydraulicBoundaryLocationId, section, forelandPoints, breakWater, gravitationalAcceleration, @@ -146,7 +146,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding) {} + probabilityOrFrequencyOpenStructureBeforeFlooding) {} public override int? GetSubMechanismModelId(int subMechanismId) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOpenStructureBeforeFlooding = 20.0; + const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; const double drainCoefficientMean = 21.1; const double drainCoefficientStandardDeviation = 22.2; const double areaFlowAperturesMean = 23.3; @@ -84,7 +84,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding, + probabilityOrFrequencyOpenStructureBeforeFlooding, drainCoefficientMean, drainCoefficientStandardDeviation, areaFlowAperturesMean, areaFlowAperturesStandardDeviation, insideWaterLevelMean, insideWaterLevelStandardDeviation); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOpenStructureBeforeFlooding = 20.0; + const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; const double modelFactorSuperCriticalFlowMean = 21.1; const double modelFactorSuperCriticalFlowStandardDeviation = 22.2; const double modelFactorSubCriticalFlowMean = 23.3; @@ -88,7 +88,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding, + probabilityOrFrequencyOpenStructureBeforeFlooding, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r92ce01ec6a2ac8d64f77a2a618c6b6e410a78812 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 92ce01ec6a2ac8d64f77a2a618c6b6e410a78812) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -60,7 +60,7 @@ const double failureProbabilityStructureWithErosion = 17.7; const double stormDurationMean = 18.8; const double stormDurationVariation = 19.9; - const double probabilityOpenStructureBeforeFlooding = 20.0; + const double probabilityOrFrequencyOpenStructureBeforeFlooding = 20.0; const double modelFactorOvertoppingFlowMean = 21.1; const double modelFactorOvertoppingFlowStandardDeviation = 22.2; const double structureNormalOrientation = 23.3; @@ -88,7 +88,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, - probabilityOpenStructureBeforeFlooding, + probabilityOrFrequencyOpenStructureBeforeFlooding, modelFactorOvertoppingFlowMean, modelFactorOvertoppingFlowStandardDeviation, structureNormalOrientation, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r9a46b1398c3a83b8f5c06254ccb9808f33eb2531 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 9a46b1398c3a83b8f5c06254ccb9808f33eb2531) @@ -269,8 +269,11 @@ Data = inputContext }; + const int overflow = 1; + string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.InvariantCulture), overflow); + // Call - TestDelegate call = () => properties.FailureProbabilityRepairClosure = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => properties.FailureProbabilityRepairClosure = newProbabilityString; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein."; @@ -360,8 +363,11 @@ Data = inputContext }; + const int overflow = 1; + string newProbabilityString = string.Concat(newValue.ToString("r", CultureInfo.InvariantCulture), overflow); + // Call - TestDelegate call = () => properties.ProbabilityCollisionSecondaryStructure = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => properties.ProbabilityCollisionSecondaryStructure = newProbabilityString; // Assert var expectedMessage = "De waarde voor de faalkans is te groot of te klein.";