Changeset 5193 for trunk/sources/HeuristicLab.Core/3.3/Interfaces

Timestamp:

01/03/11 00:46:55 (14 years ago)

Author:

swagner

Message:

Merged ParallelEngine branch back into trunk (#1333)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Interfaces/IOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperator.cs

@@ -21 +21 @@
 
 using System;
+using System.Threading;
 
 namespace HeuristicLab.Core {
   /// <summary>
-  /// Interface to represent an operator (e.g. GreaterThanComparator,...), 
-  /// a basic instruction of an algorithm.
+  /// Interface to represent an operator.
   /// </summary>
   public interface IOperator : IParameterizedNamedItem {
-    /// <summary>
-    /// Gets or sets a boolean value whether the engine should stop here during the run.
-    /// </summary>
     bool Breakpoint { get; set; }
 
-    /// <summary>
-    /// Executes the current instance on the specified <paramref name="scope"/>.
-    /// </summary>
-    /// <param name="scope">The scope where to execute the current instance.</param>
-    /// <returns>The next operation.</returns>
-    IOperation Execute(IExecutionContext context);
-    /// <summary>
-    /// Aborts the current operator.
-    /// </summary>
-    void Abort();
+    IOperation Execute(IExecutionContext context, CancellationToken cancellationToken);
 
-    /// <summary>
-    /// Occurs when the breakpoint flag of the current instance was changed.
-    /// </summary>
-    event EventHandler BreakpointChanged; 
-    /// <summary>
-    /// Occurs when the current instance is executed.
-    /// </summary>
+    event EventHandler BreakpointChanged;
     event EventHandler Executed;
   }