Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Constraints/AndConstraint.cs

Timestamp:

12/02/08 14:13:06 (15 years ago)

Author:

gkronber

Message:

Refactored cloning in HL.Core, HL.Data and HL.Constraints

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

File:

• branches/CloningRefactorBranch/HeuristicLab.Constraints/AndConstraint.cs (modified) (2 diffs)

branches/CloningRefactorBranch/HeuristicLab.Constraints/AndConstraint.cs

@@ -44 +44 @@
     }
 
+    /// <summary>
+    /// Default constructor for an empty AndConstraint.
+    /// </summary>
     public AndConstraint() {
       clauses = new ItemList<IConstraint>();
+    }
+
+    /// <summary>
+    /// Copy constructor to create clones (deep).
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public AndConstraint(AndConstraint original) : this(original, new Dictionary<Guid, object>()) { }
+   /// <summary>
+    /// Copy constructor to create clones (deep) reusing already cloned object references.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected AndConstraint(AndConstraint original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.Clauses = (ItemList<IConstraint>)Auxiliary.Clone(original.Clauses, clonedObjects);
     }
 
@@ -60 +78 @@
       return new AndConstraintView(this);
     }
-
+    /// <summary>
+    /// Uses copy constructor to create a deep clone reusing already cloned object references.
+    /// </summary>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    /// <returns></returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      AndConstraint clone = new AndConstraint();
-      clonedObjects.Add(Guid, clone);
-      clone.Clauses = (ItemList<IConstraint>)Auxiliary.Clone(Clauses, clonedObjects);
-      return clone;
+      return new AndConstraint(this, clonedObjects);
     }