Changeset 10874

Timestamp:

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

Author:

pfleck

Message:

• convert variable weights into multiplication nodes for backtransformation

File:

• branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (modified) (1 diff)

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

@@ -43 +43 @@
     private void ApplyBacktransformation(ITransformation transformation, ISymbolicExpressionTree symbolicExpressionTree) {
       var variableNodes = symbolicExpressionTree.IterateNodesBreadth()
-        .Where(n => IsVariableNode(n, transformation.Column));
+        .OfType<VariableTreeNode>()
+        .Where(n => n.VariableName == transformation.Column);
 
       var transformationTree = transformationMapper.GenerateModel(transformation);
       foreach (var variableNode in variableNodes) {
-        SwapTransformationTree(transformationTree, variableNode);
+        SwapTransformationWithVariable(transformationTree, variableNode);
       }
     }
 
-    private void SwapTransformationTree(ISymbolicExpressionTreeNode transformationTreeNode, ISymbolicExpressionTreeNode targetNode) {
-      var parent = targetNode.Parent;
-      int index = parent.IndexOfSubtree(targetNode);
+    private void SwapTransformationWithVariable(ISymbolicExpressionTreeNode transformationTree, VariableTreeNode variableNode) {
+      var parent = variableNode.Parent;
+      int index = parent.IndexOfSubtree(variableNode);
       parent.RemoveSubtree(index);
-      parent.InsertSubtree(index, transformationTreeNode);
-    }
 
-    private bool IsVariableNode(ISymbolicExpressionTreeNode node, string variableName) {
-      var variableNode = node as VariableTreeNode;
-      if (variableNode == null) return false;
-      return variableNode.VariableName == variableName;
+      var multiplicationNode = new SymbolicExpressionTreeNode(new Multiplication());
+      multiplicationNode.AddSubtree(new ConstantTreeNode(new Constant()) { Value = variableNode.Weight });
+      multiplicationNode.AddSubtree(transformationTree);
+
+      parent.InsertSubtree(index, multiplicationNode);
     }
   }