[mlpack-git] master: Merge branch 'leaf-only-vptree' of https://github.com/lozhnikov/mlpack into lozhnikov-leaf-only-vptree (b96c19e)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/8a0ad2fbe4db5614a6aad27cfb5e101ae8b1db96...dc6bae4e8634486b384b67e3ae7a690f34bdc677

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

commit b96c19eebe6af5139c9571b1d35459493f73013a
Merge: 8a0ad2f 31ed87b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Aug 15 11:52:59 2016 -0400

    Merge branch 'leaf-only-vptree' of https://github.com/lozhnikov/mlpack into lozhnikov-leaf-only-vptree


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

b96c19eebe6af5139c9571b1d35459493f73013a
 src/mlpack/core/tree/CMakeLists.txt                |  13 +-
 src/mlpack/core/tree/binary_space_tree.hpp         |   1 +
 .../tree/binary_space_tree/binary_space_tree.hpp   |  17 +
 .../binary_space_tree/binary_space_tree_impl.hpp   |  47 +-
 src/mlpack/core/tree/binary_space_tree/traits.hpp  |  24 +-
 src/mlpack/core/tree/binary_space_tree/typedef.hpp |  58 ++
 .../vantage_point_split.hpp                        |   0
 .../vantage_point_split_impl.hpp                   |   0
 src/mlpack/core/tree/cover_tree/traits.hpp         |   6 -
 src/mlpack/core/tree/hollow_ball_bound.hpp         |  14 +-
 src/mlpack/core/tree/hollow_ball_bound_impl.hpp    | 169 ++--
 src/mlpack/core/tree/hrectbound_impl.hpp           | 168 +++-
 src/mlpack/core/tree/rectangle_tree/traits.hpp     |  12 -
 src/mlpack/core/tree/tree_traits.hpp               |   6 -
 src/mlpack/core/tree/vantage_point_tree.hpp        |  21 -
 .../vantage_point_tree/dual_tree_traverser.hpp     |  98 ---
 .../dual_tree_traverser_impl.hpp                   | 237 ------
 .../vantage_point_tree/single_tree_traverser.hpp   |  63 --
 .../single_tree_traverser_impl.hpp                 | 113 ---
 src/mlpack/core/tree/vantage_point_tree/traits.hpp |  66 --
 .../core/tree/vantage_point_tree/typedef.hpp       |  76 --
 .../tree/vantage_point_tree/vantage_point_tree.hpp | 508 -----------
 .../vantage_point_tree/vantage_point_tree_impl.hpp | 937 ---------------------
 .../neighbor_search/neighbor_search_rules_impl.hpp |  53 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp    |   1 -
 .../range_search/range_search_rules_impl.hpp       |  42 +-
 src/mlpack/methods/range_search/rs_model.hpp       |   1 -
 src/mlpack/tests/vantage_point_tree_test.cpp       |  82 +-
 28 files changed, 427 insertions(+), 2406 deletions(-)

diff --cc src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
index a2e93f3,1522584..970db3a
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
@@@ -351,14 -306,11 +309,11 @@@ inline double NeighborSearchRules<SortP
    if (SortPolicy::IsBetter(distance, bestDistance))
    {
      // Set traversal information.
-     if (!tree::TreeTraits<TreeType>::FirstSiblingFirstPointIsCentroid)
-     {
-       traversalInfo.LastQueryNode() = &queryNode;
-       traversalInfo.LastReferenceNode() = &referenceNode;
-       traversalInfo.LastScore() = distance;
-     }
+     traversalInfo.LastQueryNode() = &queryNode;
+     traversalInfo.LastReferenceNode() = &referenceNode;
+     traversalInfo.LastScore() = distance;
  
 -     return distance;
 +    return SortPolicy::ConvertToScore(distance);
    }
    else
    {