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

Merged in fix/chart_dead_code (pull request #89) 

removed dead code from old default charts in Values
release/4.3a0
Michael Bosse 2015-01-16 13:25:49 +01:00
parent d79b9fc04b e575f27e4a
commit 5ea30af837
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/Values-inl.h
View File

@ -289,13 +289,13 @@ namespace gtsam {
} }
/* ************************************************************************* */ /* ************************************************************************* */
// insert a plain value using the default chart // insert a templated value
template<typename ValueType> template<typename ValueType>
void Values::insert(Key j, const ValueType& val) { void Values::insert(Key j, const ValueType& val) {
insert(j, static_cast<const Value&>(GenericValue<ValueType>(val))); insert(j, static_cast<const Value&>(GenericValue<ValueType>(val)));
} }
// update with default chart // update with templated value
template <typename ValueType> template <typename ValueType>
void Values::update(Key j, const ValueType& val) { void Values::update(Key j, const ValueType& val) {
update(j, static_cast<const Value&>(GenericValue<ValueType >(val))); update(j, static_cast<const Value&>(GenericValue<ValueType >(val)));

18
gtsam/nonlinear/Values.h
View File

@ -260,7 +260,6 @@ namespace gtsam {
/** Templated version to add a variable with the given j, /** Templated version to add a variable with the given j,
* throws KeyAlreadyExists<J> if j is already present * throws KeyAlreadyExists<J> if j is already present
* if no chart is specified, the DefaultChart<ValueType> is used
*/ */
template <typename ValueType> template <typename ValueType>
void insert(Key j, const ValueType& val); void insert(Key j, const ValueType& val);
@ -272,15 +271,6 @@ namespace gtsam {
/// version for double /// version for double
void insertDouble(Key j, double c) { insert<double>(j,c); } void insertDouble(Key j, double c) { insert<double>(j,c); }
/// overloaded insert version that also specifies a chart
template <typename ValueType, typename Chart>
void insert(Key j, const ValueType& val);
/// overloaded insert version that also specifies a chart initializer
template <typename ValueType, typename Chart>
void insert(Key j, const ValueType& val, Chart chart);
/** insert that mimics the STL map insert - if the value already exists, the map is not modified /** insert that mimics the STL map insert - if the value already exists, the map is not modified
* and an iterator to the existing value is returned, along with 'false'. If the value did not * and an iterator to the existing value is returned, along with 'false'. If the value did not
* exist, it is inserted and an iterator pointing to the new element, along with 'true', is * exist, it is inserted and an iterator pointing to the new element, along with 'true', is
@ -297,14 +287,6 @@ namespace gtsam {
template <typename T> template <typename T>
void update(Key j, const T& val); void update(Key j, const T& val);
/// overloaded insert version that also specifies a chart
template <typename T, typename Chart>
void update(Key j, const T& val);
/// overloaded insert version that also specifies a chart initializer
template <typename T, typename Chart>
void update(Key j, const T& val, Chart chart);
/** update the current available values without adding new ones */ /** update the current available values without adding new ones */
void update(const Values& values); void update(const Values& values);