Added not merged modifications

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@453 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 03:25:44 +00:00
parent a2eb8bcab6
commit f9b97fb638
5 changed files with 12 additions and 10 deletions

View File

@@ -14,6 +14,7 @@ ENDIF()
IF(CPPUNIT_FOUND)
ADD_SUBDIRECTORY( tests )
#MESSAGE(STATUS "Tests are desactivated...")
ELSE(CPPUNIT_FOUND)
MESSAGE(STATUS "CppUnit is not found, tests for the ${PROJECT_NAME} project won't be compiled...")
ENDIF(CPPUNIT_FOUND)

View File

@@ -427,7 +427,7 @@ int main(int argc, char * argv[])
std::list<std::vector<float> > actions;
while(loopDataset <= repeat && g_forever)
{
SMState * smState = camera->takeImage();
SMState * smState = camera->takeSMState();
int i=0;
while(smState && g_forever)
{
@@ -456,7 +456,7 @@ int main(int argc, char * argv[])
{
++countLoopDetected;
}
smState = camera->takeImage();
smState = camera->takeSMState();
if(++count % 100 == 0)
{
printf(" count = %d, loop closures = %d\n", count, countLoopDetected);

View File

@@ -5,6 +5,7 @@ SET(SRC_FILES
Memory.cpp
KeypointMemory.cpp
SMMemory.cpp
DBDriverFactory.cpp
DBDriver.cpp

View File

@@ -31,14 +31,14 @@
class Tests : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE( Tests );
CPPUNIT_TEST( testAvpd );
CPPUNIT_TEST( testDBDriverFactory );
//CPPUNIT_TEST( testAvpd );
//CPPUNIT_TEST( testDBDriverFactory );
CPPUNIT_TEST( testSqlite3Database );
CPPUNIT_TEST( testBayesFilter );
CPPUNIT_TEST( testKeypointMemory );
//CPPUNIT_TEST( testKeypointMemory );
CPPUNIT_TEST( testCamera );
CPPUNIT_TEST( testVWDictionary );
CPPUNIT_TEST( testVerifyHypotheses );
//CPPUNIT_TEST( testVWDictionary );
//CPPUNIT_TEST( testVerifyHypotheses );
CPPUNIT_TEST_SUITE_END();
private:
@@ -53,7 +53,7 @@ public:
ULogger::reset();
ULogger::setType(ULogger::kTypeConsole);
ULogger::setLevel(ULogger::kError);
//Util::Logger::setLevel(Util::Logger::kDebug);
//ULogger::setLevel(ULogger::kDebug);
}
void tearDown()