[mlpack] 145/149: Merge changes to mlpack-1.0.11 tag.

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit 2562c77ab79353e46d0b61378adb48b33bf32cbb
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Thu Dec 11 14:03:30 2014 +0000

    Merge changes to mlpack-1.0.11 tag.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17498 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git