Changeset 3128 for trunk/sources/HeuristicLab.Selection

Timestamp:

03/19/10 17:52:02 (14 years ago)

Author:

abeham

Message:

fixing bug in BestSelector as described in #930

File:

• trunk/sources/HeuristicLab.Selection/3.3/BestSelector.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Selection/3.3/BestSelector.cs

@@ -52 +52 @@
       var list = temp.ToList();
 
-      int j = 0;
-      for (int i = 0; i < count; i++) {
-        if (copy) {
+      if (copy) {
+        for (int i = 0, j = 0; i < count; i++, j++) {
+          if (j >= list.Count) j = 0;
           selected[i] = (IScope)scopes[list[j].index].Clone();
-          j++;
-          if (j >= list.Count) j = 0;
-        } else {
-          selected[i] = scopes[list[j].index];
-          scopes.RemoveAt(list[j].index);
-          list.RemoveAt(j);
         }
+      } else {
+        int i;
+        for (i = 0; i < count; i++) {
+          selected[i] = scopes[list[i].index];
+        }
+        // remove the selected scopes starting from the scope with the highest index
+        if (i < list.Count) list.RemoveRange(i, list.Count - i);
+        list = list.OrderBy(x => x.index).ToList();
+        do {
+          i--;
+          scopes.RemoveAt(list[i].index);
+        } while (i > 0);
       }
       return selected;