Changeset 7566 for branches/MPI/HeuristicLab.Operators.MPISupport/3.3

Timestamp:

03/06/12 16:11:36 (13 years ago)

Author:

svonolfe

Message:

Adapted MPI operators (#1542)

Location:

branches/MPI/HeuristicLab.Operators.MPISupport/3.3

Files:

• MPIHelper.cs (modified) (3 diffs)
• MPISolutionsCreator.cs (modified) (2 diffs)
• MPIUniformSubscopesProcessor.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

branches/MPI/HeuristicLab.Operators.MPISupport/3.3/MPIHelper.cs

@@ -27 +27 @@
     }
 
-    public static void Execute(IAtomicOperation op, CancellationToken cancellationToken) {
+    public static void Execute(IAtomicOperation op) {
       IOperation next;
       OperationCollection coll;
@@ -36 +36 @@
 
       while (executionStack.Count > 0) {
-        cancellationToken.ThrowIfCancellationRequested();
-
         next = executionStack.Pop();
         if (next is OperationCollection) {
@@ -46 +44 @@
           operation = (IAtomicOperation)next;
           try {
-            next = operation.Operator.Execute((IExecutionContext)operation, cancellationToken);
+            next = operation.Operator.Execute((IExecutionContext)operation, new CancellationToken());
           }
           catch (Exception ex) {

branches/MPI/HeuristicLab.Operators.MPISupport/3.3/MPISolutionsCreator.cs

@@ -29 +29 @@
 using System.Collections.Generic;
 using MPI;
+using System;
 
 namespace HeuristicLab.Operators.MPISupport {
@@ -103 +104 @@
           if (creator != null) {
             IAtomicOperation op = ExecutionContext.CreateOperation(creator, scopes[i]);
-            MPIHelper.Execute(op, CancellationToken);
+            MPIHelper.Execute(op);
           }
 
           if (evaluator != null) {
             IAtomicOperation op = ExecutionContext.CreateOperation(evaluator, scopes[i]);
-            MPIHelper.Execute(op, CancellationToken);
+            MPIHelper.Execute(op);
           }
 

branches/MPI/HeuristicLab.Operators.MPISupport/3.3/MPIUniformSubscopesProcessor.cs

@@ -64 +64 @@
           for (int i = start; i < end; i++) {
             IAtomicOperation op = ExecutionContext.CreateOperation(Operator, scopes[i]);
-            MPIHelper.Execute(op, CancellationToken);
+            MPIHelper.Execute(op);
             
             //SEND results to other clients

branches/MPI/HeuristicLab.Operators.MPISupport/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Operators.MPISupport", "3.3.4.$WCREV$")]
   [PluginFile("HeuristicLab.Operators.MPISupport-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.MPInet", "1.0.0")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]