diff --git a/gtsam/inference/JunctionTree-inst.h b/gtsam/inference/JunctionTree-inst.h index 04472f7e3..1c68aa0da 100644 --- a/gtsam/inference/JunctionTree-inst.h +++ b/gtsam/inference/JunctionTree-inst.h @@ -33,7 +33,7 @@ struct ConstructorTraversalData { typedef typename JunctionTree::sharedNode sharedNode; ConstructorTraversalData* const parentData; - sharedNode myJTNode; + sharedNode junctionTreeNode; FastVector childSymbolicConditionals; FastVector childSymbolicFactors; @@ -53,8 +53,9 @@ struct ConstructorTraversalData { // a traversal data structure with its own JT node, and create a child // pointer in its parent. ConstructorTraversalData myData = ConstructorTraversalData(&parentData); - myData.myJTNode = boost::make_shared(node->key, node->factors); - parentData.myJTNode->addChild(myData.myJTNode); + myData.junctionTreeNode = + boost::make_shared(node->key, node->factors); + parentData.junctionTreeNode->addChild(myData.junctionTreeNode); return myData; } @@ -91,7 +92,7 @@ struct ConstructorTraversalData { myData.parentData->childSymbolicConditionals.push_back(myConditional); myData.parentData->childSymbolicFactors.push_back(mySeparatorFactor); - sharedNode node = myData.myJTNode; + sharedNode node = myData.junctionTreeNode; const FastVector& childConditionals = myData.childSymbolicConditionals; node->problemSize_ = (int) (myConditional->size() * symbolicFactors.size()); @@ -138,14 +139,14 @@ JunctionTree::JunctionTree( typedef typename EliminationTree::Node ETreeNode; typedef ConstructorTraversalData Data; Data rootData(0); - rootData.myJTNode = boost::make_shared(); // Make a dummy node to gather - // the junction tree roots + // Make a dummy node to gather the junction tree roots + rootData.junctionTreeNode = boost::make_shared(); treeTraversal::DepthFirstForest(eliminationTree, rootData, Data::ConstructorTraversalVisitorPre, Data::ConstructorTraversalVisitorPostAlg2); // Assign roots from the dummy node - this->addChildrenAsRoots(rootData.myJTNode); + this->addChildrenAsRoots(rootData.junctionTreeNode); // Transfer remaining factors from elimination tree Base::remainingFactors_ = eliminationTree.remainingFactors();