12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use brace init

release/4.3a0
Frank Dellaert 2025-01-27 23:50:08 -05:00
parent 460a9a958e
commit b8f265d69f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/discrete/DiscreteSearch.cpp
View File

@ -159,7 +159,7 @@ DiscreteSearch::DiscreteSearch(const DiscreteEliminationTree& etree) {
: DiscreteFactorGraph(factors).product(); : DiscreteFactorGraph(factors).product();
const size_t cardinality = factor->cardinality(node->key); const size_t cardinality = factor->cardinality(node->key);
std::vector<std::pair<Key, size_t>> pairs{{node->key, cardinality}}; std::vector<std::pair<Key, size_t>> pairs{{node->key, cardinality}};
const Slot slot(factor, DiscreteValues::CartesianProduct(pairs), 0.0); const Slot slot{factor, DiscreteValues::CartesianProduct(pairs), 0.0};
slots_.emplace_back(std::move(slot)); slots_.emplace_back(std::move(slot));
return data + 1; return data + 1;
}; };
@ -181,7 +181,7 @@ DiscreteSearch::DiscreteSearch(const DiscreteJunctionTree& junctionTree) {
for (Key key : cluster->orderedFrontalKeys) { for (Key key : cluster->orderedFrontalKeys) {
pairs.emplace_back(key, factor->cardinality(key)); pairs.emplace_back(key, factor->cardinality(key));
} }
const Slot slot(factor, DiscreteValues::CartesianProduct(pairs), 0.0); const Slot slot{factor, DiscreteValues::CartesianProduct(pairs), 0.0};
slots_.emplace_back(std::move(slot)); slots_.emplace_back(std::move(slot));
return data + 1; return data + 1;
}; };
@ -207,7 +207,7 @@ DiscreteSearch DiscreteSearch::FromFactorGraph(
DiscreteSearch::DiscreteSearch(const DiscreteBayesNet& bayesNet) { DiscreteSearch::DiscreteSearch(const DiscreteBayesNet& bayesNet) {
slots_.reserve(bayesNet.size()); slots_.reserve(bayesNet.size());
for (auto& conditional : bayesNet) { for (auto& conditional : bayesNet) {
const Slot slot(conditional, conditional->frontalAssignments(), 0.0); const Slot slot{conditional, conditional->frontalAssignments(), 0.0};
slots_.emplace_back(std::move(slot)); slots_.emplace_back(std::move(slot));
} }
lowerBound_ = computeHeuristic(); lowerBound_ = computeHeuristic();
@ -219,7 +219,7 @@ DiscreteSearch::DiscreteSearch(const DiscreteBayesTree& bayesTree) {
if (!clique) return; if (!clique) return;
for (const auto& child : clique->children) collectConditionals(child); for (const auto& child : clique->children) collectConditionals(child);
auto conditional = clique->conditional(); auto conditional = clique->conditional();
const Slot slot(conditional, conditional->frontalAssignments(), 0.0); const Slot slot{conditional, conditional->frontalAssignments(), 0.0};
slots_.emplace_back(std::move(slot)); slots_.emplace_back(std::move(slot));
}; };