[mlpack-git] master: Merge remote-tracking branch 'upstream/master' Fix conflicts (f0f9fff)
gitdub at mlpack.org
gitdub at mlpack.org
Fri Apr 22 14:22:58 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/4c8a8d1ccbc33916794fe0f6142fa5378ff8503d...93eb34cc4daf08cc331d1a22fccf44950b276daa
>---------------------------------------------------------------
commit f0f9fff64b5f04967d0c8b88f41e2e2593e8c814
Merge: 6008c15 213a04d
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date: Fri Apr 22 21:22:58 2016 +0300
Merge remote-tracking branch 'upstream/master'
Fix conflicts
>---------------------------------------------------------------
f0f9fff64b5f04967d0c8b88f41e2e2593e8c814
.appveyor.yml | 2 +-
CMake/CreateArmaConfigInfo.cmake | 4 +-
CMakeLists.txt | 10 +-
COPYRIGHT.txt | 1 +
HISTORY.md | 11 +
README.md | 14 +-
doc/doxygen/stylesheet.css | 0
doc/guide/build.hpp | 8 +-
doc/guide/formats.hpp | 310 +++++++++++++++++++++
doc/guide/iodoc.hpp | 0
doc/guide/matrices.hpp | 2 +-
doc/guide/sample.hpp | 4 +-
doc/guide/timer.hpp | 2 +-
doc/guide/version.hpp | 6 +-
doc/tutorials/README.md | 2 +-
doc/tutorials/emst/emst.txt | 0
doc/tutorials/fastmks/fastmks.txt | 2 +-
doc/tutorials/kmeans/kmeans.txt | 52 +++-
.../linear_regression/linear_regression.txt | 0
doc/tutorials/neighbor_search/neighbor_search.txt | 46 +--
doc/tutorials/range_search/range_search.txt | 9 -
doc/tutorials/tutorials.txt | 2 +
src/mlpack/CMakeLists.txt | 12 +-
src/mlpack/bindings/matlab/allknn/allknn.m | 0
src/mlpack/bindings/matlab/gmm/gmm.m | 0
src/mlpack/bindings/matlab/hmm/hmm_generate.m | 0
src/mlpack/bindings/matlab/kernel_pca/kernel_pca.m | 0
src/mlpack/bindings/matlab/kmeans/kmeans.m | 0
src/mlpack/bindings/matlab/lars/lars.m | 0
src/mlpack/bindings/matlab/nca/nca.m | 0
src/mlpack/bindings/matlab/nmf/nmf.m | 0
src/mlpack/bindings/matlab/pca/pca.m | 0
.../bindings/matlab/range_search/range_search.m | 0
src/mlpack/core.hpp | 12 +-
src/mlpack/core/arma_extend/Cube_extra_meat.hpp | 0
src/mlpack/core/arma_extend/arma_extend.hpp | 4 +-
.../unordered_collections_load_imp.hpp | 0
.../unordered_collections_save_imp.hpp | 0
src/mlpack/core/boost_backport/unordered_map.hpp | 0
src/mlpack/core/data/dataset_info.hpp | 35 ++-
src/mlpack/core/data/dataset_info_impl.hpp | 4 +-
src/mlpack/core/data/extension.hpp | 4 +-
src/mlpack/core/data/format.hpp | 4 +-
src/mlpack/core/data/load.hpp | 4 +-
src/mlpack/core/data/load_arff.hpp | 4 +-
src/mlpack/core/data/load_arff_impl.hpp | 4 +-
src/mlpack/core/data/load_impl.hpp | 4 +-
src/mlpack/core/data/normalize_labels.hpp | 4 +-
src/mlpack/core/data/normalize_labels_impl.hpp | 4 +-
src/mlpack/core/data/save.hpp | 4 +-
src/mlpack/core/data/save_impl.hpp | 4 +-
src/mlpack/core/data/serialization_shim.hpp | 4 +-
src/mlpack/core/data/split_data.hpp | 120 ++++++++
src/mlpack/core/dists/discrete_distribution.hpp | 4 +-
src/mlpack/core/dists/gaussian_distribution.hpp | 4 +-
src/mlpack/core/dists/laplace_distribution.hpp | 4 +-
src/mlpack/core/dists/regression_distribution.hpp | 4 +-
src/mlpack/core/kernels/cosine_distance.hpp | 4 +-
src/mlpack/core/kernels/cosine_distance_impl.hpp | 4 +-
src/mlpack/core/kernels/epanechnikov_kernel.cpp | 2 +-
src/mlpack/core/kernels/epanechnikov_kernel.hpp | 4 +-
.../core/kernels/epanechnikov_kernel_impl.hpp | 4 +-
src/mlpack/core/kernels/example_kernel.hpp | 4 +-
src/mlpack/core/kernels/gaussian_kernel.hpp | 4 +-
.../core/kernels/hyperbolic_tangent_kernel.hpp | 4 +-
src/mlpack/core/kernels/kernel_traits.hpp | 4 +-
src/mlpack/core/kernels/laplacian_kernel.hpp | 4 +-
src/mlpack/core/kernels/linear_kernel.hpp | 4 +-
src/mlpack/core/kernels/polynomial_kernel.hpp | 4 +-
.../core/kernels/pspectrum_string_kernel.hpp | 4 +-
.../core/kernels/pspectrum_string_kernel_impl.hpp | 4 +-
src/mlpack/core/kernels/spherical_kernel.hpp | 4 +-
src/mlpack/core/kernels/triangular_kernel.hpp | 4 +-
src/mlpack/core/math/clamp.hpp | 6 +-
src/mlpack/core/math/columns_to_blocks.hpp | 4 +-
src/mlpack/core/math/lin_alg.hpp | 6 +-
src/mlpack/core/math/lin_alg_impl.hpp | 4 +-
src/mlpack/core/math/random.hpp | 6 +-
src/mlpack/core/math/random_basis.hpp | 4 +-
src/mlpack/core/math/range.hpp | 6 +-
src/mlpack/core/math/range_impl.hpp | 4 +-
src/mlpack/core/math/round.hpp | 4 +-
src/mlpack/core/metrics/ip_metric.hpp | 4 +-
src/mlpack/core/metrics/ip_metric_impl.hpp | 4 +-
src/mlpack/core/metrics/lmetric.hpp | 4 +-
src/mlpack/core/metrics/lmetric_impl.hpp | 4 +-
src/mlpack/core/metrics/mahalanobis_distance.hpp | 4 +-
.../core/metrics/mahalanobis_distance_impl.hpp | 4 +-
src/mlpack/core/optimizers/adadelta/ada_delta.hpp | 0
.../core/optimizers/adadelta/ada_delta_impl.hpp | 0
src/mlpack/core/optimizers/adam/adam_impl.hpp | 0
.../optimizers/aug_lagrangian/aug_lagrangian.hpp | 6 +-
.../aug_lagrangian/aug_lagrangian_function.hpp | 6 +-
.../aug_lagrangian_function_impl.hpp | 4 +-
.../aug_lagrangian/aug_lagrangian_impl.hpp | 6 +-
.../aug_lagrangian_test_functions.hpp | 6 +-
src/mlpack/core/optimizers/lbfgs/lbfgs.hpp | 6 +-
src/mlpack/core/optimizers/lbfgs/lbfgs_impl.hpp | 6 +-
.../core/optimizers/lbfgs/test_functions.hpp | 6 +-
.../optimizers/minibatch_sgd/minibatch_sgd.hpp | 4 +-
.../minibatch_sgd/minibatch_sgd_impl.hpp | 4 +-
src/mlpack/core/optimizers/rmsprop/rmsprop.hpp | 4 +-
.../core/optimizers/rmsprop/rmsprop_impl.hpp | 4 +-
.../core/optimizers/sa/exponential_schedule.hpp | 4 +-
src/mlpack/core/optimizers/sa/sa.hpp | 4 +-
src/mlpack/core/optimizers/sa/sa_impl.hpp | 4 +-
src/mlpack/core/optimizers/sdp/lrsdp.hpp | 4 +-
src/mlpack/core/optimizers/sdp/lrsdp_function.hpp | 6 +-
.../core/optimizers/sdp/lrsdp_function_impl.hpp | 4 +-
src/mlpack/core/optimizers/sdp/lrsdp_impl.hpp | 4 +-
src/mlpack/core/optimizers/sdp/primal_dual.hpp | 4 +-
.../core/optimizers/sdp/primal_dual_impl.hpp | 4 +-
src/mlpack/core/optimizers/sdp/sdp.hpp | 4 +-
src/mlpack/core/optimizers/sdp/sdp_impl.hpp | 4 +-
src/mlpack/core/optimizers/sgd/sgd.hpp | 4 +-
src/mlpack/core/optimizers/sgd/sgd_impl.hpp | 4 +-
src/mlpack/core/optimizers/sgd/test_function.cpp | 2 +-
src/mlpack/core/optimizers/sgd/test_function.hpp | 4 +-
src/mlpack/core/tree/ballbound.hpp | 6 +-
src/mlpack/core/tree/ballbound_impl.hpp | 6 +-
src/mlpack/core/tree/binary_space_tree.hpp | 4 +-
.../tree/binary_space_tree/binary_space_tree.hpp | 4 +-
.../binary_space_tree/binary_space_tree_impl.hpp | 4 +-
.../breadth_first_dual_tree_traverser.hpp | 6 +-
.../breadth_first_dual_tree_traverser_impl.hpp | 6 +-
.../tree/binary_space_tree/dual_tree_traverser.hpp | 6 +-
.../binary_space_tree/dual_tree_traverser_impl.hpp | 6 +-
.../core/tree/binary_space_tree/mean_split.hpp | 4 +-
.../tree/binary_space_tree/mean_split_impl.hpp | 4 +-
.../core/tree/binary_space_tree/midpoint_split.hpp | 4 +-
.../tree/binary_space_tree/midpoint_split_impl.hpp | 4 +-
.../binary_space_tree/single_tree_traverser.hpp | 4 +-
.../single_tree_traverser_impl.hpp | 4 +-
src/mlpack/core/tree/binary_space_tree/traits.hpp | 4 +-
src/mlpack/core/tree/binary_space_tree/typedef.hpp | 4 +-
src/mlpack/core/tree/bound_traits.hpp | 4 +-
src/mlpack/core/tree/bounds.hpp | 6 +-
src/mlpack/core/tree/cosine_tree/cosine_tree.hpp | 4 +-
src/mlpack/core/tree/cover_tree.hpp | 4 +-
src/mlpack/core/tree/cover_tree/cover_tree.hpp | 4 +-
.../core/tree/cover_tree/cover_tree_impl.hpp | 4 +-
.../core/tree/cover_tree/dual_tree_traverser.hpp | 4 +-
.../tree/cover_tree/dual_tree_traverser_impl.hpp | 4 +-
.../core/tree/cover_tree/first_point_is_root.hpp | 6 +-
.../core/tree/cover_tree/single_tree_traverser.hpp | 4 +-
.../tree/cover_tree/single_tree_traverser_impl.hpp | 4 +-
src/mlpack/core/tree/cover_tree/traits.hpp | 4 +-
src/mlpack/core/tree/cover_tree/typedef.hpp | 4 +-
src/mlpack/core/tree/example_tree.hpp | 4 +-
src/mlpack/core/tree/hrectbound.hpp | 6 +-
src/mlpack/core/tree/hrectbound_impl.hpp | 6 +-
src/mlpack/core/tree/rectangle_tree.hpp | 4 +-
.../tree/rectangle_tree/dual_tree_traverser.hpp | 4 +-
.../rectangle_tree/dual_tree_traverser_impl.hpp | 4 +-
.../r_star_tree_descent_heuristic.hpp | 4 +-
.../r_star_tree_descent_heuristic_impl.hpp | 4 +-
.../core/tree/rectangle_tree/r_star_tree_split.hpp | 4 +-
.../tree/rectangle_tree/r_star_tree_split_impl.hpp | 4 +-
.../rectangle_tree/r_tree_descent_heuristic.hpp | 4 +-
.../r_tree_descent_heuristic_impl.hpp | 4 +-
.../core/tree/rectangle_tree/r_tree_split.hpp | 4 +-
.../core/tree/rectangle_tree/r_tree_split_impl.hpp | 4 +-
.../core/tree/rectangle_tree/rectangle_tree.hpp | 4 +-
.../tree/rectangle_tree/rectangle_tree_impl.hpp | 4 +-
.../tree/rectangle_tree/single_tree_traverser.hpp | 4 +-
.../rectangle_tree/single_tree_traverser_impl.hpp | 4 +-
src/mlpack/core/tree/rectangle_tree/traits.hpp | 4 +-
src/mlpack/core/tree/rectangle_tree/typedef.hpp | 4 +-
.../core/tree/rectangle_tree/x_tree_split.hpp | 4 +-
.../core/tree/rectangle_tree/x_tree_split_impl.hpp | 4 +-
src/mlpack/core/tree/statistic.hpp | 6 +-
src/mlpack/core/tree/traversal_info.hpp | 4 +-
src/mlpack/core/tree/tree_traits.hpp | 4 +-
src/mlpack/core/util/arma_config_check.hpp | 4 +-
src/mlpack/core/util/arma_traits.hpp | 4 +-
src/mlpack/core/util/backtrace.cpp | 18 +-
src/mlpack/core/util/backtrace.hpp | 0
src/mlpack/core/util/cli.hpp | 8 +-
src/mlpack/core/util/cli_deleter.hpp | 4 +-
src/mlpack/core/util/cli_impl.hpp | 4 +-
src/mlpack/core/util/log.cpp | 0
src/mlpack/core/util/log.hpp | 4 +-
src/mlpack/core/util/nulloutstream.hpp | 4 +-
src/mlpack/core/util/option.hpp | 4 +-
src/mlpack/core/util/option_impl.hpp | 4 +-
src/mlpack/core/util/prefixedoutstream.hpp | 4 +-
src/mlpack/core/util/prefixedoutstream_impl.hpp | 53 ++--
src/mlpack/core/util/sfinae_utility.hpp | 4 +-
src/mlpack/core/util/string_util.hpp | 4 +-
src/mlpack/core/util/timers.hpp | 6 +-
src/mlpack/core/util/version.cpp | 6 +-
src/mlpack/core/util/version.hpp | 10 +-
src/mlpack/methods/CMakeLists.txt | 15 +
src/mlpack/methods/adaboost/CMakeLists.txt | 8 +-
src/mlpack/methods/adaboost/adaboost.hpp | 4 +-
src/mlpack/methods/adaboost/adaboost_impl.hpp | 4 +-
src/mlpack/methods/amf/amf.hpp | 6 +-
src/mlpack/methods/amf/init_rules/average_init.hpp | 4 +-
.../methods/amf/init_rules/random_acol_init.hpp | 4 +-
src/mlpack/methods/amf/init_rules/random_init.hpp | 4 +-
.../complete_incremental_termination.hpp | 6 +-
.../max_iteration_termination.hpp | 4 +-
src/mlpack/methods/amf/update_rules/nmf_als.hpp | 4 +-
.../methods/amf/update_rules/nmf_mult_dist.hpp | 4 +-
.../methods/amf/update_rules/nmf_mult_div.hpp | 4 +-
.../amf/update_rules/svd_batch_learning.hpp | 6 +-
.../svd_complete_incremental_learning.hpp | 4 +-
.../svd_incomplete_incremental_learning.hpp | 4 +-
.../ann/activation_functions/identity_function.hpp | 4 +-
.../ann/activation_functions/logistic_function.hpp | 4 +-
.../activation_functions/rectifier_function.hpp | 4 +-
.../ann/activation_functions/softsign_function.hpp | 4 +-
.../ann/activation_functions/tanh_function.hpp | 4 +-
src/mlpack/methods/ann/cnn.hpp | 10 +-
src/mlpack/methods/ann/cnn_impl.hpp | 4 +-
.../methods/ann/convolution_rules/border_modes.hpp | 4 +-
.../ann/convolution_rules/fft_convolution.hpp | 4 +-
.../ann/convolution_rules/naive_convolution.hpp | 4 +-
.../ann/convolution_rules/svd_convolution.hpp | 4 +-
src/mlpack/methods/ann/ffn.hpp | 10 +-
src/mlpack/methods/ann/ffn_impl.hpp | 10 +-
.../kathirvalavakumar_subavathi_init.hpp | 4 +-
.../methods/ann/init_rules/nguyen_widrow_init.hpp | 4 +-
src/mlpack/methods/ann/init_rules/oivs_init.hpp | 4 +-
.../methods/ann/init_rules/orthogonal_init.hpp | 4 +-
src/mlpack/methods/ann/init_rules/random_init.hpp | 4 +-
src/mlpack/methods/ann/init_rules/zero_init.hpp | 4 +-
src/mlpack/methods/ann/layer/base_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/bias_layer.hpp | 33 +--
.../ann/layer/binary_classification_layer.hpp | 24 +-
src/mlpack/methods/ann/layer/constant_layer.hpp | 116 ++++++++
src/mlpack/methods/ann/layer/conv_layer.hpp | 13 +-
src/mlpack/methods/ann/layer/dropconnect_layer.hpp | 23 +-
src/mlpack/methods/ann/layer/dropout_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/empty_layer.hpp | 6 +-
src/mlpack/methods/ann/layer/hard_tanh_layer.hpp | 2 +-
src/mlpack/methods/ann/layer/layer_traits.hpp | 4 +-
src/mlpack/methods/ann/layer/leaky_relu_layer.hpp | 0
src/mlpack/methods/ann/layer/linear_layer.hpp | 33 ++-
.../{softmax_layer.hpp => log_softmax_layer.hpp} | 81 +++---
src/mlpack/methods/ann/layer/lstm_layer.hpp | 22 +-
.../ann/layer/multiclass_classification_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/one_hot_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/pooling_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/recurrent_layer.hpp | 11 +-
.../methods/ann/layer/reinforce_normal_layer.hpp | 133 +++++++++
src/mlpack/methods/ann/layer/softmax_layer.hpp | 4 +-
src/mlpack/methods/ann/layer/sparse_bias_layer.hpp | 11 +-
.../methods/ann/layer/sparse_input_layer.hpp | 16 +-
.../methods/ann/layer/sparse_output_layer.hpp | 14 +-
src/mlpack/methods/ann/network_traits.hpp | 4 +-
src/mlpack/methods/ann/network_util.hpp | 97 ++++++-
src/mlpack/methods/ann/network_util_impl.hpp | 113 +++++++-
.../ann/performance_functions/cee_function.hpp | 4 +-
.../ann/performance_functions/mse_function.hpp | 4 +-
.../ann/performance_functions/sparse_function.hpp | 4 +-
.../ann/performance_functions/sse_function.hpp | 4 +-
.../methods/ann/pooling_rules/max_pooling.hpp | 4 +-
.../methods/ann/pooling_rules/mean_pooling.hpp | 4 +-
src/mlpack/methods/ann/rnn.hpp | 20 +-
src/mlpack/methods/ann/rnn_impl.hpp | 14 +-
src/mlpack/methods/ann/trainer/trainer.hpp | 4 +-
src/mlpack/methods/cf/CMakeLists.txt | 8 +-
src/mlpack/methods/cf/cf.cpp | 6 +-
src/mlpack/methods/cf/cf.hpp | 4 +-
src/mlpack/methods/cf/cf_impl.hpp | 4 +-
src/mlpack/methods/cf/svd_wrapper.hpp | 4 +-
src/mlpack/methods/decision_stump/CMakeLists.txt | 8 +-
.../methods/decision_stump/decision_stump.hpp | 4 +-
.../methods/decision_stump/decision_stump_impl.hpp | 4 +-
src/mlpack/methods/det/CMakeLists.txt | 10 +-
src/mlpack/methods/det/dt_utils.cpp | 2 +-
src/mlpack/methods/det/dt_utils.hpp | 6 +-
src/mlpack/methods/det/dtree.hpp | 6 +-
src/mlpack/methods/emst/CMakeLists.txt | 8 +-
src/mlpack/methods/emst/dtb.hpp | 6 +-
src/mlpack/methods/emst/dtb_impl.hpp | 4 +-
src/mlpack/methods/emst/dtb_rules.hpp | 4 +-
src/mlpack/methods/emst/dtb_rules_impl.hpp | 4 +-
src/mlpack/methods/emst/dtb_stat.hpp | 6 +-
src/mlpack/methods/emst/edge_pair.hpp | 6 +-
src/mlpack/methods/emst/union_find.hpp | 6 +-
src/mlpack/methods/fastmks/CMakeLists.txt | 8 +-
src/mlpack/methods/fastmks/fastmks.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_impl.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_model.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_model_impl.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_rules.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_rules_impl.hpp | 4 +-
src/mlpack/methods/fastmks/fastmks_stat.hpp | 4 +-
src/mlpack/methods/gmm/CMakeLists.txt | 28 +-
src/mlpack/methods/gmm/diagonal_constraint.hpp | 4 +-
.../methods/gmm/eigenvalue_ratio_constraint.hpp | 4 +-
src/mlpack/methods/gmm/em_fit.hpp | 4 +-
src/mlpack/methods/gmm/em_fit_impl.hpp | 4 +-
src/mlpack/methods/gmm/gmm.hpp | 4 +-
src/mlpack/methods/gmm/gmm_impl.hpp | 4 +-
src/mlpack/methods/gmm/no_constraint.hpp | 4 +-
.../methods/gmm/positive_definite_constraint.hpp | 4 +-
src/mlpack/methods/hmm/CMakeLists.txt | 37 +--
src/mlpack/methods/hmm/hmm.hpp | 4 +-
src/mlpack/methods/hmm/hmm_impl.hpp | 19 +-
src/mlpack/methods/hmm/hmm_regression.hpp | 4 +-
src/mlpack/methods/hmm/hmm_regression_impl.hpp | 4 +-
src/mlpack/methods/hmm/hmm_util.hpp | 4 +-
src/mlpack/methods/hmm/hmm_util_impl.hpp | 4 +-
src/mlpack/methods/hoeffding_trees/CMakeLists.txt | 8 +-
.../hoeffding_trees/binary_numeric_split.hpp | 4 +-
.../hoeffding_trees/binary_numeric_split_impl.hpp | 4 +-
.../hoeffding_trees/binary_numeric_split_info.hpp | 4 +-
.../hoeffding_trees/categorical_split_info.hpp | 4 +-
.../methods/hoeffding_trees/gini_impurity.hpp | 4 +-
.../hoeffding_categorical_split.hpp | 4 +-
.../hoeffding_categorical_split_impl.hpp | 4 +-
.../hoeffding_trees/hoeffding_numeric_split.hpp | 4 +-
.../hoeffding_numeric_split_impl.hpp | 4 +-
.../methods/hoeffding_trees/hoeffding_tree.hpp | 4 +-
.../hoeffding_trees/hoeffding_tree_impl.hpp | 4 +-
.../methods/hoeffding_trees/information_gain.hpp | 4 +-
.../methods/hoeffding_trees/numeric_split_info.hpp | 4 +-
src/mlpack/methods/hoeffding_trees/typedef.hpp | 4 +-
src/mlpack/methods/kernel_pca/CMakeLists.txt | 8 +-
src/mlpack/methods/kernel_pca/kernel_pca.hpp | 6 +-
src/mlpack/methods/kernel_pca/kernel_pca_impl.hpp | 4 +-
.../kernel_pca/kernel_rules/naive_method.hpp | 4 +-
.../kernel_pca/kernel_rules/nystroem_method.hpp | 4 +-
src/mlpack/methods/kmeans/CMakeLists.txt | 10 +-
src/mlpack/methods/kmeans/allow_empty_clusters.hpp | 4 +-
src/mlpack/methods/kmeans/dual_tree_kmeans.hpp | 4 +-
.../methods/kmeans/dual_tree_kmeans_impl.hpp | 6 +-
.../methods/kmeans/dual_tree_kmeans_rules.hpp | 4 +-
.../methods/kmeans/dual_tree_kmeans_rules_impl.hpp | 4 +-
.../methods/kmeans/dual_tree_kmeans_statistic.hpp | 4 +-
src/mlpack/methods/kmeans/elkan_kmeans.hpp | 4 +-
src/mlpack/methods/kmeans/elkan_kmeans_impl.hpp | 4 +-
src/mlpack/methods/kmeans/hamerly_kmeans.hpp | 4 +-
src/mlpack/methods/kmeans/hamerly_kmeans_impl.hpp | 4 +-
src/mlpack/methods/kmeans/kmeans.hpp | 17 +-
src/mlpack/methods/kmeans/kmeans_impl.hpp | 98 +++++--
src/mlpack/methods/kmeans/kmeans_main.cpp | 2 +-
.../methods/kmeans/max_variance_new_cluster.hpp | 4 +-
.../kmeans/max_variance_new_cluster_impl.hpp | 4 +-
src/mlpack/methods/kmeans/naive_kmeans.hpp | 4 +-
src/mlpack/methods/kmeans/naive_kmeans_impl.hpp | 4 +-
src/mlpack/methods/kmeans/pelleg_moore_kmeans.hpp | 4 +-
.../methods/kmeans/pelleg_moore_kmeans_impl.hpp | 4 +-
.../methods/kmeans/pelleg_moore_kmeans_rules.hpp | 4 +-
.../kmeans/pelleg_moore_kmeans_rules_impl.hpp | 4 +-
.../kmeans/pelleg_moore_kmeans_statistic.hpp | 4 +-
src/mlpack/methods/kmeans/random_partition.hpp | 4 +-
src/mlpack/methods/kmeans/refined_start.hpp | 22 +-
src/mlpack/methods/kmeans/refined_start_impl.hpp | 33 ++-
.../methods/kmeans/sample_initialization.hpp | 49 ++++
src/mlpack/methods/lars/CMakeLists.txt | 8 +-
src/mlpack/methods/lars/lars.hpp | 4 +-
src/mlpack/methods/lars/lars_impl.hpp | 4 +-
.../methods/linear_regression/CMakeLists.txt | 8 +-
.../linear_regression/linear_regression.hpp | 6 +-
.../methods/local_coordinate_coding/CMakeLists.txt | 8 +-
src/mlpack/methods/local_coordinate_coding/lcc.hpp | 4 +-
.../methods/local_coordinate_coding/lcc_impl.hpp | 4 +-
...c_main.cpp => local_coordinate_coding_main.cpp} | 0
.../methods/logistic_regression/CMakeLists.txt | 8 +-
.../logistic_regression/logistic_regression.hpp | 6 +-
.../logistic_regression_function.hpp | 6 +-
.../logistic_regression_function_impl.hpp | 4 +-
.../logistic_regression_impl.hpp | 6 +-
src/mlpack/methods/lsh/CMakeLists.txt | 8 +-
src/mlpack/methods/lsh/lsh_search.hpp | 4 +-
src/mlpack/methods/lsh/lsh_search_impl.hpp | 4 +-
.../matrix_completion/matrix_completion.hpp | 4 +-
src/mlpack/methods/mean_shift/CMakeLists.txt | 9 +-
src/mlpack/methods/mean_shift/mean_shift.hpp | 6 +-
src/mlpack/methods/mean_shift/mean_shift_impl.hpp | 8 +-
src/mlpack/methods/mvu/CMakeLists.txt | 8 +-
src/mlpack/methods/mvu/mvu.cpp | 6 +-
src/mlpack/methods/mvu/mvu.hpp | 4 +-
src/mlpack/methods/naive_bayes/CMakeLists.txt | 8 +-
.../methods/naive_bayes/naive_bayes_classifier.hpp | 4 +-
.../naive_bayes/naive_bayes_classifier_impl.hpp | 4 +-
src/mlpack/methods/nca/CMakeLists.txt | 8 +-
src/mlpack/methods/nca/nca.hpp | 4 +-
src/mlpack/methods/nca/nca_impl.hpp | 4 +-
.../methods/nca/nca_softmax_error_function.hpp | 4 +-
.../nca/nca_softmax_error_function_impl.hpp | 4 +-
src/mlpack/methods/neighbor_search/CMakeLists.txt | 33 ++-
.../{allkfn_main.cpp => kfn_main.cpp} | 8 +-
.../{allknn_main.cpp => knn_main.cpp} | 6 +-
.../methods/neighbor_search/neighbor_search.hpp | 4 +-
.../neighbor_search/neighbor_search_impl.hpp | 4 +-
.../neighbor_search/neighbor_search_rules.hpp | 6 +-
.../neighbor_search/neighbor_search_rules_impl.hpp | 8 +-
.../neighbor_search/neighbor_search_stat.hpp | 4 +-
src/mlpack/methods/neighbor_search/ns_model.hpp | 4 +-
.../methods/neighbor_search/ns_model_impl.hpp | 4 +-
.../methods/neighbor_search/ns_traversal_info.hpp | 4 +-
.../sort_policies/furthest_neighbor_sort.hpp | 10 +-
.../sort_policies/furthest_neighbor_sort_impl.hpp | 4 +-
.../sort_policies/nearest_neighbor_sort.hpp | 10 +-
.../sort_policies/nearest_neighbor_sort_impl.hpp | 4 +-
src/mlpack/methods/neighbor_search/typedef.hpp | 28 +-
src/mlpack/methods/neighbor_search/unmap.hpp | 4 +-
src/mlpack/methods/nmf/CMakeLists.txt | 8 +-
.../methods/nystroem_method/kmeans_selection.hpp | 4 +-
.../methods/nystroem_method/nystroem_method.hpp | 4 +-
.../nystroem_method/nystroem_method_impl.hpp | 4 +-
.../methods/nystroem_method/ordered_selection.hpp | 4 +-
.../methods/nystroem_method/random_selection.hpp | 4 +-
src/mlpack/methods/pca/CMakeLists.txt | 8 +-
src/mlpack/methods/pca/pca.hpp | 4 +-
src/mlpack/methods/perceptron/CMakeLists.txt | 9 +-
.../initialization_methods/random_init.hpp | 4 +-
.../initialization_methods/zero_init.hpp | 4 +-
src/mlpack/methods/perceptron/perceptron.hpp | 4 +-
src/mlpack/methods/perceptron/perceptron_impl.hpp | 4 +-
src/mlpack/methods/quic_svd/quic_svd.hpp | 4 +-
src/mlpack/methods/quic_svd/quic_svd_impl.hpp | 4 +-
src/mlpack/methods/radical/CMakeLists.txt | 8 +-
src/mlpack/methods/radical/radical.hpp | 4 +-
src/mlpack/methods/range_search/CMakeLists.txt | 8 +-
src/mlpack/methods/range_search/range_search.hpp | 4 +-
.../methods/range_search/range_search_impl.hpp | 4 +-
.../methods/range_search/range_search_rules.hpp | 4 +-
.../range_search/range_search_rules_impl.hpp | 4 +-
.../methods/range_search/range_search_stat.hpp | 4 +-
src/mlpack/methods/range_search/rs_model.hpp | 4 +-
src/mlpack/methods/range_search/rs_model_impl.hpp | 4 +-
src/mlpack/methods/rann/CMakeLists.txt | 8 +-
src/mlpack/methods/rann/ra_model.hpp | 4 +-
src/mlpack/methods/rann/ra_model_impl.hpp | 4 +-
src/mlpack/methods/rann/ra_query_stat.hpp | 4 +-
src/mlpack/methods/rann/ra_search.hpp | 4 +-
src/mlpack/methods/rann/ra_search_impl.hpp | 4 +-
src/mlpack/methods/rann/ra_search_rules.hpp | 6 +-
src/mlpack/methods/rann/ra_search_rules_impl.hpp | 6 +-
src/mlpack/methods/rann/ra_typedef.hpp | 4 +-
src/mlpack/methods/rann/ra_util.hpp | 4 +-
.../methods/regularized_svd/regularized_svd.hpp | 4 +-
.../regularized_svd/regularized_svd_function.hpp | 4 +-
.../regularized_svd/regularized_svd_impl.hpp | 4 +-
.../methods/softmax_regression/CMakeLists.txt | 8 +-
.../softmax_regression/softmax_regression.hpp | 4 +-
.../softmax_regression_function.hpp | 4 +-
.../softmax_regression/softmax_regression_impl.hpp | 4 +-
.../methods/sparse_autoencoder/maximal_inputs.hpp | 4 +-
.../sparse_autoencoder/sparse_autoencoder.hpp | 4 +-
.../sparse_autoencoder_function.hpp | 4 +-
.../sparse_autoencoder/sparse_autoencoder_impl.hpp | 4 +-
src/mlpack/methods/sparse_coding/CMakeLists.txt | 8 +-
.../data_dependent_random_initializer.hpp | 4 +-
.../methods/sparse_coding/nothing_initializer.hpp | 4 +-
.../methods/sparse_coding/random_initializer.hpp | 4 +-
src/mlpack/methods/sparse_coding/sparse_coding.hpp | 4 +-
.../methods/sparse_coding/sparse_coding_impl.hpp | 4 +-
src/mlpack/prereqs.hpp | 6 +-
src/mlpack/tests/CMakeLists.txt | 11 +-
src/mlpack/tests/activation_functions_test.cpp | 4 -
src/mlpack/tests/allkrann_search_test.cpp | 4 +-
src/mlpack/tests/cli_test.cpp | 2 +-
src/mlpack/tests/convolution_test.cpp | 4 -
src/mlpack/tests/convolutional_network_test.cpp | 0
src/mlpack/tests/fastmks_test.cpp | 0
src/mlpack/tests/feedforward_network_test.cpp | 0
src/mlpack/tests/hmm_test.cpp | 14 +-
src/mlpack/tests/init_rules_test.cpp | 6 +-
src/mlpack/tests/{allkfn_test.cpp => kfn_test.cpp} | 44 +--
src/mlpack/tests/kmeans_test.cpp | 40 ++-
src/mlpack/tests/{allknn_test.cpp => knn_test.cpp} | 96 +++----
src/mlpack/tests/layer_traits_test.cpp | 4 -
src/mlpack/tests/lsh_test.cpp | 218 +++++++--------
src/mlpack/tests/network_util_test.cpp | 123 ++++++--
src/mlpack/tests/old_boost_test_definitions.hpp | 4 +-
src/mlpack/tests/rectangle_tree_test.cpp | 36 ++-
src/mlpack/tests/recurrent_network_test.cpp | 4 -
src/mlpack/tests/sdp_primal_dual_test.cpp | 4 +-
src/mlpack/tests/serialization.hpp | 4 +-
src/mlpack/tests/serialization_test.cpp | 18 +-
src/mlpack/tests/split_data_test.cpp | 118 ++++++++
src/mlpack/tests/tree_traits_test.cpp | 6 +-
479 files changed, 2809 insertions(+), 1607 deletions(-)
diff --cc src/mlpack/tests/rectangle_tree_test.cpp
index f3c4474,56a3915..9e5b203
--- a/src/mlpack/tests/rectangle_tree_test.cpp
+++ b/src/mlpack/tests/rectangle_tree_test.cpp
@@@ -593,9 -594,8 +589,9 @@@ BOOST_AUTO_TEST_CASE(XTreeTraverserTest
TreeType xTree(dataset, 20, 6, 5, 2, 0);
// Nearest neighbor search with the X tree.
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, TreeType>
- knn1(&xTree, dataset, true);
+
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat, XTree >
- allknn1(&xTree, true);
++ knn1(&xTree, true);
BOOST_REQUIRE_EQUAL(xTree.NumDescendants(), numP);
More information about the mlpack-git
mailing list