use Assignment<Key> since it is a base class
parent
fff8458d6b
commit
295b965b68
|
|
@ -136,7 +136,7 @@ namespace gtsam {
|
|||
}
|
||||
|
||||
/// Evaluate probability distribution, sugar.
|
||||
double operator()(const DiscreteValues& values) const override {
|
||||
double operator()(const Assignment<Key>& values) const override {
|
||||
return ADT::operator()(values);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class GTSAM_EXPORT DiscreteConditional
|
|||
}
|
||||
|
||||
/// Evaluate, just look up in AlgebraicDecisionTree
|
||||
double evaluate(const DiscreteValues& values) const {
|
||||
double evaluate(const Assignment<Key>& values) const override {
|
||||
return ADT::operator()(values);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ class GTSAM_EXPORT DiscreteFactor : public Factor {
|
|||
size_t cardinality(Key j) const { return cardinalities_.at(j); }
|
||||
|
||||
/// Find value for given assignment of values to variables
|
||||
virtual double operator()(const DiscreteValues& values) const = 0;
|
||||
virtual double operator()(const Assignment<Key>& values) const = 0;
|
||||
|
||||
/// Error is just -log(value)
|
||||
virtual double error(const DiscreteValues& values) const;
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ class GTSAM_EXPORT TableFactor : public DiscreteFactor {
|
|||
}
|
||||
|
||||
/// Evaluate probability distribution, sugar.
|
||||
double operator()(const Assignment<Key>& values) const;
|
||||
double operator()(const Assignment<Key>& values) const override;
|
||||
|
||||
/// Calculate error for DiscreteValues `x`, is -log(probability).
|
||||
double error(const DiscreteValues& values) const override;
|
||||
|
|
|
|||
Loading…
Reference in New Issue