Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs
===================================================================
diff -u -re314d4ad7576e3b3cd70600f6d93ff89462568c8 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e314d4ad7576e3b3cd70600f6d93ff89462568c8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -82,36 +82,6 @@
}
///
- /// Looks up a localized string similar to "TrajectID";"Variabele";"Min";"Max"
- ///"1-1";"Toetspeil";3.83;5.83
- ///"1-1";"Hs";1.09;3.09
- ///"1-1";"HBN";6.22;9.82
- ///"1-1";"Q";5.00;50.00
- ///"1-2";"Toetspeil";3.83;5.83
- ///"1-2";"Hs";1.09;3.09
- ///"1-2";"HBN";6.22;9.82
- ///"1-2";"Q";5.00;20.00
- ///"2-1";"Toetspeil";3.51;5.51
- ///"2-1";"Hs";1.02;3.02
- ///"2-1";"HBN";6.09;9.77
- ///"2-1";"Q";5.00;50.00
- ///"2-2";"Toetspeil";3.51;5.51
- ///"2-2";"Hs";1.02;3.02
- ///"2-2";"HBN";6.09;9.77
- ///"2-2";"Q";5.00;20.00
- ///"3-1";"Toetspeil";3.34;5.34
- ///"3-1";"Hs";0.86;2.86
- ///"3-1";"HBN";5.31;7.98
- ///"3-1";"Q";5.00;50.00
- ///"3-2";"Toetspeil [rest of string was truncated]";.
- ///
- internal static string DesignTablesSettings {
- get {
- return ResourceManager.GetString("DesignTablesSettings", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to "TrajectID";"MechanismID";"SubMechanismID";"Rekenmethode";"FORM_StartMethod";"FORM_NrIterations";"FORM_RelaxationFactor";"FORM_EpsBeta";"FORM_EpsHOH";"FORM_EpsZFunc";"Ds_StartMethod";"Ds_Min";"Ds_Max";"Ds_VarCoefficient";"NI_UMin";"NI_Umax";"NI_NumberSteps"
///"205";1;1;1;4;50;0.15;0.01;0.01;0.01;2;20000;100000;0.1;-6;6;25
///"205";11;11;1;4;50;0.15;0.01;0.01;0.01;2;20000;100000;0.1;-6;6;25
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx
===================================================================
diff -u -re314d4ad7576e3b3cd70600f6d93ff89462568c8 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision e314d4ad7576e3b3cd70600f6d93ff89462568c8)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Properties/Resources.resx (.../Resources.resx) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -121,9 +121,6 @@
Kan het Hydra-Ring uitvoerbestand {0} noch het logbestand {1} lezen uit de map {2}.
-
- ..\Resources\DesignTables.csv;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
..\resources\defaults_numerics.csv;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
Fisheye: Tag c6c7b460e6385d89b1b372dcbe9c307bef6c59fb refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag c6c7b460e6385d89b1b372dcbe9c307bef6c59fb refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Resources/DesignTables.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r5d993779a41af229dac2d6defb21ce2b775e73fd -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 5d993779a41af229dac2d6defb21ce2b775e73fd)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -128,7 +128,6 @@
-
@@ -165,7 +164,6 @@
-
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r16f6bd5805e77d549cded91fc48fff35ffbdec00 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 16f6bd5805e77d549cded91fc48fff35ffbdec00)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -68,7 +68,6 @@
private readonly VariableDefaultsProvider variableDefaultsProvider = new VariableDefaultsProvider();
private readonly NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider();
- private readonly DesignTablesSettingsProvider designTablesSettingsProvider = new DesignTablesSettingsProvider();
private readonly HydraRingUncertaintiesType uncertaintiesType;
@@ -244,7 +243,7 @@
foreach (HydraRingCalculationInput hydraRingCalculationInput in hydraRingInputs)
{
FailureMechanismDefaults failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType);
- DesignTablesSetting designTablesSetting = designTablesSettingsProvider.GetDesignTablesSetting(hydraRingCalculationInput.FailureMechanismType, ringId);
+ DesignTablesSetting designTablesSetting = hydraRingCalculationInput.DesignTablesSetting;
orderedDictionaries.Add(new OrderedDictionary
{
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs
===================================================================
diff -u -re4565100f14feece0bea5bc7acf9eef9acf7a8e6 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision e4565100f14feece0bea5bc7acf9eef9acf7a8e6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -25,6 +25,7 @@
using Ringtoets.HydraRing.Calculation.Calculator;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input;
+using Ringtoets.HydraRing.Calculation.Data.Settings;
using Ringtoets.HydraRing.Calculation.Parsers;
namespace Ringtoets.HydraRing.Calculation.Test.Calculator
@@ -99,7 +100,10 @@
{
private readonly HydraRingSection section = new HydraRingSection(12, 12, 12);
- public TestHydraRingCalculationInput() : base(12) {}
+ public TestHydraRingCalculationInput() : base(12)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0);
+ }
public override HydraRingFailureMechanismType FailureMechanismType
{
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -rb1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision b1f2e25e9f7b32c9bfa81a17d649cfe967e52c4e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -30,6 +30,7 @@
using Ringtoets.HydraRing.Calculation.Data.Input.Overtopping;
using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
+using Ringtoets.HydraRing.Calculation.Data.Settings;
using Ringtoets.HydraRing.Calculation.Services;
namespace Ringtoets.HydraRing.Calculation.Test.Integration
@@ -45,7 +46,10 @@
// Setup
var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
- hydraRingConfigurationService.AddHydraRingCalculationInput(new AssessmentLevelCalculationInput(1, 700004, 10000));
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new AssessmentLevelCalculationInput(1, 700004, 10000)
+ {
+ DesignTablesSetting = new DesignTablesSetting(1.1, 2.2)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -54,7 +58,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 [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 9, 26, 0, 0, 0, 0, 2.18, 4.18, 3.71901648545568);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 9, 26, 0, 0, 0, 0, 1.1, 2.2, 3.71901648545568);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 1, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -117,7 +121,10 @@
// Setup
var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All);
- hydraRingConfigurationService.AddHydraRingCalculationInput(new WaveHeightCalculationInput(1, 700004, 10000));
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new WaveHeightCalculationInput(1, 700004, 10000)
+ {
+ DesignTablesSetting = new DesignTablesSetting(1.1, 2.2)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -126,7 +133,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 [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 11, 1, 1, 9, 28, 0, 0, 0, 0, 0.11, 2.11, 3.71901648545568);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 11, 1, 1, 9, 28, 0, 0, 0, 0, 1.1, 2.2, 3.71901648545568);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 11, 1, 1, 11, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -225,7 +232,10 @@
modelFactorOvertopping,
criticalOvertoppingMean, criticalOvertoppingStandardDeviation,
modelFactorFrunupMean, modelFactorFrunupStandardDeviation,
- exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation));
+ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation)
+ {
+ DesignTablesSetting = new DesignTablesSetting(17.17, 18.18)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -234,7 +244,7 @@
"INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 2.2);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 1, 1, 0, 0, 0, 0, 17.17, 18.18, 0);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -346,7 +356,10 @@
modelFactorOvertopping,
criticalOvertoppingMean, criticalOvertoppingStandardDeviation,
modelFactorFrunupMean, modelFactorFrunupStandardDeviation,
- exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation));
+ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation)
+ {
+ DesignTablesSetting = new DesignTablesSetting(16.16, 17.17)
+ });
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -355,7 +368,7 @@
"INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 2.2);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 9, 1, 0, 0, 0, 0, 3.48, 5.48, 3.09023230616781);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 9, 1, 0, 0, 0, 0, 16.16, 17.17, 3.09023230616781);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -483,7 +496,10 @@
failureProbabilityStructureWithErosion,
widthFlowAperturesMean, widthFlowAperturesStandardDeviation,
deviationWaveDirection,
- stormDurationMean, stormDurationVariation));
+ stormDurationMean, stormDurationVariation)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript =
"DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -591,7 +607,10 @@
3.3,
4.4,
5.5,
- 6.6));
+ 6.6)
+ {
+ DesignTablesSetting = new DesignTablesSetting(7.7, 8.8)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -600,7 +619,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 [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 7.7, 8.8, 3.71901648545568);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 5, 4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -689,7 +708,10 @@
4.4,
5.5,
6.6,
- 7.7));
+ 7.7)
+ {
+ DesignTablesSetting = new DesignTablesSetting(8.8, 9.9)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -698,7 +720,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 [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 8.8, 9.9, 3.71901648545568);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 5, 4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -786,7 +808,10 @@
11.1, 12.2, 13.3, 14.4,
15.5, 16.6, 17.7, 18.8,
19.9, 20.0, 21.1, 22.2,
- 23.3, 24.4, 25.5, 26.6));
+ 23.3, 24.4, 25.5, 26.6)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -900,7 +925,10 @@
15.5, 16.6, 17.7, 18.8,
19.9, 20.0, 21.1, 22.2,
23.3, 24.4, 25.5, 26.6,
- 27.7, 28.8, 29.9, 30.0));
+ 27.7, 28.8, 29.9, 30.0)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -1016,7 +1044,10 @@
15.5, 16.6, 17.7, 18.8,
19.9, 20.0, 21.1, 22.2,
23.3, 24.4, 25.5, 26.6,
- 27.7, 28.8, 29.9, 30.0));
+ 27.7, 28.8, 29.9, 30.0)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -1141,7 +1172,10 @@
47.7, 48.8, 49.9, 50.0,
51.1, 52.2, 53.3, 54.4,
55.5, 56.6, 57.7, 58.8,
- 59.9));
+ 59.9)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -1288,7 +1322,10 @@
47.7, 48.8, 49.9, 50.0,
51.1, 52.2, 53.3, 54.4,
55.5, 56.6, 57.7, 58.8,
- 59.9));
+ 59.9)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -1435,7 +1472,10 @@
47.7, 48.8, 49.9, 50.0,
51.1, 52.2, 53.3, 54.4,
55.5, 56.6, 57.7, 58.8,
- 59.9));
+ 59.9)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -1582,7 +1622,10 @@
47.7, 48.8, 49.9, 50.0,
51.1, 52.2, 53.3, 54.4,
55.5, 56.6, 57.7, 58.8,
- 59.9));
+ 59.9)
+ {
+ DesignTablesSetting = new DesignTablesSetting(0, 0)
+ });
string expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
Fisheye: Tag c6c7b460e6385d89b1b372dcbe9c307bef6c59fb refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 2d5e2d09b0cb1a7f48e1b0a067d332347c89d4a8)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -113,7 +113,6 @@
-
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -rc6c7b460e6385d89b1b372dcbe9c307bef6c59fb
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision c6c7b460e6385d89b1b372dcbe9c307bef6c59fb)
@@ -27,6 +27,7 @@
using NUnit.Framework;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input;
+using Ringtoets.HydraRing.Calculation.Data.Settings;
using Ringtoets.HydraRing.Calculation.Services;
namespace Ringtoets.HydraRing.Calculation.Test.Services
@@ -90,7 +91,10 @@
// Setup
var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
- hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004)
+ {
+ DesignTablesSetting = new DesignTablesSetting(6.6, 7.7)
+ });
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 2, 'WTI 2017');" + Environment.NewLine +
@@ -99,7 +103,7 @@
"INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 2.2);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 4, 5, 0, 0, 0, 0, 2.18, 4.18, 1.1);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 4, 5, 0, 0, 0, 0, 6.6, 7.7, 1.1);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 1, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
@@ -176,9 +180,18 @@
// Setup
var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model);
- hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004));
- hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(2, 700005));
- hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(3, 700006));
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004)
+ {
+ DesignTablesSetting = new DesignTablesSetting(6.6, 7.7)
+ });
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(2, 700005)
+ {
+ DesignTablesSetting = new DesignTablesSetting(8.8, 9.9)
+ });
+ hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(3, 700006)
+ {
+ DesignTablesSetting = new DesignTablesSetting(10.10, 11.11)
+ });
var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
"INSERT INTO [HydraulicModels] VALUES (1, 2, 'WTI 2017');" + Environment.NewLine +
@@ -189,9 +202,9 @@
"INSERT INTO [Sections] VALUES (3, 1, 1, 3, 3, 0, 0, 0, 0, 700006, 700006, 100, 3.3, 2.2);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [DesignTables];" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 4, 5, 0, 0, 0, 0, 2.18, 4.18, 1.1);" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (2, 1, 1, 1, 4, 5, 0, 0, 0, 0, 2.18, 4.18, 1.1);" + Environment.NewLine +
- "INSERT INTO [DesignTables] VALUES (3, 1, 1, 1, 4, 5, 0, 0, 0, 0, 2.18, 4.18, 1.1);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 4, 5, 0, 0, 0, 0, 6.6, 7.7, 1.1);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (2, 1, 1, 1, 4, 5, 0, 0, 0, 0, 8.8, 9.9, 1.1);" + Environment.NewLine +
+ "INSERT INTO [DesignTables] VALUES (3, 1, 1, 1, 4, 5, 0, 0, 0, 0, 10.1, 11.11, 1.1);" + Environment.NewLine +
Environment.NewLine +
"DELETE FROM [Numerics];" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 1, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +