[mlpack-svn] r16907 - mlpack/trunk/src/mlpack/tests

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Jul 28 15:52:39 EDT 2014


Author: rcurtin
Date: Mon Jul 28 15:52:39 2014
New Revision: 16907

Log:
More comprehensive tests.


Modified:
   mlpack/trunk/src/mlpack/tests/arma_extend_test.cpp

Modified: mlpack/trunk/src/mlpack/tests/arma_extend_test.cpp
==============================================================================
--- mlpack/trunk/src/mlpack/tests/arma_extend_test.cpp	(original)
+++ mlpack/trunk/src/mlpack/tests/arma_extend_test.cpp	Mon Jul 28 15:52:39 2014
@@ -54,17 +54,44 @@
 BOOST_AUTO_TEST_CASE(ConstRowColIteratorTest)
 {
   mat X;
-  X.ones(2, 2);
-  // make sure default costructor works okay
+  X.zeros(5, 5);
+  for (size_t i = 0; i < 5; ++i)
+    X.col(i) += i;
+
+  for (size_t i = 0; i < 5; ++i)
+    X.row(i) += 3 * i;
+
+  // Make sure default constructor works okay.
   mat::const_row_col_iterator it;
-  // make sure ++ operator, operator* and comparison operators work fine
+  // Make sure ++ operator, operator* and comparison operators work fine.
   size_t count = 0;
-  for(it = X.begin_row_col();it != X.end_row_col();it++)
+  for (it = X.begin_row_col(); it != X.end_row_col(); it++)
   {
+    // Check iterator value.
+    BOOST_REQUIRE_EQUAL(*it, (count % 5) * 3 + (count / 5));
+
+    // Check iterator position.
+    BOOST_REQUIRE_EQUAL(it.row(), count % 5);
+    BOOST_REQUIRE_EQUAL(it.col(), count / 5);
+
     count++;
-    BOOST_REQUIRE_EQUAL(*it, 1);
   }
-  BOOST_REQUIRE_EQUAL(count, 4);
+  BOOST_REQUIRE_EQUAL(count, 25);
+  it = X.end_row_col();
+  do
+  {
+    it--;
+    count--;
+
+    // Check iterator value.
+    BOOST_REQUIRE_EQUAL(*it, (count % 5) * 3 + (count / 5));
+
+    // Check iterator position.
+    BOOST_REQUIRE_EQUAL(it.row(), count % 5);
+    BOOST_REQUIRE_EQUAL(it.col(), count / 5);
+  } while (it != X.begin_row_col());
+
+  BOOST_REQUIRE_EQUAL(count, 0);
   // make sure it can be constructed from row_iterator
   it = X.begin_row(0);
 }
@@ -75,18 +102,46 @@
 BOOST_AUTO_TEST_CASE(RowColIteratorTest)
 {
   mat X;
-  X.ones(2, 2);
-  // make sure default costructor works okay
+  X.zeros(5, 5);
+  for (size_t i = 0; i < 5; ++i)
+    X.col(i) += i;
+
+  for (size_t i = 0; i < 5; ++i)
+    X.row(i) += 3 * i;
+
+  // Make sure default constructor works okay.
   mat::row_col_iterator it;
-  // make sure ++ operator, operator* and comparison operators work fine
+  // Make sure ++ operator, operator* and comparison operators work fine.
   size_t count = 0;
-  for(it = X.begin_row_col();it != X.end_row_col();it++)
+  for (it = X.begin_row_col(); it != X.end_row_col(); it++)
   {
+    // Check iterator value.
+    BOOST_REQUIRE_EQUAL(*it, (count % 5) * 3 + (count / 5));
+
+    // Check iterator position.
+    BOOST_REQUIRE_EQUAL(it.row(), count % 5);
+    BOOST_REQUIRE_EQUAL(it.col(), count / 5);
+
     count++;
-    BOOST_REQUIRE_EQUAL(*it, 1);
   }
-  BOOST_REQUIRE_EQUAL(count, 4);
-  // make sure it can be constructed from row_iterator
+  BOOST_REQUIRE_EQUAL(count, 25);
+  it = X.end_row_col();
+  do
+  {
+    it--;
+    count--;
+
+    // Check iterator value.
+    BOOST_REQUIRE_EQUAL(*it, (count % 5) * 3 + (count / 5));
+
+    // Check iterator position.
+    BOOST_REQUIRE_EQUAL(it.row(), count % 5);
+    BOOST_REQUIRE_EQUAL(it.col(), count / 5);
+  } while (it != X.begin_row_col());
+
+  BOOST_REQUIRE_EQUAL(count, 0);
+
+  // Make sure it can be constructed from row_iterator.
   it = X.begin_row(0);
 }
 



More information about the mlpack-svn mailing list