[mlpack-svn] r16770 - mlpack/trunk/src/mlpack/tests

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

Author: rcurtin
Date: Mon Jul  7 09:10:44 2014
New Revision: 16770

Log:
Fix constructor calls, and automatically construct a cover tree with the default
RASearch constructor.


Modified:
   mlpack/trunk/src/mlpack/tests/allkrann_search_test.cpp

Modified: mlpack/trunk/src/mlpack/tests/allkrann_search_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/allkrann_search_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/allkrann_search_test.cpp	Mon Jul  7 09:10:44 2014
@@ -162,7 +162,7 @@
   arma::Mat<size_t> neighbors;
   arma::mat distances;
 
-  RASearch<> tssRann(refData, queryData, false, true, 5);
+  RASearch<> tssRann(refData, queryData, false, true);
 
   // The relative ranks for the given query reference pair
   arma::Mat<size_t> qrRanks;
@@ -177,7 +177,7 @@
 
   for (size_t rounds = 0; rounds < numRounds; rounds++)
   {
-    tssRann.Search(1, neighbors, distances, 1.0, 0.95, false, false, 5);
+    tssRann.Search(1, neighbors, distances, 1.0, 0.95, false, false);
 
     for (size_t i = 0; i < queryData.n_cols; i++)
       if (qrRanks(i, neighbors(0, i)) < expectedRankErrorUB)
@@ -221,7 +221,7 @@
   arma::Mat<size_t> neighbors;
   arma::mat distances;
 
-  RASearch<> tsdRann(refData, queryData, false, false, 5);
+  RASearch<> tsdRann(refData, queryData, false, false);
 
   arma::Mat<size_t> qrRanks;
   data::Load("rann_test_qr_ranks.csv", qrRanks, true, false); // No transpose.
@@ -344,8 +344,7 @@
   typedef RASearch<NearestNeighborSort, metric::EuclideanDistance, TreeType>
       RACoverTreeSearch;
 
-  TreeType refTree(refData);
-  RACoverTreeSearch tssRann(&refTree, NULL, refData, queryData, true);
+  RACoverTreeSearch tssRann(refData, queryData, true);
 
   // The relative ranks for the given query reference pair.
   arma::Mat<size_t> qrRanks;