Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -rf677c258a750c0212a03a81cbdab50ae9d67c05f -re975019e41effd18cbfd6386bb891d0cf9735893 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f677c258a750c0212a03a81cbdab50ae9d67c05f) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision e975019e41effd18cbfd6386bb891d0cf9735893) @@ -58,7 +58,7 @@ 1, new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25) } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -68,7 +68,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 9, 26, 0, 0, 0, 0, 1.1, 2.2, 3.71901648545571);" + Environment.NewLine + @@ -139,7 +139,7 @@ 11, new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25) } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -149,7 +149,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 11, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 11, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 11, 1, 1, 9, 28, 0, 0, 0, 0, 1.1, 2.2, 3.71901648545571);" + Environment.NewLine + @@ -272,7 +272,7 @@ 103, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -282,7 +282,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 1, 1, 0, 0, 0, 0, 17.17, 18.18, 0);" + Environment.NewLine + @@ -419,7 +419,7 @@ 103, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -429,7 +429,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 9, 1, 0, 0, 0, 0, 16.16, 17.17, 3.09023230616781);" + Environment.NewLine + @@ -565,7 +565,7 @@ 103, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -575,7 +575,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 101, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 2, 17, 0, 0, 0, 0, 15.15, 16.16, 3.09023230616781);" + Environment.NewLine + @@ -719,7 +719,7 @@ 423, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -729,7 +729,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 110, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 110, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 110, 1, 1, 1, 60, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -836,7 +836,7 @@ 5, new NumericsSetting(4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25) } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -846,7 +846,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 56.23, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 3, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 3, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 7.7, 8.8, 3.71901648545571);" + Environment.NewLine + @@ -943,7 +943,7 @@ 5, new NumericsSetting(4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25) } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -953,7 +953,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 86.48, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 3, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 3, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 8.8, 9.9, 3.71901648545571);" + Environment.NewLine + @@ -1045,7 +1045,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresClosureNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1055,7 +1055,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1164,7 +1164,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresClosureNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1174,7 +1174,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1284,7 +1284,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresClosureNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1294,7 +1294,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 111, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 111, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1414,7 +1414,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresStabilityPointNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1424,7 +1424,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1566,7 +1566,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresStabilityPointNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1576,7 +1576,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1717,7 +1717,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresStabilityPointNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1727,7 +1727,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1867,7 +1867,7 @@ { DesignTablesSetting = new DesignTablesSetting(0, 0), NumericsSettings = CreateStructuresStabilityPointNumericsSettings(), - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -1877,7 +1877,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 112, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 112, 1, 1, 1, 58, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine + @@ -1997,7 +1997,7 @@ 6, new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25) } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -2007,7 +2007,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 2, 26, 0, 0, 0, 0, 1.1, 2.2, 3.71901648545571);" + Environment.NewLine + @@ -2128,7 +2128,7 @@ 314, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -2138,7 +2138,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 1.1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 103, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 103, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 103, 1, 1, 1, 58, 0, 0, 0, 0, 17.17, 18.18, 0);" + Environment.NewLine + @@ -2270,7 +2270,7 @@ 314, numericsSetting } }, - TimeIntegrationSetting = new TimeIntegrationSetting(1) + TimeIntegrationSetting = new TimeIntegrationSetting(1, 5, 0.7) }); string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + @@ -2280,7 +2280,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 1.1);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + - "INSERT INTO [SectionCalculationSchemes] VALUES (1, 103, 1, 3, 1);" + Environment.NewLine + + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 103, 1, 5, 0.7);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + "INSERT INTO [DesignTables] VALUES (1, 103, 1, 1, 1, 58, 0, 0, 0, 0, 17.17, 18.18, 0);" + Environment.NewLine +