[mlpack-git] master: Merge pull request #434 from HurricaneTong/latest (fbd6b1f)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/86f647ca937380cf2ea2569ba5735dcdcc659730...fbd6b1f878ec3b2fa365254a22daf3add743ee51

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

commit fbd6b1f878ec3b2fa365254a22daf3add743ee51
Merge: 86f647c 44308fa
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Sat Apr 25 13:54:32 2015 +0200

    Merge pull request #434 from HurricaneTong/latest
    
    Add 2DNeuronLayer and conv connection.


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

fbd6b1f878ec3b2fa365254a22daf3add743ee51
 .../ann/connections/cnn_conv_connection.hpp        | 159 +++++++++++++++++++++
 src/mlpack/methods/ann/layer/neuron_layer.hpp      | 158 ++++++++++++++------
 ..._classification_layer.hpp => one_hot_layer.hpp} |  43 +++---
 3 files changed, 294 insertions(+), 66 deletions(-)