Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb4f870d1efb9a460234c5657275b48c993fd9a67 --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision b4f870d1efb9a460234c5657275b48c993fd9a67) @@ -33,15 +33,13 @@ /// /// The mechanism id. /// The sub mechanism ids that are applicable. - /// The fault tree model id. /// The fault tree model id to be used when running the preprocessor. /// The mechanism id to be used when running the preprocessor. - public FailureMechanismDefaults(int mechanismId, IEnumerable subMechanismIds, int faultTreeModelId, + public FailureMechanismDefaults(int mechanismId, IEnumerable subMechanismIds, int preprocessorFaultTreeModelId, int preprocessorMechanismId) { MechanismId = mechanismId; SubMechanismIds = subMechanismIds; - FaultTreeModelId = faultTreeModelId; PreprocessorFaultTreeModelId = preprocessorFaultTreeModelId; PreprocessorMechanismId = preprocessorMechanismId; } @@ -57,11 +55,6 @@ public IEnumerable SubMechanismIds { get; } /// - /// Gets the fault tree model id. - /// - public int FaultTreeModelId { get; } - - /// /// Gets the fault tree model id to be used when running the preprocessor. /// public int PreprocessorFaultTreeModelId { get; } @@ -74,12 +67,6 @@ /// /// Gets the sub mechanism id to be used when running the preprocessor. /// - public int PreprocessorSubMechanismId - { - get - { - return 7; - } - } + public int PreprocessorSubMechanismId => 7; } } \ No newline at end of file Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs =================================================================== diff -u -r3e38f2adb0a1ab5078221fd5bc2446693f060126 -rb4f870d1efb9a460234c5657275b48c993fd9a67 --- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision 3e38f2adb0a1ab5078221fd5bc2446693f060126) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Providers/FailureMechanismDefaultsProvider.cs (.../FailureMechanismDefaultsProvider.cs) (revision b4f870d1efb9a460234c5657275b48c993fd9a67) @@ -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, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.WavePeakPeriod, new FailureMechanismDefaults(11, new[] { 14 - }, 14, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.WaveSpectralPeriod, new FailureMechanismDefaults(11, new[] { 16 - }, 16, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.QVariant, new FailureMechanismDefaults(3, new[] { 5 - }, 6, 10, 4) + }, 10, 4) }, { HydraRingFailureMechanismType.DikeHeight, GetOvertoppingDefaults() @@ -86,7 +86,7 @@ 421, 422, 423 - }, 4404, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.StructuresClosure, new FailureMechanismDefaults(111, new[] @@ -96,7 +96,7 @@ 425, 426, 427 - }, 4505, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.StructuresStructuralFailure, new FailureMechanismDefaults(112, new[] @@ -110,13 +110,13 @@ 433, 434, 435 - }, 4607, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.DunesBoundaryConditions, new FailureMechanismDefaults(1, new[] { 6 - }, 8, 9, 1) + }, 9, 1) }, { HydraRingFailureMechanismType.OvertoppingRate, GetOvertoppingDefaults() @@ -127,7 +127,7 @@ 311, 313, 314 - }, 3015, 9, 1) + }, 9, 1) } }; } @@ -148,7 +148,7 @@ { 102, 103 - }, 1017, 9, 1); + }, 9, 1); } } } \ No newline at end of file Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rb4f870d1efb9a460234c5657275b48c993fd9a67 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Defaults/FailureMechanismDefaultsTest.cs (.../FailureMechanismDefaultsTest.cs) (revision b4f870d1efb9a460234c5657275b48c993fd9a67) @@ -35,7 +35,7 @@ { 2, 3 - }, 4, 5, 6); + }, 4, 5); // Assert Assert.AreEqual(1, failureMechanismDefaults.MechanismId); @@ -44,9 +44,8 @@ 2, 3 }, failureMechanismDefaults.SubMechanismIds); - Assert.AreEqual(4, failureMechanismDefaults.FaultTreeModelId); - Assert.AreEqual(5, failureMechanismDefaults.PreprocessorFaultTreeModelId); - Assert.AreEqual(6, failureMechanismDefaults.PreprocessorMechanismId); + Assert.AreEqual(4, failureMechanismDefaults.PreprocessorFaultTreeModelId); + Assert.AreEqual(5, failureMechanismDefaults.PreprocessorMechanismId); Assert.AreEqual(7, failureMechanismDefaults.PreprocessorSubMechanismId); } } Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs =================================================================== diff -u -r3e38f2adb0a1ab5078221fd5bc2446693f060126 -rb4f870d1efb9a460234c5657275b48c993fd9a67 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision 3e38f2adb0a1ab5078221fd5bc2446693f060126) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Providers/FailureMechanismDefaultsProviderTest.cs (.../FailureMechanismDefaultsProviderTest.cs) (revision b4f870d1efb9a460234c5657275b48c993fd9a67) @@ -33,47 +33,47 @@ [TestCase(HydraRingFailureMechanismType.AssessmentLevel, 1, new[] { 1 - }, 1, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.WaveHeight, 11, new[] { 11 - }, 11, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, 11, new[] { 14 - }, 14, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, 11, new[] { 16 - }, 16, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.QVariant, 3, new[] { 5 - }, 6, 10, 4)] + }, 10, 4)] [TestCase(HydraRingFailureMechanismType.DikeHeight, 101, new[] { 102, 103 - }, 1017, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, 101, new[] { 102, 103 - }, 1017, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, 110, new[] { 421, 422, 423 - }, 4404, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, 111, new[] { 422, 424, 425, 426, 427 - }, 4505, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 112, new[] { 422, @@ -85,26 +85,25 @@ 433, 434, 435 - }, 4607, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 1, new[] { 6 - }, 8, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.OvertoppingRate, 101, new[] { 102, 103 - }, 1017, 9, 1)] + }, 9, 1)] [TestCase(HydraRingFailureMechanismType.Piping, 103, new[] { 311, 313, 314 - }, 3015, 9, 1)] + }, 9, 1)] public void GetFailureMechanismDefaults_ReturnsExpectedFailureMechanismDefaults(HydraRingFailureMechanismType failureMechanismType, int expectedMechanismId, IEnumerable expectedSubMechanismIds, - int expectedFaultTreeModelId, int expectedPreprocessorFaultTreeModelId, int expectedPreprocessorMechanismId) { @@ -117,7 +116,6 @@ // Assert Assert.AreEqual(expectedMechanismId, failureMechanismDefaults.MechanismId); Assert.AreEqual(expectedSubMechanismIds, failureMechanismDefaults.SubMechanismIds); - Assert.AreEqual(expectedFaultTreeModelId, failureMechanismDefaults.FaultTreeModelId); Assert.AreEqual(expectedPreprocessorFaultTreeModelId, failureMechanismDefaults.PreprocessorFaultTreeModelId); Assert.AreEqual(expectedPreprocessorMechanismId, failureMechanismDefaults.PreprocessorMechanismId); }