Changeset 4722 for trunk/sources/HeuristicLab.Random/3.3/NormalDistributedRandom.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Random/3.3/NormalDistributedRandom.cs (modified) (3 diffs)

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

@@ -450 +450 @@
 
     /// <summary>
+    /// Used by HeuristicLab.Persistence to initialize new instances during deserialization.
+    /// </summary>
+    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
+    [StorableConstructor]
+    private NormalDistributedRandom(bool deserializing) : base(deserializing) { }
+
+    /// <summary>
+    /// Initializes a new instance from an existing one (copy constructor).
+    /// </summary>
+    /// <param name="original">The original <see cref="NormalDistributedRandom"/> instance which is used to initialize the new instance.</param>
+    /// <param name="cloner">A <see cref="Cloner"/> which is used to track all already cloned objects in order to avoid cycles.</param>
+    private NormalDistributedRandom(NormalDistributedRandom original, Cloner cloner)
+      : base(original, cloner) {
+      uniform = cloner.Clone(original.uniform);
+      mu = original.mu;
+      sigma = original.sigma;
+    }
+
+    /// <summary>
     /// Initializes a new instance of <see cref="NormalDistributedRandom"/> with µ = 0 and sigma = 1
     /// and a new random number generator.
@@ -471 +490 @@
       this.uniform = uniformRandom;
     }
-    /// <summary>
-    /// Used by HeuristicLab.Persistence to initialize new instances during deserialization.
-    /// </summary>
-    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
-    [StorableConstructor]
-    private NormalDistributedRandom(bool deserializing) : base(deserializing) { }
 
     #region IRandom Members
@@ -529 +542 @@
     /// <returns>The cloned object as <see cref="NormalDistributedRandom"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      NormalDistributedRandom clone = (NormalDistributedRandom)base.Clone(cloner);
-      clone.uniform = (IRandom)cloner.Clone(uniform);
-      clone.mu = mu;
-      clone.sigma = sigma;
-      return clone;
+      return new NormalDistributedRandom(this, cloner);
     }