Changeset 27

Timestamp:

02/28/08 12:21:16 (17 years ago)

Author:

gkronber

Message:

fixed #34 by not extending ProcessingEngine from ThreadParallelEngine. This also has the benefit that Grid and DistributedEngine are not dependent on ThreadParallelEngine anymore.

Location:

trunk/sources

Files:

• HeuristicLab.DistributedEngine/HeuristicLab.DistributedEngine.csproj (modified) (1 diff)
• HeuristicLab.DistributedEngine/HeuristicLabDistributedEnginePlugin.cs (modified) (1 diff)
• HeuristicLab.Grid/HeuristicLab.Grid.csproj (modified) (1 diff)
• HeuristicLab.Grid/HeuristicLabGridPlugin.cs (modified) (1 diff)
• HeuristicLab.Grid/ProcessingEngine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DistributedEngine/HeuristicLab.DistributedEngine.csproj

@@ -72 +72 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.ThreadParallelEngine\HeuristicLab.ThreadParallelEngine.csproj">
-      <Project>{6E757D0E-20F9-4E89-AF06-D7DA256870DB}</Project>
-      <Name>HeuristicLab.ThreadParallelEngine</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.DistributedEngine/HeuristicLabDistributedEnginePlugin.cs

@@ -30 +30 @@
   [Dependency(Dependency = "HeuristicLab.Core")]
   [Dependency(Dependency = "HeuristicLab.Grid")]
-  [Dependency(Dependency = "HeuristicLab.ThreadParallelEngine")]
   public class HeuristicLabDistributedEnginePlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Grid/HeuristicLab.Grid.csproj

@@ -83 +83 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HeuristicLab.ThreadParallelEngine\HeuristicLab.ThreadParallelEngine.csproj">
-      <Project>{6E757D0E-20F9-4E89-AF06-D7DA256870DB}</Project>
-      <Name>HeuristicLab.ThreadParallelEngine</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Grid/HeuristicLabGridPlugin.cs

@@ -30 +30 @@
   [PluginFile(Filename = "HeuristicLab.Grid.dll", Filetype = PluginFileType.Assembly)]
   [Dependency(Dependency = "HeuristicLab.Core")]
-  [Dependency(Dependency = "HeuristicLab.ThreadParallelEngine")]
   public class HeuristicLabGridPlugin : PluginBase {
   }

trunk/sources/HeuristicLab.Grid/ProcessingEngine.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using System.Xml;
+using System.Threading;
 
 namespace HeuristicLab.Grid {
-  public class ProcessingEngine : ThreadParallelEngine.ThreadParallelEngine {
-
+  public class ProcessingEngine : EngineBase {
     private AtomicOperation initialOperation;
     public AtomicOperation InitialOperation {
@@ -56 +56 @@
       initialOperation = (AtomicOperation)PersistenceManager.Restore(node.SelectSingleNode("InitialOperation"), restoredObjects);
     }
+
+    protected override void ProcessNextOperation() {
+      IOperation operation = myExecutionStack.Pop();
+      if(operation is AtomicOperation) {
+        AtomicOperation atomicOperation = (AtomicOperation)operation;
+        IOperation next = null;
+        try {
+          next = atomicOperation.Operator.Execute(atomicOperation.Scope);
+        } catch(Exception ex) {
+          // push operation on stack again
+          myExecutionStack.Push(atomicOperation);
+          Abort();
+          ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex); });
+        }
+        if(next != null)
+          myExecutionStack.Push(next);
+        OnOperationExecuted(atomicOperation);
+        if(atomicOperation.Operator.Breakpoint) Abort();
+      } else if(operation is CompositeOperation) {
+        CompositeOperation compositeOperation = (CompositeOperation)operation;
+        for(int i = compositeOperation.Operations.Count - 1; i >= 0; i--)
+          myExecutionStack.Push(compositeOperation.Operations[i]);
+      }
+    }
   }
 }