Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Tasks

Timestamp:

07/18/14 12:35:00 (10 years ago)

Author:

ascheibe

Message:

reverted last commit

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (4 diffs)

branches/HiveStatistics/sources

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
   [StorableClass]
   public class EngineTask : ItemTask {
-    public override HiveTask CreateHiveTask() {
-      //only used when deserializing, so no problem with parentscope
-      return new EngineHiveTask(this, null);
-    }
-
     [Storable]
     protected IOperation initialOperation;
@@ -55 +50 @@
 
     #region constructors and cloning
+    public EngineTask() { }
     public EngineTask(IOperation initialOperation, IEngine engine) {
       this.initialOperation = initialOperation;
       this.Item = engine;
     }
-
-    public EngineTask(IEngine engine) : base(engine) { }
 
     [StorableConstructor]
@@ -150 +144 @@
 
     public override string Name {
-      get { return Item != null ? Item.ToString() : "Engine Task"; }
+      get { return Item != null ? Item.ToString() : null; }
       set { throw new NotSupportedException(); }
     }
@@ -159 +153 @@
 
     public override string ItemName {
-      get { return "Engine Task"; }
+      get { return "EngineTask"; }
     }
   }

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -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 {
@@ -33 +31 @@
   [StorableClass]
   public abstract class ItemTask : NamedItem, ITask {
-    public virtual HiveTask CreateHiveTask() {
-      return new HiveTask(this, true);
-    }
-
     public virtual bool IsParallelizable {
       get { return true; }
-      set { }
     }
 
@@ -78 +71 @@
       this.Item = cloner.Clone(original.Item);
     }
-    public ItemTask(IItem item) {
-      Item = item;
-    }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -221 +211 @@
       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
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -30 +30 @@
   [StorableClass]
   public class OptimizerTask : ItemTask {
-    public override HiveTask CreateHiveTask() {
-      return new OptimizerHiveTask(this);
-    }
-
     public override bool IsParallelizable {
       get { return this.Item is Experiment || this.Item is BatchRun; }
@@ -50 +46 @@
     }
 
+    public OptimizerTask() : base() { }
     public OptimizerTask(IOptimizer optimizer)
-      : base(optimizer) {
-
-      if (optimizer is Experiment || optimizer is BatchRun) {
+      : this() {
+      this.Item = optimizer;
+
+      if (optimizer is Experiment) {
         this.ComputeInParallel = true;
+      } else if (optimizer is BatchRun) {
+        this.ComputeInParallel = false;
       } else {
         this.ComputeInParallel = false;
@@ -210 +210 @@
       get {
         if (Item == null)
-          return "Optimizer Task";
+          return string.Empty;
         else
           return Item.Name;

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll