[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into vptrees Fix conflicts. (923bfe7)
gitdub at mlpack.org
gitdub at mlpack.org
Mon Aug 8 14:31:14 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/acd81e11579f69e75aa8406b2982328c88cf1fde...1e9f0f39ea4443f0d595c395871ea8c6b27443af
>---------------------------------------------------------------
commit 923bfe7cd44add148ab52f690935c7b57f35cabd
Merge: 300882a 4c88348
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date: Fri Jul 22 18:57:09 2016 +0300
Merge remote-tracking branch 'upstream/master' into vptrees
Fix conflicts.
>---------------------------------------------------------------
923bfe7cd44add148ab52f690935c7b57f35cabd
CMake/mlpack_coverage.in | 125 ++++++
CMakeLists.txt | 64 +++-
doc/tutorials/kmeans/kmeans.txt | 18 +-
src/mlpack/CMakeLists.txt | 3 +
src/mlpack/core/tree/binary_space_tree/traits.hpp | 24 ++
src/mlpack/core/tree/rectangle_tree.hpp | 2 +-
.../tree/rectangle_tree/r_plus_tree_split_impl.hpp | 32 +-
.../core/tree/rectangle_tree/r_star_tree_split.hpp | 25 +-
.../tree/rectangle_tree/r_star_tree_split_impl.hpp | 236 ++++--------
src/mlpack/core/tree/rectangle_tree/traits.hpp | 48 +++
.../core/tree/rectangle_tree/x_tree_split.hpp | 25 +-
.../core/tree/rectangle_tree/x_tree_split_impl.hpp | 260 +++++--------
src/mlpack/core/util/cli.cpp | 126 +++++-
src/mlpack/core/util/cli.hpp | 351 +----------------
src/mlpack/core/util/cli_impl.hpp | 21 +-
src/mlpack/core/util/option.hpp | 20 +-
src/mlpack/core/util/option_impl.hpp | 11 +-
src/mlpack/core/util/param.hpp | 426 +++++++++++++++++++++
src/mlpack/methods/CMakeLists.txt | 1 +
src/mlpack/methods/adaboost/adaboost_impl.hpp | 2 +-
src/mlpack/methods/adaboost/adaboost_main.cpp | 37 +-
src/mlpack/methods/ann/cnn.hpp | 3 +
src/mlpack/methods/ann/cnn_impl.hpp | 13 +-
src/mlpack/methods/ann/layer/one_hot_layer.hpp | 2 +-
.../methods/ann/layer/vr_class_reward_layer.hpp | 2 +-
src/mlpack/methods/cf/cf_main.cpp | 44 ++-
.../methods/decision_stump/decision_stump_main.cpp | 23 +-
src/mlpack/methods/det/det_main.cpp | 37 +-
src/mlpack/methods/emst/emst_main.cpp | 20 +-
src/mlpack/methods/fastmks/fastmks_main.cpp | 33 +-
src/mlpack/methods/gmm/gmm_generate_main.cpp | 15 +-
src/mlpack/methods/gmm/gmm_probability_main.cpp | 21 +-
src/mlpack/methods/gmm/gmm_train_main.cpp | 26 +-
src/mlpack/methods/hmm/hmm_generate_main.cpp | 23 +-
src/mlpack/methods/hmm/hmm_loglik_main.cpp | 8 +-
src/mlpack/methods/hmm/hmm_train_main.cpp | 21 +-
src/mlpack/methods/hmm/hmm_viterbi_main.cpp | 10 +-
.../hoeffding_trees/hoeffding_tree_main.cpp | 36 +-
src/mlpack/methods/kernel_pca/kernel_pca_main.cpp | 31 +-
src/mlpack/methods/kmeans/kmeans_main.cpp | 37 +-
src/mlpack/methods/lars/lars_main.cpp | 61 ++-
.../linear_regression/linear_regression_main.cpp | 63 ++-
.../local_coordinate_coding_main.cpp | 32 +-
.../logistic_regression_main.cpp | 48 +--
src/mlpack/methods/lsh/lsh_main.cpp | 45 ++-
src/mlpack/methods/mean_shift/mean_shift_main.cpp | 80 ++--
src/mlpack/methods/mvu/mvu_main.cpp | 10 +-
src/mlpack/methods/naive_bayes/nbc_main.cpp | 17 +-
src/mlpack/methods/nca/nca_main.cpp | 49 ++-
src/mlpack/methods/neighbor_search/kfn_main.cpp | 42 +-
src/mlpack/methods/neighbor_search/knn_main.cpp | 29 +-
.../neighbor_search/neighbor_search_impl.hpp | 3 +-
src/mlpack/methods/nmf/nmf_main.cpp | 36 +-
src/mlpack/methods/pca/pca_main.cpp | 27 +-
src/mlpack/methods/perceptron/perceptron_impl.hpp | 2 +-
src/mlpack/methods/perceptron/perceptron_main.cpp | 34 +-
.../preprocess/preprocess_binarize_main.cpp | 18 +-
.../methods/preprocess/preprocess_split_main.cpp | 64 ++--
src/mlpack/methods/radical/radical.cpp | 2 +-
src/mlpack/methods/radical/radical_main.cpp | 65 +++-
.../methods/range_search/range_search_impl.hpp | 2 +-
.../methods/range_search/range_search_main.cpp | 27 +-
src/mlpack/methods/rann/krann_main.cpp | 31 +-
src/mlpack/methods/rann/ra_search_impl.hpp | 2 +-
src/mlpack/methods/rmva/rmva_main.cpp | 37 +-
.../softmax_regression/softmax_regression_main.cpp | 35 +-
.../methods/sparse_coding/sparse_coding_main.cpp | 56 +--
src/mlpack/tests/cli_test.cpp | 2 +-
src/mlpack/tests/rectangle_tree_test.cpp | 8 +
69 files changed, 1858 insertions(+), 1331 deletions(-)
diff --cc src/mlpack/methods/neighbor_search/kfn_main.cpp
index 08cd95f,fac28b5..b223d7c
--- a/src/mlpack/methods/neighbor_search/kfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp
@@@ -61,14 -61,14 +61,14 @@@ PARAM_INT_IN("k", "Number of furthest n
// The user may specify the type of tree to use, and a few pararmeters for tree
// building.
- PARAM_STRING("tree_type", "Type of tree to use: 'kd', 'cover', 'r', 'r-star', "
- "'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', 'vp'.", "t", "kd");
- PARAM_INT("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
-PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'cover', 'r', "
++PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'cover', 'r', "
+ "'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus'.", "t", "kd");
-PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, R "
- "trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ trees).", "l",
- 20);
++PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
+ "trees, R trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ "
+ "trees).", "l", 20);
PARAM_FLAG("random_basis", "Before tree-building, project the data onto a "
"random orthogonal basis.", "R");
- PARAM_INT("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
+ PARAM_INT_IN("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
// Search settings.
PARAM_FLAG("naive", "If true, O(n^2) naive mode is used for computation.", "N");
diff --cc src/mlpack/methods/neighbor_search/knn_main.cpp
index 62fff18,14e07db..10cbd5d
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@@ -62,14 -63,14 +63,14 @@@ PARAM_INT_IN("k", "Number of nearest ne
// The user may specify the type of tree to use, and a few parameters for tree
// building.
- PARAM_STRING("tree_type", "Type of tree to use: 'kd', 'cover', 'r', 'r-star', "
- "'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', 'vp'.", "t", "kd");
- PARAM_INT("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
-PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'cover', 'r', "
++PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'cover', 'r', "
+ "'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus'.", "t", "kd");
-PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, R "
- "trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ trees).", "l",
- 20);
++PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
+ "trees, R trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ "
+ "trees).", "l", 20);
PARAM_FLAG("random_basis", "Before tree-building, project the data onto a "
"random orthogonal basis.", "R");
- PARAM_INT("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
+ PARAM_INT_IN("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
// Search settings.
PARAM_FLAG("naive", "If true, O(n^2) naive mode is used for computation.", "N");
diff --cc src/mlpack/methods/range_search/range_search_main.cpp
index 4db62f7,3b8b088..27813c0
--- a/src/mlpack/methods/range_search/range_search_main.cpp
+++ b/src/mlpack/methods/range_search/range_search_main.cpp
@@@ -69,14 -70,14 +70,14 @@@ PARAM_DOUBLE_IN("min", "Lower bound in
// The user may specify the type of tree to use, and a few parameters for tree
// building.
- PARAM_STRING("tree_type", "Type of tree to use: 'kd', 'cover', 'r', 'r-star', "
- "'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', 'vp'.", "t", "kd");
- PARAM_INT("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
-PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'cover', 'r', "
++PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'cover', 'r', "
+ "'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', 'r-plus-plus'.", "t", "kd");
-PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, R "
- "trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ trees).", "l",
- 20);
++PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
+ "trees, R trees, R* trees, X trees, Hilbert R trees, R+ trees and R++ "
+ "trees).", "l", 20);
PARAM_FLAG("random_basis", "Before tree-building, project the data onto a "
"random orthogonal basis.", "R");
- PARAM_INT("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
+ PARAM_INT_IN("seed", "Random seed (if 0, std::time(NULL) is used).", "s", 0);
// Search settings.
PARAM_FLAG("naive", "If true, O(n^2) naive mode is used for computation.", "N");
More information about the mlpack-git
mailing list