Changeset 7413 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DiscreteLocationCrossover.cs

Timestamp:

01/26/12 00:36:45 (12 years ago)

Author:

abeham

Message:

#1614

• renamed AssemblyInfo frame files to proper name
• fixed discovery of move operators
• fixed a bug in the move evaluator
• fixed a bug in the DiscreteLocationCrossover

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DiscreteLocationCrossover.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DiscreteLocationCrossover.cs

@@ -64 +64 @@
       foreach (var i in Enumerable.Range(0, locations).Shuffle(random)) {
         int parent = random.Next(parents.Length);
+        if (!groupedLocations[parent].ContainsKey(i)) {
+          int tmp = parent;
+          do {
+            tmp = (tmp + 1) % parents.Length;
+          } while (tmp != parent && !groupedLocations[tmp].ContainsKey(i));
+          if (parent == tmp) continue;
+          else parent = tmp;
+        }
         foreach (var item in groupedLocations[parent][i]) {
           if (remainingEquipment.Contains(item.Equipment)) {