Changeset 6234 for trunk/sources

Timestamp:

05/19/11 15:45:34 (14 years ago)

Author:

mkommend

Message:

#1532: Corrected bug in scaling of trees.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationModel.cs

@@ -145 +145 @@
       } else {
         var mainBranch = startNode.GetSubtree(0);
-        var product = MakeProduct(mainBranch, beta);
         startNode.RemoveSubtree(0);
-        startNode.AddSubtree(product);
-
-        var scaledMainBranch = MakeSum(product, alpha);
-        startNode.RemoveSubtree(0);
+        var scaledMainBranch = MakeSum(MakeProduct(mainBranch, beta), alpha);
         startNode.AddSubtree(scaledMainBranch);
       }
@@ -159 +155 @@
         return treeNode;
       } else {
-        var addition = treeNode.Grammar.Symbols.OfType<Addition>().FirstOrDefault();
-        if (addition == null) addition = new Addition();
+        var addition = new Addition();
         var node = addition.CreateTreeNode();
         var alphaConst = MakeConstant(alpha);
@@ -173 +168 @@
         return treeNode;
       } else {
-        var multipliciation = treeNode.Grammar.Symbols.OfType<Multiplication>().FirstOrDefault();
-        if (multipliciation == null) multipliciation = new Multiplication();
+        var multipliciation = new Multiplication();
         var node = multipliciation.CreateTreeNode();
         var betaConst = MakeConstant(beta);

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -95 +94 @@
       } else {
         var mainBranch = startNode.GetSubtree(0);
-        var product = MakeProduct(mainBranch, beta);
         startNode.RemoveSubtree(0);
-        startNode.AddSubtree(product);
-
-        var scaledMainBranch = MakeSum(product, alpha);
-        startNode.RemoveSubtree(0);
+        var scaledMainBranch = MakeSum(MakeProduct(mainBranch, beta), alpha);
         startNode.AddSubtree(scaledMainBranch);
       }
@@ -109 +104 @@
         return treeNode;
       } else {
-        var addition = treeNode.Grammar.Symbols.OfType<Addition>().FirstOrDefault();
-        if (addition == null) addition = new Addition();
+        var addition = new Addition();
         var node = addition.CreateTreeNode();
         var alphaConst = MakeConstant(alpha);
@@ -123 +117 @@
         return treeNode;
       } else {
-        var multipliciation = treeNode.Grammar.Symbols.OfType<Multiplication>().FirstOrDefault();
-        if (multipliciation == null) multipliciation = new Multiplication();
+        var multipliciation = new Multiplication();
         var node = multipliciation.CreateTreeNode();
         var betaConst = MakeConstant(beta);