Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Clients.Hive/3.3/HiveTasks

Timestamp:

06/28/18 11:13:37 (7 years ago)

Author:

gkronber

Message:

#2522: merged trunk changes from r13402:15972 to branch resolving conflicts where necessary

Location:

branches/2522_RefactorPluginInfrastructure

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs (modified) (2 diffs)

branches/2522_RefactorPluginInfrastructure

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Clients.Hive/3.3/HiveTasks/EngineHiveTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -316 +316 @@
     public override void AddChildHiveTask(HiveTask hiveTask) {
       base.AddChildHiveTask(hiveTask);
-      var optimizerHiveJob = (OptimizerHiveTask)hiveTask;
+      var optimizerHiveTask = (OptimizerHiveTask)hiveTask;
       syncTasksWithOptimizers = false;
-      if (this.ItemTask != null && optimizerHiveJob.ItemTask != null) {
-        // if task is in state Paused, it has to preserve its ResultCollection, which is cleared when a optimizer is added to an experiment
-        OptimizerTask optimizerJobClone = null;
-        if (optimizerHiveJob.Task.State == TaskState.Paused) {
-          optimizerJobClone = (OptimizerTask)optimizerHiveJob.ItemTask.Clone();
-        }
+      if (this.ItemTask != null && optimizerHiveTask.ItemTask != null) {
+        OptimizerTask optimizerTaskClone = (OptimizerTask)optimizerHiveTask.ItemTask.Clone();
 
         if (this.ItemTask.Item is Optimization.Experiment) {
-          if (!this.ItemTask.OptimizerAsExperiment.Optimizers.Contains(optimizerHiveJob.ItemTask.Item)) {
-            UpdateOptimizerInExperiment(this.ItemTask.OptimizerAsExperiment, optimizerHiveJob.ItemTask);
+          if (!this.ItemTask.OptimizerAsExperiment.Optimizers.Contains(optimizerHiveTask.ItemTask.Item)) {
+            UpdateOptimizerInExperiment(this.ItemTask.OptimizerAsExperiment, optimizerHiveTask.ItemTask);
           }
         } else if (this.ItemTask.Item is Optimization.BatchRun) {
-          UpdateOptimizerInBatchRun(this.ItemTask.OptimizerAsBatchRun, optimizerHiveJob.ItemTask);
-        }
-
-        if (optimizerHiveJob.Task.State == TaskState.Paused) {
-          optimizerHiveJob.ItemTask = optimizerJobClone;
-        }
+          UpdateOptimizerInBatchRun(this.ItemTask.OptimizerAsBatchRun, optimizerHiveTask.ItemTask);
+        }
+
+        optimizerHiveTask.syncTasksWithOptimizers = false;
+        optimizerHiveTask.ItemTask = optimizerTaskClone;
+        optimizerHiveTask.syncTasksWithOptimizers = true;
       }
       syncTasksWithOptimizers = true;

@@ -24 +24 @@
 protoc.exe
 obj
+.vs