Changeset 4722 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (4 diffs)

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

@@ -38 +38 @@
     [StorableConstructor]
     protected RunCollection(bool deserializing) : base(deserializing) { }
+
+    protected RunCollection(RunCollection original, Cloner cloner)
+      : base(original, cloner) {
+      resultNames = new List<string>(original.resultNames);
+      parameterNames = new List<string>(original.parameterNames);
+      dataTypes = new Dictionary<string, HashSet<Type>>();
+      foreach (string s in original.dataTypes.Keys)
+        dataTypes[s] = new HashSet<Type>(original.dataTypes[s]);
+
+      constraints = new RunCollectionConstraintCollection(original.constraints.Select(x => cloner.Clone(x)));
+      foreach (IRunCollectionConstraint constraint in constraints)
+        constraint.ConstrainedValue = this;
+      RegisterConstraintsEvents();
+      RegisterConstraintEvents(constraints);
+
+      UpdateFiltering(true);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new RunCollection(this, cloner);
+    }
     public RunCollection() : base() { Initialize(); }
     public RunCollection(int capacity) : base(capacity) { Initialize(); }
@@ -171 +191 @@
 
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       if (constraints == null) constraints = new RunCollectionConstraintCollection();
       RegisterConstraintsEvents();
       RegisterConstraintEvents(constraints);
       UpdateFiltering(true);
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      RunCollection clone = (RunCollection)base.Clone(cloner);
-      clone.resultNames = new List<string>(this.resultNames);
-      clone.parameterNames = new List<string>(this.parameterNames);
-      clone.dataTypes = new Dictionary<string, HashSet<Type>>();
-      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;
     }
 
@@ -253 +255 @@
     public event EventHandler<EventArgs<int, int>> ItemChanged;
     protected virtual void OnItemChanged(int rowIndex, int columnIndex) {
-      if (ItemChanged != null)
-        ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
+      EventHandler<EventArgs<int, int>> handler = ItemChanged;
+      if (handler != null) handler(this, new EventArgs<int, int>(rowIndex, columnIndex));
       OnToStringChanged();
     }
     public event EventHandler Reset;
     protected virtual void OnReset() {
-      if (Reset != null)
-        Reset(this, EventArgs.Empty);
+      EventHandler handler = Reset;
+      if (handler != null) handler(this, EventArgs.Empty);
       OnToStringChanged();
     }
@@ -266 +268 @@
     protected virtual void OnColumnNamesChanged() {
       EventHandler handler = ColumnNamesChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
     public event EventHandler RowNamesChanged;
     protected virtual void OnRowNamesChanged() {
       EventHandler handler = RowNamesChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
     public event EventHandler SortableViewChanged;
     protected virtual void OnSortableViewChanged() {
       EventHandler handler = SortableViewChanged;
-      if (handler != null)
-        handler(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }