12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get different classes to play nicely

release/4.3a0
Varun Agrawal 2024-12-07 19:39:44 -05:00
parent 9633ad1fd8
commit 0b3477fc5a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/discrete/DiscreteConditional.h
View File

@ -173,8 +173,8 @@ class GTSAM_EXPORT DiscreteConditional
return ADT::operator()(values);
}
using DiscreteFactor::error; ///< DiscreteValues version
using DiscreteFactor::operator(); ///< DiscreteValues version
using DecisionTreeFactor::error; ///< DiscreteValues version
using DecisionTreeFactor::operator(); ///< DiscreteValues version
/**
* @brief restrict to given *parent* values.

3
gtsam/discrete/DiscreteDistribution.h
View File

@ -86,8 +86,7 @@ class GTSAM_EXPORT DiscreteDistribution : public DiscreteConditional {
double operator()(size_t value) const;
/// 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.
std::vector<double> pmf() const;