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

Merged in fix/no-deprecated-partition-errors (pull request #358) 

Fix trivial compiler errors
release/4.3a0
Chris Beall 2018-12-27 20:49:59 +00:00
parent 58ef0dceb6 f4d1fec558
commit 94cf67b398
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtsam_unstable/partition/GenericGraph.cpp
View File

@ -47,15 +47,15 @@ namespace gtsam { namespace partition {
toErase.push_back(itFactor); nrFactors--; continue; toErase.push_back(itFactor); nrFactors--; continue;
} }
size_t label1 = dsf.findSet(key1.index); size_t label1 = dsf.find(key1.index);
size_t label2 = dsf.findSet(key2.index); size_t label2 = dsf.find(key2.index);
if (label1 == label2) { toErase.push_back(itFactor); nrFactors--; continue; } if (label1 == label2) { toErase.push_back(itFactor); nrFactors--; continue; }
// merge two trees if the connection is strong enough, otherwise cache it // merge two trees if the connection is strong enough, otherwise cache it
// an odometry factor always merges two islands // an odometry factor always merges two islands
if (key1.type == NODE_POSE_2D && key2.type == NODE_POSE_2D) { if (key1.type == NODE_POSE_2D && key2.type == NODE_POSE_2D) {
toErase.push_back(itFactor); nrFactors--; toErase.push_back(itFactor); nrFactors--;
dsf.makeUnionInPlace(label1, label2); dsf.merge(label1, label2);
succeed = true; succeed = true;
break; break;
} }
@ -64,7 +64,7 @@ namespace gtsam { namespace partition {
if ((dsf.isSingleton(label1)==1 && key1.type == NODE_LANDMARK_2D) || if ((dsf.isSingleton(label1)==1 && key1.type == NODE_LANDMARK_2D) ||
(dsf.isSingleton(label2)==1 && key2.type == NODE_LANDMARK_2D)) { (dsf.isSingleton(label2)==1 && key2.type == NODE_LANDMARK_2D)) {
toErase.push_back(itFactor); nrFactors--; toErase.push_back(itFactor); nrFactors--;
dsf.makeUnionInPlace(label1, label2); dsf.merge(label1, label2);
succeed = true; succeed = true;
break; break;
} }
@ -87,7 +87,7 @@ namespace gtsam { namespace partition {
} else { } else {
toErase.push_back(itFactor); nrFactors--; toErase.push_back(itFactor); nrFactors--;
toErase.push_back(itCached->second); nrFactors--; toErase.push_back(itCached->second); nrFactors--;
dsf.makeUnionInPlace(label1, label2); dsf.merge(label1, label2);
connections.erase(itCached); connections.erase(itCached);
succeed = true; succeed = true;
break; break;
@ -150,8 +150,8 @@ namespace gtsam { namespace partition {
} }
if (graph.size() == 178765) cout << "kai22" << endl; if (graph.size() == 178765) cout << "kai22" << endl;
size_t label1 = dsf.findSet(key1.index); size_t label1 = dsf.find(key1.index);
size_t label2 = dsf.findSet(key2.index); size_t label2 = dsf.find(key2.index);
if (label1 == label2) { toErase.push_back(itFactor); nrFactors--; continue; } if (label1 == label2) { toErase.push_back(itFactor); nrFactors--; continue; }
if (graph.size() == 178765) cout << "kai23" << endl; if (graph.size() == 178765) cout << "kai23" << endl;
@ -160,7 +160,7 @@ namespace gtsam { namespace partition {
if ((key1.type == NODE_POSE_3D && key2.type == NODE_LANDMARK_3D) || if ((key1.type == NODE_POSE_3D && key2.type == NODE_LANDMARK_3D) ||
(key1.type == NODE_POSE_3D && key2.type == NODE_POSE_3D)) { (key1.type == NODE_POSE_3D && key2.type == NODE_POSE_3D)) {
toErase.push_back(itFactor); nrFactors--; toErase.push_back(itFactor); nrFactors--;
dsf.makeUnionInPlace(label1, label2); dsf.merge(label1, label2);
succeed = true; succeed = true;
break; break;
} }