Changeset 885 for branches/CloningRefactorBranch/HeuristicLab.Data/DoubleArrayData.cs

Timestamp:

12/02/08 14:13:06 (16 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/DoubleArrayData.cs (modified) (5 diffs)

branches/CloningRefactorBranch/HeuristicLab.Data/DoubleArrayData.cs

@@ -56 +56 @@
       Data = data;
     }
+    /// <summary>
+    /// Copy constructor to create clones (deep).
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    public DoubleArrayData(DoubleArrayData 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 DoubleArrayData(DoubleArrayData original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) { }
 
     /// <summary>
@@ -63 +75 @@
     public override IView CreateView() {
       return new DoubleArrayDataView(this);
+    }
+
+    /// <summary>
+    /// Clones an instance using the copy constructor
+    /// reusing already cloned object references.
+    /// </summary>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    /// <returns>A cloned (deep) instance</returns>
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      return new DoubleArrayData(this, clonedObjects);
     }
 
@@ -74 +96 @@
     /// <param name="persistedObjects">A dictionary of all already persisted objects. (Needed to avoid cycles.)</param>
     /// <returns>The saved <see cref="XmlNode"></see>.</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(CultureInfo.InvariantCulture.NumberFormat);
       return node;
     }
-    
+
     /// <summary>
     /// Loads the persisted double array from the specified <paramref name="node"/>.
@@ -89 +111 @@
     /// <param name="node">The <see cref="XmlNode"></see> where the instance is saved.</param>
     /// <param name="restoredObjects">A 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);
       string[] tokens = node.InnerText.Split(';');
       double[] data = new double[tokens.Length];
-      for(int i = 0; i < data.Length; i++)
-        if(double.TryParse(tokens[i], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data[i]) == false) {
+      for (int i = 0; i < data.Length; i++)
+        if (double.TryParse(tokens[i], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data[i]) == false) {
           throw new FormatException("Can't parse " + tokens[i] + " as double value.");
         }
@@ -109 +131 @@
     private string ToString(NumberFormatInfo format) {
       StringBuilder builder = new StringBuilder();
-      for(int i = 0; i < Data.Length; i++) {
+      for (int i = 0; i < Data.Length; i++) {
         builder.Append(";");
         builder.Append(Data[i].ToString("r", format));
       }
-      if(builder.Length > 0)
+      if (builder.Length > 0)
         builder.Remove(0, 1);
       return builder.ToString();