[mlpack-svn] r17498 - in mlpack/trunk/src/mlpack: methods/sparse_coding tests

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Thu Dec 11 09:03:30 2014
New Revision: 17498

Log:
Merge changes to mlpack-1.0.11 tag.


Modified:
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
   mlpack/trunk/src/mlpack/tests/cosine_tree_test.cpp

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
==============================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	(original)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	Thu Dec 11 09:03:30 2014
@@ -207,7 +207,7 @@
     codesZT = matActiveZ * trans(matActiveZ);
   }
 
-  double normGradient;
+  double normGradient = 0;
   double improvement = 0;
   for (size_t t = 1; (t != maxIterations) && !converged; ++t)
   {

Modified: mlpack/trunk/src/mlpack/tests/cosine_tree_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/cosine_tree_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/cosine_tree_test.cpp	Thu Dec 11 09:03:30 2014
@@ -105,8 +105,8 @@
 
       // 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);