diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/product.h | 5 | ||||
| -rw-r--r-- | test/product_large.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/product.h b/test/product.h index 5365a7dc6..804ce131d 100644 --- a/test/product.h +++ b/test/product.h @@ -45,7 +45,7 @@ template<typename MatrixType> void product(const MatrixType& m) typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> RowSquareMatrixType; typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, MatrixType::ColsAtCompileTime> ColSquareMatrixType; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime, - MatrixType::Flags&RowMajorBit> OtherMajorMatrixType; + MatrixType::Flags&RowMajorBit?ColMajor:RowMajor> OtherMajorMatrixType; Index rows = m.rows(); Index cols = m.cols(); @@ -152,6 +152,9 @@ template<typename MatrixType> void product(const MatrixType& m) VERIFY(areNotApprox(res2,square2 + m2.transpose() * m1)); } + VERIFY_IS_APPROX(res.col(r).noalias() = square.adjoint() * square.col(r), (square.adjoint() * square.col(r)).eval()); + VERIFY_IS_APPROX(res.col(r).noalias() = square * square.col(r), (square * square.col(r)).eval()); + // inner product Scalar x = square2.row(c) * square2.col(c2); VERIFY_IS_APPROX(x, square2.row(c).transpose().cwiseProduct(square2.col(c2)).sum()); diff --git a/test/product_large.cpp b/test/product_large.cpp index e5f6e12aa..2d36c5a92 100644 --- a/test/product_large.cpp +++ b/test/product_large.cpp @@ -30,7 +30,7 @@ void test_product_large() CALL_SUBTEST_1( product(MatrixXf(ei_random<int>(1,320), ei_random<int>(1,320))) ); CALL_SUBTEST_2( product(MatrixXd(ei_random<int>(1,320), ei_random<int>(1,320))) ); CALL_SUBTEST_3( product(MatrixXi(ei_random<int>(1,320), ei_random<int>(1,320))) ); - CALL_SUBTEST_4( product(MatrixXcf(ei_random<int>(1,50), ei_random<int>(1,50))) ); + CALL_SUBTEST_4( product(MatrixXcf(ei_random<int>(1,150), ei_random<int>(1,150))) ); CALL_SUBTEST_5( product(Matrix<float,Dynamic,Dynamic,RowMajor>(ei_random<int>(1,320), ei_random<int>(1,320))) ); } |