Changeset 12591

Timestamp:

07/05/15 19:41:18 (9 years ago)

Author:

gkronber

Message:

#2261 fixed slow evaluation, even when results are already cached

Location:

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

Files:

• GradientBoostedTreesAlgorithm.cs (modified) (2 diffs)
• GradientBoostedTreesModel.cs (modified) (1 diff)

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

@@ -187 +187 @@
       // init
       var problemData = Problem.ProblemData;
-      var lossFunction = ApplicationManager.Manager.GetInstances<ILossFunction>().Single(l => l.ToString() == LossFunctionParameter.Value.Value);
+      var lossFunction = ApplicationManager.Manager.GetInstances<ILossFunction>()
+        .Single(l => l.ToString() == LossFunctionParameter.Value.Value);
       var state = GradientBoostedTreesAlgorithmStatic.CreateGbmState(problemData, lossFunction, (uint)Seed, MaxDepth, R, M, Nu);
 
@@ -213 +214 @@
 
       // produce variable relevance
-      // update variable impacts matrix
       var orderedImpacts = state.GetVariableRelevance().Select(t => new { name = t.Key, impact = t.Value }).ToList();
 

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

@@ -64 +64 @@
       // allocate target array go over all models and add up weighted estimation for each row
       var res = new double[rows.Count()];
+      if (res.Length == 0) return res; // return immediately if rows is empty. This prevents multiple iteration over lazy rows enumerable.
+                                       // (which essentially looks up indexes in a dictionary)
       for (int i = 0; i < models.Count; i++) {
         var w = weights[i];