Changeset 2757 for trunk/sources/HeuristicLab.Parameters/3.3

Timestamp:

02/08/10 03:43:36 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• LookupParameter.cs (modified) (4 diffs)
• Parameter.cs (modified) (2 diffs)
• ScopeParameter.cs (modified) (2 diffs)
• SubScopesLookupParameter.cs (modified) (4 diffs)
• ValueLookupParameter.cs (modified) (4 diffs)
• ValueParameter.cs (modified) (3 diffs)

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

@@ -32 +32 @@
   /// A parameter whose value is retrieved from the scope.
   /// </summary>
-  [Item("LookupParameter<T>", "A parameter whose value is retrieved from the scope.")]
+  [Item("LookupParameter<T>", "A parameter whose value is retrieved from or written to a scope.")]
   public class LookupParameter<T> : Parameter, ILookupParameter<T> where T : class, IItem {
     [Storable]
@@ -46 +46 @@
       }
     }
-    public T ActualValue {
-      get { return GetActualValue(); }
+    public new T ActualValue {
+      get { return (T)GetActualValue(); }
       set { SetActualValue(value); }
     }
@@ -80 +80 @@
       return scope != null ? scope.Variables[actualName] : null;
     }
-    protected virtual T GetActualValue() {
+    protected override IItem GetActualValue() {
       string name = TranslateName(Name, ExecutionContext);
       IVariable var = LookupVariable(name);
@@ -95 +95 @@
       return null;
     }
-    protected virtual void SetActualValue(T value) {
+    protected override void SetActualValue(IItem value) {
+      T val = value as T;
+      if (val == null)
+        throw new InvalidOperationException(
+          string.Format("Type mismatch. Value is not a \"{0}\".",
+                        typeof(T).GetPrettyName())
+        );
       string name = TranslateName(Name, ExecutionContext);
       IVariable var = LookupVariable(name);
-      if (var != null) var.Value = value;
-      else ExecutionContext.Scope.Variables.Add(new Variable(name, value));
+      if (var != null) var.Value = val;
+      else ExecutionContext.Scope.Variables.Add(new Variable(name, val));
     }
 

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

@@ -45 +45 @@
       get { return dataType; }
     }
+    public IItem ActualValue {
+      get { return GetActualValue(); }
+      set { SetActualValue(value); }
+    }
     [Storable]
     private ExecutionContext executionContext;
     public ExecutionContext ExecutionContext {
       get { return executionContext; }
-      set { executionContext = value; }
+      set {
+        if (value != executionContext) {
+          executionContext = value;
+          OnExecutionContextChanged();
+        }
+      }
     }
 
@@ -77 +86 @@
       return string.Format("{0} ({1})", Name, DataType.Name);
     }
+
+    protected abstract IItem GetActualValue();
+    protected abstract void SetActualValue(IItem value);
+
+    protected virtual void OnExecutionContextChanged() { }
   }
 }

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

@@ -35 +35 @@
   [Creatable("Test")]
   public class ScopeParameter : Parameter {
-    public IScope Value {
+    public new IScope ActualValue {
       get { return ExecutionContext.Scope; }
     }
@@ -52 +52 @@
       return string.Format("{0} ({1})", Name, DataType.Name);
     }
+
+    protected override IItem GetActualValue() {
+      return ExecutionContext.Scope;
+    }
+    protected override void SetActualValue(IItem value) {
+      throw new NotSupportedException("The actual value of a ScopeParameter cannot be set. It is always the current scope.");
+    }
   }
 }

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

@@ -32 +32 @@
   /// A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.
   /// </summary>
