[mlpack-git] master: Set the correct evaluation mode. (4a97187)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/baeb3885b27d3b7dd552c638c605e034b1388cad...4a97187bbba7ce8a6191b714949dd818ef0f37d2

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

commit 4a97187bbba7ce8a6191b714949dd818ef0f37d2
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Thu Jul 9 19:57:12 2015 +0200

    Set the correct evaluation mode.


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

4a97187bbba7ce8a6191b714949dd818ef0f37d2
 src/mlpack/methods/ann/cnn.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/methods/ann/cnn.hpp b/src/mlpack/methods/ann/cnn.hpp
index b5700d1..f4b854c 100644
--- a/src/mlpack/methods/ann/cnn.hpp
+++ b/src/mlpack/methods/ann/cnn.hpp
@@ -66,8 +66,13 @@ class CNN
                      ErrorType& error)
     {
       deterministic = false;
+      ResetActivations(network);
       seqNum++;
-      trainError += Evaluate(input, target, error);
+
+      std::get<0>(std::get<0>(network)).InputLayer().InputActivation() = input;
+
+      LayerForward(network);
+      trainError += OutputError(network, target, error);
     }
 
     /**
@@ -130,7 +135,7 @@ class CNN
                     const OutputType& target,
                     ErrorType& error)
     {
-      deterministic = false;
+      deterministic = true;
       ResetActivations(network);
 
       std::get<0>(std::get<0>(network)).InputLayer().InputActivation() = input;