Changeset 4675 for branches/CloningRefactoring/HeuristicLab.Random/3.3/FastRandom.cs

Timestamp:

10/29/10 18:58:23 (13 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.SequentialEngine and HeuristicLab.Random (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Random/3.3/FastRandom.cs (modified) (3 diffs)

branches/CloningRefactoring/HeuristicLab.Random/3.3/FastRandom.cs

@@ -54 +54 @@
 
     #region Constructors
+    /// <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 FastRandom(bool deserializing) : base(deserializing) { }
+
+    /// <summary>
+    /// Initializes a new instance from an existing one (copy constructor).
+    /// </summary>
+    /// <param name="original">The original <see cref="FastRandom"/> 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 FastRandom(FastRandom original, Cloner cloner)
+      : base(original, cloner) {
+      x = original.x;
+      y = original.y;
+      z = original.z;
+      w = original.w;
+      bitBuffer = original.bitBuffer;
+      bitMask = original.bitMask;
+    }
 
     /// <summary>
@@ -71 +92 @@
       Reinitialise(seed);
     }
-
-    /// <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 FastRandom(bool deserializing) : base(deserializing) { }
-
     #endregion
 
@@ -351 +364 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      FastRandom clone = (FastRandom)base.Clone(cloner);
-      clone.x = x;
-      clone.y = y;
-      clone.z = z;
-      clone.w = w;
-      clone.bitBuffer = bitBuffer;
-      clone.bitMask = bitMask;
-      return clone;
+      return new FastRandom(this, cloner);
     }
   }