diff --git a/gtsam/inference/BayesTree-inl.h b/gtsam/inference/BayesTree-inl.h index 316135483..177457cfa 100644 --- a/gtsam/inference/BayesTree-inl.h +++ b/gtsam/inference/BayesTree-inl.h @@ -32,7 +32,6 @@ #include #include #include -#include #include using namespace boost::assign; namespace lam = boost::lambda; diff --git a/gtsam/inference/EliminationTree.h b/gtsam/inference/EliminationTree.h index c93b3d6e6..fdc071447 100644 --- a/gtsam/inference/EliminationTree.h +++ b/gtsam/inference/EliminationTree.h @@ -9,8 +9,8 @@ #include #include #include -#include +#include #include #include #include @@ -34,8 +34,8 @@ public: private: - typedef std::list > Factors; - typedef std::list > SubTrees; + typedef FastList Factors; + typedef FastList SubTrees; typedef std::vector Conditionals; Index key_; /** index associated with root */ diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h index 9ddc80462..7eda5f175 100644 --- a/gtsam/inference/FactorGraph.h +++ b/gtsam/inference/FactorGraph.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/gtsam/inference/ISAM.h b/gtsam/inference/ISAM.h index d9dadfe5c..6346b9fe6 100644 --- a/gtsam/inference/ISAM.h +++ b/gtsam/inference/ISAM.h @@ -25,7 +25,6 @@ #include //#include //#include -#include #include #include diff --git a/gtsam/inference/IndexFactor.cpp b/gtsam/inference/IndexFactor.cpp index f0d9f7c45..1f5f193ef 100644 --- a/gtsam/inference/IndexFactor.cpp +++ b/gtsam/inference/IndexFactor.cpp @@ -28,7 +28,7 @@ namespace gtsam { template class FactorBase; -IndexFactor::IndexFactor(const IndexConditional& c) : Base(static_cast(c)) {} +IndexFactor::IndexFactor(const IndexConditional& c) : Base(c) {} pair::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate( const FactorGraph& factors, size_t nrFrontals) { diff --git a/gtsam/inference/IndexFactor.h b/gtsam/inference/IndexFactor.h index dee284fb4..15d4b9a91 100644 --- a/gtsam/inference/IndexFactor.h +++ b/gtsam/inference/IndexFactor.h @@ -34,7 +34,7 @@ public: typedef boost::shared_ptr shared_ptr; /** Copy constructor */ - IndexFactor(const This& f) : Base(static_cast(f)) {} + IndexFactor(const This& f) : Base(f) {} /** Construct from derived type */ IndexFactor(const IndexConditional& c); diff --git a/gtsam/inference/JunctionTree-inl.h b/gtsam/inference/JunctionTree-inl.h index 45ea558ca..517691ee7 100644 --- a/gtsam/inference/JunctionTree-inl.h +++ b/gtsam/inference/JunctionTree-inl.h @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/gtsam/inference/SymbolicFactorGraph.cpp b/gtsam/inference/SymbolicFactorGraph.cpp index 10c35f752..9fd3c4fcb 100644 --- a/gtsam/inference/SymbolicFactorGraph.cpp +++ b/gtsam/inference/SymbolicFactorGraph.cpp @@ -63,9 +63,9 @@ namespace gtsam { } /* ************************************************************************* */ - std::set, boost::fast_pool_allocator > + FastSet SymbolicFactorGraph::keys() const { - std::set, boost::fast_pool_allocator > keys; + FastSet keys; BOOST_FOREACH(const sharedFactor& factor, *this) { if(factor) keys.insert(factor->begin(), factor->end()); } return keys; diff --git a/gtsam/inference/SymbolicFactorGraph.h b/gtsam/inference/SymbolicFactorGraph.h index 308b9515b..307813c53 100644 --- a/gtsam/inference/SymbolicFactorGraph.h +++ b/gtsam/inference/SymbolicFactorGraph.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,7 @@ public: * Return the set of variables involved in the factors (computes a set * union). */ - std::set, boost::fast_pool_allocator > keys() const; + FastSet keys() const; /** * Same as eliminate in the SymbolicFactorGraph case diff --git a/gtsam/inference/VariableIndex.h b/gtsam/inference/VariableIndex.h index 083073c12..49a4ba462 100644 --- a/gtsam/inference/VariableIndex.h +++ b/gtsam/inference/VariableIndex.h @@ -43,7 +43,7 @@ class VariableIndex { public: typedef boost::shared_ptr shared_ptr; - typedef FastList Factors; + typedef std::list Factors; typedef Factors::iterator Factor_iterator; typedef Factors::const_iterator Factor_const_iterator;