Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs =================================================================== diff -u -r2de3f6d885cc0599821fa59f191b5bd0892b66f6 -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 2de3f6d885cc0599821fa59f191b5bd0892b66f6) +++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -85,147 +85,150 @@ private void InitializeDefaultNumericsSettings() { + var numericsSettingForm = new NumericsSetting(1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25); + var numericsSettingDirs = new NumericsSetting(11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25); + defaultNumericsSettings = new Dictionary> { { HydraRingFailureMechanismType.AssessmentLevel, new Dictionary { { - 1, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 1, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WaveHeight, new Dictionary { { - 11, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 11, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WavePeakPeriod, new Dictionary { { - 14, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 14, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WaveSpectralPeriod, new Dictionary { { - 16, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 16, numericsSettingDirs } } }, { HydraRingFailureMechanismType.QVariant, new Dictionary { { - 5, new NumericsSetting(4, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 5, new NumericsSetting(4, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3000, 10000, 0.1, -6.0, 6.0, 25) } } }, { HydraRingFailureMechanismType.DikesOvertopping, new Dictionary { { - 102, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 102, numericsSettingDirs }, { - 103, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 103, numericsSettingDirs } } }, { HydraRingFailureMechanismType.DikesHeight, new Dictionary { { - 102, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 102, numericsSettingDirs }, { - 103, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 103, numericsSettingDirs } } }, { HydraRingFailureMechanismType.DikesPiping, new Dictionary { { - 311, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 311, numericsSettingDirs }, { - 313, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 313, numericsSettingDirs }, { - 314, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 314, numericsSettingDirs } } }, { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary { { - 421, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 421, numericsSettingDirs }, { - 422, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingDirs }, { - 423, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 423, numericsSettingDirs } } }, { HydraRingFailureMechanismType.StructuresClosure, new Dictionary { { - 422, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingForm }, { - 424, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 424, numericsSettingDirs }, { - 425, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 425, numericsSettingDirs }, { - 426, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 426, numericsSettingForm }, { - 427, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 427, numericsSettingForm } } }, { HydraRingFailureMechanismType.StructuresStructuralFailure, new Dictionary { { - 422, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingForm }, { - 424, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 424, numericsSettingDirs }, { - 425, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 425, numericsSettingDirs }, { - 430, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 430, numericsSettingDirs }, { - 431, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 431, numericsSettingForm }, { - 432, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 432, numericsSettingForm }, { - 433, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 433, numericsSettingForm }, { - 434, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 434, numericsSettingDirs }, { - 435, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 435, numericsSettingDirs } } } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs =================================================================== diff -u -r2de3f6d885cc0599821fa59f191b5bd0892b66f6 -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 2de3f6d885cc0599821fa59f191b5bd0892b66f6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -67,34 +67,35 @@ } [Test] - [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 1, 4)] - [TestCase(HydraRingFailureMechanismType.QVariant, 5, 4, 4)] - [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 1, 4)] - [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 1, 4)] - [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 103, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 102, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 103, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 311, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 313, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 314, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 421, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 422, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 423, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 424, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 425, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 422, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 424, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 425, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 430, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 431, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 432, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 1, 4)] + [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.QVariant, 5, 4, 4, 3000, 10000)] + [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 11, 4, 10000, 40000)] + [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)] + [TestCase(HydraRingFailureMechanismType.StructuresClosure, 424, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresClosure, 425, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 422, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 424, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 425, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 430, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 431, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 432, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 11, 4, 10000, 40000)] public void GetNumericsSetting_UnknownLocationId_ReturnsExpectedDefaultNumericsSetting( - HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, int expectedFormStartMethod) + HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, + int expectedFormStartMethod, int expectedDsMinNumberOfIterations, int expectedDsMaxNumberOfIterations) { // Setup using (NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider(completeDatabaseDataPath)) @@ -106,14 +107,14 @@ NumericsSetting numericsSetting = numericsSettings[subMechanismId]; Assert.AreEqual(expectedCalculationTechniqueId, numericsSetting.CalculationTechniqueId); Assert.AreEqual(expectedFormStartMethod, numericsSetting.FormStartMethod); - Assert.AreEqual(50, numericsSetting.FormNumberOfIterations); + Assert.AreEqual(150, numericsSetting.FormNumberOfIterations); Assert.AreEqual(0.15, numericsSetting.FormRelaxationFactor); - Assert.AreEqual(0.01, numericsSetting.FormEpsBeta); - Assert.AreEqual(0.01, numericsSetting.FormEpsHoh); - Assert.AreEqual(0.01, numericsSetting.FormEpsZFunc); + Assert.AreEqual(0.005, numericsSetting.FormEpsBeta); + Assert.AreEqual(0.005, numericsSetting.FormEpsHoh); + Assert.AreEqual(0.005, numericsSetting.FormEpsZFunc); Assert.AreEqual(2, numericsSetting.DsStartMethod); - Assert.AreEqual(10000, numericsSetting.DsMinNumberOfIterations); - Assert.AreEqual(20000, numericsSetting.DsMaxNumberOfIterations); + Assert.AreEqual(expectedDsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations); + Assert.AreEqual(expectedDsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations); Assert.AreEqual(0.1, numericsSetting.DsVarCoefficient); Assert.AreEqual(-6.0, numericsSetting.NiUMin); Assert.AreEqual(6.0, numericsSetting.NiUMax); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision bd73023d5f8926a411da214fb5ce522056a0e30a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -35,6 +35,7 @@ using Ringtoets.Common.IO.FileImporters; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Service; +using Ringtoets.HydraRing.Calculation.Calculator.Factory; using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; @@ -199,24 +200,31 @@ var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, testDataPath, assessmentSection.GrassCoverErosionInwards, assessmentSection); - // Call - Action call = () => activity.Run(); - - // Assert - TestHelper.AssertLogMessages(call, messages => + using (new HydraRingCalculatorFactoryConfig()) { - var msgs = messages.ToArray(); - Assert.AreEqual(7, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); - StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie:", msgs[3]); - StringAssert.StartsWith(string.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); - StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[5]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); - }); - Assert.AreEqual(ActivityState.Executed, activity.State); - mocks.VerifyAll(); // Expect no calls on the observer + var calculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + calculator.DikeHeight = double.NaN; + calculator.EndInFailure = true; + + // Call + Action call = () => activity.Run(); + + // Assert + TestHelper.AssertLogMessages(call, messages => + { + var msgs = messages.ToArray(); + Assert.AreEqual(7, msgs.Length); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]); + StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie:", msgs[3]); + StringAssert.StartsWith(string.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[4]); + StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie:", msgs[5]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[6]); + }); + Assert.AreEqual(ActivityState.Executed, activity.State); + mocks.VerifyAll(); // Expect no calls on the observer + } } [Test] @@ -458,8 +466,15 @@ var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, testDataPath, assessmentSection.GrassCoverErosionInwards, assessmentSection); - activity.Run(); + using (new HydraRingCalculatorFactoryConfig()) + { + var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + calculator.DikeHeight = double.NaN; + calculator.EndInFailure = true; + activity.Run(); + } + // Call activity.Finish(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/NumericsSettingsProvider.cs =================================================================== diff -u -r2de3f6d885cc0599821fa59f191b5bd0892b66f6 -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 2de3f6d885cc0599821fa59f191b5bd0892b66f6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/NumericsSettingsProvider.cs (.../NumericsSettingsProvider.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -69,147 +69,150 @@ private void InitializeDefaultNumericsSettings() { + var numericsSettingForm = new NumericsSetting(1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25); + var numericsSettingDirs = new NumericsSetting(11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25); + defaultNumericsSettings = new Dictionary> { { HydraRingFailureMechanismType.AssessmentLevel, new Dictionary { { - 1, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 1, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WaveHeight, new Dictionary { { - 11, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 11, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WavePeakPeriod, new Dictionary { { - 14, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 14, numericsSettingDirs } } }, { HydraRingFailureMechanismType.WaveSpectralPeriod, new Dictionary { { - 16, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 16, numericsSettingDirs } } }, { HydraRingFailureMechanismType.QVariant, new Dictionary { { - 5, new NumericsSetting(4, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 5, new NumericsSetting(4, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3000, 10000, 0.1, -6.0, 6.0, 25) } } }, { HydraRingFailureMechanismType.DikesOvertopping, new Dictionary { { - 102, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 102, numericsSettingDirs }, { - 103, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 103, numericsSettingDirs } } }, { HydraRingFailureMechanismType.DikesHeight, new Dictionary { { - 102, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 102, numericsSettingDirs }, { - 103, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 103, numericsSettingDirs } } }, { HydraRingFailureMechanismType.DikesPiping, new Dictionary { { - 311, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 311, numericsSettingDirs }, { - 313, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 313, numericsSettingDirs }, { - 314, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 314, numericsSettingDirs } } }, { HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary { { - 421, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 421, numericsSettingDirs }, { - 422, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingDirs }, { - 423, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 423, numericsSettingDirs } } }, { HydraRingFailureMechanismType.StructuresClosure, new Dictionary { { - 422, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingForm }, { - 424, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 424, numericsSettingDirs }, { - 425, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 425, numericsSettingDirs }, { - 426, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 426, numericsSettingForm }, { - 427, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 427, numericsSettingForm } } }, { HydraRingFailureMechanismType.StructuresStructuralFailure, new Dictionary { { - 422, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 422, numericsSettingForm }, { - 424, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 424, numericsSettingDirs }, { - 425, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 425, numericsSettingDirs }, { - 430, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 430, numericsSettingDirs }, { - 431, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 431, numericsSettingForm }, { - 432, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 432, numericsSettingForm }, { - 433, new NumericsSetting(1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 433, numericsSettingForm }, { - 434, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 434, numericsSettingDirs }, { - 435, new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 10000, 20000, 0.1, -6.0, 6.0, 25) + 435, numericsSettingDirs } } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r2de3f6d885cc0599821fa59f191b5bd0892b66f6 -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 2de3f6d885cc0599821fa59f191b5bd0892b66f6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -495,9 +495,9 @@ "INSERT INTO [DesignTables] VALUES (1, 110, 1, 1, 1, 60, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 110, 1, 1, 421, 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 (1, 110, 1, 1, 422, 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 (1, 110, 1, 1, 423, 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 (1, 110, 1, 1, 421, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 110, 1, 1, 422, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 110, 1, 1, 423, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 58, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -798,11 +798,11 @@ "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 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 (1, 111, 1, 1, 425, 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 (1, 111, 1, 1, 426, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 58, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -912,11 +912,11 @@ "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 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 (1, 111, 1, 1, 425, 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 (1, 111, 1, 1, 426, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 58, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -1028,11 +1028,11 @@ "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 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 (1, 111, 1, 1, 425, 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 (1, 111, 1, 1, 426, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 427, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 58, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -1153,15 +1153,15 @@ "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 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 (1, 112, 1, 1, 425, 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 (1, 112, 1, 1, 430, 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 (1, 112, 1, 1, 431, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 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 (1, 112, 1, 1, 435, 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 (1, 112, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 430, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 431, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 435, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 43, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -1300,15 +1300,15 @@ "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 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 (1, 112, 1, 1, 425, 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 (1, 112, 1, 1, 430, 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 (1, 112, 1, 1, 431, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 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 (1, 112, 1, 1, 435, 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 (1, 112, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 430, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 431, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 435, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 43, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -1447,15 +1447,15 @@ "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 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 (1, 112, 1, 1, 425, 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 (1, 112, 1, 1, 430, 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 (1, 112, 1, 1, 431, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 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 (1, 112, 1, 1, 435, 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 (1, 112, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 430, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 431, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 435, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 43, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + @@ -1594,15 +1594,15 @@ "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 422, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 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 (1, 112, 1, 1, 425, 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 (1, 112, 1, 1, 430, 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 (1, 112, 1, 1, 431, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 10000, 20000, 0.1, -6, 6, 25);" + Environment.NewLine + - "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 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 (1, 112, 1, 1, 435, 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 (1, 112, 1, 1, 422, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 424, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 425, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 430, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 431, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 432, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 433, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + + "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 435, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 1, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 43, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs =================================================================== diff -u -r2de3f6d885cc0599821fa59f191b5bd0892b66f6 -r2d900083e4f3a92af1acc0584aa3e2bc9155b8cb --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 2de3f6d885cc0599821fa59f191b5bd0892b66f6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 2d900083e4f3a92af1acc0584aa3e2bc9155b8cb) @@ -57,36 +57,35 @@ } [Test] - [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 1, 4)] - [TestCase(HydraRingFailureMechanismType.QVariant, 5, 4, 4)] - [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 1, 4)] - [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 1, 4)] - [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 103, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 102, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, 103, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 311, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 313, 1, 4)] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 314, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 421, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 422, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 423, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 422, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 424, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 425, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 426, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 427, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 422, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 424, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 425, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 430, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 431, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 432, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 1, 4)] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 1, 4)] - public void GetNumericsSetting_UnknownRingId_ReturnsExpectedDefaultNumericsSetting(HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, int expectedFormStartMethod) + [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.QVariant, 5, 4, 4, 3000, 10000)] + [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 14, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 16, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 102, 11, 4, 10000, 40000)] + [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)] + [TestCase(HydraRingFailureMechanismType.StructuresClosure, 424, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresClosure, 425, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 422, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 424, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 425, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 430, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 431, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 432, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 11, 4, 10000, 40000)] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 11, 4, 10000, 40000)] + public void GetNumericsSetting_UnknownLocationId_ReturnsExpectedDefaultNumericsSetting( + HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, + int expectedFormStartMethod, int expectedDsMinNumberOfIterations, int expectedDsMaxNumberOfIterations) { // Setup NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider(); @@ -97,14 +96,14 @@ // Assert Assert.AreEqual(expectedCalculationTechniqueId, numericsSetting.CalculationTechniqueId); Assert.AreEqual(expectedFormStartMethod, numericsSetting.FormStartMethod); - Assert.AreEqual(50, numericsSetting.FormNumberOfIterations); + Assert.AreEqual(150, numericsSetting.FormNumberOfIterations); Assert.AreEqual(0.15, numericsSetting.FormRelaxationFactor); - Assert.AreEqual(0.01, numericsSetting.FormEpsBeta); - Assert.AreEqual(0.01, numericsSetting.FormEpsHoh); - Assert.AreEqual(0.01, numericsSetting.FormEpsZFunc); + Assert.AreEqual(0.005, numericsSetting.FormEpsBeta); + Assert.AreEqual(0.005, numericsSetting.FormEpsHoh); + Assert.AreEqual(0.005, numericsSetting.FormEpsZFunc); Assert.AreEqual(2, numericsSetting.DsStartMethod); - Assert.AreEqual(10000, numericsSetting.DsMinNumberOfIterations); - Assert.AreEqual(20000, numericsSetting.DsMaxNumberOfIterations); + Assert.AreEqual(expectedDsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations); + Assert.AreEqual(expectedDsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations); Assert.AreEqual(0.1, numericsSetting.DsVarCoefficient); Assert.AreEqual(-6.0, numericsSetting.NiUMin); Assert.AreEqual(6.0, numericsSetting.NiUMax);