[mlpack-svn] r13952 - mlpack/trunk/src/mlpack/bindings/matlab/pca

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

Author: rcurtin
Date: 2012-11-28 18:12:36 -0500 (Wed, 28 Nov 2012)
New Revision: 13952

Removed:
   mlpack/trunk/src/mlpack/bindings/matlab/pca/Makefile
Modified:
   mlpack/trunk/src/mlpack/bindings/matlab/pca/pca.cpp
Log:
Fix includes, remove unnecessary Makefile, tabs to spaces.


Deleted: mlpack/trunk/src/mlpack/bindings/matlab/pca/Makefile
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/pca/Makefile	2012-11-28 23:12:21 UTC (rev 13951)
+++ mlpack/trunk/src/mlpack/bindings/matlab/pca/Makefile	2012-11-28 23:12:36 UTC (rev 13952)
@@ -1,26 +0,0 @@
-pca: pca.o
-	g++ -g -pthread -shared  \
--Wl,--version-script,/opt/matlab/2010b/extern/lib/glnxa64/mexFunction.map \
--Wl,--no-undefined -o 'mex_pca.mexa64' pca.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 \
-
-
-pca.o:
-	g++ -c  \
--I../../build/include \
--I../../build/include/mlpack/methods/pca \
--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 -g 'pca.cpp'
-
-#-DMX_COMPAT_32 -O -DNDEBUG 'pca.cpp'
-
-clean:
-	rm -f *.o *.mexa64

Modified: mlpack/trunk/src/mlpack/bindings/matlab/pca/pca.cpp
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/pca/pca.cpp	2012-11-28 23:12:21 UTC (rev 13951)
+++ mlpack/trunk/src/mlpack/bindings/matlab/pca/pca.cpp	2012-11-28 23:12:36 UTC (rev 13952)
@@ -2,7 +2,7 @@
 
 #include <mlpack/core.hpp>
 
-#include "pca.hpp"
+#include <mlpack/methods/pca/pca.hpp>
 
 using namespace mlpack;
 using namespace mlpack::pca;
@@ -12,12 +12,12 @@
                  int nrhs, const mxArray *prhs[])
 {
   // argument checks
-  if (nrhs != 3) 
+  if (nrhs != 3)
   {
     mexErrMsgTxt("Expecting three inputs.");
   }
 
-  if (nlhs != 1) 
+  if (nlhs != 1)
   {
     mexErrMsgTxt("Output required.");
   }
@@ -27,36 +27,36 @@
   size_t numPoints = mxGetN(prhs[0]);
   size_t numDimensions = mxGetM(prhs[0]);
   arma::mat dataset(numDimensions, numPoints);
-  for (int i = 0, n = numPoints * numDimensions; i < n; ++i) 
+  for (int i = 0, n = numPoints * numDimensions; i < n; ++i)
     dataset(i) = mexDataPoints[i];
 
   // Find out what dimension we want.
   size_t newDimension = dataset.n_rows; // No reduction, by default.
 
-	if (mxGetScalar(prhs[1]) != 0.0)
+  if (mxGetScalar(prhs[1]) != 0.0)
   {
     // Validate the parameter.
-		newDimension = (size_t) mxGetScalar(prhs[1]);
+    newDimension = (size_t) mxGetScalar(prhs[1]);
     if (newDimension > dataset.n_rows)
     {
-			std::stringstream ss;
+      std::stringstream ss;
       ss << "New dimensionality (" << newDimension
           << ") cannot be greater than existing dimensionality ("
           << dataset.n_rows << ")!";
-			mexErrMsgTxt(ss.str().c_str());
+      mexErrMsgTxt(ss.str().c_str());
     }
   }
 
   // Get the options for running PCA.
-	const bool scale = (mxGetScalar(prhs[2]) == 1.0);
+  const bool scale = (mxGetScalar(prhs[2]) == 1.0);
 
   // Perform PCA.
   PCA p(scale);
   p.Apply(dataset, newDimension);
 
   // Now returning results to matlab
-	plhs[0] = mxCreateDoubleMatrix(dataset.n_rows, dataset.n_cols, mxREAL);
-	double * values = mxGetPr(plhs[0]);
-	for (int i = 0; i < dataset.n_rows * dataset.n_cols; ++i)
-		values[i] = dataset(i);
+  plhs[0] = mxCreateDoubleMatrix(dataset.n_rows, dataset.n_cols, mxREAL);
+  double * values = mxGetPr(plhs[0]);
+  for (int i = 0; i < dataset.n_rows * dataset.n_cols; ++i)
+    values[i] = dataset(i);
 }