[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into hilbert-r-tree Fix conflicts. (9eebd7c)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/37fda23945b4f998cd5fa6ec011ae345236c8552...479eca0c625cc4255a3b1a354a4788dae10f1b01

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

commit 9eebd7c648b144931b796d77f9f6529ccfffd219
Merge: 8cc0ac5 ca391aa
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Tue Jun 14 01:12:20 2016 +0300

    Merge remote-tracking branch 'upstream/master' into hilbert-r-tree
    Fix conflicts.


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

9eebd7c648b144931b796d77f9f6529ccfffd219
 .appveyor.yml                                      |  10 +-
 CMake/CXX11.cmake                                  |   2 +-
 CMake/NewCXX11.cmake                               |  17 +
 CMakeLists.txt                                     |  19 +-
 COPYRIGHT.txt                                      |   4 +
 HISTORY.md                                         |   7 +
 doc/guide/build.hpp                                |  16 +-
 doc/tutorials/README.md                            |  48 ++-
 doc/tutorials/kmeans/kmeans.txt                    |  10 +-
 src/mlpack/CMakeLists.txt                          |   5 +
 src/mlpack/core.hpp                                |   4 +
 src/mlpack/core/arma_extend/CMakeLists.txt         |   1 +
 src/mlpack/core/arma_extend/arma_extend.hpp        |   2 +
 src/mlpack/core/arma_extend/fn_ind2sub.hpp         |  70 ++++
 src/mlpack/core/data/load_impl.hpp                 | 172 +++++----
 .../core/data/serialization_template_version.hpp   |  37 ++
 src/mlpack/core/data/split_data.hpp                | 114 ++++--
 src/mlpack/core/metrics/ip_metric.hpp              |   2 +-
 src/mlpack/core/metrics/ip_metric_impl.hpp         |  10 +-
 src/mlpack/core/metrics/lmetric.hpp                |   3 +-
 src/mlpack/core/metrics/lmetric_impl.hpp           |  57 +--
 .../binary_space_tree/binary_space_tree_impl.hpp   |   1 -
 .../core/tree/cover_tree/cover_tree_impl.hpp       |   1 -
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |   2 +-
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    |   1 -
 .../core/tree/rectangle_tree/x_tree_split.hpp      |   0
 .../core/tree/rectangle_tree/x_tree_split_impl.hpp |   4 +-
 src/mlpack/core/util/CMakeLists.txt                |   2 -
 src/mlpack/core/util/prefixedoutstream.hpp         |   1 -
 src/mlpack/core/util/string_util.cpp               |  47 ---
 src/mlpack/core/util/string_util.hpp               |  23 --
 src/mlpack/methods/CMakeLists.txt                  |   1 +
 src/mlpack/methods/emst/dtb_rules.hpp              |  28 --
 src/mlpack/methods/emst/dtb_rules_impl.hpp         |  46 ---
 src/mlpack/methods/kmeans/CMakeLists.txt           |   1 +
 src/mlpack/methods/kmeans/allow_empty_clusters.hpp |  15 +-
 .../methods/kmeans/dual_tree_kmeans_impl.hpp       |   1 -
 src/mlpack/methods/kmeans/elkan_kmeans_impl.hpp    |   2 -
 src/mlpack/methods/kmeans/hamerly_kmeans_impl.hpp  |   2 -
 ..._empty_clusters.hpp => kill_empty_clusters.hpp} |  25 +-
 src/mlpack/methods/kmeans/kmeans_main.cpp          |  26 +-
 src/mlpack/methods/kmeans/naive_kmeans.hpp         |   5 +-
 src/mlpack/methods/kmeans/naive_kmeans_impl.hpp    |   2 -
 .../methods/kmeans/pelleg_moore_kmeans_impl.hpp    |   6 +-
 .../logistic_regression/logistic_regression.hpp    |  41 ++
 .../logistic_regression_impl.hpp                   |  31 ++
 .../logistic_regression_main.cpp                   |  28 +-
 src/mlpack/methods/lsh/lsh_search.hpp              |  77 ++--
 src/mlpack/methods/lsh/lsh_search_impl.hpp         | 417 +++++++++++++--------
 src/mlpack/methods/mean_shift/mean_shift_impl.hpp  |   1 -
 .../methods/neighbor_search/neighbor_search.hpp    |   5 +
 .../neighbor_search/neighbor_search_impl.hpp       |   5 +-
 .../neighbor_search/neighbor_search_rules_impl.hpp |  41 +-
 .../neighbor_search/neighbor_search_stat.hpp       |  33 +-
 .../{adaboost => preprocess}/CMakeLists.txt        |   9 +-
 .../methods/preprocess/preprocess_split_main.cpp   | 168 +++++++++
 .../softmax_regression/softmax_regression.hpp      |   3 +-
 .../softmax_regression/softmax_regression_impl.hpp |   2 +-
 src/mlpack/prereqs.hpp                             |   1 +
 src/mlpack/tests/CMakeLists.txt                    |   1 +
 src/mlpack/tests/ind2sub_test.cpp                  |  30 ++
 src/mlpack/tests/load_save_test.cpp                | 314 +++++++++++++++-
 src/mlpack/tests/logistic_regression_test.cpp      | 150 ++++++++
 src/mlpack/tests/lsh_test.cpp                      | 177 +++++++++
 src/mlpack/tests/metric_test.cpp                   |   4 +-
 src/mlpack/tests/serialization_test.cpp            |   4 +-
 src/mlpack/tests/split_data_test.cpp               |  60 ++-
 67 files changed, 1864 insertions(+), 590 deletions(-)