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

Added conversion to base BayesNet from derived (includes Symbolic from Gaussian)

release/4.3a0
Richard Roberts 2012-03-12 01:25:55 +00:00
parent 19d1514008
commit 6b5a385b7e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtsam/inference/BayesNet.h
View File

@ -74,6 +74,12 @@ public:
/** Default constructor as an empty BayesNet */ /** Default constructor as an empty BayesNet */
BayesNet() {}; BayesNet() {};
/** convert from a derived type */
template<class DERIVEDCONDITIONAL>
BayesNet(const BayesNet<DERIVEDCONDITIONAL>& bn) {
conditionals_.assign(bn.begin(), bn.end());
}
/** BayesNet with 1 conditional */ /** BayesNet with 1 conditional */
BayesNet(const sharedConditional& conditional) { push_back(conditional); } BayesNet(const sharedConditional& conditional) { push_back(conditional); }

17
tests/testSymbolicBayesNet.cpp
View File

@ -34,11 +34,6 @@ using namespace example;
Key kx(size_t i) { return Symbol('x',i); } Key kx(size_t i) { return Symbol('x',i); }
Key kl(size_t i) { return Symbol('l',i); } Key kl(size_t i) { return Symbol('l',i); }
//Symbol _B_('B', 0), _L_('L', 0);
//IndexConditional::shared_ptr
// B(new IndexConditional(_B_)),
// L(new IndexConditional(_L_, _B_));
/* ************************************************************************* */ /* ************************************************************************* */
TEST( SymbolicBayesNet, constructor ) TEST( SymbolicBayesNet, constructor )
{ {
@ -64,6 +59,18 @@ TEST( SymbolicBayesNet, constructor )
CHECK(assert_equal(expected, actual)); CHECK(assert_equal(expected, actual));
} }
/* ************************************************************************* */
TEST( SymbolicBayesNet, FromGaussian) {
SymbolicBayesNet expected;
expected.push_back(IndexConditional::shared_ptr(new IndexConditional(0, 1)));
expected.push_back(IndexConditional::shared_ptr(new IndexConditional(1)));
GaussianBayesNet gbn = createSmallGaussianBayesNet();
SymbolicBayesNet actual(gbn);
EXPECT(assert_equal(expected, actual));
}
/* ************************************************************************* */ /* ************************************************************************* */
int main() { int main() {
TestResult tr; TestResult tr;