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

simplify code

release/4.3a0
Varun Agrawal 2023-01-04 02:55:37 -05:00
parent 7dd4bc990a
commit b16480bab1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/discrete/DecisionTreeFactor.cpp
View File

@ -156,9 +156,9 @@ namespace gtsam {
std::vector<std::pair<DiscreteValues, double>> DecisionTreeFactor::enumerate() std::vector<std::pair<DiscreteValues, double>> DecisionTreeFactor::enumerate()
const { const {
// Get all possible assignments // Get all possible assignments
std::vector<std::pair<Key, size_t>> pairs = discreteKeys(); DiscreteKeys pairs = discreteKeys();
// Reverse to make cartesian product output a more natural ordering. // Reverse to make cartesian product output a more natural ordering.
std::vector<std::pair<Key, size_t>> rpairs(pairs.rbegin(), pairs.rend()); DiscreteKeys rpairs(pairs.rbegin(), pairs.rend());
const auto assignments = DiscreteValues::CartesianProduct(rpairs); const auto assignments = DiscreteValues::CartesianProduct(rpairs);
// Construct unordered_map with values // Construct unordered_map with values

1
gtsam/hybrid/HybridDiscreteFactor.cpp
View File

@ -26,7 +26,6 @@
namespace gtsam { namespace gtsam {
/* ************************************************************************ */ /* ************************************************************************ */
// TODO(fan): THIS IS VERY VERY DIRTY! We need to get DiscreteFactor right!
HybridDiscreteFactor::HybridDiscreteFactor(DiscreteFactor::shared_ptr other) HybridDiscreteFactor::HybridDiscreteFactor(DiscreteFactor::shared_ptr other)
: Base(boost::dynamic_pointer_cast<DecisionTreeFactor>(other) : Base(boost::dynamic_pointer_cast<DecisionTreeFactor>(other)
->discreteKeys()), ->discreteKeys()),