[mlpack-git] master: Use mean pooling as default pooling rule. (24f8733)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/91ae1062772a0f2bbca9a072769629c2d775ae64...42d61dfdbc9b0cbce59398e67ea58544b0fa1919

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

commit 24f873372b4f72b32145d23fa18730923fbc1c16
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Thu Sep 3 14:08:11 2015 +0200

    Use mean pooling as default pooling rule.


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

24f873372b4f72b32145d23fa18730923fbc1c16
 src/mlpack/methods/ann/layer/pooling_layer.hpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/mlpack/methods/ann/layer/pooling_layer.hpp b/src/mlpack/methods/ann/layer/pooling_layer.hpp
index d9bb072..7a85a83 100644
--- a/src/mlpack/methods/ann/layer/pooling_layer.hpp
+++ b/src/mlpack/methods/ann/layer/pooling_layer.hpp
@@ -9,7 +9,7 @@
 #define __MLPACK_METHODS_ANN_LAYER_POOLING_LAYER_HPP
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/ann/pooling_rules/max_pooling.hpp>
+#include <mlpack/methods/ann/pooling_rules/mean_pooling.hpp>
 #include <mlpack/methods/ann/layer/layer_traits.hpp>
 
 namespace mlpack {
@@ -26,7 +26,7 @@ namespace ann /** Artificial Neural Network. */ {
  *         arma::sp_mat or arma::cube).
  */
 template <
-    typename PoolingRule = MaxPooling,
+    typename PoolingRule = MeanPooling,
     typename InputDataType = arma::cube,
     typename OutputDataType = arma::cube
 >
@@ -102,16 +102,16 @@ class PoolingLayer
    * @param g The calculated gradient.
    */
   template<typename eT>
-  void Backward(const arma::Cube<eT>& input,
+  void Backward(const arma::Cube<eT>& /* unused */,
                 const arma::Cube<eT>& gy,
                 arma::Cube<eT>& g)
   {
-    g = arma::zeros<arma::Cube<eT> >(input.n_rows, input.n_cols,
-        input.n_slices);
+    g = arma::zeros<arma::Cube<eT> >(inputParameter.n_rows,
+        inputParameter.n_cols, inputParameter.n_slices);
 
     for (size_t s = 0; s < gy.n_slices; s++)
     {
-      Unpooling(input.slice(s), gy.slice(s), g.slice(s));
+      Unpooling(inputParameter.slice(s), gy.slice(s), g.slice(s));
     }
   }
 
@@ -125,7 +125,7 @@ class PoolingLayer
    * @param g The calculated gradient.
    */
   template<typename eT>
-  void Backward(const arma::Cube<eT>& input,
+  void Backward(const arma::Cube<eT>& /* unused */,
                 const arma::Mat<eT>& gy,
                 arma::Cube<eT>& g)
   {
@@ -146,7 +146,7 @@ class PoolingLayer
       }
     }
 
-    Backward(input, mappedError, g);
+    Backward(inputParameter, mappedError, g);
   }
 
   //! Get the input parameter.
@@ -235,7 +235,7 @@ class PoolingLayer
   PoolingRule pooling;
 }; // class PoolingLayer
 
-//! Layer traits for the linear layer.
+//! Layer traits for the pooling layer.
 template<
     typename PoolingRule,
     typename InputDataType,