use Assignment<Key> for evaluate since it is the base class
parent
9f88a360df
commit
2a3b5e62b7
|
|
@ -94,7 +94,7 @@ class GTSAM_EXPORT DiscreteFactor : public Factor {
|
||||||
size_t cardinality(Key j) const { return cardinalities_.at(j); }
|
size_t cardinality(Key j) const { return cardinalities_.at(j); }
|
||||||
|
|
||||||
/// Find value for given assignment of values to variables
|
/// Find value for given assignment of values to variables
|
||||||
virtual double operator()(const DiscreteValues&) const = 0;
|
virtual double operator()(const DiscreteValues& values) const = 0;
|
||||||
|
|
||||||
/// Error is just -log(value)
|
/// Error is just -log(value)
|
||||||
virtual double error(const DiscreteValues& values) const;
|
virtual double error(const DiscreteValues& values) const;
|
||||||
|
|
|
||||||
|
|
@ -177,9 +177,6 @@ class GTSAM_EXPORT TableFactor : public DiscreteFactor {
|
||||||
|
|
||||||
/// Evaluate probability distribution, sugar.
|
/// Evaluate probability distribution, sugar.
|
||||||
double operator()(const Assignment<Key>& values) const;
|
double operator()(const Assignment<Key>& values) const;
|
||||||
double operator()(const DiscreteValues& values) const override {
|
|
||||||
return operator()(Assignment<Key>(values));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Calculate error for DiscreteValues `x`, is -log(probability).
|
/// Calculate error for DiscreteValues `x`, is -log(probability).
|
||||||
double error(const DiscreteValues& values) const override;
|
double error(const DiscreteValues& values) const override;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue