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

Fixed some warnings

release/4.3a0
Richard Roberts 2013-11-21 15:09:46 +00:00
parent da47f8a9e8
commit b7fb8429bb
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtsam/nonlinear/tests/testValues.cpp
View File

@ -316,14 +316,14 @@ TEST(Values, filter) {
// Filter by key // Filter by key
int i = 0; int i = 0;
Values::Filtered<Value> filtered = values.filter(boost::bind(std::greater_equal<Key>(), _1, 2)); Values::Filtered<Value> filtered = values.filter(boost::bind(std::greater_equal<Key>(), _1, 2));
EXPECT_LONGS_EQUAL(2, filtered.size()); EXPECT_LONGS_EQUAL(2, (long)filtered.size());
BOOST_FOREACH(const Values::Filtered<>::KeyValuePair& key_value, filtered) { BOOST_FOREACH(const Values::Filtered<>::KeyValuePair& key_value, filtered) {
if(i == 0) { if(i == 0) {
LONGS_EQUAL(2, key_value.key); LONGS_EQUAL(2, (long)key_value.key);
EXPECT(typeid(Pose2) == typeid(key_value.value)); EXPECT(typeid(Pose2) == typeid(key_value.value));
EXPECT(assert_equal(pose2, dynamic_cast<const Pose2&>(key_value.value))); EXPECT(assert_equal(pose2, dynamic_cast<const Pose2&>(key_value.value)));
} else if(i == 1) { } else if(i == 1) {
LONGS_EQUAL(3, key_value.key); LONGS_EQUAL(3, (long)key_value.key);
EXPECT(typeid(Pose3) == typeid(key_value.value)); EXPECT(typeid(Pose3) == typeid(key_value.value));
EXPECT(assert_equal(pose3, dynamic_cast<const Pose3&>(key_value.value))); EXPECT(assert_equal(pose3, dynamic_cast<const Pose3&>(key_value.value)));
} else { } else {
@ -331,7 +331,7 @@ TEST(Values, filter) {
} }
++ i; ++ i;
} }
EXPECT_LONGS_EQUAL(2, i); EXPECT_LONGS_EQUAL(2, (long)i);
// construct a values with the view // construct a values with the view
Values actualSubValues1(filtered); Values actualSubValues1(filtered);
@ -343,20 +343,20 @@ TEST(Values, filter) {
// Filter by type // Filter by type
i = 0; i = 0;
Values::ConstFiltered<Pose3> pose_filtered = values.filter<Pose3>(); Values::ConstFiltered<Pose3> pose_filtered = values.filter<Pose3>();
EXPECT_LONGS_EQUAL(2, pose_filtered.size()); EXPECT_LONGS_EQUAL(2, (long)pose_filtered.size());
BOOST_FOREACH(const Values::ConstFiltered<Pose3>::KeyValuePair& key_value, pose_filtered) { BOOST_FOREACH(const Values::ConstFiltered<Pose3>::KeyValuePair& key_value, pose_filtered) {
if(i == 0) { if(i == 0) {
EXPECT_LONGS_EQUAL(1, key_value.key); EXPECT_LONGS_EQUAL(1, (long)key_value.key);
EXPECT(assert_equal(pose1, key_value.value)); EXPECT(assert_equal(pose1, key_value.value));
} else if(i == 1) { } else if(i == 1) {
EXPECT_LONGS_EQUAL(3, key_value.key); EXPECT_LONGS_EQUAL(3, (long)key_value.key);
EXPECT(assert_equal(pose3, key_value.value)); EXPECT(assert_equal(pose3, key_value.value));
} else { } else {
EXPECT(false); EXPECT(false);
} }
++ i; ++ i;
} }
EXPECT_LONGS_EQUAL(2, i); EXPECT_LONGS_EQUAL(2, (long)i);
// construct a values with the view // construct a values with the view
Values actualSubValues2(pose_filtered); Values actualSubValues2(pose_filtered);
@ -382,17 +382,17 @@ TEST(Values, Symbol_filter) {
int i = 0; int i = 0;
BOOST_FOREACH(const Values::Filtered<Value>::KeyValuePair& key_value, values.filter(Symbol::ChrTest('y'))) { BOOST_FOREACH(const Values::Filtered<Value>::KeyValuePair& key_value, values.filter(Symbol::ChrTest('y'))) {
if(i == 0) { if(i == 0) {
LONGS_EQUAL(Symbol('y',1), key_value.key); LONGS_EQUAL(Symbol('y', 1), (long)key_value.key);
EXPECT(assert_equal(pose1, dynamic_cast<const Pose3&>(key_value.value))); EXPECT(assert_equal(pose1, dynamic_cast<const Pose3&>(key_value.value)));
} else if(i == 1) { } else if(i == 1) {
LONGS_EQUAL(Symbol('y',3), key_value.key); LONGS_EQUAL(Symbol('y', 3), (long)key_value.key);
EXPECT(assert_equal(pose3, dynamic_cast<const Pose3&>(key_value.value))); EXPECT(assert_equal(pose3, dynamic_cast<const Pose3&>(key_value.value)));
} else { } else {
EXPECT(false); EXPECT(false);
} }
++ i; ++ i;
} }
LONGS_EQUAL(2, i); LONGS_EQUAL(2, (long)i);
} }
/* ************************************************************************* */ /* ************************************************************************* */
@ -403,16 +403,16 @@ TEST(Values, Destructors) {
{ {
TestValue value1; TestValue value1;
TestValue value2; TestValue value2;
LONGS_EQUAL(2, TestValueData::ConstructorCount); LONGS_EQUAL(2, (long)TestValueData::ConstructorCount);
LONGS_EQUAL(0, TestValueData::DestructorCount); LONGS_EQUAL(0, (long)TestValueData::DestructorCount);
values.insert(0, value1); values.insert(0, value1);
values.insert(1, value2); values.insert(1, value2);
} }
LONGS_EQUAL(4, TestValueData::ConstructorCount); LONGS_EQUAL(4, (long)TestValueData::ConstructorCount);
LONGS_EQUAL(2, TestValueData::DestructorCount); LONGS_EQUAL(2, (long)TestValueData::DestructorCount);
} }
LONGS_EQUAL(4, TestValueData::ConstructorCount); LONGS_EQUAL(4, (long)TestValueData::ConstructorCount);
LONGS_EQUAL(4, TestValueData::DestructorCount); LONGS_EQUAL(4, (long)TestValueData::DestructorCount);
} }
/* ************************************************************************* */ /* ************************************************************************* */

