Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -re57fc88b834c1c65fc5acbecf172c15e88bf6b05 -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision e57fc88b834c1c65fc5acbecf172c15e88bf6b05) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) @@ -498,7 +498,7 @@ { configurationDictionary["Numerics"] = configurationSettings .Where(cs => cs.HydraRingFailureMechanismType == FailureMechanismType) - .Select(configurationSettingsForFailureMechanism => new OrderedDictionary + .Select(cs => new OrderedDictionary { { "SectionId", 999 // TODO: Dike section integration @@ -513,54 +513,53 @@ "AlternativeId", null // Fixed: no support for piping }, { - "SubMechanismId", configurationSettingsForFailureMechanism.SubMechanismId + "SubMechanismId", cs.SubMechanismId }, { - "Method", configurationSettingsForFailureMechanism.CalculationTechniqueId + "Method", cs.CalculationTechniqueId }, { - "FormStartMethod", configurationSettingsForFailureMechanism.FormStartMethod + "FormStartMethod", cs.FormStartMethod }, - -// { -// "FormNumberOfIterations", 50 -// }, -// { -// "FormRelaxationFactor", 0.15 -// }, -// { -// "FormEpsBeta", 0.01 -// }, -// { -// "FormEpsHOH", 0.01 -// }, -// { -// "FormEpsZFunc", 0.01 -// }, -// { -// "DsStartMethod", 2 -// }, -// { -// "DsIterationmethod", 1 -// }, -// { -// "DsMinNumberOfIterations", 10000 -// }, -// { -// "DsMaxNumberOfIterations", 20000 -// }, -// { -// "DsVarCoefficient", 0.1 -// }, -// { -// "NiUMin", -6.0 -// }, -// { -// "NiUMax", 6.0 -// }, -// { -// "NiNumberSteps", 25 -// } + { + "FormNumberOfIterations", cs.FormNumberOfIterations + }, + { + "FormRelaxationFactor", cs.FormRelaxationFactor + }, + { + "FormEpsBeta", cs.FormEpsBeta + }, + { + "FormEpsHOH", cs.FormEpsHOH + }, + { + "FormEpsZFunc", cs.FormEpsZFunc + }, + { + "DsStartMethod", cs.DsStartMethod + }, + { + "DsIterationmethod", 1 // Fixed: Not relevant + }, + { + "DsMinNumberOfIterations", cs.DsMinNumberOfIterations + }, + { + "DsMaxNumberOfIterations", cs.DsMaxNumberOfIterations + }, + { + "DsVarCoefficient", cs.DsVarCoefficient + }, + { + "NiUMin", cs.NiUMin + }, + { + "NiUMax", cs.NiUMax + }, + { + "NiNumberSteps", cs.NiNumberSteps + } }).ToList(); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs =================================================================== diff -u -re57fc88b834c1c65fc5acbecf172c15e88bf6b05 -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision e57fc88b834c1c65fc5acbecf172c15e88bf6b05) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) @@ -55,5 +55,71 @@ /// Gets or set the FORM start method. /// public int FormStartMethod { get; set; } + + /// + /// Gets or set the maximum number of FORM iterations to perform. + /// + public int FormNumberOfIterations { get; set; } + + /// + /// Gets or set a relaxation towards the design point for FORM. + /// + public int FormRelaxationFactor { get; set; } + + /// + /// Gets or set one of the three convergence criteria for FORM. + /// + /// + /// + public int FormEpsBeta { get; set; } + + /// + /// Gets or set one of the three convergence criteria for FORM. + /// + /// + /// + public int FormEpsHOH { get; set; } + + /// + /// Gets or set one of the three convergence criteria for FORM. + /// + /// + /// + public int FormEpsZFunc { get; set; } + + /// + /// Gets or set the DIRS start method. + /// + public int DsStartMethod { get; set; } + + /// + /// Gets or set the minimum number of DIRS iterations to perform. + /// + public int DsMinNumberOfIterations { get; set; } + + /// + /// Gets or set the maximum number of DIRS iterations to perform. + /// + public int DsMaxNumberOfIterations { get; set; } + + /// + /// Gets or set the variation coefficient to use within the DIRS iterations. + /// + public int DsVarCoefficient { get; set; } + + /// + /// Gets or set the lower size limit of a uniform grid deployed by NINT. + /// + public int NiUMin { get; set; } + + /// + /// Gets or set the upper size limit of a uniform grid deployed by NINT. + /// + public int NiUMax { get; set; } + + /// + /// Gets or set the number of steps between and for NINT. + /// + public int NiNumberSteps { get; set; } } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -re57fc88b834c1c65fc5acbecf172c15e88bf6b05 -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision e57fc88b834c1c65fc5acbecf172c15e88bf6b05) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) @@ -117,9 +117,9 @@ "INSERT INTO [DesignTables] VALUES (999, 3, NULL, NULL, 6, 114, NULL, NULL, NULL, NULL, NULL, NULL, NULL);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 3, 1, 4);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 4, 1, 4);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 5, 4, 4);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 3, 1, 4, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 4, 1, 4, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 5, 4, 4, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine +