[mlpack-git] master: Merge branch 'master' of https://github.com/mlpack/mlpack (1058c4c)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/672786f499b8cc48ab1722de4544c1dc03af988a...7467dd42adfc64b8c7e4107f361c3245728e99e5

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

commit 1058c4c693d384fa5a77baa97e9c352cf2442589
Merge: b0f81c8 f535c29
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Dec 13 22:56:04 2015 -0500

    Merge branch 'master' of https://github.com/mlpack/mlpack


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

1058c4c693d384fa5a77baa97e9c352cf2442589
 CMake/FindArmadillo.cmake                          |   4 +-
 src/mlpack/core/data/normalize_labels.hpp          |  10 +-
 src/mlpack/core/data/normalize_labels_impl.hpp     |  10 +-
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    |  20 +-
 src/mlpack/methods/adaboost/adaboost.hpp           |   4 +-
 src/mlpack/methods/adaboost/adaboost_impl.hpp      |  20 +-
 src/mlpack/methods/adaboost/adaboost_main.cpp      | 425 ++++++++++++++++-----
 .../methods/decision_stump/decision_stump.hpp      |   2 +-
 .../methods/decision_stump/decision_stump_main.cpp |  15 +-
 .../naive_bayes/naive_bayes_classifier_impl.hpp    |   6 +-
 src/mlpack/methods/naive_bayes/nbc_main.cpp        |  32 +-
 src/mlpack/methods/nca/nca_main.cpp                |  15 +-
 src/mlpack/methods/perceptron/perceptron_main.cpp  |  48 +--
 src/mlpack/methods/rann/allkrann_main.cpp          | 313 ++++++++-------
 src/mlpack/methods/rann/ra_model_impl.hpp          |   9 +
 src/mlpack/methods/sparse_coding/sparse_coding.cpp |   2 +-
 src/mlpack/methods/sparse_coding/sparse_coding.hpp |  48 ++-
 .../methods/sparse_coding/sparse_coding_impl.hpp   |  16 +-
 .../methods/sparse_coding/sparse_coding_main.cpp   | 240 ++++++++----
 src/mlpack/tests/adaboost_test.cpp                 |  20 +-
 src/mlpack/tests/allkrann_search_test.cpp          |   7 +-
 src/mlpack/tests/load_save_test.cpp                |  12 +-
 src/mlpack/tests/sparse_coding_test.cpp            |  58 ++-
 23 files changed, 904 insertions(+), 432 deletions(-)

diff --cc src/mlpack/methods/rann/ra_model_impl.hpp
index 56d2156,390de09..d7a27cb
--- a/src/mlpack/methods/rann/ra_model_impl.hpp
+++ b/src/mlpack/methods/rann/ra_model_impl.hpp
@@@ -452,6 -453,7 +453,10 @@@ void RAModel<SortPolicy>::Search(arma::
      Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
    else
      Log::Info << "brute-force (naive) rank-approximate search...";
++<<<<<<< HEAD
++=======
+   Log::Info << std::endl;
++>>>>>>> f535c29999c3d57b06664cceb871b5c937666586
  
    switch (treeType)
    {
@@@ -513,6 -515,7 +518,10 @@@ void RAModel<SortPolicy>::Search(const 
      Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
    else
      Log::Info << "brute-force (naive) rank-approximate search...";
++<<<<<<< HEAD
++=======
+   Log::Info << std::endl;
++>>>>>>> f535c29999c3d57b06664cceb871b5c937666586
  
    switch (treeType)
    {