Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment

Timestamp:

10/04/19 17:31:54 (5 years ago)

Author:

mkommend

Message:

#2521: Added cancellation token to evaluate function of problems.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -135 +136 @@
     }
 
-    public override double Evaluate(Permutation assignment, IRandom random) {
-      return Evaluate(assignment);
-    }
-
-    public double Evaluate(Permutation assignment) {
+    public override double Evaluate(Permutation assignment, IRandom random, CancellationToken cancellationToken) {
+      return Evaluate(assignment, cancellationToken);
+    }
+
+    public double Evaluate(Permutation assignment, CancellationToken cancellationToken) {
       double quality = 0;
       for (int i = 0; i < assignment.Length; i++) {
@@ -283 +284 @@
       // calculate the optimum of a LAP relaxation and use it as lower bound of our QAP
       LowerBound = new DoubleValue(GilmoreLawlerBoundCalculator.CalculateLowerBound(Weights, Distances, out lbSolution));
-      // evalute the LAP optimal solution as if it was a QAP solution
-      var lbSolutionQuality = Evaluate(lbSolution);
+      // evaluate the LAP optimal solution as if it was a QAP solution
+      var lbSolutionQuality = Evaluate(lbSolution, CancellationToken.None);
       // in case both qualities are the same it means that the LAP optimum is also a QAP optimum
       if (LowerBound.Value.IsAlmost(lbSolutionQuality)) {
@@ -312 +313 @@
 
     public void Load(QAPData data) {
-      if (data.Dimension > ProblemSizeLimit) throw new System.IO.InvalidDataException("The problem is limited to instance of size " + ProblemSizeLimit + ". You can change this limit by modifying " + nameof(QuadraticAssignmentProblem) + "." + nameof(ProblemSizeLimit) +"!");
+      if (data.Dimension > ProblemSizeLimit) throw new System.IO.InvalidDataException("The problem is limited to instance of size " + ProblemSizeLimit + ". You can change this limit by modifying " + nameof(QuadraticAssignmentProblem) + "." + nameof(ProblemSizeLimit) + "!");
       var weights = new DoubleMatrix(data.Weights, @readonly: true);
       var distances = new DoubleMatrix(data.Distances, @readonly: true);
@@ -363 +364 @@
       if (assignment == null || assignment.Length == 0) return;
       var vector = new Permutation(PermutationTypes.Absolute, assignment);
-      var result = Evaluate(vector);
+      var result = Evaluate(vector, CancellationToken.None);
       BestKnownQuality = result;
       BestKnownSolution = vector;