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

Correct conversion from unsorted HessianFactor (to sorted JacobianFactor) - will soon re-standardize sorting. Also checking for non-finite values in assertInvariants

release/4.3a0
Richard Roberts 2011-02-04 01:01:29 +00:00
parent 9525bd5eb6
commit 24fbe9b02b
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtsam/linear/JacobianFactor.cpp
View File

@ -57,6 +57,12 @@ namespace gtsam {
for(size_t i=0; i<firstNonzeroBlocks_.size(); ++i) for(size_t i=0; i<firstNonzeroBlocks_.size(); ++i)
assert(firstNonzeroBlocks_[i] < Ab_.nBlocks()); assert(firstNonzeroBlocks_[i] < Ab_.nBlocks());
#endif #endif
// Check for non-finite values
for(size_t i=0; i<Ab_.size1(); ++i)
for(size_t j=0; j<Ab_.size2(); ++j)
if(isnan(matrix_(i,j)))
throw invalid_argument("JacobianFactor contains NaN matrix entries.");
} }
/* ************************************************************************* */ /* ************************************************************************* */
@ -167,17 +173,29 @@ namespace gtsam {
JacobianFactor::JacobianFactor(const HessianFactor& factor) : Ab_(matrix_) { JacobianFactor::JacobianFactor(const HessianFactor& factor) : Ab_(matrix_) {
keys_ = factor.keys_; keys_ = factor.keys_;
Ab_.assignNoalias(factor.info_); Ab_.assignNoalias(factor.info_);
size_t maxrank = choleskyCareful(matrix_); size_t maxrank = choleskyCareful(matrix_).first;
matrix_ = ublas::triangular_adaptor<AbMatrix, ublas::upper>(matrix_);
Ab_.rowEnd() = maxrank; Ab_.rowEnd() = maxrank;
model_ = noiseModel::Unit::Create(maxrank); model_ = noiseModel::Unit::Create(maxrank);
size_t varpos = 0; size_t varpos = 0;
firstNonzeroBlocks_.resize(this->size1()); firstNonzeroBlocks_.resize(this->size1(), 0);
for(size_t row=0; row<this->size1(); ++row) {
while(varpos < this->keys_.size() && Ab_.offset(varpos+1) <= row) // Sort keys
++ varpos; set<Index> vars;
firstNonzeroBlocks_[row] = varpos; for(size_t j=0; j<keys_.size(); ++j)
vars.insert(keys_[j]);
Permutation permutation(Permutation::Identity(*vars.rbegin() + 1));
size_t jNew = 0;
BOOST_FOREACH(const Index& var, vars) {
permutation[var] = jNew++;
} }
permuteWithInverse(permutation);
jNew = 0;
BOOST_FOREACH(const Index& var, vars) {
keys_[jNew++] = var;
}
assertInvariants(); assertInvariants();
} }