[mlpack-git] master: Count base cases and scores correctly. (744b326)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/076156df78e26ba87012f2b5fbc6d45e84da918b...744b3268b46dbd04fc42b343d992bceda121bc11

>---------------------------------------------------------------

commit 744b3268b46dbd04fc42b343d992bceda121bc11
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun May 3 21:37:45 2015 -0400

    Count base cases and scores correctly.


>---------------------------------------------------------------

744b3268b46dbd04fc42b343d992bceda121bc11
 src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
index 0664808..6251e8f 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -319,6 +319,9 @@ void NeighborSearch<SortPolicy, MetricType, TreeType, TraversalType>::Search(
   TraversalType<RuleType> traverser(rules);
   traverser.Traverse(*queryTree, *referenceTree);
 
+  scores += rules.Scores();
+  baseCases += rules.BaseCases();
+
   Timer::Stop("computing_neighbors");
 
   // Do we need to map indices?
@@ -387,6 +390,9 @@ void NeighborSearch<SortPolicy, MetricType, TreeType, TraversalType>::Search(
     for (size_t i = 0; i < referenceSet.n_cols; ++i)
       traverser.Traverse(i, *referenceTree);
 
+    scores += rules.Scores();
+    baseCases += rules.BaseCases();
+
     Log::Info << rules.Scores() << " node combinations were scored.\n";
     Log::Info << rules.BaseCases() << " base cases were calculated.\n";
   }
@@ -397,6 +403,9 @@ void NeighborSearch<SortPolicy, MetricType, TreeType, TraversalType>::Search(
 
     traverser.Traverse(*referenceTree, *referenceTree);
 
+    scores += rules.Scores();
+    baseCases += rules.BaseCases();
+
     Log::Info << rules.Scores() << " node combinations were scored.\n";
     Log::Info << rules.BaseCases() << " base cases were calculated.\n";
   }