Changeset 14056 for trunk/sources/HeuristicLab.Parameters

Timestamp:

07/13/16 09:47:55 (8 years ago)

Author:

abeham

Message:

#2281:

• Moved check if context contains a parameter of the requested translated name to the front of the loop
  • Reason is that ResultsParameter queries for a parameter "Results" which doesn't exist in its own context
• Added a flag to suppress the type check in LookupParameter's GetValue
  • Default value of that flag is true, so existing code is not affected
  • Reason is that ResultsParameter queries for ResultCollection with a generic type e.g. IntValue which don't match
• Replaced some ContainsKey/Access combinations with TryGetValue

File:

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

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

@@ -135 +135 @@
 
       while (currentExecutionContext != null) {
-        valueParam = currentExecutionContext.Parameters[translatedName] as IValueParameter;
-        lookupParam = currentExecutionContext.Parameters[translatedName] as ILookupParameter;
+        IParameter param = null;
+        while (currentExecutionContext != null && !currentExecutionContext.Parameters.TryGetValue(translatedName, out param))
+          currentExecutionContext = currentExecutionContext.Parent;
+        if (currentExecutionContext == null) break;
+
+        valueParam = param as IValueParameter;
+        lookupParam = param as ILookupParameter;
 
         if ((valueParam == null) && (lookupParam == null))
@@ -148 +153 @@
           else if (lookupParam == null) return valueParam;
         }
-        if (lookupParam != null) translatedName = lookupParam.ActualName;
+        translatedName = lookupParam.ActualName;
 
         currentExecutionContext = currentExecutionContext.Parent;
-        while ((currentExecutionContext != null) && !currentExecutionContext.Parameters.ContainsKey(translatedName))
-          currentExecutionContext = currentExecutionContext.Parent;
       }
       return null;
     }
     protected static IVariable LookupVariable(IScope scope, string name) {
-      while ((scope != null) && !scope.Variables.ContainsKey(name))
+      IVariable variable = null;
+      while (scope != null && !scope.Variables.TryGetValue(name, out variable))
         scope = scope.Parent;
-      return scope != null ? scope.Variables[name] : null;
+      return scope != null ? variable : null;
     }
 
@@ -171 +175 @@
     }
 
-    protected static IItem GetValue(IExecutionContext executionContext, ref string name) {
+    protected static IItem GetValue(IExecutionContext executionContext, ref string name, bool verifyType = true) {
       // try to get value from context stack
       IValueParameter param = GetValueParameterAndTranslateName(executionContext, ref name);
@@ -179 +183 @@
       IVariable var = LookupVariable(executionContext.Scope, name);
       if (var != null) {
-        if (!(var.Value is T))
+        if (verifyType && !(var.Value is T))
           throw new InvalidOperationException(
             string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",