Changeset 11083 for stable/HeuristicLab.Clients.Hive.JobManager

Timestamp:

07/03/14 16:36:10 (10 years ago)

Author:

ascheibe

Message:

#2117 merged r10130, r10150, r10154, r10170, r11079 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (2 diffs)

stable/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -98 +98 @@
     <Compile Include="ExtensionMethods\TreeNodeExtensions.cs" />
     <Compile Include="ListViewItemDateComparer.cs" />
+    <Compile Include="MenuItems\CreateHiveJobMenuItem.cs" />
+    <Compile Include="MenuItems\RunInHiveMenuItem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Views\HiveJobManagerView.cs">

stable/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Clients.Hive;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimizer;
 
-namespace HeuristicLab.Optimizer.MenuItems {
+namespace HeuristicLab.Clients.Hive.JobManager {
   public class CreateHiveJobMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
@@ -48 +48 @@
           Type contentType = content.GetType();
           ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType);
-        } else {
-          ToolStripItem.Enabled = false;
+          return;
         }
       }
+      ToolStripItem.Enabled = false;
     }
 
@@ -74 +74 @@
       HiveTask task = hiveTask.CreateHiveTask();
       RefreshableJob rJob = new RefreshableJob();
-      rJob.Job.Name = content.ItemName;
+      rJob.Job.Name = content.ToString();
       rJob.HiveTasks.Add(task);
       task.ItemTask.ComputeInParallel = content is Experiment || content is BatchRun;

stable/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Clients.Hive;
 using HeuristicLab.MainForm;
+using HeuristicLab.Optimizer;
 
-namespace HeuristicLab.Optimizer.MenuItems {
+namespace HeuristicLab.Clients.Hive.JobManager {
   public class JobManagerMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {

stable/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Threading;
-using HeuristicLab.Clients.Hive;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimizer;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Optimizer.MenuItems {
+namespace HeuristicLab.Clients.Hive.JobManager {
   public class RunInHiveMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
@@ -50 +50 @@
           Type contentType = content.GetType();
           ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType);
-        } else {
-          ToolStripItem.Enabled = false;
+          return;
         }
       }
+      ToolStripItem.Enabled = false;
     }
 
@@ -78 +78 @@
       HiveTask task = hiveTask.CreateHiveTask();
       RefreshableJob rJob = new RefreshableJob();
-      rJob.Job.Name = content.ItemName;
+      rJob.Job.Name = content.ToString();
       rJob.HiveTasks.Add(task);
       task.ItemTask.ComputeInParallel = content is Experiment || content is BatchRun;

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -468 +468 @@
     private void jobsTreeView_DragEnter(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      var obj = e.Data.GetData(Constants.DragDropDataFormat);
-      if (obj is IOptimizer) {
+      var obj = (IDeepCloneable)e.Data.GetData(Constants.DragDropDataFormat);
+
+      Type objType = obj.GetType();
+      if (ItemTask.IsTypeSupported(objType)) {
         if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
         else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
@@ -478 +480 @@
     private void jobsTreeView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var obj = e.Data.GetData(Constants.DragDropDataFormat);
-
-        var optimizer = obj as IOptimizer;
-        if (optimizer != null) {
-          IOptimizer newOptimizer = null;
-          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
-            newOptimizer = (IOptimizer)optimizer.Clone();
-            newOptimizer.Runs.Clear();
-          } else {
-            newOptimizer = optimizer;
+        var obj = (IItem)e.Data.GetData(Constants.DragDropDataFormat);
+
+        IItem newObj = null;
+        if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+          newObj = (IItem)obj.Clone();
+        } else {
+          newObj = obj;
+        }
+
+        //IOptimizer and IExecutables need some special care
+        if (newObj is IOptimizer) {
+          ((IOptimizer)newObj).Runs.Clear();
+        }
+        if (newObj is IExecutable) {
+          IExecutable exec = (IExecutable)newObj;
+          if (exec.ExecutionState != ExecutionState.Prepared) {
+            exec.Prepare();
           }
-          if (newOptimizer.ExecutionState != ExecutionState.Prepared) {
-            newOptimizer.Prepare();
-          }
-
-          Content.HiveTasks.Add(new OptimizerHiveTask(newOptimizer));
-        }
+        }
+
+        ItemTask hiveTask = ItemTask.GetItemTaskForItem(newObj);
+        Content.HiveTasks.Add(hiveTask.CreateHiveTask());
       }
     }