Changeset 2834 for trunk/sources/HeuristicLab.Evolutionary/3.3

Timestamp:

02/19/10 06:19:16 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

Location:

trunk/sources/HeuristicLab.Evolutionary/3.3

Files:

• ChildrenCreator.cs (modified) (1 diff)
• PopulationCreator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Evolutionary/3.3/ChildrenCreator.cs

@@ -60 +60 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int parentsPerChild = ParentsPerChildParameter.ActualValue.Value;
       int parents = CurrentScope.SubScopes.Count;

trunk/sources/HeuristicLab.Evolutionary/3.3/PopulationCreator.cs

@@ -59 +59 @@
     }
 
-    public override IExecutionSequence Apply() {
+    public override IOperation Apply() {
       int size = PopulationSizeParameter.ActualValue.Value;
       IOperator creator = SolutionCreatorParameter.ActualValue;
@@ -69 +69 @@
         CurrentScope.SubScopes.Add(new Scope(i.ToString()));
 
-      ExecutionContextCollection next = new ExecutionContextCollection();
+      OperationCollection next = new OperationCollection();
       for (int i = 0; i < CurrentScope.SubScopes.Count; i++) {
-        if (creator != null) next.Add(ExecutionContext.CreateContext(creator, CurrentScope.SubScopes[i]));
-        if (evaluator != null) next.Add(ExecutionContext.CreateContext(evaluator, CurrentScope.SubScopes[i]));
+        if (creator != null) next.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[i]));
+        if (evaluator != null) next.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[i]));
       }
       next.Add(base.Apply());