Changeset 8700


Ignore:
Timestamp:
09/25/12 15:02:51 (7 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:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r8692 r8700  
    534534        RunCollection runs = new RunCollection();
    535535
    536         foreach (HiveTask hiveTask in job.HiveTasks) {
    537           TaskUtil.GetAllRunsFromHiveTask(runs, hiveTask);
     536        foreach (HiveTask subTask in job.HiveTasks) {
     537          if (subTask is OptimizerHiveTask) {
     538            OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
     539            runs.AddRange(ohTask.ItemTask.Item.Runs);
     540          }
    538541        }
    539542        return runs;
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

    r8692 r8700  
    2525using HeuristicLab.MainForm;
    2626using HeuristicLab.MainForm.WindowsForms;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.PluginInfrastructure;
    2928
     
    5453    protected override void Job_ItemChanged(object sender, EventArgs e) {
    5554      if (Content != null && Content.Task != null && Content.ItemTask.Item != null) {
    56         RunCollection runs = new RunCollection();
    57         TaskUtil.GetAllRunsFromHiveTask(runs, Content);
    58         runCollectionViewHost.Content = runs;
     55        runCollectionViewHost.Content = Content.ItemTask.Item.Runs;
    5956      } else {
    6057        runCollectionViewHost.Content = null;
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r8692 r8700  
    130130    <Compile Include="StateLogList.cs" />
    131131    <Compile Include="StateLogListList.cs" />
    132     <Compile Include="Util\TaskUtil.cs" />
    133132    <None Include="app.config">
    134133      <SubType>Designer</SubType>
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r8165 r8700  
    483483      foreach (LightweightTask task in childTasks) {
    484484        HiveTask childHiveTask = allHiveTasks[task.Id];
     485        BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
    485486        parentHiveTask.AddChildHiveTask(childHiveTask);
    486         BuildHiveJobTree(childHiveTask, allTasks, allHiveTasks);
    487487      }
    488488    }
Note: See TracChangeset for help on using the changeset viewer.