Changeset 7759 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

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

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (3 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -191 +191 @@
       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -34 +32 @@
   [Creatable("Problems")]
   public class SymbolicRegressionSingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, ISymbolicRegressionSingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IRegressionProblem,
-    IProblemInstanceConsumer<RegressionData>, IProblemInstanceExporter<RegressionData> {
+    IProblemInstanceConsumer<RegressionProblemData>, IProblemInstanceExporter<RegressionProblemData> {
     private const double PunishmentFactor = 10;
     private const int InitialMaximumTreeDepth = 8;
@@ -116 +114 @@
     }
 
-    public void Load(RegressionData data) {
+    public void Load(RegressionProblemData data) {
       Name = data.Name;
       Description = data.Description;
-      Dataset dataset = new Dataset(data.InputVariables, data.Values);
-      ProblemData = new RegressionProblemData(dataset, data.AllowedInputVariables, data.TargetVariable);
-      ProblemData.TrainingPartition.Start = data.TrainingPartitionStart;
-      ProblemData.TrainingPartition.End = data.TrainingPartitionEnd;
-      ProblemData.TestPartition.Start = data.TestPartitionStart;
-      ProblemData.TestPartition.End = data.TestPartitionEnd;
+      ProblemData = new RegressionProblemData(data.Dataset, data.AllowedInputVariables, data.TargetVariable);
+      ProblemData.TrainingPartition.Start = data.TrainingPartition.Start;
+      ProblemData.TrainingPartition.End = data.TrainingPartition.End;
+      ProblemData.TestPartition.Start = data.TestPartition.Start;
+      ProblemData.TestPartition.End = data.TestPartition.End;
       OnReset();
     }
 
-    public RegressionData Export() {
-      if (!ProblemData.InputVariables.Count.Equals(ProblemData.Dataset.DoubleVariables.Count()))
-        throw new ArgumentException("Not all input variables are double variables! (Export only works with double variables)");
-
-      RegressionData regData = new RegressionData();
+    public RegressionProblemData Export() {
+      RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
       regData.Name = Name;
       regData.Description = Description;
-      regData.TargetVariable = ProblemData.TargetVariable;
-      regData.InputVariables = ProblemData.InputVariables.Select(x => x.Value).ToArray();
-      regData.AllowedInputVariables = ProblemData.AllowedInputVariables.ToArray();
-      regData.TrainingPartitionStart = ProblemData.TrainingPartition.Start;
-      regData.TrainingPartitionEnd = ProblemData.TrainingPartition.End;
-      regData.TestPartitionStart = ProblemData.TestPartition.Start;
-      regData.TestPartitionEnd = ProblemData.TestPartition.End;
-
-      List<List<double>> data = new List<List<double>>();
-      foreach (var variable in ProblemData.Dataset.DoubleVariables) {
-        data.Add(ProblemData.Dataset.GetDoubleValues(variable).ToList());
-      }
-      regData.Values = Transformer.Transformation(data);
-
+      regData.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
+      regData.TrainingPartition.End = ProblemData.TrainingPartition.End;
+      regData.TestPartition.Start = ProblemData.TestPartition.Start;
+      regData.TestPartition.End = ProblemData.TestPartition.End;
       return regData;
     }