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

minor fix for Mac/Clang

release/4.3a0
Chris Beall 2013-08-13 04:01:23 +00:00
parent dd029f544f
commit 5c37845c75
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam/inference/FactorGraph.h
View File

@ -150,7 +150,7 @@ namespace gtsam {
/** Add a factor directly using a shared_ptr */
template<class DERIVEDFACTOR>
typename boost::enable_if<boost::is_base_of<FactorType, DERIVEDFACTOR>>::type
typename boost::enable_if<boost::is_base_of<FactorType, DERIVEDFACTOR> >::type
push_back(boost::shared_ptr<DERIVEDFACTOR> factor) {
factors_.push_back(boost::shared_ptr<FACTOR>(factor)); }
@ -160,13 +160,13 @@ namespace gtsam {
/** push back many factors with an iterator over shared_ptr (factors are not copied) */
template<typename ITERATOR>
typename boost::enable_if<boost::is_base_of<FactorType, typename ITERATOR::value_type::element_type>>::type
typename boost::enable_if<boost::is_base_of<FactorType, typename ITERATOR::value_type::element_type> >::type
push_back(ITERATOR firstFactor, ITERATOR lastFactor) {
factors_.insert(end(), firstFactor, lastFactor); }
/** push back many factors as shared_ptr's in a container (factors are not copied) */
template<typename CONTAINER>
typename boost::enable_if<boost::is_base_of<FactorType, typename CONTAINER::value_type::element_type>>::type
typename boost::enable_if<boost::is_base_of<FactorType, typename CONTAINER::value_type::element_type> >::type
push_back(const CONTAINER& container) {
push_back(container.begin(), container.end());
}
@ -174,7 +174,7 @@ namespace gtsam {
/** push back a BayesTree as a collection of factors. NOTE: This should be hidden in derived
* classes in favor of a type-specialized version that calls this templated function. */
template<class CLIQUE>
typename boost::enable_if<boost::is_base_of<This, typename CLIQUE::FactorGraphType>>::type
typename boost::enable_if<boost::is_base_of<This, typename CLIQUE::FactorGraphType> >::type
push_back(const BayesTree<CLIQUE>& bayesTree) {
bayesTree.addFactorsToGraph(*this);
}
@ -233,13 +233,13 @@ namespace gtsam {
/** Add a factor by value, will be copy-constructed (use push_back with a shared_ptr to avoid
* the copy). */
template<class DERIVEDFACTOR>
typename boost::enable_if<boost::is_base_of<FactorType, DERIVEDFACTOR>>::type
typename boost::enable_if<boost::is_base_of<FactorType, DERIVEDFACTOR> >::type
push_back(const DERIVEDFACTOR& factor) {
factors_.push_back(boost::make_shared<DERIVEDFACTOR>(factor)); }
/** push back many factors with an iterator over plain factors (factors are copied) */
template<typename ITERATOR>
typename boost::enable_if<boost::is_base_of<FactorType, typename ITERATOR::value_type>>::type
typename boost::enable_if<boost::is_base_of<FactorType, typename ITERATOR::value_type> >::type
push_back(ITERATOR firstFactor, ITERATOR lastFactor) {
for(ITERATOR f = firstFactor; f != lastFactor; ++f)
push_back(*f);
@ -247,7 +247,7 @@ namespace gtsam {
/** push back many factors as non-pointer objects in a container (factors are copied) */
template<typename CONTAINER>
typename boost::enable_if<boost::is_base_of<FactorType, typename CONTAINER::value_type>>::type
typename boost::enable_if<boost::is_base_of<FactorType, typename CONTAINER::value_type> >::type
push_back(const CONTAINER& container) {
push_back(container.begin(), container.end());
}