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

Timestamp:

11/22/19 10:06:42 (4 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.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs (modified) (2 diffs)

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;
+    }
   }
 }