Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

Timestamp:

05/20/15 16:41:14 (10 years ago)

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -234 +234 @@
       itemTaskLock.EnterWriteLock();
       try {
-        if (batchRun.Optimizer == null) {
-          batchRun.Optimizer = (IOptimizer)optimizerTask.Item; // only set the first optimizer as Optimizer. if every time the Optimizer would be set, the runs would be cleared each time
-        }
-        foreach (IRun run in optimizerTask.Item.Runs) {
-          if (!batchRun.Runs.Contains(run)) {
+        if (optimizerTask.Item is IAlgorithm) {
+          // only set the first optimizer as Optimizer. if every time the Optimizer would be set, the runs would be cleared each time
+          if (batchRun.Optimizer == null) {
+            batchRun.Optimizer = (IOptimizer)optimizerTask.Item.Clone();
+            batchRun.Optimizer.Runs.Clear();
+          }
+
+          foreach (IRun run in optimizerTask.Item.Runs) {
+            run.Name = GetNewRunName(run, batchRun.Runs);
+            batchRun.Optimizer.Runs.Add(run);
+          }
+        } else {
+          // only set the first optimizer as Optimizer. if every time the Optimizer would be set, the runs would be cleared each time
+          if (batchRun.Optimizer == null) {
+            batchRun.Optimizer = optimizerTask.Item;
+          }
+          foreach (IRun run in optimizerTask.Item.Runs) {
+            if (batchRun.Runs.Contains(run)) continue;
             run.Name = GetNewRunName(run, batchRun.Runs);
             batchRun.Runs.Add(run);