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

Changed list back to FastList, accidently left from debugging

release/4.3a0
Richard Roberts 2012-02-26 01:50:32 +00:00
parent 7fc9f39918
commit ba5bb0298d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/Values.cpp
View File

@ -152,8 +152,8 @@ namespace gtsam {
} }
/* ************************************************************************* */ /* ************************************************************************* */
std::list<Key> Values::keys() const { FastList<Key> Values::keys() const {
std::list<Key> result; FastList<Key> result;
for(const_iterator key_value = begin(); key_value != end(); ++key_value) { for(const_iterator key_value = begin(); key_value != end(); ++key_value) {
result.push_back(key_value->key); result.push_back(key_value->key);
cout << result.back() << endl; cout << result.back() << endl;

2
gtsam/nonlinear/Values.h
View File

@ -296,7 +296,7 @@ namespace gtsam {
* Returns a set of keys in the config * Returns a set of keys in the config
* Note: by construction, the list is ordered * Note: by construction, the list is ordered
*/ */
std::list<Key> keys() const; FastList<Key> keys() const;
/** Replace all keys and variables */ /** Replace all keys and variables */
Values& operator=(const Values& rhs); Values& operator=(const Values& rhs);

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

@ -218,12 +218,12 @@ TEST(Values, extract_keys)
config.insert(key3, Pose2()); config.insert(key3, Pose2());
config.insert(key4, Pose2()); config.insert(key4, Pose2());
std::list<Key> expected, actual; FastList<Key> expected, actual;
expected += key1, key2, key3, key4; expected += key1, key2, key3, key4;
actual = config.keys(); actual = config.keys();
CHECK(actual.size() == expected.size()); CHECK(actual.size() == expected.size());
std::list<Key>::const_iterator itAct = actual.begin(), itExp = expected.begin(); FastList<Key>::const_iterator itAct = actual.begin(), itExp = expected.begin();
for (; itAct != actual.end() && itExp != expected.end(); ++itAct, ++itExp) { for (; itAct != actual.end() && itExp != expected.end(); ++itAct, ++itExp) {
EXPECT(*itExp == *itAct); EXPECT(*itExp == *itAct);
} }