[mlpack-git] master: Fix bug in test by initializing leafSize. (9576004)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Dec 9 14:37:26 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cec4ac427536cbd9738a33e0c6facabeeadd31b0...4a39d474593067343b4972d4a5217bcfae84ca5d

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

commit 957600471a014e8a56dcb8b48ed9d3f4228ba23f
Author: ryan <ryan at ratml.org>
Date:   Wed Dec 9 14:36:46 2015 -0500

    Fix bug in test by initializing leafSize.


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

957600471a014e8a56dcb8b48ed9d3f4228ba23f
 src/mlpack/methods/rann/ra_model_impl.hpp | 1 +
 src/mlpack/tests/allkrann_search_test.cpp | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mlpack/methods/rann/ra_model_impl.hpp b/src/mlpack/methods/rann/ra_model_impl.hpp
index 56d2156..61fe067 100644
--- a/src/mlpack/methods/rann/ra_model_impl.hpp
+++ b/src/mlpack/methods/rann/ra_model_impl.hpp
@@ -17,6 +17,7 @@ template<typename SortPolicy>
 RAModel<SortPolicy>::RAModel(const int treeType, const bool randomBasis) :
     treeType(treeType),
     randomBasis(randomBasis),
+    leafSize(20),
     kdTreeRA(NULL),
     coverTreeRA(NULL),
     rTreeRA(NULL),
diff --git a/src/mlpack/tests/allkrann_search_test.cpp b/src/mlpack/tests/allkrann_search_test.cpp
index ccd3bf1..b3c36ea 100644
--- a/src/mlpack/tests/allkrann_search_test.cpp
+++ b/src/mlpack/tests/allkrann_search_test.cpp
@@ -625,7 +625,6 @@ BOOST_AUTO_TEST_CASE(RAModelTest)
   data::Load("rann_test_q_3_100.csv", queryData, true);
 
   // Build all the possible models.
-  std::cout << "build models\n";
   KNNModel models[8];
   models[0] = KNNModel(KNNModel::TreeTypes::KD_TREE, true);
   models[1] = KNNModel(KNNModel::TreeTypes::KD_TREE, false);
@@ -639,12 +638,11 @@ BOOST_AUTO_TEST_CASE(RAModelTest)
   arma::Mat<size_t> qrRanks;
   data::Load("rann_test_qr_ranks.csv", qrRanks, true, false); // No transpose.
 
-  for (size_t j = 2; j + 1 > 0; --j)
+  for (size_t j = 0; j < 2; ++j)
   {
-    for (size_t i = 7; i + 1 > 0; --i)
+    for (size_t i = 0; i < 8; ++i)
     {
       // We only have std::move() constructors so make a copy of our data.
-      std::cout << "build model " << i << " " << j << ".\n";
       arma::mat referenceCopy(referenceData);
       if (j == 0)
         models[i].BuildModel(std::move(referenceCopy), 20, false, false);
@@ -652,7 +650,6 @@ BOOST_AUTO_TEST_CASE(RAModelTest)
         models[i].BuildModel(std::move(referenceCopy), 20, false, true);
       if (j == 2)
         models[i].BuildModel(std::move(referenceCopy), 20, true, false);
-      std::cout << "built\n";
 
       // Set the search parameters.
       models[i].Tau() = 1.0;



More information about the mlpack-git mailing list