Changeset 10695 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

04/02/14 11:38:44 (11 years ago)

Author:

pfleck

Message:

• Added Transformations to PreprocessingData
• Added Transformations to DataAnalysisProblemData Parameters
• Removed SymbolicExpressionTree as inverse transformation.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingContext.cs (modified) (1 diff)
• Implementations/PreprocessingData.cs (modified) (2 diffs)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)
• ProblemDataCreator.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs

@@ -93 +93 @@
       problem.ProblemDataParameter.ActualValue = data;
       problem.Name = "Preprocessed " + problem.Name;
-
-      var symbolicProblem = problem as ISymbolicDataAnalysisProblem;
-      if (symbolicProblem != null) {
-        var tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
-        var variableNode = (VariableTreeNode)new Variable("dummy", "dummy description").CreateTreeNode();
-        variableNode.VariableName = "dummy";
-        tree.Root.AddSubtree(variableNode);
-
-        symbolicProblem.TransformationsParameter.Value.Add(tree);
-      }
-
       return clone;
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

@@ -39 +39 @@
 
     protected double trainingToTestRatio;
+
+    protected IList<ITransformation> transformations;
 
     protected PreprocessingData(PreprocessingData original, Cloner cloner)
@@ -161 +163 @@
     }
 
+    public IList<ITransformation> Transformations {
+      get { return transformations; }
+    }
+
     public string GetVariableName(int columnIndex) {
       return variableNames[columnIndex];

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs

@@ -51 +51 @@
     IntRange TestPartition { get; }
 
+    IList<ITransformation> Transformations { get; }
+
     IEnumerable<string> VariableNames { get; }
     string GetVariableName(int columnIndex);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/ProblemDataCreator.cs

@@ -29 +29 @@
     private readonly IPreprocessingContext context;
 
+    private Dataset ExportedDataset {
+      get { return exporteDataset ?? (exporteDataset = context.Data.ExportToDataset()); }
+    }
+    private Dataset exporteDataset;
+
+    private IEnumerable<string> InputVariables { get { return context.Data.VariableNames; } }
+    private IEnumerable<ITransformation> Transformations { get { return context.Data.Transformations; } }
+
+
     public ProblemDataCreator(IPreprocessingContext context) {
       this.context = context;
@@ -38 +47 @@
       IDataAnalysisProblemData problemData = null;
 
-      var dataSet = context.Data.ExportToDataset();
-      var inputVariables = context.Data.VariableNames;
-
       if (oldProblemData is RegressionProblemData) {
-        problemData = CreateRegressionData((RegressionProblemData)oldProblemData, dataSet, inputVariables);
+        problemData = CreateRegressionData((RegressionProblemData)oldProblemData);
       } else if (oldProblemData is ClassificationProblemData) {
-        problemData = CreateClassificationData((ClassificationProblemData)oldProblemData, dataSet, inputVariables);
+        problemData = CreateClassificationData((ClassificationProblemData)oldProblemData);
       } else if (oldProblemData is ClusteringProblemData) {
-        problemData = CreateClusteringData((ClusteringProblemData)oldProblemData, dataSet, inputVariables);
+        problemData = CreateClusteringData((ClusteringProblemData)oldProblemData);
       } else {
         throw new NotImplementedException("The type of the DataAnalysisProblemData is not supported.");
@@ -56 +62 @@
     }
 
-    private IDataAnalysisProblemData CreateRegressionData(RegressionProblemData oldProblemData, Dataset dataSet, IEnumerable<string> inputVariables) {
+    private IDataAnalysisProblemData CreateRegressionData(RegressionProblemData oldProblemData) {
       var targetVariable = oldProblemData.TargetVariable;
       // target variable must be double and must exist in the new dataset
-      return new RegressionProblemData(dataSet, inputVariables, targetVariable);
+      return new RegressionProblemData(ExportedDataset, InputVariables, targetVariable, Transformations);
     }
 
-    private IDataAnalysisProblemData CreateClassificationData(ClassificationProblemData oldProblemData, Dataset dataSet, IEnumerable<string> inputVariables) {
+    private IDataAnalysisProblemData CreateClassificationData(ClassificationProblemData oldProblemData) {
       var targetVariable = oldProblemData.TargetVariable;
       // target variable must be double and must exist in the new dataset
-      return new ClassificationProblemData(dataSet, inputVariables, targetVariable);
+      return new ClassificationProblemData(ExportedDataset, InputVariables, targetVariable, Transformations);
     }
 
-    private IDataAnalysisProblemData CreateClusteringData(ClusteringProblemData oldProblemData, Dataset dataSet, IEnumerable<string> inputVariables) {
-      return new ClusteringProblemData(dataSet, inputVariables);
+    private IDataAnalysisProblemData CreateClusteringData(ClusteringProblemData oldProblemData) {
+      return new ClusteringProblemData(ExportedDataset, InputVariables, Transformations);
     }