Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r240fbc1c83da30eae57a9dace4f4a136c8213437 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 240fbc1c83da30eae57a9dace4f4a136c8213437) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -290,9 +290,9 @@ Assert.AreEqual("KUNST1", heightStructure.Name); Assert.AreEqual("KUNST1", heightStructure.Id); Assert.AreEqual(new Point2D(12345.56789, 9876.54321), heightStructure.Location); - Assert.AreEqual(45.0, heightStructure.OrientationOfTheNormalOfTheStructure.Value); - Assert.AreEqual(5.9, heightStructure.LevelOfCrestOfStructure.Mean.Value); - Assert.AreEqual(0.01, heightStructure.LevelOfCrestOfStructure.StandardDeviation.Value); + Assert.AreEqual(45.0, heightStructure.StructureNormalOrientation.Value); + Assert.AreEqual(5.9, heightStructure.LevelCrestStructure.Mean.Value); + Assert.AreEqual(0.01, heightStructure.LevelCrestStructure.StandardDeviation.Value); Assert.AreEqual(18.5, heightStructure.FlowWidthAtBottomProtection.Mean.Value); Assert.AreEqual(0.05, heightStructure.FlowWidthAtBottomProtection.StandardDeviation.Value); Assert.AreEqual(0.1, heightStructure.CriticalOvertoppingDischarge.Mean.Value); @@ -302,8 +302,8 @@ Assert.AreEqual(1.0, heightStructure.FailureProbabilityOfStructureGivenErosion); Assert.AreEqual(50000.0, heightStructure.StorageStructureArea.Mean.Value); Assert.AreEqual(0.02, heightStructure.StorageStructureArea.StandardDeviation.Value); - Assert.AreEqual(6.5, heightStructure.AllowableIncreaseOfLevelForStorage.Mean.Value); - Assert.AreEqual(0.1, heightStructure.AllowableIncreaseOfLevelForStorage.StandardDeviation.Value); + Assert.AreEqual(6.5, heightStructure.AllowedLevelIncreaseStorage.Mean.Value); + Assert.AreEqual(0.1, heightStructure.AllowedLevelIncreaseStorage.StandardDeviation.Value); } private static void AssertExpectedHeightStructuresInput(HeightStructuresInput inputParameters) Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs =================================================================== diff -u -rad75a347a7586757599297f2b2e776100d827264 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision ad75a347a7586757599297f2b2e776100d827264) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/StructuresParameterRowsValidator.cs (.../StructuresParameterRowsValidator.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -34,10 +34,10 @@ new Dictionary>> { { - "KW_HOOGTE1", OrientationOfTheNormalOfTheStructure + "KW_HOOGTE1", StructureNormalOrientation }, { - "KW_HOOGTE2", LevelOfCrestOfStructure + "KW_HOOGTE2", LevelCrestStructure }, { "KW_HOOGTE3", FlowWidthAtBottomProtection @@ -55,7 +55,7 @@ "KW_HOOGTE7", StorageStructureArea }, { - "KW_HOOGTE8", AllowableIncreaseOfLevelForStorage + "KW_HOOGTE8", AllowedLevelIncreaseStorage } }; @@ -66,10 +66,10 @@ "KW_BETSLUIT1", StorageStructureArea }, { - "KW_BETSLUIT2", AllowableIncreaseOfLevelForStorage + "KW_BETSLUIT2", AllowedLevelIncreaseStorage }, { - "KW_BETSLUIT3", OrientationOfTheNormalOfTheStructure + "KW_BETSLUIT3", StructureNormalOrientation }, { "KW_BETSLUIT4", WidthOfFlowApertures @@ -180,7 +180,7 @@ return messages; } - private static List AllowableIncreaseOfLevelForStorage(StructuresParameterRow row) + private static List AllowedLevelIncreaseStorage(StructuresParameterRow row) { List messages = new List(); double meanAllowableIncrease = row.NumericalValue; @@ -196,7 +196,7 @@ return messages; } - private static List OrientationOfTheNormalOfTheStructure(StructuresParameterRow row) + private static List StructureNormalOrientation(StructuresParameterRow row) { List messages = new List(); double orientation = row.NumericalValue; @@ -259,7 +259,7 @@ #region HeightStructuesRules - private static List LevelOfCrestOfStructure(StructuresParameterRow row) + private static List LevelCrestStructure(StructuresParameterRow row) { List messages = new List(); double meanCrestLevel = row.NumericalValue; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs =================================================================== diff -u -rad75a347a7586757599297f2b2e776100d827264 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision ad75a347a7586757599297f2b2e776100d827264) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -38,9 +38,9 @@ /// The name of the height structure. /// The identifier of the height structure. /// The location of the height structure. - /// The orientation of the height structure, relative to north. - /// The mean crest level of the height structure. - /// The standard deviation of the crest level of the height structure. + /// The orientation of the height structure, relative to north. + /// The mean crest level of the height structure. + /// The standard deviation of the crest level of the height structure. /// The mean flow width of the height structure at the bottom protection. /// The standard deviation of the flow width of the height structure at the bottom protection. /// The mean critical overtopping discharge of the height structure. @@ -50,27 +50,27 @@ /// 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. - /// The standard deviation of allowable increase of level for storage of the height structure. + /// The mean allowable increase of level for storage of the height structure. + /// The standard deviation of allowable increase of level for storage of the height structure. /// Thrown when or is null /// , empty or consists of whitespace. /// Thrown when is null. public HeightStructure(string name, string id, Point2D location, - double orientationOfTheNormalOfTheStructure, - double levelOfCrestOfStructureMean, double levelOfCrestOfStructureStandardDeviation, + double structureNormalOrientation, + double levelCrestStructureMean, double levelCrestStructureStandardDeviation, double flowWidthAtBottomProtectionMean, double flowWidthAtBottomProtectionStandardDeviation, double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeStandardDeviation, double widthOfFlowAperturesMean, double widthOfFlowAperturesStandardDeviation, double failureProbabilityOfStructureGivenErosion, double storageStructureAreaMean, double storageStructureAreaStandardDeviation, - double allowableIncreaseOfLevelForStorageMean, double allowableIncreaseOfLevelForStorageStandardDeviation) + double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation) : base(name, id, location) { - OrientationOfTheNormalOfTheStructure = new RoundedDouble(2, orientationOfTheNormalOfTheStructure); - LevelOfCrestOfStructure = new NormalDistribution(2) + StructureNormalOrientation = new RoundedDouble(2, structureNormalOrientation); + LevelCrestStructure = new NormalDistribution(2) { - Mean = new RoundedDouble(2, levelOfCrestOfStructureMean), - StandardDeviation = new RoundedDouble(2, levelOfCrestOfStructureStandardDeviation) + Mean = new RoundedDouble(2, levelCrestStructureMean), + StandardDeviation = new RoundedDouble(2, levelCrestStructureStandardDeviation) }; FlowWidthAtBottomProtection = new LogNormalDistribution(2) { @@ -93,22 +93,22 @@ Mean = new RoundedDouble(2, storageStructureAreaMean), StandardDeviation = new RoundedDouble(2, storageStructureAreaStandardDeviation) }; - AllowableIncreaseOfLevelForStorage = new LogNormalDistribution(2) + AllowedLevelIncreaseStorage = new LogNormalDistribution(2) { - Mean = new RoundedDouble(2, allowableIncreaseOfLevelForStorageMean), - StandardDeviation = new RoundedDouble(2, allowableIncreaseOfLevelForStorageStandardDeviation) + Mean = new RoundedDouble(2, allowedLevelIncreaseStorageMean), + StandardDeviation = new RoundedDouble(2, allowedLevelIncreaseStorageStandardDeviation) }; } /// /// Gets the orientation of the height structure, relative to north. /// - public RoundedDouble OrientationOfTheNormalOfTheStructure { get; private set; } + public RoundedDouble StructureNormalOrientation { get; private set; } /// /// Gets the crest level of the height structure. /// - public NormalDistribution LevelOfCrestOfStructure { get; private set; } + public NormalDistribution LevelCrestStructure { get; private set; } /// /// Gets the flow width of the height structure at the bottom protection. @@ -138,6 +138,6 @@ /// /// Gets the allowable increase of level for storage of the height structure. /// - public LogNormalDistribution AllowableIncreaseOfLevelForStorage { get; private set; } + public LogNormalDistribution AllowedLevelIncreaseStorage { get; private set; } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs =================================================================== diff -u -r1051f838aebbd5977351542027ce6330583b0d43 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision 1051f838aebbd5977351542027ce6330583b0d43) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -81,9 +81,9 @@ private void AddDemoInput() { - InputParameters.LevelOfCrestOfStructure.Mean = (RoundedDouble) 5.74; - InputParameters.OrientationOfTheNormalOfTheStructure = (RoundedDouble) 115; - InputParameters.AllowableIncreaseOfLevelForStorage.Mean = (RoundedDouble) 1.0; + InputParameters.LevelCrestStructure.Mean = (RoundedDouble) 5.74; + InputParameters.StructureNormalOrientation = (RoundedDouble) 115; + InputParameters.AllowedLevelIncreaseStorage.Mean = (RoundedDouble) 1.0; InputParameters.FlowWidthAtBottomProtection.Mean = (RoundedDouble) 18; InputParameters.CriticalOvertoppingDischarge.Mean = (RoundedDouble) 1; InputParameters.WidthOfFlowApertures.Mean = (RoundedDouble) 18; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u -r13e66da0fff74d0062fe1c0872691a6634a4853b -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 13e66da0fff74d0062fe1c0872691a6634a4853b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -34,15 +34,15 @@ /// public class HeightStructuresInput : Observable, ICalculationInput { - private readonly NormalDistribution levelOfCrestOfStructure; - private readonly NormalDistribution modelFactorOvertoppingSuperCriticalFlow; - private readonly LogNormalDistribution allowableIncreaseOfLevelForStorage; + private readonly NormalDistribution levelCrestStructure; + private readonly NormalDistribution modelFactorSuperCriticalFlow; + private readonly LogNormalDistribution allowedLevelIncreaseStorage; private readonly LogNormalDistribution storageStructureArea; private readonly LogNormalDistribution flowWidthAtBottomProtection; private readonly LogNormalDistribution criticalOvertoppingDischarge; private readonly NormalDistribution widthOfFlowApertures; private readonly LogNormalDistribution stormDuration; - private RoundedDouble orientationOfTheNormalOfTheStructure; + private RoundedDouble structureNormalOrientation; private RoundedDouble deviationOfTheWaveDirection; private double failureProbabilityOfStructureGivenErosion; @@ -53,20 +53,20 @@ { failureProbabilityOfStructureGivenErosion = 1.0; - levelOfCrestOfStructure = new NormalDistribution(2) + levelCrestStructure = new NormalDistribution(2) { StandardDeviation = (RoundedDouble) 0.05 }; - orientationOfTheNormalOfTheStructure = new RoundedDouble(2); + structureNormalOrientation = new RoundedDouble(2); - modelFactorOvertoppingSuperCriticalFlow = new NormalDistribution(2) + modelFactorSuperCriticalFlow = new NormalDistribution(2) { Mean = (RoundedDouble) 1.1, StandardDeviation = (RoundedDouble) 0.03 }; - allowableIncreaseOfLevelForStorage = new LogNormalDistribution(2) + allowedLevelIncreaseStorage = new LogNormalDistribution(2) { Mean = (RoundedDouble) double.NaN, StandardDeviation = (RoundedDouble) 0.1 @@ -110,15 +110,15 @@ /// Gets or sets the model factor overtopping critical flow. /// /// Only sets the mean. - public NormalDistribution ModelFactorOvertoppingSuperCriticalFlow + public NormalDistribution ModelFactorSuperCriticalFlow { get { - return modelFactorOvertoppingSuperCriticalFlow; + return modelFactorSuperCriticalFlow; } set { - modelFactorOvertoppingSuperCriticalFlow.Mean = value.Mean; + modelFactorSuperCriticalFlow.Mean = value.Mean; } } @@ -177,16 +177,16 @@ /// Gets or sets the level of crest of the structure. /// [m+NAP] /// - public NormalDistribution LevelOfCrestOfStructure + public NormalDistribution LevelCrestStructure { get { - return levelOfCrestOfStructure; + return levelCrestStructure; } set { - levelOfCrestOfStructure.Mean = value.Mean; - levelOfCrestOfStructure.StandardDeviation = value.StandardDeviation; + levelCrestStructure.Mean = value.Mean; + levelCrestStructure.StandardDeviation = value.StandardDeviation; } } @@ -195,38 +195,38 @@ /// [degrees] /// ///Thrown when the value for the orientation is not between [0, 360] degrees. - public RoundedDouble OrientationOfTheNormalOfTheStructure + public RoundedDouble StructureNormalOrientation { get { - return orientationOfTheNormalOfTheStructure; + return structureNormalOrientation; } set { - RoundedDouble newOrientationValue = value.ToPrecision(orientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces); + RoundedDouble newOrientationValue = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces); if (newOrientationValue < 0 || newOrientationValue > 360) { throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.Orientation_Value_needs_to_be_between_0_and_360); } - orientationOfTheNormalOfTheStructure = newOrientationValue; + structureNormalOrientation = newOrientationValue; } } /// /// Gets or sets the allowable increase of level for the storage. /// [m] /// - public LogNormalDistribution AllowableIncreaseOfLevelForStorage + public LogNormalDistribution AllowedLevelIncreaseStorage { get { - return allowableIncreaseOfLevelForStorage; + return allowedLevelIncreaseStorage; } set { - allowableIncreaseOfLevelForStorage.Mean = value.Mean; - allowableIncreaseOfLevelForStorage.StandardDeviation = value.StandardDeviation; + allowedLevelIncreaseStorage.Mean = value.Mean; + allowedLevelIncreaseStorage.StandardDeviation = value.StandardDeviation; } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r1f5543e4b0c6e4c1464232890da7a2598c40b72e -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1f5543e4b0c6e4c1464232890da7a2598c40b72e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -84,18 +84,18 @@ /// /// Looks up a localized string similar to De toegestane peilverhoging op het kombergend oppervlak.. /// - public static string AllowableIncreaseOfLevelForStorage_Description { + public static string AllowedLevelIncreaseStorage_Description { get { - return ResourceManager.GetString("AllowableIncreaseOfLevelForStorage_Description", resourceCulture); + return ResourceManager.GetString("AllowedLevelIncreaseStorage_Description", resourceCulture); } } /// /// Looks up a localized string similar to Toegestane peilverhoging komberging [m]. /// - public static string AllowableIncreaseOfLevelForStorage_DisplayName { + public static string AllowedLevelIncreaseStorage_DisplayName { get { - return ResourceManager.GetString("AllowableIncreaseOfLevelForStorage_DisplayName", resourceCulture); + return ResourceManager.GetString("AllowedLevelIncreaseStorage_DisplayName", resourceCulture); } } @@ -307,58 +307,40 @@ /// /// Looks up a localized string similar to De kerende hoogte van het kunstwerk.. /// - public static string LevelOfCrestOfStructure_Description { + public static string LevelCrestStructure_Description { get { - return ResourceManager.GetString("LevelOfCrestOfStructure_Description", resourceCulture); + return ResourceManager.GetString("LevelCrestStructure_Description", resourceCulture); } } /// /// Looks up a localized string similar to Kerende hoogte [m]. /// - public static string LevelOfCrestOfStructure_DisplayName { + public static string LevelCrestStructure_DisplayName { get { - return ResourceManager.GetString("LevelOfCrestOfStructure_DisplayName", resourceCulture); + return ResourceManager.GetString("LevelCrestStructure_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Het modelfactor van overloopdebiet bij superkritische stroming.. /// - public static string ModelFactorOvertoppingSuperCriticalFlow_Description { + public static string ModelFactorSuperCriticalFlow_Description { get { - return ResourceManager.GetString("ModelFactorOvertoppingSuperCriticalFlow_Description", resourceCulture); + return ResourceManager.GetString("ModelFactorSuperCriticalFlow_Description", resourceCulture); } } /// /// Looks up a localized string similar to Modelfactor van overloopdebiet bij superkritische stroming [-]. /// - public static string ModelFactorOvertoppingSuperCriticalFlow_DisplayName { + public static string ModelFactorSuperCriticalFlow_DisplayName { get { - return ResourceManager.GetString("ModelFactorOvertoppingSuperCriticalFlow_DisplayName", resourceCulture); + return ResourceManager.GetString("ModelFactorSuperCriticalFlow_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.. - /// - public static string OrientationOfTheNormalOfTheStructure_Description { - get { - return ResourceManager.GetString("OrientationOfTheNormalOfTheStructure_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Oriëntatie [°]. - /// - public static string OrientationOfTheNormalOfTheStructure_DisplayName { - get { - return ResourceManager.GetString("OrientationOfTheNormalOfTheStructure_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Het kombergend oppervlak.. /// public static string StorageStructureArea_Description { @@ -395,6 +377,24 @@ } /// + /// Looks up a localized string similar to Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.. + /// + public static string StructureNormalOrientation_Description { + get { + return ResourceManager.GetString("StructureNormalOrientation_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Oriëntatie [°]. + /// + public static string StructureNormalOrientation_DisplayName { + get { + return ResourceManager.GetString("StructureNormalOrientation_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De breedte van de kruin van het kunstwerk.. /// public static string WidthOfFlowApertures_Description { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx =================================================================== diff -u -rd499bba7f0abdb8481bfe1ffc619414116a13121 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision d499bba7f0abdb8481bfe1ffc619414116a13121) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -144,10 +144,10 @@ Modelfactor overslagdebiet [-] - + De toegestane peilverhoging op het kombergend oppervlak. - + Toegestane peilverhoging komberging [m] @@ -168,22 +168,22 @@ Stroomvoerende breedte bij bodembescherming [m] - + De kerende hoogte van het kunstwerk. - + Kerende hoogte [m] - + Het modelfactor van overloopdebiet bij superkritische stroming. - + Modelfactor van overloopdebiet bij superkritische stroming [-] - + Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden. - + Oriëntatie [°] Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs =================================================================== diff -u -rd499bba7f0abdb8481bfe1ffc619414116a13121 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision d499bba7f0abdb8481bfe1ffc619414116a13121) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructureProperties.cs (.../HeightStructureProperties.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -63,44 +63,44 @@ [PropertyOrder(3)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "OrientationOfTheNormalOfTheStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "OrientationOfTheNormalOfTheStructure_Description")] - public RoundedDouble OrientationOfTheNormalOfTheStructure + [ResourcesDisplayName(typeof(Resources), "StructureNormalOrientation_DisplayName")] + [ResourcesDescription(typeof(Resources), "StructureNormalOrientation_Description")] + public RoundedDouble StructureNormalOrientation { get { - return data.OrientationOfTheNormalOfTheStructure; + return data.StructureNormalOrientation; } } [PropertyOrder(4)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "LevelOfCrestOfStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "LevelOfCrestOfStructure_Description")] - public NormalDistributionProperties LevelOfCrestOfStructure + [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")] + [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")] + public NormalDistributionProperties LevelCrestStructure { get { return new NormalDistributionProperties { - Data = data.LevelOfCrestOfStructure + Data = data.LevelCrestStructure }; } } [PropertyOrder(5)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "AllowableIncreaseOfLevelForStorage_DisplayName")] - [ResourcesDescription(typeof(Resources), "AllowableIncreaseOfLevelForStorage_Description")] - public LogNormalDistributionProperties AllowableIncreaseOfLevelForStorage + [ResourcesDisplayName(typeof(Resources), "AllowedLevelIncreaseStorage_DisplayName")] + [ResourcesDescription(typeof(Resources), "AllowedLevelIncreaseStorage_Description")] + public LogNormalDistributionProperties AllowedLevelIncreaseStorage { get { return new LogNormalDistributionProperties { - Data = data.AllowableIncreaseOfLevelForStorage + Data = data.AllowedLevelIncreaseStorage }; } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r5bf3ab7f70cfc6ef3d15d590b527ade100e01235 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 5bf3ab7f70cfc6ef3d15d590b527ade100e01235) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -44,32 +44,32 @@ /// public class HeightStructuresInputContextProperties : ObjectProperties { - private const int orientationOfTheNormalOfTheStructurePropertyIndex = 1; - private const int levelOfCrestOfStructurePropertyIndex = 2; - private const int allowableIncreaseOfLevelForStoragePropertyIndex = 3; + private const int structureNormalOrientationPropertyIndex = 1; + private const int levelCrestStructurePropertyIndex = 2; + private const int allowedLevelIncreaseStoragePropertyIndex = 3; private const int storageStructureAreaPropertyIndex = 4; private const int flowWidthAtBottomProtectionPropertyIndex = 5; private const int widthOfFlowAperturesPropertyIndex = 6; private const int criticalOvertoppingDischargePropertyIndex = 7; private const int failureProbabilityOfStructureGivenErosionPropertyIndex = 8; - private const int modelFactorOvertoppingSuperCriticalFlowPropertyIndex = 9; + private const int modelFactorSuperCriticalFlowPropertyIndex = 9; private const int hydraulicBoundaryLocationPropertyIndex = 10; private const int stormDurationPropertyIndex = 11; #region Model settings - [PropertyOrder(modelFactorOvertoppingSuperCriticalFlowPropertyIndex)] + [PropertyOrder(modelFactorSuperCriticalFlowPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "ModelFactorOvertoppingSuperCriticalFlow_DisplayName")] - [ResourcesDescription(typeof(Resources), "ModelFactorOvertoppingSuperCriticalFlow_Description")] - public NormalDistributionProperties ModelFactorOvertoppingSuperCriticalFlow + [ResourcesDisplayName(typeof(Resources), "ModelFactorSuperCriticalFlow_DisplayName")] + [ResourcesDescription(typeof(Resources), "ModelFactorSuperCriticalFlow_Description")] + public NormalDistributionProperties ModelFactorSuperCriticalFlow { get { return new NormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.StandardDeviation) { - Data = data.WrappedData.ModelFactorOvertoppingSuperCriticalFlow + Data = data.WrappedData.ModelFactorSuperCriticalFlow }; } } @@ -87,51 +87,51 @@ #region Schematisation - [PropertyOrder(orientationOfTheNormalOfTheStructurePropertyIndex)] + [PropertyOrder(structureNormalOrientationPropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "OrientationOfTheNormalOfTheStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "OrientationOfTheNormalOfTheStructure_Description")] - public RoundedDouble OrientationOfTheNormalOfTheStructure + [ResourcesDisplayName(typeof(Resources), "StructureNormalOrientation_DisplayName")] + [ResourcesDescription(typeof(Resources), "StructureNormalOrientation_Description")] + public RoundedDouble StructureNormalOrientation { get { - return data.WrappedData.OrientationOfTheNormalOfTheStructure; + return data.WrappedData.StructureNormalOrientation; } set { - data.WrappedData.OrientationOfTheNormalOfTheStructure = value; + data.WrappedData.StructureNormalOrientation = value; data.WrappedData.NotifyObservers(); } } - [PropertyOrder(levelOfCrestOfStructurePropertyIndex)] + [PropertyOrder(levelCrestStructurePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "LevelOfCrestOfStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "LevelOfCrestOfStructure_Description")] - public NormalDistributionProperties LevelOfCrestOfStructure + [ResourcesDisplayName(typeof(Resources), "LevelCrestStructure_DisplayName")] + [ResourcesDescription(typeof(Resources), "LevelCrestStructure_Description")] + public NormalDistributionProperties LevelCrestStructure { get { return new NormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None) { - Data = data.WrappedData.LevelOfCrestOfStructure + Data = data.WrappedData.LevelCrestStructure }; } } - [PropertyOrder(allowableIncreaseOfLevelForStoragePropertyIndex)] + [PropertyOrder(allowedLevelIncreaseStoragePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "AllowableIncreaseOfLevelForStorage_DisplayName")] - [ResourcesDescription(typeof(Resources), "AllowableIncreaseOfLevelForStorage_Description")] - public LogNormalDistributionProperties AllowableIncreaseOfLevelForStorage + [ResourcesDisplayName(typeof(Resources), "AllowedLevelIncreaseStorage_DisplayName")] + [ResourcesDescription(typeof(Resources), "AllowedLevelIncreaseStorage_Description")] + public LogNormalDistributionProperties AllowedLevelIncreaseStorage { get { return new LogNormalDistributionProperties(data.WrappedData, DistributionPropertiesReadOnly.None) { - Data = data.WrappedData.AllowableIncreaseOfLevelForStorage + Data = data.WrappedData.AllowedLevelIncreaseStorage }; } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -rb2306061789f5e34a6f0994552b4431d01d220f0 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision b2306061789f5e34a6f0994552b4431d01d220f0) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -128,15 +128,15 @@ { return new StructuresOvertoppingCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.OrientationOfTheNormalOfTheStructure), + new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), new HydraRingForelandPoint[0], null, generalInput.GravitationalAcceleration, generalInput.ModelFactorOvertoppingFlow.Mean, generalInput.ModelFactorOvertoppingFlow.StandardDeviation, - calculation.InputParameters.LevelOfCrestOfStructure.Mean, calculation.InputParameters.LevelOfCrestOfStructure.StandardDeviation, - calculation.InputParameters.OrientationOfTheNormalOfTheStructure, - calculation.InputParameters.ModelFactorOvertoppingSuperCriticalFlow.Mean, calculation.InputParameters.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation, - calculation.InputParameters.AllowableIncreaseOfLevelForStorage.Mean, calculation.InputParameters.AllowableIncreaseOfLevelForStorage.StandardDeviation, + calculation.InputParameters.LevelCrestStructure.Mean, calculation.InputParameters.LevelCrestStructure.StandardDeviation, + 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, calculation.InputParameters.StorageStructureArea.Mean, calculation.InputParameters.StorageStructureArea.GetVariationCoefficient(), generalInput.ModelFactorForIncomingFlowVolume, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs =================================================================== diff -u -rad75a347a7586757599297f2b2e776100d827264 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision ad75a347a7586757599297f2b2e776100d827264) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -55,16 +55,16 @@ Assert.AreEqual(location.X, heightStructure.Location.X); Assert.AreEqual(location.Y, heightStructure.Location.Y); - Assert.IsInstanceOf(heightStructure.OrientationOfTheNormalOfTheStructure); - Assert.AreEqual(2, heightStructure.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces); - Assert.AreEqual(0.12, heightStructure.OrientationOfTheNormalOfTheStructure.Value); + Assert.IsInstanceOf(heightStructure.StructureNormalOrientation); + Assert.AreEqual(2, heightStructure.StructureNormalOrientation.NumberOfDecimalPlaces); + Assert.AreEqual(0.12, heightStructure.StructureNormalOrientation.Value); - var levelOfCrestOfStructure = heightStructure.LevelOfCrestOfStructure; - Assert.IsInstanceOf(levelOfCrestOfStructure); - Assert.AreEqual(2, levelOfCrestOfStructure.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(234.57, levelOfCrestOfStructure.Mean.Value); - Assert.AreEqual(2, levelOfCrestOfStructure.StandardDeviation.NumberOfDecimalPlaces); - Assert.AreEqual(0.23, levelOfCrestOfStructure.StandardDeviation.Value); + var levelCrestStructure = heightStructure.LevelCrestStructure; + Assert.IsInstanceOf(levelCrestStructure); + Assert.AreEqual(2, levelCrestStructure.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(234.57, levelCrestStructure.Mean.Value); + Assert.AreEqual(2, levelCrestStructure.StandardDeviation.NumberOfDecimalPlaces); + Assert.AreEqual(0.23, levelCrestStructure.StandardDeviation.Value); var flowWidthAtBottomProtection = heightStructure.FlowWidthAtBottomProtection; Assert.IsInstanceOf(flowWidthAtBottomProtection); @@ -96,12 +96,12 @@ Assert.AreEqual(2, storageStructureArea.StandardDeviation.NumberOfDecimalPlaces); Assert.AreEqual(0.11, storageStructureArea.StandardDeviation.Value); - var allowableIncreaseOfLevelForStorage = heightStructure.AllowableIncreaseOfLevelForStorage; - Assert.IsInstanceOf(allowableIncreaseOfLevelForStorage); - Assert.AreEqual(2, allowableIncreaseOfLevelForStorage.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(225.34, allowableIncreaseOfLevelForStorage.Mean.Value); - Assert.AreEqual(2, allowableIncreaseOfLevelForStorage.StandardDeviation.NumberOfDecimalPlaces); - Assert.AreEqual(0.23, allowableIncreaseOfLevelForStorage.StandardDeviation.Value); + var allowedLevelIncreaseStorage = heightStructure.AllowedLevelIncreaseStorage; + Assert.IsInstanceOf(allowedLevelIncreaseStorage); + Assert.AreEqual(2, allowedLevelIncreaseStorage.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(225.34, allowedLevelIncreaseStorage.Mean.Value); + Assert.AreEqual(2, allowedLevelIncreaseStorage.StandardDeviation.NumberOfDecimalPlaces); + Assert.AreEqual(0.23, allowedLevelIncreaseStorage.StandardDeviation.Value); } } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs =================================================================== diff -u -rc7da0846a135f849273407e16fe52237371e8f7a -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision c7da0846a135f849273407e16fe52237371e8f7a) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs (.../HeightStructuresCalculationTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -124,12 +124,12 @@ private void AssertDemoInput(HeightStructuresInput inputParameters) { - Assert.AreEqual(2, inputParameters.LevelOfCrestOfStructure.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(5.74, inputParameters.LevelOfCrestOfStructure.Mean.Value); - Assert.AreEqual(2, inputParameters.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces); - Assert.AreEqual(115, inputParameters.OrientationOfTheNormalOfTheStructure.Value); - Assert.AreEqual(2, inputParameters.AllowableIncreaseOfLevelForStorage.Mean.NumberOfDecimalPlaces); - Assert.AreEqual(1.0, inputParameters.AllowableIncreaseOfLevelForStorage.Mean.Value); + Assert.AreEqual(2, inputParameters.LevelCrestStructure.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(5.74, inputParameters.LevelCrestStructure.Mean.Value); + Assert.AreEqual(2, inputParameters.StructureNormalOrientation.NumberOfDecimalPlaces); + Assert.AreEqual(115, inputParameters.StructureNormalOrientation.Value); + Assert.AreEqual(2, inputParameters.AllowedLevelIncreaseStorage.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(1.0, inputParameters.AllowedLevelIncreaseStorage.Mean.Value); Assert.AreEqual(2, inputParameters.StorageStructureArea.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, inputParameters.StorageStructureArea.Mean.Value); Assert.AreEqual(2, inputParameters.FlowWidthAtBottomProtection.Mean.NumberOfDecimalPlaces); @@ -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, inputParameters.FailureProbabilityOfStructureGivenErosion); + Assert.AreEqual(1.0, inputParameters.FailureProbabilityOfStructureGivenErosion); } private class TestHeightStructuresOutput : ProbabilityAssessmentOutput Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -re1fb308ee037ad868246b1a38601f098f151a123 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision e1fb308ee037ad868246b1a38601f098f151a123) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -45,13 +45,13 @@ Assert.IsInstanceOf(input); Assert.IsNull(input.HydraulicBoundaryLocation); - AssertAreEqual(0, input.OrientationOfTheNormalOfTheStructure); - Assert.AreEqual(2, input.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces); + AssertAreEqual(0, input.StructureNormalOrientation); + Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - AssertAreEqual(0.05, input.LevelOfCrestOfStructure.StandardDeviation); - AssertAreEqual(1.1, input.ModelFactorOvertoppingSuperCriticalFlow.Mean); - AssertAreEqual(0.03, input.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation); - AssertAreEqual(0.1, input.AllowableIncreaseOfLevelForStorage.StandardDeviation); + AssertAreEqual(0.05, input.LevelCrestStructure.StandardDeviation); + AssertAreEqual(1.1, input.ModelFactorSuperCriticalFlow.Mean); + AssertAreEqual(0.03, input.ModelFactorSuperCriticalFlow.StandardDeviation); + AssertAreEqual(0.1, input.AllowedLevelIncreaseStorage.StandardDeviation); AssertAreEqual(0.1, input.StorageStructureArea.GetVariationCoefficient()); AssertAreEqual(0.05, input.FlowWidthAtBottomProtection.StandardDeviation); AssertAreEqual(0.15, input.CriticalOvertoppingDischarge.GetVariationCoefficient()); @@ -61,25 +61,25 @@ } [Test] - public void Properties_ModelFactorOvertoppingSuperCriticalFlow_ExpectedValues() + public void Properties_ModelFactorSuperCriticalFlow_ExpectedValues() { // Setup var input = new HeightStructuresInput(); var random = new Random(22); - RoundedDouble defaultModelFactorOvertoppingSuperCriticalFlowStandardDeviation = input.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation; - NormalDistribution modelFactorOvertoppingSuperCriticalFlow = new NormalDistribution(5) + RoundedDouble defaultModelFactorSuperCriticalFlowStandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation; + NormalDistribution modelFactorSuperCriticalFlow = new NormalDistribution(5) { Mean = (RoundedDouble) (0.01 + random.NextDouble()), StandardDeviation = (RoundedDouble) random.NextDouble() }; // Call - input.ModelFactorOvertoppingSuperCriticalFlow = modelFactorOvertoppingSuperCriticalFlow; + input.ModelFactorSuperCriticalFlow = modelFactorSuperCriticalFlow; // Assert - AssertAreEqual(modelFactorOvertoppingSuperCriticalFlow.Mean, input.ModelFactorOvertoppingSuperCriticalFlow.Mean); - AssertAreEqual(defaultModelFactorOvertoppingSuperCriticalFlowStandardDeviation, input.ModelFactorOvertoppingSuperCriticalFlow.StandardDeviation); + AssertAreEqual(modelFactorSuperCriticalFlow.Mean, input.ModelFactorSuperCriticalFlow.Mean); + AssertAreEqual(defaultModelFactorSuperCriticalFlowStandardDeviation, input.ModelFactorSuperCriticalFlow.StandardDeviation); } [Test] @@ -135,24 +135,24 @@ } [Test] - public void Properties_LevelOfCrestOfStructure_ExpectedValues() + public void Properties_LevelCrestStructure_ExpectedValues() { // Setup var input = new HeightStructuresInput(); var random = new Random(22); - NormalDistribution levelOfCrestOfStructure = new NormalDistribution(5) + NormalDistribution levelCrestStructure = new NormalDistribution(5) { Mean = (RoundedDouble) random.NextDouble(), StandardDeviation = (RoundedDouble) random.NextDouble() }; // Call - input.LevelOfCrestOfStructure = levelOfCrestOfStructure; + input.LevelCrestStructure = levelCrestStructure; // Assert - AssertAreEqual(levelOfCrestOfStructure.Mean, input.LevelOfCrestOfStructure.Mean); - AssertAreEqual(levelOfCrestOfStructure.StandardDeviation, input.LevelOfCrestOfStructure.StandardDeviation); + AssertAreEqual(levelCrestStructure.Mean, input.LevelCrestStructure.Mean); + AssertAreEqual(levelCrestStructure.StandardDeviation, input.LevelCrestStructure.StandardDeviation); } [Test] @@ -166,11 +166,11 @@ var input = new HeightStructuresInput(); // Call - input.OrientationOfTheNormalOfTheStructure = (RoundedDouble)orientation; + input.StructureNormalOrientation = (RoundedDouble)orientation; // Assert - Assert.AreEqual(2, input.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces); - AssertAreEqual(orientation, input.OrientationOfTheNormalOfTheStructure); + Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); + AssertAreEqual(orientation, input.StructureNormalOrientation); } [Test] @@ -184,31 +184,31 @@ var input = new HeightStructuresInput(); // Call - TestDelegate call = () => input.OrientationOfTheNormalOfTheStructure = (RoundedDouble)invalidValue; + TestDelegate call = () => input.StructureNormalOrientation = (RoundedDouble)invalidValue; // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de oriëntatie moet in het bereik tussen [0, 360] graden liggen."); } [Test] - public void Properties_AllowableIncreaseOfLevelForStorage_ExpectedValues() + public void Properties_AllowedLevelIncreaseStorage_ExpectedValues() { // Setup var input = new HeightStructuresInput(); var random = new Random(22); - LogNormalDistribution allowableIncreaseOfLevelForStorage = new LogNormalDistribution(5) + LogNormalDistribution allowedLevelIncreaseStorage = new LogNormalDistribution(5) { Mean = (RoundedDouble) (0.01 + random.NextDouble()), StandardDeviation = (RoundedDouble) random.NextDouble() }; // Call - input.AllowableIncreaseOfLevelForStorage = allowableIncreaseOfLevelForStorage; + input.AllowedLevelIncreaseStorage = allowedLevelIncreaseStorage; // Assert - AssertAreEqual(allowableIncreaseOfLevelForStorage.Mean, input.AllowableIncreaseOfLevelForStorage.Mean); - AssertAreEqual(allowableIncreaseOfLevelForStorage.StandardDeviation, input.AllowableIncreaseOfLevelForStorage.StandardDeviation); + AssertAreEqual(allowedLevelIncreaseStorage.Mean, input.AllowedLevelIncreaseStorage.Mean); + AssertAreEqual(allowedLevelIncreaseStorage.StandardDeviation, input.AllowedLevelIncreaseStorage.StandardDeviation); } [Test] Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs =================================================================== diff -u -r1f5543e4b0c6e4c1464232890da7a2598c40b72e -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 1f5543e4b0c6e4c1464232890da7a2598c40b72e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -34,9 +34,9 @@ { private const int namePropertyIndex = 0; private const int locationPropertyIndex = 1; - private const int orientationOfTheNormalOfTheStructure = 2; - private const int levelOfCrestOfStructure = 3; - private const int allowableIncreaseOfLevelForStorage = 4; + private const int structureNormalOrientation = 2; + private const int levelCrestStructure = 3; + private const int allowedLevelIncreaseStorage = 4; private const int storageStructureArea = 5; private const int flowWidthAtBottomProtection = 6; private const int widthOfFlowApertures = 7; @@ -69,17 +69,17 @@ // Assert Assert.AreEqual(structure.Name, properties.Name); Assert.AreEqual(structure.Location, properties.Location); - Assert.AreEqual(structure.OrientationOfTheNormalOfTheStructure, properties.OrientationOfTheNormalOfTheStructure); + Assert.AreEqual(structure.StructureNormalOrientation, properties.StructureNormalOrientation); - Assert.AreEqual("Normaal", properties.LevelOfCrestOfStructure.DistributionType); - Assert.AreEqual(structure.LevelOfCrestOfStructure, properties.LevelOfCrestOfStructure.Data); - Assert.IsTrue(properties.LevelOfCrestOfStructure.DynamicReadOnlyValidationMethod("Mean")); - Assert.IsTrue(properties.LevelOfCrestOfStructure.DynamicReadOnlyValidationMethod("StandardDeviation")); + Assert.AreEqual("Normaal", properties.LevelCrestStructure.DistributionType); + Assert.AreEqual(structure.LevelCrestStructure, properties.LevelCrestStructure.Data); + Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("Mean")); + Assert.IsTrue(properties.LevelCrestStructure.DynamicReadOnlyValidationMethod("StandardDeviation")); - Assert.AreEqual("Lognormaal", properties.AllowableIncreaseOfLevelForStorage.DistributionType); - Assert.AreEqual(structure.AllowableIncreaseOfLevelForStorage, properties.AllowableIncreaseOfLevelForStorage.Data); - Assert.IsTrue(properties.AllowableIncreaseOfLevelForStorage.DynamicReadOnlyValidationMethod("Mean")); - Assert.IsTrue(properties.AllowableIncreaseOfLevelForStorage.DynamicReadOnlyValidationMethod("StandardDeviation")); + Assert.AreEqual("Lognormaal", properties.AllowedLevelIncreaseStorage.DistributionType); + Assert.AreEqual(structure.AllowedLevelIncreaseStorage, properties.AllowedLevelIncreaseStorage.Data); + Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("Mean")); + Assert.IsTrue(properties.AllowedLevelIncreaseStorage.DynamicReadOnlyValidationMethod("StandardDeviation")); Assert.AreEqual("Lognormaal", properties.StorageStructureArea.DistributionType); Assert.AreEqual(structure.StorageStructureArea, properties.StorageStructureArea.Data); @@ -139,23 +139,23 @@ Assert.AreEqual("De coördinaten van de locatie van het kunstwerk in het Rijksdriehoeksstelsel.", locationProperty.Description); - PropertyDescriptor orientationOfTheNormalOfTheStructureProperty = dynamicProperties[orientationOfTheNormalOfTheStructure]; - Assert.IsTrue(orientationOfTheNormalOfTheStructureProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, orientationOfTheNormalOfTheStructureProperty.Category); - Assert.AreEqual("Oriëntatie [°]", orientationOfTheNormalOfTheStructureProperty.DisplayName); - Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", orientationOfTheNormalOfTheStructureProperty.Description); + PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientation]; + Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category); + Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName); + Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description); - PropertyDescriptor levelOfCrestOfStructureProperty = dynamicProperties[levelOfCrestOfStructure]; - Assert.IsInstanceOf(levelOfCrestOfStructureProperty.Converter); - Assert.AreEqual(schematizationCategory, levelOfCrestOfStructureProperty.Category); - Assert.AreEqual("Kerende hoogte [m]", levelOfCrestOfStructureProperty.DisplayName); - Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelOfCrestOfStructureProperty.Description); + PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructure]; + Assert.IsInstanceOf(levelCrestStructureProperty.Converter); + Assert.AreEqual(schematizationCategory, levelCrestStructureProperty.Category); + Assert.AreEqual("Kerende hoogte [m]", levelCrestStructureProperty.DisplayName); + Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelCrestStructureProperty.Description); - PropertyDescriptor allowableIncreaseOfLevelForStorageProperty = dynamicProperties[allowableIncreaseOfLevelForStorage]; - Assert.IsInstanceOf(allowableIncreaseOfLevelForStorageProperty.Converter); - Assert.AreEqual(schematizationCategory, allowableIncreaseOfLevelForStorageProperty.Category); - Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowableIncreaseOfLevelForStorageProperty.DisplayName); - Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowableIncreaseOfLevelForStorageProperty.Description); + PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStorage]; + Assert.IsInstanceOf(allowedLevelIncreaseStorageProperty.Converter); + Assert.AreEqual(schematizationCategory, allowedLevelIncreaseStorageProperty.Category); + Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowedLevelIncreaseStorageProperty.DisplayName); + Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowedLevelIncreaseStorageProperty.Description); PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureArea]; Assert.IsInstanceOf(storageStructureAreaProperty.Converter); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r679173a47bec16eebaf4be2ddedf42de87788456 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 679173a47bec16eebaf4be2ddedf42de87788456) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -43,15 +43,15 @@ [TestFixture] public class HeightStructuresInputContextPropertiesTest { - private const int orientationOfTheNormalOfTheStructurePropertyIndex = 0; - private const int levelOfCrestOfStructurePropertyIndex = 1; - private const int allowableIncreaseOfLevelForStoragePropertyIndex = 2; + private const int structureNormalOrientationPropertyIndex = 0; + private const int levelCrestStructurePropertyIndex = 1; + private const int allowedLevelIncreaseStoragePropertyIndex = 2; private const int storageStructureAreaPropertyIndex = 3; private const int flowWidthAtBottomProtectionPropertyIndex = 4; private const int widthOfFlowAperturesPropertyIndex = 5; private const int criticalOvertoppingDischargePropertyIndex = 6; private const int failureProbabilityOfStructureGivenErosionPropertyIndex = 7; - private const int modelFactorOvertoppingSuperCriticalFlowPropertyIndex = 8; + private const int modelFactorSuperCriticalFlowPropertyIndex = 8; private const int hydraulicBoundaryLocationPropertyIndex = 9; private const int stormDurationPropertyIndex = 10; private MockRepository mockRepository; @@ -91,25 +91,25 @@ properties.Data = inputContext; // Assert - var modelFactorOvertoppingSuperCriticalFlowProperties = new NormalDistributionProperties + var modelFactorSuperCriticalFlowProperties = new NormalDistributionProperties { - Data = input.ModelFactorOvertoppingSuperCriticalFlow + Data = input.ModelFactorSuperCriticalFlow }; - AssertDistributionProperties(modelFactorOvertoppingSuperCriticalFlowProperties, properties.ModelFactorOvertoppingSuperCriticalFlow); + AssertDistributionProperties(modelFactorSuperCriticalFlowProperties, properties.ModelFactorSuperCriticalFlow); - Assert.AreEqual(input.OrientationOfTheNormalOfTheStructure, properties.OrientationOfTheNormalOfTheStructure); + Assert.AreEqual(input.StructureNormalOrientation, properties.StructureNormalOrientation); - var levelOfCrestOfStructureProperties = new NormalDistributionProperties + var levelCrestStructureProperties = new NormalDistributionProperties { - Data = input.LevelOfCrestOfStructure + Data = input.LevelCrestStructure }; - AssertDistributionProperties(levelOfCrestOfStructureProperties, properties.LevelOfCrestOfStructure); + AssertDistributionProperties(levelCrestStructureProperties, properties.LevelCrestStructure); - var allowableIncreaseOfLevelForStorageProperties = new LogNormalDistributionProperties + var allowedLevelIncreaseStorageProperties = new LogNormalDistributionProperties { - Data = input.AllowableIncreaseOfLevelForStorage + Data = input.AllowedLevelIncreaseStorage }; - AssertDistributionProperties(allowableIncreaseOfLevelForStorageProperties, properties.AllowableIncreaseOfLevelForStorage); + AssertDistributionProperties(allowedLevelIncreaseStorageProperties, properties.AllowedLevelIncreaseStorage); var storageStructureAreaProperties = new LogNormalDistributionVariationProperties { @@ -172,15 +172,15 @@ }; var random = new Random(100); - var newOrientationOfTheNormalOfTheStructure = new RoundedDouble(2, random.NextDouble()); + var newStructureNormalOrientation = new RoundedDouble(2, random.NextDouble()); // Call - properties.OrientationOfTheNormalOfTheStructure = newOrientationOfTheNormalOfTheStructure; + properties.StructureNormalOrientation = newStructureNormalOrientation; properties.FailureProbabilityOfStructureGivenErosion = "1e-2"; properties.HydraulicBoundaryLocation = hydraulicBoundaryLocation; // Assert - Assert.AreEqual(newOrientationOfTheNormalOfTheStructure, properties.OrientationOfTheNormalOfTheStructure); + Assert.AreEqual(newStructureNormalOrientation, properties.StructureNormalOrientation); Assert.AreEqual(0.01, input.FailureProbabilityOfStructureGivenErosion); Assert.AreEqual("1/100", properties.FailureProbabilityOfStructureGivenErosion); Assert.AreSame(hydraulicBoundaryLocation, properties.HydraulicBoundaryLocation); @@ -297,23 +297,23 @@ PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(); Assert.AreEqual(12, dynamicProperties.Count); - PropertyDescriptor orientationOfTheNormalOfTheStructureProperty = dynamicProperties[orientationOfTheNormalOfTheStructurePropertyIndex]; - Assert.IsFalse(orientationOfTheNormalOfTheStructureProperty.IsReadOnly); - Assert.AreEqual(schematizationCategory, orientationOfTheNormalOfTheStructureProperty.Category); - Assert.AreEqual("Oriëntatie [°]", orientationOfTheNormalOfTheStructureProperty.DisplayName); - Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", orientationOfTheNormalOfTheStructureProperty.Description); + PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex]; + Assert.IsFalse(structureNormalOrientationProperty.IsReadOnly); + Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category); + Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName); + Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description); - PropertyDescriptor levelOfCrestOfStructureProperty = dynamicProperties[levelOfCrestOfStructurePropertyIndex]; - Assert.IsInstanceOf(levelOfCrestOfStructureProperty.Converter); - Assert.AreEqual(schematizationCategory, levelOfCrestOfStructureProperty.Category); - Assert.AreEqual("Kerende hoogte [m]", levelOfCrestOfStructureProperty.DisplayName); - Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelOfCrestOfStructureProperty.Description); + PropertyDescriptor levelCrestStructureProperty = dynamicProperties[levelCrestStructurePropertyIndex]; + Assert.IsInstanceOf(levelCrestStructureProperty.Converter); + Assert.AreEqual(schematizationCategory, levelCrestStructureProperty.Category); + Assert.AreEqual("Kerende hoogte [m]", levelCrestStructureProperty.DisplayName); + Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelCrestStructureProperty.Description); - PropertyDescriptor allowableIncreaseOfLevelForStorageProperty = dynamicProperties[allowableIncreaseOfLevelForStoragePropertyIndex]; - Assert.IsInstanceOf(allowableIncreaseOfLevelForStorageProperty.Converter); - Assert.AreEqual(schematizationCategory, allowableIncreaseOfLevelForStorageProperty.Category); - Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowableIncreaseOfLevelForStorageProperty.DisplayName); - Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowableIncreaseOfLevelForStorageProperty.Description); + PropertyDescriptor allowedLevelIncreaseStorageProperty = dynamicProperties[allowedLevelIncreaseStoragePropertyIndex]; + Assert.IsInstanceOf(allowedLevelIncreaseStorageProperty.Converter); + Assert.AreEqual(schematizationCategory, allowedLevelIncreaseStorageProperty.Category); + Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowedLevelIncreaseStorageProperty.DisplayName); + Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowedLevelIncreaseStorageProperty.Description); PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex]; Assert.IsInstanceOf(storageStructureAreaProperty.Converter); @@ -345,11 +345,11 @@ 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 modelFactorOvertoppingSuperCriticalFlowProperty = dynamicProperties[modelFactorOvertoppingSuperCriticalFlowPropertyIndex]; - Assert.IsInstanceOf(modelFactorOvertoppingSuperCriticalFlowProperty.Converter); - Assert.AreEqual(modelSettingsCategory, modelFactorOvertoppingSuperCriticalFlowProperty.Category); - Assert.AreEqual("Modelfactor van overloopdebiet bij superkritische stroming [-]", modelFactorOvertoppingSuperCriticalFlowProperty.DisplayName); - Assert.AreEqual("Het modelfactor van overloopdebiet bij superkritische stroming.", modelFactorOvertoppingSuperCriticalFlowProperty.Description); + PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[modelFactorSuperCriticalFlowPropertyIndex]; + Assert.IsInstanceOf(modelFactorSuperCriticalFlowProperty.Converter); + Assert.AreEqual(modelSettingsCategory, modelFactorSuperCriticalFlowProperty.Category); + Assert.AreEqual("Modelfactor van overloopdebiet bij superkritische stroming [-]", modelFactorSuperCriticalFlowProperty.DisplayName); + Assert.AreEqual("Het modelfactor van overloopdebiet bij superkritische stroming.", modelFactorSuperCriticalFlowProperty.Description); PropertyDescriptor hydraulicBoundaryLocationProperty = dynamicProperties[hydraulicBoundaryLocationPropertyIndex]; Assert.IsFalse(hydraulicBoundaryLocationProperty.IsReadOnly); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r305fc42737cf7aa2c69c294789025131c1e333f0 -r6954e174ae758a8ef11bfdfce0da0aa135460fb6 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 305fc42737cf7aa2c69c294789025131c1e333f0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 6954e174ae758a8ef11bfdfce0da0aa135460fb6) @@ -436,10 +436,10 @@ const double gravitationalAcceleration = 9.81; const double modelFactorOvertoppingMean = 0.09; const double modelFactorOvertoppingStandardDeviation = 0.06; - const double levelOfCrestOfStructureStandardDeviation = 0.05; - const double modelFactorOvertoppingSuperCriticalFlowMean = 1.1; - const double modelFactorOvertoppingSuperCriticalFlowStandardDeviation = 0.03; - const double allowableIncreaseOfLevelForStorageStandardDeviation = 0.1; + const double levelCrestStructureStandardDeviation = 0.05; + 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 storageStructureAreaStandardDeviation = 0.1; @@ -450,9 +450,9 @@ const double stormDurationMean = 7.5; const double stormDurationStandardDeviation = 0.25; - const double levelOfCrestOfStructureMean = 1.1; - const double orientationOfTheNormalOfTheStructure = 2.2; - const double allowableIncreaseOfLevelForStorageMean = 3.3; + const double levelCrestStructureMean = 1.1; + const double structureNormalOrientation = 2.2; + const double allowedLevelIncreaseStorageMean = 3.3; const double storageStructureAreaMean = 4.4; const double flowWidthAtBottomProtectionMean = 5.5; const double criticalOvertoppingDischargeMean = 6.6; @@ -464,10 +464,10 @@ forelandPoints, breakWater, gravitationalAcceleration, modelFactorOvertoppingMean, modelFactorOvertoppingStandardDeviation, - levelOfCrestOfStructureMean, levelOfCrestOfStructureStandardDeviation, - orientationOfTheNormalOfTheStructure, - modelFactorOvertoppingSuperCriticalFlowMean, modelFactorOvertoppingSuperCriticalFlowStandardDeviation, - allowableIncreaseOfLevelForStorageMean, allowableIncreaseOfLevelForStorageStandardDeviation, + levelCrestStructureMean, levelCrestStructureStandardDeviation, + structureNormalOrientation, + modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation, + allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation, modelFactorForStorageVolumeMean, modelFactorForStorageVolumeStandardDeviation, storageStructureAreaMean, storageStructureAreaStandardDeviation, modelFactorForIncomingFlowVolume,