Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -102,14 +102,14 @@ new DesignTablesSetting(10, 50) }, { - HydraRingFailureMechanismType.DikesOvertopping, - new DesignTablesSetting(double.NaN, double.NaN) - }, - { HydraRingFailureMechanismType.DikesHeight, new DesignTablesSetting(2, 4) }, { + HydraRingFailureMechanismType.DikesOvertopping, + new DesignTablesSetting(double.NaN, double.NaN) + }, + { HydraRingFailureMechanismType.StructuresOvertopping, new DesignTablesSetting(double.NaN, double.NaN) }, Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -138,7 +138,7 @@ } }, { - HydraRingFailureMechanismType.DikesOvertopping, new Dictionary + HydraRingFailureMechanismType.DikesHeight, new Dictionary { { 102, numericsSettingDirs @@ -149,7 +149,7 @@ } }, { - HydraRingFailureMechanismType.DikesHeight, new Dictionary + HydraRingFailureMechanismType.DikesOvertopping, new Dictionary { { 102, numericsSettingDirs Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -99,10 +99,10 @@ [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 103, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 102, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 103, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 103, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 421, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 422, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 423, 11, 4, 10000, 40000)] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -68,8 +68,8 @@ [TestCase(HydraRingFailureMechanismType.WaveHeight, 700131, 1)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 700131, 1)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 700131, 1)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 700134, 1)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 700134, 1)] Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -75,14 +75,14 @@ }, 6) }, { - HydraRingFailureMechanismType.DikesOvertopping, new FailureMechanismDefaults(101, new[] + HydraRingFailureMechanismType.DikesHeight, new FailureMechanismDefaults(101, new[] { 102, 103 }, 1017) }, { - HydraRingFailureMechanismType.DikesHeight, new FailureMechanismDefaults(101, new[] + HydraRingFailureMechanismType.DikesOvertopping, new FailureMechanismDefaults(101, new[] { 102, 103 Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -100,7 +100,7 @@ } }, { - HydraRingFailureMechanismType.DikesOvertopping, new Dictionary + HydraRingFailureMechanismType.DikesHeight, new Dictionary { { 1, new VariableDefaults(300) @@ -129,7 +129,7 @@ } }, { - HydraRingFailureMechanismType.DikesHeight, new Dictionary + HydraRingFailureMechanismType.DikesOvertopping, new Dictionary { { 1, new VariableDefaults(300) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -49,12 +49,12 @@ { 5 }, 6)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, new[] + [TestCase(HydraRingFailureMechanismType.DikesHeight, 101, new[] { 102, 103 }, 1017)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 101, new[] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, new[] { 102, 103 Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs =================================================================== diff -u -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 -r974d938888a96c3fa06e6d762d59a0be1f338db7 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision 974d938888a96c3fa06e6d762d59a0be1f338db7) @@ -39,14 +39,6 @@ [TestCase(HydraRingFailureMechanismType.QVariant, 117, 300)] [TestCase(HydraRingFailureMechanismType.QVariant, 118, 300)] [TestCase(HydraRingFailureMechanismType.QVariant, 119, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 1, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 8, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 10, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 11, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 12, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 17, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 120, 300)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 123, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 1, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 8, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 10, 300)] @@ -55,6 +47,14 @@ [TestCase(HydraRingFailureMechanismType.DikesHeight, 17, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 120, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 123, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 1, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 8, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 10, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 11, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 12, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 17, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 120, 300)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 123, 300)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 58, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 59, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 60, 999999)]