i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added not merged modifications

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Matlab/Tests/TestBayesFilter.m
View File

@@ -4,7 +4,7 @@ clear all
% Test AvpdCore::BayesFilter::computePosterior() % Test AvpdCore::BayesFilter::computePosterior()
prior = 1; prior = 1;
predictionNP = 0.9; predictionNP = 0.9;
predictionLC = [0 0.22 0.19 0.25 0.04 0.1 0.02 0.04 0.01 0.01]; predictionLC = [0.1 0.24 0.18 0.18 0.1 0.1 0.04 0.04 0.01 0.01];
likelihood = []; likelihood = [];
nIter = 10; nIter = 10;
@@ -28,7 +28,7 @@ end
computePosteriorResult = floor(computePosteriorResult*1000)'; computePosteriorResult = floor(computePosteriorResult*1000)';
disp('computePosteriorResult='); disp('computePosteriorResult=');
disp(computePosteriorResult); disp(computePosteriorResult);
r = sum(sum((computePosteriorResult - [1000,0,0,0,0,0,0,0,0,0;900,99,0,0,0,0,0,0,0,0;810,113,75,0,0,0,0,0,0,0;729,109,96,64,0,0,0,0,0,0;656,100,98,87,56,0,0,0,0,0;590,93,95,93,78,49,0,0,0,0;531,86,90,92,85,69,42,0,0,0;478,80,86,90,86,77,62,37,0,0;430,75,81,87,86,80,70,55,33,0;387,69,77,83,84,80,73,63,49,29;]) ~= 0)); r = sum(sum((computePosteriorResult - [1000,0,0,0,0,0,0,0,0,0;900,99,0,0,0,0,0,0,0,0;820,117,62,0,0,0,0,0,0,0;756,111,82,50,0,0,0,0,0,0;704,103,84,67,40,0,0,0,0,0;663,96,82,69,54,32,0,0,0,0;631,90,79,69,58,44,26,0,0,0;604,84,76,68,58,48,36,21,0,0;583,79,73,66,58,49,40,30,17,0;567,74,69,64,58,50,41,33,25,14;]) ~= 0));
if r ~= 0 if r ~= 0
error('computePosteriorResult is not valid!') error('computePosteriorResult is not valid!')
end end

1
corelib/CMakeLists.txt
View File

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

4
corelib/ConsoleApp/main.cpp
View File

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

1
corelib/src/CMakeLists.txt
View File

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

12
corelib/tests/Tests.h
View File

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