Changeset 8692

Timestamp:

09/25/12 10:15:59 (12 years ago)

Author:

ascheibe

Message:

#1882 fixed collecting runs in the OptimizerHiveTaskView

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) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/Util/TaskUtil.cs (added)

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

@@ -534 +534 @@
         RunCollection runs = new RunCollection();
 
-        foreach (HiveTask subTask in job.HiveTasks) {
-          GetAllRunsFromHiveTask(runs, subTask);
+        foreach (HiveTask hiveTask in job.HiveTasks) {
+          TaskUtil.GetAllRunsFromHiveTask(runs, hiveTask);
         }
         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);
-        }
       }
     }

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;
 
@@ -53 +54 @@
     protected override void Job_ItemChanged(object sender, EventArgs e) {
       if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
-        runCollectionViewHost.Content = Content.ItemTask.Item.Runs;
+        RunCollection runs = new RunCollection();
+        TaskUtil.GetAllRunsFromHiveTask(runs, Content);
+        runCollectionViewHost.Content = 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>
@@ -249 +250 @@
   </PropertyGroup>
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
 set Outdir=$(Outdir)
 call PreBuildEvent.cmd</PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)