Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -110,10 +110,6 @@ new DesignTablesSetting(2, 4) }, { - HydraRingFailureMechanismType.DikesPiping, - 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 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -160,20 +160,6 @@ } }, { - HydraRingFailureMechanismType.DikesPiping, new Dictionary - { - { - 311, numericsSettingDirs - }, - { - 313, numericsSettingDirs - }, - { - 314, numericsSettingDirs - } - } - }, - { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary { { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -106,7 +106,6 @@ [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, -1, 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, -1, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 700131, 2.0, 4.0)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 700131, double.NaN, double.NaN)] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -103,9 +103,6 @@ [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.DikesPiping, 311, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 313, 11, 4, 10000, 40000)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 314, 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 -r02088b12d2e6c8993414a50a045043e0be062897 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision 02088b12d2e6c8993414a50a045043e0be062897) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/TimeIntegrationSettingsProviderTest.cs (.../TimeIntegrationSettingsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -70,7 +70,6 @@ [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 700131, 1)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 700134, 1)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700134, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 700134, 1)] @@ -96,7 +95,6 @@ [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 1)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 1)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 1)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 1)] Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -36,7 +36,6 @@ WaveSpectralPeriod, DikesOvertopping, DikesHeight, - DikesPiping, StructuresOvertopping, StructuresClosure, StructuresStructuralFailure, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -89,14 +89,6 @@ }, 1017) }, { - HydraRingFailureMechanismType.DikesPiping, new FailureMechanismDefaults(103, new[] - { - 311, - 313, - 314 - }, 3015) - }, - { HydraRingFailureMechanismType.StructuresOvertopping, new FailureMechanismDefaults(110, new[] { 421, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -158,68 +158,6 @@ } }, { - HydraRingFailureMechanismType.DikesPiping, new Dictionary - { - { - 23, new VariableDefaults(6000) - }, - { - 42, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 43, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 44, new VariableDefaults(200) - }, - { - 45, new VariableDefaults(300) - }, - { - 46, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 47, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 48, new VariableDefaults(3000) - }, - { - 49, new VariableDefaults(200) - }, - { - 50, new VariableDefaults(300) - }, - { - 51, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 52, new VariableDefaults(600) - }, - { - 53, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 54, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 55, new VariableDefaults(600) - }, - { - 56, new VariableDefaults(180) - }, - { - 58, new VariableDefaults(notApplicableCorrelationLength) - }, - { - 124, new VariableDefaults(300) - }, - { - 127, new VariableDefaults(notApplicableCorrelationLength) - } - } - }, - { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary { { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -29,9 +29,9 @@ public class HydraRingFailureMechanismTypeTest { [Test] - public void Values_HasTwelve() + public void Values_HasEleven() { - Assert.AreEqual(12, Enum.GetValues(typeof(HydraRingFailureMechanismType)).Length); + Assert.AreEqual(11, Enum.GetValues(typeof(HydraRingFailureMechanismType)).Length); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -59,12 +59,6 @@ 102, 103 }, 1017)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 103, new[] - { - 311, - 313, - 314 - }, 3015)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, new[] { 421, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs =================================================================== diff -u -rc5ccd6966d95178b030cb10b4f154546d51ecf80 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -55,25 +55,6 @@ [TestCase(HydraRingFailureMechanismType.DikesHeight, 17, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 120, 300)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 123, 300)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 23, 6000)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 42, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 43, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 44, 200)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 45, 300)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 46, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 47, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 48, 3000)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 49, 200)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 50, 300)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 51, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 52, 600)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 53, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 54, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 55, 600)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 56, 180)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 58, 999999)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 124, 300)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 127, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 58, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 59, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 60, 999999)] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs =================================================================== diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -rf2315051e8bb1281dd7f3a234ef1ed8f3c516143 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision f2315051e8bb1281dd7f3a234ef1ed8f3c516143) @@ -37,7 +37,7 @@ public void ParameteredConstructor_ExpectedValues() { // Call - var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.DikesPiping, 700001, "D:\\hlcd", "D:\\work"); + var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.AssessmentLevel, 700001, "D:\\hlcd", "D:\\work"); // Assert Assert.AreEqual("D:\\work\\700001.ini", hydraRingInitializationService.IniFilePath); @@ -54,11 +54,11 @@ public void GenerateInitializationScript_ReturnsExpectedInitializationScript() { // Setup - var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.DikesPiping, 700001, "D:\\hlcd", ""); + var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.StructuresStructuralFailure, 700001, "D:\\hlcd", ""); var configurationDatabaseFilePath = Path.Combine(hydraRingDirectory, "config.sqlite"); var expectedInitializationScript = "section = 700001" + Environment.NewLine + - "mechanism = 103" + Environment.NewLine + + "mechanism = 112" + Environment.NewLine + "alternative = 1" + Environment.NewLine + "layer = 1" + Environment.NewLine + "logfile = 700001.log" + Environment.NewLine +