Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rfcd598284a0dfe0fd6142a9ab514ee1ec12edee0 -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fcd598284a0dfe0fd6142a9ab514ee1ec12edee0) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -82,7 +82,7 @@ } /// - /// Looks up a localized string similar to Vv-VIv. + /// Looks up a localized string similar to Vv. /// internal static string FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName { get { @@ -91,7 +91,7 @@ } /// - /// Looks up a localized string similar to IVv-Vv. + /// Looks up a localized string similar to IVv. /// internal static string FailureMechanismCategoryType_LowerLimitNorm_DisplayName { get { @@ -100,7 +100,7 @@ } /// - /// Looks up a localized string similar to Iv-IIv. + /// Looks up a localized string similar to Iv. /// internal static string FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName { get { @@ -110,7 +110,7 @@ } /// - /// Looks up a localized string similar to IIIv-IVv. + /// Looks up a localized string similar to IIIv. /// internal static string FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName { get { @@ -119,7 +119,7 @@ } /// - /// Looks up a localized string similar to IIv-IIIv. + /// Looks up a localized string similar to IIv. /// internal static string FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName { get { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.resx =================================================================== diff -u -rfcd598284a0dfe0fd6142a9ab514ee1ec12edee0 -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.resx (.../Resources.resx) (revision fcd598284a0dfe0fd6142a9ab514ee1ec12edee0) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -118,19 +118,19 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Vv-VIv + Vv - IVv-Vv + IVv - Iv-IIv + Iv - IIIv-IVv + IIIv - IIv-IIIv + IIv Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd =================================================================== diff -u -r934523f771c4f305cf980e25dcd1b5b70f15025b -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd (.../GEBUConfiguratieSchema.xsd) (revision 934523f771c4f305cf980e25dcd1b5b70f15025b) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.IO/Resources/GEBUConfiguratieSchema.xsd (.../GEBUConfiguratieSchema.xsd) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -31,11 +31,11 @@ - - - - - + + + + + Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCategoryTypeConverterTest.cs =================================================================== diff -u -r1d673996ebb0e733630f2355c54d32a9e826a531 -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCategoryTypeConverterTest.cs (.../ConfigurationGrassCoverErosionOutwardsCategoryTypeConverterTest.cs) (revision 1d673996ebb0e733630f2355c54d32a9e826a531) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/Converters/ConfigurationGrassCoverErosionOutwardsCategoryTypeConverterTest.cs (.../ConfigurationGrassCoverErosionOutwardsCategoryTypeConverterTest.cs) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -83,11 +83,11 @@ } [Test] - [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificFactorizedSignalingNorm, "Iv-IIv")] - [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificSignalingNorm, "IIv-IIIv")] - [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm, "IIIv-IVv")] - [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.LowerLimitNorm, "IVv-Vv")] - [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.FactorizedLowerLimitNorm, "Vv-VIv")] + [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificFactorizedSignalingNorm, "Iv")] + [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificSignalingNorm, "IIv")] + [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm, "IIIv")] + [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.LowerLimitNorm, "IVv")] + [TestCase(ConfigurationGrassCoverErosionOutwardsCategoryType.FactorizedLowerLimitNorm, "Vv")] public void ConvertTo_ValidConfigurationGrassCoverErosionOutwardsCategoryType_ReturnExpectedText( ConfigurationGrassCoverErosionOutwardsCategoryType value, string expectedText) { @@ -177,11 +177,11 @@ } [Test] - [TestCase("Iv-IIv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificFactorizedSignalingNorm)] - [TestCase("IIv-IIIv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificSignalingNorm)] - [TestCase("IIIv-IVv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm)] - [TestCase("IVv-Vv", ConfigurationGrassCoverErosionOutwardsCategoryType.LowerLimitNorm)] - [TestCase("Vv-VIv", ConfigurationGrassCoverErosionOutwardsCategoryType.FactorizedLowerLimitNorm)] + [TestCase("Iv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificFactorizedSignalingNorm)] + [TestCase("IIv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificSignalingNorm)] + [TestCase("IIIv", ConfigurationGrassCoverErosionOutwardsCategoryType.MechanismSpecificLowerLimitNorm)] + [TestCase("IVv", ConfigurationGrassCoverErosionOutwardsCategoryType.LowerLimitNorm)] + [TestCase("Vv", ConfigurationGrassCoverErosionOutwardsCategoryType.FactorizedLowerLimitNorm)] public void ConvertFrom_ValidStringValue_ReturnConfigurationGrassCoverErosionOutwardsCategoryType( string value, ConfigurationGrassCoverErosionOutwardsCategoryType expectedResult) { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r48c203e154a0c2451e9828ab5cb0b9661c3d00da -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision 48c203e154a0c2451e9828ab5cb0b9661c3d00da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReaderTest.cs) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -46,7 +46,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 'A-B' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") + "The 'categoriegrens' element is invalid - The value 'A' is invalid according to its datatype 'categoriegrensType' - The Enumeration constraint failed.") .SetName("invalidCategoryTypeUnknownValue"); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml =================================================================== diff -u -rcfd88560f540be0e2129057a79109b5f99fb7b5c -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision cfd88560f540be0e2129057a79109b5f99fb7b5c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter/fullValidConfiguration.xml (.../fullValidConfiguration.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -2,7 +2,7 @@ - Iv-IIv + Iv NaN NaN NaN @@ -20,7 +20,7 @@ HydraulicLocationA - IIv-IIIv + IIv NaN NaN NaN Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r48c203e154a0c2451e9828ab5cb0b9661c3d00da -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 48c203e154a0c2451e9828ab5cb0b9661c3d00da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -2,7 +2,7 @@ Locatie - Vv-VIv + Vv 10 2 9 Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml =================================================================== diff -u -rfcd598284a0dfe0fd6142a9ab514ee1ec12edee0 -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision fcd598284a0dfe0fd6142a9ab514ee1ec12edee0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml (.../invalidCalculationMultipleCategoryType.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -1,7 +1,7 @@ - Iv-IIv - IVv-Vv + Iv + IVv \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml =================================================================== diff -u -rfcd598284a0dfe0fd6142a9ab514ee1ec12edee0 -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision fcd598284a0dfe0fd6142a9ab514ee1ec12edee0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml (.../invalidCategoryTypeUnknownValue.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -1,6 +1,6 @@ - A-B + A \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r48c203e154a0c2451e9828ab5cb0b9661c3d00da -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 48c203e154a0c2451e9828ab5cb0b9661c3d00da) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -2,7 +2,7 @@ Locatie - IIIv-IVv + IIIv 1.1 2.2 3.3 Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -rcfd88560f540be0e2129057a79109b5f99fb7b5c -r5a7eba9f3561afa8b807facb7901ee709500a9a8 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision cfd88560f540be0e2129057a79109b5f99fb7b5c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/test-data/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 5a7eba9f3561afa8b807facb7901ee709500a9a8) @@ -2,7 +2,7 @@ Locatie1 - IVv-Vv + IVv 1.5 0.5 1.4