Changeset 2818 for trunk/sources/HeuristicLab.SequentialEngine

Timestamp:

02/17/10 05:24:03 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• corrected several bugs in order to get SGA working

File:

• trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs (modified) (1 diff)

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

@@ -62 +62 @@
         for (int i = coll.Count - 1; i >= 0; i--)
           ExecutionStack.Push(coll[i]);
-        next = ExecutionStack.Pop();
+        next = ExecutionStack.Count > 0 ? ExecutionStack.Pop() : null;
         coll = next as ExecutionContextCollection;
       }
       ExecutionContext context = next as ExecutionContext;
-      try {
-        currentOperator = context.Operator;
-        ExecutionStack.Push(context.Operator.Execute(context));
-        currentOperator = null;
+      if (context != null) {
+        try {
+          currentOperator = context.Operator;
+          ExecutionStack.Push(context.Operator.Execute(context));
+          currentOperator = null;
+        }
+        catch (Exception ex) {
+          ExecutionStack.Push(context);
+          Stop();
+          OnExceptionOccurred(ex);
+        }
+        if (context.Operator.Breakpoint)
+          Stop();
       }
-      catch (Exception ex) {
-        ExecutionStack.Push(context);
-        Stop();
-        OnExceptionOccurred(ex);
-      }
-      if (context.Operator.Breakpoint)
-        Stop();
     }
   }