Changeset 7044 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Generator

Timestamp:

11/22/11 16:52:43 (13 years ago)

Author:

sforsten

Message:

#1669: real world problems have been added

Location:

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Generator

Files:

• RegressionBenchmark.cs (modified) (1 diff)
• RegressionRealWorldBenchmark.cs (added)
• RegressionToyBenchmark.cs (added)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Generator/RegressionBenchmark.cs

@@ -57 +57 @@
     }
 
-    protected abstract List<double> CalculateFunction(List<List<double>> data);
-
-    protected abstract List<List<double>> GenerateInput(List<List<double>> dataList);
-
-    public IDataAnalysisProblemData GenerateProblemData() {
-      List<string> varNames = new List<string>();
-      varNames.Add(this.TargetVariable);
-      varNames.AddRange(InputVariable);
-
-      List<List<double>> dataList = GenerateInput(new List<List<double>>());
-
-      dataList.Insert(0, CalculateFunction(dataList));
-
-      Dataset dataset = new Dataset(varNames, dataList);
-
-      RegressionProblemData problemData = new RegressionProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
-
-      problemData.Name = "Data generated for benchmark problem \"" + this.Name + "\"";
-      problemData.Description = this.Description;
-
-      problemData.TestPartition.Start = this.TestPartition.Start;
-      problemData.TestPartition.End = this.TestPartition.End;
-
-      problemData.TrainingPartition.Start = this.TrainingPartition.Start;
-      problemData.TrainingPartition.End = this.TrainingPartition.End;
-
-      return problemData;
-    }
+    public abstract IDataAnalysisProblemData GenerateProblemData();
 
     public static List<double> GenerateSteps(DoubleRange range, double stepWidth) {