[mlpack-svn] r10819 - mlpack/trunk/src/mlpack/tests

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

Author: rcurtin
Date: 2011-12-14 18:56:37 -0500 (Wed, 14 Dec 2011)
New Revision: 10819

Modified:
   mlpack/trunk/src/mlpack/tests/lars_test.cpp
Log:
Update LARS test.


Modified: mlpack/trunk/src/mlpack/tests/lars_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lars_test.cpp	2011-12-14 23:54:40 UTC (rev 10818)
+++ mlpack/trunk/src/mlpack/tests/lars_test.cpp	2011-12-14 23:56:37 UTC (rev 10819)
@@ -6,13 +6,14 @@
 
 // Note: We don't use BOOST_REQUIRE_CLOSE in the code below because we need
 // to use FPC_WEAK, and it's not at all intuitive how to do that.
-
-
 #include <armadillo>
 #include <mlpack/methods/lars/lars.hpp>
 
 #include <boost/test/unit_test.hpp>
 
+using namespace mlpack;
+using namespace mlpack::regression;
+
 BOOST_AUTO_TEST_SUITE(LARS_Test);
 
 void GenerateProblem(arma::mat& X, arma::vec& y, size_t nPoints, size_t nDims) {
@@ -45,10 +46,10 @@
 void LassoTest(size_t nPoints, size_t nDims, bool elasticNet, bool useCholesky) {
   arma::mat X;
   arma::vec y;
-  
+
   for(size_t i = 0; i < 100; i++) {
     GenerateProblem(X, y, nPoints, nDims);
-    
+
     // Armadillo's median is broken, so...
     arma::vec sortedAbsCorr = sort(abs(trans(X) * y));
     double lambda_1 = sortedAbsCorr(nDims/2);
@@ -59,14 +60,14 @@
     else {
       lambda_2 = 0;
     }
-    
-    mlpack::lars::LARS lars(useCholesky, lambda_1, lambda_2);
+
+    LARS lars(useCholesky, lambda_1, lambda_2);
     lars.DoLARS(X, y);
-    
+
     arma::vec betaOpt;
     lars.Solution(betaOpt);
     arma::vec errCorr = (arma::trans(X) * X + lambda_2 * arma::eye(nDims, nDims)) * betaOpt - arma::trans(X) * y;
-    
+
     VerifyCorrectness(betaOpt, errCorr, lambda_1);
   }
 }