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

Timestamp:

02/03/10 04:43:06 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Parameters/3.3

Files:

• HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• ItemParameter.cs (modified) (5 diffs)
• OperatorParameter.cs (modified) (1 diff)
• Parameter.cs (modified) (3 diffs)
• ScopeParameter.cs (added)
• SubScopesItemParameter.cs (added)

trunk/sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -49 +49 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SubScopesItemParameter.cs" />
+    <Compile Include="ScopeParameter.cs" />
     <Compile Include="HeuristicLabParametersPlugin.cs" />
     <Compile Include="ItemParameter.cs" />

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

@@ -29 +29 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// Represents a parameter.
+  /// A generic parameter which represents an instance of type T.
   /// </summary>
   [Item("ItemParameter<T>", "A generic parameter which represents an instance of type T.")]
@@ -46 +46 @@
     }
 
-    private T value;
+    private T localValue;
     [Storable]
-    public T Value {
-      get { return this.value; }
+    public T LocalValue {
+      get { return this.localValue; }
       set {
-        if (value != this.value) {
+        if (value != this.localValue) {
           if ((value != null) && (!DataType.IsInstanceOfType(value))) throw new ArgumentException("Static value does not match data type of parameter");
-          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
-          this.value = value;
-          if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
-          OnValueChanged();
+          if (this.localValue != null) this.localValue.Changed -= new ChangedEventHandler(LocalValue_Changed);
+          this.localValue = value;
+          if (this.localValue != null) this.localValue.Changed += new ChangedEventHandler(LocalValue_Changed);
+          OnLocalValueChanged();
         }
       }
+    }
+
+    public T Value {
+      get { return GetValue(); }
+      set { SetValue(value); }
     }
 
@@ -64 +69 @@
       : base("Anonymous", null, typeof(T)) {
       actualName = Name;
-      Value = null;
+      LocalValue = null;
     }
     public ItemParameter(string name, string description)
       : base(name, description, typeof(T)) {
-      this.actualName = Name;
-      this.Value = null;
+      actualName = Name;
+      LocalValue = null;
     }
-    public ItemParameter(string name, string description, T value)
+    public ItemParameter(string name, string description, T localValue)
       : base(name, description, typeof(T)) {
-      this.actualName = Name;
-      this.Value = value;
+      actualName = Name;
+      LocalValue = localValue;
     }
 
-    public override IItem GetValue(ExecutionContext context) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      ItemParameter<T> clone = (ItemParameter<T>)base.Clone(cloner);
+      clone.actualName = actualName;
+      clone.LocalValue = (T)cloner.Clone(localValue);
+      return clone;
+    }
+
+    public override string ToString() {
+      return string.Format("{0}: {1} ({2})", Name, LocalValue != null ? LocalValue.ToString() : ActualName, DataType.Name);
+    }
+
+    protected ItemParameter<T> GetParameter(out string name) {
       ItemParameter<T> param = this;
-      ExecutionContext current = context;
-      string actualName = null;
+      ExecutionContext current = ExecutionContext;
+      name = param.Name;
       while (param != null) {
-        if (param.Value != null) return param.Value;
-        actualName = param.ActualName;
+        if (param.LocalValue != null) return param;
+        name = param.ActualName;
         current = current.Parent;
-        while ((current != null) && !current.Operator.Parameters.ContainsKey(actualName))
+        while ((current != null) && !current.Operator.Parameters.ContainsKey(name))
           current = current.Parent;
         if (current != null)
@@ -92 +108 @@
           param = null;
       }
-
-      IScope scope = context.Scope;
-      while ((scope != null) && !scope.Variables.ContainsKey(actualName))
+      return null;
+    }
+    protected IVariable GetVariable(string name) {
+      IScope scope = ExecutionContext.Scope;
+      while ((scope != null) && !scope.Variables.ContainsKey(name))
         scope = scope.Parent;
-      return scope != null ? scope.Variables[actualName].Value : null;
+      return scope != null ? scope.Variables[actualName] : null;
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      ItemParameter<T> clone = (ItemParameter<T>)base.Clone(cloner);
-      clone.actualName = actualName;
-      clone.Value = (T)cloner.Clone(value);
-      return clone;
+    protected virtual T GetValue() {
+      string name;
+      // try to get local value from context stack
+      ItemParameter<T> param = GetParameter(out name);
+      if (param != null) return param.Value;
+      else {
+        // try to get variable from scope
+        IVariable var = GetVariable(name);
+        if (var != null) return (T)var.Value;
+      }
+      return null;
     }
-
-    public override string ToString() {
-      return string.Format("{0}: {1} ({2})", Name, Value != null ? Value.ToString() : ActualName, DataType.Name);
+    protected virtual void SetValue(T value) {
+      string name;
+      // try to get local value from context stack
+      ItemParameter<T> param = GetParameter(out name);
+      if (param != null) param.Value = value;
+      else {
+        // try to get variable from scope
+        IVariable var = GetVariable(name);
+        if (var != null) var.Value = value;
+        else ExecutionContext.Scope.Variables.Add(new Variable(name, value));
+      }
     }
 
@@ -116 +147 @@
       OnChanged();
     }
-    public event EventHandler ValueChanged;
-    private void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, new EventArgs());
+    public event EventHandler LocalValueChanged;
+    private void OnLocalValueChanged() {
+      if (LocalValueChanged != null)
+        LocalValueChanged(this, new EventArgs());
       OnChanged();
     }
-
-    private void Value_Changed(object sender, ChangedEventArgs e) {
+    private void LocalValue_Changed(object sender, ChangedEventArgs e) {
       OnChanged(e);
     }

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

@@ -29 +29 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// Represents a parameter.
+  /// A parameter which represents an operator.
   /// </summary>
   [Item("OperatorParameter", "A parameter which represents an operator.")]
-  [EmptyStorableClass]
   [Creatable("Test")]
-  public class OperatorParameter : ItemParameter<IOperator>, IOperatorParameter {
+  public class OperatorParameter : Parameter, IOperatorParameter {
+    private IOperator value;
+    [Storable]
+    public IOperator Value {
+      get { return this.value; }
+      set {
+        if (value != this.value) {
+          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
+          this.value = value;
+          if (this.value != null) this.value.Changed += new ChangedEventHandler(Value_Changed);
+          OnValueChanged();
+        }
+      }
+    }
+
     public OperatorParameter()
-      : base("Anonymous", null) {
+      : base("Anonymous", null, typeof(IOperator)) {
     }
     public OperatorParameter(string name, string description)
-      : base(name, description) {
+      : base(name, description, typeof(IOperator)) {
     }
     public OperatorParameter(string name, string description, IOperator value)
-      : base(name, description, value) {
+      : base(name, description, typeof(IOperator)) {
+      Value = value;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      OperatorParameter clone = (OperatorParameter)base.Clone(cloner);
+      clone.Value = (IOperator)cloner.Clone(value);
+      return clone;
+    }
+
+    public override string ToString() {
+      return string.Format("{0}: {1} ({2})", Name, Value != null ? Value.ToString() : "null", DataType.Name);
+    }
+
+    public event EventHandler ValueChanged;
+    private void OnValueChanged() {
+      if (ValueChanged != null)
+        ValueChanged(this, new EventArgs());
+      OnChanged();
+    }
+    private void Value_Changed(object sender, ChangedEventArgs e) {
+      OnChanged(e);
     }
   }

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

@@ -29 +29 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// Represents a parameter.
+  /// A base class for parameters.
   /// </summary>
   [Item("Parameter", "A base class for parameters.")]
@@ -45 +45 @@
       get { return dataType; }
     }
+    [Storable]
+    private ExecutionContext executionContext;
+    public ExecutionContext ExecutionContext {
+      get { return executionContext; }
+      set { executionContext = value; }
+    }
 
     protected Parameter()
@@ -56 +62 @@
     }
 
-    public abstract IItem GetValue(ExecutionContext context);
-
     public override IDeepCloneable Clone(Cloner cloner) {
       Parameter clone = (Parameter)base.Clone(cloner);
       clone.dataType = dataType;
+      clone.executionContext = (ExecutionContext)cloner.Clone(executionContext);
       return clone;
     }