Changeset 6511

Timestamp:

07/05/11 00:04:04 (13 years ago)

Author:

abeham

Message:

#1496

• a little undecided today, I removed the private struct for using KeyValuePair<U, V>

File:

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

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

@@ -63 +63 @@
       double pressure = PressureParameter.ActualValue.Value;
 
-      var ordered = qualities.Select((x, index) => new IndexValuePair(index, x.Value)).OrderBy(x => x.Value).ToList();
+      var ordered = qualities.Select((x, index) => new KeyValuePair<int, double>(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].Key].Clone();
         } else {
-          int idx = ordered[selIdx].Index;
+          int idx = ordered[selIdx].Key;
           selected[i] = scopes[idx];
           scopes.RemoveAt(idx);
@@ -80 +80 @@
           for (int j = 0; j < ordered.Count; j++) {
             var o = ordered[j];
-            if (o.Index > idx) ordered[j] = o.DecrementIndex();
+            if (o.Key > idx) ordered[j] = new KeyValuePair<int, double>(o.Key - 1, o.Value);
           }
           m--;
@@ -87 +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;
-      }
-    }
   }
 }