[mlpack-git] master, mlpack-1.0.x: Adapt SortPolicyTest for new API. (d544deb)

[gitdub at big.cc.gt.atl.ga.us]

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

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

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

commit d544deb8453c0b234068d452f30db904d2b4eed6
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Feb 6 20:45:04 2014 +0000

    Adapt SortPolicyTest for new API.


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

d544deb8453c0b234068d452f30db904d2b4eed6
 src/mlpack/tests/sort_policy_test.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/mlpack/tests/sort_policy_test.cpp b/src/mlpack/tests/sort_policy_test.cpp
index 39277c7..be1b02a 100644
--- a/src/mlpack/tests/sort_policy_test.cpp
+++ b/src/mlpack/tests/sort_policy_test.cpp
@@ -62,9 +62,11 @@ BOOST_AUTO_TEST_CASE(NnsSortDistanceAllDblMax)
 {
   arma::vec list(5);
   list.fill(DBL_MAX);
+  arma::Col<size_t> indices(5);
+  indices.fill(0);
 
   // Should be inserted at the head of the list.
-  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, 5.0) == 0);
+  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, indices, 5.0) == 0);
 }
 
 /**
@@ -77,12 +79,14 @@ BOOST_AUTO_TEST_CASE(NnsSortDistance2)
   list[0] = 0.66;
   list[1] = 0.89;
   list[2] = 1.14;
+  arma::Col<size_t> indices(3);
+  indices.fill(0);
 
   // Run a couple possibilities through.
-  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, 0.61) == 0);
-  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, 0.76) == 1);
-  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, 0.99) == 2);
-  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, 1.22) ==
+  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, indices, 0.61) == 0);
+  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, indices, 0.76) == 1);
+  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, indices, 0.99) == 2);
+  BOOST_REQUIRE(NearestNeighborSort::SortDistance(list, indices, 1.22) ==
       (size_t() - 1));
 }
 
@@ -220,9 +224,11 @@ BOOST_AUTO_TEST_CASE(FnsSortDistanceAllZero)
 {
   arma::vec list(5);
   list.fill(0);
+  arma::Col<size_t> indices(5);
+  indices.fill(0);
 
   // Should be inserted at the head of the list.
-  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, 5.0) == 0);
+  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, indices, 5.0) == 0);
 }
 
 /**
@@ -235,12 +241,14 @@ BOOST_AUTO_TEST_CASE(FnsSortDistance2)
   list[0] = 1.14;
   list[1] = 0.89;
   list[2] = 0.66;
+  arma::Col<size_t> indices(3);
+  indices.fill(0);
 
   // Run a couple possibilities through.
-  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, 1.22) == 0);
-  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, 0.93) == 1);
-  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, 0.68) == 2);
-  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, 0.62) ==
+  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, indices, 1.22) == 0);
+  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, indices, 0.93) == 1);
+  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, indices, 0.68) == 2);
+  BOOST_REQUIRE(FurthestNeighborSort::SortDistance(list, indices, 0.62) ==
       (size_t() - 1));
 }