Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs
===================================================================
diff -u -rba15b57903cc8a77a35dcf0efa392b5aa7a5e70e -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision ba15b57903cc8a77a35dcf0efa392b5aa7a5e70e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -181,11 +181,11 @@
/// Read a time integration setting for a given location and .
///
/// The id of a hydraulic boundary location.
- /// The type of the calculation to obtain the for.
- /// A new containing values read from the database.
+ /// The type of the calculation to obtain the for.
+ /// A new containing values read from the database.
/// Thrown when is not a valid
/// value.
- public HydraulicModelsSetting ReadTimeIntegrationSetting(long locationId, HydraRingFailureMechanismType calculationType)
+ public TimeIntegrationSetting ReadTimeIntegrationSetting(long locationId, HydraRingFailureMechanismType calculationType)
{
if (!Enum.IsDefined(calculationType.GetType(), calculationType))
{
@@ -195,8 +195,7 @@
var reader = CreateTimeIntegrationDataReader(locationId, calculationType);
if (MoveNext(reader))
{
- return new HydraulicModelsSetting(
- Convert.ToInt32(reader[timeIntegrationSchemeIdColumn]));
+ return new TimeIntegrationSetting(Convert.ToInt32(reader[timeIntegrationSchemeIdColumn]));
}
return null;
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicModelsSettingsProvider.cs
===================================================================
diff -u -rba15b57903cc8a77a35dcf0efa392b5aa7a5e70e -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicModelsSettingsProvider.cs (.../HydraulicModelsSettingsProvider.cs) (revision ba15b57903cc8a77a35dcf0efa392b5aa7a5e70e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraulicModelsSettingsProvider.cs (.../HydraulicModelsSettingsProvider.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -27,7 +27,7 @@
namespace Ringtoets.Common.IO.HydraRing
{
///
- /// Provider of .
+ /// Provider of .
///
public class HydraulicModelsSettingsProvider : IDisposable
{
@@ -50,15 +50,15 @@
}
///
- /// Gets based on the provided failure mechanism type and ring id.
+ /// Gets based on the provided failure mechanism type and location id.
///
- /// The location id to obtain the for.
- /// The to obtain the for.
- /// The corresponding to the provided failure mechanism type and ring id.
- public HydraulicModelsSetting GetHydraulicModelsSetting(long locationId, HydraRingFailureMechanismType failureMechanismType)
+ /// The location id to obtain the for.
+ /// The to obtain the for.
+ /// The corresponding to the provided failure mechanism type and location id.
+ public TimeIntegrationSetting GetHydraulicModelsSetting(long locationId, HydraRingFailureMechanismType failureMechanismType)
{
return modelSettingsReader.ReadTimeIntegrationSetting(locationId, failureMechanismType) ??
- new HydraulicModelsSetting(1);
+ new TimeIntegrationSetting(1);
}
public void Dispose()
Index: Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs
===================================================================
diff -u -r02d0e67121f748ae6d69ab9f68643d2f5e62f800 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs (.../HydraRingSettingsDatabaseHelper.cs) (revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/HydraRingSettingsDatabaseHelper.cs (.../HydraRingSettingsDatabaseHelper.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -28,7 +28,7 @@
namespace Ringtoets.Common.Service
{
///
- /// Helper class for providing a convinient method for obtaining and updating Hydra-Ring settings per location from the settings database
+ /// Helper class for providing a convenient method for obtaining and updating Hydra-Ring settings per location from the settings database
/// based on .
///
public static class HydraRingSettingsDatabaseHelper
@@ -69,7 +69,7 @@
}
using (var modelsSettingsProvider = new HydraulicModelsSettingsProvider(settingsDatabaseFileName))
{
- calculationInput.HydraulicModelsSetting = modelsSettingsProvider.GetHydraulicModelsSetting(
+ calculationInput.TimeIntegrationSetting = modelsSettingsProvider.GetHydraulicModelsSetting(
locationId,
calculationInput.FailureMechanismType);
}
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs
===================================================================
diff -u -r81395449fadcf242825e8381c6f67f41f76cf5a5 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision 81395449fadcf242825e8381c6f67f41f76cf5a5)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -141,14 +141,14 @@
[TestCase(700131, 3, 1)]
[TestCase(700134, 2, 1)]
[TestCase(700135, 4, 1)]
- public void ReadTimeIntegrationSetting_ValidLocationIdAndFailureMechanismType_DesignTableSettingWithExpectedValues(
+ public void ReadTimeIntegrationSetting_ValidLocationIdAndFailureMechanismType_TimeIntegrationSettingWithExpectedValues(
long locationId, HydraRingFailureMechanismType calculationType, int expectedTimeIntegrationScheme)
{
// Setup
using (var reader = new HydraRingSettingsDatabaseReader(completeDatabaseDataPath))
{
// Call
- HydraulicModelsSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
+ TimeIntegrationSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
// Assert
Assert.AreEqual(expectedTimeIntegrationScheme, setting.TimeIntegrationSchemeId);
@@ -164,7 +164,7 @@
using (var reader = new HydraRingSettingsDatabaseReader(completeDatabaseDataPath))
{
// Call
- HydraulicModelsSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
+ TimeIntegrationSetting setting = reader.ReadTimeIntegrationSetting(locationId, calculationType);
// Assert
Assert.IsNull(setting);
@@ -178,7 +178,7 @@
using (var reader = new HydraRingSettingsDatabaseReader(emptyDatabaseDataPath))
{
// Call
- HydraulicModelsSetting setting = reader.ReadTimeIntegrationSetting(700131, 0);
+ TimeIntegrationSetting setting = reader.ReadTimeIntegrationSetting(700131, 0);
// Assert
Assert.IsNull(setting);
@@ -189,7 +189,7 @@
[TestCase(700132, 11, 16, 1, 4, 50, 0.15, 0.05, 0.01, 0.01, 0, 2, 20000, 100000.0, 0.1, -6.0, 6)]
[TestCase(700135, 3, 5, 4, 1, 50, 0.15, 0.05, 0.01, 0.01, 0, 2, 10000, 10000.0, 0.1, -6.0, 6)]
[TestCase(700135, 101, 102, 1, 4, 50, 0.15, 0.05, 0.01, 0.01, 0, 2, 20000, 100000.0, 0.1, -6.0, 6)]
- public void ReadNumericsSetting_ValidLocationIdAndFailureMechanismType_DesignTableSettingWithExpectedValues(
+ public void ReadNumericsSetting_ValidLocationIdAndFailureMechanismType_NumericsSettingWithExpectedValues(
long locationId,
int mechanismId,
int subMechanismId,
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicModelsSettingsProviderTest.cs
===================================================================
diff -u -r16f6bd5805e77d549cded91fc48fff35ffbdec00 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicModelsSettingsProviderTest.cs (.../HydraulicModelsSettingsProviderTest.cs) (revision 16f6bd5805e77d549cded91fc48fff35ffbdec00)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicModelsSettingsProviderTest.cs (.../HydraulicModelsSettingsProviderTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -74,17 +74,17 @@
[TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 700134, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresClosure, 700134, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 700134, 1)]
- public void GetHydraulicModelsSetting_KnownLocationIdAndFailureMechanismType_ReturnsExpectedHydraulicModelsSetting(
+ public void GetHydraulicModelsSetting_KnownLocationIdAndFailureMechanismType_ReturnsExpectedTimeIntegrationSetting(
HydraRingFailureMechanismType failureMechanismType, long locationId, int expectedTimeIntegrationSchemeId)
{
// Setup
using (HydraulicModelsSettingsProvider hydraulicModelsSettingsProvider = new HydraulicModelsSettingsProvider(completeDatabaseDataPath))
{
// Call
- HydraulicModelsSetting hydraulicModelsSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(locationId, failureMechanismType);
+ TimeIntegrationSetting timeIntegrationSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(locationId, failureMechanismType);
// Assert
- Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntegrationSchemeId);
+ Assert.AreEqual(expectedTimeIntegrationSchemeId, timeIntegrationSetting.TimeIntegrationSchemeId);
}
}
@@ -100,17 +100,17 @@
[TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresClosure, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 1)]
- public void GetHydraulicModelsSetting_UnknownLocationId_ReturnsDefaultHydraulicModelsSetting(
+ public void GetHydraulicModelsSetting_UnknownLocationId_ReturnsDefaultTimeIntegrationSetting(
HydraRingFailureMechanismType failureMechanismType, int expectedTimeIntegrationSchemeId)
{
// Setup
using (HydraulicModelsSettingsProvider hydraulicModelsSettingsProvider = new HydraulicModelsSettingsProvider(completeDatabaseDataPath))
{
// Call
- HydraulicModelsSetting hydraulicModelsSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(-1, failureMechanismType);
+ TimeIntegrationSetting timeIntegrationSetting = hydraulicModelsSettingsProvider.GetHydraulicModelsSetting(-1, failureMechanismType);
// Assert
- Assert.AreEqual(expectedTimeIntegrationSchemeId, hydraulicModelsSetting.TimeIntegrationSchemeId);
+ Assert.AreEqual(expectedTimeIntegrationSchemeId, timeIntegrationSetting.TimeIntegrationSchemeId);
}
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs
===================================================================
diff -u -ra91af2b4cf186d4c53e839f6ce44b2ffc2895831 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs (.../HydraRingSettingsDatabaseHelperTest.cs) (revision a91af2b4cf186d4c53e839f6ce44b2ffc2895831)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs (.../HydraRingSettingsDatabaseHelperTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -66,7 +66,7 @@
// Assert
Assert.NotNull(input.DesignTablesSetting);
Assert.NotNull(input.NumericsSettings);
- Assert.NotNull(input.HydraulicModelsSetting);
+ Assert.NotNull(input.TimeIntegrationSetting);
}
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs
===================================================================
diff -u -r16f6bd5805e77d549cded91fc48fff35ffbdec00 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 16f6bd5805e77d549cded91fc48fff35ffbdec00)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -51,9 +51,9 @@
public Dictionary NumericsSettings { get; set; }
///
- /// Gets or sets the hydraulic models settings.
+ /// Gets or sets the time integration settings.
///
- public HydraulicModelsSetting HydraulicModelsSetting { get; set; }
+ public TimeIntegrationSetting TimeIntegrationSetting { get; set; }
///
/// Gets the .
Fisheye: Tag 82759d2322968e2b5733402ea45581e69885894d refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/HydraulicModelsSetting.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/TimeIntegrationSetting.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/TimeIntegrationSetting.cs (revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/TimeIntegrationSetting.cs (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// 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
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.Data.Settings
+{
+ ///
+ /// Container for time integration settings.
+ ///
+ public class TimeIntegrationSetting
+ {
+ private readonly int timeIntegrationSchemeId;
+
+ ///
+ /// Creates a new instance of .
+ ///
+ /// The time integration scheme id to use in a calculation.
+ public TimeIntegrationSetting(int timeIntegrationSchemeId)
+ {
+ this.timeIntegrationSchemeId = timeIntegrationSchemeId;
+ }
+
+ ///
+ /// Gets the time integration scheme id to use in a calculation.
+ ///
+ public int TimeIntegrationSchemeId
+ {
+ get
+ {
+ return timeIntegrationSchemeId;
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs
===================================================================
diff -u -rd25cad05cb14a4abe11fbcb9e31d5c74bb544b70 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs (.../HydraulicModelsSettingsCsvReader.cs) (revision d25cad05cb14a4abe11fbcb9e31d5c74bb544b70)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelsSettingsCsvReader.cs (.../HydraulicModelsSettingsCsvReader.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -27,25 +27,25 @@
namespace Ringtoets.HydraRing.Calculation.IO
{
///
- /// The reader for in csv format.
+ /// The reader for in csv format.
///
- internal class HydraulicModelsSettingsCsvReader : HydraRingSettingsVariableCsvReader>>
+ internal class HydraulicModelsSettingsCsvReader : HydraRingSettingsVariableCsvReader>>
{
///
/// Creates a new instance of .
///
/// The file contents to read.
/// Thrown when is not set.
public HydraulicModelsSettingsCsvReader(string fileContents)
- : base(fileContents, new Dictionary>()) {}
+ : base(fileContents, new Dictionary>()) {}
protected override void CreateSetting(IList line)
{
HydraRingFailureMechanismType failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[(int) HydraulicModelsSettingsColumns.Variable]));
if (!Settings.ContainsKey(failureMechanismType))
{
- Settings.Add(failureMechanismType, new Dictionary());
+ Settings.Add(failureMechanismType, new Dictionary());
}
string ringId = GetRingId(line);
@@ -60,9 +60,9 @@
return GetStringValueFromElement(line[(int) HydraulicModelsSettingsColumns.RingId]);
}
- private HydraulicModelsSetting GetHydraulicModelsSetting(IList line)
+ private TimeIntegrationSetting GetHydraulicModelsSetting(IList line)
{
- return new HydraulicModelsSetting(GetIntValueFromElement(line[(int) HydraulicModelsSettingsColumns.TimeIntegrationSchemeId]));
+ return new TimeIntegrationSetting(GetIntValueFromElement(line[(int) HydraulicModelsSettingsColumns.TimeIntegrationSchemeId]));
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r0ef0c3d0b6d374da9612e2060fdbfbb7bb6cca84 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 0ef0c3d0b6d374da9612e2060fdbfbb7bb6cca84)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -92,7 +92,7 @@
-
+
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -241,7 +241,7 @@
foreach (HydraRingCalculationInput hydraRingCalculationInput in hydraRingInputs)
{
FailureMechanismDefaults failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType);
- HydraulicModelsSetting hydraulicModelSetting = hydraRingCalculationInput.HydraulicModelsSetting;
+ TimeIntegrationSetting timeIntegrationSetting = hydraRingCalculationInput.TimeIntegrationSetting;
orderedDictionaries.Add(new OrderedDictionary
{
@@ -252,7 +252,7 @@
"MechanismId", failureMechanismDefaults.MechanismId
},
{
- "TimeIntegrationSchemeID", hydraulicModelSetting.TimeIntegrationSchemeId
+ "TimeIntegrationSchemeID", timeIntegrationSetting.TimeIntegrationSchemeId
}
});
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs
===================================================================
diff -u -r2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -109,7 +109,7 @@
1, new NumericsSetting(11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25)
}
};
- HydraulicModelsSetting = new HydraulicModelsSetting(1);
+ TimeIntegrationSetting = new TimeIntegrationSetting(1);
}
public override HydraRingFailureMechanismType FailureMechanismType
Fisheye: Tag 82759d2322968e2b5733402ea45581e69885894d refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/HydraulicModelsSettingTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/TimeIntegrationSettingTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/TimeIntegrationSettingTest.cs (revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/TimeIntegrationSettingTest.cs (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// 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
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data.Settings;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Data.Settings
+{
+ [TestFixture]
+ public class TimeIntegrationSettingTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Setup
+ const int timeIntegrationSchemeId = 1;
+
+ // Call
+ var timeIntegrationSetting = new TimeIntegrationSetting(timeIntegrationSchemeId);
+
+ // Assert
+ Assert.AreEqual(timeIntegrationSchemeId, timeIntegrationSetting.TimeIntegrationSchemeId);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs
===================================================================
diff -u -rf744bb990260662f885d34811a1ea042dae18550 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs (.../HydraulicModelsSettingsCsvReaderTest.cs) (revision f744bb990260662f885d34811a1ea042dae18550)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraulicModelsSettingsCsvReaderTest.cs (.../HydraulicModelsSettingsCsvReaderTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -42,7 +42,7 @@
HydraulicModelsSettingsCsvReader reader = new HydraulicModelsSettingsCsvReader("path.csv");
// Assert
- Assert.IsInstanceOf>>>(reader);
+ Assert.IsInstanceOf>>>(reader);
}
[Test]
@@ -66,113 +66,113 @@
string fileContents = streamReader.ReadToEnd();
var reader = new HydraulicModelsSettingsCsvReader(fileContents);
- IDictionary> expectedDictionary = GetDictionary();
+ IDictionary> expectedDictionary = GetDictionary();
// Call
- IDictionary> settings = reader.ReadSettings();
+ IDictionary> settings = reader.ReadSettings();
// Assert
Assert.AreEqual(10, settings.Count);
- foreach (KeyValuePair> expectedMechanism in expectedDictionary)
+ foreach (KeyValuePair> expectedMechanism in expectedDictionary)
{
Assert.IsTrue(settings.ContainsKey(expectedMechanism.Key));
- Assert.IsInstanceOf>(settings[expectedMechanism.Key]);
+ Assert.IsInstanceOf>(settings[expectedMechanism.Key]);
- foreach (KeyValuePair expectedDesignTablesSetting in expectedMechanism.Value)
+ foreach (KeyValuePair expectedDesignTablesSetting in expectedMechanism.Value)
{
Assert.IsTrue(settings[expectedMechanism.Key].ContainsKey(expectedDesignTablesSetting.Key));
- Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedDesignTablesSetting.Key]);
+ Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedDesignTablesSetting.Key]);
- HydraulicModelsSetting setting = settings[expectedMechanism.Key][expectedDesignTablesSetting.Key];
+ TimeIntegrationSetting setting = settings[expectedMechanism.Key][expectedDesignTablesSetting.Key];
Assert.AreEqual(expectedDesignTablesSetting.Value.TimeIntegrationSchemeId, setting.TimeIntegrationSchemeId);
}
}
}
}
- private static IDictionary> GetDictionary()
+ private static IDictionary> GetDictionary()
{
- return new Dictionary>
+ return new Dictionary>
{
{
- HydraRingFailureMechanismType.AssessmentLevel, new Dictionary
+ HydraRingFailureMechanismType.AssessmentLevel, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.QVariant, new Dictionary
+ HydraRingFailureMechanismType.QVariant, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.WaveHeight, new Dictionary
+ HydraRingFailureMechanismType.WaveHeight, new Dictionary
{
{
- "205", new HydraulicModelsSetting(2)
+ "205", new TimeIntegrationSetting(2)
}
}
},
{
- HydraRingFailureMechanismType.WavePeakPeriod, new Dictionary
+ HydraRingFailureMechanismType.WavePeakPeriod, new Dictionary
{
{
- "205", new HydraulicModelsSetting(3)
+ "205", new TimeIntegrationSetting(3)
}
}
},
{
- HydraRingFailureMechanismType.WaveSpectralPeriod, new Dictionary
+ HydraRingFailureMechanismType.WaveSpectralPeriod, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.DikesHeight, new Dictionary
+ HydraRingFailureMechanismType.DikesHeight, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.DikesOvertopping, new Dictionary
+ HydraRingFailureMechanismType.DikesOvertopping, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary
+ HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary
{
{
- "205", new HydraulicModelsSetting(1)
+ "205", new TimeIntegrationSetting(1)
}
}
},
{
- HydraRingFailureMechanismType.StructuresClosure, new Dictionary
+ HydraRingFailureMechanismType.StructuresClosure, new Dictionary
{
{
- "205", new HydraulicModelsSetting(2)
+ "205", new TimeIntegrationSetting(2)
}
}
},
{
- HydraRingFailureMechanismType.StructuresStructuralFailure, new Dictionary
+ HydraRingFailureMechanismType.StructuresStructuralFailure, new Dictionary
{
{
- "205", new HydraulicModelsSetting(2)
+ "205", new TimeIntegrationSetting(2)
}
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -55,7 +55,7 @@
1, new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -140,7 +140,7 @@
11, new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -265,7 +265,7 @@
103, numericsSetting
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -403,7 +403,7 @@
103, numericsSetting
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -560,7 +560,7 @@
423, numericsSetting
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript =
"DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -681,7 +681,7 @@
5, new NumericsSetting(4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -792,7 +792,7 @@
5, new NumericsSetting(4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -897,7 +897,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresClosureNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1019,7 +1019,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresClosureNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1143,7 +1143,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresClosureNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1276,7 +1276,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresStabilityPointNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1431,7 +1431,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresStabilityPointNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1586,7 +1586,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresStabilityPointNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -1741,7 +1741,7 @@
{
DesignTablesSetting = new DesignTablesSetting(0, 0),
NumericsSettings = CreateStructuresStabilityPointNumericsSettings(),
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r0ef0c3d0b6d374da9612e2060fdbfbb7bb6cca84 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 0ef0c3d0b6d374da9612e2060fdbfbb7bb6cca84)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -91,7 +91,7 @@
-
+
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -r2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641 -r82759d2322968e2b5733402ea45581e69885894d
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 2d7e8d4b70e86adab6fb0f5e2ddce3a6709df641)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 82759d2322968e2b5733402ea45581e69885894d)
@@ -100,7 +100,7 @@
1, new NumericsSetting(8, 9, 10, 11.11, 12.12, 13.13, 14.14, 15, 16, 17, 18.18, 19.19, 20.20, 21)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(3)
+ TimeIntegrationSetting = new TimeIntegrationSetting(3)
});
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
@@ -199,7 +199,7 @@
1, new NumericsSetting(8, 9, 10, 11.11, 12.12, 13.13, 14.14, 15, 16, 17, 18.18, 19.19, 20.20, 21)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(2)
+ TimeIntegrationSetting = new TimeIntegrationSetting(2)
});
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(2, 700005)
{
@@ -210,7 +210,7 @@
1, new NumericsSetting(108, 109, 110, 111.11, 112.12, 113.13, 114.14, 115, 116, 117, 118.18, 119.19, 120.20, 121)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(3)
+ TimeIntegrationSetting = new TimeIntegrationSetting(3)
});
hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(3, 700006)
{
@@ -221,7 +221,7 @@
1, new NumericsSetting(208, 209, 210, 211.11, 212.12, 213.13, 214.14, 215, 216, 217, 218.18, 219.19, 220.20, 221)
}
},
- HydraulicModelsSetting = new HydraulicModelsSetting(1)
+ TimeIntegrationSetting = new TimeIntegrationSetting(1)
});
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +