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

New constructor

release/4.3a0
Frank Dellaert 2022-01-22 11:05:48 -05:00
parent 26890652c4
commit 4cba05a2f7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/discrete/DiscreteKey.cpp
View File

@ -38,11 +38,9 @@ namespace gtsam {
return js; return js;
} }
map<Key,size_t> DiscreteKeys::cardinalities() const { map<Key, size_t> DiscreteKeys::cardinalities() const {
map<Key,size_t> cs; map<Key, size_t> cs;
cs.insert(begin(),end()); cs.insert(begin(), end());
// for(const DiscreteKey& key: *this)
// cs.insert(key);
return cs; return cs;
} }

9
gtsam/discrete/DiscreteKey.h
View File

@ -28,8 +28,8 @@
namespace gtsam { namespace gtsam {
/** /**
* Key type for discrete conditionals * Key type for discrete variables.
* Includes name and cardinality * Includes Key and cardinality.
*/ */
using DiscreteKey = std::pair<Key,size_t>; using DiscreteKey = std::pair<Key,size_t>;
@ -45,6 +45,11 @@ namespace gtsam {
/// Construct from a key /// Construct from a key
explicit DiscreteKeys(const DiscreteKey& key) { push_back(key); } explicit DiscreteKeys(const DiscreteKey& key) { push_back(key); }
/// Construct from cardinalities.
explicit DiscreteKeys(std::map<Key, size_t> cardinalities) {
for (auto&& kv : cardinalities) emplace_back(kv);
}
/// Construct from a vector of keys /// Construct from a vector of keys
DiscreteKeys(const std::vector<DiscreteKey>& keys) : DiscreteKeys(const std::vector<DiscreteKey>& keys) :
std::vector<DiscreteKey>(keys) { std::vector<DiscreteKey>(keys) {