Changeset 10676 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

03/27/14 12:49:33 (11 years ago)

Author:

pfleck

Message:

• Data preprocessor now works with all types of data analysis problems. Only in case of a symbolic data analysis problem the inverse transformation information is added.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingContext.cs (modified) (5 diffs)
• Interfaces/IPreprocessingContext.cs (modified) (2 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -39 +40 @@
     public IAlgorithm Algorithm { get; private set; }
 
-    public ISymbolicDataAnalysisProblem Problem { get; private set; }
+    public IDataAnalysisProblem Problem { get; private set; }
 
-    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, ISymbolicDataAnalysisProblem problem) {
+    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) {
       Data = new TransactionalPreprocessingData(dataAnalysisProblemData);
       DataAnalysisProblemData = dataAnalysisProblemData;
@@ -63 +64 @@
       if (Algorithm != null) {
         return ExportAlgorithm();
-      } else {
-        return ExportProblem();
       }
+      return ExportProblem();
     }
+
     public IProblem ExportProblem() {
       return Export(Problem, SetupProblem);
@@ -74 +75 @@
     }
 
-    private ISymbolicDataAnalysisProblem SetupProblem(IProblem problem) {
-      return (ISymbolicDataAnalysisProblem)problem;
+    private IDataAnalysisProblem SetupProblem(IProblem problem) {
+      return (IDataAnalysisProblem)problem;
     }
-    private ISymbolicDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
+    private IDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
       algorithm.Name = algorithm.Name + "(Preprocessed)";
       algorithm.Runs.Clear();
-      return (ISymbolicDataAnalysisProblem)algorithm.Problem;
+      return (IDataAnalysisProblem)algorithm.Problem;
     }
-    private T Export<T>(T original, Func<T, ISymbolicDataAnalysisProblem> setup)
+    private T Export<T>(T original, Func<T, IDataAnalysisProblem> setup)
         where T : IItem {
       var creator = new ProblemDataCreator(this);
@@ -93 +94 @@
       problem.Name = "Preprocessed " + problem.Name;
 
-      var tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
-      var variableNode = (VariableTreeNode)new HeuristicLab.Problems.DataAnalysis.Symbolic.Variable("dummy", "dummy description").CreateTreeNode();
-      variableNode.VariableName = "dummy";
-      tree.Root.AddSubtree(variableNode);
+      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);
 
-      problem.TransformationsParameter.Value.Add(tree);
+        symbolicProblem.TransformationsParameter.Value.Add(tree);
+      }
 
       return clone;

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

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -37 +36 @@
     IAlgorithm Algorithm { get; }
 
-    ISymbolicDataAnalysisProblem Problem { get; }
+    IDataAnalysisProblem Problem { get; }
 
     IItem ExportAlgorithmOrProblem();