Changeset 2773 for trunk/sources/HeuristicLab.Operators/3.3/ValuesCollector.cs

Timestamp:

02/10/10 03:39:02 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters and operators

File:

• trunk/sources/HeuristicLab.Operators/3.3/ValuesCollector.cs (moved) (moved from trunk/sources/HeuristicLab.Operators/3.3/ValueCollector.cs) (2 diffs)

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

@@ -24 +24 @@
 using System.Text;
 using System.Xml;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
@@ -32 +33 @@
   /// An operator which collects the actual values of parameters.
   /// </summary>
-  [Item("ValueCollector", "An operator which collects the actual values of parameters.")]
-  [EmptyStorableClass]
+  [Item("ValuesCollector", "An operator which collects the actual values of parameters.")]
   [Creatable("Test")]
-  public abstract class ValueCollector : SingleSuccessorOperator, IOperator {
-    protected ValueParameter<ParameterCollection> CollectedValuesParameter {
-      get { return (ValueParameter<ParameterCollection>)Parameters["CollectedValues"]; }
-    }
+  public abstract class ValuesCollector : SingleSuccessorOperator, IOperator {
+    private ParameterCollection collectedValues;
+    [Storable]
     public ParameterCollection CollectedValues {
-      get { return CollectedValuesParameter.Value; }
-      set { CollectedValuesParameter.Value = value; }
+      get { return collectedValues; }
+      private set {
+        collectedValues = value;
+        collectedValues.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsAdded);
+        collectedValues.ItemsRemoved += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsRemoved);
+        collectedValues.CollectionReset += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_CollectionReset);
+      }
     }
 
-    public ValueCollector()
+    public ValuesCollector()
       : base() {
-      Parameters.Add(new ValueParameter<ParameterCollection>("CollectedValues", "The parameters whose actual values are collected.", new ParameterCollection()));
+      CollectedValues = new ParameterCollection();
     }
 
-    protected override void OnExecutionContextChanged() {
-      foreach (IParameter param in CollectedValues)
-        param.ExecutionContext = ExecutionContext;
+    public override IDeepCloneable Clone(Cloner cloner) {
+      ValuesCollector clone = (ValuesCollector)base.Clone(cloner);
+      clone.CollectedValues = (ParameterCollection)cloner.Clone(collectedValues);
+      return clone;
+    }
+
+    private void collectedValues_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IParameter> e) {
+      Parameters.AddRange(e.Items);
+    }
+    private void collectedValues_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IParameter> e) {
+      Parameters.RemoveRange(e.Items);
+    }
+    #region NOTE
+    // NOTE: The ItemsReplaced event has not to be handled here as it is only fired when the name (i.e. key) of a parameter
+    // changes. As the same parameter is also contained in the Parameters collection of the operator, the Parameters collection
+    // will react on this name change on its own.
+    #endregion
+    private void collectedValues_CollectionReset(object sender, CollectionItemsChangedEventArgs<IParameter> e) {
+      Parameters.RemoveRange(e.OldItems);
+      Parameters.AddRange(e.Items);
     }
   }