Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -35,12 +35,15 @@
/// The sub mechanism ids that are applicable.
/// The fault tree model id.
/// The fault tree model id to be used when running the preprocessor.
- public FailureMechanismDefaults(int mechanismId, IEnumerable subMechanismIds, int faultTreeModelId, int preprocessorFaultTreeModelId)
+ /// The mechanism id to be used when running the preprocessor.
+ public FailureMechanismDefaults(int mechanismId, IEnumerable subMechanismIds, int faultTreeModelId,
+ int preprocessorFaultTreeModelId, int preprocessorMechanismId)
{
MechanismId = mechanismId;
SubMechanismIds = subMechanismIds;
FaultTreeModelId = faultTreeModelId;
PreprocessorFaultTreeModelId = preprocessorFaultTreeModelId;
+ PreprocessorMechanismId = preprocessorMechanismId;
}
///
@@ -64,6 +67,11 @@
public int PreprocessorFaultTreeModelId { get; }
///
+ /// Gets the mechanism id to be used when running the preprocessor.
+ ///
+ public int PreprocessorMechanismId { get; }
+
+ ///
/// Gets the sub mechanism id to be used when running the preprocessor.
///
public int PreprocessorSubMechanismId
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -48,31 +48,31 @@
HydraRingFailureMechanismType.AssessmentLevel, new FailureMechanismDefaults(1, new[]
{
1
- }, 1, 9)
+ }, 1, 9, 1)
},
{
HydraRingFailureMechanismType.WaveHeight, new FailureMechanismDefaults(11, new[]
{
11
- }, 11, 9)
+ }, 11, 9, 1)
},
{
HydraRingFailureMechanismType.WavePeakPeriod, new FailureMechanismDefaults(11, new[]
{
14
- }, 14, 9)
+ }, 14, 9, 1)
},
{
HydraRingFailureMechanismType.WaveSpectralPeriod, new FailureMechanismDefaults(11, new[]
{
16
- }, 16, 9)
+ }, 16, 9, 1)
},
{
HydraRingFailureMechanismType.QVariant, new FailureMechanismDefaults(3, new[]
{
5
- }, 6, 10)
+ }, 6, 10, 4)
},
{
HydraRingFailureMechanismType.DikeHeight, GetOvertoppingDefaults()
@@ -86,7 +86,7 @@
421,
422,
423
- }, 4404, 9)
+ }, 4404, 9, 1)
},
{
HydraRingFailureMechanismType.StructuresClosure, new FailureMechanismDefaults(111, new[]
@@ -96,7 +96,7 @@
425,
426,
427
- }, 4505, 9)
+ }, 4505, 9, 1)
},
{
HydraRingFailureMechanismType.StructuresStructuralFailure, new FailureMechanismDefaults(112, new[]
@@ -110,13 +110,13 @@
433,
434,
435
- }, 4607, 9)
+ }, 4607, 9, 1)
},
{
HydraRingFailureMechanismType.DunesBoundaryConditions, new FailureMechanismDefaults(1, new[]
{
6
- }, 8, 9)
+ }, 8, 9, 1)
},
{
HydraRingFailureMechanismType.OvertoppingRate, GetOvertoppingDefaults()
@@ -140,7 +140,7 @@
{
102,
103
- }, 1017, 9);
+ }, 1017, 9, 1);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -354,7 +354,7 @@
if (hydraRingCalculationInput.PreprocessorSetting.RunPreprocessor)
{
orderDictionaries.Add(CreateNumericsRecord(hydraRingCalculationInput.Section.SectionId,
- failureMechanismDefaults.MechanismId,
+ failureMechanismDefaults.PreprocessorMechanismId,
failureMechanismDefaults.PreprocessorSubMechanismId,
hydraRingCalculationInput.PreprocessorSetting.NumericsSetting));
}
@@ -648,7 +648,7 @@
if (hydraRingCalculationInput.PreprocessorSetting.RunPreprocessor)
{
orderedDictionaries.Add(CreateFaultTreeModelsRecord(hydraRingCalculationInput.Section.SectionId,
- failureMechanismDefaults.MechanismId,
+ failureMechanismDefaults.PreprocessorMechanismId,
failureMechanismDefaults.PreprocessorFaultTreeModelId));
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -35,7 +35,7 @@
{
2,
3
- }, 4, 5);
+ }, 4, 5, 6);
// Assert
Assert.AreEqual(1, failureMechanismDefaults.MechanismId);
@@ -46,6 +46,7 @@
}, failureMechanismDefaults.SubMechanismIds);
Assert.AreEqual(4, failureMechanismDefaults.FaultTreeModelId);
Assert.AreEqual(5, failureMechanismDefaults.PreprocessorFaultTreeModelId);
+ Assert.AreEqual(6, failureMechanismDefaults.PreprocessorMechanismId);
Assert.AreEqual(7, failureMechanismDefaults.PreprocessorSubMechanismId);
}
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -176,7 +176,7 @@
"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, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 11, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -187,7 +187,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 11, 1, 1, 11);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 11, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -326,7 +326,7 @@
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 103, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -345,7 +345,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 1017);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -489,7 +489,7 @@
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 103, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -508,7 +508,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 1017);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -651,7 +651,7 @@
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
"INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 103, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -670,7 +670,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 1017);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 101, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -822,7 +822,7 @@
"INSERT INTO [Numerics] VALUES (1, 110, 1, 1, 422, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 110, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -847,7 +847,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 110, 1, 1, 4404);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 110, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -953,7 +953,7 @@
"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, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 4, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -968,7 +968,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 3, 1, 1, 6);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 3, 1, 1, 10);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 4, 1, 1, 10);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1076,7 +1076,7 @@
"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, 3, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 4, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1092,7 +1092,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 3, 1, 1, 6);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 3, 1, 1, 10);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 4, 1, 1, 10);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1198,7 +1198,7 @@
"INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1225,7 +1225,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 4505);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1333,7 +1333,7 @@
"INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1362,7 +1362,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 4505);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1470,7 +1470,7 @@
"INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 426, 1, 1, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 111, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1500,7 +1500,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 4505);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 111, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1620,7 +1620,7 @@
"INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1666,7 +1666,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 4607);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1788,7 +1788,7 @@
"INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -1834,7 +1834,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 4607);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -1956,7 +1956,7 @@
"INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -2002,7 +2002,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 4607);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
@@ -2124,7 +2124,7 @@
"INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 434, 11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 3, 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, 3, 10000, 40000, 0.1, -6, 6, 25);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [Numerics] VALUES (1, 112, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
+ ? "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 7, 1008, 1009, 1010, 1011.11, 1012.12, 1013.13, 1014.14, 1015, 3, 1016, 1017, 1018.18, 1019.19, 1020.2, 1021);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [VariableDatas];" + Environment.NewLine +
@@ -2170,7 +2170,7 @@
"DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
"INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 4607);" + Environment.NewLine +
(runPreprocessor
- ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 112, 1, 1, 9);" + Environment.NewLine
+ ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine
: string.Empty) +
Environment.NewLine +
"DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine +
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision 04a24f0766ea65c1c2d20a3cf37fe5228d0f06a8)
@@ -33,47 +33,47 @@
[TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, new[]
{
1
- }, 1, 9)]
+ }, 1, 9, 1)]
[TestCase(HydraRingFailureMechanismType.WaveHeight, 11, new[]
{
11
- }, 11, 9)]
+ }, 11, 9, 1)]
[TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 11, new[]
{
14
- }, 14, 9)]
+ }, 14, 9, 1)]
[TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 11, new[]
{
16
- }, 16, 9)]
+ }, 16, 9, 1)]
[TestCase(HydraRingFailureMechanismType.QVariant, 3, new[]
{
5
- }, 6, 10)]
+ }, 6, 10, 4)]
[TestCase(HydraRingFailureMechanismType.DikeHeight, 101, new[]
{
102,
103
- }, 1017, 9)]
+ }, 1017, 9, 1)]
[TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, new[]
{
102,
103
- }, 1017, 9)]
+ }, 1017, 9, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, new[]
{
421,
422,
423
- }, 4404, 9)]
+ }, 4404, 9, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresClosure, 111, new[]
{
422,
424,
425,
426,
427
- }, 4505, 9)]
+ }, 4505, 9, 1)]
[TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 112, new[]
{
422,
@@ -85,21 +85,22 @@
433,
434,
435
- }, 4607, 9)]
+ }, 4607, 9, 1)]
[TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 1, new[]
{
6
- }, 8, 9)]
+ }, 8, 9, 1)]
[TestCase(HydraRingFailureMechanismType.OvertoppingRate, 101, new[]
{
102,
103
- }, 1017, 9)]
+ }, 1017, 9, 1)]
public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType,
int expectedMechanismId,
IEnumerable expectedSubMechanismIds,
int expectedFaultTreeModelId,
- int expectedPreprocessorFaultTreeModelId)
+ int expectedPreprocessorFaultTreeModelId,
+ int expectedPreprocessorMechanismId)
{
// Setup
var failureMechanismDefaultsProvider = new FailureMechanismDefaultsProvider();
@@ -112,6 +113,7 @@
Assert.AreEqual(expectedSubMechanismIds, failureMechanismDefaults.SubMechanismIds);
Assert.AreEqual(expectedFaultTreeModelId, failureMechanismDefaults.FaultTreeModelId);
Assert.AreEqual(expectedPreprocessorFaultTreeModelId, failureMechanismDefaults.PreprocessorFaultTreeModelId);
+ Assert.AreEqual(expectedPreprocessorMechanismId, failureMechanismDefaults.PreprocessorMechanismId);
}
}
}
\ No newline at end of file