[mlpack-git] master, mlpack-1.0.x: Remove numberOfPrunes variable, and initialize baseCase (#336). (bf2ad9c)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:44:57 EST 2015


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

On branches: master,mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

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

commit bf2ad9c99e629297fcd8de3a9755d465c5a345aa
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sat Mar 1 19:38:10 2014 +0000

    Remove numberOfPrunes variable, and initialize baseCase (#336).


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

bf2ad9c99e629297fcd8de3a9755d465c5a345aa
 src/mlpack/methods/neighbor_search/neighbor_search.hpp       |  3 ---
 src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp  | 12 ++++--------
 .../methods/neighbor_search/neighbor_search_rules_impl.hpp   |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/mlpack/methods/neighbor_search/neighbor_search.hpp b/src/mlpack/methods/neighbor_search/neighbor_search.hpp
index 4439fc7..01836c7 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search.hpp
@@ -230,9 +230,6 @@ class NeighborSearch
   std::vector<size_t> oldFromNewReferences;
   //! Permutations of query points during tree building.
   std::vector<size_t> oldFromNewQueries;
-
-  //! Total number of pruned nodes during the neighbor search.
-  size_t numberOfPrunes;
 }; // class NeighborSearch
 
 }; // namespace neighbor
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
index 5502887..c0aafb6 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
@@ -34,8 +34,7 @@ NeighborSearch(const typename TreeType::Mat& referenceSet,
     hasQuerySet(true),
     naive(naive),
     singleMode(!naive && singleMode), // No single mode if naive.
-    metric(metric),
-    numberOfPrunes(0)
+    metric(metric)
 {
   // C++11 will allow us to call out to other constructors so we can avoid this
   // copypasta problem.
@@ -75,8 +74,7 @@ NeighborSearch(const typename TreeType::Mat& referenceSet,
     hasQuerySet(false),
     naive(naive),
     singleMode(!naive && singleMode), // No single mode if naive.
-    metric(metric),
-    numberOfPrunes(0)
+    metric(metric)
 {
   // We'll time tree building, but only if we are building trees.
   Timer::Start("tree_building");
@@ -111,8 +109,7 @@ NeighborSearch<SortPolicy, MetricType, TreeType>::NeighborSearch(
     hasQuerySet(true),
     naive(false),
     singleMode(singleMode),
-    metric(metric),
-    numberOfPrunes(0)
+    metric(metric)
 {
   // Nothing else to initialize.
 }
@@ -132,8 +129,7 @@ NeighborSearch<SortPolicy, MetricType, TreeType>::NeighborSearch(
     hasQuerySet(false), // In this case we will own a tree, if singleMode.
     naive(false),
     singleMode(singleMode),
-    metric(metric),
-    numberOfPrunes(0)
+    metric(metric)
 {
   Timer::Start("tree_building");
 
diff --git a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
index a042e56..4611799 100644
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
@@ -85,7 +85,7 @@ inline double NeighborSearchRules<SortPolicy, MetricType, TreeType>::Score(
   {
     // The first point in the tree is the centroid.  So we can then calculate
     // the base case between that and the query point.
-    double baseCase;
+    double baseCase = -1.0;
     if (tree::TreeTraits<TreeType>::HasSelfChildren)
     {
       // If the parent node is the same, then we have already calculated the



More information about the mlpack-git mailing list