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

Timestamp:

07/18/14 13:34:37 (10 years ago)

Author:

ascheibe

Message:

merged only Hive changes from trunk into branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive

Files:

• . (modified) (1 prop)
• 3.3/Tasks/OptimizerTask.cs (modified) (4 diffs)

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 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; }
@@ -46 +50 @@
     }
 
-    public OptimizerTask() : base() { }
     public OptimizerTask(IOptimizer optimizer)
-      : this() {
-      this.Item = optimizer;
-
-      if (optimizer is Experiment) {
+      : base(optimizer) {
+
+      if (optimizer is Experiment || optimizer is BatchRun) {
         this.ComputeInParallel = true;
-      } else if (optimizer is BatchRun) {
-        this.ComputeInParallel = false;
       } else {
         this.ComputeInParallel = false;
@@ -210 +210 @@
       get {
         if (Item == null)
-          return string.Empty;
+          return "Optimizer Task";
         else
           return Item.Name;