Changeset 12661

Timestamp:

07/07/15 17:58:01 (9 years ago)

Author:

gkronber

Message:

#2261: regression tree builder should not be used from outside (made internal)

Location:

branches/GBT-trunkintegration

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithmStatic.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeBuilder.cs (modified) (1 diff)
• Tests/Test.cs (modified) (3 diffs)

branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithmStatic.cs

@@ -118 +118 @@
 
     // simple interface
-    public static IRegressionSolution TrainGbm(IRegressionProblemData problemData, int maxSize, double nu, double r, int maxIterations) {
-      return TrainGbm(problemData, new SquaredErrorLoss(), maxSize, nu, r, maxIterations);
-    }
-
-    // simple interface
-    public static IRegressionSolution TrainGbm(IRegressionProblemData problemData, ILossFunction lossFunction,
-      int maxSize, double nu, double r, int maxIterations, uint randSeed = 31415) {
+    public static IRegressionSolution TrainGbm(IRegressionProblemData problemData, ILossFunction lossFunction, int maxSize, double nu, double r, double m, int maxIterations, uint randSeed = 31415) {
       Contract.Assert(r > 0);
       Contract.Assert(r <= 1.0);
@@ -133 +127 @@
       state.maxSize = maxSize;
       state.r = r;
+      state.m = m;
       state.nu = nu;
 

branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeBuilder.cs

@@ -36 +36 @@
   // pre-calculated so that optimal thresholds for splits can be calculated in O(n) for each input variable.
   // After each split the row idx are partitioned in a left an right part.
-  public class RegressionTreeBuilder {
+  internal class RegressionTreeBuilder {
     private readonly IRandom random;
     private readonly IRegressionProblemData problemData;

branches/GBT-trunkintegration/Tests/Test.cs

@@ -76 +76 @@
           {-1.5, 20,  1},
           {-1.5, 20, -1},
-          {0.5, 20, -1},
+          {-0.5, 20, -1},
           {0.5, 10, -1},
           {1.5, 10, -1},
@@ -257 +257 @@
 
     #region helper
-    private void BuildTree(double[,] xy, string[] allVariables, int maxDepth) {
+    private void BuildTree(double[,] xy, string[] allVariables, int maxSize) {
       int nRows = xy.GetLength(0);
       var allowedInputs = allVariables.Skip(1);
@@ -266 +266 @@
       problemData.TestPartition.Start = nRows;
       problemData.TestPartition.End = nRows;
-      var rand = new MersenneTwister(31415);
-      var builder = new RegressionTreeBuilder(problemData, rand);
-      var model = (GradientBoostedTreesModel)builder.CreateRegressionTree(maxDepth, 1, 1); // maximal depth and use all rows and cols
+      var solution = GradientBoostedTreesAlgorithmStatic.TrainGbm(problemData, new SquaredErrorLoss(), maxSize, nu: 1, r: 1, m: 1, maxIterations: 1, randSeed: 31415);
+      var model = (GradientBoostedTreesModel)solution.Model;
       var treeM = model.Models.Skip(1).First() as RegressionTreeModel;