Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointQueries.cs =================================================================== diff -u -rca13ac94cb4308335c7a44bd15aa903eec98b308 -r2faf760ac8a46319780e2669e68d59b45b71ba99 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointQueries.cs (.../IllustrationPointQueries.cs) (revision ca13ac94cb4308335c7a44bd15aa903eec98b308) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointQueries.cs (.../IllustrationPointQueries.cs) (revision 2faf760ac8a46319780e2669e68d59b45b71ba99) @@ -183,11 +183,11 @@ $"{IllustrationPointsDatabaseConstants.RecursiveFaultTreeType}, " + $"{IllustrationPointsDatabaseConstants.RecursiveFaultTreeCombine}" + ") AS (" + - "SELECT FaultTreeId, Id1, Type1, CombinFunction " + + "SELECT FaultTreeId, Id1, Type1, combine " + "FROM FaultTrees " + "LEFT OUTER JOIN combineFunctions ON combineFunctions.id = Id1 " + "UNION " + - "SELECT FaultTreeId, Id2, Type2, CombinFunction " + + "SELECT FaultTreeId, Id2, Type2, combine " + "FROM FaultTrees " + "LEFT OUTER JOIN combineFunctions ON combineFunctions.id = Id2), " + "children(" + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r2faf760ac8a46319780e2669e68d59b45b71ba99 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs (.../IllustrationPointsParserTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/IllustrationPoints/IllustrationPointsParserTest.cs (.../IllustrationPointsParserTest.cs) (revision 2faf760ac8a46319780e2669e68d59b45b71ba99) @@ -208,6 +208,21 @@ GetAllNodes(illustrationPointNodes.Values.First(), faultTrees, subMechanisms); Assert.AreEqual(11, faultTrees.Count); + Assert.AreEqual(new[] + { + CombinationType.Or, + CombinationType.Or, + CombinationType.And, + CombinationType.And, + CombinationType.Or, + CombinationType.And, + CombinationType.And, + CombinationType.And, + CombinationType.Or, + CombinationType.And, + CombinationType.And + }, faultTrees.Select(f => f.CombinationType)); + Assert.AreEqual(12, subMechanisms.Count); SubMechanismIllustrationPoint subMechanismIllustrationPoint = subMechanisms.First(); Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name); @@ -221,6 +236,7 @@ FaultTreeIllustrationPoint faultTreeIllustrationPoint = faultTrees.First(); Assert.AreEqual("Structure 2017 Z12", subMechanismIllustrationPoint.Name); Assert.AreEqual(2.23881, faultTreeIllustrationPoint.Beta); + Assert.AreEqual(CombinationType.Or, faultTreeIllustrationPoint.CombinationType); Assert.AreEqual(46, faultTreeIllustrationPoint.Stochasts.Count()); Assert.AreEqual(new[] {