Changeset 7759 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

Timestamp:

04/24/12 16:37:40 (12 years ago)

Author:

sforsten

Message:

#1784:

• deleted ClassificationData and RegressionData. RegressionProblemData and ClassificationProblemData are used instead
• deleted not needed Transformer
• ValueGenerator is now a static class and yield return is used return IEnumerable

File:

• branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Problems.DataAnalysis;
+
 namespace HeuristicLab.Problems.Instances.Regression {
   public abstract class ArtificialRegressionDataDescriptor : IDataDescriptor {
@@ -34 +36 @@
     protected abstract int TestPartitionEnd { get; }
 
-    public RegressionData GenerateRegressionData() {
-      RegressionData regData = new RegressionData();
+    public RegressionProblemData GenerateRegressionData() {
+      Dataset dataset = new Dataset(InputVariables, this.GenerateValues());
+
+      RegressionProblemData regData = new RegressionProblemData(dataset, AllowedInputVariables, TargetVariable);
       regData.Name = this.Name;
       regData.Description = this.Description;
-      regData.InputVariables = this.InputVariables;
-      regData.AllowedInputVariables = this.AllowedInputVariables;
-      regData.TargetVariable = this.TargetVariable;
-      regData.Values = Transformer.Transformation(this.GenerateValues());
-      regData.TrainingPartitionStart = this.TrainingPartitionStart;
-      regData.TrainingPartitionEnd = this.TrainingPartitionEnd;
-      regData.TestPartitionStart = this.TestPartitionStart;
-      regData.TestPartitionEnd = this.TestPartitionEnd;
+      regData.TrainingPartition.Start = this.TrainingPartitionStart;
+      regData.TrainingPartition.End = this.TrainingPartitionEnd;
+      regData.TestPartition.Start = this.TestPartitionStart;
+      regData.TestPartition.End = this.TestPartitionEnd;
       return regData;
     }