density -> distribution nomenclature
parent
8b685c0348
commit
e5de127150
|
|
@ -104,7 +104,7 @@ namespace gtsam {
|
||||||
return ADT::operator()(values);
|
return ADT::operator()(values);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Evaluate probability density, sugar.
|
/// Evaluate probability distribution, sugar.
|
||||||
double operator()(const DiscreteValues& values) const override {
|
double operator()(const DiscreteValues& values) const override {
|
||||||
return ADT::operator()(values);
|
return ADT::operator()(values);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ class GTSAM_EXPORT DiscreteBayesTreeClique
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
/**
|
/**
|
||||||
* @brief A Bayes tree representing a Discrete density.
|
* @brief A Bayes tree representing a Discrete distribution.
|
||||||
* @ingroup discrete
|
* @ingroup discrete
|
||||||
*/
|
*/
|
||||||
class GTSAM_EXPORT DiscreteBayesTree
|
class GTSAM_EXPORT DiscreteBayesTree
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ void DiscreteConditional::sampleInPlace(DiscreteValues* values) const {
|
||||||
size_t DiscreteConditional::sample(const DiscreteValues& parentsValues) const {
|
size_t DiscreteConditional::sample(const DiscreteValues& parentsValues) const {
|
||||||
static mt19937 rng(2); // random number generator
|
static mt19937 rng(2); // random number generator
|
||||||
|
|
||||||
// Get the correct conditional density
|
// Get the correct conditional distribution
|
||||||
ADT pFS = choose(parentsValues, true); // P(F|S=parentsValues)
|
ADT pFS = choose(parentsValues, true); // P(F|S=parentsValues)
|
||||||
|
|
||||||
// TODO(Duy): only works for one key now, seems horribly slow this way
|
// TODO(Duy): only works for one key now, seems horribly slow this way
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ class DiscreteMarginals {
|
||||||
DiscreteMarginals() {}
|
DiscreteMarginals() {}
|
||||||
|
|
||||||
/** Construct a marginals class.
|
/** Construct a marginals class.
|
||||||
* @param graph The factor graph defining the full joint density on all variables.
|
* @param graph The factor graph defining the full joint distribution on all variables.
|
||||||
*/
|
*/
|
||||||
DiscreteMarginals(const DiscreteFactorGraph& graph) {
|
DiscreteMarginals(const DiscreteFactorGraph& graph) {
|
||||||
bayesTree_ = graph.eliminateMultifrontal();
|
bayesTree_ = graph.eliminateMultifrontal();
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
namespace gtsam {
|
namespace gtsam {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Signature for a discrete conditional density, used to construct conditionals.
|
* Signature for a discrete conditional distribution, used to construct conditionals.
|
||||||
*
|
*
|
||||||
* The format is (Key % string) for nodes with no parents,
|
* The format is (Key % string) for nodes with no parents,
|
||||||
* and (Key | Key, Key = string) for nodes with parents.
|
* and (Key | Key, Key = string) for nodes with parents.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue