[mlpack-git] mlpack-2.x: Merge branch 'master' into mlpack-2.x (9d76f17)
gitdub at mlpack.org
gitdub at mlpack.org
Wed Jun 15 09:17:43 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : mlpack-2.x
Link : https://github.com/mlpack/mlpack/compare/281fb8ac87e6bd6b0f7b12c66cc58dba98c49e46...909d69e4bff15bb4db0b3d05739f6963123e346a
>---------------------------------------------------------------
commit 9d76f17296f0afa1e626cdde67cbfeb523090c59
Merge: 281fb8a a8b5be9
Author: Ryan Curtin <ryan at ratml.org>
Date: Wed Jun 15 06:17:43 2016 -0700
Merge branch 'master' into mlpack-2.x
>---------------------------------------------------------------
9d76f17296f0afa1e626cdde67cbfeb523090c59
.appveyor.yml | 22 +-
CMake/CXX11.cmake | 2 +-
CMake/NewCXX11.cmake | 17 ++
CMakeLists.txt | 19 +-
COPYRIGHT.txt | 4 +
README.md | 2 +-
doc/guide/build.hpp | 8 +-
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/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/r_star_tree_split.hpp | 12 +-
.../tree/rectangle_tree/r_star_tree_split_impl.hpp | 25 +-
.../core/tree/rectangle_tree/r_tree_split.hpp | 18 +-
.../core/tree/rectangle_tree/r_tree_split_impl.hpp | 51 ++--
.../core/tree/rectangle_tree/rectangle_tree.hpp | 2 +-
.../tree/rectangle_tree/rectangle_tree_impl.hpp | 6 +-
.../core/tree/rectangle_tree/x_tree_split.hpp | 9 +-
.../core/tree/rectangle_tree/x_tree_split_impl.hpp | 24 +-
src/mlpack/core/util/CMakeLists.txt | 2 -
src/mlpack/core/util/cli.cpp | 57 +----
src/mlpack/core/util/cli.hpp | 18 +-
src/mlpack/core/util/cli_impl.hpp | 45 +++-
src/mlpack/core/util/prefixedoutstream.hpp | 1 -
src/mlpack/core/util/string_util.cpp | 62 -----
src/mlpack/core/util/string_util.hpp | 38 ---
src/mlpack/methods/det/det_main.cpp | 2 +-
src/mlpack/methods/emst/dtb_rules.hpp | 28 ---
src/mlpack/methods/emst/dtb_rules_impl.hpp | 46 ----
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/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} | 40 ++--
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 +-
src/mlpack/methods/lars/lars_main.cpp | 37 +--
.../linear_regression/linear_regression_main.cpp | 54 +++--
src/mlpack/methods/lsh/lsh_main.cpp | 3 +-
src/mlpack/methods/lsh/lsh_search.hpp | 59 +++--
src/mlpack/methods/lsh/lsh_search_impl.hpp | 259 +++++++++++++++------
.../methods/neighbor_search/neighbor_search.hpp | 5 +
.../neighbor_search/neighbor_search_impl.hpp | 4 +-
.../neighbor_search/neighbor_search_stat.hpp | 11 +
src/mlpack/methods/perceptron/perceptron_main.cpp | 15 +-
.../methods/preprocess/preprocess_split_main.cpp | 67 ++----
src/mlpack/methods/radical/radical_main.cpp | 6 +-
.../softmax_regression/softmax_regression_main.cpp | 78 +++----
src/mlpack/tests/CMakeLists.txt | 1 +
src/mlpack/tests/ind2sub_test.cpp | 30 +++
src/mlpack/tests/lsh_test.cpp | 177 ++++++++++++++
src/mlpack/tests/metric_test.cpp | 4 +-
src/mlpack/tests/rectangle_tree_test.cpp | 1 -
src/mlpack/tests/serialization_test.cpp | 12 +-
73 files changed, 1051 insertions(+), 740 deletions(-)
diff --cc doc/guide/build.hpp
index 791a752,8f0448e..e7368db
--- a/doc/guide/build.hpp
+++ b/doc/guide/build.hpp
@@@ -5,11 -5,13 +5,13 @@@
mlpack uses CMake as a build system and allows several flexible build
configuration options. One can consult any of numerous CMake tutorials for
further documentation, but this tutorial should be enough to get mlpack built
- and installed.
+ and installed on most Linux and UNIX-like systems (including OS X). If you want
+ to build mlpack on Windows, see <a
+ href="http://keon.io/mlpack-on-windows.html">Keon's excellent tutorial</a>.
@section Download latest mlpack build
+
Download latest mlpack build from here:
-<a href="http://www.mlpack.org/files/mlpack-2.0.1.tar.gz">mlpack-2.0.1</a>
@section builddir Creating Build Directory
diff --cc src/mlpack/tests/CMakeLists.txt
index cffe736,8b36a94..37dd752
--- a/src/mlpack/tests/CMakeLists.txt
+++ b/src/mlpack/tests/CMakeLists.txt
@@@ -18,6 -21,9 +18,7 @@@ add_executable(mlpack_tes
gmm_test.cpp
hmm_test.cpp
hoeffding_tree_test.cpp
+ ind2sub_test.cpp
- init_rules_test.cpp
kernel_test.cpp
kernel_pca_test.cpp
kernel_traits_test.cpp
More information about the mlpack-git
mailing list