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

branches/CloningRefactorBranch/HeuristicLab.Data/BoolData.cs

@@ -54 +54 @@
       Data = data;
     }
+
+    /// <summary>
+    /// Copy constructor to create deep clones.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    public BoolData(BoolData original) : this(original, new Dictionary<Guid, object>()) { }
+
+    /// <summary>
+    /// Copy constructor to create deep clones 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 BoolData(BoolData original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.Data = original.Data;
+    }
     /// <summary>
     /// Creates a new instance of the <see cref="BoolDataView"/> class.
@@ -63 +79 @@
 
     /// <summary>
-    /// Clones the current instance.
+    /// Clones the current instance using the copy constructor.
     /// </summary>
-    /// <remarks>The cloned instance is added to the <paramref name="dictionary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already cloned objects.</param>
     /// <returns>The cloned instance as <see cref="BoolData"/>.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      BoolData clone = new BoolData();
-      clonedObjects.Add(Guid, clone);
-      clone.Data = Data;
-      return clone;
+      return new BoolData(this, clonedObjects);
     }
     /// <summary>
@@ -82 +94 @@
     /// <param name="persistedObjects">The dictionary of all already persisted objects. (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);
       node.InnerText = ToString();
@@ -95 +107 @@
     /// <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);
       Data = bool.Parse(node.InnerText);