Skip to content

Commit

Permalink
Improved BayesDistribution
Browse files Browse the repository at this point in the history
Thanks to a new formula for the CDF, computeCDF() is now way faster and much more accurate when the range of the conditioned distribution changes with the conditioning value.
  • Loading branch information
regislebrun committed Jul 31, 2024
1 parent 91f4158 commit 3a98879
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 0 deletions.
76 changes: 76 additions & 0 deletions lib/src/Uncertainty/Distribution/BayesDistribution.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,82 @@ Scalar BayesDistribution::computePDF(const Point & point) const
return deconditionedPDF * conditioningPDF;
}

namespace {
// Class used to compute the CDF of a Bayes distribution
class BayesCDFKernel: public EvaluationImplementation
{
public:
BayesCDFKernel(const Distribution & conditionedDistribution,
const Distribution & conditioningDistribution,
const Function & linkFunction,
const Point & x)
: EvaluationImplementation()
, conditionedDistribution_(conditionedDistribution)
, conditioningDistribution_(conditioningDistribution)
, linkFunction_(linkFunction)
, x_(x)
{
// Nothing to do
}

BayesCDFKernel * clone() const
{
return new BayesCDFKernel(*this);
}

Point operator() (const Point & point) const
{
const Scalar pdfY = conditioningDistribution_.computePDF(point);
if (pdfY == 0.0) return Point(1, 0.0);
Distribution parameterized(conditionedDistribution_);
const Point parameter(linkFunction_(point));
parameterized.setParameter(parameter);
const Scalar cdfX = parameterized.computeCDF(x_);
return Point(1, pdfY * cdfX);
}

UnsignedInteger getInputDimension() const
{
return conditioningDistribution_.getDimension();
}

UnsignedInteger getOutputDimension() const
{
return 1;
}

Description getInputDescription() const
{
return conditioningDistribution_.getDescription();
}

Description getOutputDescription() const
{
return Description(1, "BayesCDFKernel");
}

private:
const Distribution & conditionedDistribution_;
const Distribution & conditioningDistribution_;
const Function & linkFunction_;
const Point & x_;
}; // class BayesCDFKernel
} // anonymous namespace

/* Get the CDF of the distribution */
Scalar BayesDistribution::computeCDF(const Point & point) const
{
if (point.getDimension() != getDimension()) throw InvalidArgumentException(HERE) << "Error: the given point must have dimension=" << getDimension() << ", here dimension=" << point.getDimension();
Point y(conditioningDistribution_.getDimension());
std::copy(point.begin(), point.begin() + y.getSize(), y.begin());
Point x(conditionedDistribution_.getDimension());
std::copy(point.begin() + y.getSize(), point.end(), x.begin());
Point lowerY(conditioningDistribution_.getRange().getLowerBound());
const Function kernel(BayesCDFKernel(conditionedDistribution_, conditioningDistribution_, linkFunction_, x));
const Scalar cdf = IteratedQuadrature().integrate(kernel, Interval(lowerY, y))[0];
return cdf;
}

/* Bayes distribution accessor */
void BayesDistribution::setConditionedDistribution(const Distribution & conditionedDistribution)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ public:
using ContinuousDistribution::computePDF;
Scalar computePDF(const Point & point) const override;

/** Compute the CDF of the distribution */
using ContinuousDistribution::computeCDF;
Scalar computeCDF(const Point & point) const override;

/* Interface specific to BayesDistribution */

/** Conditioned distribution accessor */
Expand Down

0 comments on commit 3a98879

Please sign in to comment.