From 82df8193b677eec5bb910a0f689eb1cebfc94971 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Fri, 12 Jul 2013 22:27:52 +0000 Subject: [PATCH] Changed back to single-threaded elimination for now, until the code is optimized --- gtsam/inference/JunctionTreeUnordered-inst.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtsam/inference/JunctionTreeUnordered-inst.h b/gtsam/inference/JunctionTreeUnordered-inst.h index 1afb6c91e..c663c431d 100644 --- a/gtsam/inference/JunctionTreeUnordered-inst.h +++ b/gtsam/inference/JunctionTreeUnordered-inst.h @@ -237,11 +237,12 @@ namespace gtsam { std::pair, boost::shared_ptr > JunctionTreeUnordered::eliminate(const Eliminate& function) const { + gttic(JunctionTreeUnordered_eliminate); // Do elimination (depth-first traversal). The rootsContainer stores a 'dummy' BayesTree node // that contains all of the roots as its children. rootsContainer also stores the remaining // uneliminated factors passed up from the roots. EliminationData rootsContainer(0, roots_.size()); - treeTraversal::DepthFirstForestParallel(*this, rootsContainer, eliminationPreOrderVisitor, + treeTraversal::DepthFirstForest(*this, rootsContainer, eliminationPreOrderVisitor, boost::bind(eliminationPostOrderVisitor, _1, _2, function)); // Create BayesTree from roots stored in the dummy BayesTree node.