Changeset 10869 for branches/DataPreprocessing

Timestamp:

05/21/14 11:49:55 (10 years ago)

Author:

pfleck

Message:

• implemented basic backtransformation without variable weights

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) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.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);
-      var model = transformator.Backtransform(Content.Model, Content.ProblemData.Transformations);
-      MainFormManager.MainForm.ShowContent(model);
+      transformator.Backtransform(Content.Model, Content.ProblemData.Transformations);
     }
   }

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

@@ -33 +33 @@
     }
 
-    public IDataAnalysisModel Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations) {
+    public void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations) {
       var symbolicModel = (ISymbolicDataAnalysisModel)model;
 
@@ -39 +39 @@
         ApplyBacktransformation(transformation, symbolicModel.SymbolicExpressionTree);
       }
-
-      return symbolicModel;
     }
 
     private void ApplyBacktransformation(ITransformation transformation, ISymbolicExpressionTree symbolicExpressionTree) {
-      bool modelHasVariable = symbolicExpressionTree.IterateNodesBreadth().Any(n => IsVariableNode(n, transformation.Column));
-      // TODO
+      var variableNodes = symbolicExpressionTree.IterateNodesBreadth()
+        .Where(n => IsVariableNode(n, transformation.Column));
+
+      var transformationTree = transformationMapper.GenerateModel(transformation);
+      foreach (var variableNode in variableNodes) {
+        SwapTransformationTree(transformationTree, variableNode);
+      }
+    }
+
+    private void SwapTransformationTree(ISymbolicExpressionTree transformationTree, ISymbolicExpressionTreeNode targetNode) {
+      var parent = targetNode.Parent;
+      int index = parent.IndexOfSubtree(targetNode);
+      parent.RemoveSubtree(index);
+      parent.InsertSubtree(index, transformationTree.Root.GetSubtree(0));
     }
 

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

@@ -284 +284 @@
 
     private ConstantTreeNode CreateConstantTreeNode(string description, double value) {
-      return new ConstantTreeNode(new Constant() { Description = description }) { Value = value };
+      return new ConstantTreeNode(new Constant()) { Value = value };
     }
     private ISymbolicExpressionTreeNode CreateVariableTreeNode(string name, string description) {

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

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