Changeset 2845 for trunk/sources/HeuristicLab.Operators

Timestamp:

02/20/10 20:04:08 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameterized items

File:

• trunk/sources/HeuristicLab.Operators/3.3/Operator.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Operators/3.3/Operator.cs

@@ -22 +22 @@
 using System;
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
   /// </summary>
   [Item("Operator", "Base class for operators.")]
-  public abstract class Operator : NamedItem, IOperator {
+  public abstract class Operator : ParameterizedNamedItem, IOperator {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Method; }
@@ -37 +36 @@
     public override bool CanChangeDescription {
       get { return false; }
-    }
-
-    private ParameterCollection parameters;
-    [Storable]
-    protected ParameterCollection Parameters {
-      get { return parameters;}
-      private set {
-        if (parameters != null) parameters.Changed -= new ChangedEventHandler(Parameters_Changed);
-        parameters = value;
-        readOnlyParameters = null;
-        if (parameters != null) parameters.Changed += new ChangedEventHandler(Parameters_Changed);
-      }
-    }
-    private ReadOnlyObservableKeyedCollection<string, IParameter> readOnlyParameters;
-    IObservableKeyedCollection<string, IParameter> IParameterizedItem.Parameters {
-      get {
-        if (readOnlyParameters == null) readOnlyParameters = parameters.AsReadOnly();
-        return readOnlyParameters;
-      }
     }
 
@@ -103 +83 @@
     /// the canceled flag to <c>false</c> and the name of the operator to the type name. 
     /// </summary>
-    protected Operator() {
-      Name = ItemName;
-      Parameters = new ParameterCollection();
-      readOnlyParameters = null;
+    protected Operator()
+      : base() {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name)
+      : base(name) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, ParameterCollection parameters)
+      : base(name, parameters) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, string description)
+      : base(name, description) {
+      canceled = false;
+      breakpoint = false;
+    }
+    protected Operator(string name, string description, ParameterCollection parameters)
+      : base(name, description, parameters) {
       canceled = false;
       breakpoint = false;
@@ -119 +117 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       Operator clone = (Operator)base.Clone(cloner);
-      clone.Parameters = (ParameterCollection)cloner.Clone(parameters);
       clone.canceled = canceled;
       clone.breakpoint = breakpoint;
@@ -178 +175 @@
       }
     }
-
-    private void Parameters_Changed(object sender, ChangedEventArgs e) {
-      OnChanged(e);
-    }
   }
 }