Changeset 4258 for trunk/sources/HeuristicLab.Random/3.3/FastRandom.cs

Timestamp:

08/19/10 05:38:47 (14 years ago)

Author:

swagner

Message:

Worked in integration of FastRandom PRNG (#1114)

File:

• trunk/sources/HeuristicLab.Random/3.3/FastRandom.cs (modified) (6 diffs)

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

@@ -1 +1 @@
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -43 +44 @@
   /// </summary>
   [StorableClass]
-  public class FastRandom : Item, IRandom {
+  public sealed class FastRandom : Item, IRandom {
     // The +1 ensures NextDouble doesn't generate 1.0
     private const double REAL_UNIT_INT = 1.0 / ((double)int.MaxValue + 1.0);
@@ -70 +71 @@
       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
@@ -319 +327 @@
       }
       return (bitBuffer & (bitMask >>= 1)) == 0;
-    }           
+    }
     // Buffer 32 bits in bitBuffer, return 1 at a time, keep track of how many have been returned
     // with bitBufferIdx.
@@ -328 +336 @@
 
 
-    #endregion    
+    #endregion
 
     #region IRandom Members
@@ -340 +348 @@
     }
 
-    #endregion   
-
-    public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
+    #endregion
+
+    public override IDeepCloneable Clone(Cloner cloner) {
       FastRandom clone = (FastRandom)base.Clone(cloner);
       clone.x = x;