Changeset 2715 for trunk

Timestamp:

01/29/10 04:15:45 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• adapted parameters to be able to use generic content types of views

Location:

trunk/sources

Files:

• HeuristicLab.Core/3.3/Interfaces/IOperatorParameter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/Counter.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/StandardOperator.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ItemParameterView.Designer.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ItemParameterView.cs (modified) (5 diffs)
• HeuristicLab.Parameters/3.3/ItemParameter.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IOperatorParameter.cs

@@ -30 +30 @@
     IOperator Value { get; set; }
 
-    new IOperator GetValue(ExecutionContext context);
-
     event EventHandler ActualNameChanged;
     event EventHandler ValueChanged;

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

@@ -50 +50 @@
 
     public override ExecutionContextCollection Apply(ExecutionContext context) {
-      IntData value = Value.GetValue(context);
-      IntData increment = Increment.GetValue(context);
+      IntData value = (IntData)Value.GetValue(context);
+      IntData increment = (IntData)Increment.GetValue(context);
       value.Value += increment.Value;
       return base.Apply(context);

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

@@ -46 +46 @@
 
     public override ExecutionContextCollection Apply(ExecutionContext context) {
-      IOperator successor = Successor.GetValue(context);
+      IOperator successor = (IOperator)Successor.GetValue(context);
       if (successor != null)
         return new ExecutionContextCollection(new ExecutionContext(context.Parent, successor, context.Scope));

trunk/sources/HeuristicLab.Parameters.Views/3.3/ItemParameterView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Parameters.Views {
-  partial class ItemParameterView {
+  partial class ItemParameterView<T> {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Parameters.Views/3.3/ItemParameterView.cs

@@ -35 +35 @@
   /// The visual representation of a <see cref="Parameter"/>.
   /// </summary>
-  [Content(typeof(ItemParameter), true)]
-  public partial class ItemParameterView : ParameterView {
+  [Content(typeof(ItemParameter<>), true)]
+  public partial class ItemParameterView<T> : ParameterView where T : class, IItem {
     protected TypeSelectorDialog typeSelectorDialog;
 
@@ -44 +44 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No own data storage present.</remarks>
-    public new ItemParameter Content {
-      get { return (ItemParameter)base.Content; }
+    public new ItemParameter<T> Content {
+      get { return (ItemParameter<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -61 +61 @@
     /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
     /// <param name="variable">The variable to represent visually.</param>
-    public ItemParameterView(ItemParameter parameter)
+    public ItemParameterView(ItemParameter<T> parameter)
       : this() {
       Content = parameter;
@@ -134 +134 @@
       typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, false);
       if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK)
-        Content.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
+        Content.Value = (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
     }
     protected virtual void clearValueButton_Click(object sender, EventArgs e) {
@@ -152 +152 @@
     protected virtual void valuePanel_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        IItem item = e.Data.GetData("Value") as IItem;
-        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (IItem)item.Clone();
+        T item = e.Data.GetData("Value") as T;
+        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (T)item.Clone();
         Content.Value = item;
       }

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

@@ -31 +31 @@
   /// Represents a parameter.
   /// </summary>
-  [Item("ItemParameter", "A parameter which represents an IItem.")]
-  [Creatable("Test")]
-  public class ItemParameter : Parameter {
+  [Item("ItemParameter<T>", "A generic parameter which represents an instance of type T.")]
+  public class ItemParameter<T> : Parameter where T : class, IItem {
     [Storable]
     private string actualName;
@@ -47 +46 @@
     }
 
-    private IItem value;
+    private T value;
     [Storable]
-    public IItem Value {
+    public T Value {
       get { return this.value; }
       set {
@@ -63 +62 @@
 
     public ItemParameter()
-      : base("Anonymous", null, typeof(IItem)) {
+      : base("Anonymous", null, typeof(T)) {
       actualName = Name;
       Value = null;
     }
-    protected ItemParameter(string name, string description, Type dataType)
-      : base(name, description, dataType) {
+    public ItemParameter(string name, string description)
+      : base(name, description, typeof(T)) {
       this.actualName = Name;
       this.Value = null;
     }
-    public ItemParameter(string name, string description)
-      : base(name, description, typeof(IItem)) {
-      this.actualName = Name;
-      this.Value = null;
-    }
-    public ItemParameter(string name, string description, IItem value)
-      : base(name, description, typeof(IItem)) {
+    public ItemParameter(string name, string description, T value)
+      : base(name, description, typeof(T)) {
       this.actualName = Name;
       this.Value = value;
@@ -84 +78 @@
 
     public override IItem GetValue(ExecutionContext context) {
-      ItemParameter param = this;
+      ItemParameter<T> param = this;
       ExecutionContext current = context;
       string actualName = null;
@@ -94 +88 @@
           current = current.Parent;
         if (current != null)
-          param = (ItemParameter)current.Operator.Parameters[actualName];
+          param = (ItemParameter<T>)current.Operator.Parameters[actualName];
         else
           param = null;
@@ -106 +100 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      ItemParameter clone = (ItemParameter)base.Clone(cloner);
+      ItemParameter<T> clone = (ItemParameter<T>)base.Clone(cloner);
       clone.actualName = actualName;
-      clone.Value = (IItem)cloner.Clone(value);
+      clone.Value = (T)cloner.Clone(value);
       return clone;
     }
@@ -133 +127 @@
     }
   }
-
-  [Item("ItemParameter<T>", "A generic parameter which represents an instance of type T.")]
-  [EmptyStorableClass]
-  public class ItemParameter<T> : ItemParameter where T : class, IItem {
-    public new T Value {
-      get { return (T)base.Value; }
-      set { base.Value = value; }
-    }
-
-    public ItemParameter()
-      : base("Anonymous", null, typeof(T)) {
-      Value = null;
-    }
-    public ItemParameter(string name, string description)
-      : base(name, description, typeof(T)) {
-      this.Value = null;
-    }
-    public ItemParameter(string name, string description, T value)
-      : base(name, description, typeof(T)) {
-      this.Value = value;
-    }
-
-    public new T GetValue(ExecutionContext context) {
-      return (T)base.GetValue(context);
-    }
-  }
 }