From 6410205e7891e2353a0b10566818f9a8f7007836 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sun, 11 Aug 2013 18:18:06 +0000 Subject: [PATCH] Fixed warnings --- tests/testGaussianISAM2.cpp | 2 -- tests/testNonlinearFactor.cpp | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp index 6fd6cba92..feaad5c92 100644 --- a/tests/testGaussianISAM2.cpp +++ b/tests/testGaussianISAM2.cpp @@ -37,8 +37,6 @@ using boost::shared_ptr; const double tol = 1e-4; -#define TEST TEST_UNSAFE - // SETDEBUG("ISAM2 update", true); // SETDEBUG("ISAM2 update verbose", true); // SETDEBUG("ISAM2 recalculate", true); diff --git a/tests/testNonlinearFactor.cpp b/tests/testNonlinearFactor.cpp index a64971b36..f7b212fd7 100644 --- a/tests/testNonlinearFactor.cpp +++ b/tests/testNonlinearFactor.cpp @@ -273,10 +273,10 @@ TEST(NonlinearFactor, NoiseModelFactor4) { EXPECT(assert_equal(Vector_(1, 10.0), tf.unwhitenedError(tv))); DOUBLES_EQUAL(25.0/2.0, tf.error(tv), 1e-9); JacobianFactor jf(*boost::dynamic_pointer_cast(tf.linearize(tv))); - LONGS_EQUAL(X(1), (long)jf.keys()[0]); - LONGS_EQUAL(X(2), (long)jf.keys()[1]); - LONGS_EQUAL(X(3), (long)jf.keys()[2]); - LONGS_EQUAL(X(4), (long)jf.keys()[3]); + LONGS_EQUAL((long)X(1), (long)jf.keys()[0]); + LONGS_EQUAL((long)X(2), (long)jf.keys()[1]); + LONGS_EQUAL((long)X(3), (long)jf.keys()[2]); + LONGS_EQUAL((long)X(4), (long)jf.keys()[3]); EXPECT(assert_equal(Matrix_(1,1, 0.5), jf.getA(jf.begin()))); EXPECT(assert_equal(Matrix_(1,1, 1.0), jf.getA(jf.begin()+1))); EXPECT(assert_equal(Matrix_(1,1, 1.5), jf.getA(jf.begin()+2))); @@ -320,11 +320,11 @@ TEST(NonlinearFactor, NoiseModelFactor5) { EXPECT(assert_equal(Vector_(1, 15.0), tf.unwhitenedError(tv))); DOUBLES_EQUAL(56.25/2.0, tf.error(tv), 1e-9); JacobianFactor jf(*boost::dynamic_pointer_cast(tf.linearize(tv))); - LONGS_EQUAL(X(1), (long)jf.keys()[0]); - LONGS_EQUAL(X(2), (long)jf.keys()[1]); - LONGS_EQUAL(X(3), (long)jf.keys()[2]); - LONGS_EQUAL(X(4), (long)jf.keys()[3]); - LONGS_EQUAL(X(5), (long)jf.keys()[4]); + LONGS_EQUAL((long)X(1), (long)jf.keys()[0]); + LONGS_EQUAL((long)X(2), (long)jf.keys()[1]); + LONGS_EQUAL((long)X(3), (long)jf.keys()[2]); + LONGS_EQUAL((long)X(4), (long)jf.keys()[3]); + LONGS_EQUAL((long)X(5), (long)jf.keys()[4]); EXPECT(assert_equal(Matrix_(1,1, 0.5), jf.getA(jf.begin()))); EXPECT(assert_equal(Matrix_(1,1, 1.0), jf.getA(jf.begin()+1))); EXPECT(assert_equal(Matrix_(1,1, 1.5), jf.getA(jf.begin()+2))); @@ -373,12 +373,12 @@ TEST(NonlinearFactor, NoiseModelFactor6) { EXPECT(assert_equal(Vector_(1, 21.0), tf.unwhitenedError(tv))); DOUBLES_EQUAL(110.25/2.0, tf.error(tv), 1e-9); JacobianFactor jf(*boost::dynamic_pointer_cast(tf.linearize(tv))); - LONGS_EQUAL(X(1), (long)jf.keys()[0]); - LONGS_EQUAL(X(2), (long)jf.keys()[1]); - LONGS_EQUAL(X(3), (long)jf.keys()[2]); - LONGS_EQUAL(X(4), (long)jf.keys()[3]); - LONGS_EQUAL(X(5), (long)jf.keys()[4]); - LONGS_EQUAL(X(6), (long)jf.keys()[5]); + LONGS_EQUAL((long)X(1), (long)jf.keys()[0]); + LONGS_EQUAL((long)X(2), (long)jf.keys()[1]); + LONGS_EQUAL((long)X(3), (long)jf.keys()[2]); + LONGS_EQUAL((long)X(4), (long)jf.keys()[3]); + LONGS_EQUAL((long)X(5), (long)jf.keys()[4]); + LONGS_EQUAL((long)X(6), (long)jf.keys()[5]); EXPECT(assert_equal(Matrix_(1,1, 0.5), jf.getA(jf.begin()))); EXPECT(assert_equal(Matrix_(1,1, 1.0), jf.getA(jf.begin()+1))); EXPECT(assert_equal(Matrix_(1,1, 1.5), jf.getA(jf.begin()+2)));