Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -299,7 +299,7 @@ Assert.AreEqual(1.5, heightStructure.CriticalOvertoppingDischarge.StandardDeviation.Value); Assert.AreEqual(4.0, heightStructure.WidthOfFlowApertures.Mean.Value); Assert.AreEqual(0.05, heightStructure.WidthOfFlowApertures.StandardDeviation.Value); - Assert.AreEqual(1.0, heightStructure.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(1.0, heightStructure.FailureProbabilityStructureWithErosion); Assert.AreEqual(50000.0, heightStructure.StorageStructureArea.Mean.Value); Assert.AreEqual(0.02, heightStructure.StorageStructureArea.StandardDeviation.Value); Assert.AreEqual(6.5, heightStructure.AllowedLevelIncreaseStorage.Mean.Value); Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -49,7 +49,7 @@ "KW_HOOGTE5", WidthOfFlowApertures }, { - "KW_HOOGTE6", FailureProbabilityOfStructureGivenErosion + "KW_HOOGTE6", FailureProbabilityStructureWithErosion }, { "KW_HOOGTE7", StorageStructureArea @@ -275,7 +275,7 @@ return messages; } - private static List FailureProbabilityOfStructureGivenErosion(StructuresParameterRow row) + private static List FailureProbabilityStructureWithErosion(StructuresParameterRow row) { List messages = new List(); double failureProbability = row.NumericalValue; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs =================================================================== diff -u -ra76bb82a008a01449840d2afcc31d5aec4f5ba3f -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs (.../GeneralHeightStructuresInput.cs) (revision a76bb82a008a01449840d2afcc31d5aec4f5ba3f) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs (.../GeneralHeightStructuresInput.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -48,13 +48,13 @@ StandardDeviation = (RoundedDouble) 0.06 }; - ModelFactorForStorageVolume = new LogNormalDistribution(2) + ModelFactorStorageVolume = new LogNormalDistribution(2) { Mean = (RoundedDouble) 1, StandardDeviation = (RoundedDouble) 0.2 }; - ModelFactorForIncomingFlowVolume = new RoundedDouble(2, 1); + ModelFactorInflowVolume = new RoundedDouble(2, 1); } /// @@ -92,11 +92,11 @@ /// /// Gets the model factor for storage volume. /// - public LogNormalDistribution ModelFactorForStorageVolume { get; private set; } + public LogNormalDistribution ModelFactorStorageVolume { get; private set; } /// /// Gets the model factor for incoming flow volume. /// - public RoundedDouble ModelFactorForIncomingFlowVolume { get; private set; } + public RoundedDouble ModelFactorInflowVolume { get; private set; } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -47,7 +47,7 @@ /// The standard deviation of critical overtopping discharge of the height structure. /// The mean flow apertures width of the height structure. /// The standard deviation of flow apertures width of the height structure. - /// The failure probability of the height structure, given erosion. + /// The failure probability of the height structure, given erosion. /// The mean storage area of the height structure. /// The standard deviation of storage area of the height structure. /// The mean allowable increase of level for storage of the height structure. @@ -61,7 +61,7 @@ double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeStandardDeviation, double widthOfFlowAperturesMean, double widthOfFlowAperturesStandardDeviation, - double failureProbabilityOfStructureGivenErosion, + double failureProbabilityStructureWithErosion, double storageStructureAreaMean, double storageStructureAreaStandardDeviation, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation) : base(name, id, location) @@ -87,7 +87,7 @@ Mean = new RoundedDouble(2, widthOfFlowAperturesMean), StandardDeviation = new RoundedDouble(2, widthOfFlowAperturesStandardDeviation) }; - FailureProbabilityOfStructureGivenErosion = failureProbabilityOfStructureGivenErosion; + FailureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; StorageStructureArea = new LogNormalDistribution(2) { Mean = new RoundedDouble(2, storageStructureAreaMean), @@ -128,7 +128,7 @@ /// /// Gets the failure probability of the height structure, given erosion. /// - public double FailureProbabilityOfStructureGivenErosion { get; private set; } + public double FailureProbabilityStructureWithErosion { get; private set; } /// /// Gets the storage area of the height structure. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u -ree9ea66795cde20ae1bd8a096333476e49d0d558 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision ee9ea66795cde20ae1bd8a096333476e49d0d558) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -44,14 +44,14 @@ private readonly LogNormalDistribution stormDuration; private RoundedDouble structureNormalOrientation; private RoundedDouble deviationOfTheWaveDirection; - private double failureProbabilityOfStructureGivenErosion; + private double failureProbabilityStructureWithErosion; /// /// Creates a new instance of the class. /// public HeightStructuresInput() { - failureProbabilityOfStructureGivenErosion = 1.0; + failureProbabilityStructureWithErosion = 1.0; levelCrestStructure = new NormalDistribution(2) { @@ -291,19 +291,19 @@ /// [1/year] /// /// Thrown when is not in range [0, 1]. - public double FailureProbabilityOfStructureGivenErosion + public double FailureProbabilityStructureWithErosion { get { - return failureProbabilityOfStructureGivenErosion; + return failureProbabilityStructureWithErosion; } set { if (!ValidProbabilityValue(value)) { throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_between_0_and_1); } - failureProbabilityOfStructureGivenErosion = value; + failureProbabilityStructureWithErosion = value; } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6b9fda141298524c0910937dd090d82be420c52b -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6b9fda141298524c0910937dd090d82be420c52b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -120,45 +120,45 @@ /// /// Looks up a localized string similar to De waarde voor de faalkans kon niet geïnterpreteerd worden als een getal.. /// - public static string FailureProbabilityOfStructureGivenErosion_Could_not_parse_string_to_double_value { + public static string FailureProbabilityStructureWithErosion_Could_not_parse_string_to_double_value { get { - return ResourceManager.GetString("FailureProbabilityOfStructureGivenErosion_Could_not_parse_string_to_double_value", resourceCulture); + return ResourceManager.GetString("FailureProbabilityStructureWithErosion_Could_not_parse_string_to_double_value", resourceCulture); } } /// /// Looks up a localized string similar to De faalkans van het kunstwerk gegeven de erosie in de bodem.. /// - public static string FailureProbabilityOfStructureGivenErosion_Description { + public static string FailureProbabilityStructureWithErosion_Description { get { - return ResourceManager.GetString("FailureProbabilityOfStructureGivenErosion_Description", resourceCulture); + return ResourceManager.GetString("FailureProbabilityStructureWithErosion_Description", resourceCulture); } } /// /// Looks up a localized string similar to Faalkans kunstwerk gegeven erosie bodem [-]. /// - public static string FailureProbabilityOfStructureGivenErosion_DisplayName { + public static string FailureProbabilityStructureWithErosion_DisplayName { get { - return ResourceManager.GetString("FailureProbabilityOfStructureGivenErosion_DisplayName", resourceCulture); + return ResourceManager.GetString("FailureProbabilityStructureWithErosion_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to De waarde voor de faalkans moet ingevuld zijn.. /// - public static string FailureProbabilityOfStructureGivenErosion_Value_cannot_be_null { + public static string FailureProbabilityStructureWithErosion_Value_cannot_be_null { get { - return ResourceManager.GetString("FailureProbabilityOfStructureGivenErosion_Value_cannot_be_null", resourceCulture); + return ResourceManager.GetString("FailureProbabilityStructureWithErosion_Value_cannot_be_null", resourceCulture); } } /// /// Looks up a localized string similar to De waarde voor de faalkans is te groot of te klein.. /// - public static string FailureProbabilityOfStructureGivenErosion_Value_too_large { + public static string FailureProbabilityStructureWithErosion_Value_too_large { get { - return ResourceManager.GetString("FailureProbabilityOfStructureGivenErosion_Value_too_large", resourceCulture); + return ResourceManager.GetString("FailureProbabilityStructureWithErosion_Value_too_large", resourceCulture); } } @@ -255,42 +255,42 @@ } /// - /// Looks up a localized string similar to Het modelfactor kombergingsvolume.. + /// Looks up a localized string similar to Het modelfactor overslagdebiet.. /// - public static string HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_Description { + public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description { get { - return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_Descript" + - "ion", resourceCulture); + return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Descripti" + + "on", resourceCulture); } } /// - /// Looks up a localized string similar to Modelfactor kombergingsvolume [-]. + /// Looks up a localized string similar to Modelfactor overslagdebiet [-]. /// - public static string HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_DisplayName { + public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName { get { - return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_DisplayN" + - "ame", resourceCulture); + return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayNa" + + "me", resourceCulture); } } /// - /// Looks up a localized string similar to Het modelfactor overslagdebiet.. + /// Looks up a localized string similar to Het modelfactor kombergingsvolume.. /// - public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description { + public static string HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description { get { - return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Descripti" + - "on", resourceCulture); + return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description" + + "", resourceCulture); } } /// - /// Looks up a localized string similar to Modelfactor overslagdebiet [-]. + /// Looks up a localized string similar to Modelfactor kombergingsvolume [-]. /// - public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayName { + public static string HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName { get { - return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_DisplayNa" + - "me", resourceCulture); + return ResourceManager.GetString("HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName" + + "", resourceCulture); } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx =================================================================== diff -u -r6b9fda141298524c0910937dd090d82be420c52b -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6b9fda141298524c0910937dd090d82be420c52b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -129,10 +129,10 @@ Valversnelling [m/s²] - + Het modelfactor kombergingsvolume. - + Modelfactor kombergingsvolume [-] @@ -153,10 +153,10 @@ Kritiek overslagdebiet [m³/s/m] - + De faalkans van het kunstwerk gegeven de erosie in de bodem. - + Faalkans kunstwerk gegeven erosie bodem [-] @@ -201,13 +201,13 @@ Breedte van de kruin van het kunstwerk [m] - + De waarde voor de faalkans kon niet geïnterpreteerd worden als een getal. - + De waarde voor de faalkans is te groot of te klein. - + De waarde voor de faalkans moet ingevuld zijn. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -171,13 +171,13 @@ [PropertyOrder(10)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_DisplayName")] - [ResourcesDescription(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_Description")] - public double FailureProbabilityOfStructureGivenErosion + [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")] + [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")] + public double FailureProbabilityStructureWithErosion { get { - return data.FailureProbabilityOfStructureGivenErosion; + return data.FailureProbabilityStructureWithErosion; } } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs =================================================================== diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs (.../HeightStructuresFailureMechanismContextProperties.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs (.../HeightStructuresFailureMechanismContextProperties.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -42,7 +42,7 @@ private const int gravitationalAccelerationPropertyIndex = 3; private const int lengthEffectPropertyIndex = 4; private const int modelFactorOvertoppingFlowPropertyIndex = 5; - private const int modelFactorForStorageVolumePropertyIndex = 6; + private const int modelFactorStorageVolumePropertyIndex = 6; #region Length effect parameters @@ -123,18 +123,18 @@ } } - [PropertyOrder(modelFactorForStorageVolumePropertyIndex)] + [PropertyOrder(modelFactorStorageVolumePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_DisplayName")] - [ResourcesDescription(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorForStorageVolume_Description")] - public LogNormalDistributionProperties ModelFactorForStorageVolume + [ResourcesDisplayName(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_DisplayName")] + [ResourcesDescription(typeof(Resources), "HeightStructuresInputFailureMechanismContext_ModelFactorStorageVolume_Description")] + public LogNormalDistributionProperties ModelFactorStorageVolume { get { return new LogNormalDistributionProperties { - Data = data.WrappedData.GeneralInput.ModelFactorForStorageVolume + Data = data.WrappedData.GeneralInput.ModelFactorStorageVolume }; } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -51,7 +51,7 @@ private const int flowWidthAtBottomProtectionPropertyIndex = 5; private const int widthOfFlowAperturesPropertyIndex = 6; private const int criticalOvertoppingDischargePropertyIndex = 7; - private const int failureProbabilityOfStructureGivenErosionPropertyIndex = 8; + private const int failureProbabilityStructureWithErosionPropertyIndex = 8; private const int modelFactorSuperCriticalFlowPropertyIndex = 9; private const int hydraulicBoundaryLocationPropertyIndex = 10; private const int stormDurationPropertyIndex = 11; @@ -200,33 +200,33 @@ } } - [PropertyOrder(failureProbabilityOfStructureGivenErosionPropertyIndex)] + [PropertyOrder(failureProbabilityStructureWithErosionPropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_DisplayName")] - [ResourcesDescription(typeof(Resources), "FailureProbabilityOfStructureGivenErosion_Description")] - public string FailureProbabilityOfStructureGivenErosion + [ResourcesDisplayName(typeof(Resources), "FailureProbabilityStructureWithErosion_DisplayName")] + [ResourcesDescription(typeof(Resources), "FailureProbabilityStructureWithErosion_Description")] + public string FailureProbabilityStructureWithErosion { get { - return ProbabilityFormattingHelper.Format(data.WrappedData.FailureProbabilityOfStructureGivenErosion); + return ProbabilityFormattingHelper.Format(data.WrappedData.FailureProbabilityStructureWithErosion); } set { if (value == null) { - throw new ArgumentNullException("value", Resources.FailureProbabilityOfStructureGivenErosion_Value_cannot_be_null); + throw new ArgumentNullException("value", Resources.FailureProbabilityStructureWithErosion_Value_cannot_be_null); } try { - data.WrappedData.FailureProbabilityOfStructureGivenErosion = (RoundedDouble) double.Parse(value); + data.WrappedData.FailureProbabilityStructureWithErosion = (RoundedDouble) double.Parse(value); } catch (OverflowException) { - throw new ArgumentException(Resources.FailureProbabilityOfStructureGivenErosion_Value_too_large); + throw new ArgumentException(Resources.FailureProbabilityStructureWithErosion_Value_too_large); } catch (FormatException) { - throw new ArgumentException(Resources.FailureProbabilityOfStructureGivenErosion_Could_not_parse_string_to_double_value); + throw new ArgumentException(Resources.FailureProbabilityStructureWithErosion_Could_not_parse_string_to_double_value); } data.WrappedData.NotifyObservers(); } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -137,12 +137,12 @@ calculation.InputParameters.StructureNormalOrientation, calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation, calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, - generalInput.ModelFactorForStorageVolume.Mean, generalInput.ModelFactorForStorageVolume.StandardDeviation, + generalInput.ModelFactorStorageVolume.Mean, generalInput.ModelFactorStorageVolume.StandardDeviation, calculation.InputParameters.StorageStructureArea.Mean, calculation.InputParameters.StorageStructureArea.GetVariationCoefficient(), - generalInput.ModelFactorForIncomingFlowVolume, + generalInput.ModelFactorInflowVolume, calculation.InputParameters.FlowWidthAtBottomProtection.Mean, calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, calculation.InputParameters.CriticalOvertoppingDischarge.Mean, calculation.InputParameters.CriticalOvertoppingDischarge.GetVariationCoefficient(), - calculation.InputParameters.FailureProbabilityOfStructureGivenErosion, + calculation.InputParameters.FailureProbabilityStructureWithErosion, calculation.InputParameters.WidthOfFlowApertures.Mean, calculation.InputParameters.WidthOfFlowApertures.GetVariationCoefficient(), calculation.InputParameters.DeviationOfTheWaveDirection, calculation.InputParameters.StormDuration.Mean, calculation.InputParameters.StormDuration.GetVariationCoefficient()); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs =================================================================== diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -49,15 +49,15 @@ Assert.AreEqual(modelFactorOvertopping.Mean, generalHeightStructuresInput.ModelFactorOvertoppingFlow.Mean); Assert.AreEqual(modelFactorOvertopping.StandardDeviation, generalHeightStructuresInput.ModelFactorOvertoppingFlow.StandardDeviation); - var modelFactorForStorageVolume = new NormalDistribution(2) + var modelFactorStorageVolume = new NormalDistribution(2) { Mean = new RoundedDouble(2, 1.00), StandardDeviation = new RoundedDouble(2, 0.20) }; - Assert.AreEqual(modelFactorForStorageVolume.Mean, generalHeightStructuresInput.ModelFactorForStorageVolume.Mean); - Assert.AreEqual(modelFactorForStorageVolume.StandardDeviation, generalHeightStructuresInput.ModelFactorForStorageVolume.StandardDeviation); + Assert.AreEqual(modelFactorStorageVolume.Mean, generalHeightStructuresInput.ModelFactorStorageVolume.Mean); + Assert.AreEqual(modelFactorStorageVolume.StandardDeviation, generalHeightStructuresInput.ModelFactorStorageVolume.StandardDeviation); - Assert.AreEqual(1, generalHeightStructuresInput.ModelFactorForIncomingFlowVolume, 1e-6); + Assert.AreEqual(1, generalHeightStructuresInput.ModelFactorInflowVolume, 1e-6); } [Test] Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -87,7 +87,7 @@ Assert.AreEqual(2, widthOfFlowApertures.StandardDeviation.NumberOfDecimalPlaces); Assert.AreEqual(0.57, widthOfFlowApertures.StandardDeviation.Value); - Assert.AreEqual(0.67890, heightStructure.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(0.67890, heightStructure.FailureProbabilityStructureWithErosion); var storageStructureArea = heightStructure.StorageStructureArea; Assert.IsInstanceOf(storageStructureArea); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -140,7 +140,7 @@ Assert.AreEqual(18, inputParameters.WidthOfFlowApertures.Mean.Value); Assert.AreEqual(2, inputParameters.DeviationOfTheWaveDirection.NumberOfDecimalPlaces); Assert.AreEqual(0.0, inputParameters.DeviationOfTheWaveDirection.Value); - Assert.AreEqual(1.0, inputParameters.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(1.0, inputParameters.FailureProbabilityStructureWithErosion); } private class TestHeightStructuresOutput : ProbabilityAssessmentOutput Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -rd5daf17a6ed66dddef590069e4db152f6250c2c3 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision d5daf17a6ed66dddef590069e4db152f6250c2c3) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -281,29 +281,29 @@ [TestCase(0)] [TestCase(0.5)] [TestCase(1)] - public void Properties_ValidFailureProbabilityOfStructureGivenErosion_ExpectedValues(double failureProbabilityOfStructureGivenErosion) + public void Properties_ValidFailureProbabilityStructureWithErosion_ExpectedValues(double failureProbabilityStructureWithErosion) { // Setup var input = new HeightStructuresInput(); // Call - input.FailureProbabilityOfStructureGivenErosion = failureProbabilityOfStructureGivenErosion; + input.FailureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; // Assert - Assert.AreEqual(failureProbabilityOfStructureGivenErosion, input.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(failureProbabilityStructureWithErosion, input.FailureProbabilityStructureWithErosion); } [Test] [TestCase(-0.1)] [TestCase(1.1)] [TestCase(double.NaN)] - public void Properties_InvalidFailureProbabilityOfStructureGivenErosion_ThrowArgumentOutOfRangeException(double failureProbabilityOfStructureGivenErosion) + public void Properties_InvalidFailureProbabilityStructureWithErosion_ThrowArgumentOutOfRangeException(double failureProbabilityStructureWithErosion) { // Setup var input = new HeightStructuresInput(); // Call - TestDelegate call = () => input.FailureProbabilityOfStructureGivenErosion = (RoundedDouble) failureProbabilityOfStructureGivenErosion; + TestDelegate call = () => input.FailureProbabilityStructureWithErosion = (RoundedDouble) failureProbabilityStructureWithErosion; // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen."); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -41,7 +41,7 @@ private const int flowWidthAtBottomProtection = 6; private const int widthOfFlowApertures = 7; private const int criticalOvertoppingDischarge = 8; - private const int failureProbabilityOfStructureGivenErosion = 9; + private const int failureProbabilityStructureWithErosion = 9; [Test] public void Constructor_ExpectedValues() @@ -101,7 +101,7 @@ Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean")); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("StandardDeviation")); - Assert.AreEqual(structure.FailureProbabilityOfStructureGivenErosion, properties.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(structure.FailureProbabilityStructureWithErosion, properties.FailureProbabilityStructureWithErosion); } [Test] @@ -181,11 +181,11 @@ Assert.AreEqual("Kritiek overslagdebiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Het kritieke overslagdebiet per strekkende meter.", criticalOvertoppingDischargeProperty.Description); - PropertyDescriptor failureProbabilityOfStructureGivenErosionProperty = dynamicProperties[failureProbabilityOfStructureGivenErosion]; - Assert.IsTrue(failureProbabilityOfStructureGivenErosionProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, failureProbabilityOfStructureGivenErosionProperty.Category); - Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityOfStructureGivenErosionProperty.DisplayName); - Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityOfStructureGivenErosionProperty.Description); + PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosion]; + Assert.IsTrue(failureProbabilityStructureWithErosionProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category); + Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName); + Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityStructureWithErosionProperty.Description); } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -rccce1ae96e85aa2603c218de61de03fb14cfae11 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs (.../HeightStructuresFailureMechanismContextPropertiesTest.cs) (revision ccce1ae96e85aa2603c218de61de03fb14cfae11) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs (.../HeightStructuresFailureMechanismContextPropertiesTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -40,7 +40,7 @@ private const int gravitationalAccelerationPropertyIndex = 2; private const int lengthEffectPropertyIndex = 3; private const int modelFactorOvertoppingFlowPropertyIndex = 4; - private const int modelFactorForStorageVolumePropertyIndex = 5; + private const int modelFactorStorageVolumePropertyIndex = 5; private MockRepository mockRepository; [SetUp] @@ -83,8 +83,8 @@ Assert.AreEqual(generalInput.ModelFactorOvertoppingFlow.Mean, properties.ModelFactorOvertoppingFlow.Mean); Assert.AreEqual(generalInput.ModelFactorOvertoppingFlow.StandardDeviation, properties.ModelFactorOvertoppingFlow.StandardDeviation); - Assert.AreEqual(generalInput.ModelFactorForStorageVolume.Mean, properties.ModelFactorForStorageVolume.Mean); - Assert.AreEqual(generalInput.ModelFactorForStorageVolume.StandardDeviation, properties.ModelFactorForStorageVolume.StandardDeviation); + Assert.AreEqual(generalInput.ModelFactorStorageVolume.Mean, properties.ModelFactorStorageVolume.Mean); + Assert.AreEqual(generalInput.ModelFactorStorageVolume.StandardDeviation, properties.ModelFactorStorageVolume.StandardDeviation); mockRepository.VerifyAll(); } @@ -175,13 +175,13 @@ Assert.AreEqual("Modelfactor overslagdebiet [-]", modelFactorOvertoppingFlowProperty.DisplayName); Assert.AreEqual("Het modelfactor overslagdebiet.", modelFactorOvertoppingFlowProperty.Description); - PropertyDescriptor modelFactorForStorageVolumeProperty = dynamicProperties[modelFactorForStorageVolumePropertyIndex]; - Assert.IsNotNull(modelFactorForStorageVolumeProperty); - Assert.IsInstanceOf(modelFactorForStorageVolumeProperty.Converter); - Assert.IsTrue(modelFactorForStorageVolumeProperty.IsReadOnly); - Assert.AreEqual(modelSettingsCategory, modelFactorForStorageVolumeProperty.Category); - Assert.AreEqual("Modelfactor kombergingsvolume [-]", modelFactorForStorageVolumeProperty.DisplayName); - Assert.AreEqual("Het modelfactor kombergingsvolume.", modelFactorForStorageVolumeProperty.Description); + PropertyDescriptor modelFactorStorageVolumeProperty = dynamicProperties[modelFactorStorageVolumePropertyIndex]; + Assert.IsNotNull(modelFactorStorageVolumeProperty); + Assert.IsInstanceOf(modelFactorStorageVolumeProperty.Converter); + Assert.IsTrue(modelFactorStorageVolumeProperty.IsReadOnly); + Assert.AreEqual(modelSettingsCategory, modelFactorStorageVolumeProperty.Category); + Assert.AreEqual("Modelfactor kombergingsvolume [-]", modelFactorStorageVolumeProperty.DisplayName); + Assert.AreEqual("Het modelfactor kombergingsvolume.", modelFactorStorageVolumeProperty.Description); mockRepository.VerifyAll(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r6b9fda141298524c0910937dd090d82be420c52b -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 6b9fda141298524c0910937dd090d82be420c52b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -50,7 +50,7 @@ private const int flowWidthAtBottomProtectionPropertyIndex = 4; private const int widthOfFlowAperturesPropertyIndex = 5; private const int criticalOvertoppingDischargePropertyIndex = 6; - private const int failureProbabilityOfStructureGivenErosionPropertyIndex = 7; + private const int failureProbabilityStructureWithErosionPropertyIndex = 7; private const int modelFactorSuperCriticalFlowPropertyIndex = 8; private const int hydraulicBoundaryLocationPropertyIndex = 9; private const int stormDurationPropertyIndex = 10; @@ -134,8 +134,8 @@ }; AssertLogNormalDistributionVariationProperties(criticalOvertoppingDischargeProperties, properties.CriticalOvertoppingDischarge); - var expectedFailureProbabilityOfStructureGivenErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityOfStructureGivenErosion); - Assert.AreEqual(expectedFailureProbabilityOfStructureGivenErosion, properties.FailureProbabilityOfStructureGivenErosion); + var expectedFailureProbabilityStructureWithErosion = ProbabilityFormattingHelper.Format(input.FailureProbabilityStructureWithErosion); + Assert.AreEqual(expectedFailureProbabilityStructureWithErosion, properties.FailureProbabilityStructureWithErosion); Assert.AreEqual(input.HydraulicBoundaryLocation, properties.HydraulicBoundaryLocation); @@ -175,20 +175,20 @@ // Call properties.StructureNormalOrientation = newStructureNormalOrientation; - properties.FailureProbabilityOfStructureGivenErosion = "1e-2"; + properties.FailureProbabilityStructureWithErosion = "1e-2"; properties.HydraulicBoundaryLocation = hydraulicBoundaryLocation; // Assert Assert.AreEqual(newStructureNormalOrientation, properties.StructureNormalOrientation); - Assert.AreEqual(0.01, input.FailureProbabilityOfStructureGivenErosion); - Assert.AreEqual("1/100", properties.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(0.01, input.FailureProbabilityStructureWithErosion); + Assert.AreEqual("1/100", properties.FailureProbabilityStructureWithErosion); Assert.AreSame(hydraulicBoundaryLocation, properties.HydraulicBoundaryLocation); mockRepository.VerifyAll(); } [Test] [TestCase(double.MaxValue)] - public void SetFailureProbabilityOfStructureGivenErosion_InvalidValues_ThrowsArgumentException(double newValue) + public void SetFailureProbabilityStructureWithErosion_InvalidValues_ThrowsArgumentException(double newValue) { // Setup var assessmentSectionMock = mockRepository.StrictMock(); @@ -204,10 +204,10 @@ }; // Call - TestDelegate call = () => properties.FailureProbabilityOfStructureGivenErosion = newValue.ToString(CultureInfo.InvariantCulture); + TestDelegate call = () => properties.FailureProbabilityStructureWithErosion = newValue.ToString(CultureInfo.InvariantCulture); // Assert - var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Value_too_large; + var expectedMessage = Resources.FailureProbabilityStructureWithErosion_Value_too_large; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); mockRepository.VerifyAll(); @@ -216,7 +216,7 @@ [Test] [TestCase("no double value")] [TestCase("")] - public void SetFailureProbabilityOfStructureGivenErosion_ValuesUnableToParse_ThrowsArgumentException(string newValue) + public void SetFailureProbabilityStructureWithErosion_ValuesUnableToParse_ThrowsArgumentException(string newValue) { // Setup var assessmentSectionMock = mockRepository.StrictMock(); @@ -232,17 +232,17 @@ }; // Call - TestDelegate call = () => properties.FailureProbabilityOfStructureGivenErosion = newValue; + TestDelegate call = () => properties.FailureProbabilityStructureWithErosion = newValue; // Assert - var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Could_not_parse_string_to_double_value; + var expectedMessage = Resources.FailureProbabilityStructureWithErosion_Could_not_parse_string_to_double_value; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); mockRepository.VerifyAll(); } [Test] - public void SetFailureProbabilityOfStructureGivenErosion_NullValue_ThrowsArgumentException() + public void SetFailureProbabilityStructureWithErosion_NullValue_ThrowsArgumentException() { // Setup var assessmentSectionMock = mockRepository.StrictMock(); @@ -258,10 +258,10 @@ }; // Call - TestDelegate call = () => properties.FailureProbabilityOfStructureGivenErosion = null; + TestDelegate call = () => properties.FailureProbabilityStructureWithErosion = null; // Assert - var expectedMessage = Resources.FailureProbabilityOfStructureGivenErosion_Value_cannot_be_null; + var expectedMessage = Resources.FailureProbabilityStructureWithErosion_Value_cannot_be_null; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); mockRepository.VerifyAll(); @@ -334,11 +334,11 @@ Assert.AreEqual("Kritiek overslagdebiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Het kritieke overslagdebiet per strekkende meter.", criticalOvertoppingDischargeProperty.Description); - PropertyDescriptor failureProbabilityOfStructureGivenErosionProperty = dynamicProperties[failureProbabilityOfStructureGivenErosionPropertyIndex]; - Assert.IsFalse(failureProbabilityOfStructureGivenErosionProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, failureProbabilityOfStructureGivenErosionProperty.Category); - Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityOfStructureGivenErosionProperty.DisplayName); - Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityOfStructureGivenErosionProperty.Description); + PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex]; + Assert.IsFalse(failureProbabilityStructureWithErosionProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category); + Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName); + Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityStructureWithErosionProperty.Description); PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[modelFactorSuperCriticalFlowPropertyIndex]; Assert.IsInstanceOf(modelFactorSuperCriticalFlowProperty.Converter); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) @@ -440,10 +440,10 @@ const double modelFactorSuperCriticalFlowMean = 1.1; const double modelFactorSuperCriticalFlowStandardDeviation = 0.03; const double allowedLevelIncreaseStorageStandardDeviation = 0.1; - const double modelFactorForStorageVolumeMean = 1.0; - const double modelFactorForStorageVolumeStandardDeviation = 0.2; + const double modelFactorStorageVolumeMean = 1.0; + const double modelFactorStorageVolumeStandardDeviation = 0.2; const double storageStructureAreaStandardDeviation = 0.1; - const double modelFactorForIncomingFlowVolume = 1; + const double modelFactorInflowVolume = 1; const double flowWidthAtBottomProtectionStandardDeviation = 0.05; const double criticalOvertoppingDischargeMeanStandardDeviation = 0.15; const double widthOfFlowAperturesStandardDeviation = 0.05; @@ -456,7 +456,7 @@ const double storageStructureAreaMean = 4.4; const double flowWidthAtBottomProtectionMean = 5.5; const double criticalOvertoppingDischargeMean = 6.6; - const double failureProbabilityOfStructureGivenErosion = 7.7; + const double failureProbabilityStructureWithErosion = 7.7; const double widthOfFlowAperturesMean = 8.8; const double deviationOfTheWaveDirection = 9.9; @@ -468,12 +468,12 @@ structureNormalOrientation, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, - modelFactorForStorageVolumeMean, modelFactorForStorageVolumeStandardDeviation, + modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation, storageStructureAreaMean, storageStructureAreaStandardDeviation, - modelFactorForIncomingFlowVolume, + modelFactorInflowVolume, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeMeanStandardDeviation, - failureProbabilityOfStructureGivenErosion, + failureProbabilityStructureWithErosion, widthOfFlowAperturesMean, widthOfFlowAperturesStandardDeviation, deviationOfTheWaveDirection, stormDurationMean, stormDurationStandardDeviation));