[mlpack-svn] r13056 - mlpack/trunk/src/mlpack/methods/sparse_coding

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

Author: rcurtin
Date: 2012-06-13 17:47:04 -0400 (Wed, 13 Jun 2012)
New Revision: 13056

Modified:
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
Log:
Rename DoSparseCoding() to more flowing Encode().


Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp	2012-06-13 21:46:45 UTC (rev 13055)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.hpp	2012-06-13 21:47:04 UTC (rev 13056)
@@ -123,7 +123,7 @@
    * @param maxIterations Maximum number of iterations to run algorithm.  If 0,
    *     the algorithm will run until convergence (or forever).
    */
-  void DoSparseCoding(const size_t maxIterations = 0);
+  void Encode(const size_t maxIterations = 0);
 
   /**
    * Sparse code each point via LARS.
@@ -152,8 +152,6 @@
 
   //! Access the data.
   const arma::mat& Data() const { return data; }
-  //! Modify the data.
-  arma::mat& Data() { return data; }
 
   //! Access the dictionary.
   const arma::mat& Dictionary() const { return dictionary; }

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	2012-06-13 21:46:45 UTC (rev 13055)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_impl.hpp	2012-06-13 21:47:04 UTC (rev 13056)
@@ -34,8 +34,7 @@
 }
 
 template<typename DictionaryInitializer>
-void SparseCoding<DictionaryInitializer>::DoSparseCoding(
-    const size_t maxIterations)
+void SparseCoding<DictionaryInitializer>::Encode(const size_t maxIterations)
 {
   double lastObjVal = DBL_MAX;
 
@@ -302,6 +301,7 @@
   dictionary = dictionaryEstimate;
 }
 
+// Project each atom of the dictionary onto the unit ball.
 template<typename DictionaryInitializer>
 void SparseCoding<DictionaryInitializer>::ProjectDictionary()
 {

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-06-13 21:46:45 UTC (rev 13055)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding_main.cpp	2012-06-13 21:47:04 UTC (rev 13056)
@@ -88,7 +88,7 @@
   }
 
   Timer::Start("sparse_coding");
-  sc.DoSparseCoding(nIterations);
+  sc.Encode(nIterations);
   Timer::Stop("sparse_coding");
 
   mat learnedD = sc.Dictionary();