Merge branch 'common-discrete-evaluate' into common-ops

release/4.3a0
Varun Agrawal 2024-12-09 17:37:27 -05:00
commit aed2a9dc7f
1 changed files with 2 additions and 3 deletions

View File

@ -41,7 +41,7 @@ virtual class DiscreteFactor : gtsam::Factor {
const gtsam::KeyFormatter& keyFormatter =
gtsam::DefaultKeyFormatter) const;
bool equals(const gtsam::DiscreteFactor& other, double tol = 1e-9) const;
double operator()(const gtsam::DiscreteValues& values) const;
double operator()(const gtsam::Assignment<gtsam::Key>& values) const;
};
#include <gtsam/discrete/DecisionTreeFactor.h>
@ -69,7 +69,7 @@ virtual class DecisionTreeFactor : gtsam::DiscreteFactor {
size_t cardinality(gtsam::Key j) const;
double operator()(const gtsam::DiscreteValues& values) const;
double operator()(const gtsam::Assignment<gtsam::Key>& values) const;
gtsam::DecisionTreeFactor operator*(const gtsam::DecisionTreeFactor& f) const;
size_t cardinality(gtsam::Key j) const;
gtsam::DecisionTreeFactor operator/(const gtsam::DecisionTreeFactor& f) const;
@ -248,7 +248,6 @@ class DiscreteBayesTree {
void saveGraph(string s,
const gtsam::KeyFormatter& keyFormatter =
gtsam::DefaultKeyFormatter) const;
double operator()(const gtsam::DiscreteValues& values) const;
string markdown(const gtsam::KeyFormatter& keyFormatter =
gtsam::DefaultKeyFormatter) const;