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

Reducing errors in check* libraries when compiling

release/4.3a0
Clark Taylor 2019-07-15 20:19:00 -04:00
parent e28fb84fef
commit a49ed61a58
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/inference/tests/testKey.cpp
View File

@ -76,7 +76,7 @@ TEST(Key, ChrTest) {
/* ************************************************************************* */ /* ************************************************************************* */
// A custom (nonsensical) formatter. // A custom (nonsensical) formatter.
string myFormatter(Key key) { string keyMyFormatter(Key key) {
return "special"; return "special";
} }
@ -91,7 +91,7 @@ TEST(Key, Formatting) {
// use key_formatter with a function pointer // use key_formatter with a function pointer
stringstream ss2; stringstream ss2;
ss2 << key_formatter(myFormatter) << StreamedKey(key); ss2 << key_formatter(keyMyFormatter) << StreamedKey(key);
EXPECT("special" == ss2.str()); EXPECT("special" == ss2.str());
// use key_formatter with a function object. // use key_formatter with a function object.

4
gtsam/inference/tests/testLabeledSymbol.cpp
View File

@ -81,7 +81,7 @@ TEST(LabeledSymbol, ChrTest) {
/* ************************************************************************* */ /* ************************************************************************* */
// A custom (nonsensical) formatter. // A custom (nonsensical) formatter.
string myFormatter(Key key) { string labeledSymbolMyFormatter(Key key) {
return "special"; return "special";
} }
@ -90,7 +90,7 @@ TEST(LabeledSymbol, Formatting) {
// use key_formatter with a function pointer // use key_formatter with a function pointer
stringstream ss2; stringstream ss2;
ss2 << key_formatter(myFormatter) << symbol; ss2 << key_formatter(labeledSymbolMyFormatter) << symbol;
EXPECT("special" == ss2.str()); EXPECT("special" == ss2.str());
// use key_formatter with a function object. // use key_formatter with a function object.

4
gtsam/inference/tests/testSymbol.cpp
View File

@ -23,7 +23,7 @@ using namespace gtsam;
/* ************************************************************************* */ /* ************************************************************************* */
// A custom (nonsensical) formatter. // A custom (nonsensical) formatter.
string myFormatter(Key key) { string symbolMyFormatter(Key key) {
return "special"; return "special";
} }
@ -32,7 +32,7 @@ TEST(Symbol, Formatting) {
// use key_formatter with a function pointer // use key_formatter with a function pointer
stringstream ss2; stringstream ss2;
ss2 << key_formatter(myFormatter) << symbol; ss2 << key_formatter(symbolMyFormatter) << symbol;
EXPECT("special" == ss2.str()); EXPECT("special" == ss2.str());
// use key_formatter with a function object. // use key_formatter with a function object.

10
timing/timeGaussianFactorGraph.cpp
View File

@ -153,13 +153,13 @@ TEST(timeGaussianFactorGraph, linearTime)
// Switch to 100*100 grid = 10K poses // Switch to 100*100 grid = 10K poses
// 1879: 15.6498 15.3851 15.5279 // 1879: 15.6498 15.3851 15.5279
int size = 100; int grid_size = 100;
/* ************************************************************************* */ /* ************************************************************************* */
TEST(timeGaussianFactorGraph, planar_old) TEST(timeGaussianFactorGraph, planar_old)
{ {
cout << "Timing planar - original version" << endl; cout << "Timing planar - original version" << endl;
double time = timePlanarSmoother(size); double time = timePlanarSmoother(grid_size);
cout << "timeGaussianFactorGraph : " << time << endl; cout << "timeGaussianFactorGraph : " << time << endl;
//DOUBLES_EQUAL(5.97,time,0.1); //DOUBLES_EQUAL(5.97,time,0.1);
} }
@ -168,7 +168,7 @@ TEST(timeGaussianFactorGraph, planar_old)
TEST(timeGaussianFactorGraph, planar_new) TEST(timeGaussianFactorGraph, planar_new)
{ {
cout << "Timing planar - new version" << endl; cout << "Timing planar - new version" << endl;
double time = timePlanarSmoother(size, false); double time = timePlanarSmoother(grid_size, false);
cout << "timeGaussianFactorGraph : " << time << endl; cout << "timeGaussianFactorGraph : " << time << endl;
//DOUBLES_EQUAL(5.97,time,0.1); //DOUBLES_EQUAL(5.97,time,0.1);
} }
@ -177,7 +177,7 @@ TEST(timeGaussianFactorGraph, planar_new)
TEST(timeGaussianFactorGraph, planar_eliminate_old) TEST(timeGaussianFactorGraph, planar_eliminate_old)
{ {
cout << "Timing planar Eliminate - original version" << endl; cout << "Timing planar Eliminate - original version" << endl;
double time = timePlanarSmootherEliminate(size); double time = timePlanarSmootherEliminate(grid_size);
cout << "timeGaussianFactorGraph : " << time << endl; cout << "timeGaussianFactorGraph : " << time << endl;
//DOUBLES_EQUAL(5.97,time,0.1); //DOUBLES_EQUAL(5.97,time,0.1);
} }
@ -186,7 +186,7 @@ TEST(timeGaussianFactorGraph, planar_eliminate_old)
TEST(timeGaussianFactorGraph, planar_eliminate_new) TEST(timeGaussianFactorGraph, planar_eliminate_new)
{ {
cout << "Timing planar Eliminate - new version" << endl; cout << "Timing planar Eliminate - new version" << endl;
double time = timePlanarSmootherEliminate(size, false); double time = timePlanarSmootherEliminate(grid_size, false);
cout << "timeGaussianFactorGraph : " << time << endl; cout << "timeGaussianFactorGraph : " << time << endl;
//DOUBLES_EQUAL(5.97,time,0.1); //DOUBLES_EQUAL(5.97,time,0.1);
} }