From ba5bb0298dfd1698d1c68847ecc87ab6e00b6de1 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sun, 26 Feb 2012 01:50:32 +0000 Subject: [PATCH] Changed list back to FastList, accidently left from debugging --- gtsam/nonlinear/Values.cpp | 4 ++-- gtsam/nonlinear/Values.h | 2 +- gtsam/nonlinear/tests/testValues.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtsam/nonlinear/Values.cpp b/gtsam/nonlinear/Values.cpp index 6fd99fc76..6a0d9b8d9 100644 --- a/gtsam/nonlinear/Values.cpp +++ b/gtsam/nonlinear/Values.cpp @@ -152,8 +152,8 @@ namespace gtsam { } /* ************************************************************************* */ - std::list Values::keys() const { - std::list result; + FastList Values::keys() const { + FastList result; for(const_iterator key_value = begin(); key_value != end(); ++key_value) { result.push_back(key_value->key); cout << result.back() << endl; diff --git a/gtsam/nonlinear/Values.h b/gtsam/nonlinear/Values.h index abf0d3f8c..b8807646c 100644 --- a/gtsam/nonlinear/Values.h +++ b/gtsam/nonlinear/Values.h @@ -296,7 +296,7 @@ namespace gtsam { * Returns a set of keys in the config * Note: by construction, the list is ordered */ - std::list keys() const; + FastList keys() const; /** Replace all keys and variables */ Values& operator=(const Values& rhs); diff --git a/gtsam/nonlinear/tests/testValues.cpp b/gtsam/nonlinear/tests/testValues.cpp index 99973aa0f..c37759552 100644 --- a/gtsam/nonlinear/tests/testValues.cpp +++ b/gtsam/nonlinear/tests/testValues.cpp @@ -218,12 +218,12 @@ TEST(Values, extract_keys) config.insert(key3, Pose2()); config.insert(key4, Pose2()); - std::list expected, actual; + FastList expected, actual; expected += key1, key2, key3, key4; actual = config.keys(); CHECK(actual.size() == expected.size()); - std::list::const_iterator itAct = actual.begin(), itExp = expected.begin(); + FastList::const_iterator itAct = actual.begin(), itExp = expected.begin(); for (; itAct != actual.end() && itExp != expected.end(); ++itAct, ++itExp) { EXPECT(*itExp == *itAct); }