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

Made BayesTree::Cliques a FastList instead of an std::list

release/4.3a0
Richard Roberts 2013-03-18 19:27:56 +00:00
parent 52410ac6f7
commit d88ed78bb3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/inference/BayesTree.h
View File

@ -28,7 +28,7 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <gtsam/base/types.h> #include <gtsam/base/types.h>
#include <gtsam/base/FastVector.h> #include <gtsam/base/FastList.h>
#include <gtsam/inference/FactorGraph.h> #include <gtsam/inference/FactorGraph.h>
#include <gtsam/inference/BayesNet.h> #include <gtsam/inference/BayesNet.h>
#include <gtsam/inference/BayesTreeCliqueBase.h> #include <gtsam/inference/BayesTreeCliqueBase.h>
@ -69,7 +69,7 @@ namespace gtsam {
typedef boost::shared_ptr<Clique> sharedClique; typedef boost::shared_ptr<Clique> sharedClique;
// A convenience class for a list of shared cliques // A convenience class for a list of shared cliques
struct Cliques : public std::list<sharedClique> { struct Cliques : public FastList<sharedClique> {
void print(const std::string& s = "Cliques", void print(const std::string& s = "Cliques",
const IndexFormatter& indexFormatter = DefaultIndexFormatter) const; const IndexFormatter& indexFormatter = DefaultIndexFormatter) const;
bool equals(const Cliques& other, double tol = 1e-9) const; bool equals(const Cliques& other, double tol = 1e-9) const;

4
gtsam/inference/BayesTreeCliqueBase.h
View File

@ -85,7 +85,7 @@ namespace gtsam {
public: public:
sharedConditional conditional_; sharedConditional conditional_;
derived_weak_ptr parent_; derived_weak_ptr parent_;
std::list<derived_ptr> children_; FastList<derived_ptr> children_;
/// @name Testable /// @name Testable
/// @{ /// @{
@ -149,7 +149,7 @@ namespace gtsam {
} }
/** return the reference of children non-const version*/ /** return the reference of children non-const version*/
std::list<derived_ptr>& children() { FastList<derived_ptr>& children() {
return children_; return children_;
} }