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

branches/CloningRefactorBranch/HeuristicLab.Core/OperatorGraph.cs

@@ -60 +60 @@
 
     /// <summary>
+    /// Copy constructor to create a deep clone of an OperatorGraph instance.
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public OperatorGraph(OperatorGraph original) : this(original, new Dictionary<Guid, object>()) { }
+
+    /// <summary>
+    /// Copy constructor to create a deep clone of an OperatorGraph instance
+    /// reusing already cloned objects.
+    /// </summary>
+    /// <param name="original">The original instance to be cloned</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected OperatorGraph(OperatorGraph original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      foreach (IOperator op in original.Operators)
+        this.AddOperator((IOperator)Auxiliary.Clone(op, clonedObjects));
+      if (original.InitialOperator != null)
+        this.myInitialOperator = (IOperator)Auxiliary.Clone(original.InitialOperator, clonedObjects);
+    }
+
+    /// <summary>
     /// Creates a new instance of <see cref="OperatorGraphView"/> to represent the current instance
     /// visually.
@@ -71 +91 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
-    /// <see cref="Auxiliary"/>.</remarks>
+    /// <remarks>Deep clone using the copy constructor.</remarks>
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="OperatorGraph"/>.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      OperatorGraph clone = new OperatorGraph();
-      clonedObjects.Add(Guid, clone);
-      foreach (IOperator op in Operators)
-        clone.AddOperator((IOperator)Auxiliary.Clone(op, clonedObjects));
-      if (InitialOperator != null)
-        clone.myInitialOperator = (IOperator)Auxiliary.Clone(InitialOperator, clonedObjects);
-      return clone;
+      return new OperatorGraph(this, clonedObjects);
     }
 
@@ -179 +192 @@
     /// (Needed to avoid cycles.)</param>
     /// <returns>The saved <see cref="XmlNode"/>.</returns>
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlNode ops = document.CreateNode(XmlNodeType.Element, "Operators", null);
@@ -197 +210 @@
     /// <param name="restoredObjects">The dictionary of all already restored objects. 
     /// (Needed to avoid cycles.)</param>
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);