Changeset 77 for trunk/sources/HeuristicLab.Operators

Timestamp:

03/18/08 16:00:00 (16 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.Operators

Files:

• ComparatorBase.cs (modified) (1 diff)
• DataCollector.cs (modified) (1 diff)
• SingleObjectiveEvaluatorBase.cs (modified) (1 diff)
• Sorter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators/ComparatorBase.cs

@@ -42 +42 @@
           AddVariable(new Variable(info.ActualName, result));
         else
-          scope.AddVariable(new Variable(info.ActualName, result));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), result));
       }
       IItem leftSide = GetVariableValue<IItem>("LeftSide", scope, true);

trunk/sources/HeuristicLab.Operators/DataCollector.cs

@@ -50 +50 @@
           AddVariable(new Variable(info.ActualName, values));
         else
-          scope.AddVariable(new Variable(info.ActualName, values));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), values));
       }
 

trunk/sources/HeuristicLab.Operators/SingleObjectiveEvaluatorBase.cs

@@ -42 +42 @@
           AddVariable(new Variable(qualityInfo.ActualName, quality));
         else
-          scope.AddVariable(new Variable(qualityInfo.ActualName, quality));
+          scope.AddVariable(new Variable(scope.TranslateName(qualityInfo.FormalName), quality));
       } else {
         quality.Data = qualityValue;

trunk/sources/HeuristicLab.Operators/Sorter.cs

@@ -44 +44 @@
 
       for (int i = 0; i < keys.Length; i++) {
-        keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Value").ActualName, false).Data;
+        keys[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Value", false).Data;
         sequence[i] = i;
       }