12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabled LAPACK version of QR (which didn't work on Linux), also added missing header

release/4.3a0
Richard Roberts 2010-10-22 23:18:22 +00:00
parent a411cf9683
commit b7f979b4dd
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/DenseQRUtil.cpp
View File

@ -23,6 +23,8 @@
#include <boost/numeric/ublas/matrix_proxy.hpp> #include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/ublas/triangular.hpp> #include <boost/numeric/ublas/triangular.hpp>
#include <string.h> // for memcpy and memset
using namespace std; using namespace std;
namespace ublas = boost::numeric::ublas; namespace ublas = boost::numeric::ublas;

2
base/Matrix.cpp
View File

@ -669,7 +669,6 @@ void householder(Matrix &A) {
A(i,j) = a[k]; A(i,j) = a[k];
} }
} }
#endif
void householderColMajor(MatrixColMajor &A) { void householderColMajor(MatrixColMajor &A) {
__CLPK_integer m = A.size1(); __CLPK_integer m = A.size1();
@ -686,6 +685,7 @@ void householderColMajor(MatrixColMajor &A) {
dgeqrf_(&m, &n, A.data().begin(), &m, tau, work, &lwork, &info); dgeqrf_(&m, &n, A.data().begin(), &m, tau, work, &lwork, &info);
} }
#endif #endif
#endif
///* ************************************************************************* */ ///* ************************************************************************* */

2
base/Matrix.h
View File

@ -271,7 +271,6 @@ void householder(Matrix& A, size_t k);
* @return nothing: in place !!! * @return nothing: in place !!!
*/ */
void householder(Matrix& A); void householder(Matrix& A);
#endif
/** /**
* Householder tranformation directly on a column-major matrix. Does not zero * Householder tranformation directly on a column-major matrix. Does not zero
@ -282,6 +281,7 @@ void householder(Matrix& A);
*/ */
void householderColMajor(MatrixColMajor& A); void householderColMajor(MatrixColMajor& A);
#endif #endif
#endif
/** /**
* backSubstitute U*x=b * backSubstitute U*x=b