Changeset 7505 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

Timestamp:

02/22/12 22:43:09 (12 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/Moves/NMoveMaker.cs (modified) (2 diffs)

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("NMoveMaker", "Performs an n-move.")]
+  [Item("N-Move Maker", "Performs an N-Move.")]
   [StorableClass]
   public class NMoveMaker : SingleSuccessorOperator, IAssignmentAwareGQAPOperator, IQualityAwareGQAPOperator, IMoveQualityAwareGQAPOperator, IGQAPNMoveOperator, IMoveMaker {
@@ -97 +97 @@
 
     public static void Apply(IntegerVector vector, NMove move) {
-      for (int i = 0; i < move.N; i++) {
-        vector[move.Equipments[i]] = move.Locations[i];
-      }
+      foreach (var kvp in move.NewAssignments)
+        vector[kvp.Key] = kvp.Value;
     }