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

Timestamp:

01/26/10 05:14:51 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• continued work on adapting and refactoring HeuristicLab.Data according to the changes in HeuristicLab.Core
• started work on adapting and refactoring HeuristicLab.Operators according to changes in HeuristicLab.Core

File:

• trunk/sources/HeuristicLab.Core/3.3/ItemParameter.cs (modified) (5 diffs)

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

@@ -31 +31 @@
   /// Represents a parameter.
   /// </summary>
-  [Item("Item Parameter", "A parameter which represents an IItem.")]
+  [Item("ItemParameter", "A parameter which represents an IItem.")]
   [Creatable("Test")]
   public class ItemParameter : Parameter {
@@ -84 +84 @@
 
     public override IItem GetValue(ExecutionContext context) {
+      return GetValue(context, true);
+    }
+    public override IItem GetValue(ExecutionContext context, bool throwOnError) {
       if (Value != null) return Value;
       ExecutionContext parent = context.Parent;
@@ -94 +97 @@
 
       if (parameter != null) return parameter.GetValue(context);
-      else return context.Scope.Lookup(ActualName, true).Value;
+      else {
+        Variable variable = context.Scope.Lookup(ActualName, true, throwOnError);
+        return variable == null ? null : variable.Value;
+      }
     }
 
@@ -126 +132 @@
   }
 
-  [Item("Parameter<T>", "A generic parameter which represents an instance of type T.")]
+  [Item("ItemParameter<T>", "A generic parameter which represents an instance of type T.")]
   [EmptyStorableClass]
   public class ItemParameter<T> : ItemParameter where T : class, IItem {
@@ -148 +154 @@
 
     public new T GetValue(ExecutionContext context) {
-      return (T)base.GetValue(context);
+      return GetValue(context, true);
+    }
+    public new T GetValue(ExecutionContext context, bool throwOnError) {
+      return (T)base.GetValue(context, throwOnError);
     }
   }