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

Fixed compile in tests comparing sets of keys

release/4.3a0
Alex Cunningham 2013-08-15 20:22:50 +00:00
parent 20b6e33362
commit 957169b5cc
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtsam/nonlinear/tests/testLinearContainerFactor.cpp
View File

@ -47,7 +47,7 @@ TEST( testLinearContainerFactor, generic_jacobian_factor ) {
EXPECT(!actFactor.isHessian()); EXPECT(!actFactor.isHessian());
// check keys // check keys
std::vector<gtsam::Key> expKeys; expKeys += l1, l2; FastVector<Key> expKeys; expKeys += l1, l2;
EXPECT(assert_container_equality(expKeys, actFactor.keys())); EXPECT(assert_container_equality(expKeys, actFactor.keys()));
Values values; Values values;
@ -229,10 +229,7 @@ TEST( testLinearContainerFactor, hessian_factor_withlinpoints ) {
/* ************************************************************************* */ /* ************************************************************************* */
TEST( testLinearContainerFactor, creation ) { TEST( testLinearContainerFactor, creation ) {
// Create a set of local keys (No robot label) // Create a set of local keys (No robot label)
Key l1 = 11, l2 = 12, Key l1 = 11, l3 = 13, l5 = 15;
l3 = 13, l4 = 14,
l5 = 15, l6 = 16,
l7 = 17, l8 = 18;
// create a linear factor // create a linear factor
SharedDiagonal model = noiseModel::Unit::Create(2); SharedDiagonal model = noiseModel::Unit::Create(2);
@ -249,7 +246,7 @@ TEST( testLinearContainerFactor, creation ) {
LinearContainerFactor actual(linear_factor, full_values); LinearContainerFactor actual(linear_factor, full_values);
// Verify the keys // Verify the keys
std::vector<gtsam::Key> expKeys; FastVector<Key> expKeys;
expKeys += l3, l5; expKeys += l3, l5;
EXPECT(assert_container_equality(expKeys, actual.keys())); EXPECT(assert_container_equality(expKeys, actual.keys()));

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

@ -42,14 +42,14 @@ TEST( JunctionTree, constructor )
SymbolicJunctionTree actual(SymbolicEliminationTree(simpleChain, order)); SymbolicJunctionTree actual(SymbolicEliminationTree(simpleChain, order));
vector<Key> frontal1 = list_of(2)(3); SymbolicJunctionTree::Node::Keys
vector<Key> frontal2 = list_of(0)(1); frontal1 = list_of(2)(3),
vector<Key> sep1; frontal2 = list_of(0)(1),
vector<Key> sep2 = list_of(2); sep1, sep2 = list_of(2);
EXPECT(assert_equal(frontal1, actual.roots().front()->keys)); EXPECT(assert_container_equality(frontal1, actual.roots().front()->keys));
//EXPECT(assert_equal(sep1, actual.roots().front()->separator)); //EXPECT(assert_equal(sep1, actual.roots().front()->separator));
LONGS_EQUAL(1, (long)actual.roots().front()->factors.size()); LONGS_EQUAL(1, (long)actual.roots().front()->factors.size());
EXPECT(assert_equal(frontal2, actual.roots().front()->children.front()->keys)); EXPECT(assert_container_equality(frontal2, actual.roots().front()->children.front()->keys));
//EXPECT(assert_equal(sep2, actual.roots().front()->children.front()->separator)); //EXPECT(assert_equal(sep2, actual.roots().front()->children.front()->separator));
LONGS_EQUAL(2, (long)actual.roots().front()->children.front()->factors.size()); LONGS_EQUAL(2, (long)actual.roots().front()->children.front()->factors.size());
EXPECT(assert_equal(*simpleChain[2], *actual.roots().front()->factors[0])); EXPECT(assert_equal(*simpleChain[2], *actual.roots().front()->factors[0]));