Changeset 4164 for trunk/sources/HeuristicLab.Optimization

Timestamp:

08/05/10 10:54:00 (14 years ago)

Author:

mkommend

Message:

Added persistence of Constraints to RunCollection (ticket #1124).

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -34 +34 @@
   [StorableClass]
   public class RunCollection : ItemCollection<IRun>, IStringConvertibleMatrix {
+    [StorableConstructor]
+    protected RunCollection(bool deserializing) : base(deserializing) { }
     public RunCollection() : base() { Initialize(); }
     public RunCollection(int capacity) : base(capacity) { Initialize(); }
@@ -42 +44 @@
       dataTypes = new Dictionary<string, HashSet<Type>>();
       constraints = new RunCollectionConstraintCollection();
-      constraints.ItemsAdded += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsAdded);
-      constraints.ItemsRemoved += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsRemoved);
-      constraints.CollectionReset += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_CollectionReset);
-    }
+      RegisterConstraintsEvents();
+    }
+
     [Storable]
     private Dictionary<string, HashSet<Type>> dataTypes;
@@ -53 +54 @@
       return dataTypes[columnName];
     }
+
+    [Storable]
     private RunCollectionConstraintCollection constraints;
     public RunCollectionConstraintCollection Constraints {
@@ -160 +163 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      if (constraints == null) constraints = new RunCollectionConstraintCollection();
+      RegisterConstraintsEvents();
+      UpdateFiltering(true);
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -168 +177 @@
       foreach (string s in this.dataTypes.Keys)
         clone.dataTypes[s] = new HashSet<Type>(this.dataTypes[s]);
+
+      clone.constraints = new RunCollectionConstraintCollection(this.constraints.Select(x => (IRunCollectionConstraint)cloner.Clone(x)));
+      foreach (IRunCollectionConstraint constraint in clone.constraints)
+        constraint.ConstrainedValue = clone;
+      clone.RegisterConstraintsEvents();
+      clone.RegisterConstraintEvents(clone.constraints);
+
+      clone.UpdateFiltering(true);
       return clone;
     }
@@ -261 +278 @@
     }
 
+    private void RegisterConstraintsEvents() {
+      constraints.ItemsAdded += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsAdded);
+      constraints.ItemsRemoved += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_ItemsRemoved);
+      constraints.CollectionReset += new CollectionItemsChangedEventHandler<IRunCollectionConstraint>(Constraints_CollectionReset);
+    }
+
     protected virtual void RegisterConstraintEvents(IEnumerable<IRunCollectionConstraint> constraints) {
       foreach (IRunCollectionConstraint constraint in constraints) {