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

Fixed emplace to align with std

release/4.3a0
Fan Jiang 2020-06-02 17:36:20 -04:00
parent 1fe876aba6
commit 5bf8dc4174
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/linear/VectorValues.cpp
View File

@ -97,17 +97,13 @@ namespace gtsam {
} }
/* ************************************************************************* */ /* ************************************************************************* */
VectorValues::iterator VectorValues::emplace(Key j, const Vector& value) { std::pair<VectorValues::iterator, bool> VectorValues::emplace(Key j, const Vector& value) {
#ifdef TBB_GREATER_EQUAL_2020 #ifdef TBB_GREATER_EQUAL_2020
std::pair<iterator, bool> result = values_.emplace(j, value); std::pair<iterator, bool> result = values_.emplace(j, value);
#else #else
std::pair<iterator, bool> result = values_.insert(std::make_pair(j, value)); std::pair<iterator, bool> result = values_.insert(std::make_pair(j, value));
#endif #endif
if(!result.second) return result;
throw std::invalid_argument(
"Requested to emplace variable '" + DefaultKeyFormatter(j)
+ "' already in this VectorValues.");
return result.first;
} }
/* ************************************************************************* */ /* ************************************************************************* */

2
gtsam/linear/VectorValues.h
View File

@ -179,7 +179,7 @@ namespace gtsam {
* j is already used. * j is already used.
* @param value The vector to be inserted. * @param value The vector to be inserted.
* @param j The index with which the value will be associated. */ * @param j The index with which the value will be associated. */
iterator emplace(Key j, const Vector& value); std::pair<VectorValues::iterator, bool> emplace(Key j, const Vector& value);
/** Insert a vector \c value with key \c j. Throws an invalid_argument exception if the key \c /** Insert a vector \c value with key \c j. Throws an invalid_argument exception if the key \c
* j is already used. * j is already used.

9
gtsam/linear/linearAlgorithms-inst.h
View File

@ -98,8 +98,13 @@ namespace gtsam
// Insert solution into a VectorValues // Insert solution into a VectorValues
DenseIndex vectorPosition = 0; DenseIndex vectorPosition = 0;
for(GaussianConditional::const_iterator frontal = c.beginFrontals(); frontal != c.endFrontals(); ++frontal) { for(GaussianConditional::const_iterator frontal = c.beginFrontals(); frontal != c.endFrontals(); ++frontal) {
VectorValues::const_iterator r = auto result = collectedResult.emplace(*frontal, solution.segment(vectorPosition, c.getDim(frontal)));
collectedResult.emplace(*frontal, solution.segment(vectorPosition, c.getDim(frontal))); if(!result.second)
throw std::invalid_argument(
"Requested to emplace variable '" + DefaultKeyFormatter(*frontal)
+ "' already in this VectorValues.");
VectorValues::const_iterator r = result.first;
myData.cliqueResults.emplace(r->first, r); myData.cliqueResults.emplace(r->first, r);
vectorPosition += c.getDim(frontal); vectorPosition += c.getDim(frontal);
} }