From e52d9c83ef4e449951a45955f6a3a55e4b820b2e Mon Sep 17 00:00:00 2001 From: tekhnofiend Date: Wed, 14 Dec 2011 17:52:34 +0000 Subject: [PATCH] moved accessor definitions for LARS from lars.cpp to lars.hpp --- src/mlpack/methods/lars/lars.cpp | 21 --------------------- src/mlpack/methods/lars/lars.hpp | 22 +++++++++++++++++----- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/mlpack/methods/lars/lars.cpp b/src/mlpack/methods/lars/lars.cpp index 0b13858876..7276bf3645 100644 --- a/src/mlpack/methods/lars/lars.cpp +++ b/src/mlpack/methods/lars/lars.cpp @@ -45,7 +45,6 @@ void LARS::SetGram(const mat& matGram) { this->matGram = matGram; } - void LARS::ComputeGram(const mat& matX) { if (elasticNet) @@ -58,26 +57,6 @@ void LARS::ComputeGram(const mat& matX) } } -const std::vector LARS::ActiveSet() -{ - return activeSet; -} - -const std::vector LARS::BetaPath() -{ - return betaPath; -} - -const std::vector LARS::LambdaPath() -{ - return lambdaPath; -} - -const mat LARS::MatUtriCholFactor() -{ - return matUtriCholFactor; -} - void LARS::DoLARS(const mat& matX, const vec& y) { // compute Xty diff --git a/src/mlpack/methods/lars/lars.hpp b/src/mlpack/methods/lars/lars.hpp index 4d9d32479b..29d0574b9c 100644 --- a/src/mlpack/methods/lars/lars.hpp +++ b/src/mlpack/methods/lars/lars.hpp @@ -122,22 +122,34 @@ class LARS { /* * Accessor for activeSet */ - const std::vector ActiveSet(); + const std::vector ActiveSet() + { + return activeSet; + } /* * Accessor for betaPath */ - const std::vector BetaPath(); - + const std::vector BetaPath() + { + return betaPath; + } + /* * Accessor for lambdaPath */ - const std::vector LambdaPath(); + const std::vector LambdaPath() + { + return lambdaPath; + } /* * Accessor for matUtriCholFactor */ - const arma::mat MatUtriCholFactor(); + const arma::mat MatUtriCholFactor() + { + return matUtriCholFactor; + } /* Run LARS *