[mlpack-svn] r16972 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Tue Aug 5 11:34:21 EDT 2014
Author: rcurtin
Date: Tue Aug 5 11:34:20 2014
New Revision: 16972
Log:
Test sparse iterators, when we can.
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 Tue Aug 5 11:34:20 2014
@@ -145,4 +145,101 @@
it = X.begin_row(0);
}
+// These tests don't work when the sparse iterators hold references and not
+// pointers internally because of the lack of default constructor.
+#if ARMA_VERSION_MAJOR > 4 || \
+ (ARMA_VERSION_MAJOR == 4 && ARMA_VERSION_MINOR > 320)
+
+/**
+ * Test sparse const_row_col_iterator for basic functionality.
+ */
+BOOST_AUTO_TEST_CASE(ConstSpRowColIteratorTest)
+{
+ sp_mat X(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.
+ sp_mat::const_row_col_iterator it;
+ // Make sure ++ operator, operator* and comparison operators work fine.
+ size_t count = 1;
+ 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(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, 1);
+}
+
+/**
+ * Test sparse row_col_iterator for basic functionality.
+ */
+BOOST_AUTO_TEST_CASE(SpRowColIteratorTest)
+{
+ sp_mat X(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.
+ sp_mat::row_col_iterator it;
+ // Make sure ++ operator, operator* and comparison operators work fine.
+ size_t count = 1;
+ 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(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, 1);
+}
+
+#endif
+
BOOST_AUTO_TEST_SUITE_END();
More information about the mlpack-svn
mailing list