Resurrecting Sequence Graph Capabilities to Task Class2:

- fixing other instances where Tasks are generated in irma.py with names being mentioned as the first argument,
- sequence Graph updates duration and actions_ti
- allowing actions fed into tasks to be either list or dictionary for flexibility

Author: Yuksel-Rudy

famodel/irma/irma.py

@@ -350,11 +350,11 @@ def registerTask(self, task):
         self.tasks[task.name] = task
 
 
-    def addTask(self, actions, action_sequence, task_name, **kwargs):
+    def addTask(self, task_name, actions, action_sequence, **kwargs):
         '''Creates a task and adds it to the register'''
 
         # Create the action
-        task = Task(actions, action_sequence, task_name, **kwargs)        
+        task = Task(task_name, actions, action_sequence, **kwargs)        
 
         # Register the action
         self.registerTask(task)
@@ -454,7 +454,7 @@ def implementStrategy_staged(sc):
             act_sequence[acts[i].name] = [ acts[i-1].name ]  # (previous action must be done first)
 
     # create the task, passing in the sequence of actions
-    sc.addTask(acts, act_sequence, 'install_all_anchors')
+    sc.addTask('install_all_anchors', acts, act_sequence)
 
     # ----- Create a Task for all the mooring installs -----
 
@@ -478,7 +478,7 @@ def implementStrategy_staged(sc):
             act_sequence[acts[i].name] = [ acts[i-1].name ]  # (previous action must be done first)
 
     # create the task, passing in the sequence of actions
-    sc.addTask(acts, act_sequence, 'install_all_moorings')
+    sc.addTask('install_all_moorings', acts, act_sequence)
 
 
     # ----- Create a Task for the platform tow-out and hookup -----
@@ -501,7 +501,7 @@ def implementStrategy_staged(sc):
             act_sequence[acts[i].name] = [ acts[i-1].name ]  # (previous action must be done first)
 
     # create the task, passing in the sequence of actions
-    sc.addTask(acts, act_sequence, 'tow_and_hookup')
+    sc.addTask('tow_and_hookup', acts, act_sequence)
 
 
 

famodel/irma/task.py

@@ -58,7 +58,12 @@ def __init__(self, name, actions, action_sequence=None, **kwargs):
 
 
         self.name = name
-        self.actions = {a.name: a for a in actions.values()}
+
+        if isinstance(actions, dict):
+            self.actions = actions
+        elif isinstance(actions, list):
+            self.actions = {a.name: a for a in actions}
+
 
         if action_sequence is None:
             self.stageActions(from_deps=True)
@@ -186,6 +191,8 @@ def level_of(a: str, b: set[str]) -> int:
             elif acts and lv > num_cps:
                 cp_string.append(f"End: {', '.join(acts)}")        
         # Assign to self:
+        self.duration = task_duration
+        self.actions_ti = {a: level_start_time[lv] for a, lv in levels.items()}        
         self.sequence_graph = H
         title_str = f"Task {self.name}. Duration {self.duration:.2f} : " + " | ".join(cp_string)
         if plot: