diff --git a/examples/UnorderedLinear.cpp b/examples/UnorderedLinear.cpp index 5ee8fb971..f61c96035 100644 --- a/examples/UnorderedLinear.cpp +++ b/examples/UnorderedLinear.cpp @@ -281,7 +281,7 @@ int main(int argc, char *argv[]) compareSolutions(orderedSolnFinal, orderingCOLAMD, unorderedSolnFinal); //GaussianEliminationTreeUnordered(gfgu, orderingUnordered).print("ETree: "); - //GaussianJunctionTreeUnordered(GaussianEliminationTreeUnordered(gfgu, orderingUnordered)).print("JTree: "); + //GaussianJunctionTreeUnordered(GaussianEliminationTreeUnordered(gfgu, OrderingUnordered::COLAMD(gfgu))).print("JTree: "); //gfgu.eliminateMultifrontal(orderingUnordered)->print("BayesTree: "); tictoc_print_(); diff --git a/gtsam/base/treeTraversal-inst.h b/gtsam/base/treeTraversal-inst.h index e02f8c7ed..35b3ee5a4 100644 --- a/gtsam/base/treeTraversal-inst.h +++ b/gtsam/base/treeTraversal-inst.h @@ -267,7 +267,7 @@ namespace gtsam { * root node. */ template void DepthFirstForestParallel(FOREST& forest, DATA& rootData, VISITOR_PRE& visitorPre, VISITOR_POST& visitorPost, - int problemSizeThreshold = 50) + int problemSizeThreshold = 10) { // Typedefs typedef typename FOREST::Node Node; diff --git a/gtsam/inference/JunctionTreeUnordered-inst.h b/gtsam/inference/JunctionTreeUnordered-inst.h index 0915d741a..ea642ce17 100644 --- a/gtsam/inference/JunctionTreeUnordered-inst.h +++ b/gtsam/inference/JunctionTreeUnordered-inst.h @@ -269,7 +269,7 @@ namespace gtsam { EliminationData rootsContainer(0, roots_.size()); //tbb::task_scheduler_init init(1); treeTraversal::DepthFirstForestParallel(*this, rootsContainer, eliminationPreOrderVisitor, - boost::bind(eliminationPostOrderVisitor, _1, _2, function), 5); + boost::bind(eliminationPostOrderVisitor, _1, _2, function), 10); // Create BayesTree from roots stored in the dummy BayesTree node. boost::shared_ptr result = boost::make_shared();