Changeset 2526 for trunk/sources/HeuristicLab.Random/3.3

Timestamp:

11/23/09 16:43:34 (15 years ago)

Author:

swagner

Message:

Refactored cloning (#806)

Location:

trunk/sources/HeuristicLab.Random/3.3

Files:

• MersenneTwister.cs (modified) (1 diff)
• NormalDistributedRandom.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Random/3.3/MersenneTwister.cs

@@ -84 +84 @@
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="MersenneTwister"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+    public override IItem Clone(ICloner cloner) {
       MersenneTwister clone = new MersenneTwister();
-      clonedObjects.Add(Guid, clone);
+      cloner.RegisterClonedObject(this, clone);
       clone.state = (uint[])state.Clone();
       clone.p = p;

trunk/sources/HeuristicLab.Random/3.3/NormalDistributedRandom.cs

@@ -557 +557 @@
     /// Clones the current instance (deep clone).
     /// </summary>
-    /// <remarks>Deep clone through <see cref="Auxiliary.Clone"/> method of helper class 
+    /// <remarks>Deep clone through <see cref="cloner.Clone"/> method of helper class 
     /// <see cref="Auxiliary"/>.</remarks>
     /// <param name="clonedObjects">Dictionary of all already cloned objects. (Needed to avoid cycles.)</param>
     /// <returns>The cloned object as <see cref="NormalDistributedRandom"/>.</returns>
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      NormalDistributedRandom clone = new NormalDistributedRandom((IRandom)Auxiliary.Clone(uniform, clonedObjects), mu, sigma);
-      clonedObjects.Add(Guid, clone);
+    public override IItem Clone(ICloner cloner) {
+      NormalDistributedRandom clone = new NormalDistributedRandom((IRandom)cloner.Clone(uniform), mu, sigma);
+      cloner.RegisterClonedObject(this, clone);
       return clone;
     }