Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Core/CompositeOperation.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.Core/CompositeOperation.cs (modified) (2 diffs)

branches/CloningRefactorBranch/HeuristicLab.Core/CompositeOperation.cs

@@ -59 +59 @@
 
     /// <summary>
+    /// Copy constructor to create a deep clone of a CompositeOperation instance.
+    /// <remarks>Calls <see cref="CompositeOperation(CompositeOperation original, 
+    /// IDictionary<Guid, object> clonedObjects)"/></remarks> with an initially 
+    /// empty dictionary of cloned objects to create the clone.
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public CompositeOperation(CompositeOperation original) : this(original, new Dictionary<Guid, object>()) { }
+
+    /// <summary>
+    /// Copy constructor to create a deep clone of a CompositeOperation instance 
+    /// automatically reusing references of already cloned objects.
+    /// </summary>
+    /// <param name="original">The original instance to be cloned</param>
+    /// <param name="clonedObjects">Already cloned object references</param>
+    protected CompositeOperation(CompositeOperation original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.myExecuteInParallel = original.ExecuteInParallel;
+      for (int i = 0; i < original.Operations.Count; i++)
+        this.AddOperation((IOperation)Auxiliary.Clone(original.Operations[i], clonedObjects));
+    }
+
+    /// <summary>
     /// Adds an operation to the current list of operations.
     /// </summary>
@@ -77 +99 @@
     /// </summary>
     /// <remarks>All operations of the current instance are cloned, too (deep clone), with the 
-    /// <see cref="HeuristicLab.Core.Auxiliary.Clone"/> method of the class <see cref="Auxiliary"/>.</remarks>
-    /// <param name="clonedObjects">A dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
+    /// copy consturctor <see cref="HeuristicLab.Core.CompositeOperation(
+    /// CompositeOperation original, IDictionary<Guid, object> clonedObjects)"/>.</remarks>
+    /// <param name="clonedObjects">A dictionary of all already cloned objects. (Needed for referential integrity.)</param>
     /// <returns>The cloned operation as <see cref="CompositeOperation"/>.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      CompositeOperation clone = new CompositeOperation();
-      clonedObjects.Add(Guid, clone);
-      clone.myExecuteInParallel = ExecuteInParallel;
-      for (int i = 0; i < Operations.Count; i++)
-        clone.AddOperation((IOperation)Auxiliary.Clone(Operations[i], clonedObjects));
-      return clone;
+      return new CompositeOperation(this, clonedObjects);
     }