Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -82,7 +82,7 @@ } /// - /// Looks up a localized string similar to C-D. + /// Looks up a localized string similar to C. /// internal static string AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName { get { @@ -91,7 +91,7 @@ } /// - /// Looks up a localized string similar to A+-A. + /// Looks up a localized string similar to A+. /// internal static string AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName { get { @@ -100,7 +100,7 @@ } /// - /// Looks up a localized string similar to B-C. + /// Looks up a localized string similar to B. /// internal static string AssessmentSectionCategoryType_LowerLimitNorm_DisplayName { get { @@ -109,7 +109,7 @@ } /// - /// Looks up a localized string similar to A-B. + /// Looks up a localized string similar to A. /// internal static string AssessmentSectionCategoryType_SignalingNorm_DisplayName { get { Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -158,16 +158,16 @@ ondergrens van de waterstanden - C-D + C - A+-A + A+ - B-C + B - A-B + A ..\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 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd (.../BekledingenConfiguratieSchema.xsd) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd (.../BekledingenConfiguratieSchema.xsd) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -31,10 +31,10 @@ - - - - + + + + Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs (.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -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 'F-G' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") + "The 'categoriegrens' element is invalid - The value 'F' 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 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverterTest.cs (.../ConfigurationAssessmentSectionCategoryTypeConverterTest.cs) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/Converters/ConfigurationAssessmentSectionCategoryTypeConverterTest.cs (.../ConfigurationAssessmentSectionCategoryTypeConverterTest.cs) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -83,10 +83,10 @@ } [Test] - [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm, "A+-A")] - [TestCase(ConfigurationAssessmentSectionCategoryType.SignalingNorm, "A-B")] - [TestCase(ConfigurationAssessmentSectionCategoryType.LowerLimitNorm, "B-C")] - [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm, "C-D")] + [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm, "A+")] + [TestCase(ConfigurationAssessmentSectionCategoryType.SignalingNorm, "A")] + [TestCase(ConfigurationAssessmentSectionCategoryType.LowerLimitNorm, "B")] + [TestCase(ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm, "C")] public void ConvertTo_ValidConfigurationAssessmentSectionCategoryType_ReturnExpectedText( ConfigurationAssessmentSectionCategoryType value, string expectedText) { @@ -175,10 +175,10 @@ } [Test] - [TestCase("A+-A", ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm)] - [TestCase("A-B", ConfigurationAssessmentSectionCategoryType.SignalingNorm)] - [TestCase("B-C", ConfigurationAssessmentSectionCategoryType.LowerLimitNorm)] - [TestCase("C-D", ConfigurationAssessmentSectionCategoryType.FactorizedLowerLimitNorm)] + [TestCase("A+", ConfigurationAssessmentSectionCategoryType.FactorizedSignalingNorm)] + [TestCase("A", ConfigurationAssessmentSectionCategoryType.SignalingNorm)] + [TestCase("B", ConfigurationAssessmentSectionCategoryType.LowerLimitNorm)] + [TestCase("C", 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 -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -2,7 +2,7 @@ - A+-A + A+ NaN NaN NaN @@ -20,7 +20,7 @@ HydraulicLocationA - C-D + C NaN NaN NaN Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -2,7 +2,7 @@ Locatie - A-B + A 10 2 9 Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -1,7 +1,7 @@ - A+-A - B-C + A+ + B \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -1,6 +1,6 @@ - F-G + F \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -2,7 +2,7 @@ Locatie - A-B + A 1.1 2.2 3.3 Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -r6bf4b8cdae7b3908e211eaa3766f11d5a26258d6 -r458bf8f61aef50a51328070a2091c227c2bf6a27 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 6bf4b8cdae7b3908e211eaa3766f11d5a26258d6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 458bf8f61aef50a51328070a2091c227c2bf6a27) @@ -2,7 +2,7 @@ Locatie1 - B-C + B 1.5 0.5 1.4