Changeset 2756 for trunk/sources/HeuristicLab.Operators

Timestamp:

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

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• Counter.cs (modified) (1 diff)
• MultipleSuccessorsOperator.cs (modified) (5 diffs)

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

@@ -36 +36 @@
   [Creatable("Test")]
   public sealed class Counter : SingleSuccessorOperator {
-    public ItemParameter<IntData> Value {
-      get { return (ItemParameter<IntData>)Parameters["Value"]; }
+    public LookupParameter<IntData> ValueParameter {
+      get { return (LookupParameter<IntData>)Parameters["Value"]; }
     }
-    public ItemParameter<IntData> Increment {
-      get { return (ItemParameter<IntData>)Parameters["Increment"]; }
+    public ValueLookupParameter<IntData> IncrementParaneter {
+      get { return (ValueLookupParameter<IntData>)Parameters["Increment"]; }
+    }
+    public IntData Increment {
+      get { return IncrementParaneter.Value; }
+      set { IncrementParaneter.Value = value; }
     }
 
     public Counter()
       : base() {
-      Parameters.Add(new ItemParameter<IntData>("Value", "The value which should be incremented."));
-      Parameters.Add(new ItemParameter<IntData>("Increment", "The increment which is added to the value.", new IntData(1)));
+      Parameters.Add(new LookupParameter<IntData>("Value", "The value which should be incremented."));
+      Parameters.Add(new ValueLookupParameter<IntData>("Increment", "The increment which is added to the value.", new IntData(1)));
     }
 
     public override ExecutionContextCollection Apply() {
-      IntData value = (IntData)Value.Value;
-      IntData increment = (IntData)Increment.Value;
-      value.Value += increment.Value;
+      if (ValueParameter.ActualValue == null) ValueParameter.ActualValue = new IntData();
+      ValueParameter.ActualValue.Value += IncrementParaneter.ActualValue.Value;
       return base.Apply();
     }

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

@@ -38 +38 @@
   [EmptyStorableClass]
   public abstract class MultipleSuccessorsOperator : Operator {
-    protected IOperatorParameter[] SuccessorParameters {
+    protected IValueParameter<IOperator>[] SuccessorParameters {
       get {
         return (from p in Parameters
-                where p is IOperatorParameter
+                where p is IValueParameter<IOperator>
                 orderby p.Name ascending
-                select (IOperatorParameter)p).ToArray();
+                select (IValueParameter<IOperator>)p).ToArray();
       }
     }
@@ -53 +53 @@
           successors = new OperatorList();
           var opParams = SuccessorParameters;
-          foreach (IOperatorParameter opParam in opParams) {
+          foreach (IValueParameter<IOperator> opParam in opParams) {
             opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
             successors.Add(opParam.Value);
@@ -73 +73 @@
     private void UpdateOperatorParameters() {
       var opParams = SuccessorParameters;
-      foreach (IOperatorParameter opParam in opParams) {
+      foreach (IValueParameter<IOperator> opParam in opParams) {
         opParam.ValueChanged -= new EventHandler(opParam_ValueChanged);
         Parameters.Remove(opParam.Name);
       }
       for (int i = 0; i < Successors.Count; i++) {
-        IOperatorParameter opParam = new OperatorParameter(i.ToString(), string.Empty, Successors[i]);
+        IValueParameter<IOperator> opParam = new OperatorParameter(i.ToString(), string.Empty, Successors[i]);
         opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
         Parameters.Add(opParam);
@@ -92 +92 @@
     private void successors_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOperator>> e) {
       foreach (IndexedItem<IOperator> item in e.Items)
-        ((IOperatorParameter)Parameters[item.Index.ToString()]).Value = item.Value;
+        ((IValueParameter<IOperator>)Parameters[item.Index.ToString()]).Value = item.Value;
     }
     private void successors_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOperator>> e) {
       foreach (IndexedItem<IOperator> item in e.Items)
-        ((IOperatorParameter)Parameters[item.Index.ToString()]).Value = item.Value;
+        ((IValueParameter<IOperator>)Parameters[item.Index.ToString()]).Value = item.Value;
     }
     private void successors_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IOperator>> e) {
@@ -102 +102 @@
     }
     private void opParam_ValueChanged(object sender, EventArgs e) {
-      IOperatorParameter opParam = (IOperatorParameter)sender;
+      IValueParameter<IOperator> opParam = (IValueParameter<IOperator>)sender;
       int index = int.Parse(opParam.Name);
       successors[index] = opParam.Value;