Changeset 8989 for trunk

Timestamp:

12/03/12 13:48:23 (11 years ago)

Author:

jkarder

Message:

#1890: refactored DuplicatesSelector and ProgressiveOffspringPreserver

Location:

trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3

Files:

• DuplicatesSelector.cs (modified) (1 diff)
• ProgressiveOffspringPreserver.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/DuplicatesSelector.cs

@@ -59 +59 @@
 
       var marks = new bool[scopes.Count];
-      for (int i = 0; i < scopes.Count; i++) {
-        for (int j = i + 1; j < scopes.Count; j++) {
-          if (SimilarityCalculator.Equals(scopes[i], scopes[j])) marks[j] = true;
-        }
-      }
+      for (int i = 0; i < scopes.Count; i++)
+        for (int j = i + 1; j < scopes.Count; j++)
+          marks[j] = SimilarityCalculator.Equals(scopes[i], scopes[j]);
+
 
       var selected = new IScope[marks.Count(x => x)];

trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs

@@ -105 +105 @@
           // as long as offspring is available and not enough offspring has been preserved
           while (i < createdOffspring.Length && OffspringList.Count < MaximumPopulationSize.Value - Elites.Value) {
-            if (similarityMatrix[i].Any(x => x == 1.0)) createdOffspring[i] = null; // discard duplicates
+            if (similarityMatrix[i].Any(x => x.IsAlmost(1.0))) createdOffspring[i] = null; // discard duplicates
             else OffspringList.Add(createdOffspring[i]);
             i++;