[mlpack-svn] r15146 - mlpack/trunk/src/mlpack/methods/nca

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

Author: rcurtin
Date: 2013-05-21 13:05:32 -0400 (Tue, 21 May 2013)
New Revision: 15146

Modified:
   mlpack/trunk/src/mlpack/methods/nca/nca_main.cpp
Log:
Fix for #289 (thanks Marcus)


Modified: mlpack/trunk/src/mlpack/methods/nca/nca_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/nca/nca_main.cpp	2013-05-21 16:26:11 UTC (rev 15145)
+++ mlpack/trunk/src/mlpack/methods/nca/nca_main.cpp	2013-05-21 17:05:32 UTC (rev 15146)
@@ -215,9 +215,10 @@
   }
 
   // Now create the NCA object and run the optimization.
+  arma::uvec labelsCol = labels.unsafe_col(0);
   if (optimizerType == "sgd")
   {
-    NCA<LMetric<2> > nca(data, labels.unsafe_col(0));
+    NCA<LMetric<2> > nca(data, labelsCol);
     nca.Optimizer().StepSize() = stepSize;
     nca.Optimizer().MaxIterations() = maxIterations;
     nca.Optimizer().Tolerance() = tolerance;
@@ -227,7 +228,7 @@
   }
   else if (optimizerType == "lbfgs")
   {
-    NCA<LMetric<2>, L_BFGS> nca(data, labels.unsafe_col(0));
+    NCA<LMetric<2>, L_BFGS> nca(data, labelsCol);
     nca.Optimizer().NumBasis() = numBasis;
     nca.Optimizer().MaxIterations() = maxIterations;
     nca.Optimizer().ArmijoConstant() = armijoConstant;