Changeset 17364 for branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression

Timestamp:

11/22/19 10:06:42 (5 years ago)

Author:

pfleck

Message:

#3040

• Added double vectors for Dataset. Extended the type-checks for DataAnalysisProblemData.
• Added a small benchmark instance with data containing vectors. Adapted the ArtificialRegressionDataDescriptor to be able to specify non-double values.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression

Files:

• ArtificialRegressionDataDescriptor.cs (modified) (2 diffs)
• VectorData (added)
• VectorData/VariousInstanceProvider.cs (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Various/VariousInstanceProvider.cs) (2 diffs)
• VectorData/VectorDataTestOne.cs (added)

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections;
 using System.Collections.Generic;
 using HeuristicLab.Problems.DataAnalysis;
@@ -26 +27 @@
   public abstract class ArtificialRegressionDataDescriptor : RegressionDataDescriptor {
     public IRegressionProblemData GenerateRegressionData() {
-      Dataset dataset = new Dataset(VariableNames, this.GenerateValues());
+      var values = GenerateValues();
+      Dataset dataset = values != null
+        ? new Dataset(VariableNames, GenerateValues())
+        : new Dataset(VariableNames, GenerateValuesExtended());
       return GenerateRegressionData(dataset);
     }
 
     protected abstract List<List<double>> GenerateValues();
+
+    protected virtual List<IList> GenerateValuesExtended() {
+      return null;
+    }
   }
 }

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VariousInstanceProvider.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class VariousInstanceProvider : ArtificialRegressionInstanceProvider {
+  public class VectorDataInstanceProvider : ArtificialRegressionInstanceProvider {
     public override string Name {
-      get { return "Various Benchmark Problems"; }
+      get { return "Vector Data Benchmark Problems"; }
     }
     public override string Description {
@@ -40 +40 @@
     public int Seed { get; private set; }
 
-    public VariousInstanceProvider() : this((int)DateTime.Now.Ticks) { }
+    public VectorDataInstanceProvider()
+      : this((int)DateTime.Now.Ticks) { }
 
-    public VariousInstanceProvider(int seed) : base() {
+    public VectorDataInstanceProvider(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 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;
+      return new List<IDataDescriptor> {
+        new VectorDataTestOne(rand.Next())
+      };
     }
   }