Changeset 7480 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPQualitySimilarityReducer.cs

Timestamp:

02/17/12 14:03:43 (12 years ago)

Author:

abeham

Message:

#1614

• Fixed a parameter type in the GQAP
• Fixed loading of ICTAP instances (only the upper triangular matrix is required for the distances)
• Fixed a bug in the reducer that causes the loss of diversity

File:

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

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

@@ -101 +101 @@
         if (!similarities.Any()) {
           population.Add(candidate);
-        } else if (population.Count < populationSize) {
-          double maxSimilarity = similarities.Max();
-          if (maxSimilarity < 1.0)
-            population.Add(candidate);
+          break;
+        }
+        if (similarities.Max() == 1.0) break;
+        if (population.Count < populationSize) {
+          population.Add(candidate);
         } else {
           var replacement = population.Select((v, i) => new { V = v, Index = i })