Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -395,7 +395,7 @@ private static void AssertExpectedPipingInput(PipingInput inputParameters) { - Console.WriteLine(@"{0} en {1}", Math.Exp(-0.5), Math.Sqrt((Math.Exp(1) - 1)*Math.Exp(1))); + Console.WriteLine(@"{0} en {1}", Math.Exp(-0.5), Math.Sqrt((Math.Exp(1) - 1) * Math.Exp(1))); Assert.AreEqual(1.0, inputParameters.UpliftModelFactor, 1e-3); Assert.AreEqual(1.0, inputParameters.SellmeijerModelFactor, 1e-3); @@ -529,8 +529,6 @@ Assert.AreEqual(0, structure.LevellingCount); Assert.AreEqual(0, structure.ProbabilityCollisionSecondaryStructure); Assert.AreEqual(1, structure.FlowVelocityStructureClosable.Mean, structure.FlowVelocityStructureClosable.Mean.GetAccuracy()); - Assert.AreEqual(1, structure.FlowVelocityStructureClosable.CoefficientOfVariation, - structure.FlowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy()); Assert.AreEqual(15, structure.StabilityLinearLoadModel.Mean, structure.StabilityLinearLoadModel.Mean.GetAccuracy()); Assert.AreEqual(0.1, structure.StabilityLinearLoadModel.CoefficientOfVariation, structure.StabilityLinearLoadModel.CoefficientOfVariation.GetAccuracy()); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rf13c9779874d0f122196c7298c3b95954a05ca02 -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f13c9779874d0f122196c7298c3b95954a05ca02) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -509,15 +509,6 @@ } /// - /// Looks up a localized string similar to Kritieke waarden. - /// - public static string Categories_CriticalValues { - get { - return ResourceManager.GetString("Categories_CriticalValues", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Algemeen. /// public static string Categories_General { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rf13c9779874d0f122196c7298c3b95954a05ca02 -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f13c9779874d0f122196c7298c3b95954a05ca02) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -721,9 +721,6 @@ Drempelhoogte [m+NAP] - - Kritieke waarden - Modelfactor instromend volume. Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -43,17 +43,17 @@ private const int locationPropertyIndex = 2; private const int insideWaterLevelPropertyIndex = 3; private const int insideWaterLevelFailureConstructionPropertyIndex = 4; - private const int flowVelocityStructureClosablePropertyIndex = 5; - private const int structureNormalOrientationPropertyIndex = 6; - private const int stabilityPointStructureInflowModelTypePropertyIndex = 7; - private const int widthFlowAperturesPropertyIndex = 8; - private const int areaFlowAperturesPropertyIndex = 9; - private const int flowWidthAtBottomProtectionPropertyIndex = 10; - private const int storageStructureAreaPropertyIndex = 11; - private const int allowedLevelIncreaseStoragePropertyIndex = 12; - private const int levelCrestStructurePropertyIndex = 13; - private const int thresholdHeightOpenWeirPropertyIndex = 14; - private const int criticalOvertoppingDischargePropertyIndex = 15; + private const int structureNormalOrientationPropertyIndex = 5; + private const int stabilityPointStructureInflowModelTypePropertyIndex = 6; + private const int widthFlowAperturesPropertyIndex = 7; + private const int areaFlowAperturesPropertyIndex = 8; + private const int flowWidthAtBottomProtectionPropertyIndex = 9; + private const int storageStructureAreaPropertyIndex = 10; + private const int allowedLevelIncreaseStoragePropertyIndex = 11; + private const int levelCrestStructurePropertyIndex = 12; + private const int thresholdHeightOpenWeirPropertyIndex = 13; + private const int criticalOvertoppingDischargePropertyIndex = 14; + private const int flowVelocityStructureClosablePropertyIndex = 15; private const int constructiveStrengthLinearLoadModelPropertyIndex = 16; private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 17; private const int bankWidthPropertyIndex = 18; @@ -68,26 +68,6 @@ private const int stabilityLinearLoadModelPropertyIndex = 27; private const int stabilityQuadraticLoadModelPropertyIndex = 28; - #region Critical values - - [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] - [TypeConverter(typeof(ExpandableObjectConverter))] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_CriticalValues")] - [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] - [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] - public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable - { - get - { - return new VariationCoefficientNormalDistributionProperties - { - Data = data.FlowVelocityStructureClosable - }; - } - } - - #endregion - #region General [PropertyOrder(namePropertyIndex)] @@ -308,6 +288,22 @@ } } + [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] + public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable + { + get + { + return new VariationCoefficientNormalDistributionProperties + { + Data = data.FlowVelocityStructureClosable + }; + } + } + [PropertyOrder(constructiveStrengthLinearLoadModelPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -42,32 +42,32 @@ /// ViewModel of for properties panel. /// public class StabilityPointStructuresInputContextProperties : StructuresInputBaseProperties, - StabilityPointStructuresFailureMechanism> + StabilityPointStructuresInput, + StructuresCalculation, + StabilityPointStructuresFailureMechanism> { private const int hydraulicBoundaryLocationPropertyIndex = 1; private const int volumicWeightWaterPropertyIndex = 2; private const int stormDurationPropertyIndex = 3; private const int insideWaterLevelPropertyIndex = 4; private const int insideWaterLevelFailureConstructionPropertyIndex = 5; - private const int flowVelocityStructureClosablePropertyIndex = 6; - private const int modelFactorSuperCriticalFlowPropertyIndex = 7; - private const int drainCoefficientPropertyIndex = 8; - private const int factorStormDurationOpenStructurePropertyIndex = 9; - private const int structurePropertyIndex = 10; - private const int structureLocationPropertyIndex = 11; - private const int structureNormalOrientationPropertyIndex = 12; - private const int inflowModelTypePropertyIndex = 13; - private const int loadSchematizationTypePropertyIndex = 14; - private const int widthFlowAperturesPropertyIndex = 15; - private const int areaFlowAperturesPropertyIndex = 16; - private const int flowWidthAtBottomProtectionPropertyIndex = 17; - private const int storageStructureAreaPropertyIndex = 18; - private const int allowedLevelIncreaseStoragePropertyIndex = 19; - private const int levelCrestStructurePropertyIndex = 20; - private const int thresholdHeightOpenWeirPropertyIndex = 21; - private const int criticalOvertoppingDischargePropertyIndex = 22; + private const int modelFactorSuperCriticalFlowPropertyIndex = 6; + private const int drainCoefficientPropertyIndex = 7; + private const int factorStormDurationOpenStructurePropertyIndex = 8; + private const int structurePropertyIndex = 9; + private const int structureLocationPropertyIndex = 10; + private const int structureNormalOrientationPropertyIndex = 11; + private const int inflowModelTypePropertyIndex = 12; + private const int loadSchematizationTypePropertyIndex = 13; + private const int widthFlowAperturesPropertyIndex = 14; + private const int areaFlowAperturesPropertyIndex = 15; + private const int flowWidthAtBottomProtectionPropertyIndex = 16; + private const int storageStructureAreaPropertyIndex = 17; + private const int allowedLevelIncreaseStoragePropertyIndex = 18; + private const int levelCrestStructurePropertyIndex = 19; + private const int thresholdHeightOpenWeirPropertyIndex = 20; + private const int criticalOvertoppingDischargePropertyIndex = 21; + private const int flowVelocityStructureClosablePropertyIndex = 22; private const int constructiveStrengthLinearLoadModelPropertyIndex = 23; private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 24; private const int bankWidthPropertyIndex = 25; @@ -272,23 +272,6 @@ } } - [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] - [TypeConverter(typeof(ExpandableObjectConverter))] - [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_CriticalValues")] - [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] - [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] - public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable - { - get - { - return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, - data.WrappedData) - { - Data = data.WrappedData.FlowVelocityStructureClosable - }; - } - } - #endregion #region Schematization @@ -370,6 +353,23 @@ } } + [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] + [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] + public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable + { + get + { + return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, + data.WrappedData) + { + Data = data.WrappedData.FlowVelocityStructureClosable + }; + } + } + [DynamicVisible] [PropertyOrder(areaFlowAperturesPropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -40,19 +40,18 @@ private const int insideWaterLevelPropertyIndex = 2; private const int insideWaterLevelFailureConstructionPropertyIndex = 3; - - private const int flowVelocityStructureClosablePropertyIndex = 4; - - private const int structureNormalOrientationPropertyIndex = 5; - private const int stabilityPointStructureInflowModelTypePropertyIndex = 6; - private const int widthFlowAperturesPropertyIndex = 7; - private const int areaFlowAperturesPropertyIndex = 8; - private const int flowWidthAtBottomProtectionPropertyIndex = 9; - private const int storageStructureAreaPropertyIndex = 10; - private const int allowedLevelIncreaseStoragePropertyIndex = 11; - private const int levelCrestStructurePropertyIndex = 12; - private const int thresholdHeightOpenWeirPropertyIndex = 13; - private const int criticalOvertoppingDischargePropertyIndex = 14; + + private const int structureNormalOrientationPropertyIndex = 4; + private const int stabilityPointStructureInflowModelTypePropertyIndex = 5; + private const int widthFlowAperturesPropertyIndex = 6; + private const int areaFlowAperturesPropertyIndex = 7; + private const int flowWidthAtBottomProtectionPropertyIndex = 8; + private const int storageStructureAreaPropertyIndex = 9; + private const int allowedLevelIncreaseStoragePropertyIndex = 10; + private const int levelCrestStructurePropertyIndex = 11; + private const int thresholdHeightOpenWeirPropertyIndex = 12; + private const int criticalOvertoppingDischargePropertyIndex = 13; + private const int flowVelocityStructureClosablePropertyIndex = 14; private const int constructiveStrengthLinearLoadModelPropertyIndex = 15; private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 16; private const int bankWidthPropertyIndex = 17; @@ -225,7 +224,6 @@ const string schematizationCategory = "Schematisatie"; const string hydraulicDataCategory = "Hydraulische gegevens"; const string generalCategory = "Algemeen"; - const string criticalValuesCategory = "Kritieke waarden"; PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; Assert.IsTrue(nameProperty.IsReadOnly); @@ -251,12 +249,6 @@ Assert.AreEqual("Binnenwaterstand bij constructief falen [m+NAP]", insideWaterLevelFailureConstructionProperty.DisplayName); Assert.AreEqual("Binnenwaterstand bij constructief falen.", insideWaterLevelFailureConstructionProperty.Description); - PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex]; - Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); - Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category); - Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); - Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); - PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex]; Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category); @@ -317,6 +309,12 @@ Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName); Assert.AreEqual("Kritiek instromend debiet directe invoer per strekkende meter.", criticalOvertoppingDischargeProperty.Description); + PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex]; + Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); + Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category); + Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); + Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); + PropertyDescriptor constructiveStrengthLinearLoadModelProperty = dynamicProperties[constructiveStrengthLinearLoadModelPropertyIndex]; Assert.IsInstanceOf(constructiveStrengthLinearLoadModelProperty.Converter); Assert.AreEqual(schematizationCategory, constructiveStrengthLinearLoadModelProperty.Category); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r44ce84b25d7dfc4a0b7057443a7439af3cafb8bb -ra5a14fa6f0bfccaadf4b18a75ce4b91e794508ef --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 44ce84b25d7dfc4a0b7057443a7439af3cafb8bb) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision a5a14fa6f0bfccaadf4b18a75ce4b91e794508ef) @@ -467,7 +467,6 @@ const string schematizationCategory = "Schematisatie"; const string hydraulicDataCategory = "Hydraulische gegevens"; const string modelSettingsCategory = "Modelinstellingen"; - const string criticalValuesCategory = "Kritieke waarden"; var dynamicPropertyBag = new DynamicPropertyBag(properties); PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] @@ -496,7 +495,7 @@ PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[linearLowSillFlowVelocityStructureClosablePropertyIndex]; Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); - Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category); + Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category); Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); @@ -647,7 +646,6 @@ const string schematizationCategory = "Schematisatie"; const string hydraulicDataCategory = "Hydraulische gegevens"; const string modelSettingsCategory = "Modelinstellingen"; - const string criticalValuesCategory = "Kritieke waarden"; var dynamicPropertyBag = new DynamicPropertyBag(properties); PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] @@ -676,7 +674,7 @@ PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[quadraticLowSillFlowVelocityStructureClosablePropertyIndex]; Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); - Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category); + Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category); Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); @@ -827,7 +825,6 @@ const string schematizationCategory = "Schematisatie"; const string hydraulicDataCategory = "Hydraulische gegevens"; const string modelSettingsCategory = "Modelinstellingen"; - const string criticalValuesCategory = "Kritieke waarden"; var dynamicPropertyBag = new DynamicPropertyBag(properties); PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] @@ -856,7 +853,7 @@ PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex]; Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); - Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category); + Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category); Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); @@ -1017,7 +1014,6 @@ const string schematizationCategory = "Schematisatie"; const string hydraulicDataCategory = "Hydraulische gegevens"; const string modelSettingsCategory = "Modelinstellingen"; - const string criticalValuesCategory = "Kritieke waarden"; var dynamicPropertyBag = new DynamicPropertyBag(properties); PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] @@ -1046,7 +1042,7 @@ PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex]; Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter); - Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category); + Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category); Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName); Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description); @@ -1391,21 +1387,21 @@ private const int linearLowSillStormDurationPropertyIndex = 2; private const int linearLowSillInsideWaterLevelPropertyIndex = 3; private const int linearLowSillInsideWaterLevelFailureConstructionPropertyIndex = 4; - private const int linearLowSillFlowVelocityStructureClosablePropertyIndex = 5; - private const int linearLowSillModelFactorSuperCriticalFlowPropertyIndex = 6; - private const int linearLowSillFactorStormDurationOpenStructurePropertyIndex = 7; - private const int linearLowSillStructurePropertyIndex = 8; - private const int linearLowSillStructureLocationPropertyIndex = 9; - private const int linearLowSillStructureNormalOrientationPropertyIndex = 10; - private const int linearLowSillInflowModelTypePropertyIndex = 11; - private const int linearLowSillLoadSchematizationTypePropertyIndex = 12; - private const int linearLowSillWidthFlowAperturesPropertyIndex = 13; - private const int linearLowSillFlowWidthAtBottomProtectionPropertyIndex = 14; - private const int linearLowSillStorageStructureAreaPropertyIndex = 15; - private const int linearLowSillAllowedLevelIncreaseStoragePropertyIndex = 16; - private const int linearLowSillLevelCrestStructurePropertyIndex = 17; - private const int linearLowSillThresholdHeightOpenWeirPropertyIndex = 18; - private const int linearLowSillCriticalOvertoppingDischargePropertyIndex = 19; + private const int linearLowSillModelFactorSuperCriticalFlowPropertyIndex = 5; + private const int linearLowSillFactorStormDurationOpenStructurePropertyIndex = 6; + private const int linearLowSillStructurePropertyIndex = 7; + private const int linearLowSillStructureLocationPropertyIndex = 8; + private const int linearLowSillStructureNormalOrientationPropertyIndex = 9; + private const int linearLowSillInflowModelTypePropertyIndex = 10; + private const int linearLowSillLoadSchematizationTypePropertyIndex = 11; + private const int linearLowSillWidthFlowAperturesPropertyIndex = 12; + private const int linearLowSillFlowWidthAtBottomProtectionPropertyIndex = 13; + private const int linearLowSillStorageStructureAreaPropertyIndex = 14; + private const int linearLowSillAllowedLevelIncreaseStoragePropertyIndex = 15; + private const int linearLowSillLevelCrestStructurePropertyIndex = 16; + private const int linearLowSillThresholdHeightOpenWeirPropertyIndex = 17; + private const int linearLowSillCriticalOvertoppingDischargePropertyIndex = 18; + private const int linearLowSillFlowVelocityStructureClosablePropertyIndex = 19; private const int linearLowSillConstructiveStrengthLinearLoadModelPropertyIndex = 20; private const int linearLowSillBankWidthPropertyIndex = 21; private const int linearLowSillEvaluationLevelPropertyIndex = 22; @@ -1431,21 +1427,21 @@ private const int linearFloodedCulvertStormDurationPropertyIndex = 2; private const int linearFloodedCulvertInsideWaterLevelPropertyIndex = 3; private const int linearFloodedCulvertInsideWaterLevelFailureConstructionPropertyIndex = 4; - private const int linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 5; - private const int linearFloodedCulvertDrainCoefficientPropertyIndex = 6; - private const int linearFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 7; - private const int linearFloodedCulvertStructurePropertyIndex = 8; - private const int linearFloodedCulvertStructureLocationPropertyIndex = 9; - private const int linearFloodedCulvertStructureNormalOrientationPropertyIndex = 10; - private const int linearFloodedCulvertInflowModelTypePropertyIndex = 11; - private const int linearFloodedCulvertLoadSchematizationTypePropertyIndex = 12; - private const int linearFloodedCulvertAreaFlowAperturesPropertyIndex = 13; - private const int linearFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 14; - private const int linearFloodedCulvertStorageStructureAreaPropertyIndex = 15; - private const int linearFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 16; - private const int linearFloodedCulvertLevelCrestStructurePropertyIndex = 17; - private const int linearFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 18; - private const int linearFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 19; + private const int linearFloodedCulvertDrainCoefficientPropertyIndex = 5; + private const int linearFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 6; + private const int linearFloodedCulvertStructurePropertyIndex = 7; + private const int linearFloodedCulvertStructureLocationPropertyIndex = 8; + private const int linearFloodedCulvertStructureNormalOrientationPropertyIndex = 9; + private const int linearFloodedCulvertInflowModelTypePropertyIndex = 10; + private const int linearFloodedCulvertLoadSchematizationTypePropertyIndex = 11; + private const int linearFloodedCulvertAreaFlowAperturesPropertyIndex = 12; + private const int linearFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 13; + private const int linearFloodedCulvertStorageStructureAreaPropertyIndex = 14; + private const int linearFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 15; + private const int linearFloodedCulvertLevelCrestStructurePropertyIndex = 16; + private const int linearFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 17; + private const int linearFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 18; + private const int linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 19; private const int linearFloodedCulvertConstructiveStrengthLinearLoadModelPropertyIndex = 20; private const int linearFloodedCulvertBankWidthPropertyIndex = 21; private const int linearFloodedCulvertEvaluationLevelPropertyIndex = 22; @@ -1471,21 +1467,21 @@ private const int quadraticLowSillStormDurationPropertyIndex = 2; private const int quadraticLowSillInsideWaterLevelPropertyIndex = 3; private const int quadraticLowSillInsideWaterLevelFailureConstructionPropertyIndex = 4; - private const int quadraticLowSillFlowVelocityStructureClosablePropertyIndex = 5; - private const int quadraticLowSillModelFactorSuperCriticalFlowPropertyIndex = 6; - private const int quadraticLowSillFactorStormDurationOpenStructurePropertyIndex = 7; - private const int quadraticLowSillStructurePropertyIndex = 8; - private const int quadraticLowSillStructureLocationPropertyIndex = 9; - private const int quadraticLowSillStructureNormalOrientationPropertyIndex = 10; - private const int quadraticLowSillInflowModelTypePropertyIndex = 11; - private const int quadraticLowSillLoadSchematizationTypePropertyIndex = 12; - private const int quadraticLowSillWidthFlowAperturesPropertyIndex = 13; - private const int quadraticLowSillFlowWidthAtBottomProtectionPropertyIndex = 14; - private const int quadraticLowSillStorageStructureAreaPropertyIndex = 15; - private const int quadraticLowSillAllowedLevelIncreaseStoragePropertyIndex = 16; - private const int quadraticLowSillLevelCrestStructurePropertyIndex = 17; - private const int quadraticLowSillThresholdHeightOpenWeirPropertyIndex = 18; - private const int quadraticLowSillCriticalOvertoppingDischargePropertyIndex = 19; + private const int quadraticLowSillModelFactorSuperCriticalFlowPropertyIndex = 5; + private const int quadraticLowSillFactorStormDurationOpenStructurePropertyIndex = 6; + private const int quadraticLowSillStructurePropertyIndex = 7; + private const int quadraticLowSillStructureLocationPropertyIndex = 8; + private const int quadraticLowSillStructureNormalOrientationPropertyIndex = 9; + private const int quadraticLowSillInflowModelTypePropertyIndex = 10; + private const int quadraticLowSillLoadSchematizationTypePropertyIndex = 11; + private const int quadraticLowSillWidthFlowAperturesPropertyIndex = 12; + private const int quadraticLowSillFlowWidthAtBottomProtectionPropertyIndex = 13; + private const int quadraticLowSillStorageStructureAreaPropertyIndex = 14; + private const int quadraticLowSillAllowedLevelIncreaseStoragePropertyIndex = 15; + private const int quadraticLowSillLevelCrestStructurePropertyIndex = 16; + private const int quadraticLowSillThresholdHeightOpenWeirPropertyIndex = 17; + private const int quadraticLowSillCriticalOvertoppingDischargePropertyIndex = 18; + private const int quadraticLowSillFlowVelocityStructureClosablePropertyIndex = 19; private const int quadraticLowSillConstructiveStrengthQuadraticLoadModelPropertyIndex = 20; private const int quadraticLowSillBankWidthPropertyIndex = 21; private const int quadraticLowSillEvaluationLevelPropertyIndex = 22; @@ -1511,21 +1507,21 @@ private const int quadraticFloodedCulvertStormDurationPropertyIndex = 2; private const int quadraticFloodedCulvertInsideWaterLevelPropertyIndex = 3; private const int quadraticFloodedCulvertInsideWaterLevelFailureConstructionPropertyIndex = 4; - private const int quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 5; - private const int quadraticFloodedCulvertDrainCoefficientPropertyIndex = 6; - private const int quadraticFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 7; - private const int quadraticFloodedCulvertStructurePropertyIndex = 8; - private const int quadraticFloodedCulvertStructureLocationPropertyIndex = 9; - private const int quadraticFloodedCulvertStructureNormalOrientationPropertyIndex = 10; - private const int quadraticFloodedCulvertInflowModelTypePropertyIndex = 11; - private const int quadraticFloodedCulvertLoadSchematizationTypePropertyIndex = 12; - private const int quadraticFloodedCulvertAreaFlowAperturesPropertyIndex = 13; - private const int quadraticFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 14; - private const int quadraticFloodedCulvertStorageStructureAreaPropertyIndex = 15; - private const int quadraticFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 16; - private const int quadraticFloodedCulvertLevelCrestStructurePropertyIndex = 17; - private const int quadraticFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 18; - private const int quadraticFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 19; + private const int quadraticFloodedCulvertDrainCoefficientPropertyIndex = 5; + private const int quadraticFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 6; + private const int quadraticFloodedCulvertStructurePropertyIndex = 7; + private const int quadraticFloodedCulvertStructureLocationPropertyIndex = 8; + private const int quadraticFloodedCulvertStructureNormalOrientationPropertyIndex = 9; + private const int quadraticFloodedCulvertInflowModelTypePropertyIndex = 10; + private const int quadraticFloodedCulvertLoadSchematizationTypePropertyIndex = 11; + private const int quadraticFloodedCulvertAreaFlowAperturesPropertyIndex = 12; + private const int quadraticFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 13; + private const int quadraticFloodedCulvertStorageStructureAreaPropertyIndex = 14; + private const int quadraticFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 15; + private const int quadraticFloodedCulvertLevelCrestStructurePropertyIndex = 16; + private const int quadraticFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 17; + private const int quadraticFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 18; + private const int quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 19; private const int quadraticFloodedCulvertConstructiveStrengthQuadraticLoadModelPropertyIndex = 20; private const int quadraticFloodedCulvertBankWidthPropertyIndex = 21; private const int quadraticFloodedCulvertEvaluationLevelPropertyIndex = 22;