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

Return a set of DiscreteKey, Fixes issue #1384

release/4.3a0
Frank Dellaert 2023-01-11 23:50:17 -08:00
parent 28f440a623
commit f4c3131ee2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/hybrid/HybridFactorGraph.cpp
View File

@ -25,17 +25,17 @@
namespace gtsam { namespace gtsam {
/* ************************************************************************* */ /* ************************************************************************* */
DiscreteKeys HybridFactorGraph::discreteKeys() const { std::set<DiscreteKey> HybridFactorGraph::discreteKeys() const {
DiscreteKeys keys; std::set<DiscreteKey> keys;
for (auto& factor : factors_) { for (auto& factor : factors_) {
if (auto p = boost::dynamic_pointer_cast<DecisionTreeFactor>(factor)) { if (auto p = boost::dynamic_pointer_cast<DecisionTreeFactor>(factor)) {
for (const DiscreteKey& key : p->discreteKeys()) { for (const DiscreteKey& key : p->discreteKeys()) {
keys.push_back(key); keys.insert(key);
} }
} }
if (auto p = boost::dynamic_pointer_cast<HybridFactor>(factor)) { if (auto p = boost::dynamic_pointer_cast<HybridFactor>(factor)) {
for (const DiscreteKey& key : p->discreteKeys()) { for (const DiscreteKey& key : p->discreteKeys()) {
keys.push_back(key); keys.insert(key);
} }
} }
} }

2
gtsam/hybrid/HybridFactorGraph.h
View File

@ -65,7 +65,7 @@ class HybridFactorGraph : public FactorGraph<Factor> {
/// @{ /// @{
/// Get all the discrete keys in the factor graph. /// Get all the discrete keys in the factor graph.
DiscreteKeys discreteKeys() const; std::set<DiscreteKey> discreteKeys() const;
/// Get all the discrete keys in the factor graph, as a set. /// Get all the discrete keys in the factor graph, as a set.
KeySet discreteKeySet() const; KeySet discreteKeySet() const;