Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 -r382232d34811b2df367d7dab1e54cf7bcf12a347 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 382232d34811b2df367d7dab1e54cf7bcf12a347) @@ -49,7 +49,19 @@ VariableId = 26, SubMechanismId = 1, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -58,7 +70,19 @@ VariableId = 28, SubMechanismId = 11, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -67,7 +91,19 @@ VariableId = 29, SubMechanismId = 14, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -76,7 +112,19 @@ VariableId = 29, SubMechanismId = 16, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -85,7 +133,19 @@ VariableId = 114, SubMechanismId = 3, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -94,7 +154,19 @@ VariableId = 114, SubMechanismId = 4, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -103,7 +175,19 @@ VariableId = 114, SubMechanismId = 5, CalculationTechniqueId = 4, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -112,7 +196,19 @@ VariableId = 1, SubMechanismId = 102, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -121,7 +217,19 @@ VariableId = 1, SubMechanismId = 103, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -130,7 +238,19 @@ VariableId = 44, SubMechanismId = 311, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -139,7 +259,19 @@ VariableId = 44, SubMechanismId = 313, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -148,7 +280,19 @@ VariableId = 44, SubMechanismId = 314, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -157,7 +301,19 @@ VariableId = 60, SubMechanismId = 421, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -166,7 +322,19 @@ VariableId = 60, SubMechanismId = 422, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -175,7 +343,19 @@ VariableId = 60, SubMechanismId = 423, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -184,7 +364,19 @@ VariableId = 65, SubMechanismId = 422, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -193,7 +385,19 @@ VariableId = 65, SubMechanismId = 424, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -202,7 +406,19 @@ VariableId = 65, SubMechanismId = 425, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -211,7 +427,19 @@ VariableId = 65, SubMechanismId = 426, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -220,7 +448,19 @@ VariableId = 65, SubMechanismId = 427, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -229,7 +469,19 @@ VariableId = 65, SubMechanismId = 422, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -238,7 +490,19 @@ VariableId = 65, SubMechanismId = 424, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -247,7 +511,19 @@ VariableId = 65, SubMechanismId = 425, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -256,7 +532,19 @@ VariableId = 65, SubMechanismId = 430, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -265,7 +553,19 @@ VariableId = 65, SubMechanismId = 431, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -274,7 +574,19 @@ VariableId = 65, SubMechanismId = 432, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -283,7 +595,19 @@ VariableId = 65, SubMechanismId = 433, CalculationTechniqueId = 1, - FormStartMethod = 1 + FormStartMethod = 1, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -292,7 +616,19 @@ VariableId = 65, SubMechanismId = 434, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 }, new HydraRingConfigurationSettings { @@ -301,7 +637,19 @@ VariableId = 65, SubMechanismId = 435, CalculationTechniqueId = 1, - FormStartMethod = 4 + FormStartMethod = 4, + FormNumberOfIterations = 50, + FormRelaxationFactor = 0.15, + FormEpsBeta = 0.01, + FormEpsHOH = 0.01, + FormEpsZFunc = 0.01, + DsStartMethod = 2, + DsMinNumberOfIterations = 10000, + DsMaxNumberOfIterations = 20000, + DsVarCoefficient = 0.1, + NiUMin = -6.0, + NiUMax = 6.0, + NiNumberSteps = 25 } }; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs =================================================================== diff -u -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 -r382232d34811b2df367d7dab1e54cf7bcf12a347 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision 382232d34811b2df367d7dab1e54cf7bcf12a347) @@ -64,28 +64,28 @@ /// /// Gets or set a relaxation towards the design point for FORM. /// - public int FormRelaxationFactor { get; set; } + public double FormRelaxationFactor { get; set; } /// /// Gets or set one of the three convergence criteria for FORM. /// /// /// - public int FormEpsBeta { get; set; } + public double FormEpsBeta { get; set; } /// /// Gets or set one of the three convergence criteria for FORM. /// /// /// - public int FormEpsHOH { get; set; } + public double FormEpsHOH { get; set; } /// /// Gets or set one of the three convergence criteria for FORM. /// /// /// - public int FormEpsZFunc { get; set; } + public double FormEpsZFunc { get; set; } /// /// Gets or set the DIRS start method. @@ -105,17 +105,17 @@ /// /// Gets or set the variation coefficient to use within the DIRS iterations. /// - public int DsVarCoefficient { get; set; } + public double DsVarCoefficient { get; set; } /// /// Gets or set the lower size limit of a uniform grid deployed by NINT. /// - public int NiUMin { get; set; } + public double NiUMin { get; set; } /// /// Gets or set the upper size limit of a uniform grid deployed by NINT. /// - public int NiUMax { get; set; } + public double NiUMax { get; set; } /// /// Gets or set the number of steps between and for NINT. Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -r40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78 -r382232d34811b2df367d7dab1e54cf7bcf12a347 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 40f52d3e415b6edcf47ec8970a9fdc7cf5a8fe78) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 382232d34811b2df367d7dab1e54cf7bcf12a347) @@ -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, 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 + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 3, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 4, 1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (999, 3, NULL, NULL, 5, 4, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine +