Changeset 3687 for trunk/sources/HeuristicLab.Operators

Timestamp:

05/06/10 23:34:36 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• fixed naming issues in DataTableValuesCollector, ResultsCollector and VariableCreator

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• SubScopesSorter.cs (modified) (1 diff)
• VariableCreator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators/3.3/SubScopesSorter.cs

@@ -58 +58 @@
     public override IOperation Apply() {
       descending = DescendingParameter.ActualValue.Value;
-      actualName = LookupParameter<ItemArray<DoubleValue>>.TranslateName(ValueParameter.Name, ExecutionContext);
+      actualName = ValueParameter.TranslatedName;
       CurrentScope.SubScopes.Sort(SortScopes);
       return base.Apply();

trunk/sources/HeuristicLab.Operators/3.3/VariableCreator.cs

@@ -47 +47 @@
       IVariable var;
       foreach (IParameter param in CollectedValues) {
-        CurrentScope.Variables.TryGetValue(param.Name, out var);
+        ILookupParameter lookupParam = param as ILookupParameter;
+        string name = lookupParam != null ? lookupParam.TranslatedName : param.Name;
+
+        CurrentScope.Variables.TryGetValue(name, out var);
         IItem value = param.ActualValue;
         if (var != null)
           var.Value = value == null ? null : (IItem)value.Clone();
         else
-          CurrentScope.Variables.Add(new Variable(param.Name, param.Description, value == null ? null : (IItem)value.Clone()));
+          CurrentScope.Variables.Add(new Variable(name, param.Description, value == null ? null : (IItem)value.Clone()));
       }
       return base.Apply();