[mlpack-svn] r11684 - in mlpack/trunk/src/mlpack/methods: . sparse_coding

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

Author: niche
Date: 2012-03-01 11:58:44 -0500 (Thu, 01 Mar 2012)
New Revision: 11684

Modified:
   mlpack/trunk/src/mlpack/methods/CMakeLists.txt
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
Log:
added local_coordinate_coding to CMakeLists.txt

Modified: mlpack/trunk/src/mlpack/methods/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/CMakeLists.txt	2012-03-01 16:58:10 UTC (rev 11683)
+++ mlpack/trunk/src/mlpack/methods/CMakeLists.txt	2012-03-01 16:58:44 UTC (rev 11684)
@@ -9,6 +9,7 @@
   kmeans
   lars
   linear_regression
+  local_coordinate_coding
   mvu
   naive_bayes
   nca

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp	2012-03-01 16:58:10 UTC (rev 11683)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp	2012-03-01 16:58:44 UTC (rev 11684)
@@ -4,8 +4,6 @@
  *
  * Definition of the SparseCoding class, which performs l1 (LASSO) or 
  * l1+l2 (Elastic Net)-regularized sparse coding with dictionary learning
- *
- *  @bug Could be lots, let's see!
  */
 
 #ifndef __MLPACK_METHODS_SPARSE_CODING_SPARSE_CODING_HPP

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-03-01 16:58:10 UTC (rev 11683)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-03-01 16:58:44 UTC (rev 11684)
@@ -1,14 +1,15 @@
-/** @file mnist_sc
+/** @file sparse_coding_main.cpp
  *  @author Nishant Mehta
  *
- *  Executable for Sparse Coding on MNIST
+ *  Executable for Sparse Coding
  */
 
 #include <mlpack/core.hpp>
 #include "sparse_coding.hpp"
 
+PROGRAM_INFO("Sparse Coding", "An implementation of l1-norm and l1+l2-norm "
+	     "regularized Sparse Coding with Dictionary Learning");
 
-
 PARAM_DOUBLE_REQ("lambda1", "sparse coding l1-norm regularization parameter.", "l");
 PARAM_DOUBLE("lambda2", "sparse coding l2-norm regularization parameter.", "", 0);
 
@@ -70,7 +71,7 @@
     if(matInitialD.n_cols != nAtoms) {
       Log::Fatal << "The specified initial dictionary to load has " 
 		 << matInitialD.n_cols << " atoms, but the learned dictionary "
-		 << "was specified to have " << matInitialD.n_cols << " atoms!\n";
+		 << "was specified to have " << nAtoms << " atoms!\n";
       return EXIT_FAILURE;
     }
     if(matInitialD.n_rows != matX.n_rows) {