Changeset 3801 for trunk

Timestamp:

05/13/10 20:28:11 (15 years ago)

Author:

gkronber

Message:

Fixed linear scaler to work also when no scaling parameters are given. #938

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionSolutionLinearScaler.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/SymbolicRegressionSolutionLinearScaler.cs

@@ -72 +72 @@
       DoubleValue alpha = AlphaParameter.ActualValue;
       DoubleValue beta = BetaParameter.ActualValue;
-      var mainBranch = tree.Root.SubTrees[0].SubTrees[0];
-      var scaledMainBranch = MakeSum(MakeProduct(beta.Value, mainBranch), alpha.Value);
+      if (alpha != null && beta != null) {
+        var mainBranch = tree.Root.SubTrees[0].SubTrees[0];
+        var scaledMainBranch = MakeSum(MakeProduct(beta.Value, mainBranch), alpha.Value);
 
-      // remove the main branch before cloning to prevent cloning of sub-trees
-      tree.Root.SubTrees[0].RemoveSubTree(0);
-      var scaledTree = (SymbolicExpressionTree)tree.Clone();
-      // insert main branch into the original tree again 
-      tree.Root.SubTrees[0].InsertSubTree(0, mainBranch);
-      // insert the scaled main branch into the cloned tree
-      scaledTree.Root.SubTrees[0].InsertSubTree(0, scaledMainBranch);
-      ScaledSymbolicExpressionTreeParameter.ActualValue = scaledTree;
+        // remove the main branch before cloning to prevent cloning of sub-trees
+        tree.Root.SubTrees[0].RemoveSubTree(0);
+        var scaledTree = (SymbolicExpressionTree)tree.Clone();
+        // insert main branch into the original tree again 
+        tree.Root.SubTrees[0].InsertSubTree(0, mainBranch);
+        // insert the scaled main branch into the cloned tree
+        scaledTree.Root.SubTrees[0].InsertSubTree(0, scaledMainBranch);
+        ScaledSymbolicExpressionTreeParameter.ActualValue = scaledTree;
+      } else {
+        // alpha or beta parameter not available => do not scale tree
+        ScaledSymbolicExpressionTreeParameter.ActualValue = tree;
+      }
+      
       return base.Apply();
     }