Changeset 7165 for trunk/sources/HeuristicLab.Clients.Hive/3.3

Timestamp:

12/10/11 16:32:33 (12 years ago)

Author:

ascheibe

Message:

#1672 build the task tree first and then display it. This should be more light on the CPU.

File:

• trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -242 +242 @@
       HiveServiceLocator.Instance.CallHiveService(service => {
         foreach (HiveTask task in refreshableJob.GetAllHiveTasks()) {
-          if (task.Task.State == TaskState.Paused) {            
-            service.RestartTask(task.Task.Id);            
+          if (task.Task.State == TaskState.Paused) {
+            service.RestartTask(task.Task.Id);
           }
         }
@@ -450 +450 @@
         }
         IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
-
-        refreshableJob.HiveTasks = new ItemCollection<HiveTask>(allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue));
-
+        var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue);
+
+        refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";
+        // build child-task tree
+        foreach (HiveTask hiveTask in parents) {
+          BuildHiveJobTree(hiveTask, allTasks, allHiveTasks);
+        }
+
+        refreshableJob.HiveTasks = new ItemCollection<HiveTask>(parents);
         if (refreshableJob.IsFinished()) {
           refreshableJob.ExecutionState = Core.ExecutionState.Stopped;
@@ -458 +464 @@
           refreshableJob.ExecutionState = Core.ExecutionState.Started;
         }
-
-        refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";
-        // build child-task tree
-        foreach (HiveTask hiveTask in refreshableJob.HiveTasks) {
-          BuildHiveJobTree(hiveTask, allTasks, allHiveTasks);
-        }
-
         refreshableJob.OnLoaded();
       } finally {