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

A couple cleanups

release/4.3a0
Richard Roberts 2013-07-26 21:03:10 +00:00
parent 1671183cce
commit 1ee51fb6f5
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam/inference/BayesTreeUnordered-inst.h
View File

@ -147,20 +147,6 @@ namespace gtsam {
return stats; return stats;
} }
/* ************************************************************************* */
template<class CLIQUE>
void BayesTreeUnordered<CLIQUE>::Cliques::print(const std::string& s, const KeyFormatter& keyFormatter) const {
std::cout << s << ":\n";
BOOST_FOREACH(sharedClique clique, *this) {
clique->printTree("", keyFormatter); }
}
/* ************************************************************************* */
template<class CLIQUE>
bool BayesTreeUnordered<CLIQUE>::Cliques::equals(const Cliques& other, double tol) const {
return other == *this;
}
/* ************************************************************************* */ /* ************************************************************************* */
template<class CLIQUE> template<class CLIQUE>
size_t BayesTreeUnordered<CLIQUE>::size() const { size_t BayesTreeUnordered<CLIQUE>::size() const {

17
gtsam/inference/BayesTreeUnordered.h
View File

@ -65,11 +65,7 @@ namespace gtsam {
typedef typename CLIQUE::EliminationTraits EliminationTraits; typedef typename CLIQUE::EliminationTraits EliminationTraits;
/** A convenience class for a list of shared cliques */ /** A convenience class for a list of shared cliques */
struct Cliques : public FastList<sharedClique> { typedef FastList<sharedClique> Cliques;
void print(const std::string& s = "Cliques",
const KeyFormatter& keyFormatter = DefaultKeyFormatter) const;
bool equals(const Cliques& other, double tol = 1e-9) const;
};
/** clique statistics */ /** clique statistics */
struct CliqueStats { struct CliqueStats {
@ -220,8 +216,8 @@ namespace gtsam {
Cliques removeSubtree(const sharedClique& subtree); Cliques removeSubtree(const sharedClique& subtree);
/** Insert a new subtree with known parent clique. This function does not check that the /** 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 * 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. */ * structures associated with adding a subtree, such as populating the nodes index. */
void insertRoot(const sharedClique& subtree); void insertRoot(const sharedClique& subtree);
/** add a clique (top down) */ /** add a clique (top down) */
@ -248,13 +244,6 @@ namespace gtsam {
/** Fill the nodes index for a subtree */ /** Fill the nodes index for a subtree */
void fillNodesIndex(const sharedClique& 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<BayesTreeClique<IndexConditional> >& symbolic,
// const std::vector<boost::shared_ptr<CONDITIONAL> >& conditionals,
// const typename BayesTree<CONDITIONAL,CLIQUE>::sharedClique& parent);
private: private:
/** Serialization function */ /** Serialization function */
friend class boost::serialization::access; friend class boost::serialization::access;