12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format DiscreteMarginals.h

release/4.3a0
Varun Agrawal 2025-01-21 00:34:47 -05:00
parent dc79f492b2
commit 4b3c4093d5
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtsam/discrete/DiscreteMarginals.h
View File

@ -20,9 +20,9 @@
#pragma once #pragma once
#include <gtsam/discrete/DiscreteFactorGraph.h>
#include <gtsam/discrete/DiscreteBayesTree.h>
#include <gtsam/base/Vector.h> #include <gtsam/base/Vector.h>
#include <gtsam/discrete/DiscreteBayesTree.h>
#include <gtsam/discrete/DiscreteFactorGraph.h>
namespace gtsam { namespace gtsam {
@ -31,17 +31,15 @@ namespace gtsam {
* @ingroup discrete * @ingroup discrete
*/ */
class DiscreteMarginals { class DiscreteMarginals {
protected: protected:
DiscreteBayesTree::shared_ptr bayesTree_; DiscreteBayesTree::shared_ptr bayesTree_;
public: public:
DiscreteMarginals() {} DiscreteMarginals() {}
/** Construct a marginals class. /** Construct a marginals class.
* @param graph The factor graph defining the full joint distribution on all variables. * @param graph The factor graph defining the full joint
* distribution on all variables.
*/ */
DiscreteMarginals(const DiscreteFactorGraph& graph) { DiscreteMarginals(const DiscreteFactorGraph& graph) {
bayesTree_ = graph.eliminateMultifrontal(); bayesTree_ = graph.eliminateMultifrontal();
@ -50,8 +48,8 @@ class DiscreteMarginals {
/** Compute the marginal of a single variable */ /** Compute the marginal of a single variable */
DiscreteFactor::shared_ptr operator()(Key variable) const { DiscreteFactor::shared_ptr operator()(Key variable) const {
// Compute marginal // Compute marginal
DiscreteFactor::shared_ptr marginalFactor; DiscreteFactor::shared_ptr marginalFactor =
marginalFactor = bayesTree_->marginalFactor(variable, &EliminateDiscrete); bayesTree_->marginalFactor(variable, &EliminateDiscrete);
return marginalFactor; return marginalFactor;
} }
@ -61,8 +59,7 @@ class DiscreteMarginals {
*/ */
Vector marginalProbabilities(const DiscreteKey& key) const { Vector marginalProbabilities(const DiscreteKey& key) const {
// Compute marginal // Compute marginal
DiscreteFactor::shared_ptr marginalFactor; DiscreteFactor::shared_ptr marginalFactor = this->operator()(key.first);
marginalFactor = bayesTree_->marginalFactor(key.first, &EliminateDiscrete);
// Create result // Create result
Vector vResult(key.second); Vector vResult(key.second);
@ -73,7 +70,6 @@ class DiscreteMarginals {
} }
return vResult; return vResult;
} }
}; };
} /* namespace gtsam */ } /* namespace gtsam */