Changeset 15511 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs

Timestamp:

12/11/17 23:06:32 (6 years ago)

Author:

abeham

Message:

#1614: Improved performance by switching from Dictionary to Array

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs

@@ -111 +111 @@
           isTabu = true;
           foreach (var kvp in attribute.OldAssignments) {
-            if (move.NewAssignments.ContainsKey(kvp.Key)) {
-              if (move.NewAssignments[kvp.Key] != kvp.Value) {
-                isTabu = false;
-                break;
-              }
+            var assignedLoc = move.Reassignments[kvp.Item1] - 1; // location is given 1-based
+            if (assignedLoc >= 0 && assignedLoc != kvp.Item2) {
+              isTabu = false;
+              break;
             }
           }