Changeset 15281 for branches/Async/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Vladislavleva/VladislavlevaInstanceProvider.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/Vladislavleva/VladislavlevaInstanceProvider.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/Vladislavleva/VladislavlevaInstanceProvider.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 {
@@ -38 +39 @@
     }
 
+    public int Seed { get; private set; }
+
+    public VladislavlevaInstanceProvider() : this((int)DateTime.Now.Ticks) { }
+    public VladislavlevaInstanceProvider(int seed) : base() {
+      Seed = seed;
+    }
+
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
-      descriptorList.Add(new KotanchekFunction());
+      var rand = new MersenneTwister((uint)Seed);
+      descriptorList.Add(new KotanchekFunction(rand.Next()));
       descriptorList.Add(new SalutowiczFunctionOneDimensional());
       descriptorList.Add(new SalutowiczFunctionTwoDimensional());
-      descriptorList.Add(new UnwrappedBallFunctionFiveDimensional());
-      descriptorList.Add(new RationalPolynomialThreeDimensional());
-      descriptorList.Add(new SineCosineFunction());
-      descriptorList.Add(new RippleFunction());
-      descriptorList.Add(new RationalPolynomialTwoDimensional());
+      descriptorList.Add(new UnwrappedBallFunctionFiveDimensional(rand.Next()));
+      descriptorList.Add(new RationalPolynomialThreeDimensional(rand.Next()));
+      descriptorList.Add(new SineCosineFunction(rand.Next()));
+      descriptorList.Add(new RippleFunction(rand.Next()));
+      descriptorList.Add(new RationalPolynomialTwoDimensional(rand.Next()));
       return descriptorList;
     }

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