diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-06-15 09:16:10 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-06-15 09:16:10 +0200 |
| commit | aa3daad8836ab32a4e8caf044f161a219da1f15e (patch) | |
| tree | 32176480f46b300acb84cf1978fad0d93dacd740 | |
| parent | 3fd2beebc8a3d118f508fe43efd4217c1bfa9c97 (diff) | |
fix a warning and formatting
| -rw-r--r-- | Eigen/src/Cholesky/LDLT.h | 2 | ||||
| -rw-r--r-- | Eigen/src/SparseCholesky/SimplicialCholesky.h | 2 | ||||
| -rw-r--r-- | cmake/language_support.cmake | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Eigen/src/Cholesky/LDLT.h b/Eigen/src/Cholesky/LDLT.h index 238a2454a..a5e3d5469 100644 --- a/Eigen/src/Cholesky/LDLT.h +++ b/Eigen/src/Cholesky/LDLT.h @@ -479,7 +479,7 @@ LDLT<MatrixType,_UpLo>& LDLT<MatrixType,_UpLo>::rankUpdate(const MatrixBase<Deri for (Index i = 0; i < size; i++) m_transpositions.coeffRef(i) = i; m_temporary.resize(size); - m_sign = sigma; + m_sign = sigma>=0 ? 1 : -1; m_isInitialized = true; } diff --git a/Eigen/src/SparseCholesky/SimplicialCholesky.h b/Eigen/src/SparseCholesky/SimplicialCholesky.h index 3c577f8d2..e5d98933f 100644 --- a/Eigen/src/SparseCholesky/SimplicialCholesky.h +++ b/Eigen/src/SparseCholesky/SimplicialCholesky.h @@ -221,7 +221,7 @@ class SimplicialCholeskyBase : internal::noncopyable if(m_diag.size()>0) dest = m_diag.asDiagonal().inverse() * dest; - if (m_matrix.nonZeros()>0) // otherwise I==I + if (m_matrix.nonZeros()>0) // otherwise U==I derived().matrixU().solveInPlace(dest); if(m_P.size()>0) diff --git a/cmake/language_support.cmake b/cmake/language_support.cmake index aa5870bb0..3414e6ea6 100644 --- a/cmake/language_support.cmake +++ b/cmake/language_support.cmake @@ -23,10 +23,9 @@ function(workaround_9220 language language_works) #message("DEBUG: language = ${language}") set(text "project(test NONE) -cmake_minimum_required(VERSION 2.6.0) -enable_language(${language} OPTIONAL) -" - ) + cmake_minimum_required(VERSION 2.6.0) + enable_language(${language} OPTIONAL) + ") file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/language_tests/${language}) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/language_tests/${language}) file(WRITE ${CMAKE_BINARY_DIR}/language_tests/${language}/CMakeLists.txt |