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

Fixed typo/spelling

release/4.3a0
Richard Roberts 2012-10-08 23:27:39 +00:00
parent 2719f7ca86
commit e52b6efb68
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/inference/BayesTree-inl.h
View File

@ -639,10 +639,10 @@ namespace gtsam {
} }
} }
// Delete cachedShorcuts for each orphan subtree // Delete cachedShortcuts for each orphan subtree
//TODO: Consider Improving //TODO: Consider Improving
BOOST_FOREACH(sharedClique& orphan, orphans) BOOST_FOREACH(sharedClique& orphan, orphans)
orphan->deleteCachedShorcuts(); orphan->deleteCachedShortcuts();
} }
/* ************************************************************************* */ /* ************************************************************************* */

4
gtsam/inference/BayesTree.h
View File

@ -225,8 +225,8 @@ namespace gtsam {
void clear(); void clear();
/** Clear all shortcut caches - use before timing on marginal calculation to avoid residual cache data */ /** Clear all shortcut caches - use before timing on marginal calculation to avoid residual cache data */
inline void deleteCachedShorcuts() { inline void deleteCachedShorctuts() {
root_->deleteCachedShorcuts(); root_->deleteCachedShortcuts();
} }
/** Apply a permutation to all cliques */ /** Apply a permutation to all cliques */

4
gtsam/inference/BayesTreeCliqueBase-inl.h
View File

@ -420,14 +420,14 @@ namespace gtsam {
/* ************************************************************************* */ /* ************************************************************************* */
template<class DERIVED, class CONDITIONAL> template<class DERIVED, class CONDITIONAL>
void BayesTreeCliqueBase<DERIVED, CONDITIONAL>::deleteCachedShorcuts() { void BayesTreeCliqueBase<DERIVED, CONDITIONAL>::deleteCachedShortcuts() {
// When a shortcut is requested, all of the shortcuts between it and the // When a shortcut is requested, all of the shortcuts between it and the
// root are also generated. So, if this clique's cached shortcut is set, // root are also generated. So, if this clique's cached shortcut is set,
// recursively call over all child cliques. Otherwise, it is unnecessary. // recursively call over all child cliques. Otherwise, it is unnecessary.
if (cachedShortcut_) { if (cachedShortcut_) {
BOOST_FOREACH(derived_ptr& child, children_) { BOOST_FOREACH(derived_ptr& child, children_) {
child->deleteCachedShorcuts(); child->deleteCachedShortcuts();
} }
//Delete CachedShortcut for this clique //Delete CachedShortcut for this clique

2
gtsam/inference/BayesTreeCliqueBase.h
View File

@ -220,7 +220,7 @@ namespace gtsam {
* This deletes the cached shortcuts of all cliques (subtree) below this clique. * This deletes the cached shortcuts of all cliques (subtree) below this clique.
* This is performed when the bayes tree is modified. * This is performed when the bayes tree is modified.
*/ */
void deleteCachedShorcuts(); void deleteCachedShortcuts();
/** return cached shortcut of the clique */ /** return cached shortcut of the clique */
const boost::optional<BayesNet<ConditionalType> >& cachedShortcut() const { const boost::optional<BayesNet<ConditionalType> >& cachedShortcut() const {

2
gtsam/inference/tests/testBayesTree.cpp
View File

@ -288,7 +288,7 @@ TEST( BayesTree, shortcutCheck )
} }
// Check if all the cached shortcuts are cleared // Check if all the cached shortcuts are cleared
rootClique->deleteCachedShorcuts(); rootClique->deleteCachedShortcuts();
BOOST_FOREACH(SymbolicBayesTree::sharedClique& clique, allCliques) { BOOST_FOREACH(SymbolicBayesTree::sharedClique& clique, allCliques) {
bool notCleared = clique->cachedShortcut(); bool notCleared = clique->cachedShortcut();
CHECK( notCleared == false); CHECK( notCleared == false);