remove normalizationConstant()
parent
31519f48b4
commit
92b829dd55
|
|
@ -63,12 +63,6 @@ double Conditional<FACTOR, DERIVEDCONDITIONAL>::negLogConstant() const {
|
||||||
throw std::runtime_error("Conditional::negLogConstant is not implemented");
|
throw std::runtime_error("Conditional::negLogConstant is not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
|
||||||
template <class FACTOR, class DERIVEDCONDITIONAL>
|
|
||||||
double Conditional<FACTOR, DERIVEDCONDITIONAL>::normalizationConstant() const {
|
|
||||||
return std::exp(-negLogConstant());
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
template <class FACTOR, class DERIVEDCONDITIONAL>
|
template <class FACTOR, class DERIVEDCONDITIONAL>
|
||||||
template <class VALUES>
|
template <class VALUES>
|
||||||
|
|
@ -81,10 +75,6 @@ bool Conditional<FACTOR, DERIVEDCONDITIONAL>::CheckInvariants(
|
||||||
const double logProb = conditional.logProbability(values);
|
const double logProb = conditional.logProbability(values);
|
||||||
if (std::abs(prob_or_density - std::exp(logProb)) > 1e-9)
|
if (std::abs(prob_or_density - std::exp(logProb)) > 1e-9)
|
||||||
return false; // logProb is not consistent with prob_or_density
|
return false; // logProb is not consistent with prob_or_density
|
||||||
if (std::abs(conditional.negLogConstant() -
|
|
||||||
(-std::log(conditional.normalizationConstant()))) > 1e-9)
|
|
||||||
return false; // log normalization constant is not consistent with
|
|
||||||
// normalization constant
|
|
||||||
const double error = conditional.error(values);
|
const double error = conditional.error(values);
|
||||||
if (error < 0.0) return false; // prob_or_density is negative.
|
if (error < 0.0) return false; // prob_or_density is negative.
|
||||||
const double expected = -(conditional.negLogConstant() + error);
|
const double expected = -(conditional.negLogConstant() + error);
|
||||||
|
|
|
||||||
|
|
@ -172,9 +172,6 @@ namespace gtsam {
|
||||||
*/
|
*/
|
||||||
virtual double negLogConstant() const;
|
virtual double negLogConstant() const;
|
||||||
|
|
||||||
/** Non-virtual, negate and exponentiate negLogConstant. */
|
|
||||||
double normalizationConstant() const;
|
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
/// @name Advanced Interface
|
/// @name Advanced Interface
|
||||||
/// @{
|
/// @{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue