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

change from DiscreteValues to Assignment<Key>

release/4.3a0
Varun Agrawal 2024-12-08 11:19:35 -05:00
parent aa25ccfa6e
commit 90d7e21941
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam_unstable/discrete/AllDiff.cpp
View File

@ -26,7 +26,7 @@ void AllDiff::print(const std::string& s, const KeyFormatter& formatter) const {
} }
/* ************************************************************************* */ /* ************************************************************************* */
double AllDiff::operator()(const DiscreteValues& values) const { double AllDiff::operator()(const Assignment<Key>& values) const {
std::set<size_t> taken; // record values taken by keys std::set<size_t> taken; // record values taken by keys
for (Key dkey : keys_) { for (Key dkey : keys_) {
size_t value = values.at(dkey); // get the value for that key size_t value = values.at(dkey); // get the value for that key

2
gtsam_unstable/discrete/AllDiff.h
View File

@ -45,7 +45,7 @@ class GTSAM_UNSTABLE_EXPORT AllDiff : public Constraint {
} }
/// Calculate value = expensive ! /// Calculate value = expensive !
double operator()(const DiscreteValues& values) const override; double operator()(const Assignment<Key>& values) const override;
/// Convert into a decisiontree, can be *very* expensive ! /// Convert into a decisiontree, can be *very* expensive !
DecisionTreeFactor toDecisionTreeFactor() const override; DecisionTreeFactor toDecisionTreeFactor() const override;

2
gtsam_unstable/discrete/BinaryAllDiff.h
View File

@ -47,7 +47,7 @@ class BinaryAllDiff : public Constraint {
} }
/// Calculate value /// Calculate value
double operator()(const DiscreteValues& values) const override { double operator()(const Assignment<Key>& values) const override {
return (double)(values.at(keys_[0]) != values.at(keys_[1])); return (double)(values.at(keys_[0]) != values.at(keys_[1]));
} }

2
gtsam_unstable/discrete/Domain.cpp
View File

@ -30,7 +30,7 @@ string Domain::base1Str() const {
} }
/* ************************************************************************* */ /* ************************************************************************* */
double Domain::operator()(const DiscreteValues& values) const { double Domain::operator()(const Assignment<Key>& values) const {
return contains(values.at(key())); return contains(values.at(key()));
} }

2
gtsam_unstable/discrete/Domain.h
View File

@ -82,7 +82,7 @@ class GTSAM_UNSTABLE_EXPORT Domain : public Constraint {
bool contains(size_t value) const { return values_.count(value) > 0; } bool contains(size_t value) const { return values_.count(value) > 0; }
/// Calculate value /// Calculate value
double operator()(const DiscreteValues& values) const override; double operator()(const Assignment<Key>& values) const override;
/// Convert into a decisiontree /// Convert into a decisiontree
DecisionTreeFactor toDecisionTreeFactor() const override; DecisionTreeFactor toDecisionTreeFactor() const override;