[mlpack-git] master: Merge pull request #699 from lozhnikov/r_plus_tree-cherry_pick (e0fd690)

gitdub at mlpack.org gitdub at mlpack.org
Thu Jul 7 17:27:33 EDT 2016


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

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

commit e0fd69006b17a845f066ea4de1e205fc0922739d
Merge: 6147ed0 cdb6b5f
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Jul 7 17:27:33 2016 -0400

    Merge pull request #699 from lozhnikov/r_plus_tree-cherry_pick
    
    R+ and R++ trees implementation


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

e0fd69006b17a845f066ea4de1e205fc0922739d
 src/mlpack/core/tree/CMakeLists.txt                |  14 +
 src/mlpack/core/tree/hrectbound.hpp                |  20 ++
 src/mlpack/core/tree/hrectbound_impl.hpp           |  78 +++++
 src/mlpack/core/tree/rectangle_tree.hpp            |   8 +
 .../rectangle_tree/hilbert_r_tree_split_impl.hpp   |   2 +
 .../tree/rectangle_tree/minimal_coverage_sweep.hpp |  97 ++++++
 .../rectangle_tree/minimal_coverage_sweep_impl.hpp | 194 +++++++++++
 .../rectangle_tree/minimal_splits_number_sweep.hpp |  73 +++++
 .../minimal_splits_number_sweep_impl.hpp           | 112 +++++++
 .../rectangle_tree/no_auxiliary_information.hpp    |  20 +-
 ... => r_plus_plus_tree_auxiliary_information.hpp} | 102 ++++--
 ...r_plus_plus_tree_auxiliary_information_impl.hpp | 130 ++++++++
 .../r_plus_plus_tree_descent_heuristic.hpp         |  49 +++
 .../r_plus_plus_tree_descent_heuristic_impl.hpp    |  49 +++
 .../r_plus_plus_tree_split_policy.hpp              |  75 +++++
 .../r_plus_tree_descent_heuristic.hpp              |  49 +++
 .../r_plus_tree_descent_heuristic_impl.hpp         | 104 ++++++
 .../core/tree/rectangle_tree/r_plus_tree_split.hpp | 131 ++++++++
 .../tree/rectangle_tree/r_plus_tree_split_impl.hpp | 358 +++++++++++++++++++++
 .../rectangle_tree/r_plus_tree_split_policy.hpp    |  75 +++++
 .../tree/rectangle_tree/r_star_tree_split_impl.hpp |   3 +
 .../core/tree/rectangle_tree/r_tree_split_impl.hpp |   2 +
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |   3 +
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    |   9 +-
 src/mlpack/core/tree/rectangle_tree/typedef.hpp    |  58 ++++
 .../core/tree/rectangle_tree/x_tree_split_impl.hpp |   3 +
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |  13 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |  12 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp    |   8 +-
 .../methods/neighbor_search/ns_model_impl.hpp      |  12 +
 .../methods/range_search/range_search_main.cpp     |  13 +-
 src/mlpack/methods/range_search/rs_model.cpp       |  40 ++-
 src/mlpack/methods/range_search/rs_model.hpp       |   8 +-
 src/mlpack/methods/range_search/rs_model_impl.hpp  |  28 ++
 src/mlpack/methods/rann/krann_main.cpp             |  12 +-
 src/mlpack/methods/rann/ra_model.hpp               |   8 +-
 src/mlpack/methods/rann/ra_model_impl.hpp          | 110 ++++++-
 src/mlpack/tests/aknn_test.cpp                     |   8 +-
 src/mlpack/tests/knn_test.cpp                      |  16 +-
 src/mlpack/tests/krann_search_test.cpp             |   8 +-
 src/mlpack/tests/range_search_test.cpp             |  16 +-
 src/mlpack/tests/rectangle_tree_test.cpp           | 229 ++++++++++++-
 src/mlpack/tests/tree_test.cpp                     |  28 +-
 43 files changed, 2289 insertions(+), 98 deletions(-)





More information about the mlpack-git mailing list