Changeset 13185

Timestamp:

11/16/15 19:51:34 (9 years ago)

Author:

gkronber

Message:

#2490: merged r13030 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (6 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

@@ -23 +23 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
@@ -52 +53 @@
       public int RightIdx { get; private set; }
 
-      internal IList<double> Data { get; set; } // only necessary to improve efficiency of evaluation
-
       // necessary because the default implementation of GetHashCode for structs in .NET would only return the hashcode of val here
       public override int GetHashCode() {
@@ -82 +81 @@
     [Storable]
     // to prevent storing the references to data caches in nodes
-    // seemingly it is bad (performance-wise) to persist tuples (tuples are used as keys in a dictionary) TODO
+    // TODO seemingly it is bad (performance-wise) to persist tuples (tuples are used as keys in a dictionary)
     private Tuple<string, double, int, int>[] SerializedTree {
       get { return tree.Select(t => Tuple.Create(t.VarName, t.Val, t.LeftIdx, t.RightIdx)).ToArray(); }
@@ -104 +103 @@
     }
 
-    private static double GetPredictionForRow(TreeNode[] t, int nodeIdx, int row) {
+    private static double GetPredictionForRow(TreeNode[] t, ReadOnlyCollection<double>[] columnCache, int nodeIdx, int row) {
       while (nodeIdx != -1) {
         var node = t[nodeIdx];
@@ -110 +109 @@
           return node.Val;
 
-        if (node.Data[row] <= node.Val)
+        if (columnCache[nodeIdx][row] <= node.Val)
           nodeIdx = node.LeftIdx;
         else
@@ -124 +123 @@
     public IEnumerable<double> GetEstimatedValues(IDataset ds, IEnumerable<int> rows) {
       // lookup columns for variableNames in one pass over the tree to speed up evaluation later on
+      ReadOnlyCollection<double>[] columnCache = new ReadOnlyCollection<double>[tree.Length];
+
       for (int i = 0; i < tree.Length; i++) {
         if (tree[i].VarName != TreeNode.NO_VARIABLE) {
-          tree[i].Data = ds.GetReadOnlyDoubleValues(tree[i].VarName);
+          columnCache[i] = ds.GetReadOnlyDoubleValues(tree[i].VarName);
         }
       }
-      return rows.Select(r => GetPredictionForRow(tree, 0, r));
+      return rows.Select(r => GetPredictionForRow(tree, columnCache, 0, r));
     }