Changeset 14305 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs

Timestamp:

09/23/16 12:57:27 (8 years ago)

Author:

gkronber

Message:

#2371: merged r14228, r14229 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ValueGenerator.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   internal static class ValueGenerator {
-    private static FastRandom rand = new FastRandom();
 
     /// <summary>
     /// Generates uniformly distributed values between start and end (inclusive!) 
     /// </summary>
+    /// <param name="seed">The seed for the random number generator</param>
     /// <param name="n">Number of values to generate.</param>
     /// <param name="start">The lower value (inclusive)</param>
     /// <param name="end">The upper value (inclusive)</param>
     /// <returns>An enumerable including n values in [start, end]</returns>
-    public static IEnumerable<double> GenerateUniformDistributedValues(int n, double start, double end) {
+    public static IEnumerable<double> GenerateUniformDistributedValues(int seed, int n, double start, double end) {
+      var rand = new FastRandom(seed);
       for (int i = 0; i < n; i++) {
         // we need to return a random value including end.
@@ -47 +48 @@
     /// Generates normally distributed values sampling from N(mu, sigma) 
     /// </summary>
+    /// <param name="seed">The seed for the random number generator</param>
     /// <param name="n">Number of values to generate.</param>
     /// <param name="mu">The mu parameter of the normal distribution</param>
     /// <param name="sigma">The sigma parameter of the normal distribution</param>
     /// <returns>An enumerable including n values ~ N(mu, sigma)</returns>
-    public static IEnumerable<double> GenerateNormalDistributedValues(int n, double mu, double sigma) {
+    public static IEnumerable<double> GenerateNormalDistributedValues(int seed, int n, double mu, double sigma) {
+      var rand = new FastRandom(seed);
       for (int i = 0; i < n; i++)
         yield return NormalDistributedRandom.NextDouble(rand, mu, sigma);