Changeset 10117

Timestamp:

11/08/13 18:39:42 (11 years ago)

Author:

ascheibe

Message:

#1886 made RunCollectionModifierHiveTask distributable

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3

Files:

• HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (1 diff)
• RunCollectionModifiers/RunCollectionModifierHiveTask.cs (modified) (2 diffs)
• RunCollectionModifiers/RunCollectionModifierTask.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj

@@ -93 +93 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierHiveTask.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Clients.Hive;
 using HeuristicLab.Common;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Analysis.SolutionCaching {
@@ -30 +34 @@
       ItemTask = task;
     }
+
     public RunCollectionModifierHiveTask(RunCollectionModifierExecutable executable)
       : base() {
       ItemTask = new RunCollectionModifierTask(executable);
     }
+
     protected RunCollectionModifierHiveTask(RunCollectionModifierHiveTask original, Cloner cloner)
-      : base(original, cloner) { }
+      : base(original, cloner) {
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RunCollectionModifierHiveTask(this, cloner);
     }
     #endregion
+
+    public override void IntegrateChild(ItemTask task, Guid childTaskId) {
+      var optimizerTask = (RunCollectionModifierTask)task;
+      syncTasksWithOptimizers = false; // don't sync with optimizers during this method
+
+      if (this.ItemTask != null && this.ItemTask.Item != null) {
+        itemTaskLock.EnterWriteLock();
+        try {
+          this.ItemTask.Item.RunCollection.AddRange(((RunCollectionModifierExecutable)task.Item).RunCollection);
+        }
+        finally {
+          itemTaskLock.ExitWriteLock();
+        }
+      }
+
+      IEnumerable<HiveTask> childs = this.ChildHiveTasks.Where(j => j.Task.Id == childTaskId);
+      //TODO: in very rare cases childs is empty. This shouldn't be the case and should be further investigated.
+      if (childs.Count() > 0) {
+        RunCollectionModifierHiveTask child = childs.First() as RunCollectionModifierHiveTask;
+        if (child != null && !optimizerTask.ComputeInParallel) {
+          child.ItemTask = optimizerTask;
+        }
+      }
+      syncTasksWithOptimizers = true;
+    }
+
+    protected override void UpdateChildHiveTasks() {
+      childHiveTasksLock.EnterWriteLock();
+      try {
+        if (Task != null && syncTasksWithOptimizers) {
+          if (!ItemTask.ComputeInParallel) {
+            if (childHiveTasks.Any()) {
+              var exec = (RunCollectionModifierExecutable)ItemTask.Item;
+              //compute in parallel was deactivated, copy runs back
+              foreach (var childHiveTask in childHiveTasks) {
+                exec.RunCollection.AddRange(((RunCollectionModifierExecutable)childHiveTask.ItemTask.Item).RunCollection);
+              }
+            }
+            childHiveTasks.Clear();
+          } else {
+            var runs = ItemTask.Item.RunCollection;
+            foreach (var run in runs) {
+              var exec = (RunCollectionModifierExecutable)ItemTask.Item.Clone(new Cloner());
+              //TODO: this could be more efficient, create new RCME instead of cloning
+              exec.RunCollection.Clear();
+              exec.RunCollection.Add(run);
+
+              var rcmHiveTask = new RunCollectionModifierHiveTask(exec);
+              rcmHiveTask.Task.Priority = Task.Priority;
+              childHiveTasks.Add(rcmHiveTask);
+            }
+            ItemTask.Item.RunCollection.Clear();
+          }
+        }
+      }
+      finally {
+        childHiveTasksLock.ExitWriteLock();
+      }
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RunCollectionModifiers/RunCollectionModifierTask.cs

@@ -30 +30 @@
   [StorableClass]
   public class RunCollectionModifierTask : ItemTask {
-    public override bool IsParallelizable {
+    /*public override bool IsParallelizable {
       get { return false; }
-    }
+    } */
 
     public new RunCollectionModifierExecutable Item {