Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r6ac1d016e76120e778964de3ad7e2c0d6c837669 -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6ac1d016e76120e778964de3ad7e2c0d6c837669)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -192,18 +192,18 @@
///
/// Looks up a localized string similar to Kans op open staan bij naderend hoogwater..
///
- public static string ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description {
+ public static string ProbabilityOpenStructureBeforeFlooding_Description {
get {
- return ResourceManager.GetString("ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description", resourceCulture);
+ return ResourceManager.GetString("ProbabilityOpenStructureBeforeFlooding_Description", resourceCulture);
}
}
///
/// Looks up a localized string similar to Kans op open staan bij naderend hoogwater [1/jaar].
///
- public static string ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName {
+ public static string ProbabilityOpenStructureBeforeFlooding_DisplayName {
get {
- return ResourceManager.GetString("ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName", resourceCulture);
+ return ResourceManager.GetString("ProbabilityOpenStructureBeforeFlooding_DisplayName", resourceCulture);
}
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r6ac1d016e76120e778964de3ad7e2c0d6c837669 -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6ac1d016e76120e778964de3ad7e2c0d6c837669)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -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 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -54,7 +54,7 @@
private const int thresholdHeightOpenWeirPropertyIndex = 13;
private const int insideWaterLevelPropertyIndex = 14;
private const int criticalOvertoppingDischargePropertyIndex = 15;
- private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 16;
+ private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 16;
private const int failureProbabilityOpenStructurePropertyIndex = 17;
private const int failureProbabilityReparationPropertyIndex = 18;
@@ -249,11 +249,11 @@
}
}
- [PropertyOrder(probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex)]
+ [PropertyOrder(probabilityOpenStructureBeforeFloodingPropertyIndex)]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description))]
- public string ProbabilityOrFrequencyOpenStructureBeforeFlooding
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityOpenStructureBeforeFlooding_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityOpenStructureBeforeFlooding_Description))]
+ public string ProbabilityOpenStructureBeforeFlooding
{
get
{
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -64,7 +64,7 @@
private const int levelCrestStructureNotClosingPropertyIndex = 14;
private const int thresholdHeightOpenWeirPropertyIndex = 15;
private const int criticalOvertoppingDischargePropertyIndex = 16;
- private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 17;
+ private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 17;
private const int failureProbabilityOpenStructurePropertyIndex = 18;
private const int failureProbabilityReparationPropertyIndex = 19;
private const int failureProbabilityStructureWithErosionPropertyIndex = 20;
@@ -196,7 +196,7 @@
{
return nameof(InflowModelType).Equals(property)
|| nameof(IdenticalApertures).Equals(property)
- || nameof(ProbabilityOrFrequencyOpenStructureBeforeFlooding).Equals(property)
+ || nameof(ProbabilityOpenStructureBeforeFlooding).Equals(property)
|| nameof(FailureProbabilityOpenStructure).Equals(property)
|| nameof(FailureProbabilityReparation).Equals(property)
|| base.ShouldPropertyBeReadOnlyInAbsenseOfStructure(property);
@@ -401,12 +401,12 @@
}
[DynamicReadOnly]
- [PropertyOrder(probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex)]
+ [PropertyOrder(probabilityOpenStructureBeforeFloodingPropertyIndex)]
[TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityOrFrequencyOpenStructureBeforeFlooding_Description))]
- public double ProbabilityOrFrequencyOpenStructureBeforeFlooding
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.ProbabilityOpenStructureBeforeFlooding_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.ProbabilityOpenStructureBeforeFlooding_Description))]
+ public double ProbabilityOpenStructureBeforeFlooding
{
get
{
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs
===================================================================
diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -295,7 +295,7 @@
CreateTestClosingStructureConstructionProperties();
differentProbabilityOpenStructureBeforeFloodingConstructionProperties.ProbabilityOpenStructureBeforeFlooding = random.NextDouble();
yield return new TestCaseData(new ClosingStructure(differentProbabilityOpenStructureBeforeFloodingConstructionProperties))
- .SetName($"{targetName}_DifferentProbabilityOrFrequencyOpenStructureBeforeFlooding_{testResultDescription}");
+ .SetName($"{targetName}_DifferentProbabilityOpenStructureBeforeFlooding_{testResultDescription}");
ClosingStructure.ConstructionProperties differentStructureNormalOrientationConstructionProperties =
CreateTestClosingStructureConstructionProperties();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs
===================================================================
diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -49,7 +49,7 @@
private const int thresholdHeightOpenWeirPropertyIndex = 12;
private const int insideWaterLevelPropertyIndex = 13;
private const int criticalOvertoppingDischargePropertyIndex = 14;
- private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 15;
+ private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 15;
private const int failureProbabilityOpenStructurePropertyIndex = 16;
private const int failureProbabilityReparationPropertyIndex = 17;
@@ -129,7 +129,7 @@
Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean"));
Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("CoefficientOfVariation"));
- Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOpenStructureBeforeFlooding), properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding);
+ Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOpenStructureBeforeFlooding), properties.ProbabilityOpenStructureBeforeFlooding);
Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityOpenStructure), properties.FailureProbabilityOpenStructure);
Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityReparation), properties.FailureProbabilityReparation);
}
@@ -269,8 +269,8 @@
"Kritiek instromend debiet directe invoer per strekkende meter.",
true);
- PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOrFrequencyOpenStructureBeforeFloodingProperty,
+ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOpenStructureBeforeFloodingPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty,
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 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c -rb12f00efd92f6777faae2c4e00f70e10c1930d96
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision b12f00efd92f6777faae2c4e00f70e10c1930d96)
@@ -139,7 +139,7 @@
Assert.AreEqual(input.IdenticalApertures, properties.IdenticalApertures);
Assert.AreSame(input.LevelCrestStructureNotClosing, properties.LevelCrestStructureNotClosing.Data);
Assert.AreSame(input.ThresholdHeightOpenWeir, properties.ThresholdHeightOpenWeir.Data);
- Assert.AreEqual(input.ProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding);
+ Assert.AreEqual(input.ProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOpenStructureBeforeFlooding);
Assert.AreEqual(input.FailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure);
Assert.AreEqual(input.FailureProbabilityReparation, properties.FailureProbabilityReparation);
Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data);
@@ -152,7 +152,7 @@
nameof(ClosingStructuresInputContextProperties.FailureProbabilityOpenStructure));
TestHelper.AssertTypeConverter(
- nameof(ClosingStructuresInputContextProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding));
+ nameof(ClosingStructuresInputContextProperties.ProbabilityOpenStructureBeforeFlooding));
TestHelper.AssertTypeConverter(
nameof(ClosingStructuresInputContextProperties.FailureProbabilityReparation));
@@ -212,8 +212,8 @@
true);
DistributionPropertiesTestHelper.AssertPropertiesAreReadOnly(properties.LevelCrestStructureNotClosing, false, false);
- PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[verticalWallProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOrFrequencyOpenStructureBeforeFloodingProperty,
+ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[verticalWallProbabilityOpenStructureBeforeFloodingPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty,
schematizationCategory,
"Kans op open staan bij naderend hoogwater [1/jaar]",
"Kans op open staan bij naderend hoogwater.");
@@ -319,8 +319,8 @@
"Aantal identieke doorstroomopeningen [-]",
"Aantal identieke doorstroomopeningen.");
- PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[floodedCulvertProbabilityOpenOrFrequencyStructureBeforeFloodingPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOrFrequencyOpenStructureBeforeFloodingProperty,
+ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[floodedCulvertProbabilityOpenStructureBeforeFloodingPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty,
schematizationCategory,
"Kans op open staan bij naderend hoogwater [1/jaar]",
"Kans op open staan bij naderend hoogwater.");
@@ -432,8 +432,8 @@
true);
DistributionPropertiesTestHelper.AssertPropertiesAreReadOnly(properties.ThresholdHeightOpenWeir, false, false);
- PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFloodingProperty = dynamicProperties[lowSillProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOrFrequencyOpenStructureBeforeFloodingProperty,
+ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[lowSillProbabilityOpenStructureBeforeFloodingPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty,
schematizationCategory,
"Kans op open staan bij naderend hoogwater [1/jaar]",
"Kans op open staan bij naderend hoogwater.");
@@ -503,8 +503,8 @@
PropertyDescriptor identicalApertures = dynamicProperties[identicalAperturesPropertyIndex];
Assert.IsTrue(identicalApertures.IsReadOnly);
- PropertyDescriptor probabilityOrFrequencyOpenStructureBeforeFlooding = dynamicProperties[probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex];
- Assert.IsTrue(probabilityOrFrequencyOpenStructureBeforeFlooding.IsReadOnly);
+ PropertyDescriptor probabilityOpenStructureBeforeFlooding = dynamicProperties[probabilityOpenStructureBeforeFloodingPropertyIndex];
+ Assert.IsTrue(probabilityOpenStructureBeforeFlooding.IsReadOnly);
PropertyDescriptor failureProbabilityOpenStructure = dynamicProperties[failureProbabilityOpenStructurePropertyIndex];
Assert.IsTrue(failureProbabilityOpenStructure.IsReadOnly);
@@ -590,11 +590,11 @@
}
[Test]
- public void ProbabilityOrFrequencyOpenStructureBeforeFlooding_Always_InputChangedAndObservablesNotified()
+ public void ProbabilityOpenStructureBeforeFlooding_Always_InputChangedAndObservablesNotified()
{
var random = new Random(21);
SetPropertyAndVerifyNotificationsAndOutput(
- properties => properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextDouble());
+ properties => properties.ProbabilityOpenStructureBeforeFlooding = random.NextDouble());
}
[Test]
@@ -892,7 +892,7 @@
private const int verticalWallAllowedLevelIncreaseStoragePropertyIndex = 10;
private const int verticalWallLevelCrestStructureNotClosingPropertyIndex = 11;
private const int verticalWallCriticalOvertoppingDischargePropertyIndex = 12;
- private const int verticalWallProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 13;
+ private const int verticalWallProbabilityOpenStructureBeforeFloodingPropertyIndex = 13;
private const int verticalWallFailureProbabilityOpenStructurePropertyIndex = 14;
private const int verticalWallFailureProbabilityReparationPropertyIndex = 15;
private const int verticalWallFailureProbabilityStructureWithErosionPropertyIndex = 16;
@@ -920,7 +920,7 @@
private const int lowSillAllowedLevelIncreaseStoragePropertyIndex = 10;
private const int lowSillThresholdHeightOpenWeirPropertyIndex = 11;
private const int lowSillCriticalOvertoppingDischargePropertyIndex = 12;
- private const int lowSillProbabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 13;
+ private const int lowSillProbabilityOpenStructureBeforeFloodingPropertyIndex = 13;
private const int lowSillFailureProbabilityOpenStructurePropertyIndex = 14;
private const int lowSillFailureProbabilityReparationPropertyIndex = 15;
private const int lowSillFailureProbabilityStructureWithErosionPropertyIndex = 16;
@@ -947,7 +947,7 @@
private const int floodedCulvertStorageStructureAreaPropertyIndex = 9;
private const int floodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 10;
private const int floodedCulvertCriticalOvertoppingDischargePropertyIndex = 11;
- private const int floodedCulvertProbabilityOpenOrFrequencyStructureBeforeFloodingPropertyIndex = 12;
+ private const int floodedCulvertProbabilityOpenStructureBeforeFloodingPropertyIndex = 12;
private const int floodedCulvertFailureProbabilityOpenStructurePropertyIndex = 13;
private const int floodedCulvertFailureProbabilityReparationPropertyIndex = 14;
private const int floodedCulvertFailureProbabilityStructureWithErosionPropertyIndex = 15;
@@ -964,7 +964,7 @@
private const int inflowModelTypePropertyIndex = 6;
private const int identicalAperturesPropertyIndex = 9;
- private const int probabilityOrFrequencyOpenStructureBeforeFloodingPropertyIndex = 16;
+ private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 16;
private const int failureProbabilityOpenStructurePropertyIndex = 17;
private const int failureProbabilityReparationPropertyIndex = 18;