[mlpack-git] master: Update tests to use rvalue references. (16de796)
gitdub at mlpack.org
gitdub at mlpack.org
Tue Aug 23 15:58:25 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/1148f1652e139c9037eb3813550090313d089a30...a8a8a1381b529a01420de6e792a4a1e7bd58a626
>---------------------------------------------------------------
commit 16de796c110de60ee011969d0046a5e0d0ae06ce
Author: MarcosPividori <marcos.pividori at gmail.com>
Date: Fri Aug 19 16:03:58 2016 -0300
Update tests to use rvalue references.
>---------------------------------------------------------------
16de796c110de60ee011969d0046a5e0d0ae06ce
src/mlpack/tests/aknn_test.cpp | 2 +-
src/mlpack/tests/knn_test.cpp | 4 +--
src/mlpack/tests/rectangle_tree_test.cpp | 47 ++++++++++++++++----------------
3 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/src/mlpack/tests/aknn_test.cpp b/src/mlpack/tests/aknn_test.cpp
index c59d646..fcb877c 100644
--- a/src/mlpack/tests/aknn_test.cpp
+++ b/src/mlpack/tests/aknn_test.cpp
@@ -273,7 +273,7 @@ BOOST_AUTO_TEST_CASE(SingleSpillTreeTest)
referenceTree(dataset, maxDist * 1.01 /* tau parameter */);
NeighborSearch<NearestNeighborSort, EuclideanDistance, arma::mat, SPTree>
- spTreeSearch(&referenceTree, SINGLE_TREE_MODE, 0.05);
+ spTreeSearch(std::move(referenceTree), SINGLE_TREE_MODE, 0.05);
arma::Mat<size_t> neighborsSPTree;
arma::mat distancesSPTree;
diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index 3e6d50a..7939337 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -913,7 +913,7 @@ BOOST_AUTO_TEST_CASE(HybridSpillSearchTest)
// neighbor of the query points, then we can be sure that we will get an exact
// solution.
SpillKNN::Tree referenceTree(dataset, maxDist * 1.01 /* tau parameter */);
- SpillKNN spTreeSearch(&referenceTree);
+ SpillKNN spTreeSearch(std::move(referenceTree));
for (size_t mode = 0; mode < 2; mode++)
{
@@ -947,7 +947,7 @@ BOOST_AUTO_TEST_CASE(DuplicatedSpillSearchTest)
double tau = test * 0.1;
SpillKNN::Tree referenceTree(dataset, tau);
- SpillKNN spTreeSearch(&referenceTree);
+ SpillKNN spTreeSearch(std::move(referenceTree));
arma::Mat<size_t> neighborsSPTree;
arma::mat distancesSPTree;
diff --git a/src/mlpack/tests/rectangle_tree_test.cpp b/src/mlpack/tests/rectangle_tree_test.cpp
index 6745043..c3004df 100644
--- a/src/mlpack/tests/rectangle_tree_test.cpp
+++ b/src/mlpack/tests/rectangle_tree_test.cpp
@@ -414,7 +414,7 @@ BOOST_AUTO_TEST_CASE(PointDeletion)
// Single-tree search.
NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- RTree> knn1(&tree, SINGLE_TREE_MODE);
+ RTree> knn1(std::move(tree), SINGLE_TREE_MODE);
arma::Mat<size_t> neighbors1;
arma::mat distances1;
@@ -504,7 +504,7 @@ BOOST_AUTO_TEST_CASE(PointDynamicAdd)
// Nearest neighbor search with the R tree.
NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- RTree> knn1(&tree, SINGLE_TREE_MODE);
+ RTree> knn1(std::move(tree), SINGLE_TREE_MODE);
knn1.Search(5, neighbors1, distances1);
@@ -535,10 +535,6 @@ BOOST_AUTO_TEST_CASE(SingleTreeTraverserTest)
arma::mat> TreeType;
TreeType rTree(dataset, 20, 6, 5, 2, 0);
- // Nearest neighbor search with the R tree.
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- RStarTree> knn1(&rTree, SINGLE_TREE_MODE);
-
BOOST_REQUIRE_EQUAL(rTree.NumDescendants(), 1000);
CheckContainment(rTree);
@@ -546,6 +542,10 @@ BOOST_AUTO_TEST_CASE(SingleTreeTraverserTest)
CheckHierarchy(rTree);
CheckNumDescendants(rTree);
+ // Nearest neighbor search with the R tree.
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
+ RStarTree> knn1(std::move(rTree), SINGLE_TREE_MODE);
+
knn1.Search(5, neighbors1, distances1);
// Nearest neighbor search the naive way.
@@ -578,10 +578,6 @@ BOOST_AUTO_TEST_CASE(XTreeTraverserTest)
arma::mat> TreeType;
TreeType xTree(dataset, 20, 6, 5, 2, 0);
- // Nearest neighbor search with the X tree.
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- XTree> knn1(&xTree, SINGLE_TREE_MODE);
-
BOOST_REQUIRE_EQUAL(xTree.NumDescendants(), numP);
CheckContainment(xTree);
@@ -589,6 +585,10 @@ BOOST_AUTO_TEST_CASE(XTreeTraverserTest)
CheckHierarchy(xTree);
CheckNumDescendants(xTree);
+ // Nearest neighbor search with the X tree.
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
+ XTree> knn1(std::move(xTree), SINGLE_TREE_MODE);
+
knn1.Search(5, neighbors1, distances1);
// Nearest neighbor search the naive way.
@@ -619,10 +619,6 @@ BOOST_AUTO_TEST_CASE(HilbertRTreeTraverserTest)
NeighborSearchStat<NearestNeighborSort>, arma::mat> TreeType;
TreeType hilbertRTree(dataset, 20, 6, 5, 2, 0);
- // Nearest neighbor search with the Hilbert R tree.
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- HilbertRTree> knn1(&hilbertRTree, SINGLE_TREE_MODE);
-
BOOST_REQUIRE_EQUAL(hilbertRTree.NumDescendants(), numP);
CheckContainment(hilbertRTree);
@@ -630,6 +626,10 @@ BOOST_AUTO_TEST_CASE(HilbertRTreeTraverserTest)
CheckHierarchy(hilbertRTree);
CheckNumDescendants(hilbertRTree);
+ // Nearest neighbor search with the Hilbert R tree.
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
+ HilbertRTree> knn1(std::move(hilbertRTree), SINGLE_TREE_MODE);
+
knn1.Search(5, neighbors1, distances1);
// Nearest neighbor search the naive way.
@@ -1008,11 +1008,6 @@ BOOST_AUTO_TEST_CASE(RPlusTreeTraverserTest)
arma::mat > TreeType;
TreeType rPlusTree(dataset, 20, 6, 5, 2, 0);
- // Nearest neighbor search with the R+ tree.
-
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
- RPlusTree > knn1(&rPlusTree, SINGLE_TREE_MODE);
-
BOOST_REQUIRE_EQUAL(rPlusTree.NumDescendants(), numP);
CheckContainment(rPlusTree);
@@ -1021,6 +1016,10 @@ BOOST_AUTO_TEST_CASE(RPlusTreeTraverserTest)
CheckOverlap(rPlusTree);
CheckNumDescendants(rPlusTree);
+ // Nearest neighbor search with the R+ tree.
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>, arma::mat,
+ RPlusTree > knn1(std::move(rPlusTree), SINGLE_TREE_MODE);
+
knn1.Search(5, neighbors1, distances1);
// Nearest neighbor search the naive way.
@@ -1139,11 +1138,6 @@ BOOST_AUTO_TEST_CASE(RPlusPlusTreeTraverserTest)
NeighborSearchStat<NearestNeighborSort>, arma::mat > TreeType;
TreeType rPlusPlusTree(dataset, 20, 6, 5, 2, 0);
- // Nearest neighbor search with the R++ tree.
-
- NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>,
- arma::mat, RPlusPlusTree > knn1(&rPlusPlusTree, SINGLE_TREE_MODE);
-
BOOST_REQUIRE_EQUAL(rPlusPlusTree.NumDescendants(), numP);
CheckContainment(rPlusPlusTree);
@@ -1152,6 +1146,11 @@ BOOST_AUTO_TEST_CASE(RPlusPlusTreeTraverserTest)
CheckRPlusPlusTreeBound(rPlusPlusTree);
CheckNumDescendants(rPlusPlusTree);
+ // Nearest neighbor search with the R++ tree.
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>,
+ arma::mat, RPlusPlusTree > knn1(std::move(rPlusPlusTree),
+ SINGLE_TREE_MODE);
+
knn1.Search(5, neighbors1, distances1);
// Nearest neighbor search the naive way.
More information about the mlpack-git
mailing list