Changeset 14305 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.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/Keijzer/KeijzerInstanceProvider.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.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; private set; }
+
+    public KeijzerInstanceProvider() : this((int)System.DateTime.Now.Ticks) {
+    }
+    public KeijzerInstanceProvider(int seed) : base() {
+      Seed = seed;
+    }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      var rand = new MersenneTwister((uint)Seed);
       descriptorList.Add(new KeijzerFunctionOne());
       descriptorList.Add(new KeijzerFunctionTwo());
       descriptorList.Add(new KeijzerFunctionThree());
       descriptorList.Add(new KeijzerFunctionFour());
-      descriptorList.Add(new KeijzerFunctionFive());
+      descriptorList.Add(new KeijzerFunctionFive(rand.Next()));
       descriptorList.Add(new KeijzerFunctionSix());
       descriptorList.Add(new KeijzerFunctionSeven());
       descriptorList.Add(new KeijzerFunctionEight());
       descriptorList.Add(new KeijzerFunctionNine());
-      descriptorList.Add(new KeijzerFunctionTen());
-      descriptorList.Add(new KeijzerFunctionEleven());
-      descriptorList.Add(new KeijzerFunctionTwelve());
-      descriptorList.Add(new KeijzerFunctionThirteen());
-      descriptorList.Add(new KeijzerFunctionFourteen());
-      descriptorList.Add(new KeijzerFunctionFifteen());
+      descriptorList.Add(new KeijzerFunctionTen(rand.Next()));
+      descriptorList.Add(new KeijzerFunctionEleven(rand.Next()));
+      descriptorList.Add(new KeijzerFunctionTwelve(rand.Next()));
+      descriptorList.Add(new KeijzerFunctionThirteen(rand.Next()));
+      descriptorList.Add(new KeijzerFunctionFourteen(rand.Next()));
+      descriptorList.Add(new KeijzerFunctionFifteen(rand.Next()));
       return descriptorList;
     }