[mlpack-svn] r13951 - mlpack/trunk/src/mlpack/bindings/matlab/nca

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

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

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


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

Modified: mlpack/trunk/src/mlpack/bindings/matlab/nca/nca.cpp
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/nca/nca.cpp	2012-11-28 23:11:24 UTC (rev 13950)
+++ mlpack/trunk/src/mlpack/bindings/matlab/nca/nca.cpp	2012-11-28 23:12:21 UTC (rev 13951)
@@ -3,7 +3,7 @@
 #include <mlpack/core.hpp>
 #include <mlpack/core/metrics/lmetric.hpp>
 
-#include "nca.hpp"
+#include <mlpack/methods/nca/nca.hpp>
 
 using namespace mlpack;
 using namespace mlpack::nca;
@@ -15,31 +15,31 @@
                  int nrhs, const mxArray *prhs[])
 {
   // argument checks
-  if (nrhs != 2) 
+  if (nrhs != 2)
   {
     mexErrMsgTxt("Expecting two inputs.");
   }
 
-  if (nlhs != 1) 
+  if (nlhs != 1)
   {
     mexErrMsgTxt("Output required.");
   }
 
   // Load data.
-	mat data(mxGetM(prhs[0]), mxGetN(prhs[0]));
-	double * values = mxGetPr(prhs[0]);
-	for (int i=0, num=mxGetNumberOfElements(prhs[0]); i<num; ++i)
-		data(i) = values[i];
+  mat data(mxGetM(prhs[0]), mxGetN(prhs[0]));
+  double * values = mxGetPr(prhs[0]);
+  for (int i=0, num=mxGetNumberOfElements(prhs[0]); i<num; ++i)
+    data(i) = values[i];
 
-	// load labels
-	umat labels(mxGetNumberOfElements(prhs[1]), 1);
-	values = mxGetPr(prhs[1]);
-	for (int i=0, num=mxGetNumberOfElements(prhs[1]); i<num; ++i)
-		labels(i) = (int) values[i];
+  // load labels
+  umat labels(mxGetNumberOfElements(prhs[1]), 1);
+  values = mxGetPr(prhs[1]);
+  for (int i=0, num=mxGetNumberOfElements(prhs[1]); i<num; ++i)
+    labels(i) = (int) values[i];
 
-	// dimension checks
-	if (labels.n_elem != data.n_cols)
-		mexErrMsgTxt("Labels vector and data have unmatching dimensions.");
+  // dimension checks
+  if (labels.n_elem != data.n_cols)
+    mexErrMsgTxt("Labels vector and data have unmatching dimensions.");
 
   // Now create the NCA object and run the optimization.
   NCA<LMetric<2> > nca(data, labels.unsafe_col(0));
@@ -47,9 +47,9 @@
   mat distance;
   nca.LearnDistance(distance);
 
-	// return to matlab
-	plhs[0] = mxCreateDoubleMatrix(distance.n_rows, distance.n_cols, mxREAL);
-	values = mxGetPr(plhs[0]);
-	for (int i = 0; i < distance.n_elem; ++i)
-		values[i] = distance(i);
+  // return to matlab
+  plhs[0] = mxCreateDoubleMatrix(distance.n_rows, distance.n_cols, mxREAL);
+  values = mxGetPr(plhs[0]);
+  for (int i = 0; i < distance.n_elem; ++i)
+    values[i] = distance(i);
 }