Changeset 3687 for trunk/sources/HeuristicLab.Parameters

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.Parameters/3.3

Files:

• LookupParameter.cs (modified) (2 diffs)
• ScopeTreeLookupParameter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs

@@ -42 +42 @@
           OnActualNameChanged();
         }
+      }
+    }
+    public string TranslatedName {
+      get {
+        string translatedName;
+        GetValueParameterAndTranslateName(out translatedName);
+        return translatedName;
       }
     }
@@ -168 +175 @@
       OnToStringChanged();
     }
-
-    public static string TranslateName(string name, IExecutionContext context) {
-      string currentName = name;
-      IExecutionContext currentContext = context;
-      IParameter param;
-      ILookupParameter lookupParam;
-
-      while (currentContext != null) {
-        currentContext.Parameters.TryGetValue(currentName, out param);
-        if (param != null) {
-          lookupParam = param as ILookupParameter;
-          if (lookupParam == null)
-            throw new InvalidOperationException(
-              string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\".",
-                            currentName,
-                            typeof(ILookupParameter).GetPrettyName())
-            );
-          currentName = lookupParam.ActualName;
-        }
-        currentContext = currentContext.Parent;
-      }
-      return currentName;
-    }
   }
 }

trunk/sources/HeuristicLab.Parameters/3.3/ScopeTreeLookupParameter.cs

@@ -73 +73 @@
 
     protected override IItem GetActualValue() {
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
-
       IEnumerable<IScope> scopes = new IScope[] { ExecutionContext.Scope };
       for (int i = 0; i < depth; i++)
         scopes = scopes.Select(x => (IEnumerable<IScope>)x.SubScopes).Aggregate((a, b) => a.Concat(b));
 
+      string name = TranslatedName;
       List<T> values = new List<T>();
       IVariable var;
@@ -105 +104 @@
         );
 
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
-
       IEnumerable<IScope> scopes = new IScope[] { ExecutionContext.Scope };
       for (int i = 0; i < depth; i++)
@@ -113 +110 @@
       if (scopes.Count() != values.Length) throw new InvalidOperationException("Number of values is not equal to number of scopes.");
 
+      string name = TranslatedName;
       int j = 0;
       IVariable var;