Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverter.cs =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverter.cs (.../ConfigurationAssessmentSectionCategoryTypeConverter.cs) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverter.cs (.../ConfigurationAssessmentSectionCategoryTypeConverter.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -23,7 +23,7 @@ using System.ComponentModel; using System.Globalization; using Ringtoets.Common.Data.AssessmentSection; -using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; +using Ringtoets.Revetment.IO.Properties; namespace Ringtoets.Revetment.IO.Configurations.Converters { @@ -74,13 +74,13 @@ switch (categoryType) { case ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm: - return RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName; + return Resources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName; case ConfigurationAssessmentSectionCategoryType.SignalingNorm: - return RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName; + return Resources.AssessmentSectionCategoryType_SignalingNorm_DisplayName; case ConfigurationAssessmentSectionCategoryType.LowerLimitNorm: - return RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName; + return Resources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName; case ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm: - return RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName; + return Resources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName; default: throw new NotSupportedException(); } @@ -129,22 +129,22 @@ var stringValue = value as string; if (stringValue != null) { - if (stringValue == RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName) + if (stringValue == Resources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName) { return ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm; } - if (stringValue == RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName) + if (stringValue == Resources.AssessmentSectionCategoryType_SignalingNorm_DisplayName) { return ConfigurationAssessmentSectionCategoryType.SignalingNorm; } - if (stringValue == RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName) + if (stringValue == Resources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName) { return ConfigurationAssessmentSectionCategoryType.LowerLimitNorm; } - if (stringValue == RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName) + if (stringValue == Resources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName) { return ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm; } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -82,6 +82,42 @@ } /// + /// Looks up a localized string similar to C-D. + /// + internal static string AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName { + get { + return ResourceManager.GetString("AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A+-A. + /// + internal static string AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName { + get { + return ResourceManager.GetString("AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to B-C. + /// + internal static string AssessmentSectionCategoryType_LowerLimitNorm_DisplayName { + get { + return ResourceManager.GetString("AssessmentSectionCategoryType_LowerLimitNorm_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A-B. + /// + internal static string AssessmentSectionCategoryType_SignalingNorm_DisplayName { + get { + return ResourceManager.GetString("AssessmentSectionCategoryType_SignalingNorm_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?><!-- ///Copyright (C) Stichting Deltares 2017. All rights reserved. /// Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -157,6 +157,18 @@ ondergrens van de waterstanden + + C-D + + + A+-A + + + B-C + + + A-B + ..\resources\BekledingenConfiguratieSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd (.../BekledingenConfiguratieSchema.xsd) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd (.../BekledingenConfiguratieSchema.xsd) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -31,10 +31,10 @@ - - - - + + + + Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -45,7 +45,7 @@ "Element 'categoriegrens' cannot appear more than once if content model type is \"all\".") .SetName("invalidCalculationMultipleCategoryType"); yield return new TestCaseData("invalidCategoryTypeUnknownValue.xml", - "The 'categoriegrens' element is invalid - The value 'Categoriegrens D' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") + "The 'categoriegrens' element is invalid - The value 'F-G' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") .SetName("invalidCategoryTypeUnknownValue"); } } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverterTest.cs =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverterTest.cs (.../ConfigurationAssessmentSectionCategoryTypeConverterTest.cs) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverterTest.cs (.../ConfigurationAssessmentSectionCategoryTypeConverterTest.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -83,10 +83,10 @@ } [Test] - [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm, "Categoriegrens A+")] - [TestCase(ConfigurationAssessmentSectionCategoryType.SignalingNorm, "Categoriegrens A")] - [TestCase(ConfigurationAssessmentSectionCategoryType.LowerLimitNorm, "Categoriegrens B")] - [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm, "Categoriegrens C")] + [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm, "A+-A")] + [TestCase(ConfigurationAssessmentSectionCategoryType.SignalingNorm, "A-B")] + [TestCase(ConfigurationAssessmentSectionCategoryType.LowerLimitNorm, "B-C")] + [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm, "C-D")] public void ConvertTo_ValidConfigurationAssessmentSectionCategoryType_ReturnExpectedText( ConfigurationAssessmentSectionCategoryType value, string expectedText) { @@ -175,10 +175,10 @@ } [Test] - [TestCase("Categoriegrens A+", ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm)] - [TestCase("Categoriegrens A", ConfigurationAssessmentSectionCategoryType.SignalingNorm)] - [TestCase("Categoriegrens B", ConfigurationAssessmentSectionCategoryType.LowerLimitNorm)] - [TestCase("Categoriegrens C", ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm)] + [TestCase("A+-A", ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm)] + [TestCase("A-B", ConfigurationAssessmentSectionCategoryType.SignalingNorm)] + [TestCase("B-C", ConfigurationAssessmentSectionCategoryType.LowerLimitNorm)] + [TestCase("C-D", ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm)] public void ConvertFrom_ValidStringValue_ReturnConfigurationAssessmentSectionCategoryType( string value, ConfigurationAssessmentSectionCategoryType expectedResult) { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -2,7 +2,7 @@ - Categoriegrens A+ + A+-A NaN NaN NaN @@ -20,7 +20,7 @@ HydraulicLocationA - Categoriegrens C + C-D NaN NaN NaN Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -2,7 +2,7 @@ Locatie - Categoriegrens A + A-B 10 2 9 Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -1,7 +1,7 @@ - Categoriegrens A+ - Categoriegrens B + A+-A + B-C \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -1,6 +1,6 @@ - Categoriegrens D + F-G \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -2,7 +2,7 @@ Locatie - Categoriegrens A + A-B 1.1 2.2 3.3 Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -r843c44ed3804552cb22a7b2fc96631048b7ed2b2 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 843c44ed3804552cb22a7b2fc96631048b7ed2b2) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) @@ -2,7 +2,7 @@ Locatie1 - Categoriegrens B + B-C 1.5 0.5 1.4