[mlpack-git] master: Use the naive convolution method as default. (2598e5a)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cf08dc96724f70468c8e31ced1761ed000b55b18...222a7e191f8a7925a4870ce1acbd68589899dfde

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

commit 2598e5aac2fe275951e25d874bd2638d2744c8d8
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Tue Jun 30 17:09:36 2015 +0200

    Use the naive convolution method as default.


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

2598e5aac2fe275951e25d874bd2638d2744c8d8
 src/mlpack/methods/ann/connections/conv_connection.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/ann/connections/conv_connection.hpp b/src/mlpack/methods/ann/connections/conv_connection.hpp
index 748e219..26ebd10 100644
--- a/src/mlpack/methods/ann/connections/conv_connection.hpp
+++ b/src/mlpack/methods/ann/connections/conv_connection.hpp
@@ -10,7 +10,7 @@
 #define __MLPACK_METHODS_ANN_CONNECTIONS_CONV_CONNECTION_HPP
 
 #include <mlpack/core.hpp>
-#include <mlpack/methods/ann/init_rules/random_init.hpp>
+#include <mlpack/methods/ann/init_rules/nguyen_widrow_init.hpp>
 #include <mlpack/methods/ann/optimizer/steepest_descent.hpp>
 #include <mlpack/methods/ann/convolution_rules/border_modes.hpp>
 #include <mlpack/methods/ann/convolution_rules/naive_convolution.hpp>
@@ -45,10 +45,10 @@ template<
     typename InputLayerType,
     typename OutputLayerType,
     template<typename, typename> class OptimizerType = mlpack::ann::RMSPROP,
-    class WeightInitRule = RandomInitialization,
+    class WeightInitRule = NguyenWidrowInitialization,
     typename ForwardConvolutionRule = NaiveConvolution<ValidConvolution>,
-    typename BackwardConvolutionRule = FFTConvolution<FullConvolution>,
-    typename GradientConvolutionRule = FFTConvolution<ValidConvolution>,
+    typename BackwardConvolutionRule = NaiveConvolution<FullConvolution>,
+    typename GradientConvolutionRule = NaiveConvolution<ValidConvolution>,
     typename DataType = arma::cube
 >
 class ConvConnection