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

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

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

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

@@ -55 +55 @@
 
     /// <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 MersenneTwister(bool deserializing) : base(deserializing) { }
+    /// <summary>
+    /// Initializes a new instance from an existing one (copy constructor).
+    /// </summary>
+    /// <param name="original">The original <see cref="MersenneTwister"/> 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 MersenneTwister(MersenneTwister original, Cloner cloner)
+      : base(original, cloner) {
+      state = (uint[])original.state.Clone();
+      p = original.p;
+      init = original.init;
+    }
+    /// <summary>
     /// Initializes a new instance of <see cref="MersenneTwister"/>.
     /// </summary>
@@ -78 +95 @@
       init = true;
     }
-    /// <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 MersenneTwister(bool deserializing) : base(deserializing) { }
 
     /// <summary>
@@ -91 +102 @@
     /// <returns>The cloned object as <see cref="MersenneTwister"/>.</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      MersenneTwister clone = (MersenneTwister)base.Clone(cloner);
-      clone.state = (uint[])state.Clone();
-      clone.p = p;
-      clone.init = init;
-      return clone;
+      return new MersenneTwister(this, cloner);
     }