Changeset 3075

Timestamp:

03/16/10 23:50:46 (14 years ago)

Author:

swagner

Message:

Refactored parameter lookup as suggested in a patch of mkommend (#919)

File:

• trunk/sources/HeuristicLab.Parameters/3.3/LookupParameter.cs (modified) (3 diffs)

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

@@ -78 +78 @@
     }
 
-    private IValueParameter GetParameter(out string name) {
-      IValueParameter valueParam = this as IValueParameter;
-      ILookupParameter lookupParam = this as ILookupParameter;
-      IExecutionContext current = ExecutionContext;
+    private IValueParameter GetValueParameterAndTranslateName(out string actualName) {
+      IValueParameter valueParam;
+      ILookupParameter lookupParam;
+      IExecutionContext currentExecutionContext = ExecutionContext;
 
-      name = Name;
-      while ((valueParam != null) || (lookupParam != null)) {
-        if ((valueParam != null) && (valueParam.Value != null)) return valueParam;
-        if (lookupParam != null) name = lookupParam.ActualName;
+      actualName = Name;
+      while (currentExecutionContext != null) {
+        valueParam = currentExecutionContext.Parameters[actualName] as IValueParameter;
+        lookupParam = currentExecutionContext.Parameters[actualName] as ILookupParameter;
 
-        current = current.Parent;
-        while ((current != null) && !current.Parameters.ContainsKey(name))
-          current = current.Parent;
+        if ((valueParam == null) && (lookupParam == null))
+          throw new InvalidOperationException(
+            string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\" or an \"{2}\".",
+                          actualName, typeof(IValueParameter).GetPrettyName(), typeof(ILookupParameter).GetPrettyName())
+          );
 
-        if (current != null) {
-          valueParam = current.Parameters[name] as IValueParameter;
-          lookupParam = current.Parameters[name] as ILookupParameter;
-          if ((valueParam == null) && (lookupParam == null))
-            throw new InvalidOperationException(
-              string.Format("Parameter look-up chain broken. Parameter \"{0}\" is not an \"{1}\" or an \"{2}\".",
-                            name,
-                            typeof(IValueParameter).GetPrettyName(),
-                            typeof(ILookupParameter).GetPrettyName())
-            );
-        } else {
-          valueParam = null;
-          lookupParam = null;
+        if (valueParam != null) {
+          if (valueParam.Value != null) return valueParam;
+          else if (lookupParam == null) return valueParam;
         }
+        if (lookupParam != null) actualName = lookupParam.ActualName;
+
+        currentExecutionContext = currentExecutionContext.Parent;
+        while ((currentExecutionContext != null) && !currentExecutionContext.Parameters.ContainsKey(actualName))
+          currentExecutionContext = currentExecutionContext.Parent;
       }
       return null;
@@ -118 +115 @@
       string name;
       // try to get value from context stack
-      IValueParameter param = GetParameter(out name);
-      if (param != null) return param.Value;
+      IValueParameter param = GetValueParameterAndTranslateName(out name);
+      if (param != null && param.Value != null) return param.Value;
 
       // try to get variable from scope
@@ -142 +139 @@
       // try to set value in context stack
       string name;
-      IValueParameter param = GetParameter(out name);
+      IValueParameter param = GetValueParameterAndTranslateName(out name);
       if (param != null) {
         param.Value = value;