Changeset 14057 for trunk/sources

Timestamp:

07/13/16 10:38:42 (8 years ago)

Author:

abeham

Message:

#2281: moved type verification to member method

File:

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

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

@@ -171 +171 @@
       string translatedName = Name;
       var value = GetValue(ExecutionContext, ref translatedName);
+      if (value != null && !(value is T))
+        throw new InvalidOperationException(
+          string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
+                        translatedName,
+                        typeof(T).GetPrettyName())
+        );
       CachedActualValue = value;
       return value;
     }
 
-    protected static IItem GetValue(IExecutionContext executionContext, ref string name, bool verifyType = true) {
+    protected static IItem GetValue(IExecutionContext executionContext, ref string name) {
       // try to get value from context stack
       IValueParameter param = GetValueParameterAndTranslateName(executionContext, ref name);
@@ -182 +188 @@
       // try to get variable from scope
       IVariable var = LookupVariable(executionContext.Scope, name);
-      if (var != null) {
-        if (verifyType && !(var.Value is T))
-          throw new InvalidOperationException(
-            string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
-                          name,
-                          typeof(T).GetPrettyName())
-          );
-        return var.Value;
-      }
-      return null;
+      return var != null ? var.Value : null;
     }