From 5fb04ab2da509de116faa0f35e3038b14fd69573 Mon Sep 17 00:00:00 2001 From: Rasmus Munk Larsen Date: Wed, 3 Feb 2016 10:12:10 -0800 Subject: [PATCH] Fix bad line break. Don't repeat Kahan matrix test since it is deterministic. --- Eigen/src/QR/ColPivHouseholderQR.h | 3 +-- 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::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 @@ -212,11 +212,6 @@ void test_qr_colpivoting() CALL_SUBTEST_5(( qr_fixedsize, 1 >() )); } - for(int i = 0; i < g_repeat; i++) { - CALL_SUBTEST_1( qr_kahan_matrix() ); - CALL_SUBTEST_2( qr_kahan_matrix() ); - } - for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1( qr_invertible() ); CALL_SUBTEST_2( qr_invertible() ); @@ -233,4 +228,7 @@ void test_qr_colpivoting() // Test problem size constructors CALL_SUBTEST_9(ColPivHouseholderQR(10, 20)); + + CALL_SUBTEST_1( qr_kahan_matrix() ); + CALL_SUBTEST_2( qr_kahan_matrix() ); }