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

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

Author: niche
Date: 2011-12-14 12:52:34 -0500 (Wed, 14 Dec 2011)
New Revision: 10794

Modified:
   mlpack/trunk/src/mlpack/methods/lars/lars.cpp
   mlpack/trunk/src/mlpack/methods/lars/lars.hpp
Log:
moved accessor definitions for LARS from lars.cpp to lars.hpp

Modified: mlpack/trunk/src/mlpack/methods/lars/lars.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/lars/lars.cpp	2011-12-14 17:51:22 UTC (rev 10793)
+++ mlpack/trunk/src/mlpack/methods/lars/lars.cpp	2011-12-14 17:52:34 UTC (rev 10794)
@@ -45,7 +45,6 @@
   this->matGram = matGram;
 }
 
-
 void LARS::ComputeGram(const mat& matX)
 {
   if (elasticNet)
@@ -58,26 +57,6 @@
   }
 }
 
-const std::vector<u32> LARS::ActiveSet()
-{
-  return activeSet;
-}
-
-const std::vector<vec> LARS::BetaPath()
-{
-  return betaPath;
-}
-
-const std::vector<double> LARS::LambdaPath()
-{
-  return lambdaPath;
-}
-
-const mat LARS::MatUtriCholFactor()
-{
-  return matUtriCholFactor;
-}
-
 void LARS::DoLARS(const mat& matX, const vec& y)
 {
   // compute Xty

Modified: mlpack/trunk/src/mlpack/methods/lars/lars.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/lars/lars.hpp	2011-12-14 17:51:22 UTC (rev 10793)
+++ mlpack/trunk/src/mlpack/methods/lars/lars.hpp	2011-12-14 17:52:34 UTC (rev 10794)
@@ -122,22 +122,34 @@
   /*
    * Accessor for activeSet
    */
-  const std::vector<arma::u32> ActiveSet();
+  const std::vector<arma::u32> ActiveSet()
+  {
+    return activeSet;
+  }
   
   /*
    * Accessor for betaPath
    */
-  const std::vector<arma::vec> BetaPath();
-
+  const std::vector<arma::vec> BetaPath()
+  {
+    return betaPath;
+  }
+  
   /*
    * Accessor for lambdaPath
    */
-  const std::vector<double> LambdaPath();
+  const std::vector<double> LambdaPath()
+  {
+    return lambdaPath;
+  }
   
   /* 
    * Accessor for matUtriCholFactor
    */
-  const arma::mat MatUtriCholFactor();
+  const arma::mat MatUtriCholFactor()
+  {
+    return matUtriCholFactor;
+  }
   
   /* Run LARS
    *