[mlpack-svn] r13949 - mlpack/trunk/src/mlpack/bindings/matlab/lars

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

Author: rcurtin
Date: 2012-11-28 18:10:05 -0500 (Wed, 28 Nov 2012)
New Revision: 13949

Removed:
   mlpack/trunk/src/mlpack/bindings/matlab/lars/Makefile
Modified:
   mlpack/trunk/src/mlpack/bindings/matlab/lars/lars.cpp
Log:
Remove unnecessary Makefile, tabs to spaces, use correct includes.


Deleted: mlpack/trunk/src/mlpack/bindings/matlab/lars/Makefile
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/lars/Makefile	2012-11-28 23:09:47 UTC (rev 13948)
+++ mlpack/trunk/src/mlpack/bindings/matlab/lars/Makefile	2012-11-28 23:10:05 UTC (rev 13949)
@@ -1,22 +0,0 @@
-lars: lars.o
-	g++ -O -pthread -shared  \
--Wl,--version-script,/opt/matlab/2010b/extern/lib/glnxa64/mexFunction.map \
--Wl,--no-undefined -o 'mex_lars.mexa64' lars.o \
--L../../build/lib -lmlpack \
--Wl,-rpath-link,/opt/matlab/2010b/bin/glnxa64 \
--L/opt/matlab/2010b/bin/glnxa64 -lmx -lmex -lmat -lm -lmwlapack \
--Wl,-rpath=/net/hu19/pmason8/mlpack/trunk/build/lib \
--L/usr/lib64 -larmadillo \
-
-lars.o:
-	g++ -c  \
--I../../build/include \
--I../../build/include/mlpack/methods/lars \
--I/usr/include/libxml2 \
--I/opt/matlab/2010b/extern/include \
--DMATLAB_MEX_FILE \
--ansi -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread \
--DMX_COMPAT_32 -O -DNDEBUG 'lars.cpp'
-
-clean:
-	rm -f *.o *.mexa64

Modified: mlpack/trunk/src/mlpack/bindings/matlab/lars/lars.cpp
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/lars/lars.cpp	2012-11-28 23:09:47 UTC (rev 13948)
+++ mlpack/trunk/src/mlpack/bindings/matlab/lars/lars.cpp	2012-11-28 23:10:05 UTC (rev 13949)
@@ -2,7 +2,7 @@
 
 #include <mlpack/core.hpp>
 
-#include "lars.hpp"
+#include <mlpack/methods/lars/lars.hpp>
 
 using namespace arma;
 using namespace std;
@@ -13,31 +13,31 @@
                  int nrhs, const mxArray *prhs[])
 {
   // argument checks
-  if (nrhs != 4) 
+  if (nrhs != 4)
   {
     mexErrMsgTxt("Expecting four inputs.");
   }
 
-  if (nlhs != 1) 
+  if (nlhs != 1)
   {
     mexErrMsgTxt("Output required.");
   }
 
-	double lambda1 = mxGetScalar(prhs[2]);
-	double lambda2 = mxGetScalar(prhs[3]);
-	bool useCholesky = (mxGetScalar(prhs[3]) == 1.0);
+  double lambda1 = mxGetScalar(prhs[2]);
+  double lambda2 = mxGetScalar(prhs[3]);
+  bool useCholesky = (mxGetScalar(prhs[3]) == 1.0);
 
-	// loading covariates
-	mat matX(mxGetM(prhs[0]), mxGetN(prhs[0]));
-	double * values = mxGetPr(prhs[0]);
-	for (int i=0, num=mxGetNumberOfElements(prhs[0]); i<num; ++i)
-		matX(i) = values[i];
+  // loading covariates
+  mat matX(mxGetM(prhs[0]), mxGetN(prhs[0]));
+  double * values = mxGetPr(prhs[0]);
+  for (int i=0, num=mxGetNumberOfElements(prhs[0]); i<num; ++i)
+    matX(i) = values[i];
 
-	// loading responses
-	mat matY(mxGetM(prhs[1]), mxGetN(prhs[1]));
-	values = mxGetPr(prhs[1]);
-	for (int i=0, num=mxGetNumberOfElements(prhs[1]); i<num; ++i)
-		matY(i) = values[i];
+  // loading responses
+  mat matY(mxGetM(prhs[1]), mxGetN(prhs[1]));
+  values = mxGetPr(prhs[1]);
+  for (int i=0, num=mxGetNumberOfElements(prhs[1]); i<num; ++i)
+    matY(i) = values[i];
 
   if (matY.n_cols > 1)
     mexErrMsgTxt("Only one column or row allowed in responses file!");
@@ -50,9 +50,9 @@
   vec beta;
   lars.Regress(matX, matY.unsafe_col(0), beta, false /* do not transpose */);
 
-	// return to matlab
-	plhs[0] = mxCreateDoubleMatrix(beta.n_elem, 1, mxREAL);
-	values = mxGetPr(plhs[0]);
-	for (int i = 0; i < beta.n_elem; ++i)
-		values[i] = beta(i);
+  // return to matlab
+  plhs[0] = mxCreateDoubleMatrix(beta.n_elem, 1, mxREAL);
+  values = mxGetPr(plhs[0]);
+  for (int i = 0; i < beta.n_elem; ++i)
+    values[i] = beta(i);
 }