[mlpack-git] master: Merge branch 'master' into spill-trees (180fc11)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/0f4b25acd6aaa14294c044874ba6cc0751712baa...0a19d07bd39e6223991976474bc79671ba8aa0f0

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

commit 180fc11ab5ee44c8b293c8beddf06fbd2392bb62
Merge: 69804c6 a7794bd
Author: MarcosPividori <marcos.pividori at gmail.com>
Date:   Mon Aug 15 22:03:57 2016 -0300

    Merge branch 'master' into spill-trees


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

180fc11ab5ee44c8b293c8beddf06fbd2392bb62
 .appveyor.yml                                      |   2 +-
 HISTORY.md                                         |   6 +
 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           | 170 +++-
 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 ---------------------
 src/mlpack/methods/lsh/lsh_search.hpp              |   3 +-
 .../neighbor_search/neighbor_search_rules_impl.hpp |  66 +-
 .../sort_policies/furthest_neighbor_sort.hpp       |  25 +
 .../sort_policies/nearest_neighbor_sort.hpp        |  20 +
 .../preprocess/preprocess_describe_main.cpp        |  42 +-
 .../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 +-
 33 files changed, 512 insertions(+), 2433 deletions(-)

diff --cc src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
index 93bd5f5,970db3a..01dd892
--- a/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
@@@ -375,9 -333,8 +333,11 @@@ inline double NeighborSearchRules<SortP
    if (oldScore == DBL_MAX)
      return oldScore;
  
 +  if (oldScore == SortPolicy::BestDistance())
 +    return oldScore;
 +
+   const double distance = SortPolicy::ConvertToDistance(oldScore);
+ 
    // Update our bound.
    const double bestDistance = CalculateBound(queryNode);