[mlpack-git] master: Fix AllkNN serialization test. (075383b)

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

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/cbeb3ea17262b7c5115247dc217e316c529249b7...f85a9b22f3ce56143943a2488c05c2810d6b2bf3

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

commit 075383bd530a9cc2519ac96ad74c00d0e4091d77
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Sep 25 22:43:13 2015 +0000

    Fix AllkNN serialization test.


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

075383bd530a9cc2519ac96ad74c00d0e4091d77
 src/mlpack/tests/serialization_test.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/tests/serialization_test.cpp b/src/mlpack/tests/serialization_test.cpp
index 061e799..773b70e 100644
--- a/src/mlpack/tests/serialization_test.cpp
+++ b/src/mlpack/tests/serialization_test.cpp
@@ -307,6 +307,33 @@ void CheckMatrices(const mat& x,
   }
 }
 
+void CheckMatrices(const Mat<size_t>& x,
+                   const Mat<size_t>& xmlX,
+                   const Mat<size_t>& textX,
+                   const Mat<size_t>& binaryX)
+{
+  // First check dimensions.
+  BOOST_REQUIRE_EQUAL(x.n_rows, xmlX.n_rows);
+  BOOST_REQUIRE_EQUAL(x.n_rows, textX.n_rows);
+  BOOST_REQUIRE_EQUAL(x.n_rows, binaryX.n_rows);
+
+  BOOST_REQUIRE_EQUAL(x.n_cols, xmlX.n_cols);
+  BOOST_REQUIRE_EQUAL(x.n_cols, textX.n_cols);
+  BOOST_REQUIRE_EQUAL(x.n_cols, binaryX.n_cols);
+
+  BOOST_REQUIRE_EQUAL(x.n_elem, xmlX.n_elem);
+  BOOST_REQUIRE_EQUAL(x.n_elem, textX.n_elem);
+  BOOST_REQUIRE_EQUAL(x.n_elem, binaryX.n_elem);
+
+  // Now check elements.
+  for (size_t i = 0; i < x.n_elem; ++i)
+  {
+    BOOST_REQUIRE_EQUAL(x[i], xmlX[i]);
+    BOOST_REQUIRE_EQUAL(x[i], textX[i]);
+    BOOST_REQUIRE_EQUAL(x[i], binaryX[i]);
+  }
+}
+
 // Now, test mlpack objects.
 BOOST_AUTO_TEST_CASE(DiscreteDistributionTest)
 {
@@ -750,7 +777,7 @@ BOOST_AUTO_TEST_CASE(AllkNNTest)
 {
   using neighbor::AllkNN;
   arma::mat dataset = arma::randu<arma::mat>(5, 2000);
-/*
+
   AllkNN allknn(dataset, false, false);
 
   AllkNN knnXml, knnText, knnBinary;
@@ -770,7 +797,6 @@ BOOST_AUTO_TEST_CASE(AllkNNTest)
 
   CheckMatrices(distances, xmlDistances, textDistances, binaryDistances);
   CheckMatrices(neighbors, xmlNeighbors, textNeighbors, binaryNeighbors);
-*/
 }
 
 BOOST_AUTO_TEST_SUITE_END();