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

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/3781ccbe93bb4cb886978b4c865ff9b42f5dbc56...637809fec8d341829e4cd122cf5a385e5e219c9b

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

commit 637809fec8d341829e4cd122cf5a385e5e219c9b
Merge: e0e9d04 3781ccb
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Apr 14 14:47:25 2016 -0400

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


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

637809fec8d341829e4cd122cf5a385e5e219c9b
 doc/guide/formats.hpp                              | 34 +++++++++++++---------
 doc/tutorials/tutorials.txt                        |  2 ++
 src/mlpack/methods/ann/layer/hard_tanh_layer.hpp   |  2 +-
 src/mlpack/methods/ann/layer/log_softmax_layer.hpp | 10 +++----
 .../neighbor_search/neighbor_search_rules_impl.hpp |  2 +-
 .../sort_policies/furthest_neighbor_sort.hpp       |  6 ++--
 .../sort_policies/nearest_neighbor_sort.hpp        |  6 ++--
 src/mlpack/tests/cli_test.cpp                      |  2 +-
 8 files changed, 36 insertions(+), 28 deletions(-)