Changeset 77 for trunk/sources/HeuristicLab.Selection

Timestamp:

03/18/08 16:00:00 (17 years ago)

Author:

swagner

Message:

Fixed ticket #67

• adapted accessing of variables in operators due to changes of variable lookup and the new name aliasing mechanism (actual/formal name translations should not be done directly anymore; instead the new method Scope.TranslateName should be used)

Location:

trunk/sources/HeuristicLab.Selection

Files:

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

trunk/sources/HeuristicLab.Selection/ProportionalSelector.cs

@@ -81 +81 @@
       if (subScopes < 1) throw new InvalidOperationException("No source scopes to select available.");
 
-      double best = source.SubScopes[0].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
-      double worst = source.SubScopes[subScopes - 1].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+      double best = source.SubScopes[0].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
+      double worst = source.SubScopes[subScopes - 1].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
       double limit = Math.Min(worst * 2, double.MaxValue);
       double min = Math.Min(best, worst);
@@ -90 +90 @@
       // preprocess fitness values, apply windowing if desired
       for (int i = 0; i < qualities.Length; i++) {
-        solutionQuality = source.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+        solutionQuality = source.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
         if (solutionQuality < min || solutionQuality > max) {
           // something has obviously gone wrong here

trunk/sources/HeuristicLab.Selection/TournamentSelector.cs

@@ -52 +52 @@
         for (int j = 0; j < groupSize; j++) {
           IScope scope = source.SubScopes[random.Next(source.SubScopes.Count)];
-          double quality = scope.GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          double quality = scope.GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
           if (((maximization) && (quality > best)) ||
               ((!maximization) && (quality < best))) {