[mlpack-git] master: Merge branch 'master' into serialize (4972219)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Fri Jul 10 19:00:10 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4a97187bbba7ce8a6191b714949dd818ef0f37d2...e5905e62c15d1bcff21e6359b11efcd7ab6d7ca0

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

commit 4972219dd17b78aae8be1a56c40a71a0d6df3782
Merge: 8998cd7 57d0567
Author: ryan <ryan at ratml.org>
Date:   Wed Apr 22 16:56:43 2015 -0400

    Merge branch 'master' into serialize


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

4972219dd17b78aae8be1a56c40a71a0d6df3782
 CMake/CreateArmaConfigInfo.cmake                   |  67 ++--
 CMakeLists.txt                                     |  56 +--
 HISTORY.md                                         |   3 +
 doc/guide/iodoc.hpp                                |   9 +-
 src/mlpack/core/data/load.hpp                      |  11 +-
 src/mlpack/core/data/save.hpp                      |  10 +-
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |   6 +-
 .../tree/rectangle_tree/rectangle_tree_impl.hpp    |   2 +-
 src/mlpack/core/tree/rectangle_tree/traits.hpp     |   8 +-
 src/mlpack/core/util/cli.hpp                       |  24 +-
 src/mlpack/core/util/log.cpp                       |   2 +-
 src/mlpack/core/util/prefixedoutstream.hpp         |  18 +-
 src/mlpack/core/util/prefixedoutstream_impl.hpp    |  12 +-
 .../methods/ann/convolution_rules/border_modes.hpp |  28 ++
 .../ann/convolution_rules/fft_convolution.hpp      | 154 ++++++++
 .../ann/convolution_rules/naive_convolution.hpp    | 128 +++++++
 .../ann/convolution_rules/svd_convolution.hpp      | 137 +++++++
 src/mlpack/methods/cf/cf_impl.hpp                  |   4 +-
 .../methods/kmeans/dual_tree_kmeans_impl.hpp       |   2 +-
 src/mlpack/methods/neighbor_search/allkfn_main.cpp | 216 +++++------
 src/mlpack/methods/neighbor_search/allknn_main.cpp | 229 +++++-------
 .../methods/neighbor_search/neighbor_search.hpp    | 154 +++-----
 .../neighbor_search/neighbor_search_impl.hpp       | 405 +++++++++++----------
 .../neighbor_search/neighbor_search_rules.hpp      |   6 +-
 .../neighbor_search/neighbor_search_rules_impl.hpp |   6 +-
 src/mlpack/methods/range_search/range_search.hpp   | 194 +++++-----
 .../methods/range_search/range_search_impl.hpp     | 388 +++++++++++---------
 .../methods/range_search/range_search_main.cpp     | 115 +++---
 .../methods/range_search/range_search_rules.hpp    |   8 +-
 .../range_search/range_search_rules_impl.hpp       |   6 +-
 src/mlpack/prereqs.hpp                             |   1 +
 src/mlpack/tests/allkfn_test.cpp                   | 113 +++---
 src/mlpack/tests/allknn_test.cpp                   | 121 +++---
 src/mlpack/tests/convolution_test.cpp              | 252 +++++++++++++
 src/mlpack/tests/range_search_test.cpp             | 167 ++++-----
 src/mlpack/tests/rectangle_tree_test.cpp           |  12 +-
 src/mlpack/tests/to_string_test.cpp                |   2 +-
 37 files changed, 1849 insertions(+), 1227 deletions(-)




More information about the mlpack-git mailing list