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

Fixed template names

release/4.3a0
Richard Roberts 2010-11-06 20:52:39 +00:00
parent d20118abbc
commit 4a23971b80
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtsam/base/Matrix-inl.h
View File

@ -33,11 +33,11 @@ using namespace std;
* @param b an RHS vector * @param b an RHS vector
* @return the solution x of U*x=b * @return the solution x of U*x=b
*/ */
template<class MATRIXAE, class VECTORAE> template<class MATRIX, class VECTOR>
Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<MATRIXAE>& _U, Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<MATRIX>& _U,
const boost::numeric::ublas::vector_expression<VECTORAE>& _b, bool unit=false) { const boost::numeric::ublas::vector_expression<VECTOR>& _b, bool unit=false) {
const MATRIXAE& U((const MATRIXAE&)_U); const MATRIX& U(*static_cast<const MATRIX*>(&_U));
const VECTORAE& b((const VECTORAE&)_b); const VECTOR& b(*static_cast<const VECTOR*>(&_b));
size_t n = U.size2(); size_t n = U.size2();
#ifndef NDEBUG #ifndef NDEBUG
size_t m = U.size1(); size_t m = U.size1();
@ -74,11 +74,11 @@ Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<MATRIX
* @return the solution x of x'*U=b' * @return the solution x of x'*U=b'
* TODO: use boost * TODO: use boost
*/ */
template<class VECTORAE, class MATRIXAE> template<class VECTOR, class MATRIX>
Vector backSubstituteUpper(const boost::numeric::ublas::vector_expression<VECTORAE>& _b, Vector backSubstituteUpper(const boost::numeric::ublas::vector_expression<VECTOR>& _b,
const boost::numeric::ublas::matrix_expression<MATRIXAE>& _U, bool unit=false) { const boost::numeric::ublas::matrix_expression<MATRIX>& _U, bool unit=false) {
const VECTORAE& b((const VECTORAE&)_b); const VECTOR& b(*static_cast<const VECTOR*>(&_b));
const MATRIXAE& U((const MATRIXAE&)_U); const MATRIX& U(*static_cast<const MATRIX*>(&_U));
size_t n = U.size2(); size_t n = U.size2();
#ifndef NDEBUG #ifndef NDEBUG
size_t m = U.size1(); size_t m = U.size1();

12
gtsam/base/Matrix.h
View File

@ -293,9 +293,9 @@ void householderColMajor(MatrixColMajor& A);
* @return the solution x of U*x=b * @return the solution x of U*x=b
* TODO: use boost * TODO: use boost
*/ */
template<class MatrixAE, class VectorAE> template<class MATRIX, class VECTOR>
Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<MatrixAE>& U, Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<MATRIX>& U,
const boost::numeric::ublas::vector_expression<VectorAE>& b, bool unit=false); const boost::numeric::ublas::vector_expression<VECTOR>& b, bool unit=false);
/** /**
* backSubstitute x'*U=b' * backSubstitute x'*U=b'
@ -305,9 +305,9 @@ Vector backSubstituteUpper(const boost::numeric::ublas::matrix_expression<Matrix
* @return the solution x of x'*U=b' * @return the solution x of x'*U=b'
* TODO: use boost * TODO: use boost
*/ */
template<class VectorAE, class MatrixAE> template<class VECTOR, class MATRIX>
Vector backSubstituteUpper(const boost::numeric::ublas::vector_expression<VectorAE>& b, Vector backSubstituteUpper(const boost::numeric::ublas::vector_expression<VECTOR>& b,
const boost::numeric::ublas::matrix_expression<MatrixAE>& U, bool unit=false); const boost::numeric::ublas::matrix_expression<MATRIX>& U, bool unit=false);
/** /**
* backSubstitute L*x=b * backSubstitute L*x=b