2
gtsam/nonlinear/tests/testWhiteNoiseFactor.cpp
View File

@ -30,7 +30,7 @@ TEST( WhiteNoiseFactor, constructor )
double z = 0.1; double z = 0.1;
Key meanKey=1, precisionKey=2; Key meanKey=1, precisionKey=2;
WhiteNoiseFactor factor(z,meanKey, precisionKey); WhiteNoiseFactor factor(z,meanKey, precisionKey);
LONGS_EQUAL(2,factor.dim()); LONGS_EQUAL(2, (long)factor.dim());
} }
/* ************************************************************************* */ /* ************************************************************************* */

28
gtsam/symbolic/tests/testSymbolicConditional.cpp
View File

@ -29,40 +29,40 @@ using namespace gtsam;
TEST( SymbolicConditional, empty ) TEST( SymbolicConditional, empty )
{ {
SymbolicConditional c0; SymbolicConditional c0;
LONGS_EQUAL(0,c0.nrFrontals()) LONGS_EQUAL(0, (long)c0.nrFrontals());
LONGS_EQUAL(0,c0.nrParents()) LONGS_EQUAL(0, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
TEST( SymbolicConditional, noParents ) TEST( SymbolicConditional, noParents )
{ {
SymbolicConditional c0(0); SymbolicConditional c0(0);
LONGS_EQUAL(1,c0.nrFrontals()) LONGS_EQUAL(1, (long)c0.nrFrontals());
LONGS_EQUAL(0,c0.nrParents()) LONGS_EQUAL(0, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
TEST( SymbolicConditional, oneParents ) TEST( SymbolicConditional, oneParents )
{ {
SymbolicConditional c0(0,1); SymbolicConditional c0(0,1);
LONGS_EQUAL(1,c0.nrFrontals()) LONGS_EQUAL(1, (long)c0.nrFrontals());
LONGS_EQUAL(1,c0.nrParents()) LONGS_EQUAL(1, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
TEST( SymbolicConditional, twoParents ) TEST( SymbolicConditional, twoParents )
{ {
SymbolicConditional c0(0,1,2); SymbolicConditional c0(0,1,2);
LONGS_EQUAL(1,c0.nrFrontals()) LONGS_EQUAL(1, (long)c0.nrFrontals());
LONGS_EQUAL(2,c0.nrParents()) LONGS_EQUAL(2, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
TEST( SymbolicConditional, threeParents ) TEST( SymbolicConditional, threeParents )
{ {
SymbolicConditional c0(0,1,2,3); SymbolicConditional c0(0,1,2,3);
LONGS_EQUAL(1,c0.nrFrontals()) LONGS_EQUAL(1, (long)c0.nrFrontals());
LONGS_EQUAL(3,c0.nrParents()) LONGS_EQUAL(3, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
@ -70,8 +70,8 @@ TEST( SymbolicConditional, fourParents )
{ {
SymbolicConditional c0 = SymbolicConditional::FromKeys( SymbolicConditional c0 = SymbolicConditional::FromKeys(
list_of(0)(1)(2)(3)(4), 1); list_of(0)(1)(2)(3)(4), 1);
LONGS_EQUAL(1,c0.nrFrontals()) LONGS_EQUAL(1, (long)c0.nrFrontals());
LONGS_EQUAL(4,c0.nrParents()) LONGS_EQUAL(4, (long)c0.nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */
@ -80,8 +80,8 @@ TEST( SymbolicConditional, FromRange )
SymbolicConditional::shared_ptr c0 = SymbolicConditional::shared_ptr c0 =
boost::make_shared<SymbolicConditional>( boost::make_shared<SymbolicConditional>(
SymbolicConditional::FromKeys(list_of(1)(2)(3)(4)(5), 2)); SymbolicConditional::FromKeys(list_of(1)(2)(3)(4)(5), 2));
LONGS_EQUAL(2,c0->nrFrontals()) LONGS_EQUAL(2, (long)c0->nrFrontals());
LONGS_EQUAL(3,c0->nrParents()) LONGS_EQUAL(3, (long)c0->nrParents());
} }
/* ************************************************************************* */ /* ************************************************************************* */