Changeset 3317 for trunk/sources/HeuristicLab.Operators

Timestamp:

04/13/10 06:41:56 (14 years ago)

Author:

swagner

Message:

Implemented ReadOnlyView property for items (#969).

Location:

trunk/sources/HeuristicLab.Operators/3.3

Files:

• MultipleCallsOperator.cs (modified) (2 diffs)
• Operator.cs (modified) (1 diff)
• SingleSuccessorOperator.cs (modified) (1 diff)
• ValuesCollector.cs (modified) (1 diff)

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

@@ -37 +37 @@
     private List<IValueParameter<IOperator>> operatorParameters;
 
+    [Storable]
     private OperatorList operators;
-    [Storable]
     public OperatorList Operators {
       get { return operators; }
-      private set {
-        if (operators != null) DeregisterOperatorsEvents();
-        operators = value;
-        if (operators != null) RegisterOperatorsEvents();
-      }
     }
 
     public MultipleCallsOperator()
       : base() {
-      Operators = new OperatorList();
+      operators = new OperatorList();
       Initialize();
     }
+    [StorableConstructor]
+    protected MultipleCallsOperator(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
+      if (operators != null) RegisterOperatorsEvents();
       operatorParameters = new List<IValueParameter<IOperator>>();
       for (int i = 0; i < Operators.Count; i++) {
@@ -66 +64 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       MultipleCallsOperator clone = (MultipleCallsOperator)base.Clone(cloner);
-      clone.Operators = (OperatorList)cloner.Clone(operators);
+      clone.operators = (OperatorList)cloner.Clone(operators);
       clone.Initialize();
       return clone;

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

@@ -113 +113 @@
       breakpoint = false;
     }
+    [StorableConstructor]
+    protected Operator(bool deserializing) : base(deserializing) { }
 
     /// <summary>

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

@@ -43 +43 @@
       Parameters.Add(new OperatorParameter("Successor", "Operator which is executed next."));
     }
+    [StorableConstructor]
+    protected SingleSuccessorOperator(bool deserializing) : base(deserializing) { }
 
     public override IOperation Apply() {

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

@@ -31 +31 @@
   [StorableClass]
   public abstract class ValuesCollector : SingleSuccessorOperator, IOperator {
+    [Storable]
     private ParameterCollection collectedValues;
-    [Storable]
     public ParameterCollection CollectedValues {
       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 ValuesCollector()
       : base() {
-      CollectedValues = new ParameterCollection();
+      collectedValues = new ParameterCollection();
+      Initialize();
+    }
+    [StorableConstructor]
+    protected ValuesCollector(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      collectedValues.ItemsAdded += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsAdded);
+      collectedValues.ItemsRemoved += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_ItemsRemoved);
+      collectedValues.CollectionReset += new CollectionItemsChangedEventHandler<IParameter>(collectedValues_CollectionReset);
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       ValuesCollector clone = (ValuesCollector)base.Clone(cloner);
-      clone.CollectedValues = (ParameterCollection)cloner.Clone(collectedValues);
+      clone.collectedValues = (ParameterCollection)cloner.Clone(collectedValues);
+      clone.Initialize();
       return clone;
     }