diff --git a/gtsam/inference/BayesTreeUnordered-inst.h b/gtsam/inference/BayesTreeUnordered-inst.h index 248af3ce5..3791ce82d 100644 --- a/gtsam/inference/BayesTreeUnordered-inst.h +++ b/gtsam/inference/BayesTreeUnordered-inst.h @@ -147,20 +147,6 @@ namespace gtsam { return stats; } - /* ************************************************************************* */ - template - void BayesTreeUnordered::Cliques::print(const std::string& s, const KeyFormatter& keyFormatter) const { - std::cout << s << ":\n"; - BOOST_FOREACH(sharedClique clique, *this) { - clique->printTree("", keyFormatter); } - } - - /* ************************************************************************* */ - template - bool BayesTreeUnordered::Cliques::equals(const Cliques& other, double tol) const { - return other == *this; - } - /* ************************************************************************* */ template size_t BayesTreeUnordered::size() const { diff --git a/gtsam/inference/BayesTreeUnordered.h b/gtsam/inference/BayesTreeUnordered.h index 13d35b038..0a6853f18 100644 --- a/gtsam/inference/BayesTreeUnordered.h +++ b/gtsam/inference/BayesTreeUnordered.h @@ -65,11 +65,7 @@ namespace gtsam { typedef typename CLIQUE::EliminationTraits EliminationTraits; /** A convenience class for a list of shared cliques */ - struct Cliques : public FastList { - void print(const std::string& s = "Cliques", - const KeyFormatter& keyFormatter = DefaultKeyFormatter) const; - bool equals(const Cliques& other, double tol = 1e-9) const; - }; + typedef FastList Cliques; /** clique statistics */ struct CliqueStats { @@ -220,8 +216,8 @@ namespace gtsam { Cliques removeSubtree(const sharedClique& subtree); /** Insert a new subtree with known parent clique. This function does not check that the - * specified parent is the correct parent. This function updates all of the internal data - * structures associated with adding a subtree, such as populating the nodes index. */ + * specified parent is the correct parent. This function updates all of the internal data + * structures associated with adding a subtree, such as populating the nodes index. */ void insertRoot(const sharedClique& subtree); /** add a clique (top down) */ @@ -248,13 +244,6 @@ namespace gtsam { /** Fill the nodes index for a subtree */ void fillNodesIndex(const sharedClique& subtree); - /** Helper function to build a non-symbolic tree (e.g. Gaussian) using a - * symbolic tree, used in the BT(BN) constructor. - */ - //void recursiveTreeBuild(const boost::shared_ptr >& symbolic, - // const std::vector >& conditionals, - // const typename BayesTree::sharedClique& parent); - private: /** Serialization function */ friend class boost::serialization::access;