Changeset 6508 for trunk/sources/HeuristicLab.Selection

Timestamp:

07/04/11 23:58:24 (13 years ago)

Author:

abeham

Message:

#1496

• Fixed bug when CopySelected = false

File:

• trunk/sources/HeuristicLab.Selection/3.3/GeneralizedRankSelector.cs (modified) (3 diffs)

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

@@ -63 +63 @@
       double pressure = PressureParameter.ActualValue.Value;
 
-      var ordered = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).ToList();
+      var ordered = qualities.Select((x, index) => new IndexValuePair(index, x.Value)).OrderBy(x => x.Value).ToList();
       if (maximization) ordered.Reverse();
 
@@ -72 +72 @@
 
         if (copy) {
-          selected[i] = (IScope)scopes[ordered[selIdx].index].Clone();
+          selected[i] = (IScope)scopes[ordered[selIdx].Index].Clone();
         } else {
-          selected[i] = scopes[ordered[selIdx].index];
-          scopes.Remove(selected[i]);
+          int idx = ordered[selIdx].Index;
+          selected[i] = scopes[idx];
+          scopes.RemoveAt(idx);
+          ordered.RemoveAt(selIdx);
+          for (int j = 0; j < ordered.Count; j++) {
+            var o = ordered[j];
+            if (o.Index > idx) ordered[j] = o.DecrementIndex();
+          }
           m--;
         }
@@ -81 +87 @@
       return selected;
     }
+
+    private struct IndexValuePair {
+      private int index;
+      internal int Index { get { return index; } }
+      private double value;
+      internal double Value { get { return value; } }
+
+      internal IndexValuePair(int index, double value) {
+        this.index = index;
+        this.value = value;
+      }
+
+      internal IndexValuePair DecrementIndex() {
+        this.index--;
+        return this;
+      }
+    }
   }
 }