[mlpack-git] master, mlpack-1.0.x: Fix constructor calls, and automatically construct a cover tree with the default RASearch constructor. (bde2477)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:51:29 EST 2015


Repository : https://github.com/mlpack/mlpack

On branches: master,mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit bde24771bb5e08e9f0b690c51903e745127797bc
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Jul 7 13:10:44 2014 +0000

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


>---------------------------------------------------------------

bde24771bb5e08e9f0b690c51903e745127797bc
 src/mlpack/tests/allkrann_search_test.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/tests/allkrann_search_test.cpp b/src/mlpack/tests/allkrann_search_test.cpp
index 67eb8eb..76da72b 100644
--- a/src/mlpack/tests/allkrann_search_test.cpp
+++ b/src/mlpack/tests/allkrann_search_test.cpp
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(SingleTreeSearch)
   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 @@ BOOST_AUTO_TEST_CASE(SingleTreeSearch)
 
   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 @@ BOOST_AUTO_TEST_CASE(DualTreeSearch)
   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 @@ BOOST_AUTO_TEST_CASE(SingleCoverTreeTest)
   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;



More information about the mlpack-git mailing list