Changeset 7997 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3

Timestamp:

06/13/12 13:20:38 (12 years ago)

Author:

bburlacu

Message:

#1772: New analyzer: SymbolicExpressionTreeRelativeLengthAnalyzer. Rewrote the SymbolicExpressionTreeFragmentsAnalyzer, added generic wrapper to wrap HL objects as items.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3

Files:

• Plugin.cs (modified) (1 diff)
• ProportionalSelector.cs (modified) (2 diffs)
• RandomSelector.cs (modified) (2 diffs)
• Selector.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/Plugin.cs

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

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/ProportionalSelector.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -103 +102 @@
           // map the selected (cloned) tree to the original tree
           var original = scopes[index].Variables.First().Value;
-          var clone = selected[i].Variables.First().Value; 
+          var clone = selected[i].Variables.First().Value;
           GlobalCloneMap.Add(clone, original);
         } else {

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/RandomSelector.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -69 +70 @@
 
       for (int i = 0; i < count; i++) {
-        if (copy)
-          selected[i] = (IScope)scopes[random.Next(scopes.Count)].Clone();
-        else {
+        if (copy) {
+          int index = random.Next(scopes.Count);
+          selected[i] = (IScope)scopes[index].Clone();
+          // map the selected (cloned) tree to the original tree
+          var original = scopes[index].Variables.First().Value;
+          var clone = selected[i].Variables.First().Value;
+          GlobalCloneMap.Add(clone, original);
+        } else {
           int index = random.Next(scopes.Count);
           selected[i] = scopes[index];

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/Selector.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
@@ -74 +73 @@
         while (gScope.Parent != null) gScope = gScope.Parent;
         gScope.Variables.Add(new Variable(GlobalCloneMapParameterName, new CloneMapType()));
-      } else {
-        GlobalCloneMap.Clear();
       }
-
       IScope[] selected = Select(scopes);