Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd) @@ -6,7 +6,7 @@ // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -86,7 +86,7 @@ /// Adds Hydra-Ring calculation input to the configuration. /// /// The calculation input to add to the configuration. - /// Thrown when with + /// Thrown when with /// the same has already been added. /// Thrown when is not unique. /// Thrown when @@ -132,9 +132,7 @@ ["ForelandModels"] = GetForelandModelsConfiguration(), ["Forelands"] = GetForelandsConfiguration(), ["ProbabilityAlternatives"] = new List(), - ["SetUpHeights"] = new List(), ["CalcWindDirections"] = new List(), - ["WaveReductions"] = new List(), ["Areas"] = GetAreasConfiguration(), ["Projects"] = GetProjectsConfiguration(), ["Breakwaters"] = GetBreakWatersConfiguration() Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd) @@ -6,7 +6,7 @@ // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -98,12 +98,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -179,12 +175,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -326,12 +318,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -473,12 +461,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -619,12 +603,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -777,12 +757,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -883,12 +859,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -991,12 +963,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1109,12 +1077,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1229,12 +1193,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1351,12 +1311,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1503,12 +1459,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1655,12 +1607,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1805,12 +1753,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -1955,12 +1899,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -2037,12 +1977,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -2186,12 +2122,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -2328,12 +2260,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r9339a780307cdb21ebe38cbd3aa8811e2c98d980 -r35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 9339a780307cdb21ebe38cbd3aa8811e2c98d980) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 35b72ea84a16e4c7b3fc44cbf34496bc32cc2fcd) @@ -6,7 +6,7 @@ // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -174,12 +174,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine + @@ -350,12 +346,8 @@ Environment.NewLine + "DELETE FROM [ProbabilityAlternatives];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [SetUpHeights];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [CalcWindDirections];" + Environment.NewLine + Environment.NewLine + - "DELETE FROM [WaveReductions];" + Environment.NewLine + - Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine + Environment.NewLine +