Changeset 15574 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch

Timestamp:

01/04/18 00:36:40 (7 years ago)

Author:

abeham

Message:

#1614: Added CPLEX algorithms

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch

Files:

• IteratedLS.cs (modified) (2 diffs)
• MultistartLS.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.cs

@@ -101 +101 @@
       Results.Add(new Result("BestSolution", Context.BestSolution));
 
-      Context.RunOperator(Analyzer, Context.Scope, token);
+      try {
+        Context.RunOperator(Analyzer, token);
+      } catch (OperationCanceledException) { }
     }
 
@@ -141 +143 @@
 
         try {
-          Context.RunOperator(Analyzer, Context.Scope, cancellationToken);
+          Context.RunOperator(Analyzer, cancellationToken);
         } catch (OperationCanceledException) { }
 

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/MultistartLS.cs

@@ -108 +108 @@
 
         try {
-          Context.RunOperator(Analyzer, Context.Scope, cancellationToken);
+          Context.RunOperator(Analyzer, cancellationToken);
         } catch (OperationCanceledException) { }