Changeset 887 for branches/CloningRefactorBranch/HeuristicLab.Random/NormalDistributedRandom.cs

Timestamp:

12/02/08 21:10:17 (15 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.Random/NormalDistributedRandom.cs (modified) (3 diffs)

branches/CloningRefactorBranch/HeuristicLab.Random/NormalDistributedRandom.cs

@@ -452 +452 @@
     }
 
+    /// <summary>
+    /// Copy constructor to create deep clones.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    public NormalDistributedRandom(NormalDistributedRandom 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 NormalDistributedRandom(NormalDistributedRandom original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.uniform = (IRandom)Auxiliary.Clone(original.uniform, clonedObjects);
+      this.mu = original.mu;
+      this.sigma = original.sigma;
+    }
+
     #region IRandom Members
 
@@ -511 +528 @@
     #endregion
 
+    /// <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) {
+      return new NormalDistributedRandom(this, clonedObjects);
+    }
     #region persistence
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
@@ -536 +562 @@
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      NormalDistributedRandom clone = new NormalDistributedRandom((IRandom)Auxiliary.Clone(uniform, clonedObjects), mu, sigma);
-      clonedObjects.Add(Guid, clone);
-      return clone;
-    }
-
     #endregion
   }