replace set<Key> with KeySet
parent
effcfc7b7a
commit
4d9f27cb28
|
@ -247,7 +247,7 @@ namespace gtsam {
|
||||||
/* ************************************************************************ */
|
/* ************************************************************************ */
|
||||||
std::vector<double> DecisionTreeFactor::probabilities() const {
|
std::vector<double> DecisionTreeFactor::probabilities() const {
|
||||||
// Set of all keys
|
// Set of all keys
|
||||||
std::set<Key> allKeys(keys().begin(), keys().end());
|
KeySet allKeys(keys().begin(), keys().end());
|
||||||
|
|
||||||
std::vector<double> probs;
|
std::vector<double> probs;
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ namespace gtsam {
|
||||||
*/
|
*/
|
||||||
auto op = [&](const Assignment<Key>& a, double p) {
|
auto op = [&](const Assignment<Key>& a, double p) {
|
||||||
// Get all the keys in the current assignment
|
// Get all the keys in the current assignment
|
||||||
std::set<Key> assignment_keys;
|
KeySet assignment_keys;
|
||||||
for (auto&& [k, _] : a) {
|
for (auto&& [k, _] : a) {
|
||||||
assignment_keys.insert(k);
|
assignment_keys.insert(k);
|
||||||
}
|
}
|
||||||
|
@ -453,18 +453,18 @@ namespace gtsam {
|
||||||
/* ************************************************************************ */
|
/* ************************************************************************ */
|
||||||
double DecisionTreeFactor::computeThreshold(const size_t N) const {
|
double DecisionTreeFactor::computeThreshold(const size_t N) const {
|
||||||
// Set of all keys
|
// Set of all keys
|
||||||
std::set<Key> allKeys = this->labels();
|
KeySet allKeys = this->labels();
|
||||||
MinHeap min_heap;
|
MinHeap min_heap;
|
||||||
|
|
||||||
auto op = [&](const Assignment<Key>& a, double p) {
|
auto op = [&](const Assignment<Key>& a, double p) {
|
||||||
// Get all the keys in the current assignment
|
// Get all the keys in the current assignment
|
||||||
std::set<Key> assignment_keys;
|
KeySet assignment_keys;
|
||||||
for (auto&& [k, _] : a) {
|
for (auto&& [k, _] : a) {
|
||||||
assignment_keys.insert(k);
|
assignment_keys.insert(k);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find the keys missing in the assignment
|
// Find the keys missing in the assignment
|
||||||
std::vector<Key> diff;
|
KeyVector diff;
|
||||||
std::set_difference(allKeys.begin(), allKeys.end(),
|
std::set_difference(allKeys.begin(), allKeys.end(),
|
||||||
assignment_keys.begin(), assignment_keys.end(),
|
assignment_keys.begin(), assignment_keys.end(),
|
||||||
std::back_inserter(diff));
|
std::back_inserter(diff));
|
||||||
|
|
Loading…
Reference in New Issue