From 8f1081f7b36d18dfe48b83bbe024479335fa47f1 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Sat, 9 Jun 2012 21:57:21 +0000 Subject: [PATCH] Changes to DoLARS() propagating to here. --- src/mlpack/methods/local_coordinate_coding/lcc.cpp | 3 +-- src/mlpack/methods/sparse_coding/sparse_coding.cpp | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mlpack/methods/local_coordinate_coding/lcc.cpp b/src/mlpack/methods/local_coordinate_coding/lcc.cpp index 5c6ac7ea73..cf4db243db 100644 --- a/src/mlpack/methods/local_coordinate_coding/lcc.cpp +++ b/src/mlpack/methods/local_coordinate_coding/lcc.cpp @@ -154,9 +154,8 @@ void LocalCoordinateCoding::OptimizeCode() { 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; } } diff --git a/src/mlpack/methods/sparse_coding/sparse_coding.cpp b/src/mlpack/methods/sparse_coding/sparse_coding.cpp index 78a74dee3b..3fbb1b4afb 100644 --- a/src/mlpack/methods/sparse_coding/sparse_coding.cpp +++ b/src/mlpack/methods/sparse_coding/sparse_coding.cpp @@ -125,10 +125,9 @@ void SparseCoding::OptimizeCode() 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; } }