[mlpack-git] master: Use MaxPooling as default pooling rule. (b421424)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/6e98f6d5e61ac0ca861f0a7c3ec966076eccc50e...7de290f191972dd41856b647249e2d24d2bf029d

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

commit b4214245128a9ef8bafbf58525f80e52a80e2988
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Thu Jun 18 10:38:46 2015 +0200

    Use MaxPooling as default pooling rule.


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

b4214245128a9ef8bafbf58525f80e52a80e2988
 src/mlpack/methods/ann/connections/pooling_connection.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/methods/ann/connections/pooling_connection.hpp b/src/mlpack/methods/ann/connections/pooling_connection.hpp
index d12d603..5f5f3d2 100644
--- a/src/mlpack/methods/ann/connections/pooling_connection.hpp
+++ b/src/mlpack/methods/ann/connections/pooling_connection.hpp
@@ -12,7 +12,7 @@
 #include <mlpack/core.hpp>
 #include <mlpack/methods/ann/optimizer/steepest_descent.hpp>
 #include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
-#include <mlpack/methods/ann/pooling_rules/mean_pooling.hpp>
+#include <mlpack/methods/ann/pooling_rules/max_pooling.hpp>
 #include <mlpack/methods/ann/connections/connection_traits.hpp>
 
 namespace mlpack{
@@ -32,7 +32,7 @@ namespace ann /** Artificial Neural Network. */ {
 template<
     typename InputLayerType,
     typename OutputLayerType,
-    typename PoolingRule = MeanPooling,
+    typename PoolingRule = MaxPooling,
     template<typename, typename> class OptimizerType = mlpack::ann::RMSPROP,
     typename DataType = arma::cube
 >