[mlpack-git] master: Merge changes to mlpack-1.0.11 tag. (9884d5f)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

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

commit 9884d5f4f0eb0ebb5457bcc6f2622667d89bad32
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Dec 11 14:03:30 2014 +0000

    Merge changes to mlpack-1.0.11 tag.


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

9884d5f4f0eb0ebb5457bcc6f2622667d89bad32
 src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp | 2 +-
 src/mlpack/tests/cosine_tree_test.cpp                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp b/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
index 82179f6..a306c13 100644
--- a/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
+++ b/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
@@ -207,7 +207,7 @@ double SparseCoding<DictionaryInitializer>::OptimizeDictionary(
     codesZT = matActiveZ * trans(matActiveZ);
   }
 
-  double normGradient;
+  double normGradient = 0;
   double improvement = 0;
   for (size_t t = 1; (t != maxIterations) && !converged; ++t)
   {
diff --git a/src/mlpack/tests/cosine_tree_test.cpp b/src/mlpack/tests/cosine_tree_test.cpp
index 2f44d7d..eed5c3e 100644
--- a/src/mlpack/tests/cosine_tree_test.cpp
+++ b/src/mlpack/tests/cosine_tree_test.cpp
@@ -105,8 +105,8 @@ BOOST_AUTO_TEST_CASE(CosineNodeCosineSplit)
 
       // Check if the columns assigned to the children agree with the splitting
       // condition.
-      double cosineMax = arma::max(cosines % (cosines < 1));
-      double cosineMin = arma::min(cosines);
+//      double cosineMax = arma::max(cosines % (cosines < 1));
+//      double cosineMin = arma::min(cosines);
 
       for (i = 0; i < leftIndices.size(); i++)
         BOOST_CHECK_LT(cosineMax - cosines(i), cosines(i) - cosineMin);