Changeset 77 for trunk/sources/HeuristicLab.Logging

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

Files:

• BestAverageWorstQualityCalculator.cs (modified) (2 diffs)
• LinechartInjector.cs (modified) (1 diff)
• QualityLogger.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Logging/BestAverageWorstQualityCalculator.cs

@@ -46 +46 @@
 
       for (int i = 0; i < scope.SubScopes.Count; i++)
-        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Quality").ActualName, false).Data;
+        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
 
       double worst = qualities[0];
@@ -78 +78 @@
           AddVariable(new Variable(info.ActualName, data));
         else
-          scope.AddVariable(new Variable(info.ActualName, data));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), data));
       }
       data.Data = value;

trunk/sources/HeuristicLab.Logging/LinechartInjector.cs

@@ -52 +52 @@
           AddVariable(new Variable(info.ActualName, linechart));
         else
-          scope.AddVariable(new Variable(info.ActualName, linechart));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), linechart));
       } else
         linechart.Values = values;

trunk/sources/HeuristicLab.Logging/QualityLogger.cs

@@ -43 +43 @@
 
       for (int i = 0; i < scope.SubScopes.Count; i++)
-        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>(GetVariableInfo("Quality").ActualName, false).Data;
+        qualities[i] = scope.SubScopes[i].GetVariableValue<DoubleData>("Quality", false).Data;
 
       double min = qualities[0];
@@ -62 +62 @@
           AddVariable(new Variable(info.ActualName, log));
         else
-          scope.AddVariable(new Variable(info.ActualName, log));
+          scope.AddVariable(new Variable(scope.TranslateName(info.FormalName), log));
       }
       log.Items.Add(new DoubleArrayData(new double[] { min, average, max } ));