diff --git a/gtsam/base/kruskal-inl.h b/gtsam/base/kruskal-inl.h index 73dcf9298..7f1a30151 100644 --- a/gtsam/base/kruskal-inl.h +++ b/gtsam/base/kruskal-inl.h @@ -52,7 +52,6 @@ inline std::vector sortedIndices(const std::vector &src) { /****************************************************************/ template std::vector kruskal(const Graph &fg, - const FastMap &ordering, const std::vector &weights) { // Create an index from variables to factor indices. const VariableIndex variableIndex(fg); @@ -66,7 +65,7 @@ std::vector kruskal(const Graph &fg, std::vector treeIndices; treeIndices.reserve(n - 1); - // Initialize disjoint-set forest to keep track of merged 'blah'. + // Initialize disjoint-set forest to keep track of merged Keys. DSFMap dsf; // Loop over all edges in order of increasing weight. diff --git a/gtsam/base/kruskal.h b/gtsam/base/kruskal.h index f8f648018..8f5d75966 100644 --- a/gtsam/base/kruskal.h +++ b/gtsam/base/kruskal.h @@ -24,7 +24,6 @@ namespace gtsam::utils { template std::vector kruskal(const FactorGraph &fg, - const FastMap &ordering, const std::vector &weights); } diff --git a/gtsam/linear/SubgraphBuilder.cpp b/gtsam/linear/SubgraphBuilder.cpp index 0d899cb11..b787a87ea 100644 --- a/gtsam/linear/SubgraphBuilder.cpp +++ b/gtsam/linear/SubgraphBuilder.cpp @@ -230,7 +230,7 @@ vector SubgraphBuilder::buildTree(const GaussianFactorGraph &gfg, return bfs(gfg); break; case SubgraphBuilderParameters::KRUSKAL: - return kruskal(gfg, ordering, weights); + return kruskal(gfg, weights); break; default: std::cerr << "SubgraphBuilder::buildTree undefined skeleton type" << endl; @@ -306,9 +306,8 @@ vector SubgraphBuilder::bfs(const GaussianFactorGraph &gfg) const { /****************************************************************/ vector SubgraphBuilder::kruskal(const GaussianFactorGraph &gfg, - const FastMap &ordering, const vector &weights) const { - return utils::kruskal(gfg, ordering, weights); + return utils::kruskal(gfg, weights); } /****************************************************************/ diff --git a/gtsam/linear/SubgraphBuilder.h b/gtsam/linear/SubgraphBuilder.h index 34b397cc9..65e288c0d 100644 --- a/gtsam/linear/SubgraphBuilder.h +++ b/gtsam/linear/SubgraphBuilder.h @@ -171,7 +171,6 @@ class GTSAM_EXPORT SubgraphBuilder { std::vector sample(const std::vector &weights, const size_t t) const; std::vector kruskal(const GaussianFactorGraph &gfg, - const FastMap &ordering, const std::vector &weights) const; Weights weights(const GaussianFactorGraph &gfg) const ; diff --git a/gtsam/slam/lago.cpp b/gtsam/slam/lago.cpp index ab8c7bea2..d63d2b8ea 100644 --- a/gtsam/slam/lago.cpp +++ b/gtsam/slam/lago.cpp @@ -230,11 +230,9 @@ static PredecessorMap findOdometricPath( PredecessorMap findMinimumSpanningTree( const NonlinearFactorGraph& pose2Graph) { // Compute the minimum spanning tree - const FastMap forwardOrdering = - Ordering::Natural(pose2Graph).invert(); const auto edgeWeights = std::vector(pose2Graph.size(), 1.0); const auto mstEdgeIndices = - utils::kruskal(pose2Graph, forwardOrdering, edgeWeights); + utils::kruskal(pose2Graph, edgeWeights); // Create a PredecessorMap 'predecessorMap' such that: // predecessorMap[key2] = key1, where key1 is the 'parent' node for key2 in