Changeset 2685 for trunk/sources/HeuristicLab.Core/3.3/ItemParameter.cs

Timestamp:

01/26/10 17:28:03 (14 years ago)

Author:

swagner

Message:

Fixed error in parameter lookup (#95)

File:

• trunk/sources/HeuristicLab.Core/3.3/ItemParameter.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/ItemParameter.cs

@@ -88 +88 @@
     public override IItem GetValue(ExecutionContext context, bool throwOnError) {
       if (Value != null) return Value;
-      ExecutionContext parent = context.Parent;
+
+      ExecutionContext current, child;
       IParameter parameter = null;
-
-      while ((parent != null) && (parameter == null)) {
-        parent.Operator.Parameters.TryGetValue(ActualName, out parameter);
-        parent = parent.Parent;
+      child = context;
+      current = context.Parent;
+      while ((current != null) && (parameter == null)) {
+        current.Operator.Parameters.TryGetValue(ActualName, out parameter);
+        child = current;
+        current = current.Parent;
       }
 
-      if (parameter != null) return parameter.GetValue(context);
+      if (parameter != null) return parameter.GetValue(child, throwOnError);
       else {
         Variable variable = context.Scope.Lookup(ActualName, true, throwOnError);