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

Fixed compilation errors

release/4.3a0
Richard Roberts 2012-02-03 22:23:41 +00:00
parent 1ef82b6e84
commit b849fbec16
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtsam/nonlinear/ISAM2.h
View File

@ -315,7 +315,6 @@ public:
typedef BayesTree<CONDITIONAL,ISAM2Clique<CONDITIONAL> > Base; ///< The BayesTree base class typedef BayesTree<CONDITIONAL,ISAM2Clique<CONDITIONAL> > Base; ///< The BayesTree base class
typedef ISAM2<CONDITIONAL> This; ///< This class typedef ISAM2<CONDITIONAL> This; ///< This class
typedef Values Values;
typedef GRAPH Graph; typedef GRAPH Graph;
/** Create an empty ISAM2 instance */ /** Create an empty ISAM2 instance */

20
gtsam/nonlinear/Values.h
View File

@ -82,10 +82,18 @@ namespace gtsam {
typedef boost::shared_ptr<Values> shared_ptr; typedef boost::shared_ptr<Values> shared_ptr;
/// A pair of const references to the key and value, the dereferenced type of the const_iterator and const_reverse_iterator /// A pair of const references to the key and value, the dereferenced type of the const_iterator and const_reverse_iterator
typedef std::pair<const Symbol&, const Value&> ConstKeyValuePair; struct ConstKeyValuePair {
const Symbol& first;
const Value& second;
ConstKeyValuePair(const Symbol& key, const Value& value) : first(key), second(value) {}
};
/// A pair of references to the key and value, the dereferenced type of the iterator and reverse_iterator /// A pair of references to the key and value, the dereferenced type of the iterator and reverse_iterator
typedef std::pair<const Symbol&, Value&> KeyValuePair; struct KeyValuePair {
const Symbol& first;
Value& second;
KeyValuePair(const Symbol& key, Value& value) : first(key), second(value) {}
};
/// Mutable forward iterator, with value type KeyValuePair /// Mutable forward iterator, with value type KeyValuePair
typedef boost::transform_iterator< typedef boost::transform_iterator<
@ -178,10 +186,10 @@ namespace gtsam {
VectorValues zeroVectors(const Ordering& ordering) const; VectorValues zeroVectors(const Ordering& ordering) const;
private: private:
static std::pair<const Symbol&, const Value&> make_const_deref_pair(const KeyValueMap::const_iterator::value_type& key_value) { static ConstKeyValuePair make_const_deref_pair(const KeyValueMap::const_iterator::value_type& key_value) {
return std::make_pair<const Symbol&, const Value&>(key_value.first, *key_value.second); } return ConstKeyValuePair(key_value.first, *key_value.second); }
static std::pair<const Symbol&, Value&> make_deref_pair(const KeyValueMap::iterator::value_type& key_value) { static KeyValuePair make_deref_pair(const KeyValueMap::iterator::value_type& key_value) {
return std::make_pair<const Symbol&, Value&>(key_value.first, *key_value.second); } return KeyValuePair(key_value.first, *key_value.second); }
public: public:
const_iterator begin() const { return boost::make_transform_iterator(values_.begin(), &make_const_deref_pair); } const_iterator begin() const { return boost::make_transform_iterator(values_.begin(), &make_const_deref_pair); }