Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Selection

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Selection/3.3

Files:

• GeneralizedRankSelector.cs (modified) (2 diffs)
• HeuristicLabSelectionPlugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.frame (modified) (1 diff)

branches/GP.Grammar.Editor/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 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 {
-          selected[i] = scopes[ordered[selIdx].index];
-          scopes.Remove(selected[i]);
+          int idx = ordered[selIdx].Key;
+          selected[i] = scopes[idx];
+          scopes.RemoveAt(idx);
+          ordered.RemoveAt(selIdx);
+          for (int j = 0; j < ordered.Count; j++) {
+            var o = ordered[j];
+            if (o.Key > idx) ordered[j] = new KeyValuePair<int, double>(o.Key - 1, o.Value);
+          }
           m--;
         }

branches/GP.Grammar.Editor/HeuristicLab.Selection/3.3/HeuristicLabSelectionPlugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Selection plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Selection", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Selection", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Selection-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/GP.Grammar.Editor/HeuristicLab.Selection/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]