[mlpack-git] master: merge (32c8a73)

gitdub at mlpack.org gitdub at mlpack.org
Mon Jul 25 12:18:46 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ecbfd24defe31d9f39708c0b4c6ad352cd46ed5c...7eec0609aa21cb12aeed3cbcaa1e411dad0359f2

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

commit 32c8a73c7d905c59795cc284a09cfd9eec38b9d7
Merge: 3b8ffd0 90a5cd2
Author: Keon Kim <kwk236 at gmail.com>
Date:   Tue Jun 28 06:41:21 2016 +0900

    merge


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

32c8a73c7d905c59795cc284a09cfd9eec38b9d7
 .gitignore                                         |   5 -
 CMakeLists.txt                                     |   2 +-
 HISTORY.md                                         |   9 +-
 LICENSE.txt                                        |  12 +-
 src/mlpack/core.hpp                                |   2 +-
 src/mlpack/core/arma_extend/CMakeLists.txt         |   4 -
 src/mlpack/core/arma_extend/Mat_extra_bones.hpp    |  10 +
 src/mlpack/core/arma_extend/Mat_extra_meat.hpp     |  10 +
 src/mlpack/core/arma_extend/README.md              |  23 +
 src/mlpack/core/arma_extend/SpMat_extra_bones.hpp  |  40 +-
 src/mlpack/core/arma_extend/SpMat_extra_meat.hpp   | 323 +-----------
 src/mlpack/core/arma_extend/arma_extend.hpp        |   4 -
 src/mlpack/core/arma_extend/fn_ind2sub.hpp         |   8 +
 src/mlpack/core/arma_extend/hdf5_misc.hpp          |  11 +
 src/mlpack/core/arma_extend/operator_minus.hpp     |  10 +
 src/mlpack/core/arma_extend/promote_type.hpp       |  50 --
 src/mlpack/core/arma_extend/restrictors.hpp        |  22 -
 src/mlpack/core/arma_extend/traits.hpp             |  49 --
 src/mlpack/core/arma_extend/typedef.hpp            |  30 --
 src/mlpack/core/boost_backport/LICENSE.txt         |  23 +
 src/mlpack/core/boost_backport/README.md           |  11 +-
 .../unordered_collections_load_imp.hpp             |   3 +
 .../unordered_collections_save_imp.hpp             |   3 +
 src/mlpack/core/boost_backport/unordered_map.hpp   |   5 +-
 src/mlpack/core/data/CMakeLists.txt                |   1 +
 src/mlpack/core/data/binarize.hpp                  |  99 ++++
 src/mlpack/core/optimizers/lbfgs/lbfgs.hpp         |   4 +-
 src/mlpack/core/tree/CMakeLists.txt                |  10 +
 src/mlpack/core/tree/rectangle_tree.hpp            |   6 +
 .../tree/rectangle_tree/discrete_hilbert_value.hpp | 272 ++++++++++
 .../rectangle_tree/discrete_hilbert_value_impl.hpp | 457 +++++++++++++++++
 .../tree/rectangle_tree/dual_tree_traverser.hpp    |   7 +-
 .../rectangle_tree/dual_tree_traverser_impl.hpp    |  16 +-
 .../hilbert_r_tree_auxiliary_information.hpp       | 128 +++++
 .../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 |  52 +-
 .../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 |  59 +--
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |  54 +-
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    | 378 ++++++++------
 .../tree/rectangle_tree/single_tree_traverser.hpp  |   7 +-
 .../rectangle_tree/single_tree_traverser_impl.hpp  |  16 +-
 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 | 128 ++---
 src/mlpack/core/util/cli.cpp                       |  57 +--
 src/mlpack/core/util/cli.hpp                       |  18 +-
 src/mlpack/core/util/cli_impl.hpp                  |  45 +-
 src/mlpack/methods/ann/ffn.hpp                     |  24 +-
 src/mlpack/methods/ann/rnn.hpp                     |  20 +-
 src/mlpack/methods/cf/cf_main.cpp                  |   2 +-
 src/mlpack/methods/det/det_main.cpp                |   2 +-
 src/mlpack/methods/emst/emst_main.cpp              |  25 +-
 src/mlpack/methods/gmm/gmm_generate_main.cpp       |  11 +-
 src/mlpack/methods/gmm/gmm_probability_main.cpp    |  17 +-
 src/mlpack/methods/hmm/hmm_generate_main.cpp       |  16 +-
 src/mlpack/methods/hmm/hmm_train_main.cpp          |   7 +-
 src/mlpack/methods/hmm/hmm_viterbi_main.cpp        |  13 +-
 .../hoeffding_trees/hoeffding_tree_main.cpp        |  45 +-
 src/mlpack/methods/lars/lars_main.cpp              |  37 +-
 .../linear_regression/linear_regression_main.cpp   |  54 +-
 src/mlpack/methods/lsh/lsh_main.cpp                |  20 +
 src/mlpack/methods/lsh/lsh_search.hpp              |  12 +
 src/mlpack/methods/lsh/lsh_search_impl.hpp         |  27 +
 src/mlpack/methods/mvu/mvu_main.cpp                |  18 +-
 src/mlpack/methods/neighbor_search/CMakeLists.txt  |  30 +-
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |  28 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |  14 +-
 .../methods/neighbor_search/neighbor_search.hpp    |  19 +-
 .../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    | 231 ++++++++-
 .../methods/neighbor_search/ns_model_impl.hpp      | 558 ++++++++++-----------
 .../sort_policies/furthest_neighbor_sort.cpp       |   4 +-
 .../sort_policies/furthest_neighbor_sort.hpp       |  17 +
 .../sort_policies/nearest_neighbor_sort.hpp        |  15 +
 src/mlpack/methods/pca/pca_main.cpp                |   7 +-
 src/mlpack/methods/perceptron/perceptron_main.cpp  |  15 +-
 src/mlpack/methods/preprocess/CMakeLists.txt       |   1 +
 .../preprocess/preprocess_binarize_main.cpp        |  85 ++++
 .../methods/preprocess/preprocess_split_main.cpp   |  69 +--
 src/mlpack/methods/radical/radical_main.cpp        |   6 +-
 src/mlpack/methods/rann/CMakeLists.txt             |  20 +-
 .../rann/{allkrann_main.cpp => krann_main.cpp}     |   6 +-
 src/mlpack/methods/rann/ra_typedef.hpp             |  43 +-
 .../softmax_regression/softmax_regression_main.cpp |  78 ++-
 src/mlpack/tests/CMakeLists.txt                    |   5 +-
 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                     | 400 +++++++++++++++
 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                 |  66 +++
 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                      |   6 +-
 ...krann_search_test.cpp => krann_search_test.cpp} |  12 +-
 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                      | 122 ++++-
 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             |   2 +-
 src/mlpack/tests/rectangle_tree_test.cpp           | 321 ++++++++++--
 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 +-
 185 files changed, 4866 insertions(+), 1816 deletions(-)

diff --cc src/mlpack/core/data/CMakeLists.txt
index 8252b35,f11f19c..65e4fc3
--- a/src/mlpack/core/data/CMakeLists.txt
+++ b/src/mlpack/core/data/CMakeLists.txt
@@@ -15,7 -15,7 +15,8 @@@ set(SOURCE
    save_impl.hpp
    serialization_shim.hpp
    split_data.hpp
 +  imputer.hpp
+   binarize.hpp
  )
  
  # add directory name to sources
diff --cc src/mlpack/methods/preprocess/CMakeLists.txt
index 1490341,b10c8ea..0eee8ac
--- a/src/mlpack/methods/preprocess/CMakeLists.txt
+++ b/src/mlpack/methods/preprocess/CMakeLists.txt
@@@ -14,5 -14,6 +14,6 @@@ set(MLPACK_SRCS ${MLPACK_SRCS} ${DIR_SR
  
  #add_cli_executable(preprocess_stats)
  add_cli_executable(preprocess_split)
+ add_cli_executable(preprocess_binarize)
  #add_cli_executable(preprocess_scan)
 -#add_cli_executable(preprocess_imputer)
 +add_cli_executable(preprocess_imputer)




More information about the mlpack-git mailing list