aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/submatrices.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-01-27 11:42:04 -0500
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2010-01-27 11:42:04 -0500
commit828d058b4b340a467da7f7bea6bb29522a6565f9 (patch)
treed1ba7df441ddc1f7365bbfad637fa0616abc8710 /test/submatrices.cpp
parentdcbf104bccec39e955ab84c76bf1d96beaa31aa1 (diff)
EIGEN_ENUM_MIN ---> EIGEN_SIZE_MIN
Diffstat (limited to 'test/submatrices.cpp')
-rw-r--r--test/submatrices.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/submatrices.cpp b/test/submatrices.cpp
index 9cd6f3fab..d53fd4b6f 100644
--- a/test/submatrices.cpp
+++ b/test/submatrices.cpp
@@ -60,6 +60,7 @@ template<typename MatrixType> void submatrices(const MatrixType& m)
typedef typename MatrixType::RealScalar RealScalar;
typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
typedef Matrix<Scalar, 1, MatrixType::ColsAtCompileTime> RowVectorType;
+ typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> SquareMatrixType;
int rows = m.rows();
int cols = m.cols();
@@ -67,11 +68,9 @@ template<typename MatrixType> void submatrices(const MatrixType& m)
m2 = MatrixType::Random(rows, cols),
m3(rows, cols),
mzero = MatrixType::Zero(rows, cols),
- ones = MatrixType::Ones(rows, cols),
- identity = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
- ::Identity(rows, rows),
- square = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
- ::Random(rows, rows);
+ ones = MatrixType::Ones(rows, cols);
+ SquareMatrixType identity = SquareMatrixType::Identity(rows, rows),
+ square = SquareMatrixType::Random(rows, rows);
VectorType v1 = VectorType::Random(rows),
v2 = VectorType::Random(rows),
v3 = VectorType::Random(rows),
@@ -222,6 +221,8 @@ void test_submatrices()
CALL_SUBTEST_5( submatrices(MatrixXcd(20, 20)) );
CALL_SUBTEST_6( submatrices(MatrixXf(20, 20)) );
+ CALL_SUBTEST_8( submatrices(Matrix<float,Dynamic,4>(3, 4)) );
+
CALL_SUBTEST_6( data_and_stride(MatrixXf(ei_random(5,50), ei_random(5,50))) );
CALL_SUBTEST_7( data_and_stride(Matrix<int,Dynamic,Dynamic,RowMajor>(ei_random(5,50), ei_random(5,50))) );
}