Changeset 9943

Timestamp:

09/10/13 15:56:35 (11 years ago)

Author:

bburlacu

Message:

#1772: Re-added tracking code (record copies of individuals in the GlobalCloneMap)

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3

Files:

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

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

@@ -104 +104 @@
           currentQuality += list[index];
         }
-        if (copy)
+        if (copy) {
           selected[i] = (IScope)scopes[index].Clone();
-        else {
+          var original = scopes[index].Variables.First().Value;
+          var clone = selected[i].Variables.First().Value;
+          GlobalCloneMap.Add(clone, original);
+        } else {
           selected[i] = scopes[index];
           scopes.RemoveAt(index);

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) {
+          var index = random.Next(scopes.Count);
+          selected[i] = (IScope)scopes[index].Clone();
+          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/TournamentSelector.cs

@@ -79 +79 @@
         }
 
-        if (copy)
+        if (copy) {
           selected[i] = (IScope)scopes[best].Clone();
-        else {
+          var original = scopes[best].Variables.First().Value;
+          var clone = selected[i].Variables.First().Value;
+          GlobalCloneMap.Add(clone, original);
+        } else {
           selected[i] = scopes[best];
           scopes.RemoveAt(best);