Changeset 3137

Timestamp:

03/20/10 03:49:15 (14 years ago)

Author:

swagner

Message:

Fixed IndexOutOfRangeExceptions in selectors (#930).

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• BestSelector.cs (modified) (1 diff)
• LinearRankSelector.cs (modified) (1 diff)
• WorstSelector.cs (modified) (1 diff)

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

@@ -53 +53 @@
 
       if (copy) {
-        for (int i = 0, j = 0; i < count; i++, j++) {
+        int j = 0;
+        for (int i = 0; i < count; i++) {
+          selected[i] = (IScope)scopes[list[j].index].Clone();
+          j++;
           if (j >= list.Count) j = 0;
-          selected[i] = (IScope)scopes[list[j].index].Clone();
         }
       } else {
-        int i;
-        for (i = 0; i < count; i++) {
-          selected[i] = scopes[list[i].index];
+        for (int i = 0; i < count; i++) {
+          selected[i] = scopes[list[0].index];
+          scopes[list[0].index] = null;
+          list.RemoveAt(0);
         }
-        // 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);
+        scopes.RemoveAll(x => x == null);
       }
       return selected;

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

@@ -55 +55 @@
       for (int i = 0; i < count; i++) {
         int selectedLot = random.Next(lotSum) + 1;
-        int index = 0;
-        int currentLot = list[index].lots;
+        int j = 0;
+        int currentLot = list[j].lots;
         while (currentLot < selectedLot) {
-          index++;
-          currentLot += list[index].lots;
+          j++;
+          currentLot += list[j].lots;
         }
         if (copy)
-          selected[i] = (IScope)scopes[list[index].index].Clone();
+          selected[i] = (IScope)scopes[list[j].index].Clone();
         else {
-          selected[i] = scopes[list[index].index];
-          scopes.RemoveAt(list[index].index);
-          lotSum -= list[index].lots;
-          list.RemoveAt(index);
+          selected[i] = scopes[list[j].index];
+          scopes[list[j].index] = null;
+          lotSum -= list[j].lots;
+          list.RemoveAt(j);
         }
       }
+      if (!copy) scopes.RemoveAll(x => x == null);
       return selected;
     }

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

@@ -51 +51 @@
       var list = temp.ToList();
 
-      int j = 0;
-      for (int i = 0; i < count; i++) {
-        if (copy) {
+      if (copy) {
+        int j = 0;
+        for (int i = 0; i < count; i++) {
           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 {
+        for (int i = 0; i < count; i++) {
+          selected[i] = scopes[list[0].index];
+          scopes[list[0].index] = null;
+          list.RemoveAt(0);
+        }
+        scopes.RemoveAll(x => x == null);
       }
       return selected;