get different classes to play nicely
parent
9633ad1fd8
commit
0b3477fc5a
|
|
@ -173,8 +173,8 @@ class GTSAM_EXPORT DiscreteConditional
|
||||||
return ADT::operator()(values);
|
return ADT::operator()(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
using DiscreteFactor::error; ///< DiscreteValues version
|
using DecisionTreeFactor::error; ///< DiscreteValues version
|
||||||
using DiscreteFactor::operator(); ///< DiscreteValues version
|
using DecisionTreeFactor::operator(); ///< DiscreteValues version
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief restrict to given *parent* values.
|
* @brief restrict to given *parent* values.
|
||||||
|
|
|
||||||
|
|
@ -86,8 +86,7 @@ class GTSAM_EXPORT DiscreteDistribution : public DiscreteConditional {
|
||||||
double operator()(size_t value) const;
|
double operator()(size_t value) const;
|
||||||
|
|
||||||
/// We also want to keep the Base version, taking DiscreteValues:
|
/// We also want to keep the Base version, taking DiscreteValues:
|
||||||
// TODO(dellaert): does not play well with wrapper!
|
using Base::operator();
|
||||||
// using Base::operator();
|
|
||||||
|
|
||||||
/// Return entire probability mass function.
|
/// Return entire probability mass function.
|
||||||
std::vector<double> pmf() const;
|
std::vector<double> pmf() const;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue