Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -46,7 +46,7 @@ private RoundedDouble factorStormDurationOpenStructure; private double failureProbabilityOpenStructure; private double failureProbabilityReparation; - private double probabilityOrFrequencyOpenStructureBeforeFlooding; + private double probabilityOpenStructureBeforeFlooding; private RoundedDouble deviationWaveDirection; /// @@ -89,7 +89,7 @@ && Equals(FailureProbabilityReparation, Structure.FailureProbabilityReparation) && Equals(IdenticalApertures, Structure.IdenticalApertures) && Equals(InsideWaterLevel, Structure.InsideWaterLevel) - && Equals(ProbabilityOrFrequencyOpenStructureBeforeFlooding, Structure.ProbabilityOpenStructureBeforeFlooding) + && Equals(ProbabilityOpenStructureBeforeFlooding, Structure.ProbabilityOpenStructureBeforeFlooding) && Equals(ThresholdHeightOpenWeir, Structure.ThresholdHeightOpenWeir); } } @@ -120,7 +120,7 @@ FailureProbabilityReparation = Structure.FailureProbabilityReparation; IdenticalApertures = Structure.IdenticalApertures; InsideWaterLevel = Structure.InsideWaterLevel; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = Structure.ProbabilityOpenStructureBeforeFlooding; + ProbabilityOpenStructureBeforeFlooding = Structure.ProbabilityOpenStructureBeforeFlooding; ThresholdHeightOpenWeir = Structure.ThresholdHeightOpenWeir; } else @@ -146,7 +146,7 @@ { FailureProbabilityOpenStructure = 0; FailureProbabilityReparation = 0; - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1.0; + ProbabilityOpenStructureBeforeFlooding = 1.0; ThresholdHeightOpenWeir = new NormalDistribution { @@ -351,20 +351,20 @@ } /// - /// Gets or sets the failure probability or frequency of an open structure before flooding. + /// Gets or sets the failure probability of an open structure before flooding. /// /// Thrown when the value of the probability /// is not in the interval [0, 1]. - public double ProbabilityOrFrequencyOpenStructureBeforeFlooding + public double ProbabilityOpenStructureBeforeFlooding { get { - return probabilityOrFrequencyOpenStructureBeforeFlooding; + return probabilityOpenStructureBeforeFlooding; } set { ProbabilityHelper.ValidateProbability(value, null, RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); - probabilityOrFrequencyOpenStructureBeforeFlooding = value; + probabilityOpenStructureBeforeFlooding = value; } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r0834dde2510012e42a23dbcb9b2886237c87a938 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 0834dde2510012e42a23dbcb9b2886237c87a938) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -410,11 +410,11 @@ { get { - return data.WrappedData.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + return data.WrappedData.ProbabilityOpenStructureBeforeFlooding; } set { - PropertyChangeHelper.ChangePropertyAndNotify(() => data.WrappedData.ProbabilityOrFrequencyOpenStructureBeforeFlooding = value, PropertyChangeHandler); + PropertyChangeHelper.ChangePropertyAndNotify(() => data.WrappedData.ProbabilityOpenStructureBeforeFlooding = value, PropertyChangeHandler); } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs =================================================================== diff -u -rb518a61a87335ee85085ef4a35d4c54d229ae382 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision b518a61a87335ee85085ef4a35d4c54d229ae382) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -74,7 +74,7 @@ calculationConfiguration.IdenticalApertures = input.IdenticalApertures; calculationConfiguration.FailureProbabilityOpenStructure = input.FailureProbabilityOpenStructure; calculationConfiguration.FailureProbabilityReparation = input.FailureProbabilityReparation; - calculationConfiguration.ProbabilityOrFrequencyOpenStructureBeforeFlooding = input.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + calculationConfiguration.ProbabilityOrFrequencyOpenStructureBeforeFlooding = input.ProbabilityOpenStructureBeforeFlooding; calculationConfiguration.FlowWidthAtBottomProtection = input.FlowWidthAtBottomProtection.ToStochastConfiguration(); calculationConfiguration.WidthFlowApertures = input.WidthFlowApertures.ToStochastConfiguration(); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r0834dde2510012e42a23dbcb9b2886237c87a938 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 0834dde2510012e42a23dbcb9b2886237c87a938) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.Linq; using Core.Common.Base.Data; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.IO.Configurations.Helpers; @@ -353,7 +352,7 @@ try { - calculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding = (RoundedDouble) failureProbability; + calculation.InputParameters.ProbabilityOpenStructureBeforeFlooding = (RoundedDouble) failureProbability; } catch (ArgumentOutOfRangeException e) { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -re3ebc9635d55057cb242e9a5b4f650b9c87737a8 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision e3ebc9635d55057cb242e9a5b4f650b9c87737a8) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -94,7 +94,7 @@ structureInput.CriticalOvertoppingDischarge.Mean, structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation, structureInput.FailureProbabilityStructureWithErosion, structureInput.StormDuration.Mean, structureInput.StormDuration.CoefficientOfVariation, - structureInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + structureInput.ProbabilityOpenStructureBeforeFlooding, generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation, structureInput.StructureNormalOrientation, structureInput.ModelFactorSuperCriticalFlow.Mean, structureInput.ModelFactorSuperCriticalFlow.StandardDeviation, @@ -125,7 +125,7 @@ structureInput.CriticalOvertoppingDischarge.Mean, structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation, structureInput.FailureProbabilityStructureWithErosion, structureInput.StormDuration.Mean, structureInput.StormDuration.CoefficientOfVariation, - structureInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + structureInput.ProbabilityOpenStructureBeforeFlooding, structureInput.ModelFactorSuperCriticalFlow.Mean, structureInput.ModelFactorSuperCriticalFlow.StandardDeviation, generalInput.ModelFactorSubCriticalFlow.Mean, generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, structureInput.ThresholdHeightOpenWeir.Mean, structureInput.ThresholdHeightOpenWeir.StandardDeviation, @@ -155,7 +155,7 @@ structureInput.CriticalOvertoppingDischarge.Mean, structureInput.CriticalOvertoppingDischarge.CoefficientOfVariation, structureInput.FailureProbabilityStructureWithErosion, structureInput.StormDuration.Mean, structureInput.StormDuration.CoefficientOfVariation, - structureInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + structureInput.ProbabilityOpenStructureBeforeFlooding, structureInput.DrainCoefficient.Mean, structureInput.DrainCoefficient.StandardDeviation, structureInput.AreaFlowApertures.Mean, structureInput.AreaFlowApertures.StandardDeviation, structureInput.InsideWaterLevel.Mean, structureInput.InsideWaterLevel.StandardDeviation); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -87,7 +87,7 @@ DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); Assert.AreEqual(0, (int) input.InflowModelType); @@ -170,7 +170,7 @@ DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); Assert.AreEqual(0, (int) input.InflowModelType); @@ -570,13 +570,13 @@ [TestCase(-1e-6)] [TestCase(-23456)] [TestCase(double.NaN)] - public void ProbabilityOrFrequencyOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentOutOfRangeException(double probability) + public void ProbabilityOpenStructureBeforeFlooding_InvalidValues_ThrowsArgumentOutOfRangeException(double probability) { // Setup var input = new ClosingStructuresInput(); // Call - TestDelegate call = () => input.ProbabilityOrFrequencyOpenStructureBeforeFlooding = probability; + TestDelegate call = () => input.ProbabilityOpenStructureBeforeFlooding = probability; // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen."); @@ -586,16 +586,16 @@ [TestCase(0)] [TestCase(0.5)] [TestCase(1.0)] - public void ProbabilityOrFrequencyOpenStructureBeforeFlooding_ValidValues_ExpectedValues(double probability) + public void ProbabilityOpenStructureBeforeFlooding_ValidValues_ExpectedValues(double probability) { // Setup var input = new ClosingStructuresInput(); // Call - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding = probability; + input.ProbabilityOpenStructureBeforeFlooding = probability; // Assert - Assert.AreEqual(probability, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(probability, input.ProbabilityOpenStructureBeforeFlooding); } #endregion @@ -622,7 +622,7 @@ Assert.AreEqual(defaultInput.FailureProbabilityReparation, input.FailureProbabilityReparation); Assert.AreEqual(defaultInput.IdenticalApertures, input.IdenticalApertures); DistributionAssert.AreEqual(defaultInput.InsideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(defaultInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(defaultInput.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOpenStructureBeforeFlooding); DistributionAssert.AreEqual(defaultInput.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } else @@ -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.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedClosingStructure.ProbabilityOpenStructureBeforeFlooding, input.ProbabilityOpenStructureBeforeFlooding); DistributionAssert.AreEqual(expectedClosingStructure.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs =================================================================== diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs (.../TestClosingStructureCalculationTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs (.../TestClosingStructureCalculationTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -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.ProbabilityOpenStructureBeforeFlooding, calculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(referenceStructure.ProbabilityOpenStructureBeforeFlooding, calculation.InputParameters.ProbabilityOpenStructureBeforeFlooding); 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/ClosingStructuresCloneAssert.cs =================================================================== diff -u -r9cad3fcafde3778a0b39a89b1758af7d8a120735 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresCloneAssert.cs (.../ClosingStructuresCloneAssert.cs) (revision 9cad3fcafde3778a0b39a89b1758af7d8a120735) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresCloneAssert.cs (.../ClosingStructuresCloneAssert.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -50,7 +50,7 @@ Assert.AreEqual(original.FactorStormDurationOpenStructure, clone.FactorStormDurationOpenStructure); Assert.AreEqual(original.FailureProbabilityOpenStructure, clone.FailureProbabilityOpenStructure); Assert.AreEqual(original.FailureProbabilityReparation, clone.FailureProbabilityReparation); - Assert.AreEqual(original.ProbabilityOrFrequencyOpenStructureBeforeFlooding, clone.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(original.ProbabilityOpenStructureBeforeFlooding, clone.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(original.DeviationWaveDirection, clone.DeviationWaveDirection); Assert.AreEqual(original.InflowModelType, clone.InflowModelType); Assert.AreEqual(original.IdenticalApertures, clone.IdenticalApertures); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs =================================================================== diff -u -rca6ec12fb540f0a56a12e363dc1eb3cff066d6cd -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs (.../ClosingStructuresTestDataGenerator.cs) (revision ca6ec12fb540f0a56a12e363dc1eb3cff066d6cd) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs (.../ClosingStructuresTestDataGenerator.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -73,7 +73,7 @@ input.FactorStormDurationOpenStructure = random.NextRoundedDouble(); input.FailureProbabilityOpenStructure = random.NextDouble(); input.FailureProbabilityReparation = random.NextDouble(); - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextDouble(); + input.ProbabilityOpenStructureBeforeFlooding = random.NextDouble(); input.DeviationWaveDirection = random.NextRoundedDouble(); input.InflowModelType = random.NextEnumValue(); input.IdenticalApertures = random.Next(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r0d301f769dc84d57979a55d902c498afe5d93e19 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 0d301f769dc84d57979a55d902c498afe5d93e19) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -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.ProbabilityOrFrequencyOpenStructureBeforeFlooding, properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(input.ProbabilityOpenStructureBeforeFlooding, properties.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(input.FailureProbabilityOpenStructure, properties.FailureProbabilityOpenStructure); Assert.AreEqual(input.FailureProbabilityReparation, properties.FailureProbabilityReparation); Assert.AreSame(input.DrainCoefficient, properties.DrainCoefficient.Data); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -133,7 +133,7 @@ StructureNormalOrientation = (RoundedDouble) 67.1, FactorStormDurationOpenStructure = (RoundedDouble) 1.0, IdenticalApertures = 1, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 1e-2, + ProbabilityOpenStructureBeforeFlooding = 1e-2, FailureProbabilityOpenStructure = 1e-3, FailureProbabilityReparation = 1e-2, InflowModelType = ClosingStructureInflowModelType.LowSill, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r9d464742b12df2c1a1779e74b8e289eed5045e91 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 9d464742b12df2c1a1779e74b8e289eed5045e91) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -401,7 +401,7 @@ InflowModelType = ClosingStructureInflowModelType.VerticalWall, FailureProbabilityStructureWithErosion = 0.001, FactorStormDurationOpenStructure = (RoundedDouble) 0.002, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = 0.03, + ProbabilityOpenStructureBeforeFlooding = 0.03, FailureProbabilityOpenStructure = 0.22, FailureProbabilityReparation = 0.0006, ShouldIllustrationPointsBeCalculated = true, @@ -759,7 +759,7 @@ Assert.AreEqual(expectedCalculation.InputParameters.FailureProbabilityReparation, actualCalculation.InputParameters.FailureProbabilityReparation); Assert.AreEqual(expectedCalculation.InputParameters.IdenticalApertures, actualCalculation.InputParameters.IdenticalApertures); Assert.AreEqual(expectedCalculation.InputParameters.InflowModelType, actualCalculation.InputParameters.InflowModelType); - Assert.AreEqual(expectedCalculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding, actualCalculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedCalculation.InputParameters.ProbabilityOpenStructureBeforeFlooding, actualCalculation.InputParameters.ProbabilityOpenStructureBeforeFlooding); Assert.AreSame(expectedCalculation.InputParameters.ForeshoreProfile, actualCalculation.InputParameters.ForeshoreProfile); Assert.AreEqual(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.AreSame(expectedCalculation.InputParameters.Structure, actualCalculation.InputParameters.Structure); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r9cd1f99915772a8d9990c31e281b70dd663b4e2d -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -404,7 +404,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation, input.StructureNormalOrientation, input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, @@ -485,7 +485,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation, input.StructureNormalOrientation, input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, @@ -564,7 +564,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, generalInput.ModelFactorSubCriticalFlow.Mean, generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, input.ThresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.StandardDeviation, @@ -645,7 +645,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, input.ModelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.StandardDeviation, generalInput.ModelFactorSubCriticalFlow.Mean, generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, input.ThresholdHeightOpenWeir.Mean, input.ThresholdHeightOpenWeir.StandardDeviation, @@ -722,7 +722,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, input.DrainCoefficient.Mean, input.DrainCoefficient.StandardDeviation, input.AreaFlowApertures.Mean, input.AreaFlowApertures.StandardDeviation, input.InsideWaterLevel.Mean, input.InsideWaterLevel.StandardDeviation); @@ -800,7 +800,7 @@ input.CriticalOvertoppingDischarge.Mean, input.CriticalOvertoppingDischarge.CoefficientOfVariation, input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, - input.ProbabilityOrFrequencyOpenStructureBeforeFlooding, + input.ProbabilityOpenStructureBeforeFlooding, input.DrainCoefficient.Mean, input.DrainCoefficient.StandardDeviation, input.AreaFlowApertures.Mean, input.AreaFlowApertures.StandardDeviation, input.InsideWaterLevel.Mean, input.InsideWaterLevel.StandardDeviation); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -160,7 +160,7 @@ entity.LevelCrestStructureNotClosingMean = input.LevelCrestStructureNotClosing.Mean.ToNaNAsNull(); entity.LevelCrestStructureNotClosingStandardDeviation = input.LevelCrestStructureNotClosing.StandardDeviation.ToNaNAsNull(); - entity.ProbabilityOpenStructureBeforeFlooding = input.ProbabilityOrFrequencyOpenStructureBeforeFlooding; + entity.ProbabilityOpenStructureBeforeFlooding = input.ProbabilityOpenStructureBeforeFlooding; } private static void SetOutputEntity(StructuresCalculation calculation, Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -99,7 +99,7 @@ inputParameters.IdenticalApertures = entity.IdenticalApertures; inputParameters.LevelCrestStructureNotClosing.Mean = (RoundedDouble) entity.LevelCrestStructureNotClosingMean.ToNullAsNaN(); inputParameters.LevelCrestStructureNotClosing.StandardDeviation = (RoundedDouble) entity.LevelCrestStructureNotClosingStandardDeviation.ToNullAsNaN(); - inputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding = entity.ProbabilityOpenStructureBeforeFlooding; + inputParameters.ProbabilityOpenStructureBeforeFlooding = entity.ProbabilityOpenStructureBeforeFlooding; } private static void ReadOutput(StructuresCalculation calculation, Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -457,7 +457,7 @@ Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() }, - ProbabilityOrFrequencyOpenStructureBeforeFlooding = random.NextRoundedDouble(), + ProbabilityOpenStructureBeforeFlooding = random.NextRoundedDouble(), ShouldIllustrationPointsBeCalculated = random.NextBoolean() } }; @@ -510,7 +510,7 @@ Assert.AreEqual(inputParameters.IdenticalApertures, entity.IdenticalApertures); Assert.AreEqual(inputParameters.LevelCrestStructureNotClosing.Mean.Value, entity.LevelCrestStructureNotClosingMean); Assert.AreEqual(inputParameters.LevelCrestStructureNotClosing.StandardDeviation.Value, entity.LevelCrestStructureNotClosingStandardDeviation); - Assert.AreEqual(inputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding, entity.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(inputParameters.ProbabilityOpenStructureBeforeFlooding, entity.ProbabilityOpenStructureBeforeFlooding); Assert.AreEqual(Convert.ToByte(inputParameters.ShouldIllustrationPointsBeCalculated), entity.ShouldIllustrationPointsBeCalculated); Assert.AreEqual(order, entity.Order); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rf9ec47142fcf16124764c36ddcfeb407c2f82233 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision f9ec47142fcf16124764c36ddcfeb407c2f82233) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -1018,7 +1018,7 @@ Assert.AreEqual(expectedInput.FailureProbabilityReparation, actualInput.FailureProbabilityReparation); Assert.AreEqual(expectedInput.IdenticalApertures, actualInput.IdenticalApertures); DistributionAssert.AreEqual(expectedInput.LevelCrestStructureNotClosing, actualInput.LevelCrestStructureNotClosing); - Assert.AreEqual(expectedInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding, actualInput.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(expectedInput.ProbabilityOpenStructureBeforeFlooding, actualInput.ProbabilityOpenStructureBeforeFlooding); } #endregion Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r17b61f72a41eb30047843b20621e45b3e90d2962 -r38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision 17b61f72a41eb30047843b20621e45b3e90d2962) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensionsTest.cs (.../ClosingStructuresCalculationEntityReadExtensionsTest.cs) (revision 38cd5da3aefa4ea677c2b1796cbb9b831d41fe3c) @@ -159,7 +159,7 @@ Assert.AreEqual(entity.IdenticalApertures, inputParameters.IdenticalApertures); Assert.AreEqual(entity.LevelCrestStructureNotClosingMean, inputParameters.LevelCrestStructureNotClosing.Mean.Value); Assert.AreEqual(entity.LevelCrestStructureNotClosingStandardDeviation, inputParameters.LevelCrestStructureNotClosing.StandardDeviation.Value); - Assert.AreEqual(entity.ProbabilityOpenStructureBeforeFlooding, inputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); + Assert.AreEqual(entity.ProbabilityOpenStructureBeforeFlooding, inputParameters.ProbabilityOpenStructureBeforeFlooding); Assert.IsFalse(calculation.HasOutput); }