Changeset 4258

Timestamp:

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

Author:

swagner

Message:

Worked in integration of FastRandom PRNG (#1114)

Location:

trunk/sources/HeuristicLab.Random/3.3

Files:

• FastRandom.cs (modified) (6 diffs)
• FastRandomCreator.cs (deleted)
• HeuristicLab.Random-3.3.csproj (modified) (1 diff)
• MersenneTwister.cs (modified) (2 diffs)
• NormalDistributedRandom.cs (modified) (2 diffs)
• NormalRandomizer.cs (modified) (1 diff)
• RandomCreator.cs (modified) (4 diffs)
• UniformRandomizer.cs (modified) (1 diff)

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;

trunk/sources/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj

@@ -108 +108 @@
   <ItemGroup>
     <None Include="HeuristicLabRandomPlugin.cs.frame" />
-    <Compile Include="FastRandomCreator.cs" />
     <Compile Include="FastRandom.cs" />
     <Compile Include="HeuristicLabRandomPlugin.cs" />

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

@@ -43 +43 @@
   [Item("MersenneTwister", "A high-quality pseudo random number generator which creates uniformly distributed random numbers.")]
   [StorableClass]
-  public class MersenneTwister : Item, IRandom {
+  public sealed class MersenneTwister : Item, IRandom {
     private const int n = 624, m = 397;
 
@@ -78 +78 @@
       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>

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

@@ -34 +34 @@
   [Item("NormalDistributedRandom", "A pseudo random number generator which uses the Ziggurat method to create normally distributed random numbers.")]
   [StorableClass]
-  public class NormalDistributedRandom : Item, IRandom {
+  public sealed class NormalDistributedRandom : Item, IRandom {
     [Storable]
     private double mu;
@@ -471 +471 @@
       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

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

@@ -67 +67 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Value", "The value that should be set to a random value."));
     }
+    [StorableConstructor]
+    protected NormalRandomizer(bool deserializing) : base(deserializing) { }
 
     /// <summary>

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

@@ -39 +39 @@
       get { return (ValueLookupParameter<IntValue>)Parameters["Seed"]; }
     }
+    public ValueParameter<IRandom> RandomTypeParameter {
+      get { return (ValueParameter<IRandom>)Parameters["RandomType"]; }
+    }
     public LookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
@@ -50 +53 @@
       set { SeedParameter.Value = value; }
     }
+    public IRandom RandomType {
+      get { return RandomTypeParameter.Value; }
+      set { RandomTypeParameter.Value = value; }
+    }
 
     public RandomCreator()
@@ -55 +62 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
+      Parameters.Add(new ValueParameter<IRandom>("RandomType", "The type of pseudo random number generator which is created.", new MersenneTwister()));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The new pseudo random number generator which is initialized with the given seed."));
     }
+    [StorableConstructor]
+    private RandomCreator(bool deserializing) : base(deserializing) { }
+
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code (remove with 3.4)
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      if (!Parameters.ContainsKey("RandomType"))
+        Parameters.Add(new ValueParameter<IRandom>("RandomType", "The type of pseudo random number generator which is created.", new MersenneTwister()));
+    }
+    #endregion
 
     public override IOperation Apply() {
@@ -65 +84 @@
 
       if (setSeedRandomly) seed.Value = new System.Random().Next();
-      RandomParameter.ActualValue = new MersenneTwister((uint)seed.Value);
+      IRandom random = (IRandom)RandomType.Clone();
+      random.Reset(seed.Value);
+      RandomParameter.ActualValue = random;
 
       return base.Apply();

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

@@ -70 +70 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Value", "The value that should be set to a random value."));
     }
+    [StorableConstructor]
+    protected UniformRandomizer(bool deserializing) : base(deserializing) { }
 
     /// <summary>