diff options
| -rw-r--r-- | Eigen/src/QR/ColPivHouseholderQR.h | 3 | ||||
| -rw-r--r-- | test/qr_colpivoting.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Eigen/src/QR/ColPivHouseholderQR.h b/Eigen/src/QR/ColPivHouseholderQR.h index a13965ff0..efeb1f438 100644 --- a/Eigen/src/QR/ColPivHouseholderQR.h +++ b/Eigen/src/QR/ColPivHouseholderQR.h @@ -511,8 +511,7 @@ void ColPivHouseholderQR<MatrixType>::computeInPlace() if(k != biggest_col_index) { m_qr.col(k).swap(m_qr.col(biggest_col_index)); std::swap(m_colNormsUpdated.coeffRef(k), m_colNormsUpdated.coeffRef(biggest_col_index)); - std::swap(m_colNormsDirect.coeffRef(k), - m_colNormsDirect.coeffRef(biggest_col_index)); + std::swap(m_colNormsDirect.coeffRef(k), m_colNormsDirect.coeffRef(biggest_col_index)); ++number_of_transpositions; } diff --git a/test/qr_colpivoting.cpp b/test/qr_colpivoting.cpp index 7b97292db..c777d5f94 100644 --- a/test/qr_colpivoting.cpp +++ b/test/qr_colpivoting.cpp @@ -213,11 +213,6 @@ void test_qr_colpivoting() } for(int i = 0; i < g_repeat; i++) { - CALL_SUBTEST_1( qr_kahan_matrix<MatrixXf>() ); - CALL_SUBTEST_2( qr_kahan_matrix<MatrixXd>() ); - } - - for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1( qr_invertible<MatrixXf>() ); CALL_SUBTEST_2( qr_invertible<MatrixXd>() ); CALL_SUBTEST_6( qr_invertible<MatrixXcf>() ); @@ -233,4 +228,7 @@ void test_qr_colpivoting() // Test problem size constructors CALL_SUBTEST_9(ColPivHouseholderQR<MatrixXf>(10, 20)); + + CALL_SUBTEST_1( qr_kahan_matrix<MatrixXf>() ); + CALL_SUBTEST_2( qr_kahan_matrix<MatrixXd>() ); } |