Changeset 6086 for branches/histogram/HeuristicLab.Encodings.PermutationEncoding

Timestamp:

04/30/11 15:40:40 (14 years ago)

Author:

abeham

Message:

#1497

• Added problem-specific local improvement operator (best improvement local search using swap2 moves)
  • Adapted ExhaustiveSwap2MoveGenerator to yield moves
• Added a parameter BestKnownSolutions to collect possible optimal invariants
  • Adapted BestQAPSolutionAnalyzer to collect optimal invariants
• Added a function to the QAP Evaluator that calculates the impact of a certain allele

File:

• branches/histogram/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/ExhaustiveSwap2MoveGenerator.cs (modified) (2 diffs)

branches/histogram/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/ExhaustiveSwap2MoveGenerator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -39 +40 @@
     }
 
+    public static IEnumerable<Swap2Move> Generate(Permutation permutation) {
+      int length = permutation.Length;
+      if (length == 1) throw new ArgumentException("ExhaustiveSwap2MoveGenerator: There cannot be an Swap move given a permutation of length 1.", "permutation");
+
+      for (int i = 0; i < length - 1; i++)
+        for (int j = i + 1; j < length; j++) {
+          yield return new Swap2Move(i, j);
+        }
+    }
+
     public static Swap2Move[] Apply(Permutation permutation) {
       int length = permutation.Length;
-      if (length == 1) throw new ArgumentException("ExhaustiveSwap2MoveGenerator: There cannot be an Swap move given a permutation of length 1.", "permutation");
       int totalMoves = (length) * (length - 1) / 2;
       Swap2Move[] moves = new Swap2Move[totalMoves];
       int count = 0;
-
-      for (int i = 0; i < length - 1; i++)
-        for (int j = i + 1; j < length; j++) {
-          moves[count++] = new Swap2Move(i, j);
-        }
+      foreach (Swap2Move move in Generate(permutation)) {
+        moves[count++] = move;
+      }
       return moves;
     }