[mlpack-git] master: Details in spilltree and knn tests. (f989164)

gitdub at mlpack.org gitdub at mlpack.org
Tue Aug 16 20:58:03 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/0f4b25acd6aaa14294c044874ba6cc0751712baa...0a19d07bd39e6223991976474bc79671ba8aa0f0

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

commit f989164147b33ba87192c311fff19622cc59f714
Author: MarcosPividori <marcos.pividori at gmail.com>
Date:   Tue Aug 16 21:58:03 2016 -0300

    Details in spilltree and knn tests.


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

f989164147b33ba87192c311fff19622cc59f714
 src/mlpack/tests/knn_test.cpp        | 23 ++---------------------
 src/mlpack/tests/spill_tree_test.cpp | 14 +-------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index 2b50fe6..b6d6876 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -918,17 +918,7 @@ BOOST_AUTO_TEST_CASE(HybridSpillSearchTest)
 
   for (size_t mode = 0; mode < 2; mode++)
   {
-    switch (mode)
-    {
-      case 0: // Single Tree Search.
-        spTreeSearch.Naive() = false;
-        spTreeSearch.SingleMode() = true;
-        break;
-      case 1: // Dual Tree Search.
-        spTreeSearch.Naive() = false;
-        spTreeSearch.SingleMode() = false;
-        break;
-    }
+    spTreeSearch.SingleMode() = (mode == 0);
 
     arma::Mat<size_t> neighborsSPTree;
     arma::mat distancesSPTree;
@@ -952,19 +942,10 @@ BOOST_AUTO_TEST_CASE(DuplicatedSpillSearchTest)
   dataset.randu(50, 300); // 50 dimensional, 300 points.
 
   const size_t k = 15;
-  double tau = 0;
 
   for (size_t test = 0; test < 2; test++)
   {
-    switch (test)
-    {
-      case 0:
-        tau = 0;
-        break;
-      case 1:
-        tau = 0.1;
-        break;
-    }
+    double tau = test * 0.1;
 
     SpillSearch<> spTreeSearch(dataset, false, false, tau);
     arma::Mat<size_t> neighborsSPTree;
diff --git a/src/mlpack/tests/spill_tree_test.cpp b/src/mlpack/tests/spill_tree_test.cpp
index 857de82..b5a3628 100644
--- a/src/mlpack/tests/spill_tree_test.cpp
+++ b/src/mlpack/tests/spill_tree_test.cpp
@@ -116,19 +116,7 @@ void SpillTreeHyperplaneTestAux()
 
   for (size_t cases = 0; cases < 3; cases++)
   {
-    double tau;
-    switch (cases)
-    {
-      case 0:
-        tau = 0;
-        break;
-      case 1:
-        tau = 0.05;
-        break;
-      case 2:
-        tau = 0.1;
-        break;
-    }
+    double tau = cases * 0.05;
 
     // Let's check node by node, that points in the left child are considered to
     // the left by the splitting hyperplane, and the same for points in the




More information about the mlpack-git mailing list