Changeset 10150 for trunk

Timestamp:

11/22/13 14:23:56 (11 years ago)

Author:

ascheibe

Message:

#2117

• improved creation of ItemTasks from Items and moved common functionality to ItemTask
• added a MenuItem for directly uploading tasks (e.g. from experiments, batchruns,...)
• added a MenuItem for creating RefreshableHiveJobs

Location:

trunk/sources

Files:

• 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 (added)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs (added)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (1 diff)

trunk/sources/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">

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading;
@@ -472 +471 @@
       Type objType = obj.GetType();
 
-      var typeHiveTaskMap = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
-          .Select(t => new Tuple<PropertyInfo, Type>(t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)), t));
-
-      var hiveTaskFound = typeHiveTaskMap.Any(x => x.Item1.PropertyType.IsAssignableFrom(objType));
-
+      var hiveTaskFound = ItemTask.IsTypeSupported(objType);
       if (hiveTaskFound) {
         if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
@@ -486 +481 @@
     private void jobsTreeView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        var obj = e.Data.GetData(Constants.DragDropDataFormat) as IDeepCloneable;
-        Type objType = obj.GetType();
-
-        var typeHiveTaskMap = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
-            .Select(t => new Tuple<PropertyInfo, Type>(t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)), t));
-
-        var hiveTaskType = typeHiveTaskMap.Single(x => x.Item1.PropertyType.IsAssignableFrom(objType)).Item2;
-
-        IDeepCloneable newObj = null;
+        var obj = e.Data.GetData(Constants.DragDropDataFormat) as IItem;
+
+        IItem newObj = null;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) {
-          newObj = obj.Clone(new Cloner());
+          newObj = obj.Clone(new Cloner()) as IItem;
         } else {
           newObj = obj;
@@ -512 +501 @@
         }
 
-        ItemTask hiveTask = Activator.CreateInstance(hiveTaskType, new object[] { newObj }) as ItemTask;
+        ItemTask hiveTask = ItemTask.GetItemTaskForItem(newObj);
         Content.HiveTasks.Add(hiveTask.CreateHiveTask());
       }

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

@@ -351 +351 @@
     /// </summary>
     /// <param name="parentHiveTask">shall be null if its the root task</param>
-    private void UploadTaskWithChildren(Progress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
+    private void UploadTaskWithChildren(IProgress progress, HiveTask hiveTask, HiveTask parentHiveTask, IEnumerable<Guid> groups, int[] taskCount, int totalJobCount, Guid configPluginId, Guid jobId, ILog log, bool isPrivileged, CancellationToken cancellationToken) {
       taskUploadSemaphore.WaitOne();
       bool semaphoreReleased = false;

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

@@ -157 +157 @@
     }
 
-    private Progress progress;
-    public Progress Progress {
+    private IProgress progress;
+    public IProgress Progress {
       get { return progress; }
       set {

trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -60 +60 @@
     }
 
-    public EngineTask(IEngine engine) {
-      this.Item = engine;
-    }
+    public EngineTask(IEngine engine) : base(engine) { }
 
     [StorableConstructor]

trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Hive;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.Hive {
@@ -76 +78 @@
       this.Item = cloner.Clone(original.Item);
     }
+    public ItemTask(IItem item) {
+      Item = item;
+    }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -216 +221 @@
       return Name;
     }
+
+    #region Helpers
+    public static bool IsTypeSupported(Type itemType) {
+      var supportedHiveTaskTypes = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
+          .Select(t => t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)).PropertyType);
+      return supportedHiveTaskTypes.Any(x => x.IsAssignableFrom(itemType));
+    }
+
+    public static Type GetHiveTaskType(Type itemType) {
+      if (!IsTypeSupported(itemType)) throw new Exception("Item " + itemType + " is not supported for Hive.");
+
+      var typeHiveTaskMap = ApplicationManager.Manager.GetTypes(typeof(ItemTask))
+          .Select(t => new Tuple<Type, Type>(t.GetProperties().Single(x => x.Name == "Item" && x.PropertyType != typeof(IItem)).PropertyType, t));
+
+      return typeHiveTaskMap.Single(x => x.Item1.IsAssignableFrom(itemType)).Item2;
+    }
+
+    public static ItemTask GetItemTaskForItem(IItem item) {
+      Type itemType = item.GetType();
+      Type hiveTaskType = GetHiveTaskType(itemType);
+      return Activator.CreateInstance(hiveTaskType, new object[] { item }) as ItemTask;
+    }
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -50 +50 @@
     }
 
-    public OptimizerTask(IOptimizer optimizer) {
-      this.Item = optimizer;
+    public OptimizerTask(IOptimizer optimizer)
+      : base(optimizer) {
 
       if (optimizer is Experiment) {