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

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

Author: rcurtin
Date: 2012-06-09 17:57:21 -0400 (Sat, 09 Jun 2012)
New Revision: 12984

Modified:
   mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp
   mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp
Log:
Changes to DoLARS() propagating to here.


Modified: mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp	2012-06-09 21:57:02 UTC (rev 12983)
+++ mlpack/trunk/src/mlpack/methods/local_coordinate_coding/lcc.cpp	2012-06-09 21:57:21 UTC (rev 12984)
@@ -154,9 +154,8 @@
     bool useCholesky = false;
     LARS lars(useCholesky, matDPrimeTDPrime, 0.5 * lambda);
 
-    lars.DoLARS(matDPrime, matX.unsafe_col(i), true);
     vec beta;
-    lars.Solution(beta);
+    lars.DoLARS(matDPrime, matX.unsafe_col(i), beta, true);
     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 21:57:02 UTC (rev 12983)
+++ mlpack/trunk/src/mlpack/methods/sparse_coding/sparse_coding.cpp	2012-06-09 21:57:21 UTC (rev 12984)
@@ -125,10 +125,9 @@
     bool useCholesky = true;
     LARS lars(useCholesky, matGram, lambda1, lambda2);
 
-    lars.DoLARS(dictionary, data.unsafe_col(i), true);
-
     vec beta;
-    lars.Solution(beta);
+    lars.DoLARS(dictionary, data.unsafe_col(i), beta, true);
+
     codes.col(i) = beta;
   }
 }