Changeset 6358

Timestamp:

06/05/11 22:43:07 (13 years ago)

Author:

cneumuel

Message:

#1233

• svn fixes

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4

Files:

• HiveEngine.cs (modified) (1 diff)
• Tests (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test) (1 prop)
• Tests/HeuristicLab.HiveEngine-3.4.Tests.csproj (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/HeuristicLab.HiveEngine-3.4.Tests.csproj)
• Tests/HeuristicLab.HiveEngine.Test.csproj (deleted)
• Tests/Program.cs (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/Program.cs)
• Tests/app.config (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/app.config)
• Tests/app_services.config (copied) (copied from branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine.Test/app_services.config)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/HiveEngine.cs

@@ -150 +150 @@
 
         next = executionStack.Pop();
-        bool isOpCollection = next is OperationCollection;
-        int collCount = isOpCollection ? ((OperationCollection)next).Count : 0;
-        string opName = !isOpCollection ? ((IAtomicOperation)next).Operator.Name : "OpCollection";
+        //bool isOpCollection = next is OperationCollection;
+        //int collCount = isOpCollection ? ((OperationCollection)next).Count : 0;
+        //string opName = !isOpCollection ? ((IAtomicOperation)next).Operator.Name : "OpCollection";
 
         if (next is OperationCollection) {
           coll = (OperationCollection)next;
 
-          bool isPMOEvaluator = coll.Count > 0 && coll.First() is HeuristicLab.Core.ExecutionContext && ((HeuristicLab.Core.ExecutionContext)coll.First()).Operator.GetType().Name == "PMOEvaluator";
-          bool isAlgorithmEvaluator = coll.Count > 0 && coll.First() is HeuristicLab.Core.ExecutionContext && ((HeuristicLab.Core.ExecutionContext)coll.First()).Operator.GetType().Name == "AlgorithmEvaluator";
-
-          if (coll.Parallel && isPMOEvaluator) {
-            Task[] tasks = new Task[coll.Count];
-            Stack<IOperation>[] stacks = new Stack<IOperation>[coll.Count];
-            for (int i = 0; i < coll.Count; i++) {
-              stacks[i] = new Stack<IOperation>();
-              stacks[i].Push(coll[i]);
-              tasks[i] = Task.Factory.StartNew(Run, stacks[i], cancellationToken);
-            }
-            try {
-              Task.WaitAll(tasks);
-            }
-            catch (AggregateException ex) {
-              OperationCollection remaining = new OperationCollection() { Parallel = true };
-              for (int i = 0; i < stacks.Length; i++) {
-                if (stacks[i].Count == 1)
-                  remaining.Add(stacks[i].Pop());
-                if (stacks[i].Count > 1) {
-                  OperationCollection ops = new OperationCollection();
-                  while (stacks[i].Count > 0)
-                    ops.Add(stacks[i].Pop());
-                  remaining.Add(ops);
-                }
-              }
-              if (remaining.Count > 0) executionStack.Push(remaining);
-              throw ex;
-            }
-          } else if (coll.Parallel) {
+          //bool isPMOEvaluator = coll.Count > 0 && coll.First() is HeuristicLab.Core.ExecutionContext && ((HeuristicLab.Core.ExecutionContext)coll.First()).Operator.GetType().Name == "PMOEvaluator";
+          //bool isAlgorithmEvaluator = coll.Count > 0 && coll.First() is HeuristicLab.Core.ExecutionContext && ((HeuristicLab.Core.ExecutionContext)coll.First()).Operator.GetType().Name == "AlgorithmEvaluator";
+
+          //if (coll.Parallel && isPMOEvaluator) {
+          //  Task[] tasks = new Task[coll.Count];
+          //  Stack<IOperation>[] stacks = new Stack<IOperation>[coll.Count];
+          //  for (int i = 0; i < coll.Count; i++) {
+          //    stacks[i] = new Stack<IOperation>();
+          //    stacks[i].Push(coll[i]);
+          //    tasks[i] = Task.Factory.StartNew(Run, stacks[i], cancellationToken);
+          //  }
+          //  try {
+          //    Task.WaitAll(tasks);
+          //  }
+          //  catch (AggregateException ex) {
+          //    OperationCollection remaining = new OperationCollection() { Parallel = true };
+          //    for (int i = 0; i < stacks.Length; i++) {
+          //      if (stacks[i].Count == 1)
+          //        remaining.Add(stacks[i].Pop());
+          //      if (stacks[i].Count > 1) {
+          //        OperationCollection ops = new OperationCollection();
+          //        while (stacks[i].Count > 0)
+          //          ops.Add(stacks[i].Pop());
+          //        remaining.Add(ops);
+          //      }
+          //    }
+          //    if (remaining.Count > 0) executionStack.Push(remaining);
+          //    throw ex;
+          //  }
+          //} else if (coll.Parallel) {
+          if(coll.Parallel) {
             // clone the parent scope here and reuse it for each operation. otherwise for each job the whole scope-tree first needs to be copied and then cleaned, which causes a lot of work for the Garbage Collector
             IScope parentScopeClone = (IScope)((IAtomicOperation)coll.First()).Scope.Parent.Clone();

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.HiveEngine/3.4/Tests

@@ -3 +3 @@
 HeuristicLab.HiveEngine.Test.csproj.vs10x
 HeuristicLab.HiveEngine.Test.csproj.user
+HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
+Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl

@@ -3 +3 @@
 HeuristicLab.HiveEngine.Test.csproj.vs10x
 HeuristicLab.HiveEngine.Test.csproj.user
+HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
+Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl

@@ -3 +3 @@
 HeuristicLab.HiveEngine.Test.csproj.vs10x
 HeuristicLab.HiveEngine.Test.csproj.user
+HeuristicLab.HiveEngine-3.4.Tests.csproj.vs10x
+Meta-GA - Meta Optimization Problem (Genetic Programming - Symbolic Regression 3.4 scaled)_small.hl