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

Fixed traceSize failures

release/4.3a0
Frank 2015-05-12 13:46:43 -07:00
parent 4ba329c23b
commit 3b83c18d67
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtsam/nonlinear/tests/testAdaptAutoDiff.cpp
View File

@ -267,7 +267,8 @@ TEST(AdaptAutoDiff, Snavely) {
#ifdef GTSAM_USE_QUATERNIONS #ifdef GTSAM_USE_QUATERNIONS
EXPECT_LONGS_EQUAL(384,expression.traceSize()); // Todo, should be zero EXPECT_LONGS_EQUAL(384,expression.traceSize()); // Todo, should be zero
#else #else
EXPECT_LONGS_EQUAL(416,expression.traceSize()); // Todo, should be zero EXPECT_LONGS_EQUAL(sizeof(internal::BinaryExpression<Point2, Camera, Point3>::Record),
expression.traceSize()); // Todo, should be zero
#endif #endif
set<Key> expected = list_of(1)(2); set<Key> expected = list_of(1)(2);
EXPECT(expected == expression.keys()); EXPECT(expected == expression.keys());

4
gtsam/nonlinear/tests/testExpressionFactor.cpp
View File

@ -261,8 +261,8 @@ TEST(ExpressionFactor, Shallow) {
EXPECT_LONGS_EQUAL(352, sizeof(Binary::Record)); EXPECT_LONGS_EQUAL(352, sizeof(Binary::Record));
LONGS_EQUAL(96+352, expectedTraceSize); LONGS_EQUAL(96+352, expectedTraceSize);
#else #else
EXPECT_LONGS_EQUAL(400, sizeof(Binary::Record)); EXPECT_LONGS_EQUAL(384, sizeof(Binary::Record));
LONGS_EQUAL(112+400, expectedTraceSize); LONGS_EQUAL(96+384, expectedTraceSize);
#endif #endif
size_t size = expression.traceSize(); size_t size = expression.traceSize();
CHECK(size); CHECK(size);