Changeset 14228 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen

Timestamp:

08/02/16 18:09:47 (8 years ago)

Author:

gkronber

Message:

#2371: added constructors to allow specification of random seeds for randomly generated regression problem instances (primarily for unit tests)

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen

Files:

• NguyenFunctionEight.cs (modified) (1 diff)
• NguyenFunctionEleven.cs (modified) (2 diffs)
• NguyenFunctionFive.cs (modified) (1 diff)
• NguyenFunctionFour.cs (modified) (1 diff)
• NguyenFunctionNine.cs (modified) (2 diffs)
• NguyenFunctionOne.cs (modified) (1 diff)
• NguyenFunctionSeven.cs (modified) (1 diff)
• NguyenFunctionSix.cs (modified) (2 diffs)
• NguyenFunctionTen.cs (modified) (2 diffs)
• NguyenFunctionThree.cs (modified) (1 diff)
• NguyenFunctionTwelve.cs (modified) (2 diffs)
• NguyenFunctionTwo.cs (modified) (1 diff)
• NguyenInstanceProvider.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEight.cs

@@ -46 +46 @@
     protected override int TestPartitionEnd { get { return 520; } }
 
+    public int Seed { get; }
+
+    public NguyenFunctionEight() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionEight(int seed) : base() {
+      Seed = seed;
+    }
+
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, 0, 4).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, 0, 4).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEleven.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -45 +46 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 1020; } }
+    public int Seed { get; }
 
+    public NguyenFunctionEleven() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionEleven(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1).ToList());
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1).ToList());
+      var rand = new MersenneTwister((uint)Seed);
+
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 0, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 0, 1).ToList());
 
       double x, y;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFive.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionFive() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionFive(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFour.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionFour() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionFour(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionNine.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -45 +46 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 1020; } }
+    public int Seed { get; }
 
+    public NguyenFunctionNine() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionNine(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1).ToList());
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1).ToList());
+      var rand = new MersenneTwister((uint)Seed);
+
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 0, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, 0, 1).ToList());
 
       double x, y;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionOne.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionOne() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionOne(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSeven.cs

@@ -46 +46 @@
     protected override int TestPartitionEnd { get { return 520; } }
 
+    public int Seed { get; }
+
+    public NguyenFunctionSeven() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionSeven(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, 0, 2).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, 0, 2).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSix.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionSix() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionSix(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;
@@ -54 +59 @@
       for (int i = 0; i < data[0].Count; i++) {
         x = data[0][i];
-        results.Add(Math.Sin(x) + Math.Sin(x + x*x));
+        results.Add(Math.Sin(x) + Math.Sin(x + x * x));
       }
       data.Add(results);

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTen.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -45 +46 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 1020; } }
+    public int Seed { get; }
 
+    public NguyenFunctionTen() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionTen(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
+      var rand = new MersenneTwister((uint)Seed);
+
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 1020, 0, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 1020, 0, 1).ToList());
 
       double x, y;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionThree.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionThree() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionThree(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwelve.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -45 +46 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 1020; } }
+    public int Seed { get; }
 
+    public NguyenFunctionTwelve() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionTwelve(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
+      var rand = new MersenneTwister((uint)Seed);
+
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 1020, 0, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 1020, 0, 1).ToList());
 
       double x, y;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwo.cs

@@ -45 +45 @@
     protected override int TestPartitionStart { get { return 20; } }
     protected override int TestPartitionEnd { get { return 520; } }
+    public int Seed { get; }
 
+    public NguyenFunctionTwo() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenFunctionTwo(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(Seed, 520, -1, 1).ToList());
 
       double x;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -37 +38 @@
       get { return "McDermott et al., 2012 \"Genetic Programming Needs Better Benchmarks\", in Proc. of GECCO 2012."; }
     }
+    public int Seed { get; }
+
+    public NguyenInstanceProvider() : this((int)System.DateTime.Now.Ticks) { }
+    public NguyenInstanceProvider(int seed) : base() {
+      Seed = seed;
+    }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
-      descriptorList.Add(new NguyenFunctionOne());
-      descriptorList.Add(new NguyenFunctionTwo());
-      descriptorList.Add(new NguyenFunctionThree());
-      descriptorList.Add(new NguyenFunctionFour());
-      descriptorList.Add(new NguyenFunctionFive());
-      descriptorList.Add(new NguyenFunctionSix());
-      descriptorList.Add(new NguyenFunctionSeven());
-      descriptorList.Add(new NguyenFunctionEight());
-      descriptorList.Add(new NguyenFunctionNine());
-      descriptorList.Add(new NguyenFunctionTen());
-      descriptorList.Add(new NguyenFunctionEleven());
-      descriptorList.Add(new NguyenFunctionTwelve());
+      var rand = new MersenneTwister((uint)Seed);
+      descriptorList.Add(new NguyenFunctionOne(rand.Next()));
+      descriptorList.Add(new NguyenFunctionTwo(rand.Next()));
+      descriptorList.Add(new NguyenFunctionThree(rand.Next()));
+      descriptorList.Add(new NguyenFunctionFour(rand.Next()));
+      descriptorList.Add(new NguyenFunctionFive(rand.Next()));
+      descriptorList.Add(new NguyenFunctionSix(rand.Next()));
+      descriptorList.Add(new NguyenFunctionSeven(rand.Next()));
+      descriptorList.Add(new NguyenFunctionEight(rand.Next()));
+      descriptorList.Add(new NguyenFunctionNine(rand.Next()));
+      descriptorList.Add(new NguyenFunctionTen(rand.Next()));
+      descriptorList.Add(new NguyenFunctionEleven(rand.Next()));
+      descriptorList.Add(new NguyenFunctionTwelve(rand.Next()));
       return descriptorList;
     }