remove extraneous argument 'ordering' from SubGraphBuilder::buildTree
parent
b5a1e9699a
commit
3b745d39e8
|
|
@ -219,7 +219,6 @@ std::string SubgraphBuilderParameters::augmentationWeightTranslator(
|
||||||
|
|
||||||
/****************************************************************/
|
/****************************************************************/
|
||||||
vector<size_t> SubgraphBuilder::buildTree(const GaussianFactorGraph &gfg,
|
vector<size_t> SubgraphBuilder::buildTree(const GaussianFactorGraph &gfg,
|
||||||
const FastMap<Key, size_t> &ordering,
|
|
||||||
const vector<double> &weights) const {
|
const vector<double> &weights) const {
|
||||||
const SubgraphBuilderParameters &p = parameters_;
|
const SubgraphBuilderParameters &p = parameters_;
|
||||||
switch (p.skeletonType) {
|
switch (p.skeletonType) {
|
||||||
|
|
@ -336,7 +335,7 @@ Subgraph SubgraphBuilder::operator()(const GaussianFactorGraph &gfg) const {
|
||||||
vector<double> weights = this->weights(gfg);
|
vector<double> weights = this->weights(gfg);
|
||||||
|
|
||||||
// Build spanning tree.
|
// Build spanning tree.
|
||||||
const vector<size_t> tree = buildTree(gfg, forward_ordering, weights);
|
const vector<size_t> tree = buildTree(gfg, weights);
|
||||||
if (tree.size() != n - 1) {
|
if (tree.size() != n - 1) {
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"SubgraphBuilder::operator() failure: tree.size() != n-1, might be caused by disconnected graph");
|
"SubgraphBuilder::operator() failure: tree.size() != n-1, might be caused by disconnected graph");
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,6 @@ class GTSAM_EXPORT SubgraphBuilder {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<size_t> buildTree(const GaussianFactorGraph &gfg,
|
std::vector<size_t> buildTree(const GaussianFactorGraph &gfg,
|
||||||
const FastMap<Key, size_t> &ordering,
|
|
||||||
const std::vector<double> &weights) const;
|
const std::vector<double> &weights) const;
|
||||||
std::vector<size_t> unary(const GaussianFactorGraph &gfg) const;
|
std::vector<size_t> unary(const GaussianFactorGraph &gfg) const;
|
||||||
std::vector<size_t> natural_chain(const GaussianFactorGraph &gfg) const;
|
std::vector<size_t> natural_chain(const GaussianFactorGraph &gfg) const;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue