aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/QR
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2009-08-06 14:10:02 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2009-08-06 14:10:02 +0200
commit1d4fea48b57ef2fdd20df909c65e3432e26e91f9 (patch)
tree4e4c1992d149860c1ea4cd81644e430e7d85856f /Eigen/src/QR
parentc2861dd41a1b0f86757af98011d20e156b05979b (diff)
fix a couple of compilations issues
Diffstat (limited to 'Eigen/src/QR')
-rw-r--r--Eigen/src/QR/HessenbergDecomposition.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Eigen/src/QR/HessenbergDecomposition.h b/Eigen/src/QR/HessenbergDecomposition.h
index e7b086cb4..6ba90fb3a 100644
--- a/Eigen/src/QR/HessenbergDecomposition.h
+++ b/Eigen/src/QR/HessenbergDecomposition.h
@@ -170,7 +170,7 @@ void HessenbergDecomposition<MatrixType>::_compute(MatrixType& matA, CoeffVector
// i.e., A = H' A H where H = I - h v v' and v = matA.col(i).end(n-i-1)
matA.col(i).coeffRef(i+1) = 1;
- // first let's do A = H A
+ // first let's do A = H' A
matA.corner(BottomRight,n-i-1,n-i-1) -= ((ei_conj(h) * matA.col(i).end(n-i-1)) *
(matA.col(i).end(n-i-1).adjoint() * matA.corner(BottomRight,n-i-1,n-i-1))).lazy();
@@ -213,14 +213,15 @@ HessenbergDecomposition<MatrixType>::matrixQ(void) const
{
int n = m_matrix.rows();
MatrixType matQ = MatrixType::Identity(n,n);
+ Matrix<Scalar,1,MatrixType::ColsAtCompileTime> temp(n);
for (int i = n-2; i>=0; i--)
{
Scalar tmp = m_matrix.coeff(i+1,i);
m_matrix.const_cast_derived().coeffRef(i+1,i) = 1;
- matQ.corner(BottomRight,n-i-1,n-i-1) -=
- ((m_hCoeffs.coeff(i) * m_matrix.col(i).end(n-i-1)) *
- (m_matrix.col(i).end(n-i-1).adjoint() * matQ.corner(BottomRight,n-i-1,n-i-1)).lazy()).lazy();
+ int rs = n-i-1;
+ temp.end(rs) = (m_matrix.col(i).end(rs).adjoint() * matQ.corner(BottomRight,rs,rs)).lazy();
+ matQ.corner(BottomRight,rs,rs) -= (m_hCoeffs.coeff(i) * m_matrix.col(i).end(rs) * temp.end(rs)).lazy();
m_matrix.const_cast_derived().coeffRef(i+1,i) = tmp;
}