[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into vptrees Fix conflicts. (805eaa9)
gitdub at mlpack.org
gitdub at mlpack.org
Mon Aug 8 14:31:10 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/acd81e11579f69e75aa8406b2982328c88cf1fde...1e9f0f39ea4443f0d595c395871ea8c6b27443af
>---------------------------------------------------------------
commit 805eaa9d7af77c00363afb70d077ffe229adb70b
Merge: 430cbe3 e434aee
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date: Mon Jul 11 23:57:11 2016 +0300
Merge remote-tracking branch 'upstream/master' into vptrees
Fix conflicts.
>---------------------------------------------------------------
805eaa9d7af77c00363afb70d077ffe229adb70b
CMakeLists.txt | 24 +-
COPYRIGHT.txt | 1 +
HISTORY.md | 18 +-
README.md | 6 +-
doc/guide/build.hpp | 4 +-
src/mlpack/core.hpp | 6 +
src/mlpack/core/dists/gaussian_distribution.hpp | 2 +-
src/mlpack/core/tree/CMakeLists.txt | 24 +
src/mlpack/core/tree/hrectbound.hpp | 20 +
src/mlpack/core/tree/hrectbound_impl.hpp | 78 +++
src/mlpack/core/tree/rectangle_tree.hpp | 14 +
.../tree/rectangle_tree/discrete_hilbert_value.hpp | 263 ++++++++
.../rectangle_tree/discrete_hilbert_value_impl.hpp | 457 ++++++++++++++
.../tree/rectangle_tree/dual_tree_traverser.hpp | 7 +-
.../rectangle_tree/dual_tree_traverser_impl.hpp | 24 +-
.../hilbert_r_tree_auxiliary_information.hpp | 120 ++++
.../hilbert_r_tree_auxiliary_information_impl.hpp | 169 +++++
.../hilbert_r_tree_descent_heuristic.hpp | 53 ++
.../hilbert_r_tree_descent_heuristic_impl.hpp | 49 ++
.../tree/rectangle_tree/hilbert_r_tree_split.hpp | 94 +++
.../rectangle_tree/hilbert_r_tree_split_impl.hpp | 342 ++++++++++
.../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 | 135 ++++
.../r_plus_plus_tree_auxiliary_information.hpp | 148 +++++
...r_plus_plus_tree_auxiliary_information_impl.hpp | 130 ++++
.../r_plus_plus_tree_descent_heuristic.hpp | 48 ++
.../r_plus_plus_tree_descent_heuristic_impl.hpp | 48 ++
.../r_plus_plus_tree_split_policy.hpp | 74 +++
.../r_plus_tree_descent_heuristic.hpp | 48 ++
.../r_plus_tree_descent_heuristic_impl.hpp | 103 +++
.../core/tree/rectangle_tree/r_plus_tree_split.hpp | 129 ++++
.../tree/rectangle_tree/r_plus_tree_split_impl.hpp | 360 +++++++++++
.../rectangle_tree/r_plus_tree_split_policy.hpp | 74 +++
.../r_star_tree_descent_heuristic.hpp | 16 +-
.../r_star_tree_descent_heuristic_impl.hpp | 50 +-
.../core/tree/rectangle_tree/r_star_tree_split.hpp | 24 +-
.../tree/rectangle_tree/r_star_tree_split_impl.hpp | 154 ++---
.../rectangle_tree/r_tree_descent_heuristic.hpp | 4 +-
.../r_tree_descent_heuristic_impl.hpp | 32 +-
.../core/tree/rectangle_tree/r_tree_split.hpp | 33 +-
.../core/tree/rectangle_tree/r_tree_split_impl.hpp | 152 +++--
.../core/tree/rectangle_tree/rectangle_tree.hpp | 104 ++-
.../tree/rectangle_tree/rectangle_tree_impl.hpp | 466 ++++++++------
.../tree/rectangle_tree/single_tree_traverser.hpp | 7 +-
.../rectangle_tree/single_tree_traverser_impl.hpp | 20 +-
src/mlpack/core/tree/rectangle_tree/traits.hpp | 7 +-
src/mlpack/core/tree/rectangle_tree/typedef.hpp | 103 ++-
.../x_tree_auxiliary_information.hpp | 186 ++++++
.../core/tree/rectangle_tree/x_tree_split.hpp | 61 +-
.../core/tree/rectangle_tree/x_tree_split_impl.hpp | 246 ++++----
src/mlpack/core/util/backtrace.cpp | 7 -
src/mlpack/core/util/backtrace.hpp | 7 -
src/mlpack/methods/CMakeLists.txt | 1 +
src/mlpack/methods/amf/init_rules/CMakeLists.txt | 1 +
src/mlpack/methods/amf/init_rules/given_init.hpp | 75 +++
src/mlpack/methods/ann/CMakeLists.txt | 1 -
src/mlpack/methods/ann/trainer/trainer.hpp | 310 ---------
src/mlpack/methods/gmm/gmm_impl.hpp | 2 +-
.../linear_regression/linear_regression_main.cpp | 2 +-
src/mlpack/methods/lsh/lsh_main.cpp | 13 +-
src/mlpack/methods/lsh/lsh_search.hpp | 96 ++-
src/mlpack/methods/lsh/lsh_search_impl.hpp | 574 ++++++++++++++---
src/mlpack/methods/neighbor_search/kfn_main.cpp | 15 +-
src/mlpack/methods/neighbor_search/knn_main.cpp | 14 +-
src/mlpack/methods/neighbor_search/ns_model.hpp | 39 +-
.../methods/neighbor_search/ns_model_impl.hpp | 18 +
src/mlpack/methods/pca/CMakeLists.txt | 4 +-
.../decomposition_policies}/CMakeLists.txt | 4 +-
.../decomposition_policies/exact_svd_method.hpp | 72 +++
.../pca/decomposition_policies/quic_svd_method.hpp | 92 +++
.../randomized_svd_method.hpp | 97 +++
src/mlpack/methods/pca/pca.hpp | 85 ++-
src/mlpack/methods/pca/{pca.cpp => pca_impl.hpp} | 118 ++--
src/mlpack/methods/pca/pca_main.cpp | 75 ++-
.../methods/preprocess/preprocess_split_main.cpp | 2 +-
src/mlpack/methods/quic_svd/CMakeLists.txt | 2 +-
.../quic_svd/{quic_svd_impl.hpp => quic_svd.cpp} | 7 +-
src/mlpack/methods/quic_svd/quic_svd.hpp | 7 +-
.../{quic_svd => randomized_svd}/CMakeLists.txt | 4 +-
.../methods/randomized_svd/randomized_svd.cpp | 128 ++++
.../methods/randomized_svd/randomized_svd.hpp | 133 ++++
.../methods/range_search/range_search_main.cpp | 15 +-
src/mlpack/methods/range_search/rs_model.cpp | 59 +-
src/mlpack/methods/range_search/rs_model.hpp | 11 +-
src/mlpack/methods/range_search/rs_model_impl.hpp | 42 ++
src/mlpack/methods/rann/krann_main.cpp | 14 +-
src/mlpack/methods/rann/ra_model.hpp | 11 +-
src/mlpack/methods/rann/ra_model_impl.hpp | 164 ++++-
src/mlpack/prereqs.hpp | 1 +
src/mlpack/tests/CMakeLists.txt | 3 +-
src/mlpack/tests/adaboost_test.cpp | 1 -
src/mlpack/tests/akfn_test.cpp | 34 +-
src/mlpack/tests/aknn_test.cpp | 97 +--
src/mlpack/tests/gmm_test.cpp | 38 +-
src/mlpack/tests/kmeans_test.cpp | 1 -
src/mlpack/tests/knn_test.cpp | 20 +-
src/mlpack/tests/krann_search_test.cpp | 10 +-
src/mlpack/tests/lsh_test.cpp | 233 ++++++-
src/mlpack/tests/mean_shift_test.cpp | 1 -
src/mlpack/tests/nmf_test.cpp | 15 +-
src/mlpack/tests/pca_test.cpp | 107 +++-
src/mlpack/tests/quic_svd_test.cpp | 34 +-
src/mlpack/tests/randomized_svd_test.cpp | 62 ++
src/mlpack/tests/range_search_test.cpp | 22 +-
src/mlpack/tests/rectangle_tree_test.cpp | 697 +++++++++++++++++----
src/mlpack/tests/recurrent_network_test.cpp | 107 ++--
src/mlpack/tests/test_tools.hpp | 2 +-
src/mlpack/tests/tree_test.cpp | 28 +-
111 files changed, 7428 insertions(+), 1619 deletions(-)
diff --cc src/mlpack/tests/CMakeLists.txt
index d98a67e,b13494d..2fb9174
--- a/src/mlpack/tests/CMakeLists.txt
+++ b/src/mlpack/tests/CMakeLists.txt
@@@ -80,8 -82,6 +82,7 @@@ add_executable(mlpack_tes
svd_incremental_test.cpp
nystroem_method_test.cpp
armadillo_svd_test.cpp
- recurrent_network_test.cpp
+ vantage_point_tree_test.cpp
)
# Link dependencies of test executable.
target_link_libraries(mlpack_test
More information about the mlpack-git
mailing list