Changeset 887 for branches/CloningRefactorBranch/HeuristicLab.DataAnalysis/Dataset.cs

Timestamp:

12/02/08 21:10:17 (16 years ago)

Author:

gkronber

Message:

Refactored cloning in all plugins except: HL.Communication, HL.Hive, HL.GP, HL.Routing, HL.Scheduling, HL.SimOpt, HL.Visualization

#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.DataAnalysis/Dataset.cs (modified) (2 diffs)

branches/CloningRefactorBranch/HeuristicLab.DataAnalysis/Dataset.cs

@@ -105 +105 @@
     }
 
+    /// <summary>
+    /// Copy constructor to create deep clones.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    public Dataset(Dataset 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 Dataset(Dataset original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      double[] cloneSamples = new double[original.rows * original.columns];
+      Array.Copy(original.samples, cloneSamples, original.samples.Length);
+      this.rows = original.rows;
+      this.columns = original.columns;
+      this.Samples = cloneSamples;
+      this.Name = original.Name;
+      this.VariableNames = new string[original.VariableNames.Length];
+      Array.Copy(original.VariableNames, this.VariableNames, original.VariableNames.Length);
+      Array.Copy(original.scalingFactor, this.scalingFactor, original.columns);
+      Array.Copy(original.scalingOffset, this.scalingOffset, original.columns);
+    }
+
     private void CreateDictionaries() {
       // keep a means and ranges dictionary for each column (possible target variable) of the dataset.
@@ -119 +143 @@
     }
 
+    /// <summary>
+    /// Creates a deep clone with the copy constructor reusing already cloned
+    /// object references.
+    /// </summary>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    /// <returns>The cloned instance.</returns>
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Dataset clone = new Dataset();
-      clonedObjects.Add(Guid, clone);
-      double[] cloneSamples = new double[rows * columns];
-      Array.Copy(samples, cloneSamples, samples.Length);
-      clone.rows = rows;
-      clone.columns = columns;
-      clone.Samples = cloneSamples;
-      clone.Name = Name;
-      clone.VariableNames = new string[VariableNames.Length];
-      Array.Copy(VariableNames, clone.VariableNames, VariableNames.Length);
-      Array.Copy(scalingFactor, clone.scalingFactor, columns);
-      Array.Copy(scalingOffset, clone.scalingOffset, columns);
-      return clone;
+      return new Dataset(this, clonedObjects);
     }