From 8b6ce55151c45fd9d5952129d2cbb5dd6681bcee Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Fri, 16 May 2025 00:09:31 -0400 Subject: [PATCH] set default pointer value to nullptr which is more idiomatic --- gtsam/discrete/DiscreteBayesNet.h | 4 ++-- gtsam/discrete/DiscreteConditional.h | 9 ++++----- gtsam/discrete/TableDistribution.h | 6 ++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gtsam/discrete/DiscreteBayesNet.h b/gtsam/discrete/DiscreteBayesNet.h index 3d84cd656..01c9c004c 100644 --- a/gtsam/discrete/DiscreteBayesNet.h +++ b/gtsam/discrete/DiscreteBayesNet.h @@ -112,7 +112,7 @@ class GTSAM_EXPORT DiscreteBayesNet: public BayesNet { * * @return a sampled value for all variables. */ - DiscreteValues sample(std::mt19937_64* rng = &kRandomNumberGenerator) const; + DiscreteValues sample(std::mt19937_64* rng = nullptr) const; /** * @brief do ancestral sampling, given certain variables. @@ -123,7 +123,7 @@ class GTSAM_EXPORT DiscreteBayesNet: public BayesNet { * @return given values extended with sampled value for all other variables. */ DiscreteValues sample(DiscreteValues given, - std::mt19937_64* rng = &kRandomNumberGenerator) const; + std::mt19937_64* rng = nullptr) const; /** * @brief Prune the Bayes net diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index 970a0a142..00bfadd14 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -210,11 +210,10 @@ class GTSAM_EXPORT DiscreteConditional * @return sample from conditional */ virtual size_t sample(const DiscreteValues& parentsValues, - std::mt19937_64* rng = &kRandomNumberGenerator) const; + std::mt19937_64* rng = nullptr) const; /// Single parent version. - size_t sample(size_t parent_value, - std::mt19937_64* rng = &kRandomNumberGenerator) const; + size_t sample(size_t parent_value, std::mt19937_64* rng = nullptr) const; /** * Sample from conditional, zero parent version @@ -222,7 +221,7 @@ class GTSAM_EXPORT DiscreteConditional * std::mt19937_64 rng(42); * auto sample = dc.sample(&rng); */ - size_t sample(std::mt19937_64* rng = &kRandomNumberGenerator) const; + size_t sample(std::mt19937_64* rng = nullptr) const; /** * @brief Return assignment for single frontal variable that maximizes value. @@ -246,7 +245,7 @@ class GTSAM_EXPORT DiscreteConditional /// Sample in place with optional PRNG, stores result in partial solution void sampleInPlace(DiscreteValues* parentsValues, - std::mt19937_64* rng = &kRandomNumberGenerator) const; + std::mt19937_64* rng = nullptr) const; /// Return all assignments for frontal variables. std::vector frontalAssignments() const; diff --git a/gtsam/discrete/TableDistribution.h b/gtsam/discrete/TableDistribution.h index a556d6edb..bd959d135 100644 --- a/gtsam/discrete/TableDistribution.h +++ b/gtsam/discrete/TableDistribution.h @@ -125,7 +125,6 @@ class GTSAM_EXPORT TableDistribution : public DiscreteConditional { /// Create new factor by maximizing over all values with the same separator. DiscreteFactor::shared_ptr max(const Ordering& keys) const override; - /// Multiply by scalar s DiscreteFactor::shared_ptr operator*(double s) const override; @@ -146,9 +145,8 @@ class GTSAM_EXPORT TableDistribution : public DiscreteConditional { * @param rng Pseudo random number generator * @return sample from conditional */ - virtual size_t sample( - const DiscreteValues& parentsValues, - std::mt19937_64* rng = &kRandomNumberGenerator) const override; + virtual size_t sample(const DiscreteValues& parentsValues, + std::mt19937_64* rng = nullptr) const override; /// @} /// @name Advanced Interface