Merge pull request #90 from kbss-cvut/fix/89-fix-fault-tree-summary-i…

…ssues [Fix #189] Fix issues with FaultTreeSummary
kbss-cvut · May 8, 2024 · 185e6c6 · 185e6c6
2 parents 0d24780 + 3f1e9df
commit 185e6c6
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/main/java/cz/cvut/kbss/analysis/dao/FaultTreeDao.java b/src/main/java/cz/cvut/kbss/analysis/dao/FaultTreeDao.java
@@ -97,29 +97,30 @@ public List<FaultTree> findAllSummaries() {
                                     }
                                     OPTIONAL{
                                         ?sup fta:has-failure-rate ?failureRate.
-                                        OPTIONAL{
-                                            ?failureRate fta:has-prediction ?failureRatePrediction.
-                                            ?failureRatePrediction fta:value ?fhaBasedFailureRate.
-                                        }
-                                        
-                                        OPTIONAL{
-                                            ?failureRate fta:has-requirement ?failureRateRequirement.
-                                            ?failureRateRequirement fta:to ?requiredFailureRate.
-                                        }
+                                        ?failureRate fta:has-requirement ?failureRateRequirement.
+                                        ?failureRateRequirement fta:to ?requiredFailureRate.
                                     }
+                                    OPTIONAL{
+                                        ?sup fta:is-derived-from ?supsup.
+                                        ?supsup fta:has-failure-rate ?fhaFailureRateQ.
+                                        ?fhaFailureRateQ fta:has-estimate ?fhaFailureRateP.
+                                        ?fhaFailureRateP a fta:failure-rate-estimate;
+                                                         fta:value ?fhaBasedFailureRate.
+                                    } 
                                     OPTIONAL{
                                         ?sup fta:is-manifestation-of ?behavior .
                                         ?behavior fta:has-component ?subsystemUri.
-                                        ?subsystemUri fta:name ?subsystemName.
+                                        ?subsystemUri fta:is-derived-from ?subsystemType.
+                                        ?subsystemType fta:name ?subsystemTypeLabel.
+                                        ?subsystemType fta:ata-code ?subsystemTypeCode.
+                                        BIND(CONCAT(str(?subsystemTypeCode), " - ", str(?subsystemTypeLabel)) as ?subsystemName)
                                         ?subsystemUri fta:is-part-of+ ?systemUri.
                                         FILTER NOT EXISTS{
                                             ?systemUri fta:is-part-of ?system2.
                                         }
                                         ?systemUri fta:name ?systemName.
                                     }
                                 }
-                                
-                                {}
                             }""", "FaultTreeSummary")
                     .setParameter("type", typeUri)
                     .setParameter("pName", P_HAS_NAME)