Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs =================================================================== diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs (.../HydraRingCalculation.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs (.../HydraRingCalculation.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -46,6 +46,11 @@ public abstract HydraRingFailureMechanismType FailureMechanismType { get; } /// + /// Gets the id corresponding to the type of calculation that should be performed. + /// + public abstract int CalculationTypeId { get; } + + /// /// Gets the id of the hydraulic station to use during the calculation. /// public int HydraulicBoundaryLocationId Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -r43074cf185009dabd2b9a4ee2b1a8fffa73747c5 -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 43074cf185009dabd2b9a4ee2b1a8fffa73747c5) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -258,7 +258,7 @@ "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { - "Method", failureMechanismDefaults.CalculationTypeId + "Method", hydraRingCalculation.CalculationTypeId }, { "VariableId", failureMechanismDefaults.VariableId Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs =================================================================== diff -u -re58872a87106093853d59f6cae8f57e63b623202 -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs (.../IterateTowardsTargetProbabilityCalculation.cs) (revision e58872a87106093853d59f6cae8f57e63b623202) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs (.../IterateTowardsTargetProbabilityCalculation.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -38,6 +38,14 @@ this.beta = beta; } + public override int CalculationTypeId + { + get + { + return 2; + } + } + public override double Beta { get Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs =================================================================== diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -31,21 +31,18 @@ { private readonly int variableId; private readonly int mechanismId; - private readonly int calculationTypeId; private readonly IEnumerable subMechanismIds; /// /// Creates a new instance of the class. /// /// The mechanism id that corresponds to a specific . - /// The calculation type id that is applicable for a specific . /// The id of the variable that is relevant for a specific . /// The sub mechanism ids that are applicable for a specific . - public FailureMechanismDefaults(int mechanismId, int calculationTypeId, int variableId, IEnumerable subMechanismIds) + public FailureMechanismDefaults(int mechanismId, int variableId, IEnumerable subMechanismIds) { this.mechanismId = mechanismId; this.variableId = variableId; - this.calculationTypeId = calculationTypeId; this.subMechanismIds = subMechanismIds; } @@ -61,17 +58,6 @@ } /// - /// Gets the calculation type id that is applicable for a specific . - /// - public int CalculationTypeId - { - get - { - return calculationTypeId; - } - } - - /// /// Gets the id of the variable that is relevant for a specific . /// public int VariableId Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -44,62 +44,62 @@ failureMechanismDefaults = new Dictionary { { - HydraRingFailureMechanismType.AssessmentLevel, new FailureMechanismDefaults(1, 2, 26, new[] + HydraRingFailureMechanismType.AssessmentLevel, new FailureMechanismDefaults(1, 26, new[] { 1 }) }, { - HydraRingFailureMechanismType.WaveHeight, new FailureMechanismDefaults(11, 2, 28, new[] + HydraRingFailureMechanismType.WaveHeight, new FailureMechanismDefaults(11, 28, new[] { 11 }) }, { - HydraRingFailureMechanismType.WavePeakPeriod, new FailureMechanismDefaults(11, 2, 29, new[] + HydraRingFailureMechanismType.WavePeakPeriod, new FailureMechanismDefaults(11, 29, new[] { 14 }) }, { - HydraRingFailureMechanismType.WaveSpectralPeriod, new FailureMechanismDefaults(11, 2, 29, new[] + HydraRingFailureMechanismType.WaveSpectralPeriod, new FailureMechanismDefaults(11, 29, new[] { 16 }) }, { - HydraRingFailureMechanismType.QVariant, new FailureMechanismDefaults(3, 6, 114, new[] + HydraRingFailureMechanismType.QVariant, new FailureMechanismDefaults(3, 114, new[] { 3, 4, 5 }) }, { - HydraRingFailureMechanismType.DikesOvertopping, new FailureMechanismDefaults(101, 1, 1, new[] + HydraRingFailureMechanismType.DikesOvertopping, new FailureMechanismDefaults(101, 1, new[] { 102, 103 }) }, { - HydraRingFailureMechanismType.DikesPiping, new FailureMechanismDefaults(103, 1, 44, new[] + HydraRingFailureMechanismType.DikesPiping, new FailureMechanismDefaults(103, 44, new[] { 311, 313, 314 }) }, { - HydraRingFailureMechanismType.StructuresOvertopping, new FailureMechanismDefaults(110, 1, 60, new[] + HydraRingFailureMechanismType.StructuresOvertopping, new FailureMechanismDefaults(110, 60, new[] { 421, 422, 423 }) }, { - HydraRingFailureMechanismType.StructuresClosure, new FailureMechanismDefaults(111, 1, 65, new[] + HydraRingFailureMechanismType.StructuresClosure, new FailureMechanismDefaults(111, 65, new[] { 422, 424, @@ -109,7 +109,7 @@ }) }, { - HydraRingFailureMechanismType.StructuresStructuralFailure, new FailureMechanismDefaults(112, 1, 65, new[] + HydraRingFailureMechanismType.StructuresStructuralFailure, new FailureMechanismDefaults(112, 65, new[] { 422, 424, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingCalculationTest.cs =================================================================== diff -u -r59b1c01f9c155ff608c09769f19fd0158dea38e8 -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingCalculationTest.cs (.../HydraRingCalculationTest.cs) (revision 59b1c01f9c155ff608c09769f19fd0158dea38e8) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingCalculationTest.cs (.../HydraRingCalculationTest.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -36,6 +36,7 @@ // Assert Assert.AreEqual(1, hydraRingCalculation.HydraulicBoundaryLocationId); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, hydraRingCalculation.FailureMechanismType); + Assert.AreEqual(4, hydraRingCalculation.CalculationTypeId); CollectionAssert.IsEmpty(hydraRingCalculation.Variables); CollectionAssert.IsEmpty(hydraRingCalculation.ProfilePoints); Assert.IsNaN(hydraRingCalculation.Beta); @@ -65,6 +66,14 @@ } } + public override int CalculationTypeId + { + get + { + return 4; + } + } + public override HydraRingDikeSection DikeSection { get Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -29,54 +29,54 @@ [TestFixture] public class FailureMechanismDefaultsProviderTest { - [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 2, 26, new[] + [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, 26, new[] { 1 })] - [TestCase(HydraRingFailureMechanismType.QVariant, 3, 6, 114, new[] + [TestCase(HydraRingFailureMechanismType.QVariant, 3, 114, new[] { 3, 4, 5 })] - [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 2, 28, new[] + [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, 28, new[] { 11 })] - [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 11, 2, 29, new[] + [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 11, 29, new[] { 14 })] - [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 11, 2, 29, new[] + [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 11, 29, new[] { 16 })] - [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, 1, 1, new[] + [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, 1, new[] { 102, 103 })] - [TestCase(HydraRingFailureMechanismType.DikesPiping, 103, 1, 44, new[] + [TestCase(HydraRingFailureMechanismType.DikesPiping, 103, 44, new[] { 311, 313, 314 })] - [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, 1, 60, new[] + [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, 60, new[] { 421, 422, 423 })] - [TestCase(HydraRingFailureMechanismType.StructuresClosure, 111, 1, 65, new[] + [TestCase(HydraRingFailureMechanismType.StructuresClosure, 111, 65, new[] { 422, 424, 425, 426, 427 })] - [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 112, 1, 65, new[] + [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 112, 65, new[] { 422, 424, @@ -88,7 +88,7 @@ 434, 435 })] - public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType, int expectedMechanismId, int expectedCalculationTypeId, int expectedVariableId, IEnumerable expectedSubMechanismIds) + public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType, int expectedMechanismId, int expectedVariableId, IEnumerable expectedSubMechanismIds) { // Setup var failureMechanismDefaultsProvider = new FailureMechanismDefaultsProvider(); @@ -98,7 +98,6 @@ // Assert Assert.AreEqual(expectedMechanismId, failureMechanismDefaults.MechanismId); - Assert.AreEqual(expectedCalculationTypeId, failureMechanismDefaults.CalculationTypeId); Assert.AreEqual(expectedVariableId, failureMechanismDefaults.VariableId); Assert.AreEqual(expectedSubMechanismIds, failureMechanismDefaults.SubMechanismIds); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsTest.cs =================================================================== diff -u -re6f8ac7ecbea09b8c7500713e9c2a48844b67eed -rc1971492b8f3eb86ac4669d7247e1778fabd7a9b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision e6f8ac7ecbea09b8c7500713e9c2a48844b67eed) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision c1971492b8f3eb86ac4669d7247e1778fabd7a9b) @@ -31,20 +31,19 @@ public void Constructor_ExpectedValues() { // Call - var failureMechanismDefaults = new FailureMechanismDefaults(1, 2, 3, new[] + var failureMechanismDefaults = new FailureMechanismDefaults(1, 2, new[] { - 4, - 5 + 3, + 4 }); // Assert Assert.AreEqual(1, failureMechanismDefaults.MechanismId); - Assert.AreEqual(2, failureMechanismDefaults.CalculationTypeId); - Assert.AreEqual(3, failureMechanismDefaults.VariableId); + Assert.AreEqual(2, failureMechanismDefaults.VariableId); CollectionAssert.AreEqual(new[] { - 4, - 5 + 3, + 4 }, failureMechanismDefaults.SubMechanismIds); } }