Changeset 8688 for trunk

Timestamp:

09/24/12 15:44:39 (12 years ago)

Author:

ascheibe

Message:

#1882 fixed collecting runs from deeply nested tasks

File:

• trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -533 +533 @@
 
         foreach (HiveTask subTask in job.HiveTasks) {
-          if (subTask is OptimizerHiveTask) {
-            OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
-            runs.AddRange(ohTask.ItemTask.Item.Runs);
-          }
+          GetAllRunsFromHiveTask(runs, subTask);
         }
         return runs;
       } else {
         return null;
+      }
+    }
+
+    private void GetAllRunsFromHiveTask(RunCollection runs, HiveTask task) {
+      foreach (HiveTask subTask in task.ChildHiveTasks) {
+        GetAllRunsFromHiveTask(runs, subTask);
+      }
+
+      if (task.ChildHiveTasks.Count == 0) {
+        if (task is OptimizerHiveTask) {
+          OptimizerHiveTask ohTask = task as OptimizerHiveTask;
+          runs.AddRange(ohTask.ItemTask.Item.Runs);
+        }
       }
     }