[mlpack-git] master: Update test APIs. (9b5c0e7)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/3d3d733ba3c41c4f51764f44185767384ab6d9c7...94d14187222231ca29e4f6419c5999c660db4f8a

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

commit 9b5c0e7ea0ec099a7a17556c0719adcc06552fd8
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Nov 1 13:50:39 2016 -0400

    Update test APIs.


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

9b5c0e7ea0ec099a7a17556c0719adcc06552fd8
 src/mlpack/tests/kfn_test.cpp     | 8 +++-----
 src/mlpack/tests/knn_test.cpp     | 8 +++-----
 src/mlpack/tests/ub_tree_test.cpp | 8 ++++----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/mlpack/tests/kfn_test.cpp b/src/mlpack/tests/kfn_test.cpp
index f0f4fa3..b106afa 100644
--- a/src/mlpack/tests/kfn_test.cpp
+++ b/src/mlpack/tests/kfn_test.cpp
@@ -56,15 +56,13 @@ BOOST_AUTO_TEST_CASE(ExhaustiveSyntheticTest)
     switch (i)
     {
       case 0: // Use the dual-tree method.
-        kfn.Naive() = false;
-        kfn.SingleMode() = false;
+        kfn.SearchMode() = DUAL_TREE_MODE;
         break;
       case 1: // Use the single-tree method.
-        kfn.Naive() = false;
-        kfn.SingleMode() = true;
+        kfn.SearchMode() = SINGLE_TREE_MODE;
         break;
       case 2: // Use the naive method.
-        kfn.Naive() = true;
+        kfn.SearchMode() = NAIVE_MODE;
         break;
     }
 
diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index 918347d..0d52aa8 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -383,15 +383,13 @@ BOOST_AUTO_TEST_CASE(ExhaustiveSyntheticTest)
     switch (i)
     {
       case 0: // Use the dual-tree method.
-        knn.Naive() = false;
-        knn.SingleMode() = false;
+        knn.SearchMode() = DUAL_TREE_MODE;
         break;
       case 1: // Use the single-tree method.
-        knn.Naive() = false;
-        knn.SingleMode() = true;
+        knn.SearchMode() = SINGLE_TREE_MODE;
         break;
       case 2: // Use the naive method.
-        knn.Naive() = true;
+        knn.SearchMode() = NAIVE_MODE;
         break;
     }
 
diff --git a/src/mlpack/tests/ub_tree_test.cpp b/src/mlpack/tests/ub_tree_test.cpp
index 426f4b0..09f5ab7 100644
--- a/src/mlpack/tests/ub_tree_test.cpp
+++ b/src/mlpack/tests/ub_tree_test.cpp
@@ -304,12 +304,12 @@ BOOST_AUTO_TEST_CASE(SingleTreeTraverserTest)
 
   // Nearest neighbor search with the UB tree.
   NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
-      UBTree> knn1(dataset, false, true);
+      UBTree> knn1(dataset, SINGLE_TREE_MODE);
 
   knn1.Search(5, neighbors1, distances1);
 
   // Nearest neighbor search the naive way.
-  KNN knn2(dataset, true, true);
+  KNN knn2(dataset, NAIVE_MODE);
 
   knn2.Search(5, neighbors2, distances2);
 
@@ -331,12 +331,12 @@ BOOST_AUTO_TEST_CASE(DualTreeTraverserTest)
 
   // Nearest neighbor search with the UB tree.
   NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
-      UBTree> knn1(dataset, false, false);
+      UBTree> knn1(dataset, DUAL_TREE_MODE);
 
   knn1.Search(5, neighbors1, distances1);
 
   // Nearest neighbor search the naive way.
-  KNN knn2(dataset, true, true);
+  KNN knn2(dataset, NAIVE_MODE);
 
   knn2.Search(5, neighbors2, distances2);