Changeset 10880

Timestamp:

05/21/14 15:13:44 (11 years ago)

Author:

tsteinre

Message:

• refined IModelBacktransformator

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IModelBacktransformator.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

@@ -56 +56 @@
       var mapper = new TransformationToSymbolicTreeMapper();
       var transformator = new SymbolicExpressionTreeBacktransformator(mapper);
-      transformator.Backtransform(Content.Model, Content.ProblemData.Transformations);
+      var transformations = Content.ProblemData.Transformations;
+      var targetVar = Content.ProblemData.TargetVariable;
+
+      transformator.Backtransform(Content.Model, transformations, targetVar);
       // TODO: cloning is needed for refreshing the view, find a better approach for this.
       Content = (SymbolicRegressionSolution)Content.Clone();

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs

@@ -34 +34 @@
     }
 
-    public void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations) {
+    public void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable) {
       var symbolicModel = (ISymbolicDataAnalysisModel)model;
 
       foreach (var transformation in transformations) {
-        ApplyBacktransformation(transformation, symbolicModel.SymbolicExpressionTree);
+        ApplyBacktransformation(transformation, symbolicModel.SymbolicExpressionTree, targetVariable);
       }
     }
 
-    private void ApplyBacktransformation(ITransformation transformation, ISymbolicExpressionTree symbolicExpressionTree) {
+    private void ApplyBacktransformation(ITransformation transformation, ISymbolicExpressionTree symbolicExpressionTree, string targetVariable) {
       var variableNodes = symbolicExpressionTree.IterateNodesBreadth()
         .OfType<VariableTreeNode>()

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IModelBacktransformator.cs

@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IModelBacktransformator {
-    void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations);
+    void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable);
   }
 }