Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. +// Copyright (C) Stichting Deltares 2019. All rights reserved. // // This file is part of Riskeer. // @@ -127,7 +127,7 @@ } /// - /// Looks up a localized string similar to Kans mislukken sluiting [1/jaar]. + /// Looks up a localized string similar to Kans mislukken sluiting [-]. /// public static string FailureProbabilityOpenStructure_DisplayName { get { @@ -145,7 +145,7 @@ } /// - /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [1/jaar]. + /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [-]. /// public static string FailureProbabilityReparation_DisplayName { get { @@ -199,7 +199,7 @@ } /// - /// Looks up a localized string similar to Kans op open staan bij naderend hoogwater [1/jaar]. + /// Looks up a localized string similar to Kans op open staan bij naderend hoogwater [-]. /// public static string ProbabilityOpenStructureBeforeFlooding_DisplayName { get { Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -133,19 +133,19 @@ Kans op open staan bij naderend hoogwater. - Kans op open staan bij naderend hoogwater [1/jaar] + Kans op open staan bij naderend hoogwater [-] Kans op mislukken sluiting van geopend kunstwerk. - Kans mislukken sluiting [1/jaar] + Kans mislukken sluiting [-] Faalkans herstel van gefaalde situatie. - Faalkans herstel van gefaalde situatie [1/jaar] + Faalkans herstel van gefaalde situatie [-] De parameter 'C' die gebruikt wordt om het lengte-effect te berekenen. Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -272,21 +272,21 @@ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[probabilityOpenStructureBeforeFloodingPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty, schematizationCategory, - "Kans op open staan bij naderend hoogwater [1/jaar]", + "Kans op open staan bij naderend hoogwater [-]", "Kans op open staan bij naderend hoogwater.", true); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[failureProbabilityOpenStructurePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityOpenStructureProperty, schematizationCategory, - "Kans mislukken sluiting [1/jaar]", + "Kans mislukken sluiting [-]", "Kans op mislukken sluiting van geopend kunstwerk.", true); PropertyDescriptor failureProbabilityReparationProperty = dynamicProperties[failureProbabilityReparationPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityReparationProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie.", true); } Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -218,19 +218,19 @@ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[verticalWallProbabilityOpenStructureBeforeFloodingPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty, schematizationCategory, - "Kans op open staan bij naderend hoogwater [1/jaar]", + "Kans op open staan bij naderend hoogwater [-]", "Kans op open staan bij naderend hoogwater."); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[verticalWallFailureProbabilityOpenStructurePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityOpenStructureProperty, schematizationCategory, - "Kans mislukken sluiting [1/jaar]", + "Kans mislukken sluiting [-]", "Kans op mislukken sluiting van geopend kunstwerk."); PropertyDescriptor failureProbabilityReparationProperty = dynamicProperties[verticalWallFailureProbabilityReparationPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityReparationProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor modelFactorSuperCriticalFlowProperty = dynamicProperties[verticalWallModelFactorSuperCriticalFlowPropertyIndex]; @@ -256,7 +256,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[verticalWallStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[verticalWallAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[verticalWallCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[verticalWallFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[verticalWallFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[verticalWallForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[verticalWallUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[verticalWallUseForeshorePropertyIndex].DisplayName); @@ -332,19 +332,19 @@ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[floodedCulvertProbabilityOpenStructureBeforeFloodingPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty, schematizationCategory, - "Kans op open staan bij naderend hoogwater [1/jaar]", + "Kans op open staan bij naderend hoogwater [-]", "Kans op open staan bij naderend hoogwater."); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[floodedCulvertFailureProbabilityOpenStructurePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityOpenStructureProperty, schematizationCategory, - "Kans mislukken sluiting [1/jaar]", + "Kans mislukken sluiting [-]", "Kans op mislukken sluiting van geopend kunstwerk."); PropertyDescriptor failureProbabilityReparationProperty = dynamicProperties[floodedCulvertFailureProbabilityReparationPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityReparationProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor drainCoefficientProperty = dynamicProperties[floodedCulvertDrainCoefficientPropertyIndex]; @@ -368,7 +368,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[floodedCulvertStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[floodedCulvertAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[floodedCulvertCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[floodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[floodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[floodedCulvertForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[floodedCulvertUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[floodedCulvertUseForeshorePropertyIndex].DisplayName); @@ -444,19 +444,19 @@ PropertyDescriptor probabilityOpenStructureBeforeFloodingProperty = dynamicProperties[lowSillProbabilityOpenStructureBeforeFloodingPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(probabilityOpenStructureBeforeFloodingProperty, schematizationCategory, - "Kans op open staan bij naderend hoogwater [1/jaar]", + "Kans op open staan bij naderend hoogwater [-]", "Kans op open staan bij naderend hoogwater."); PropertyDescriptor failureProbabilityOpenStructureProperty = dynamicProperties[lowSillFailureProbabilityOpenStructurePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityOpenStructureProperty, schematizationCategory, - "Kans mislukken sluiting [1/jaar]", + "Kans mislukken sluiting [-]", "Kans op mislukken sluiting van geopend kunstwerk."); PropertyDescriptor failureProbabilityReparationProperty = dynamicProperties[lowSillFailureProbabilityReparationPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(failureProbabilityReparationProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor factorStormDurationOpenStructureProperty = dynamicProperties[lowSillFactorStormDurationOpenStructurePropertyIndex]; @@ -473,7 +473,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[lowSillStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[lowSillAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[lowSillCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[lowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[lowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[lowSillForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[lowSillUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[lowSillUseForeshorePropertyIndex].DisplayName); Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r12b2d8a445b5972729dd8ad92bb146c2f9d5c005 -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 12b2d8a445b5972729dd8ad92bb146c2f9d5c005) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -3532,7 +3532,7 @@ } /// - /// Looks up a localized string similar to Faalkans gegeven erosie bodem [1/jaar]. + /// Looks up a localized string similar to Faalkans gegeven erosie bodem [-]. /// public static string Structure_FailureProbabilityStructureWithErosion_DisplayName { get { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r12b2d8a445b5972729dd8ad92bb146c2f9d5c005 -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 12b2d8a445b5972729dd8ad92bb146c2f9d5c005) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -813,7 +813,7 @@ Faalkans kunstwerk gegeven erosie bodem. - Faalkans gegeven erosie bodem [1/jaar] + Faalkans gegeven erosie bodem [-] De schematisatie van het voorlandprofiel. Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -233,7 +233,7 @@ PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[constructionProperties.FailureProbabilityStructureWithErosionPropertyIndex]; Assert.IsFalse(failureProbabilityStructureWithErosionProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", failureProbabilityStructureWithErosionProperty.DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName); Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem.", failureProbabilityStructureWithErosionProperty.Description); PropertyDescriptor foreshoreProfileProperty = dynamicProperties[constructionProperties.ForeshoreProfilePropertyIndex]; Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructurePropertiesTest.cs (.../HeightStructurePropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -187,7 +187,7 @@ PropertyDescriptor failureProbabilityStructureWithErosionProperty = dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex]; Assert.IsTrue(failureProbabilityStructureWithErosionProperty.IsReadOnly); Assert.AreEqual(schematizationCategory, failureProbabilityStructureWithErosionProperty.Category); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", failureProbabilityStructureWithErosionProperty.DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", failureProbabilityStructureWithErosionProperty.DisplayName); Assert.AreEqual("Faalkans kunstwerk gegeven erosie bodem.", failureProbabilityStructureWithErosionProperty.Description); } } Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -196,7 +196,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[storageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[allowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[criticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[failureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[foreshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[useBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[useForeshorePropertyIndex].DisplayName); Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. +// Copyright (C) Stichting Deltares 2019. All rights reserved. // // This file is part of Riskeer. // @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -221,7 +221,7 @@ } /// - /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [1/jaar]. + /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [-]. /// public static string Structure_FailureProbabilityRepairClosure_DisplayName { get { @@ -311,7 +311,7 @@ } /// - /// Looks up a localized string similar to Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]. + /// Looks up a localized string similar to Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]. /// public static string Structure_ProbabilityCollisionSecondaryStructure_DisplayName { get { Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -163,7 +163,7 @@ Faalkans herstel van gefaalde situatie. - Faalkans herstel van gefaalde situatie [1/jaar] + Faalkans herstel van gefaalde situatie [-] Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten. @@ -193,7 +193,7 @@ Kans op aanvaring tweede keermiddel per nivellering. - Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv] + Kans op aanvaring tweede keermiddel per nivellering [1/nivellering] Massa van het schip. Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -273,9 +273,9 @@ [PropertyOrder(flowVelocityStructureClosablePropertyIndex)] [TypeConverter(typeof(ExpandableObjectConverter))] - [ResourcesCategory(typeof(RiskeerCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] - [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] + [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))] + [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_DisplayName))] + [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_Description))] public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable { get Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -349,7 +349,7 @@ PropertyDescriptor failureProbabilityRepairClosureProperty = dynamicProperties[failureProbabilityRepairClosurePropertyIndex]; Assert.AreEqual(schematizationCategory, failureProbabilityRepairClosureProperty.Category); - Assert.AreEqual("Faalkans herstel van gefaalde situatie [1/jaar]", failureProbabilityRepairClosureProperty.DisplayName); + Assert.AreEqual("Faalkans herstel van gefaalde situatie [-]", failureProbabilityRepairClosureProperty.DisplayName); Assert.AreEqual("Faalkans herstel van gefaalde situatie.", failureProbabilityRepairClosureProperty.Description); PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[failureCollisionEnergyPropertyIndex]; @@ -377,7 +377,7 @@ PropertyDescriptor probabilityCollisionSecondaryStructureProperty = dynamicProperties[probabilityCollisionSecondaryStructurePropertyIndex]; Assert.AreEqual(schematizationCategory, probabilityCollisionSecondaryStructureProperty.Category); - Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", probabilityCollisionSecondaryStructureProperty.DisplayName); + Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]", probabilityCollisionSecondaryStructureProperty.DisplayName); Assert.AreEqual("Kans op aanvaring tweede keermiddel per nivellering.", probabilityCollisionSecondaryStructureProperty.Description); PropertyDescriptor stabilityLinearLoadModelProperty = dynamicProperties[stabilityLinearLoadModelPropertyIndex]; Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r8cb53ca5d3528eb63d72dff288e162993c1adc04 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 8cb53ca5d3528eb63d72dff288e162993c1adc04) @@ -313,7 +313,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( failureProbabilityRepairClosureProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[linearLowSillFailureCollisionEnergyPropertyIndex]; @@ -357,7 +357,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( probabilityCollisionSecondaryStructureProperty, schematizationCategory, - "Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", + "Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]", "Kans op aanvaring tweede keermiddel per nivellering."); PropertyDescriptor stabilityLinearLoadModel = dynamicProperties[linearLowSillStabilityLinearLoadModelPropertyIndex]; @@ -379,7 +379,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[linearLowSillStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[linearLowSillAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[linearLowSillCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[linearLowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[linearLowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[linearLowSillForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[linearLowSillUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[linearLowSillUseForeshorePropertyIndex].DisplayName); @@ -541,7 +541,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( failureProbabilityRepairClosureProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[quadraticLowSillFailureCollisionEnergyPropertyIndex]; @@ -585,7 +585,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( probabilityCollisionSecondaryStructureProperty, schematizationCategory, - "Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", + "Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]", "Kans op aanvaring tweede keermiddel per nivellering."); PropertyDescriptor stabilityQuadraticLoadModelProperty = dynamicProperties[quadraticLowSillStabilityQuadraticLoadModelPropertyIndex]; @@ -607,7 +607,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[quadraticLowSillStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[quadraticLowSillAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[quadraticLowSillCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[quadraticLowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[quadraticLowSillFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[quadraticLowSillForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[quadraticLowSillUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[quadraticLowSillUseForeshorePropertyIndex].DisplayName); @@ -789,7 +789,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( failureProbabilityRepairClosureProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[linearFloodedCulvertFailureCollisionEnergyPropertyIndex]; @@ -833,7 +833,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( probabilityCollisionSecondaryStructureProperty, schematizationCategory, - "Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", + "Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]", "Kans op aanvaring tweede keermiddel per nivellering."); PropertyDescriptor stabilityLinearLoadModel = dynamicProperties[linearFloodedCulvertStabilityLinearLoadModelPropertyIndex]; @@ -854,7 +854,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[linearFloodedCulvertStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[linearFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[linearFloodedCulvertCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[linearFloodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[linearFloodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[linearFloodedCulvertForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[linearFloodedCulvertUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[linearFloodedCulvertUseForeshorePropertyIndex].DisplayName); @@ -1036,7 +1036,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( failureProbabilityRepairClosureProperty, schematizationCategory, - "Faalkans herstel van gefaalde situatie [1/jaar]", + "Faalkans herstel van gefaalde situatie [-]", "Faalkans herstel van gefaalde situatie."); PropertyDescriptor failureCollisionEnergyProperty = dynamicProperties[quadraticFloodedCulvertFailureCollisionEnergyPropertyIndex]; @@ -1080,7 +1080,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( probabilityCollisionSecondaryStructureProperty, schematizationCategory, - "Kans op aanvaring tweede keermiddel per nivellering [1/jaar/niv]", + "Kans op aanvaring tweede keermiddel per nivellering [1/nivellering]", "Kans op aanvaring tweede keermiddel per nivellering."); PropertyDescriptor stabilityQuadraticLoadModelProperty = dynamicProperties[quadraticFloodedCulvertStabilityQuadraticLoadModelPropertyIndex]; @@ -1101,7 +1101,7 @@ Assert.AreEqual("Kombergend oppervlak [m²]", dynamicProperties[quadraticFloodedCulvertStorageStructureAreaPropertyIndex].DisplayName); Assert.AreEqual("Toegestane peilverhoging komberging [m]", dynamicProperties[quadraticFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex].DisplayName); Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", dynamicProperties[quadraticFloodedCulvertCriticalOvertoppingDischargePropertyIndex].DisplayName); - Assert.AreEqual("Faalkans gegeven erosie bodem [1/jaar]", dynamicProperties[quadraticFloodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); + Assert.AreEqual("Faalkans gegeven erosie bodem [-]", dynamicProperties[quadraticFloodedCulvertFailureProbabilityStructureWithErosionPropertyIndex].DisplayName); Assert.AreEqual("Voorlandprofiel", dynamicProperties[quadraticFloodedCulvertForeshoreProfilePropertyIndex].DisplayName); Assert.AreEqual("Dam", dynamicProperties[quadraticFloodedCulvertUseBreakWaterPropertyIndex].DisplayName); Assert.AreEqual("Voorlandgeometrie", dynamicProperties[quadraticFloodedCulvertUseForeshorePropertyIndex].DisplayName);