Changeset 32 for trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

Timestamp:

02/29/08 19:22:27 (16 years ago)

Author:

gkronber

Message:

worked on #2

File:

• trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.DistributedEngine/DistributedEngine.cs

@@ -33 +33 @@
 namespace HeuristicLab.DistributedEngine {
   public class DistributedEngine : EngineBase, IEditable {
-    // currently executed operators
-    private IOperator[] currentOperators;
-    private int operatorIndex;
     private IGridServer server;
+    private Dictionary<Guid, AtomicOperation> runningEngines = new Dictionary<Guid, AtomicOperation>();
 
     private string serverAddress;
@@ -47 +45 @@
       }
     }
-
-    public DistributedEngine() {
-      currentOperators = new IOperator[1000];
-    }
-
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
@@ -84 +77 @@
     public override void Abort() {
       base.Abort();
-      for(int i = 0; i < currentOperators.Length; i++) {
-        if(currentOperators[i] != null)
-          currentOperators[i].Abort();
+      foreach(Guid engineGuid in runningEngines.Keys) {
+        server.AbortEngine(engineGuid);
       }
     }
 
     protected override void ProcessNextOperation() {
-      operatorIndex = 1;
       ProcessNextOperation(myExecutionStack, 0);
     }
@@ -100 +91 @@
         IOperation next = null;
         try {
-          currentOperators[currentOperatorIndex] = atomicOperation.Operator;
           next = atomicOperation.Operator.Execute(atomicOperation.Scope);
         } catch(Exception ex) {
@@ -115 +105 @@
         CompositeOperation compositeOperation = (CompositeOperation)operation;
         if(compositeOperation.ExecuteInParallel) {
-          Dictionary<Guid, AtomicOperation> runningEngines = new Dictionary<Guid, AtomicOperation>();
           foreach(AtomicOperation parOperation in compositeOperation.Operations) {
             ProcessingEngine engine = new ProcessingEngine(OperatorGraph, GlobalScope, parOperation); // OperatorGraph not needed?