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

formatting

release/4.3a0
Varun Agrawal 2025-01-03 15:11:21 -05:00
parent 35e1e6102f
commit bc449c1a45
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtsam/discrete/TableDistribution.cpp
View File

@ -17,9 +17,9 @@
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <gtsam/discrete/TableDistribution.h>
#include <gtsam/discrete/Ring.h> #include <gtsam/discrete/Ring.h>
#include <gtsam/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
#include <gtsam/discrete/TableDistribution.h>
#include <gtsam/hybrid/HybridValues.h> #include <gtsam/hybrid/HybridValues.h>
#include <algorithm> #include <algorithm>
@ -39,7 +39,7 @@ namespace gtsam {
/* ************************************************************************** */ /* ************************************************************************** */
TableDistribution::TableDistribution(const size_t nrFrontals, TableDistribution::TableDistribution(const size_t nrFrontals,
const TableFactor& f) const TableFactor& f)
: BaseConditional(nrFrontals, DecisionTreeFactor(f.discreteKeys(), ADT())), : BaseConditional(nrFrontals, DecisionTreeFactor(f.discreteKeys(), ADT())),
table_(f / (*f.sum(nrFrontals))) {} table_(f / (*f.sum(nrFrontals))) {}
@ -52,15 +52,15 @@ TableDistribution::TableDistribution(
/* ************************************************************************** */ /* ************************************************************************** */
TableDistribution::TableDistribution(const TableFactor& joint, TableDistribution::TableDistribution(const TableFactor& joint,
const TableFactor& marginal) const TableFactor& marginal)
: BaseConditional(joint.size() - marginal.size(), : BaseConditional(joint.size() - marginal.size(),
joint.discreteKeys() & marginal.discreteKeys(), ADT()), joint.discreteKeys() & marginal.discreteKeys(), ADT()),
table_(joint / marginal) {} table_(joint / marginal) {}
/* ************************************************************************** */ /* ************************************************************************** */
TableDistribution::TableDistribution(const TableFactor& joint, TableDistribution::TableDistribution(const TableFactor& joint,
const TableFactor& marginal, const TableFactor& marginal,
const Ordering& orderedKeys) const Ordering& orderedKeys)
: TableDistribution(joint, marginal) { : TableDistribution(joint, marginal) {
keys_.clear(); keys_.clear();
keys_.insert(keys_.end(), orderedKeys.begin(), orderedKeys.end()); keys_.insert(keys_.end(), orderedKeys.begin(), orderedKeys.end());
@ -73,7 +73,7 @@ TableDistribution::TableDistribution(const Signature& signature)
/* ************************************************************************** */ /* ************************************************************************** */
void TableDistribution::print(const string& s, void TableDistribution::print(const string& s,
const KeyFormatter& formatter) const { const KeyFormatter& formatter) const {
cout << s << " P( "; cout << s << " P( ";
for (const_iterator it = beginFrontals(); it != endFrontals(); ++it) { for (const_iterator it = beginFrontals(); it != endFrontals(); ++it) {
cout << formatter(*it) << " "; cout << formatter(*it) << " ";
@ -90,8 +90,7 @@ void TableDistribution::print(const string& s,
} }
/* ************************************************************************** */ /* ************************************************************************** */
bool TableDistribution::equals(const DiscreteFactor& other, bool TableDistribution::equals(const DiscreteFactor& other, double tol) const {
double tol) const {
auto dtc = dynamic_cast<const TableDistribution*>(&other); auto dtc = dynamic_cast<const TableDistribution*>(&other);
if (!dtc) { if (!dtc) {
return false; return false;
@ -112,8 +111,7 @@ DiscreteConditional::shared_ptr TableDistribution::max(
} }
/* ****************************************************************************/ /* ****************************************************************************/
void TableDistribution::setData( void TableDistribution::setData(const DiscreteConditional::shared_ptr& dc) {
const DiscreteConditional::shared_ptr& dc) {
if (auto dtc = std::dynamic_pointer_cast<TableDistribution>(dc)) { if (auto dtc = std::dynamic_pointer_cast<TableDistribution>(dc)) {
this->table_ = dtc->table_; this->table_ = dtc->table_;
} else { } else {