[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into r_plus_tree-cherry_pick (464e722)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/6147ed01bab6eadcd6a5e796e259a6afacae4662...e0fd69006b17a845f066ea4de1e205fc0922739d

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

commit 464e722da1684b4696790829abd563d9bc694d7a
Merge: 155dbda 8e740b0
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Wed Jun 29 00:08:35 2016 +0300

    Merge remote-tracking branch 'upstream/master' into r_plus_tree-cherry_pick


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

464e722da1684b4696790829abd563d9bc694d7a
 .../tree/rectangle_tree/discrete_hilbert_value.hpp |  9 ----
 .../rectangle_tree/discrete_hilbert_value_impl.hpp |  4 +-
 .../rectangle_tree/dual_tree_traverser_impl.hpp    |  4 +-
 .../hilbert_r_tree_auxiliary_information.hpp       |  8 ----
 .../hilbert_r_tree_auxiliary_information_impl.hpp  | 10 ++--
 .../rectangle_tree/hilbert_r_tree_split_impl.hpp   |  6 +--
 .../tree/rectangle_tree/r_star_tree_split_impl.hpp | 12 ++---
 .../core/tree/rectangle_tree/r_tree_split_impl.hpp | 32 ++++++-------
 .../core/tree/rectangle_tree/rectangle_tree.hpp    | 31 ++----------
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    | 19 +-------
 .../rectangle_tree/single_tree_traverser_impl.hpp  |  2 +-
 .../core/tree/rectangle_tree/x_tree_split_impl.hpp | 38 +++++++--------
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |  6 ++-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |  6 ++-
 src/mlpack/methods/neighbor_search/ns_model.hpp    |  6 ++-
 .../methods/neighbor_search/ns_model_impl.hpp      |  6 +++
 .../methods/preprocess/preprocess_split_main.cpp   |  2 +-
 .../methods/range_search/range_search_main.cpp     |  6 ++-
 src/mlpack/methods/range_search/rs_model.cpp       | 21 +++++++-
 src/mlpack/methods/range_search/rs_model.hpp       |  5 +-
 src/mlpack/methods/range_search/rs_model_impl.hpp  | 14 ++++++
 src/mlpack/methods/rann/krann_main.cpp             |  6 ++-
 src/mlpack/methods/rann/ra_model.hpp               |  5 +-
 src/mlpack/methods/rann/ra_model_impl.hpp          | 56 +++++++++++++++++++++-
 src/mlpack/tests/aknn_test.cpp                     | 12 +++--
 src/mlpack/tests/knn_test.cpp                      | 12 +++--
 src/mlpack/tests/krann_search_test.cpp             |  6 ++-
 src/mlpack/tests/range_search_test.cpp             | 12 +++--
 src/mlpack/tests/rectangle_tree_test.cpp           | 12 ++---
 29 files changed, 219 insertions(+), 149 deletions(-)