Jep/stpa with fta

extension/package.json

@@ -172,6 +172,11 @@
                 "title": "Create a Markdown file",
                 "category": "STPA PDF Creation"
             },
+            {
+                "command": "pasta.stpa.ft.generation",
+                "title": "Generate Fault Trees",
+                "category": "STPA and FTA"
+            },
             {
                 "command": "pasta.fta.cutSets",
                 "title": "Generate the cut sets",
@@ -237,6 +242,10 @@
                     "command": "pasta.stpa.md.creation",
                     "when": "editorLangId == 'stpa'"
                 },
+                {
+                    "command": "pasta.stpa.ft.generation",
+                    "when": "editorLangId == 'stpa'"
+                },
                 {
                     "command": "pasta.fta.cutSets",
                     "when": "editorLangId == 'fta'"
@@ -262,7 +271,7 @@
                     "group": "checks"
                 },
                 {
-                    "submenu": "pasta.generate",
+                    "submenu": "pasta.fta.generate",
                     "group": "generate"
                 },
                 {
@@ -274,6 +283,11 @@
                     "command": "pasta.stpa.md.creation",
                     "when": "editorLangId == 'stpa'",
                     "group": "stpa"
+                },
+                {
+                    "command": "pasta.stpa.ft.generation",
+                    "when": "editorLangId == 'stpa'",
+                    "group": "stpa"
                 }
             ],
             "pasta.stpa.checks": [
@@ -298,7 +312,7 @@
                     "group": "navigation"
                 }
             ],
-            "pasta.generate": [
+            "pasta.fta.generate": [
                 {
                     "command": "pasta.fta.cutSets",
                     "when": "editorLangId == 'fta'",
@@ -332,16 +346,6 @@
                     "command": "pasta.contextTable.open",
                     "when": "resourceExtname == '.stpa'",
                     "group": "navigation"
-                },
-                {
-                    "command": "pasta.fta.cutSets",
-                    "when": "resourceExtname == '.fta'",
-                    "group": "navigation"
-                },
-                {
-                    "command": "pasta.fta.minimalCutSets",
-                    "when": "resourceExtname == '.fta'",
-                    "group": "navigation"
                 }
             ]
         },
@@ -351,7 +355,7 @@
                 "label": "Validation Checks"
             },
             {
-                "id": "pasta.generate",
+                "id": "pasta.fta.generate",
                 "label": "Generate cut sets"
             }
         ],

extension/src-language-server/fta/analysis/fta-cutSet-calculator.ts

@@ -29,14 +29,17 @@ import {
 } from "../../generated/ast";
 import { namedFtaElement } from "../utils";
 
+/* element for which the cut sets were determined */
+export let topOfAnalysis: string | undefined;
+
 /**
  * Determines the minimal cut sets for the fault tree constructured by {@code allNodes}.
  * @param allNodes All nodes in the fault tree.
  * @returns the minimal cut sets for a fault tree.
  */
-export function determineMinimalCutSets(allNodes: AstNode[]): Set<namedFtaElement>[] {
+export function determineMinimalCutSets(allNodes: AstNode[], startNode?: namedFtaElement): Set<namedFtaElement>[] {
     // TODO: add minimal flag (could reduce computation cost)
-    const allCutSets = determineCutSetsForFT(allNodes);
+    const allCutSets = determineCutSetsForFT(allNodes, startNode);
 
     // Cut sets are minimal if removing one element destroys the cut set
     // If cut set contains another cut set from the array, remove it since it is not minimal
@@ -69,18 +72,24 @@ function checkMinimalCutSet(cutSet: Set<namedFtaElement>, allCutSets: Set<namedF
 /**
  * Determines all cut sets of a fault tree.
  * @param allNodes All nodes of the fault tree.
+ * @param startNode The node from which the cut sets should be determined.
  * @returns the cut sets of the fault tree.
  */
-export function determineCutSetsForFT(allNodes: AstNode[]): Set<namedFtaElement>[] {
+export function determineCutSetsForFT(allNodes: AstNode[], startNode?: namedFtaElement): Set<namedFtaElement>[] {
     /*  Idea:
             Start from the top event.
             Get the only child of top event (will always be only one) as our starting node.
             Calculate all children of the node and evaluate them.
             In the evaluation we check if the child has children too and do the same recursively until 
             the children are components.
             Depending on the type of the node process the results of the children differently. */
-
-    const startNode = getChildOfTopEvent(allNodes);
+
+    topOfAnalysis = startNode?.name;
+    if (!startNode) {
+        topOfAnalysis = (allNodes.find((node) => isTopEvent(node)) as namedFtaElement).name;
+        // if no start node is given, the top event is used as start node
+        startNode = getChildOfTopEvent(allNodes);
+    }
     if (startNode) {
         // determine the cut sets of the Fault Tree
         return determineCutSetsForGate(startNode, allNodes);
@@ -213,9 +222,9 @@ function getChildrenOfNode(node: AstNode): namedFtaElement[] {
  * @returns the child of the top event.
  */
 function getChildOfTopEvent(allNodes: AstNode[]): namedFtaElement | undefined {
-    const topEventChildren = (allNodes.find((node) => isTopEvent(node)) as TopEvent).children;
-    if (topEventChildren.length !== 0) {
-        return topEventChildren[0].ref;
+    const topEventChild = (allNodes.find((node) => isTopEvent(node)) as TopEvent).child;
+    if (topEventChild) {
+        return topEventChild.ref;
     }
 }