Changeset 7759 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ArtificialClassificationDataDescriptor.cs

Timestamp:

04/24/12 16:37:40 (13 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.Classification/3.4/ArtificialClassificationDataDescriptor.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ArtificialClassificationDataDescriptor.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using HeuristicLab.Problems.DataAnalysis;
 
-using System.Collections.Generic;
 namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ArtificialClassificationDataDescriptor : IDataDescriptor {
@@ -35 +36 @@
     protected abstract int TestPartitionEnd { get; }
 
-    public ClassificationData GenerateClassificationData() {
-      ClassificationData claData = new ClassificationData();
+    public ClassificationProblemData GenerateClassificationData() {
+      Dataset dataset = new Dataset(InputVariables, this.GenerateValues());
+
+      ClassificationProblemData claData = new ClassificationProblemData(dataset, AllowedInputVariables, TargetVariable);
       claData.Name = this.Name;
       claData.Description = this.Description;
-      claData.InputVariables = this.InputVariables;
-      claData.AllowedInputVariables = this.AllowedInputVariables;
-      claData.TargetVariable = this.TargetVariable;
-      claData.Values = Transformer.Transformation(this.GenerateValues());
-      claData.TrainingPartitionStart = this.TrainingPartitionStart;
-      claData.TrainingPartitionEnd = this.TrainingPartitionEnd;
-      claData.TestPartitionStart = this.TestPartitionStart;
-      claData.TestPartitionEnd = this.TestPartitionEnd;
+      claData.TrainingPartition.Start = this.TrainingPartitionStart;
+      claData.TrainingPartition.End = this.TrainingPartitionEnd;
+      claData.TestPartition.Start = this.TestPartitionStart;
+      claData.TestPartition.End = this.TestPartitionEnd;
       return claData;
     }