Changeset 5208 for trunk/sources/HeuristicLab.Optimization.Operators

Timestamp:

01/04/11 06:17:50 (14 years ago)

Author:

swagner

Message:

Adapted EAs to enable parallel solution evaluation (#1333)

File:

• trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs

@@ -29 +29 @@
 namespace HeuristicLab.Optimization.Operators {
   /// <summary>
-  /// An operator which creates new solutions.
+  /// An operator which creates new solutions. Evaluation of the new solutions is executed in parallel, if an engine is used which supports parallelization.
   /// </summary>
-  [Item("SolutionsCreator", "An operator which creates new solutions.")]
+  [Item("SolutionsCreator", "An operator which creates new solutions. Evaluation of the new solutions is executed in parallel, if an engine is used which supports parallelization.")]
   [StorableClass]
   public sealed class SolutionsCreator : SingleSuccessorOperator {
@@ -61 +61 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSolutions", "The number of solutions that should be created."));
       Parameters.Add(new ValueLookupParameter<IOperator>("SolutionCreator", "The operator which is used to create new solutions."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
     }
@@ -78 +78 @@
         CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
 
+      OperationCollection creation = new OperationCollection();
+      OperationCollection evaluation = new OperationCollection() { Parallel = true };
+      for (int i = 0; i < count; i++) {
+        if (creator != null) creation.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
+        if (evaluator != null) evaluation.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
+      }
       OperationCollection next = new OperationCollection();
-      for (int i = 0; i < count; i++) {
-        if (creator != null) next.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
-        if (evaluator != null) next.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
-      }
+      next.Add(creation);
+      next.Add(evaluation);
       next.Add(base.Apply());
       return next;