[mlpack-svn] r16871 - in mlpack/tags/mlpack-1.0.9/src/mlpack: core/arma_extend tests

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: Sat Jul 26 11:36:57 2014
New Revision: 16871

Log:
Remove row_col_iterator because it isn't done quite yet.


Removed:
   mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
   mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
Modified:
   mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/CMakeLists.txt
   mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/arma_extend.hpp
   mlpack/tags/mlpack-1.0.9/src/mlpack/tests/arma_extend_test.cpp

Modified: mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/CMakeLists.txt
==============================================================================
--- mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/CMakeLists.txt	(original)
+++ mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/CMakeLists.txt	Sat Jul 26 11:36:57 2014
@@ -14,8 +14,6 @@
   typedef.hpp
   SpMat_extra_bones.hpp
   SpMat_extra_meat.hpp
-  Mat_extra_bones.hpp
-  Mat_extra_meat.hpp
 )
 
 # add directory name to sources

Modified: mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/arma_extend.hpp
==============================================================================
--- mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/arma_extend.hpp	(original)
+++ mlpack/tags/mlpack-1.0.9/src/mlpack/core/arma_extend/arma_extend.hpp	Sat Jul 26 11:36:57 2014
@@ -16,10 +16,6 @@
 #define ARMA_EXTRA_SPMAT_PROTO mlpack/core/arma_extend/SpMat_extra_bones.hpp
 #define ARMA_EXTRA_SPMAT_MEAT  mlpack/core/arma_extend/SpMat_extra_meat.hpp
 
-// add row_col_iterator and row_col_const_iterator for Mat
-#define ARMA_EXTRA_MAT_PROTO mlpack/core/arma_extend/Mat_extra_bones.hpp
-#define ARMA_EXTRA_MAT_MEAT mlpack/core/arma_extend/Mat_extra_meat.hpp
-
 #include <armadillo>
 
 namespace arma {

Modified: mlpack/tags/mlpack-1.0.9/src/mlpack/tests/arma_extend_test.cpp
==============================================================================
--- mlpack/tags/mlpack-1.0.9/src/mlpack/tests/arma_extend_test.cpp	(original)
+++ mlpack/tags/mlpack-1.0.9/src/mlpack/tests/arma_extend_test.cpp	Sat Jul 26 11:36:57 2014
@@ -48,46 +48,4 @@
     BOOST_REQUIRE_CLOSE(X[i], oldX[i], 1e-5); // Order should be preserved.
 }
 
-/**
- * Test const_row_col_iterator for basic functionality.
- */
-BOOST_AUTO_TEST_CASE(ConstRowColIteratorTest)
-{
-  mat X;
-  X.ones(2, 2);
-  // make sure default costructor works okay
-  mat::const_row_col_iterator it;
-  // 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++)
-  {
-    count++;
-    BOOST_REQUIRE_EQUAL(*it, 1);
-  }
-  BOOST_REQUIRE_EQUAL(count, 4);
-  // make sure it can be constructed from row_iterator
-  it = X.begin_row(0);
-}
-
-/**
- * Test row_col_iterator for basic functionality.
- */
-BOOST_AUTO_TEST_CASE(RowColIteratorTest)
-{
-  mat X;
-  X.ones(2, 2);
-  // make sure default costructor works okay
-  mat::row_col_iterator it;
-  // 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++)
-  {
-    count++;
-    BOOST_REQUIRE_EQUAL(*it, 1);
-  }
-  BOOST_REQUIRE_EQUAL(count, 4);
-  // make sure it can be constructed from row_iterator
-  it = X.begin_row(0);
-}
-
 BOOST_AUTO_TEST_SUITE_END();