Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs =================================================================== diff -u -r8a7d4d070e0644e7bc399b86ce751fcb774a4ea4 -r426680840fddcf9351c9ea2b8d4f1c6431f51715 --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 8a7d4d070e0644e7bc399b86ce751fcb774a4ea4) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 426680840fddcf9351c9ea2b8d4f1c6431f51715) @@ -141,26 +141,10 @@ } }, { - HydraRingFailureMechanismType.DikeHeight, new Dictionary - { - { - 102, numericsSettingFDir - }, - { - 103, numericsSettingFDir - } - } + HydraRingFailureMechanismType.DikeHeight, GetOvertoppingDefaults(numericsSettingFDir) }, { - HydraRingFailureMechanismType.DikesOvertopping, new Dictionary - { - { - 102, numericsSettingFDir - }, - { - 103, numericsSettingFDir - } - } + HydraRingFailureMechanismType.DikesOvertopping, GetOvertoppingDefaults(numericsSettingFDir) }, { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary @@ -237,15 +221,7 @@ } }, { - HydraRingFailureMechanismType.OvertoppingRate, new Dictionary - { - { - 102, numericsSettingFDir - }, - { - 103, numericsSettingFDir - } - } + HydraRingFailureMechanismType.OvertoppingRate, GetOvertoppingDefaults(numericsSettingFDir) } }; } @@ -254,5 +230,18 @@ { return new NumericsSetting(calculationTechniqueId, formStartMethod, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25); } + + private static Dictionary GetOvertoppingDefaults(NumericsSetting numericsSetting) + { + return new Dictionary + { + { + 102, numericsSetting + }, + { + 103, numericsSetting + } + }; + } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -r8a7d4d070e0644e7bc399b86ce751fcb774a4ea4 -r426680840fddcf9351c9ea2b8d4f1c6431f51715 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 8a7d4d070e0644e7bc399b86ce751fcb774a4ea4) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 426680840fddcf9351c9ea2b8d4f1c6431f51715) @@ -75,18 +75,10 @@ }, 6) }, { - HydraRingFailureMechanismType.DikeHeight, new FailureMechanismDefaults(101, new[] - { - 102, - 103 - }, 1017) + HydraRingFailureMechanismType.DikeHeight, GetOvertoppingDefaults() }, { - HydraRingFailureMechanismType.DikesOvertopping, new FailureMechanismDefaults(101, new[] - { - 102, - 103 - }, 1017) + HydraRingFailureMechanismType.DikesOvertopping, GetOvertoppingDefaults() }, { HydraRingFailureMechanismType.StructuresOvertopping, new FailureMechanismDefaults(110, new[] @@ -127,11 +119,7 @@ }, 8) }, { - HydraRingFailureMechanismType.OvertoppingRate, new FailureMechanismDefaults(101, new[] - { - 102, - 103 - }, 1017) + HydraRingFailureMechanismType.OvertoppingRate, GetOvertoppingDefaults() } }; } @@ -145,5 +133,14 @@ { return failureMechanismDefaults[failureMechanismType]; } + + private static FailureMechanismDefaults GetOvertoppingDefaults() + { + return new FailureMechanismDefaults(101, new[] + { + 102, + 103 + }, 1017); + } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -r8a7d4d070e0644e7bc399b86ce751fcb774a4ea4 -r426680840fddcf9351c9ea2b8d4f1c6431f51715 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 8a7d4d070e0644e7bc399b86ce751fcb774a4ea4) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 426680840fddcf9351c9ea2b8d4f1c6431f51715) @@ -100,62 +100,10 @@ } }, { - HydraRingFailureMechanismType.DikeHeight, new Dictionary - { - { - 1, new VariableDefaults(300) - }, - { - 8, new VariableDefaults(300) - }, - { - 10, new VariableDefaults(300) - }, - { - 11, new VariableDefaults(300) - }, - { - 12, new VariableDefaults(300) - }, - { - 17, new VariableDefaults(300) - }, - { - 120, new VariableDefaults(300) - }, - { - 123, new VariableDefaults(300) - } - } + HydraRingFailureMechanismType.DikeHeight, GetOvertoppingDefaults() }, { - HydraRingFailureMechanismType.DikesOvertopping, new Dictionary - { - { - 1, new VariableDefaults(300) - }, - { - 8, new VariableDefaults(300) - }, - { - 10, new VariableDefaults(300) - }, - { - 11, new VariableDefaults(300) - }, - { - 12, new VariableDefaults(300) - }, - { - 17, new VariableDefaults(300) - }, - { - 120, new VariableDefaults(300) - }, - { - 123, new VariableDefaults(300) - } - } + HydraRingFailureMechanismType.DikesOvertopping, GetOvertoppingDefaults() }, { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary @@ -421,33 +369,7 @@ } }, { - HydraRingFailureMechanismType.OvertoppingRate, new Dictionary - { - { - 1, new VariableDefaults(300) - }, - { - 8, new VariableDefaults(300) - }, - { - 10, new VariableDefaults(300) - }, - { - 11, new VariableDefaults(300) - }, - { - 12, new VariableDefaults(300) - }, - { - 17, new VariableDefaults(300) - }, - { - 120, new VariableDefaults(300) - }, - { - 123, new VariableDefaults(300) - } - } + HydraRingFailureMechanismType.OvertoppingRate, GetOvertoppingDefaults() } }; } @@ -462,5 +384,36 @@ { return variableDefaults[failureMechanismType][variableId]; } + + private static Dictionary GetOvertoppingDefaults() + { + return new Dictionary + { + { + 1, new VariableDefaults(300) + }, + { + 8, new VariableDefaults(300) + }, + { + 10, new VariableDefaults(300) + }, + { + 11, new VariableDefaults(300) + }, + { + 12, new VariableDefaults(300) + }, + { + 17, new VariableDefaults(300) + }, + { + 120, new VariableDefaults(300) + }, + { + 123, new VariableDefaults(300) + } + }; + } } } \ No newline at end of file