diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-07-10 22:39:05 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-07-10 22:39:05 +0200 |
| commit | 3e6329a0d92a951523d1d0f5e4f4565a87a52a45 (patch) | |
| tree | abd0379f8a11bfef35a67beb19c3245efc636114 /test/diagonal.cpp | |
| parent | a2c3003be2ea297056a880b34b1d8f14c80b293d (diff) | |
fix computation of fixed size sub/super diagonal size
Diffstat (limited to 'test/diagonal.cpp')
| -rw-r--r-- | test/diagonal.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/test/diagonal.cpp b/test/diagonal.cpp index 94a30e2f4..191a91bae 100644 --- a/test/diagonal.cpp +++ b/test/diagonal.cpp @@ -51,19 +51,32 @@ template<typename MatrixType> void diagonal(const MatrixType& m) }; // check sub/super diagonal + if(m1.template diagonal<N1>().RowsAtCompileTime!=Dynamic) + { + VERIFY(m1.template diagonal<N1>().RowsAtCompileTime == m1.diagonal(N1).size()); + } + if(m1.template diagonal<N2>().RowsAtCompileTime!=Dynamic) + { + VERIFY(m1.template diagonal<N2>().RowsAtCompileTime == m1.diagonal(N2).size()); + } + m2.template diagonal<N1>() = 2 * m1.template diagonal<N1>(); + VERIFY_IS_APPROX(m2.template diagonal<N1>(), static_cast<Scalar>(2) * m1.diagonal(N1)); m2.template diagonal<N1>()[0] *= 3; VERIFY_IS_APPROX(m2.template diagonal<N1>()[0], static_cast<Scalar>(6) * m1.template diagonal<N1>()[0]); + m2.template diagonal<N2>() = 2 * m1.template diagonal<N2>(); m2.template diagonal<N2>()[0] *= 3; VERIFY_IS_APPROX(m2.template diagonal<N2>()[0], static_cast<Scalar>(6) * m1.template diagonal<N2>()[0]); m2.diagonal(N1) = 2 * m1.diagonal(N1); + VERIFY_IS_APPROX(m2.diagonal<N1>(), static_cast<Scalar>(2) * m1.diagonal(N1)); m2.diagonal(N1)[0] *= 3; VERIFY_IS_APPROX(m2.diagonal(N1)[0], static_cast<Scalar>(6) * m1.diagonal(N1)[0]); m2.diagonal(N2) = 2 * m1.diagonal(N2); + VERIFY_IS_APPROX(m2.diagonal<N2>(), static_cast<Scalar>(2) * m1.diagonal(N2)); m2.diagonal(N2)[0] *= 3; VERIFY_IS_APPROX(m2.diagonal(N2)[0], static_cast<Scalar>(6) * m1.diagonal(N2)[0]); } @@ -73,6 +86,8 @@ void test_diagonal() { for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1( diagonal(Matrix<float, 1, 1>()) ); + CALL_SUBTEST_1( diagonal(Matrix<float, 4, 9>()) ); + CALL_SUBTEST_1( diagonal(Matrix<float, 7, 3>()) ); CALL_SUBTEST_2( diagonal(Matrix4d()) ); CALL_SUBTEST_2( diagonal(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) ); CALL_SUBTEST_2( diagonal(MatrixXi(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) ); |