Changeset 2834 for trunk/sources/HeuristicLab.SequentialEngine

Timestamp:

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

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

File:

• trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -57 +55 @@
     protected override void ProcessNextOperator() {
       currentOperator = null;
-      IExecutionSequence next = ExecutionStack.Pop();
-      ExecutionContextCollection coll = next as ExecutionContextCollection;
+      IOperation next = ExecutionStack.Pop();
+      OperationCollection coll = next as OperationCollection;
       while (coll != null) {
         for (int i = coll.Count - 1; i >= 0; i--)
           ExecutionStack.Push(coll[i]);
         next = ExecutionStack.Count > 0 ? ExecutionStack.Pop() : null;
-        coll = next as ExecutionContextCollection;
+        coll = next as OperationCollection;
       }
-      ExecutionContext context = next as ExecutionContext;
-      if (context != null) {
+      IAtomicOperation operation = next as IAtomicOperation;
+      if (operation != null) {
         try {
-          currentOperator = context.Operator;
-          ExecutionStack.Push(context.Operator.Execute(context));
+          currentOperator = operation.Operator;
+          ExecutionStack.Push(operation.Operator.Execute((IExecutionContext)operation));
           currentOperator = null;
         }
         catch (Exception ex) {
-          ExecutionStack.Push(context);
+          ExecutionStack.Push(operation);
           Stop();
           OnExceptionOccurred(ex);
         }
-        if (context.Operator.Breakpoint)
+        if (operation.Operator.Breakpoint)
           Stop();
       }