Changeset 77 for trunk/sources/HeuristicLab.Selection.OffspringSelection

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.OffspringSelection

Files:

• OffspringAnalyzer.cs (modified) (5 diffs)
• OffspringSelector.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringAnalyzer.cs

@@ -60 +60 @@
         double[] qualitiesArray = new double[scope.SubScopes.Count];
         for (int i = 0; i < qualitiesArray.Length; i++)
-          qualitiesArray[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          qualitiesArray[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
         qualities = new DoubleArrayData(qualitiesArray);
         IVariableInfo parentQualitiesInfo = GetVariableInfo("ParentQualities");
@@ -66 +66 @@
           AddVariable(new Variable(parentQualitiesInfo.ActualName, qualities));
         else
-          scope.AddVariable(new Variable(parentQualitiesInfo.ActualName, qualities));
+          scope.AddVariable(new Variable(scope.TranslateName(parentQualitiesInfo.FormalName), qualities));
 
         CompositeOperation next = new CompositeOperation();
@@ -82 +82 @@
           }
           IVariableInfo qualityInfo = GetVariableInfo("Quality");
-          double child = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.ActualName, false).Data;
+          double child = scope.SubScopes[i].GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
           double threshold;
 
@@ -97 +97 @@
           else
             successful = new BoolData(false);
-          scope.SubScopes[i].AddVariable(new Variable(successfulInfo.ActualName, successful));
+          scope.SubScopes[i].AddVariable(new Variable(scope.TranslateName(successfulInfo.FormalName), successful));
         }
 
@@ -105 +105 @@
           RemoveVariable(parentQualitiesInfo.ActualName);
         else
-          scope.RemoveVariable(parentQualitiesInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(parentQualitiesInfo.FormalName));
 
         return null;

trunk/sources/HeuristicLab.Selection.OffspringSelection/OffspringSelector.cs

@@ -57 +57 @@
           AddVariable(new Variable(goodChildrenInfo.ActualName, goodChildren));
         else
-          scope.AddVariable(new Variable(goodChildrenInfo.ActualName, goodChildren));
+          scope.AddVariable(new Variable(scope.TranslateName(goodChildrenInfo.FormalName), goodChildren));
       }
       ItemList<IScope> badChildren = GetVariableValue<ItemList<IScope>>("BadChildren", scope, false, false);
@@ -66 +66 @@
           AddVariable(new Variable(badChildrenInfo.ActualName, badChildren));
         else
-          scope.AddVariable(new Variable(badChildrenInfo.ActualName, badChildren));
+          scope.AddVariable(new Variable(scope.TranslateName(badChildrenInfo.FormalName), badChildren));
       }
 
@@ -73 +73 @@
       while (children.SubScopes.Count > 0) {
         IScope child = children.SubScopes[0];
-        bool successful = child.GetVariableValue<BoolData>(successfulInfo.ActualName, false).Data;
+        bool successful = child.GetVariableValue<BoolData>(successfulInfo.FormalName, false).Data;
         if (successful) goodChildren.Add(child);
         else badChildren.Add(child);
@@ -87 +87 @@
           AddVariable(new Variable(selectionPressureInfo.ActualName, selectionPressure));
         else
-          scope.AddVariable(new Variable(selectionPressureInfo.ActualName, selectionPressure));
+          scope.AddVariable(new Variable(scope.TranslateName(selectionPressureInfo.FormalName), selectionPressure));
       }
       DoubleData successRatio = GetVariableValue<DoubleData>("SuccessRatio", scope, false, false);
@@ -96 +96 @@
           AddVariable(new Variable(successRatioInfo.ActualName, successRatio));
         else
-          scope.AddVariable(new Variable(successRatioInfo.ActualName, successRatio));
+          scope.AddVariable(new Variable(scope.TranslateName(successRatioInfo.FormalName), successRatio));
       }
       int goodCount = goodChildren.Count;
@@ -130 +130 @@
           RemoveVariable(goodChildrenInfo.ActualName);
         else
-          scope.RemoveVariable(goodChildrenInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(goodChildrenInfo.FormalName));
         IVariableInfo badChildrenInfo = GetVariableInfo("BadChildren");
         if (badChildrenInfo.Local)
           RemoveVariable(badChildrenInfo.ActualName);
         else
-          scope.RemoveVariable(badChildrenInfo.ActualName);
+          scope.RemoveVariable(scope.TranslateName(badChildrenInfo.FormalName));
 
         return null;