Fri Oct 4 12:59:00 EDT 2013

Author: rcurtin
Date: Fri Oct  4 12:58:59 2013
New Revision: 15934

Log:
Merge trunk into branch (disaster is occurring).

Added:
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_bones.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/core/arma_extend/SpMat_extra_meat.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/data/normalize_labels.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/core/data/normalize_labels.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/data/normalize_labels_impl.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/core/data/normalize_labels_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/kernel_traits.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/core/kernels/kernel_traits.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cosine_tree/
      - copied from r15933, /mlpack/trunk/src/mlpack/core/tree/cosine_tree/
   mlpack/branches/mlpack-1.x/src/mlpack/methods/cf/
      - copied from r15933, /mlpack/trunk/src/mlpack/methods/cf/
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/diagonal_constraint.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/gmm/diagonal_constraint.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/eigenvalue_ratio_constraint.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/gmm/eigenvalue_ratio_constraint.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/no_constraint.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/gmm/no_constraint.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/positive_definite_constraint.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/gmm/positive_definite_constraint.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search_stat.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search_rules_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search_stat.hpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/methods/range_search/range_search_stat.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/cf_test.cpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/tests/cf_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/data/GroupLens100k.csv
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/tests/data/GroupLens100k.csv
   mlpack/branches/mlpack-1.x/src/mlpack/tests/kernel_traits_test.cpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/tests/kernel_traits_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/metric_test.cpp
      - copied unchanged from r15933, /mlpack/trunk/src/mlpack/tests/metric_test.cpp
Removed:
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/Col_extra_bones.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/Col_extra_meat.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/Row_extra_bones.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/Row_extra_meat.hpp
Modified:
   mlpack/branches/mlpack-1.x/   (props changed)
   mlpack/branches/mlpack-1.x/CMakeLists.txt   (contents, props changed)
   mlpack/branches/mlpack-1.x/COPYRIGHT.txt
   mlpack/branches/mlpack-1.x/HISTORY.txt
   mlpack/branches/mlpack-1.x/README.txt
   mlpack/branches/mlpack-1.x/doc/guide/build.hpp
   mlpack/branches/mlpack-1.x/doc/guide/timer.hpp
   mlpack/branches/mlpack-1.x/doc/tutorials/det/det.txt
   mlpack/branches/mlpack-1.x/doc/tutorials/emst/emst.txt
   mlpack/branches/mlpack-1.x/doc/tutorials/fastmks/fastmks.txt
   mlpack/branches/mlpack-1.x/doc/tutorials/linear_regression/linear_regression.txt
   mlpack/branches/mlpack-1.x/src/mlpack/core.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/core/arma_extend/arma_extend.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/data/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/cosine_distance.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/cosine_distance_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/epanechnikov_kernel.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/epanechnikov_kernel.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/epanechnikov_kernel_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/gaussian_kernel.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/laplacian_kernel.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/spherical_kernel.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/kernels/triangular_kernel.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/math/lin_alg.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/metrics/lmetric.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/metrics/lmetric_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/optimizers/lbfgs/lbfgs_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/binary_space_tree/dual_tree_traverser_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cover_tree/cover_tree.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cover_tree/cover_tree_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cover_tree/dual_tree_traverser.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cover_tree/dual_tree_traverser_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/tree/cover_tree/single_tree_traverser_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/util/cli.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/core/util/cli_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/methods/det/dt_utils.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/emst/dtb.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/emst/dtb_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/emst/dtb_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/emst/dtb_rules_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/emst/emst_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/fastmks/fastmks_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/fastmks/fastmks_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/fastmks/fastmks_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/fastmks/fastmks_rules_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/fastmks/fastmks_stat.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/em_fit.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/em_fit_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/gmm/gmm_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/hmm/hmm_train_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/kernel_pca/kernel_pca_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/kernel_pca/kernel_pca_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/kmeans/kmeans_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/kmeans/max_variance_new_cluster.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/kmeans/max_variance_new_cluster_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/lars/lars_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/linear_regression/linear_regression.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/linear_regression/linear_regression.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/linear_regression/linear_regression_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/lsh/lsh_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/mvu/mvu.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/mvu/mvu.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/mvu/mvu_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/naive_bayes/naive_bayes_classifier.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/naive_bayes/naive_bayes_classifier_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/naive_bayes/nbc_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nca/nca.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nca/nca_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nca/nca_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nca/nca_softmax_error_function.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nca/nca_softmax_error_function_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/allkfn_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/allknn_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/neighbor_search.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/neighbor_search_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/neighbor_search_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/neighbor_search_rules_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/neighbor_search/sort_policies/nearest_neighbor_sort.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/als_update_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/mult_dist_update_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/mult_div_update_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/nmf.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/nmf_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/random_acol_init.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/nmf/random_init.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/pca/pca.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/pca/pca.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/pca/pca_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/range_search/range_search_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/allkrann_main.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/ra_search.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/ra_search_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/ra_search_rules.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/ra_search_rules_impl.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/methods/rann/ra_typedef.hpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/CMakeLists.txt
   mlpack/branches/mlpack-1.x/src/mlpack/tests/allknn_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/allkrann_search_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/cli_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/emst_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/gmm_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/hmm_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/kernel_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/lbfgs_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/linear_regression_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/load_save_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/nbc_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/nca_test.cpp   (contents, props changed)
   mlpack/branches/mlpack-1.x/src/mlpack/tests/nmf_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/pca_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/range_search_test.cpp
   mlpack/branches/mlpack-1.x/src/mlpack/tests/tree_test.cpp

NOTE:  File difference information exceeds the allowed size.