Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r603210e73c97c052ba7fc2447b45cf57750a6ae4 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 603210e73c97c052ba7fc2447b45cf57750a6ae4) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -569,7 +569,7 @@ Mean = (RoundedDouble) 25.0, StandardDeviation = (RoundedDouble) 0.05 }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1.0, + ProbabilityOpenStructureBeforeFlooding = 1.0, FailureProbabilityOpenStructure = 0.1, IdenticalApertures = 4, FailureProbabilityReparation = 1.0, Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r9c62dbc3f18cb81172af025c25ef3cc7b5578035 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 9c62dbc3f18cb81172af025c25ef3cc7b5578035) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -330,7 +330,7 @@ Assert.AreEqual(0.15, closingStructure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value); Assert.AreEqual(25.0, closingStructure.FlowWidthAtBottomProtection.Mean.Value); Assert.AreEqual(0.05, closingStructure.FlowWidthAtBottomProtection.StandardDeviation.Value); - Assert.AreEqual(1.0, closingStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, closingStructure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0.1, closingStructure.FailureProbabilityOpenStructure); Assert.AreEqual(4, closingStructure.IdenticalApertures); Assert.AreEqual(1.0, closingStructure.FailureProbabilityReparation); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs =================================================================== diff -u -r4d4b20488a5b3b562c3745f46975a848761c3a19 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -86,7 +86,7 @@ Mean = constructionProperties.FlowWidthAtBottomProtection.Mean, StandardDeviation = constructionProperties.FlowWidthAtBottomProtection.StandardDeviation }; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = constructionProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + ProbabilityOpenStructureBeforeFlooding = constructionProperties.ProbabilityOpenStructureBeforeFlooding; FailureProbabilityOpenStructure = constructionProperties.FailureProbabilityOpenStructure; IdenticalApertures = constructionProperties.IdenticalApertures; FailureProbabilityReparation = constructionProperties.FailureProbabilityReparation; @@ -148,13 +148,10 @@ public LogNormalDistribution FlowWidthAtBottomProtection { get; } /// - /// Gets the probability or frequency of the closing structure being open before flooding. + /// Gets the probability of the closing structure being open before flooding. /// [1/year] /// - /// Because this property can also be used to denote a frequency, there - /// is no guarantee that this property returns a value in the range [0.0, 1.0] - /// nor that formal rules of probability apply. - public double ProbabilityOrFrequencyOpenStructureBeforeFlooding { get; private set; } + public double ProbabilityOpenStructureBeforeFlooding { get; private set; } /// /// Gets the probability of failing to close the closing structure. @@ -216,7 +213,7 @@ LevelCrestStructureNotClosing.Mean = fromStructure.LevelCrestStructureNotClosing.Mean; LevelCrestStructureNotClosing.StandardDeviation = fromStructure.LevelCrestStructureNotClosing.StandardDeviation; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = fromStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + ProbabilityOpenStructureBeforeFlooding = fromStructure.ProbabilityOpenStructureBeforeFlooding; StorageStructureArea.Mean = fromStructure.StorageStructureArea.Mean; StorageStructureArea.CoefficientOfVariation = fromStructure.StorageStructureArea.CoefficientOfVariation; @@ -248,7 +245,7 @@ hashCode = (hashCode * 397) ^ InflowModelType.GetHashCode(); hashCode = (hashCode * 397) ^ InsideWaterLevel.GetHashCode(); hashCode = (hashCode * 397) ^ LevelCrestStructureNotClosing.GetHashCode(); - hashCode = (hashCode * 397) ^ ProbabilityOrFrequencyOpenStructureBeforeFlooding.GetHashCode(); + hashCode = (hashCode * 397) ^ ProbabilityOpenStructureBeforeFlooding.GetHashCode(); hashCode = (hashCode * 397) ^ StorageStructureArea.GetHashCode(); hashCode = (hashCode * 397) ^ ThresholdHeightOpenWeir.GetHashCode(); hashCode = (hashCode * 397) ^ WidthFlowApertures.GetHashCode(); @@ -269,7 +266,7 @@ && InflowModelType.Equals(other.InflowModelType) && InsideWaterLevel.Equals(other.InsideWaterLevel) && LevelCrestStructureNotClosing.Equals(other.LevelCrestStructureNotClosing) - && ProbabilityOrFrequencyOpenStructureBeforeFlooding.Equals(other.ProbabilityOrFrequencyOpenStructureBeforeFlooding) + && ProbabilityOpenStructureBeforeFlooding.Equals(other.ProbabilityOpenStructureBeforeFlooding) && StorageStructureArea.Equals(other.StorageStructureArea) && ThresholdHeightOpenWeir.Equals(other.ThresholdHeightOpenWeir) && WidthFlowApertures.Equals(other.WidthFlowApertures); @@ -331,7 +328,7 @@ StandardDeviation = (RoundedDouble) 0.05 }; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1; + ProbabilityOpenStructureBeforeFlooding = 1; FailureProbabilityOpenStructure = 1; IdenticalApertures = 1; FailureProbabilityReparation = 1; @@ -393,13 +390,10 @@ public LogNormalDistribution FlowWidthAtBottomProtection { get; } /// - /// Gets or sets the probability or frequency of the closing structure being open before flooding. + /// Gets or sets the probability of the closing structure being open before flooding. /// [1/year] /// - /// Because this property can also be used to denote a frequency, there - /// is no guarantee that this property returns a value in the range [0.0, 1.0] - /// nor that formal rules of probability apply. - public double ProbabilityOrFrequencyOpenStructureBeforeFlooding { get; set; } + public double ProbabilityOpenStructureBeforeFlooding { get; set; } /// /// Gets or sets the probability of failing to close the closing structure. Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -rca6ec12fb540f0a56a12e363dc1eb3cff066d6cd -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision ca6ec12fb540f0a56a12e363dc1eb3cff066d6cd) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -89,7 +89,7 @@ && Equals(FailureProbabilityReparation, Structure.FailureProbabilityReparation) && Equals(IdenticalApertures, Structure.IdenticalApertures) && Equals(InsideWaterLevel, Structure.InsideWaterLevel) - && Equals(ProbabilityOrFrequencyOpenStructureBeforeFlooding, Structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding) + && Equals(ProbabilityOrFrequencyOpenStructureBeforeFlooding, Structure.ProbabilityOpenStructureBeforeFlooding) && Equals(ThresholdHeightOpenWeir, Structure.ThresholdHeightOpenWeir); } } @@ -120,7 +120,7 @@ FailureProbabilityReparation = Structure.FailureProbabilityReparation; IdenticalApertures = Structure.IdenticalApertures; InsideWaterLevel = Structure.InsideWaterLevel; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = Structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + ProbabilityOrFrequencyOpenStructureBeforeFlooding = Structure.ProbabilityOpenStructureBeforeFlooding; ThresholdHeightOpenWeir = Structure.ThresholdHeightOpenWeir; } else Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -257,7 +257,7 @@ { get { - return ProbabilityFormattingHelper.Format(data.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + return ProbabilityFormattingHelper.Format(data.ProbabilityOpenStructureBeforeFlooding); } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs =================================================================== diff -u -r575800d75878f201a36f9cb96bc575e25930f0c3 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision 575800d75878f201a36f9cb96bc575e25930f0c3) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -203,7 +203,7 @@ structureName, structureId); - TrySetConstructionProperty((rows, key) => constructionProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = rows[key].NumericalValue, + TrySetConstructionProperty((rows, key) => constructionProperties.ProbabilityOpenStructureBeforeFlooding = rows[key].NumericalValue, rowData, StructureFilesKeywords.ClosingStructureParameterKeyword11, structureName, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs =================================================================== diff -u -r91a0ce794ee741808096983143452e692bc786f3 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 91a0ce794ee741808096983143452e692bc786f3) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -93,7 +93,7 @@ Mean = (RoundedDouble) 111.222, StandardDeviation = (RoundedDouble) 0.111 }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 321.987, + ProbabilityOpenStructureBeforeFlooding = 321.987, FailureProbabilityOpenStructure = 654.321, IdenticalApertures = 42, FailureProbabilityReparation = 987.654, @@ -163,7 +163,7 @@ Assert.AreEqual(2, flowWidthAtBottomProtection.StandardDeviation.NumberOfDecimalPlaces); Assert.AreEqual(0.11, flowWidthAtBottomProtection.StandardDeviation, flowWidthAtBottomProtection.StandardDeviation.GetAccuracy()); - Assert.AreEqual(321.987, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(321.987, structure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(654.321, structure.FailureProbabilityOpenStructure); Assert.AreEqual(42, structure.IdenticalApertures); Assert.AreEqual(987.654, structure.FailureProbabilityReparation); @@ -250,7 +250,7 @@ Assert.AreEqual(2, flowWidthAtBottomProtection.StandardDeviation.NumberOfDecimalPlaces); Assert.AreEqual(0.05, flowWidthAtBottomProtection.StandardDeviation, flowWidthAtBottomProtection.StandardDeviation.GetAccuracy()); - Assert.AreEqual(1, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1, structure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(1, structure.FailureProbabilityOpenStructure); Assert.AreEqual(1, structure.IdenticalApertures); Assert.AreEqual(1, structure.FailureProbabilityReparation); @@ -344,7 +344,7 @@ FailureProbabilityReparation = random.NextDouble(), InflowModelType = ClosingStructureInflowModelType.FloodedCulvert, IdenticalApertures = random.Next(), - ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextDouble() + ProbabilityOpenStructureBeforeFlooding = random.NextDouble() }); // Call @@ -361,7 +361,7 @@ Assert.AreEqual(otherStructure.FailureProbabilityOpenStructure, structure.FailureProbabilityOpenStructure); Assert.AreEqual(otherStructure.FailureProbabilityReparation, structure.FailureProbabilityReparation); Assert.AreEqual(otherStructure.IdenticalApertures, structure.IdenticalApertures); - Assert.AreEqual(otherStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(otherStructure.ProbabilityOpenStructureBeforeFlooding, structure.ProbabilityOpenStructureBeforeFlooding); TestHelper.AssertAreEqualButNotSame(otherStructure.FlowWidthAtBottomProtection, structure.FlowWidthAtBottomProtection); TestHelper.AssertAreEqualButNotSame(otherStructure.InsideWaterLevel, structure.InsideWaterLevel); TestHelper.AssertAreEqualButNotSame(otherStructure.LevelCrestStructureNotClosing, structure.LevelCrestStructureNotClosing); @@ -444,8 +444,8 @@ "FlowWidthAtBottomProtectionMean"); yield return new ChangePropertyData(cp => cp.FlowWidthAtBottomProtection.StandardDeviation = cp.FlowWidthAtBottomProtection.StandardDeviation + offset, "FlowWidthAtBottomProtectionStandardDeviation"); - yield return new ChangePropertyData(cp => cp.ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextDouble(), - "ProbabilityOrFrequencyOpenStructureBeforeFlooding"); + yield return new ChangePropertyData(cp => cp.ProbabilityOpenStructureBeforeFlooding = random.NextDouble(), + "ProbabilityOpenStructureBeforeFlooding"); yield return new ChangePropertyData(cp => cp.FailureProbabilityOpenStructure = random.NextDouble(), "FailureProbabilityOpenStructure"); yield return new ChangePropertyData(cp => cp.IdenticalApertures = random.Next(5, int.MaxValue), @@ -509,7 +509,7 @@ Mean = (RoundedDouble) 25.0, StandardDeviation = (RoundedDouble) 0.05 }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1.0, + ProbabilityOpenStructureBeforeFlooding = 1.0, FailureProbabilityOpenStructure = 0.1, IdenticalApertures = 4, FailureProbabilityReparation = 1.0, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -r1fd2033b78aa540d01635bcf993080e5fe2437bd -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 1fd2033b78aa540d01635bcf993080e5fe2437bd) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -641,7 +641,7 @@ Assert.AreEqual(expectedClosingStructure.FailureProbabilityReparation, input.FailureProbabilityReparation); Assert.AreEqual(expectedClosingStructure.IdenticalApertures, input.IdenticalApertures); DistributionAssert.AreEqual(expectedClosingStructure.InsideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(expectedClosingStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedClosingStructure.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); DistributionAssert.AreEqual(expectedClosingStructure.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs =================================================================== diff -u -r16559315c0a64fffd05827d249200c62e353231f -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision 16559315c0a64fffd05827d249200c62e353231f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -146,7 +146,7 @@ differentStructures.Add(structures.Single(s => !s.FailureProbabilityOpenStructure.Equals(referenceStructure.FailureProbabilityOpenStructure))); differentStructures.Add(structures.Single(s => !s.IdenticalApertures.Equals(referenceStructure.IdenticalApertures))); differentStructures.Add(structures.Single(s => !s.InflowModelType.Equals(referenceStructure.InflowModelType))); - differentStructures.Add(structures.Single(s => !s.ProbabilityOrFrequencyOpenStructureBeforeFlooding.Equals(referenceStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding))); + differentStructures.Add(structures.Single(s => !s.ProbabilityOpenStructureBeforeFlooding.Equals(referenceStructure.ProbabilityOpenStructureBeforeFlooding))); differentStructures.Add(structures.Single(s => !s.StructureNormalOrientation.Equals(referenceStructure.StructureNormalOrientation))); Assert.AreEqual(expectedTestDataCount, differentStructures.Distinct().Count()); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs =================================================================== diff -u -rf88343c0590cb04c7135ce141872940e59325927 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs (.../TestClosingStructureCalculationTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs (.../TestClosingStructureCalculationTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -57,7 +57,7 @@ DistributionAssert.AreEqual(referenceStructure.AreaFlowApertures, calculation.InputParameters.AreaFlowApertures); DistributionAssert.AreEqual(referenceStructure.CriticalOvertoppingDischarge, calculation.InputParameters.CriticalOvertoppingDischarge); DistributionAssert.AreEqual(referenceStructure.FlowWidthAtBottomProtection, calculation.InputParameters.FlowWidthAtBottomProtection); - Assert.AreEqual(referenceStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, calculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(referenceStructure.ProbabilityOpenStructureBeforeFlooding, calculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(referenceStructure.FailureProbabilityOpenStructure, calculation.InputParameters.FailureProbabilityOpenStructure); Assert.AreEqual(referenceStructure.IdenticalApertures, calculation.InputParameters.IdenticalApertures); Assert.AreEqual(referenceStructure.FailureProbabilityOpenStructure, calculation.InputParameters.FailureProbabilityOpenStructure); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs =================================================================== diff -u -r5f6b3f80bb6747f12157149f7689a8fc7d3552a5 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision 5f6b3f80bb6747f12157149f7689a8fc7d3552a5) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -165,7 +165,7 @@ Assert.AreEqual(25.0, structure.FlowWidthAtBottomProtection.Mean.Value); Assert.AreEqual(0.05, structure.FlowWidthAtBottomProtection.StandardDeviation.Value); - Assert.AreEqual(1.0, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, structure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure); Assert.AreEqual(4, structure.IdenticalApertures); Assert.AreEqual(1.0, structure.FailureProbabilityReparation); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs =================================================================== diff -u -rcf60de33a75f1d729639a4ba7f30e3b319f9ed6d -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision cf60de33a75f1d729639a4ba7f30e3b319f9ed6d) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -291,10 +291,10 @@ yield return new TestCaseData(new ClosingStructure(differentInflowModelTypeConstructionProperties)) .SetName($"{targetName}_DifferentInflowModelType_{testResultDescription}"); - ClosingStructure.ConstructionProperties differentProbabilityOrFrequencyOpenStructureBeforeFloodingConstructionProperties = + ClosingStructure.ConstructionProperties differentProbabilityOpenStructureBeforeFloodingConstructionProperties = CreateTestClosingStructureConstructionProperties(); - differentProbabilityOrFrequencyOpenStructureBeforeFloodingConstructionProperties.ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextDouble(); - yield return new TestCaseData(new ClosingStructure(differentProbabilityOrFrequencyOpenStructureBeforeFloodingConstructionProperties)) + differentProbabilityOpenStructureBeforeFloodingConstructionProperties.ProbabilityOpenStructureBeforeFlooding = random.NextDouble(); + yield return new TestCaseData(new ClosingStructure(differentProbabilityOpenStructureBeforeFloodingConstructionProperties)) .SetName($"{targetName}_DifferentProbabilityOrFrequencyOpenStructureBeforeFlooding_{testResultDescription}"); ClosingStructure.ConstructionProperties differentStructureNormalOrientationConstructionProperties = @@ -362,7 +362,7 @@ FailureProbabilityOpenStructure = referenceStructure.FailureProbabilityOpenStructure, IdenticalApertures = referenceStructure.IdenticalApertures, InflowModelType = referenceStructure.InflowModelType, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = referenceStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + ProbabilityOpenStructureBeforeFlooding = referenceStructure.ProbabilityOpenStructureBeforeFlooding, StructureNormalOrientation = referenceStructure.StructureNormalOrientation }; } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs =================================================================== diff -u -rcda0b786ef4c81469fb4213e7fc82cb74493fcf9 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs (.../TestClosingStructure.cs) (revision cda0b786ef4c81469fb4213e7fc82cb74493fcf9) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructure.cs (.../TestClosingStructure.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -144,7 +144,7 @@ Mean = (RoundedDouble) 25.0, StandardDeviation = (RoundedDouble) 0.05 }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1.0, + ProbabilityOpenStructureBeforeFlooding = 1.0, FailureProbabilityOpenStructure = 0.1, IdenticalApertures = 4, FailureProbabilityReparation = 1.0, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs =================================================================== diff -u -r05dbdd1382bbe32c4c1519918c0aaecb29f5423a -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision 05dbdd1382bbe32c4c1519918c0aaecb29f5423a) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -129,7 +129,7 @@ Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean")); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); - Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding), properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOpenStructureBeforeFlooding), properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityOpenStructure), properties.FailureProbabilityOpenStructure); Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityReparation), properties.FailureProbabilityReparation); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -776,7 +776,7 @@ Assert.AreEqual(readStructure.FailureProbabilityReparation, structure.FailureProbabilityReparation); Assert.AreEqual(readStructure.IdenticalApertures, structure.IdenticalApertures); Assert.AreEqual(readStructure.InflowModelType, structure.InflowModelType); - Assert.AreEqual(readStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(readStructure.ProbabilityOpenStructureBeforeFlooding, structure.ProbabilityOpenStructureBeforeFlooding); DistributionAssert.AreEqual(readStructure.FlowWidthAtBottomProtection, structure.FlowWidthAtBottomProtection); DistributionAssert.AreEqual(readStructure.InsideWaterLevel, structure.InsideWaterLevel); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -77,7 +77,7 @@ CriticalOvertoppingDischargeCoefficientOfVariation = structure.CriticalOvertoppingDischarge.CoefficientOfVariation.ToNaNAsNull(), FlowWidthAtBottomProtectionMean = structure.FlowWidthAtBottomProtection.Mean.ToNaNAsNull(), FlowWidthAtBottomProtectionStandardDeviation = structure.FlowWidthAtBottomProtection.StandardDeviation.ToNaNAsNull(), - ProbabilityOpenStructureBeforeFlooding = structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding.ToNaNAsNull(), + ProbabilityOpenStructureBeforeFlooding = structure.ProbabilityOpenStructureBeforeFlooding.ToNaNAsNull(), FailureProbabilityOpenStructure = structure.FailureProbabilityOpenStructure.ToNaNAsNull(), IdenticalApertures = structure.IdenticalApertures, FailureProbabilityReparation = structure.FailureProbabilityReparation.ToNaNAsNull(), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -104,7 +104,7 @@ Mean = (RoundedDouble) entity.FlowWidthAtBottomProtectionMean.ToNullAsNaN(), StandardDeviation = (RoundedDouble) entity.FlowWidthAtBottomProtectionStandardDeviation.ToNullAsNaN() }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = entity.ProbabilityOpenStructureBeforeFlooding.ToNullAsNaN(), + ProbabilityOpenStructureBeforeFlooding = entity.ProbabilityOpenStructureBeforeFlooding.ToNullAsNaN(), FailureProbabilityOpenStructure = entity.FailureProbabilityOpenStructure.ToNullAsNaN(), IdenticalApertures = entity.IdenticalApertures, FailureProbabilityReparation = entity.FailureProbabilityReparation.ToNullAsNaN(), Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs (.../ClosingStructureCreateExtensionsTest.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ClosingStructures/ClosingStructureCreateExtensionsTest.cs (.../ClosingStructureCreateExtensionsTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -87,7 +87,7 @@ Assert.AreEqual(structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value, entity.CriticalOvertoppingDischargeCoefficientOfVariation); Assert.AreEqual(structure.FlowWidthAtBottomProtection.Mean.Value, entity.FlowWidthAtBottomProtectionMean); Assert.AreEqual(structure.FlowWidthAtBottomProtection.StandardDeviation.Value, entity.FlowWidthAtBottomProtectionStandardDeviation); - Assert.AreEqual(structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, entity.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(structure.ProbabilityOpenStructureBeforeFlooding, entity.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(structure.FailureProbabilityOpenStructure, entity.FailureProbabilityOpenStructure); Assert.AreEqual(structure.IdenticalApertures, entity.IdenticalApertures); Assert.AreEqual(structure.FailureProbabilityReparation, entity.FailureProbabilityReparation); @@ -152,7 +152,7 @@ Mean = RoundedDouble.NaN, StandardDeviation = RoundedDouble.NaN }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = double.NaN, + ProbabilityOpenStructureBeforeFlooding = double.NaN, FailureProbabilityOpenStructure = double.NaN, FailureProbabilityReparation = double.NaN }); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rd441cb29a199e83eeba442f1d0e21610805eee30 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision d441cb29a199e83eeba442f1d0e21610805eee30) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -967,7 +967,7 @@ DistributionAssert.AreEqual(expectedClosingStructure.AreaFlowApertures, actualClosingStructure.AreaFlowApertures); DistributionAssert.AreEqual(expectedClosingStructure.CriticalOvertoppingDischarge, actualClosingStructure.CriticalOvertoppingDischarge); DistributionAssert.AreEqual(expectedClosingStructure.FlowWidthAtBottomProtection, actualClosingStructure.FlowWidthAtBottomProtection); - Assert.AreEqual(expectedClosingStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, actualClosingStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedClosingStructure.ProbabilityOpenStructureBeforeFlooding, actualClosingStructure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(expectedClosingStructure.FailureProbabilityOpenStructure, actualClosingStructure.FailureProbabilityOpenStructure); Assert.AreEqual(expectedClosingStructure.IdenticalApertures, actualClosingStructure.IdenticalApertures); Assert.AreEqual(expectedClosingStructure.FailureProbabilityReparation, actualClosingStructure.FailureProbabilityReparation); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -rf9ec47142fcf16124764c36ddcfeb407c2f82233 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructureEntityReadExtensionsTest.cs (.../ClosingStructureEntityReadExtensionsTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) @@ -134,7 +134,7 @@ Assert.AreEqual(entity.CriticalOvertoppingDischargeCoefficientOfVariation, structure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value); Assert.AreEqual(entity.FlowWidthAtBottomProtectionMean, structure.FlowWidthAtBottomProtection.Mean.Value); Assert.AreEqual(entity.FlowWidthAtBottomProtectionStandardDeviation, structure.FlowWidthAtBottomProtection.StandardDeviation.Value); - Assert.AreEqual(entity.ProbabilityOpenStructureBeforeFlooding, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(entity.ProbabilityOpenStructureBeforeFlooding, structure.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(entity.FailureProbabilityOpenStructure, structure.FailureProbabilityOpenStructure); Assert.AreEqual(entity.IdenticalApertures, structure.IdenticalApertures); Assert.AreEqual(entity.FailureProbabilityReparation, structure.FailureProbabilityReparation); @@ -204,7 +204,7 @@ Assert.IsNaN(structure.CriticalOvertoppingDischarge.CoefficientOfVariation); Assert.IsNaN(structure.FlowWidthAtBottomProtection.Mean); Assert.IsNaN(structure.FlowWidthAtBottomProtection.StandardDeviation); - Assert.IsNaN(structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.IsNaN(structure.ProbabilityOpenStructureBeforeFlooding); Assert.IsNaN(structure.FailureProbabilityOpenStructure); Assert.IsNaN(structure.FailureProbabilityReparation); }