[mlpack-svn] r16167 - mlpack/conf/jenkins-conf/benchmark/methods/ann/src

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

Author: marcus
Date: Sun Jan 26 11:33:02 2014
New Revision: 16167

Log:
Increase k and set the correct data dimension.

Modified:
   mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp

Modified: mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp	(original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/ann/src/allknn.cpp	Sun Jan 26 11:33:02 2014
@@ -36,7 +36,7 @@
 
   int lsInt = CLI::GetParam<int>("leaf_size");
 
-  size_t k = CLI::GetParam<int>("k");
+  size_t k = CLI::GetParam<int>("k") + 1;
 
   arma::mat referenceData;
   arma::mat queryData; // So it doesn't go out of scope.
@@ -78,7 +78,7 @@
 
   ANNidxArray nnIdx = new ANNidx[k];
   ANNdistArray dists = new ANNdist[k];
-  ANNpointArray dataPts = annAllocPts(maxPts, dim);
+  ANNpointArray dataPts = annAllocPts(referenceData.n_cols, referenceData.n_rows);
 
   for (int i = 0; i < referenceData.n_cols; ++i)
   {
@@ -90,7 +90,7 @@
 
   Timer::Start("knn_time");
 
-  ANNkd_tree*  kdTree = new ANNkd_tree(dataPts, maxPts, dim, lsInt);
+  ANNkd_tree*  kdTree = new ANNkd_tree(dataPts, referenceData.n_cols, referenceData.n_rows, lsInt);
 
   arma::vec queryPoint;
   for (int i = 0; i < queryData.n_cols; ++i)