Changeset 9133 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs

Timestamp:

01/09/13 14:56:57 (11 years ago)

Author:

sforsten

Message:

#2001:

• removed IRealWorldRegressionDataDescriptor and RealWorldResourceRegressionDataDescriptor
• simplified regression data descriptors as suggested by mkommend

File:

• trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ArtificialRegressionDataDescriptor.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public abstract class ArtificialRegressionDataDescriptor : IDataDescriptor {
-    public abstract string Name { get; }
-    public abstract string Description { get; }
-
-    protected abstract string TargetVariable { get; }
-    protected abstract string[] VariableNames { get; }
-    protected abstract string[] AllowedInputVariables { get; }
-    protected abstract int TrainingPartitionStart { get; }
-    protected abstract int TrainingPartitionEnd { get; }
-    protected abstract int TestPartitionStart { get; }
-    protected abstract int TestPartitionEnd { get; }
-
+  public abstract class ArtificialRegressionDataDescriptor : RegressionDataDescriptor {
     public IRegressionProblemData GenerateRegressionData() {
       Dataset dataset = new Dataset(VariableNames, this.GenerateValues());
-
-      RegressionProblemData regData = new RegressionProblemData(dataset, AllowedInputVariables, TargetVariable);
-      regData.Name = this.Name;
-      regData.Description = this.Description;
-      regData.TrainingPartition.Start = this.TrainingPartitionStart;
-      regData.TrainingPartition.End = this.TrainingPartitionEnd;
-      regData.TestPartition.Start = this.TestPartitionStart;
-      regData.TestPartition.End = this.TestPartitionEnd;
-      return regData;
+      return GenerateRegressionData(dataset);
     }