Changeset 2756 for trunk/sources/HeuristicLab.Parameters/3.3/OperatorParameter.cs

Timestamp:

02/05/10 05:23:56 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

File:

• trunk/sources/HeuristicLab.Parameters/3.3/OperatorParameter.cs (modified) (1 diff)

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

@@ -32 +32 @@
   /// </summary>
   [Item("OperatorParameter", "A parameter which represents an operator.")]
+  [EmptyStorableClass]
   [Creatable("Test")]
-  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 class OperatorParameter : ValueParameter<IOperator> {
+    public OperatorParameter()
+      : base("Anonymous") {
     }
-
-    public OperatorParameter()
-      : base("Anonymous", null, typeof(IOperator)) {
+    public OperatorParameter(string name)
+      : base(name) {
+    }
+    public OperatorParameter(string name, IOperator value)
+      : base(name, value) {
+      Value = value;
     }
     public OperatorParameter(string name, string description)
-      : base(name, description, typeof(IOperator)) {
+      : base(name, description) {
     }
     public OperatorParameter(string name, string description, IOperator value)
-      : base(name, description, typeof(IOperator)) {
+      : base(name, description, value) {
       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);
     }
   }