Changeset 10878 for branches

Timestamp:

05/21/14 14:16:54 (10 years ago)

Author:

pfleck

Message:

• Fixed bug in backtransformation when model contains same variable multiple times.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationToSymbolicTreeMapper.cs (modified) (1 diff)

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

@@ -89 +89 @@
       this.transformModelButton.Location = new System.Drawing.Point(84, 3);
       this.transformModelButton.Name = "transformModelButton";
-      this.transformModelButton.Size = new System.Drawing.Size(100, 23);
+      this.transformModelButton.Size = new System.Drawing.Size(125, 23);
       this.transformModelButton.TabIndex = 8;
       this.transformModelButton.Text = "Backtransform Model";

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Problems.DataAnalysis.Transformations;
@@ -46 +47 @@
         .Where(n => n.VariableName == transformation.Column);
 
-      var transformationTree = transformationMapper.GenerateModel(transformation);
       foreach (var variableNode in variableNodes) {
+        // generate new subtrees because same subtree cannot be added more than once
+        var transformationTree = transformationMapper.GenerateModel(transformation);
         SwapTransformationWithVariable(transformationTree, variableNode);
       }
@@ -57 +59 @@
       parent.RemoveSubtree(index);
 
+      if (!variableNode.Weight.IsAlmost(1.0)) {
+        transformationTree = CreateNodeFromWeight(transformationTree, variableNode);
+      }
+
+      parent.InsertSubtree(index, transformationTree);
+    }
+
+    private ISymbolicExpressionTreeNode CreateNodeFromWeight(ISymbolicExpressionTreeNode transformationTree, VariableTreeNode variableNode) {
       var multiplicationNode = new SymbolicExpressionTreeNode(new Multiplication());
       multiplicationNode.AddSubtree(new ConstantTreeNode(new Constant()) { Value = variableNode.Weight });
       multiplicationNode.AddSubtree(transformationTree);
-
-      parent.InsertSubtree(index, multiplicationNode);
+      transformationTree = multiplicationNode;
+      return transformationTree;
     }
   }

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

@@ -273 +273 @@
     }
 
-    private ISymbolicExpressionTreeNode CreateVariableTreeNode(string name, string description) {
-      return new Variable(name, description).CreateTreeNode();
+    private VariableTreeNode CreateVariableTreeNode(string name, string description) {
+      return new VariableTreeNode(new Variable(name, description)) { VariableName = name, Weight = 1.0 };
     }