Changeset 8700 for trunk

Timestamp:

09/25/12 15:02:51 (12 years ago)

Author:

ascheibe

Message:

#1882 reverted changes of r8688 and r8692 because I think I found now the real cause for all these problems

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Util/TaskUtil.cs (deleted)

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

@@ -534 +534 @@
         RunCollection runs = new RunCollection();
 
-        foreach (HiveTask hiveTask in job.HiveTasks) {
-          TaskUtil.GetAllRunsFromHiveTask(runs, hiveTask);
+        foreach (HiveTask subTask in job.HiveTasks) {
+          if (subTask is OptimizerHiveTask) {
+            OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
+            runs.AddRange(ohTask.ItemTask.Item.Runs);
+          }
         }
         return runs;

trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 
@@ -54 +53 @@
     protected override void Job_ItemChanged(object sender, EventArgs e) {
       if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
-        RunCollection runs = new RunCollection();
-        TaskUtil.GetAllRunsFromHiveTask(runs, Content);
-        runCollectionViewHost.Content = runs;
+        runCollectionViewHost.Content = Content.ItemTask.Item.Runs;
       } else {
         runCollectionViewHost.Content = null;

trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -130 +130 @@
     <Compile Include="StateLogList.cs" />
     <Compile Include="StateLogListList.cs" />
-    <Compile Include="Util\TaskUtil.cs" />
     <None Include="app.config">
       <SubType>Designer</SubType>

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

@@ -483 +483 @@
       foreach (LightweightTask task in childTasks) {
         HiveTask childHiveTask = allHiveTasks[task.Id];
+        BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
         parentHiveTask.AddChildHiveTask(childHiveTask);
-        BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
       }
     }