diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-04-26 08:56:52 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-04-26 08:56:52 +0000 |
| commit | 62bf0bbd5911bde451ec87b9a0337d2912b9206b (patch) | |
| tree | b5a7ff26b9cab4310c1dbd4600766e955fb0ec57 /Eigen/src | |
| parent | 173e582e3ce7a7822cb40dbfe8855e642a5fc9f2 (diff) | |
fix a bug in determinant of 4x4 matrices and a small type issue in Inverse
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Core/Visitor.h | 2 | ||||
| -rw-r--r-- | Eigen/src/LU/Determinant.h | 6 | ||||
| -rw-r--r-- | Eigen/src/LU/Inverse.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/Core/Visitor.h b/Eigen/src/Core/Visitor.h index 0aeac0cfc..ac3ccc2cc 100644 --- a/Eigen/src/Core/Visitor.h +++ b/Eigen/src/Core/Visitor.h @@ -52,7 +52,7 @@ struct ei_visitor_unroller<Visitor, Derived, 1> template<typename Visitor, typename Derived> struct ei_visitor_unroller<Visitor, Derived, Dynamic> { - static void run(const Derived &mat, Visitor& visitor) {} + static void run(const Derived &, Visitor&) {} }; diff --git a/Eigen/src/LU/Determinant.h b/Eigen/src/LU/Determinant.h index 16c33ec31..d3998195c 100644 --- a/Eigen/src/LU/Determinant.h +++ b/Eigen/src/LU/Determinant.h @@ -57,10 +57,10 @@ const typename Derived::Scalar ei_bruteforce_det(const MatrixBase<Derived>& m) case 4: // trick by Martin Costabel to compute 4x4 det with only 30 muls return ei_bruteforce_det4_helper(m,0,1,2,3) - + ei_bruteforce_det4_helper(m,0,2,1,3) + - ei_bruteforce_det4_helper(m,0,2,1,3) + ei_bruteforce_det4_helper(m,0,3,1,2) + ei_bruteforce_det4_helper(m,1,2,0,3) - + ei_bruteforce_det4_helper(m,1,3,0,2) + - ei_bruteforce_det4_helper(m,1,3,0,2) + ei_bruteforce_det4_helper(m,2,3,0,1); default: assert(false); @@ -75,4 +75,4 @@ typename ei_traits<Derived>::Scalar MatrixBase<Derived>::determinant() const else assert(false); // unimplemented for now } -#endif // EIGEN_DETERMINANT_H
\ No newline at end of file +#endif // EIGEN_DETERMINANT_H diff --git a/Eigen/src/LU/Inverse.h b/Eigen/src/LU/Inverse.h index eda20e1f3..00ffa25c8 100644 --- a/Eigen/src/LU/Inverse.h +++ b/Eigen/src/LU/Inverse.h @@ -98,7 +98,7 @@ template<typename MatrixType, bool CheckExistence> class Inverse : ei_no_assignm protected: bool m_exists; - MatrixType m_inverse; + typename MatrixType::Eval m_inverse; }; template<typename MatrixType, bool CheckExistence> @@ -119,7 +119,7 @@ void Inverse<MatrixType, CheckExistence> m_inverse.row(k).swap(m_inverse.row(k+rowOfBiggest)); matrix.row(k).swap(matrix.row(k+rowOfBiggest)); - + const Scalar d = matrix(k,k); m_inverse.block(k+1, 0, size-k-1, size) -= matrix.col(k).end(size-k-1) * (m_inverse.row(k) / d); @@ -215,7 +215,7 @@ void Inverse<MatrixType, CheckExistence>::_compute_in_size4_case(const MatrixTyp const XprBlock22 S = matrix.template block<2,2>(2,2); const Block22 X = S - R_times_P_inverse_times_Q; Block22 Y; - if(ei_compute_size2_inverse<Block22, CheckExistence>(X, &Y)) + if(ei_compute_size2_inverse<Block22, CheckExistence>(X, &Y)) { m_inverse.template block<2,2>(2,2) = Y; m_inverse.template block<2,2>(2,0) = - Y * R_times_P_inverse; |