[mlpack-git] master: Merge branch 'master' into lsh-multiprobe (71edfbb)

gitdub at mlpack.org gitdub at mlpack.org
Wed Jun 29 04:03:22 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/eaa7182ebed8cce3fd6191dc1f8170546ea297da...812048c7c6bee0b6c8d936677f23bbb5930c6cfc

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

commit 71edfbbf60f2b84c1bd1f638eac0d4a95d9537ca
Merge: 4ba6f6d e6bc4b4
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Wed Jun 29 09:03:22 2016 +0100

    Merge branch 'master' into lsh-multiprobe
    
    Merges e6bc4b4


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

71edfbbf60f2b84c1bd1f638eac0d4a95d9537ca
 src/mlpack/core/tree/CMakeLists.txt                |  10 +
 src/mlpack/core/tree/rectangle_tree.hpp            |   6 +
 .../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    |  20 +-
 .../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   | 335 +++++++++++++++
 .../rectangle_tree/no_auxiliary_information.hpp    | 117 ++++++
 .../r_star_tree_descent_heuristic.hpp              |  16 +-
 .../r_star_tree_descent_heuristic_impl.hpp         |  10 +-
 .../core/tree/rectangle_tree/r_star_tree_split.hpp |  24 +-
 .../tree/rectangle_tree/r_star_tree_split_impl.hpp |  64 ++-
 .../rectangle_tree/r_tree_descent_heuristic.hpp    |   4 +-
 .../r_tree_descent_heuristic_impl.hpp              |  10 +-
 .../core/tree/rectangle_tree/r_tree_split.hpp      |  33 +-
 .../core/tree/rectangle_tree/r_tree_split_impl.hpp |  91 ++--
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |  85 ++--
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    | 389 ++++++++++--------
 .../tree/rectangle_tree/single_tree_traverser.hpp  |   7 +-
 .../rectangle_tree/single_tree_traverser_impl.hpp  |  18 +-
 src/mlpack/core/tree/rectangle_tree/traits.hpp     |   7 +-
 src/mlpack/core/tree/rectangle_tree/typedef.hpp    |  45 +-
 .../x_tree_auxiliary_information.hpp               | 186 +++++++++
 .../core/tree/rectangle_tree/x_tree_split.hpp      |  61 +--
 .../core/tree/rectangle_tree/x_tree_split_impl.hpp | 140 +++----
 src/mlpack/methods/lsh/lsh_search_impl.hpp         |  22 +-
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |  34 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |  20 +-
 .../methods/neighbor_search/neighbor_search.hpp    |  15 +
 .../neighbor_search/neighbor_search_impl.hpp       |  32 +-
 .../neighbor_search/neighbor_search_rules.hpp      |   4 +
 .../neighbor_search/neighbor_search_rules_impl.hpp |  14 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp    |  29 +-
 .../methods/neighbor_search/ns_model_impl.hpp      |  64 ++-
 .../sort_policies/furthest_neighbor_sort.cpp       |   4 +-
 .../sort_policies/furthest_neighbor_sort.hpp       |  17 +
 .../sort_policies/nearest_neighbor_sort.hpp        |  15 +
 .../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/CMakeLists.txt                    |   2 +
 src/mlpack/tests/activation_functions_test.cpp     |   2 +-
 src/mlpack/tests/ada_delta_test.cpp                |   2 +-
 src/mlpack/tests/adaboost_test.cpp                 |   2 +-
 src/mlpack/tests/adam_test.cpp                     |   2 +-
 src/mlpack/tests/akfn_test.cpp                     | 240 +++++++++++
 src/mlpack/tests/aknn_test.cpp                     | 404 ++++++++++++++++++
 src/mlpack/tests/arma_extend_test.cpp              |   2 +-
 src/mlpack/tests/armadillo_svd_test.cpp            |   2 +-
 src/mlpack/tests/aug_lagrangian_test.cpp           |   2 +-
 src/mlpack/tests/binarize_test.cpp                 |   2 +-
 src/mlpack/tests/cf_test.cpp                       |   2 +-
 src/mlpack/tests/cli_test.cpp                      |   2 +-
 src/mlpack/tests/convolution_test.cpp              |   2 +-
 src/mlpack/tests/convolutional_network_test.cpp    |   2 +-
 src/mlpack/tests/cosine_tree_test.cpp              |   2 +-
 src/mlpack/tests/decision_stump_test.cpp           |   2 +-
 src/mlpack/tests/det_test.cpp                      |   2 +-
 src/mlpack/tests/distribution_test.cpp             |   2 +-
 src/mlpack/tests/emst_test.cpp                     |   2 +-
 src/mlpack/tests/fastmks_test.cpp                  |   2 +-
 src/mlpack/tests/feedforward_network_test.cpp      |   2 +-
 src/mlpack/tests/gmm_test.cpp                      |   2 +-
 src/mlpack/tests/hmm_test.cpp                      |   2 +-
 src/mlpack/tests/hoeffding_tree_test.cpp           |   2 +-
 src/mlpack/tests/ind2sub_test.cpp                  |   2 +-
 src/mlpack/tests/init_rules_test.cpp               |   2 +-
 src/mlpack/tests/kernel_pca_test.cpp               |   2 +-
 src/mlpack/tests/kernel_test.cpp                   |   2 +-
 src/mlpack/tests/kernel_traits_test.cpp            |   2 +-
 src/mlpack/tests/kfn_test.cpp                      |   2 +-
 src/mlpack/tests/kmeans_test.cpp                   |   2 +-
 src/mlpack/tests/knn_test.cpp                      |  18 +-
 src/mlpack/tests/krann_search_test.cpp             |   8 +-
 src/mlpack/tests/lars_test.cpp                     |   2 +-
 src/mlpack/tests/layer_traits_test.cpp             |   2 +-
 src/mlpack/tests/lbfgs_test.cpp                    |   2 +-
 src/mlpack/tests/lin_alg_test.cpp                  |   2 +-
 src/mlpack/tests/linear_regression_test.cpp        |   2 +-
 src/mlpack/tests/load_save_test.cpp                |   2 +-
 src/mlpack/tests/local_coordinate_coding_test.cpp  |   2 +-
 src/mlpack/tests/log_test.cpp                      |   2 +-
 src/mlpack/tests/logistic_regression_test.cpp      |   2 +-
 src/mlpack/tests/lrsdp_test.cpp                    |   2 +-
 src/mlpack/tests/lsh_test.cpp                      |   2 +-
 src/mlpack/tests/lstm_peephole_test.cpp            |   2 +-
 src/mlpack/tests/math_test.cpp                     |   2 +-
 src/mlpack/tests/matrix_completion_test.cpp        |   2 +-
 src/mlpack/tests/maximal_inputs_test.cpp           |   2 +-
 src/mlpack/tests/mean_shift_test.cpp               |   2 +-
 src/mlpack/tests/metric_test.cpp                   |   2 +-
 src/mlpack/tests/minibatch_sgd_test.cpp            |   2 +-
 src/mlpack/tests/mlpack_test.cpp                   |   2 +-
 src/mlpack/tests/nbc_test.cpp                      |   2 +-
 src/mlpack/tests/nca_test.cpp                      |   2 +-
 src/mlpack/tests/network_util_test.cpp             |   2 +-
 src/mlpack/tests/nmf_test.cpp                      |   2 +-
 src/mlpack/tests/nystroem_method_test.cpp          |   2 +-
 src/mlpack/tests/pca_test.cpp                      |   2 +-
 src/mlpack/tests/perceptron_test.cpp               |   2 +-
 src/mlpack/tests/performance_functions_test.cpp    |   2 +-
 src/mlpack/tests/pooling_rules_test.cpp            |   2 +-
 src/mlpack/tests/quic_svd_test.cpp                 |   2 +-
 src/mlpack/tests/radical_test.cpp                  |   2 +-
 src/mlpack/tests/range_search_test.cpp             |  14 +-
 src/mlpack/tests/rectangle_tree_test.cpp           | 325 ++++++++++++---
 src/mlpack/tests/recurrent_network_test.cpp        |   2 +-
 src/mlpack/tests/regularized_svd_test.cpp          |   2 +-
 src/mlpack/tests/rmsprop_test.cpp                  |   2 +-
 src/mlpack/tests/sa_test.cpp                       |   2 +-
 src/mlpack/tests/sdp_primal_dual_test.cpp          |   2 +-
 src/mlpack/tests/serialization.hpp                 |   2 +-
 src/mlpack/tests/serialization_test.cpp            |   2 +-
 src/mlpack/tests/sgd_test.cpp                      |   2 +-
 src/mlpack/tests/softmax_regression_test.cpp       |   2 +-
 src/mlpack/tests/sort_policy_test.cpp              |   2 +-
 src/mlpack/tests/sparse_autoencoder_test.cpp       |   2 +-
 src/mlpack/tests/sparse_coding_test.cpp            |   2 +-
 src/mlpack/tests/split_data_test.cpp               |   2 +-
 src/mlpack/tests/svd_batch_test.cpp                |   2 +-
 src/mlpack/tests/svd_incremental_test.cpp          |   2 +-
 src/mlpack/tests/termination_policy_test.cpp       |   2 +-
 ...d_boost_test_definitions.hpp => test_tools.hpp} |  14 +-
 src/mlpack/tests/tree_test.cpp                     |   2 +-
 src/mlpack/tests/tree_traits_test.cpp              |   2 +-
 src/mlpack/tests/union_find_test.cpp               |   2 +-
 136 files changed, 3702 insertions(+), 754 deletions(-)





More information about the mlpack-git mailing list