Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs =================================================================== diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision d73c509c93f18a87da76086c871eca2a2c903e12) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -124,6 +124,10 @@ { HydraRingFailureMechanismType.StructuresStructuralFailure, new DesignTablesSetting(double.NaN, double.NaN) + }, + { + HydraRingFailureMechanismType.DunesBoundaryConditions, + new DesignTablesSetting(2, 4) } }; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs =================================================================== diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision d73c509c93f18a87da76086c871eca2a2c903e12) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -238,6 +238,14 @@ 435, numericsSettingDirs } } + }, + { + HydraRingFailureMechanismType.DunesBoundaryConditions, new Dictionary + { + { + 6, numericsSettingDirs + } + } } }; } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs =================================================================== diff -u -r4b93743129a2c7335995686ba8ccbee63b476446 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision 4b93743129a2c7335995686ba8ccbee63b476446) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -110,6 +110,7 @@ [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 700131, double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 700131, double.NaN, double.NaN)] + [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, -1, 2.0, 4.0)] public void GetDesignTablesSetting_UnknownFailureMechanismTypeOrLocationId_ReturnsDefaultDesignTablesSetting( HydraRingFailureMechanismType failureMechanismType, long locationId, double expectedValueMin, double expectedValueMax) { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs =================================================================== diff -u -r16f6bd5805e77d549cded91fc48fff35ffbdec00 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 16f6bd5805e77d549cded91fc48fff35ffbdec00) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -120,6 +120,7 @@ [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 11, 4, 10000, 40000)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 6, 11, 4, 10000, 40000)] public void GetNumericsSetting_UnknownLocationId_ReturnsExpectedDefaultNumericsSetting( HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, int expectedFormStartMethod, int expectedDsMinNumberOfIterations, int expectedDsMaxNumberOfIterations) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs =================================================================== diff -u -r8692161b4e1e558746fcca9d3204c33d606fb311 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision 8692161b4e1e558746fcca9d3204c33d606fb311) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs (.../HydraRingFailureMechanismType.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -39,6 +39,7 @@ DikesPiping, StructuresOvertopping, StructuresClosure, - StructuresStructuralFailure + StructuresStructuralFailure, + DunesBoundaryConditions } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -rcb1cc7b1bc157f8cc70a78b60a29f3fa7c6ba3f7 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision cb1cc7b1bc157f8cc70a78b60a29f3fa7c6ba3f7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -127,6 +127,12 @@ 434, 435 }, 4607) + }, + { + HydraRingFailureMechanismType.DunesBoundaryConditions, new FailureMechanismDefaults(1, new[] + { + 6 + }, 8) } }; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -r8ddc482a3d2978c1526da50c237d514c8b8c6d72 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 8ddc482a3d2978c1526da50c237d514c8b8c6d72) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -473,6 +473,14 @@ 136, new VariableDefaults(notApplicableCorrelationLength) } } + }, + { + HydraRingFailureMechanismType.DunesBoundaryConditions, new Dictionary + { + { + 26, new VariableDefaults(300) + } + } } }; } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs =================================================================== diff -u -r8692161b4e1e558746fcca9d3204c33d606fb311 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision 8692161b4e1e558746fcca9d3204c33d606fb311) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingFailureMechanismTypeTest.cs (.../HydraRingFailureMechanismTypeTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -29,9 +29,9 @@ public class HydraRingFailureMechanismTypeTest { [Test] - public void Values_HasEleven() + public void Values_HasTwelve() { - Assert.AreEqual(11, Enum.GetValues(typeof(HydraRingFailureMechanismType)).Length); + Assert.AreEqual(12, Enum.GetValues(typeof(HydraRingFailureMechanismType)).Length); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -rcb1cc7b1bc157f8cc70a78b60a29f3fa7c6ba3f7 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision cb1cc7b1bc157f8cc70a78b60a29f3fa7c6ba3f7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -32,53 +32,53 @@ [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, new[] { 1 - })] - [TestCase(HydraRingFailureMechanismType.QVariant, 3, new[] - { - 5 - })] + }, 1)] [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, new[] { 11 - })] + }, 11)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 11, new[] { 14 - })] + }, 14)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 11, new[] { 16 - })] + }, 16)] + [TestCase(HydraRingFailureMechanismType.QVariant, 3, new[] + { + 5 + }, 6)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, new[] { 102, 103 - })] + }, 1017)] [TestCase(HydraRingFailureMechanismType.DikesHeight, 101, new[] { 102, 103 - })] + }, 1017)] [TestCase(HydraRingFailureMechanismType.DikesPiping, 103, new[] { 311, 313, 314 - })] + }, 3015)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, new[] { 421, 422, 423 - })] + }, 4404)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 111, new[] { 422, 424, 425, 426, 427 - })] + }, 4505)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 112, new[] { 422, @@ -90,9 +90,16 @@ 433, 434, 435 - })] - public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType, int expectedMechanismId, IEnumerable expectedSubMechanismIds) + }, 4607)] + [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 1, new[] { + 6 + }, 8)] + public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType, + int expectedMechanismId, + IEnumerable expectedSubMechanismIds, + int expectedFaultTreeModel) + { // Setup var failureMechanismDefaultsProvider = new FailureMechanismDefaultsProvider(); @@ -102,6 +109,7 @@ // Assert Assert.AreEqual(expectedMechanismId, failureMechanismDefaults.MechanismId); Assert.AreEqual(expectedSubMechanismIds, failureMechanismDefaults.SubMechanismIds); + Assert.AreEqual(expectedFaultTreeModel, failureMechanismDefaults.FaultTreeModelId); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs =================================================================== diff -u -r8ddc482a3d2978c1526da50c237d514c8b8c6d72 -rc5ccd6966d95178b030cb10b4f154546d51ecf80 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision 8ddc482a3d2978c1526da50c237d514c8b8c6d72) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/VariableDefaultsProviderTest.cs (.../VariableDefaultsProviderTest.cs) (revision c5ccd6966d95178b030cb10b4f154546d51ecf80) @@ -154,6 +154,7 @@ [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 134, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 135, 999999)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 136, 999999)] + [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 26, 300)] public void GetVariableDefaults_ReturnsExpectedVariableDefaults(HydraRingFailureMechanismType failureMechanismType, int variableId, int expectedCorrelationLength) { // Setup