[mlpack-git] master: Add convenience typedefs: ConvLayer, PoolingLayer. (a1ff4e1)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/f7c45b202a6265cc34f46f0ccc70c21cf4b51110...8fce9086d19a6cb228302f068920ce876035890c

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

commit a1ff4e1722635e355fd919f1affd82524b21dc41
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Wed May 6 22:46:13 2015 +0200

    Add convenience typedefs: ConvLayer, PoolingLayer.


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

a1ff4e1722635e355fd919f1affd82524b21dc41
 src/mlpack/methods/ann/layer/neuron_layer.hpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/mlpack/methods/ann/layer/neuron_layer.hpp b/src/mlpack/methods/ann/layer/neuron_layer.hpp
index d45567b..d603d76 100644
--- a/src/mlpack/methods/ann/layer/neuron_layer.hpp
+++ b/src/mlpack/methods/ann/layer/neuron_layer.hpp
@@ -27,6 +27,8 @@ namespace ann /** Artificial Neural Network. */ {
  *  - InputLayer
  *  - HiddenLayer
  *  - ReluLayer
+ *  - ConvLayer
+ *  - PoolingLayer
  *
  * @tparam ActivationFunction Activation function used for the embedding layer.
  * @tparam DataType Type of data (arma::colvec, arma::mat or arma::sp_mat,
@@ -211,6 +213,24 @@ template <
 >
 using ReluLayer = NeuronLayer<ActivationFunction, DataType>;
 
+/**
+ * Convolution layer using the logistic activation function.
+ */
+template <
+    class ActivationFunction = LogisticFunction,
+    typename DataType = arma::cube
+>
+using ConvLayer = NeuronLayer<ActivationFunction, DataType>;
+
+/**
+ * Pooling layer using the logistic activation function.
+ */
+template <
+    class ActivationFunction = LogisticFunction,
+    typename DataType = arma::cube
+>
+using PoolingLayer = NeuronLayer<ActivationFunction, DataType>;
+
 
 }; // namespace ann
 }; // namespace mlpack