Changeset 7505 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators

Timestamp:

02/22/12 22:43:09 (13 years ago)

Author:

abeham

Message:

#1614

• added instances of Cordeau et al. as given by L. Moccia
• added operators for tabu search

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPNMoveEvaluator.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPNMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -32 +31 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("GQAPNMoveEvaluator", "Evaluates an n-move.")]
+  [Item("N-Move Evaluator", "Evaluates an N-Move.")]
   [StorableClass]
   public class GQAPNMoveEvaluator : SingleSuccessorOperator, IGQAPNMoveEvaluator, IAssignmentAwareGQAPOperator,
@@ -159 +158 @@
       var slack = (DoubleArray)capacities.Clone();
       var oldSlack = (DoubleArray)slack.Clone();
-      Dictionary<int, int> moving = new Dictionary<int, int>();
-      for (int i = 0; i < moves; i++) moving.Add(move.Equipments[i], move.Locations[i]);
-
-      for (int i = 0; i < moves; i++) {
-        int equip = move.Equipments[i];
-        int newLoc = move.Locations[i];
+      bool first = true;
+      foreach (var kvp in move.NewAssignments) {
+        int equip = kvp.Key;
+        int newLoc = kvp.Value;
         moveInstallationQuality -= installationCosts[equip, assignment[equip]];
         moveInstallationQuality += installationCosts[equip, newLoc];
         for (int j = 0; j < assignment.Length; j++) {
-          if (!moving.ContainsKey(j)) {
+          if (!move.NewAssignments.ContainsKey(j)) {
             moveFlowDistanceQuality += weights[equip, j] * distances[newLoc, assignment[j]];
             moveFlowDistanceQuality -= weights[equip, j] * distances[assignment[equip], assignment[j]];
             moveFlowDistanceQuality += weights[j, equip] * distances[assignment[j], newLoc];
             moveFlowDistanceQuality -= weights[j, equip] * distances[assignment[j], assignment[equip]];
-            if (i == 0) { // only once for each untouched equipment deduct the demand from the capacity
+            if (first) { // only once for each untouched equipment deduct the demand from the capacity
               slack[assignment[j]] -= demands[j];
               oldSlack[assignment[j]] -= demands[j];
             }
           } else {
-            moveFlowDistanceQuality += weights[equip, j] * distances[newLoc, moving[j]];
+            moveFlowDistanceQuality += weights[equip, j] * distances[newLoc, move.NewAssignments[j]];
             moveFlowDistanceQuality -= weights[equip, j] * distances[assignment[equip], assignment[j]];
           }
         }
+        first = false;
         slack[newLoc] -= demands[equip];
         oldSlack[assignment[equip]] -= demands[equip];