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

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/Various

Files:

• BreimanOne.cs (modified) (3 diffs)
• FriedmanOne.cs (modified) (1 diff)
• FriedmanTwo.cs (modified) (1 diff)
• PolyTen.cs (modified) (2 diffs)
• SpatialCoevolution.cs (modified) (3 diffs)
• VariousInstanceProvider.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/BreimanOne.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Core;
 using HeuristicLab.Random;
 
@@ -43 +44 @@
     protected override int TestPartitionEnd { get { return 10001; } }
 
-    protected static FastRandom rand = new FastRandom();
+    public int Seed { get; }
+
+    public BreimanOne() : this((int)DateTime.Now.Ticks) { }
+    public BreimanOne(int seed) : base() {
+      Seed = seed;
+    }
 
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       List<int> values = new List<int>() { -1, 1 };
-      data.Add(GenerateUniformIntegerDistribution(values, TestPartitionEnd));
+      var rand = new MersenneTwister((uint)Seed);
+      data.Add(GenerateUniformIntegerDistribution(rand, values, TestPartitionEnd));
       values.Add(0);
       for (int i = 0; i < AllowedInputVariables.Count() - 1; i++) {
-        data.Add(GenerateUniformIntegerDistribution(values, TestPartitionEnd));
+        data.Add(GenerateUniformIntegerDistribution(rand, values, TestPartitionEnd));
       }
-
       double x1, x2, x3, x4, x5, x6, x7;
       double f;
@@ -79 +85 @@
     }
 
-    private List<double> GenerateUniformIntegerDistribution(List<int> classes, int amount) {
+    private List<double> GenerateUniformIntegerDistribution(IRandom rand, List<int> classes, int amount) {
       List<double> values = new List<double>();
       for (int i = 0; i < amount; i++) {

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/FriedmanOne.cs

@@ -42 +42 @@
     protected override int TestPartitionStart { get { return 5000; } }
     protected override int TestPartitionEnd { get { return 10000; } }
+    public int Seed { get; }
 
-    protected static FastRandom rand = new FastRandom();
+    public FriedmanOne() : this((int)DateTime.Now.Ticks) { }
+
+    public FriedmanOne(int seed) : base() {
+      Seed = seed;
+    }
 
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
+      var rand = new MersenneTwister((uint)Seed);
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(10000, 0, 1).ToList());
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 10000, 0, 1).ToList());
       }
 

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/FriedmanTwo.cs

@@ -43 +43 @@
     protected override int TestPartitionEnd { get { return 10000; } }
 
-    protected static FastRandom rand = new FastRandom();
+    public int Seed { get; }
 
+    public FriedmanTwo() : this((int)DateTime.Now.Ticks) { }
+
+    public FriedmanTwo(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
+      var rand = new MersenneTwister((uint)Seed);
+
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(10000, 0, 1).ToList());
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 10000, 0, 1).ToList());
       }
 

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/PolyTen.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 250; } }
     protected override int TestPartitionEnd { get { return 500; } }
+    public int Seed { get; }
 
+    public PolyTen() : this((int)DateTime.Now.Ticks) { }
+
+    public PolyTen(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
+      var rand = new MersenneTwister((uint)Seed);
+
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1).ToList());
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), TestPartitionEnd, -1, 1).ToList());
       }
 

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/SpatialCoevolution.cs

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -50 +51 @@
     protected override int TestPartitionStart { get { return 676; } }
     protected override int TestPartitionEnd { get { return 1676; } }
+    public int Seed { get; }
 
+    public SpatialCoevolution() : this((int)DateTime.Now.Ticks) { }
+
+    public SpatialCoevolution(int seed) : base() {
+      Seed = seed;
+    }
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
@@ -57 +64 @@
       List<List<double>> trainingData = new List<List<double>>() { evenlySpacedSequence, evenlySpacedSequence };
       var combinations = ValueGenerator.GenerateAllCombinationsOfValuesInLists(trainingData).ToList();
+      var rand = new MersenneTwister((uint)Seed);
 
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
         data.Add(combinations[i].ToList());
-        data[i].AddRange(ValueGenerator.GenerateUniformDistributedValues(1000, -5, 5).ToList());
+        data[i].AddRange(ValueGenerator.GenerateUniformDistributedValues(rand.Next(), 1000, -5, 5).ToList());
       }
 

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/VariousInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -37 +38 @@
       get { return ""; }
     }
+    public int Seed { get; }
 
+    public VariousInstanceProvider() : this((int)DateTime.Now.Ticks) { }
+
+    public VariousInstanceProvider(int seed) : base() {
+      Seed = seed;
+    }
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
-      descriptorList.Add(new BreimanOne());
-      descriptorList.Add(new FriedmanOne());
-      descriptorList.Add(new FriedmanTwo());
-      descriptorList.Add(new PolyTen());
-      descriptorList.Add(new SpatialCoevolution());
+      var rand = new MersenneTwister((uint)Seed);
+      descriptorList.Add(new BreimanOne(rand.Next()));
+      descriptorList.Add(new FriedmanOne(rand.Next()));
+      descriptorList.Add(new FriedmanTwo(rand.Next()));
+      descriptorList.Add(new PolyTen(rand.Next()));
+      descriptorList.Add(new SpatialCoevolution(rand.Next()));
       return descriptorList;
     }