From 8904f5f3ff47d1859006f5ce782f72b86258dd42 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 28 Sep 2024 18:54:55 -0400 Subject: [PATCH] better docstring for prunerFunc and added dividers --- gtsam/hybrid/HybridGaussianConditional.cpp | 9 ++------- gtsam/hybrid/HybridGaussianConditional.h | 8 +++++++- gtsam/hybrid/HybridGaussianFactor.cpp | 4 ++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gtsam/hybrid/HybridGaussianConditional.cpp b/gtsam/hybrid/HybridGaussianConditional.cpp index 6bd859c1d..4e896206f 100644 --- a/gtsam/hybrid/HybridGaussianConditional.cpp +++ b/gtsam/hybrid/HybridGaussianConditional.cpp @@ -69,12 +69,14 @@ HybridGaussianConditional::HybridGaussianConditional( conditionals_(conditionals), negLogConstant_(helper.minNegLogConstant) {} +/* *******************************************************************************/ HybridGaussianConditional::HybridGaussianConditional( const DiscreteKeys &discreteParents, const HybridGaussianConditional::Conditionals &conditionals) : HybridGaussianConditional(discreteParents, conditionals, ConstructorHelper(conditionals)) {} +/* *******************************************************************************/ HybridGaussianConditional::HybridGaussianConditional( const DiscreteKey &discreteParent, const std::vector &conditionals) @@ -242,13 +244,6 @@ std::set DiscreteKeysAsSet(const DiscreteKeys &discreteKeys) { } /* ************************************************************************* */ -/** - * @brief Helper function to get the pruner functional. - * - * @param discreteProbs The probabilities of only discrete keys. - * @return std::function &, const GaussianConditional::shared_ptr &)> - */ std::function &, const GaussianConditional::shared_ptr &)> HybridGaussianConditional::prunerFunc(const DecisionTreeFactor &discreteProbs) { diff --git a/gtsam/hybrid/HybridGaussianConditional.h b/gtsam/hybrid/HybridGaussianConditional.h index e0bf66e52..02f6bba1e 100644 --- a/gtsam/hybrid/HybridGaussianConditional.h +++ b/gtsam/hybrid/HybridGaussianConditional.h @@ -194,7 +194,13 @@ class GTSAM_EXPORT HybridGaussianConditional /// Convert to a DecisionTree of Gaussian factor graphs. GaussianFactorGraphTree asGaussianFactorGraphTree() const; - //// Get the pruner functor from pruned discrete probabilities. + /** + * @brief Get the pruner function from discrete probabilities. + * + * @param discreteProbs The probabilities of only discrete keys. + * @return std::function &, const GaussianConditional::shared_ptr &)> + */ std::function &, const GaussianConditional::shared_ptr &)> prunerFunc(const DecisionTreeFactor &prunedProbabilities); diff --git a/gtsam/hybrid/HybridGaussianFactor.cpp b/gtsam/hybrid/HybridGaussianFactor.cpp index 6f33c5328..7f8e808bf 100644 --- a/gtsam/hybrid/HybridGaussianFactor.cpp +++ b/gtsam/hybrid/HybridGaussianFactor.cpp @@ -126,16 +126,19 @@ HybridGaussianFactor::HybridGaussianFactor(const ConstructorHelper &helper) factors_(helper.factorsTree.empty() ? augment(helper.pairs) : helper.factorsTree) {} +/* *******************************************************************************/ HybridGaussianFactor::HybridGaussianFactor( const DiscreteKey &discreteKey, const std::vector &factors) : HybridGaussianFactor(ConstructorHelper(discreteKey, factors)) {} +/* *******************************************************************************/ HybridGaussianFactor::HybridGaussianFactor( const DiscreteKey &discreteKey, const std::vector &factorPairs) : HybridGaussianFactor(ConstructorHelper(discreteKey, factorPairs)) {} +/* *******************************************************************************/ HybridGaussianFactor::HybridGaussianFactor(const DiscreteKeys &discreteKeys, const FactorValuePairs &factors) : HybridGaussianFactor(ConstructorHelper(discreteKeys, factors)) {} @@ -223,6 +226,7 @@ double HybridGaussianFactor::potentiallyPrunedComponentError( return std::numeric_limits::max(); } } + /* *******************************************************************************/ AlgebraicDecisionTree HybridGaussianFactor::errorTree( const VectorValues &continuousValues) const {