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

Updated iSAM2 Marginalize call for the latest version of GTSAM

release/4.3a0
Stephen Williams 2013-03-18 21:32:43 +00:00
parent d06edb8006
commit f03be70770
1 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtsam_unstable/nonlinear/IncrementalFixedLagSmoother.cpp
View File

@ -46,6 +46,7 @@ FixedLagSmoother::Result IncrementalFixedLagSmoother::update(const NonlinearFact
if(debug) { if(debug) {
std::cout << "IncrementalFixedLagSmoother::update() Start" << std::endl; std::cout << "IncrementalFixedLagSmoother::update() Start" << std::endl;
PrintSymbolicTree(isam_, "Bayes Tree Before Update:"); PrintSymbolicTree(isam_, "Bayes Tree Before Update:");
std::cout << "END" << std::endl;
} }
FastVector<size_t> removedFactors; FastVector<size_t> removedFactors;
@ -88,48 +89,19 @@ FixedLagSmoother::Result IncrementalFixedLagSmoother::update(const NonlinearFact
if(debug) { if(debug) {
PrintSymbolicTree(isam_, "Bayes Tree After Update, Before Marginalization:"); PrintSymbolicTree(isam_, "Bayes Tree After Update, Before Marginalization:");
std::cout << "END" << std::endl;
} }
// Marginalize out any needed variables // Marginalize out any needed variables
//FastList<Key> leafKeys(marginalizableKeys.begin(), marginalizableKeys.end()); FastList<Key> leafKeys(marginalizableKeys.begin(), marginalizableKeys.end());
//isam_.experimentalMarginalizeLeaves(leafKeys); isam_.experimentalMarginalizeLeaves(leafKeys);
{
// Currently the marginalization code in iSAM2 is limited.
// Marginalize the keys out one at a time, in elimination order
typedef std::map<Index, Key> OrderedKeys;
OrderedKeys marginalizeOrder;
BOOST_FOREACH(Key key, marginalizableKeys) {
Index index = isam_.getOrdering().at(key);
marginalizeOrder[index] = key;
}
if(debug) {
std::cout << "Marginalization Order: ";
BOOST_FOREACH(const OrderedKeys::value_type& index_key, marginalizeOrder) {
std::cout << DefaultKeyFormatter(index_key.second) << " ";
}
std::cout << std::endl;
}
BOOST_FOREACH(const OrderedKeys::value_type& index_key, marginalizeOrder) {
if(debug) std::cout << "Attempting to marginalize out variable: " << DefaultKeyFormatter(index_key.second) << std::endl;
FastList<Key> leafKeys;
leafKeys.push_back(index_key.second);
isam_.experimentalMarginalizeLeaves(leafKeys);
if(debug) {
PrintSymbolicTree(isam_, "Bayes Tree After Marginalization:");
}
}
}
// Remove marginalized keys from the KeyTimestampMap // Remove marginalized keys from the KeyTimestampMap
eraseKeyTimestampMap(marginalizableKeys); eraseKeyTimestampMap(marginalizableKeys);
if(debug) { if(debug) {
PrintSymbolicTree(isam_, "Final Bayes Tree:"); PrintSymbolicTree(isam_, "Final Bayes Tree:");
std::cout << "END" << std::endl;
} }
// TODO: Fill in result structure // TODO: Fill in result structure