20937590402

Committed 12 Jan 2026 10:42PM UTC coverage: 82.01% (-0.05%) from 82.058%

Build # 20937590402

Build Type

Pull #3413

github

Committed by

web-flow

Commit Message

Merge f315eb13c into 0486e433d

Pull Request Pull Request #3413: More interpolation types in Tabular.

Run Details

17206 of 23899 branches covered (71.99%)

Branch coverage included in aggregate %.

59 of 107 new or added lines in 3 files covered. (55.14%)

42 existing lines in 1 file now uncovered.

55679 of 64974 relevant lines covered (85.69%)

43165462.08 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

70.48

/src/distribution.cpp

#include "openmc/distribution.h"

#include <algorithm> // for copy
#include <array>
#include <cmath>     // for sqrt, floor, max
#include <iterator>  // for back_inserter
#include <numeric>   // for accumulate
#include <stdexcept> // for runtime_error
#include <string>    // for string, stod

#include "openmc/constants.h"
#include "openmc/error.h"
#include "openmc/math_functions.h"
#include "openmc/random_dist.h"
#include "openmc/random_lcg.h"
#include "openmc/xml_interface.h"

namespace openmc {

//==============================================================================
// Helper function for computing importance weights from biased sampling
//==============================================================================

vector<double> compute_importance_weights(
  const vector<double>& p, const vector<double>& b)
{
  std::size_t n = p.size();

  // Normalize original probabilities
  double sum_p = std::accumulate(p.begin(), p.end(), 0.0);
  vector<double> p_norm(n);
  for (std::size_t i = 0; i < n; ++i) {
    p_norm[i] = p[i] / sum_p;
  }

  // Normalize bias probabilities
  double sum_b = std::accumulate(b.begin(), b.end(), 0.0);
  vector<double> b_norm(n);
  for (std::size_t i = 0; i < n; ++i) {
    b_norm[i] = b[i] / sum_b;
  }

  // Compute importance weights
  vector<double> weights(n);
  for (std::size_t i = 0; i < n; ++i) {
    weights[i] = (b_norm[i] == 0.0) ? INFTY : p_norm[i] / b_norm[i];
  }
  return weights;
}

std::pair<double, double> Distribution::sample(uint64_t* seed) const
{
  if (bias_) {
    // Sample from the bias distribution and compute importance weight
    double val = bias_->sample_unbiased(seed);
    double wgt = this->evaluate(val) / bias_->evaluate(val);
    return {val, wgt};
  } else {
    // Unbiased sampling: return sampled value with weight 1.0
    double val = sample_unbiased(seed);
    return {val, 1.0};
  }
}

// PDF evaluation not supported for all distribution types
double Distribution::evaluate(double x) const
{
  throw std::runtime_error(
    "PDF evaluation not implemented for this distribution type.");
}

void Distribution::read_bias_from_xml(pugi::xml_node node)
{
  if (check_for_node(node, "bias")) {
    pugi::xml_node bias_node = node.child("bias");

    if (check_for_node(bias_node, "bias")) {
      openmc::fatal_error(
        "Distribution has a bias distribution with its own bias distribution. "
        "Please ensure bias distributions do not have their own bias.");
    }

    UPtrDist bias = distribution_from_xml(bias_node);
    this->set_bias(std::move(bias));
  }
}

//==============================================================================
// DiscreteIndex implementation
//==============================================================================

DiscreteIndex::DiscreteIndex(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  std::size_t n = params.size() / 2;

  assign({params.data() + n, n});
}

DiscreteIndex::DiscreteIndex(span<const double> p)
{
  assign(p);
}

void DiscreteIndex::assign(span<const double> p)
{
  prob_.assign(p.begin(), p.end());
  this->init_alias();
}

void DiscreteIndex::init_alias()
{
  normalize();

  // The initialization and sampling method is based on Vose
  // (DOI: 10.1109/32.92917)
  // Vectors for large and small probabilities based on 1/n
  vector<size_t> large;
  vector<size_t> small;

  size_t n = prob_.size();

  // Set and allocate memory
  alias_.assign(n, 0);

  // Fill large and small vectors based on 1/n
  for (size_t i = 0; i < n; i++) {
    prob_[i] *= n;
    if (prob_[i] > 1.0) {
      large.push_back(i);
    } else {
      small.push_back(i);
    }
  }

  while (!large.empty() && !small.empty()) {
    int j = small.back();
    int k = large.back();

    // Remove last element of small
    small.pop_back();

    // Update probability and alias based on Vose's algorithm
    prob_[k] += prob_[j] - 1.0;
    alias_[j] = k;

    // Move large index to small vector, if it is no longer large
    if (prob_[k] < 1.0) {
      small.push_back(k);
      large.pop_back();
    }
  }
}

size_t DiscreteIndex::sample(uint64_t* seed) const
{
  // Alias sampling of discrete distribution
  size_t n = prob_.size();
  if (n > 1) {
    size_t u = prn(seed) * n;
    if (prn(seed) < prob_[u]) {
      return u;
    } else {
      return alias_[u];
    }
  } else {
    return 0;
  }
}

void DiscreteIndex::normalize()
{
  // Renormalize density function so that it sums to unity. Note that we save
  // the integral of the distribution so that if it is used as part of another
  // distribution (e.g., Mixture), we know its relative strength.
  integral_ = std::accumulate(prob_.begin(), prob_.end(), 0.0);
  for (auto& p_i : prob_) {
    p_i /= integral_;
  }
}

//==============================================================================
// Discrete implementation
//==============================================================================

Discrete::Discrete(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  std::size_t n = params.size() / 2;

  // First half is x values, second half is probabilities
  x_.assign(params.begin(), params.begin() + n);
  const double* p = params.data() + n;

  // Check for bias
  if (check_for_node(node, "bias")) {
    // Get bias probabilities
    auto bias_params = get_node_array<double>(node, "bias");
    if (bias_params.size() != n) {
      openmc::fatal_error(
        "Size mismatch: Attempted to bias Discrete distribution with " +
        std::to_string(n) + " probability entries using a bias with " +
        std::to_string(bias_params.size()) +
        " entries. Please ensure distributions have the same size.");
    }

    // Compute importance weights
    vector<double> p_vec(p, p + n);
    weight_ = compute_importance_weights(p_vec, bias_params);

    // Initialize DiscreteIndex with bias probabilities for sampling
    di_.assign(bias_params);
  } else {
    // Unbiased case: weight_ stays empty
    di_.assign({p, n});
  }
}

Discrete::Discrete(const double* x, const double* p, size_t n) : di_({p, n})
{
  x_.assign(x, x + n);
}

std::pair<double, double> Discrete::sample(uint64_t* seed) const
{
  size_t idx = di_.sample(seed);
  double wgt = weight_.empty() ? 1.0 : weight_[idx];
  return {x_[idx], wgt};
}

double Discrete::sample_unbiased(uint64_t* seed) const
{
  size_t idx = di_.sample(seed);
  return x_[idx];
}

//==============================================================================
// Uniform implementation
//==============================================================================

Uniform::Uniform(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  if (params.size() != 2) {
    fatal_error("Uniform distribution must have two "
                "parameters specified.");
  }

  a_ = params.at(0);
  b_ = params.at(1);

  read_bias_from_xml(node);
}

double Uniform::sample_unbiased(uint64_t* seed) const
{
  return a_ + prn(seed) * (b_ - a_);
}

double Uniform::evaluate(double x) const
{
  if (x <= a()) {
    return 0.0;
  } else if (x >= b()) {
    return 0.0;
  } else {
    return 1 / (b() - a());
  }
}

//==============================================================================
// PowerLaw implementation
//==============================================================================

PowerLaw::PowerLaw(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  if (params.size() != 3) {
    fatal_error("PowerLaw distribution must have three "
                "parameters specified.");
  }

  const double a = params.at(0);
  const double b = params.at(1);
  const double n = params.at(2);

  offset_ = std::pow(a, n + 1);
  span_ = std::pow(b, n + 1) - offset_;
  ninv_ = 1 / (n + 1);

  read_bias_from_xml(node);
}

double PowerLaw::evaluate(double x) const
{
  if (x <= a()) {
    return 0.0;
  } else if (x >= b()) {
    return 0.0;
  } else {
    int pwr = n() + 1;
    double norm = pwr / span_;
    return norm * std::pow(std::fabs(x), n());
  }
}

double PowerLaw::sample_unbiased(uint64_t* seed) const
{
  return std::pow(offset_ + prn(seed) * span_, ninv_);
}

//==============================================================================
// Maxwell implementation
//==============================================================================

Maxwell::Maxwell(pugi::xml_node node)
{
  theta_ = std::stod(get_node_value(node, "parameters"));

  read_bias_from_xml(node);
}

double Maxwell::sample_unbiased(uint64_t* seed) const
{
  return maxwell_spectrum(theta_, seed);
}

double Maxwell::evaluate(double x) const
{
  double c = (2.0 / SQRT_PI) * std::pow(theta_, -1.5);
  return c * std::sqrt(x) * std::exp(-x / theta_);
}

//==============================================================================
// Watt implementation
//==============================================================================

Watt::Watt(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  if (params.size() != 2)
    openmc::fatal_error("Watt energy distribution must have two "
                        "parameters specified.");

  a_ = params.at(0);
  b_ = params.at(1);

  read_bias_from_xml(node);
}

double Watt::sample_unbiased(uint64_t* seed) const
{
  return watt_spectrum(a_, b_, seed);
}

double Watt::evaluate(double x) const
{
  double c =
    2.0 / (std::sqrt(PI * b_) * std::pow(a_, 1.5) * std::exp(a_ * b_ / 4.0));
  return c * std::exp(-x / a_) * std::sinh(std::sqrt(b_ * x));
}

//==============================================================================
// Normal implementation
//==============================================================================
Normal::Normal(pugi::xml_node node)
{
  auto params = get_node_array<double>(node, "parameters");
  if (params.size() != 2) {
    openmc::fatal_error("Normal energy distribution must have two "
                        "parameters specified.");
  }

  mean_value_ = params.at(0);
  std_dev_ = params.at(1);

  read_bias_from_xml(node);
}

double Normal::sample_unbiased(uint64_t* seed) const
{
  return normal_variate(mean_value_, std_dev_, seed);
}

double Normal::evaluate(double x) const
{
  return (1.0 / (std::sqrt(2.0 / PI) * std_dev_)) *
         std::exp(-(std::pow((x - mean_value_), 2.0)) /
                  (2.0 * std::pow(std_dev_, 2.0)));
}

//==============================================================================
// Tabular implementation
//==============================================================================

Tabular::Tabular(pugi::xml_node node)
{
  if (check_for_node(node, "interpolation")) {
    std::string temp = get_node_value(node, "interpolation");
    if (temp == "histogram") {
      interp_ = Interpolation::histogram;
    } else if (temp == "linear-linear") {
      interp_ = Interpolation::lin_lin;
    } else if (temp == "log-linear") {
      interp_ = Interpolation::log_lin;
    } else if (temp == "log-log") {
      interp_ = Interpolation::log_log;
    } else {
      openmc::fatal_error(
        "Unsupported interpolation type for distribution: " + temp);
    }
  } else {
    interp_ = Interpolation::histogram;
  }

  // Read and initialize tabular distribution. If number of parameters is odd,
  // add an extra zero for the 'p' array.
  auto params = get_node_array<double>(node, "parameters");
  if (params.size() % 2 != 0) {
    params.push_back(0.0);
  }
  std::size_t n = params.size() / 2;
  const double* x = params.data();
  const double* p = x + n;
  init(x, p, n);

  read_bias_from_xml(node);
}

Tabular::Tabular(const double* x, const double* p, int n, Interpolation interp,
  const double* c)
  : interp_ {interp}
{
  init(x, p, n, c);
}

void Tabular::init(
  const double* x, const double* p, std::size_t n, const double* c)
{
  // Copy x/p arrays into vectors
  std::copy(x, x + n, std::back_inserter(x_));
  std::copy(p, p + n, std::back_inserter(p_));

  // Calculate cumulative distribution function
  if (c) {
    std::copy(c, c + n, std::back_inserter(c_));
  } else {
    c_.resize(n);
    c_[0] = 0.0;
    for (int i = 1; i < n; ++i) {
      if (interp_ == Interpolation::histogram) {
        c_[i] = c_[i - 1] + p_[i - 1] * (x_[i] - x_[i - 1]);
      } else if (interp_ == Interpolation::lin_lin) {
        c_[i] = c_[i - 1] + 0.5 * (p_[i - 1] + p_[i]) * (x_[i] - x_[i - 1]);
      } else if (interp_ == Interpolation::log_lin) {
        double m = std::log(p_[i] / p_[i - 1]) / (x_[i] - x_[i - 1]);
        c_[i] = c_[i - 1] + p_[i - 1] * (x_[i] - x_[i - 1]) *
                              exprel(m * (x_[i] - x_[i - 1]));
      } else if (interp_ == Interpolation::log_log) {
        double m = std::log((x_[i] * p_[i]) / (x_[i - 1] * p_[i - 1])) /
                   std::log(x_[i] / x_[i - 1]);
        c_[i] = c_[i - 1] + x_[i - 1] * p_[i - 1] *
                              std::log(x_[i] / x_[i - 1]) *
                              exprel(m * std::log(x_[i] / x_[i - 1]));
      } else {
        UNREACHABLE();
      }
    }
  }

  // Normalize density and distribution functions. Note that we save the
  // integral of the distribution so that if it is used as part of another
  // distribution (e.g., Mixture), we know its relative strength.
  integral_ = c_[n - 1];
  for (int i = 0; i < n; ++i) {
    p_[i] = p_[i] / integral_;
    c_[i] = c_[i] / integral_;
  }
}

double Tabular::sample_unbiased(uint64_t* seed) const
{
  // Sample value of CDF
  double c = prn(seed);

  // Find first CDF bin which is above the sampled value
  double c_i = c_[0];
  int i;
  std::size_t n = c_.size();
  for (i = 0; i < n - 1; ++i) {
    if (c <= c_[i + 1])
      break;
    c_i = c_[i + 1];
  }

  // Determine bounding PDF values
  double x_i = x_[i];
  double p_i = p_[i];

  if (interp_ == Interpolation::histogram) {
    // Histogram interpolation
    if (p_i > 0.0) {
      return x_i + (c - c_i) / p_i;
    } else {
      return x_i;
    }
  } else if (interp_ == Interpolation::lin_lin) {
    // Linear-linear interpolation
    double x_i1 = x_[i + 1];
    double p_i1 = p_[i + 1];

    double m = (p_i1 - p_i) / (x_i1 - x_i);
    if (m == 0.0) {
      return x_i + (c - c_i) / p_i;
    } else {
      return x_i +
             (std::sqrt(std::max(0.0, p_i * p_i + 2 * m * (c - c_i))) - p_i) /
               m;
    }
  } else if (interp_ == Interpolation::log_lin) {
    // Log-linear interpolation
    double x_i1 = x_[i + 1];
    double p_i1 = p_[i + 1];

    double m = std::log(p_i1 / p_i) / (x_i1 - x_i);
    double f = (c - c_i) / p_i;
    return x_i + f * log1prel(m * f);
  } else if (interp_ == Interpolation::log_log) {
    // Log-Log interpolation
    double x_i1 = x_[i + 1];
    double p_i1 = p_[i + 1];

    double m = std::log((x_i1 * p_i1) / (x_i * p_i)) / std::log(x_i1 / x_i);
    double f = (c - c_i) / (p_i * x_i);
    return x_i * std::exp(f * log1prel(m * f));
  } else {
    UNREACHABLE();
  }
}

double Tabular::evaluate(double x) const
{
  int i;

  if (interp_ == Interpolation::histogram) {
    i = std::upper_bound(x_.begin(), x_.end(), x) - x_.begin() - 1;
    if (i < 0 || i >= static_cast<int>(p_.size())) {
      return 0.0;
    } else {
      return p_[i];
    }
  } else {
    i = std::lower_bound(x_.begin(), x_.end(), x) - x_.begin() - 1;

    if (i < 0 || i >= static_cast<int>(p_.size()) - 1) {
      return 0.0;
    } else {
      double x0 = x_[i];
      double x1 = x_[i + 1];
      double p0 = p_[i];
      double p1 = p_[i + 1];

      double t = (x - x0) / (x1 - x0);
      return (1 - t) * p0 + t * p1;
    }
  }
}

//==============================================================================
// Equiprobable implementation
//==============================================================================

double Equiprobable::sample_unbiased(uint64_t* seed) const
{
  std::size_t n = x_.size();

  double r = prn(seed);
  int i = std::floor((n - 1) * r);

  double xl = x_[i];
  double xr = x_[i + i];
  return xl + ((n - 1) * r - i) * (xr - xl);
}

double Equiprobable::evaluate(double x) const
{
  double x_min = *std::min_element(x_.begin(), x_.end());
  double x_max = *std::max_element(x_.begin(), x_.end());

  if (x < x_min || x > x_max) {
    return 0.0;
  } else {
    return 1.0 / (x_max - x_min);
  }
}

//==============================================================================
// Mixture implementation
//==============================================================================

Mixture::Mixture(pugi::xml_node node)
{
  vector<double> probabilities;

  // First pass: collect distributions and their probabilities
  for (pugi::xml_node pair : node.children("pair")) {
    // Check that required data exists
    if (!pair.attribute("probability"))
      fatal_error("Mixture pair element does not have probability.");
    if (!pair.child("dist"))
      fatal_error("Mixture pair element does not have a distribution.");

    // Get probability and distribution
    double p = std::stod(pair.attribute("probability").value());
    auto dist = distribution_from_xml(pair.child("dist"));

    // Weight probability by the distribution's integral
    double weighted_prob = p * dist->integral();
    probabilities.push_back(weighted_prob);
    distribution_.push_back(std::move(dist));
  }

  // Save sum of weighted probabilities
  integral_ = std::accumulate(probabilities.begin(), probabilities.end(), 0.0);

  std::size_t n = probabilities.size();

  // Check for bias
  if (check_for_node(node, "bias")) {
    // Get bias probabilities
    auto bias_params = get_node_array<double>(node, "bias");
    if (bias_params.size() != n) {
      openmc::fatal_error(
        "Size mismatch: Attempted to bias Mixture distribution with " +
        std::to_string(n) + " components using a bias with " +
        std::to_string(bias_params.size()) +
        " entries. Please ensure distributions have the same size.");
    }

    // Compute importance weights
    weight_ = compute_importance_weights(probabilities, bias_params);

    // Initialize DiscreteIndex with bias probabilities for sampling
    di_.assign(bias_params);
  } else {
    // Unbiased case: weight_ stays empty
    di_.assign(probabilities);
  }
}

std::pair<double, double> Mixture::sample(uint64_t* seed) const
{
  size_t idx = di_.sample(seed);

  // Sample the chosen distribution
  auto [val, sub_wgt] = distribution_[idx]->sample(seed);

  // Multiply by component selection weight
  double mix_wgt = weight_.empty() ? 1.0 : weight_[idx];
  return {val, mix_wgt * sub_wgt};
}

double Mixture::sample_unbiased(uint64_t* seed) const
{
  size_t idx = di_.sample(seed);
  return distribution_[idx]->sample(seed).first;
}

//==============================================================================
// Helper function
//==============================================================================

UPtrDist distribution_from_xml(pugi::xml_node node)
{
  if (!check_for_node(node, "type"))
    openmc::fatal_error("Distribution type must be specified.");

  // Determine type of distribution
  std::string type = get_node_value(node, "type", true, true);

  // Allocate extension of Distribution
  UPtrDist dist;
  if (type == "uniform") {
    dist = UPtrDist {new Uniform(node)};
  } else if (type == "powerlaw") {
    dist = UPtrDist {new PowerLaw(node)};
  } else if (type == "maxwell") {
    dist = UPtrDist {new Maxwell(node)};
  } else if (type == "watt") {
    dist = UPtrDist {new Watt(node)};
  } else if (type == "normal") {
    dist = UPtrDist {new Normal(node)};
  } else if (type == "discrete") {
    dist = UPtrDist {new Discrete(node)};
  } else if (type == "tabular") {
    dist = UPtrDist {new Tabular(node)};
  } else if (type == "mixture") {
    dist = UPtrDist {new Mixture(node)};
  } else if (type == "muir") {
    openmc::fatal_error(
      "'muir' distributions are now specified using the openmc.stats.muir() "
      "function in Python. Please regenerate your XML files.");
  } else {
    openmc::fatal_error("Invalid distribution type: " + type);
  }
  return dist;
}

} // namespace openmc

openmc-dev / openmc / 20937590402

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous