[mlpack-svn] r12981 - in mlpack/trunk/src/mlpack/methods: local_coordinate_coding sparse_coding

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Sat Jun 9 12:14:22 EDT 2012


Author: rcurtin
Date: 2012-06-09 12:14:21 -0400 (Sat, 09 Jun 2012)
New Revision: 12981

Modified:
   mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp
Log:
Adapt for new LARS DoLARS() API.


Modified: mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp	2012-06-09 16:13:09 UTC (rev 12980)
+++ mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp	2012-06-09 16:14:21 UTC (rev 12981)
@@ -154,7 +154,7 @@
     bool useCholesky = false;
     LARS lars(useCholesky, matDPrimeTDPrime, 0.5 * lambda);
 
-    lars.DoLARS(matDPrime, matX.unsafe_col(i));
+    lars.DoLARS(matDPrime, matX.unsafe_col(i), true);
     vec beta;
     lars.Solution(beta);
     matZ.col(i) = beta % invW;

Modified: mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp	2012-06-09 16:13:09 UTC (rev 12980)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp	2012-06-09 16:14:21 UTC (rev 12981)
@@ -29,7 +29,8 @@
 { /* Nothing left to do. */ }
 
 // Always a not good decision!
-void SparseCoding::RandomInitDictionary() {
+void SparseCoding::RandomInitDictionary()
+{
   dictionary = randn(data.n_rows, atoms);
 
   for (size_t j = 0; j < atoms; ++j)
@@ -124,7 +125,7 @@
     bool useCholesky = true;
     LARS lars(useCholesky, matGram, lambda1, lambda2);
 
-    lars.DoLARS(dictionary, data.unsafe_col(i));
+    lars.DoLARS(dictionary, data.unsafe_col(i), true);
 
     vec beta;
     lars.Solution(beta);




More information about the mlpack-svn mailing list