[mlpack-svn] r13019 - mlpack/trunk/src/mlpack/methods/lars

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

Author: rcurtin
Date: 2012-06-11 14:59:42 -0400 (Mon, 11 Jun 2012)
New Revision: 13019

Modified:
   mlpack/trunk/src/mlpack/methods/lars/lars.cpp
   mlpack/trunk/src/mlpack/methods/lars/lars_main.cpp
Log:
CLI::GetParam<bool> seems to crash, and, add a timer.


Modified: mlpack/trunk/src/mlpack/methods/lars/lars.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/lars/lars.cpp	2012-06-11 18:40:29 UTC (rev 13018)
+++ mlpack/trunk/src/mlpack/methods/lars/lars.cpp	2012-06-11 18:59:42 UTC (rev 13019)
@@ -41,6 +41,8 @@
                    arma::vec& beta,
                    const bool rowMajor)
 {
+  Timer::Start("lars_regression");
+
   // This matrix may end up holding the transpose -- if necessary.
   arma::mat dataTrans;
   // dataRef is row-major.
@@ -275,6 +277,8 @@
 
   // Unfortunate copy...
   beta = betaPath.back();
+
+  Timer::Stop("lars_regression");
 }
 
 // Private functions.

Modified: mlpack/trunk/src/mlpack/methods/lars/lars_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/lars/lars_main.cpp	2012-06-11 18:40:29 UTC (rev 13018)
+++ mlpack/trunk/src/mlpack/methods/lars/lars_main.cpp	2012-06-11 18:59:42 UTC (rev 13019)
@@ -53,7 +53,7 @@
 
   double lambda1 = CLI::GetParam<double>("lambda1");
   double lambda2 = CLI::GetParam<double>("lambda2");
-  bool useCholesky = CLI::GetParam<bool>("use_cholesky");
+  bool useCholesky = CLI::HasParam("use_cholesky");
 
   // Load covariates.  We can avoid LARS transposing our data by choosing to not
   // transpose this data.