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

Using Alex's ordering in new clique finding unit test

release/4.3a0
Richard Roberts 2013-12-02 19:29:24 +00:00
parent 85bbcf6d1e
commit 0874a81896
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtsam/symbolic/tests/testSymbolicBayesTree.cpp
View File

@ -100,13 +100,13 @@ TEST(SymbolicJunctionTree, clique_structure)
SymbolicBayesTree expected;
expected.insertRoot(
MakeClique(list_of(X(3)) (X(4)), 2, list_of
(MakeClique(list_of(L(2)) (X(5)) (X(4)), 2, list_of
(MakeClique(list_of(L(3)) (X(4)) (X(5)), 1))))
(MakeClique(list_of(X(2)) (X(3)), 1, list_of
(MakeClique(list_of(L(1)) (X(1)) (X(2)), 2))))));
MakeClique(list_of(X(2)) (X(3)), 2, list_of
(MakeClique(list_of(X(4)) (X(3)), 1, list_of
(MakeClique(list_of(X(5)) (L(2)) (X(4)), 2, list_of
(MakeClique(list_of(L(3)) (X(4)) (X(5)), 1))))))
(MakeClique(list_of(X(1)) (L(1)) (X(2)), 2))));
Ordering order = list_of(L(1)) (X(1)) (X(2)) (L(2)) (L(3)) (X(5)) (X(3)) (X(4));
Ordering order = list_of(X(1)) (L(3)) (L(1)) (X(5)) (X(2)) (L(2)) (X(4)) (X(3));
SymbolicBayesTree actual = *graph.eliminateMultifrontal(order);

18
gtsam/symbolic/tests/testSymbolicEliminationTree.cpp
View File

@ -133,16 +133,16 @@ TEST(EliminationTree, Create2)
graph += SymbolicFactor(X(5), L(3));
SymbolicEliminationTree expected = EliminationTreeTester::MakeTree(list_of
(MakeNode(X(4), SymbolicFactorGraph(), list_of
(MakeNode(X(3), list_of(SymbolicFactor(X(3), X(4))), list_of
(MakeNode(X(2), list_of(SymbolicFactor(X(2), X(3))), list_of
(MakeNode(X(1), list_of(SymbolicFactor(X(1), X(2))), list_of
(MakeNode(L(1), list_of(SymbolicFactor(X(1), L(1))) (SymbolicFactor(X(2), L(1)))))))))))
(MakeNode(X(5), list_of(SymbolicFactor(X(4), X(5))), list_of
(MakeNode(L(2), list_of(SymbolicFactor(X(4), L(2))) (SymbolicFactor(L(2), X(5)))))
(MakeNode(L(3), list_of(SymbolicFactor(X(4), L(3))) (SymbolicFactor(X(5), L(3))))))))));
(MakeNode(X(3), SymbolicFactorGraph(), list_of
(MakeNode(X(2), list_of(SymbolicFactor(X(2), X(3))), list_of
(MakeNode(L(1), list_of(SymbolicFactor(X(2), L(1))), list_of
(MakeNode(X(1), list_of(SymbolicFactor(X(1), L(1))) (SymbolicFactor(X(1), X(2)))))))))
(MakeNode(X(4), list_of(SymbolicFactor(X(3), X(4))), list_of
(MakeNode(L(2), list_of(SymbolicFactor(X(4), L(2))), list_of
(MakeNode(X(5), list_of(SymbolicFactor(X(4), X(5))) (SymbolicFactor(L(2), X(5))), list_of
(MakeNode(L(3), list_of(SymbolicFactor(X(4), L(3))) (SymbolicFactor(X(5), L(3))))))))))))));
Ordering order = list_of(L(1)) (X(1)) (X(2)) (L(2)) (L(3)) (X(5)) (X(3)) (X(4));
Ordering order = list_of(X(1)) (L(3)) (L(1)) (X(5)) (X(2)) (L(2)) (X(4)) (X(3));
SymbolicEliminationTree actual(graph, order);