-  [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.")]
+  [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.")]
   public class SubScopesLookupParameter<T> : Parameter, ILookupParameter<T> where T : class, IItem {
     [Storable]
@@ -47 +47 @@
     }
 
-    public T[] ActualValues {
-      get { return GetActualValues(); }
-      set { SetActualValues(value); }
+    public new ItemArray<T> ActualValue {
+      get { return (ItemArray<T>)GetActualValue(); }
+      set { SetActualValue(value); }
     }
 
     public SubScopesLookupParameter()
-      : base("Anonymous", typeof(T)) {
+      : base("Anonymous", typeof(ItemArray<T>)) {
       actualName = Name;
     }
     public SubScopesLookupParameter(string name)
-      : base(name, typeof(T)) {
+      : base(name, typeof(ItemArray<T>)) {
       actualName = Name;
     }
     public SubScopesLookupParameter(string name, string description)
-      : base(name, description, typeof(T)) {
+      : base(name, description, typeof(ItemArray<T>)) {
       actualName = Name;
     }
@@ -75 +75 @@
     }
 
-    protected virtual T[] GetActualValues() {
+    protected override IItem GetActualValue() {
       string name = LookupParameter<T>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;
-      T[] values = new T[scope.SubScopes.Count];
+      ItemArray<T> values = new ItemArray<T>(scope.SubScopes.Count);
       IVariable var;
       T value;
@@ -97 +97 @@
       return values;
     }
-    protected virtual void SetActualValues(T[] values) {
+    protected override void SetActualValue(IItem value) {
+      ItemArray<T> values = value as ItemArray<T>;
+      if (values == null)
+        throw new InvalidOperationException(
+          string.Format("Type mismatch. Value is not a \"{0}\".",
+                        typeof(ItemArray<T>).GetPrettyName())
+        );
+
       string name = LookupParameter<T>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;

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

@@ -32 +32 @@
   /// A parameter whose value is either defined it the parameter itself or is retrieved from the scope.
   /// </summary>
-  [Item("ValueLookupParameter<T>", "A parameter whose value is either defined it the parameter itself or is retrieved from the scope.")]
+  [Item("ValueLookupParameter<T>", "A parameter whose value is either defined it the parameter itself or is retrieved from or written to a scope.")]
   public class ValueLookupParameter<T> : Parameter, IValueLookupParameter<T> where T : class, IItem {
     [Storable]
@@ -61 +61 @@
     }
 
-    public T ActualValue {
-      get { return GetActualValue(); }
+    public new T ActualValue {
+      get { return (T)GetActualValue(); }
       set { SetActualValue(value); }
     }
@@ -137 +137 @@
       return scope != null ? scope.Variables[actualName] : null;
     }
-    protected virtual T GetActualValue() {
+    protected override IItem GetActualValue() {
       string name;
       // try to get local value from context stack
@@ -157 +157 @@
       return null;
     }
-    protected virtual void SetActualValue(T value) {
+    protected override void SetActualValue(IItem value) {
+      T val = value as T;
+      if (val == null)
+        throw new InvalidOperationException(
+          string.Format("Type mismatch. Value is not a \"{0}\".",
+                        typeof(T).GetPrettyName())
+        );
+      // try to get local value from context stack
       string name;
-      // try to get local value from context stack
       IValueParameter<T> param = GetParameter(out name);
-      if (param != null) param.Value = value;
+      if (param != null) param.Value = val;
       else {  // try to get variable from scope
         IVariable var = LookupVariable(name);
-        if (var != null) var.Value = value;
+        if (var != null) var.Value = val;
         else ExecutionContext.Scope.Variables.Add(new Variable(name, value));
       }

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -45 +46 @@
         }
       }
+    }
+    public new T ActualValue {
+      get { return Value; }
+      set { Value = value; }
     }
 
@@ -75 +80 @@
     }
 
+    protected override IItem GetActualValue() {
+      return Value;
+    }
+    protected override void SetActualValue(IItem value) {
+      T val = value as T;
+      if (val == null)
+        throw new InvalidOperationException(
+          string.Format("Type mismatch. Value is not a \"{0}\".",
+                        typeof(T).GetPrettyName())
+        );
+      Value = val;
+    }
+
     public event EventHandler ValueChanged;
     private void OnValueChanged() {