Changeset 2924 for trunk/sources/HeuristicLab.Parameters/3.3/ValueParameter.cs

Timestamp:

03/04/10 04:52:28 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• implemented reviewers' comments on version r2917.

File:

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

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

@@ -30 +30 @@
   /// </summary>
   [Item("ValueParameter<T>", "A parameter whose value is defined it the parameter itself.")]
-  public sealed class ValueParameter<T> : Parameter, IValueParameter<T> where T : class, IItem {
-    private T value;
-    [Storable]
-    public T Value {
-      get { return this.value; }
+  [EmptyStorableClass]
+  public class ValueParameter<T> : OptionalValueParameter<T> where T : class, IItem {
+    public override T Value {
+      get { return base.Value; }
       set {
         if (value == null) throw new ArgumentNullException();
-        if (value != this.value) {
-          if (this.value != null) this.value.Changed -= new ChangedEventHandler(Value_Changed);
-          this.value = value;
-          this.value.Changed += new ChangedEventHandler(Value_Changed);
-          OnValueChanged();
-        }
-      }
-    }
-    IItem IValueParameter.Value {
-      get { return Value; }
-      set {
-        if (value == null) throw new ArgumentNullException();
-        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;
+        base.Value = value;
       }
     }
 
-    private ValueParameter()
-      : base("Anonymous", typeof(T)) {
-    }
-    public ValueParameter(string name, T value)
-      : base(name, typeof(T)) {
-      Value = value;
-    }
-    public ValueParameter(string name, string description, T value)
-      : base(name, description, typeof(T)) {
-      Value = value;
-    }
+    private ValueParameter() : base() { }
+    public ValueParameter(string name, T value) : base(name, value) { }
+    public ValueParameter(string name, string description, T value) : base(name, description, value) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ValueParameter<T> clone = new ValueParameter<T>(name, description, value);
+      ValueParameter<T> clone = new ValueParameter<T>(name, description, Value);
       cloner.RegisterClonedObject(this, clone);
-      clone.Value = (T)cloner.Clone(value);
+      clone.Value = (T)cloner.Clone(Value);
       return clone;
-    }
-
-    public override string ToString() {
-      return string.Format("{0}: {1} ({2})", Name, Value.ToString(), DataType.GetPrettyName());
-    }
-
-    protected override IItem GetActualValue() {
-      return Value;
-    }
-    protected override void SetActualValue(IItem value) {
-      ((IValueParameter)this).Value = value;
-    }
-
-    public event EventHandler ValueChanged;
-    private void OnValueChanged() {
-      if (ValueChanged != null)
-        ValueChanged(this, EventArgs.Empty);
-      OnChanged();
-    }
-    private void Value_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
     }
   }