Changeset 12632 for branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

Timestamp:

07/07/15 11:57:37 (9 years ago)

Author:

gkronber

Message:

#2261 implemented node expansion using a priority queue (and changed parameter MaxDepth to MaxSize). Moved unit tests to a separate project.

File:

• branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (2 diffs)

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

@@ -36 +36 @@
     public struct TreeNode {
       public readonly static string NO_VARIABLE = string.Empty;
-      public string varName; // name of the variable for splitting or -1 if terminal node
-      public double val; // threshold
-      public int leftIdx;
-      public int rightIdx;
+      public string VarName { get; set; } // name of the variable for splitting or -1 if terminal node
+      public double Val { get; set; } // threshold
+      public int LeftIdx { get; set; }
+      public int RightIdx { get; set; }
 
       public override int GetHashCode() {
-        return leftIdx ^ rightIdx ^ val.GetHashCode();
+        return LeftIdx ^ RightIdx ^ Val.GetHashCode();
       }
     }
@@ -64 +64 @@
     private static double GetPredictionForRow(TreeNode[] t, int nodeIdx, IDataset ds, int row) {
       var node = t[nodeIdx];
-      if (node.varName == TreeNode.NO_VARIABLE)
-        return node.val;
-      else if (ds.GetDoubleValue(node.varName, row) <= node.val)
-        return GetPredictionForRow(t, node.leftIdx, ds, row);
+      if (node.VarName == TreeNode.NO_VARIABLE)
+        return node.Val;
+      else if (ds.GetDoubleValue(node.VarName, row) <= node.Val)
+        return GetPredictionForRow(t, node.LeftIdx, ds, row);
       else
-        return GetPredictionForRow(t, node.rightIdx, ds, row);
+        return GetPredictionForRow(t, node.RightIdx, ds, row);
     }