Changeset 15281 for branches/Async/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/VariousInstanceProvider.cs

Timestamp:

07/23/17 11:17:18 (7 years ago)

Author:

abeham

Message:

#2258: merged r14001:15280 from trunk into branch

Location:

branches/Async

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/VariousInstanceProvider.cs (modified) (3 diffs)

branches/Async

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/Async/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/VariousInstanceProvider.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -37 +38 @@
       get { return ""; }
     }
+    public int Seed { get; private set; }
 
+    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;
     }

@@ -24 +24 @@
 protoc.exe
 obj
+.vs