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

No emplace in case of tbb

release/4.3a0
Frank Dellaert 2023-02-05 10:50:54 -08:00
parent fbc748a1a1
commit cc26756196
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/inference/ClusterTree-inst.h
View File

@ -209,9 +209,13 @@ struct EliminationData {
// Fill nodes index - we do this here instead of calling insertRoot at the end to avoid // Fill nodes index - we do this here instead of calling insertRoot at the end to avoid
// putting orphan subtrees in the index - they'll already be in the index of the ISAM2 // putting orphan subtrees in the index - they'll already be in the index of the ISAM2
// object they're added to. // object they're added to.
for (const Key& j: myData.bayesTreeNode->conditional()->frontals()) for (const Key& j : myData.bayesTreeNode->conditional()->frontals()) {
#ifdef GTSAM_USE_TBB
nodesIndex_.insert({j, myData.bayesTreeNode});
#else
nodesIndex_.emplace(j, myData.bayesTreeNode); nodesIndex_.emplace(j, myData.bayesTreeNode);
#endif
}
// Store remaining factor in parent's gathered factors // Store remaining factor in parent's gathered factors
if (!eliminationResult.second->empty()) { if (!eliminationResult.second->empty()) {
#ifdef GTSAM_USE_TBB #ifdef GTSAM_USE_TBB