Changeset 5193 for trunk/sources/HeuristicLab.Optimization

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.Optimization/3.3/UserDefinedProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/UserDefinedProblem.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Threading;
 
 namespace HeuristicLab.Optimization {
@@ -248 +249 @@
       public bool Breakpoint { get; set; }
 
-      public IOperation Execute(IExecutionContext context) {
-        throw new InvalidOperationException("Please choose an appropriate evaluation operator.");
-      }
-
-      public void Abort() {
+      public IOperation Execute(IExecutionContext context, CancellationToken cancellationToken) {
         throw new InvalidOperationException("Please choose an appropriate evaluation operator.");
       }