Changeset 7682 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/02/12 10:55:26 (13 years ago)

Author:

sforsten

Message:

#1784:

• added Problem.Instances.Classification project
• added classification problem instances
• added a class Transformer to Problem.Instances

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/ClassificationProblem.cs (modified) (3 diffs)
• Regression/RegressionProblem.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -28 +32 @@
   [Item("Classification Problem", "A general classification problem.")]
   [Creatable("Problems")]
-  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {
+  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent,
+    IProblemInstanceConsumer<ClassificationData>, IProblemInstanceExporter<ClassificationData>, IProblemInstanceConsumer {
     public string Filename { get; set; }
 
@@ -45 +50 @@
       ProblemData = problemData;
     }
+
+    public void Load(ClassificationData data) {
+      Name = data.Name;
+      Description = data.Description;
+      Dataset dataset = new Dataset(data.InputVariables, data.Values);
+      ProblemData = new ClassificationProblemData(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;
+      OnReset();
+    }
+
+    public ClassificationData 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)");
+
+      ClassificationData claData = new ClassificationData();
+      claData.Name = Name;
+      claData.Description = Description;
+      claData.TargetVariable = ProblemData.TargetVariable;
+      claData.InputVariables = ProblemData.InputVariables.Select(x => x.Value).ToArray();
+      claData.AllowedInputVariables = ProblemData.AllowedInputVariables.ToArray();
+      claData.TrainingPartitionStart = ProblemData.TrainingPartition.Start;
+      claData.TrainingPartitionEnd = ProblemData.TrainingPartition.End;
+      claData.TestPartitionStart = ProblemData.TestPartition.Start;
+      claData.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());
+      }
+      claData.Values = Transformer.Transformation(data);
+
+      return claData;
+    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

@@ -71 +71 @@
       regData.Description = Description;
       regData.TargetVariable = ProblemData.TargetVariable;
-      regData.InputVariables = ProblemData.InputVariables.Select(x => x.Value);
-      regData.AllowedInputVariables = ProblemData.AllowedInputVariables;
+      regData.InputVariables = ProblemData.InputVariables.Select(x => x.Value).ToArray();
+      regData.AllowedInputVariables = ProblemData.AllowedInputVariables.ToArray();
       regData.TrainingPartitionStart = ProblemData.TrainingPartition.Start;
       regData.TrainingPartitionEnd = ProblemData.TrainingPartition.End;
@@ -82 +82 @@
         data.Add(ProblemData.Dataset.GetDoubleValues(variable).ToList());
       }
-      regData.Values = Transformation(data);
+      regData.Values = Transformer.Transformation(data);
 
       return regData;
     }
-
-    public static double[,] Transformation(List<List<double>> data) {
-      if (!data.All(x => x.Count.Equals(data.First().Count)))
-        throw new ArgumentException("Can't create jagged array.");
-      double[,] values = new double[data.First().Count, data.Count];
-      for (int i = 0; i < values.GetLength(0); i++) {
-        for (int j = 0; j < values.GetLength(1); j++) {
-          values[i, j] = data[j][i];
-        }
-      }
-      return values;
-    }
   }
 }