Changeset 16692 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection

Timestamp:

03/18/19 17:24:30 (6 years ago)

Author:

abeham

Message:

#2521: merged trunk changes up to r15681 into branch (removal of trunk/sources)

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelection.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelectionInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelectionRegressionProblemData.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring

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

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

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelection.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelectionInstanceProvider.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -41 +41 @@
       get { return ""; }
     }
+    public int Seed { get; private set; }
+
+    public FeatureSelectionInstanceProvider() : base() {
+      Seed = (int)DateTime.Now.Ticks;
+    }
+
+    public FeatureSelectionInstanceProvider(int seed) : base() {
+      Seed = seed;
+    }
+
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
@@ -46 +56 @@
       var pp = new double[] { 0.1, 0.25, 0.5 };
       var noiseRatios = new double[] { 0.01, 0.05, 0.1, 0.2 };
-      var mt = new MersenneTwister();
-      var xGenerator = new NormalDistributedRandom(mt, 0, 1);
-      var weightGenerator = new UniformDistributedRandom(mt, 0, 10);
+      var rand = new MersenneTwister((uint)Seed); // use fixed seed for deterministic problem generation
+
       return (from size in sizes
               from p in pp
               from noiseRatio in noiseRatios
+              let instanceSeed = rand.Next()
+              let mt = new MersenneTwister((uint)instanceSeed)
+              let xGenerator = new NormalDistributedRandom(mt, 0, 1)
+              let weightGenerator = new UniformDistributedRandom(mt, 0, 10)
               select new FeatureSelection(size, p, noiseRatio, xGenerator, weightGenerator))
               .Cast<IDataDescriptor>()

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/FeatureSelection/FeatureSelectionRegressionProblemData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
+  [StorableClass]
   public class FeatureSelectionRegressionProblemData : RegressionProblemData {
     private const string SelectedFeaturesParameterName = "SelectedFeatures";

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