From 07a68296d5d8ab900883431d1eccc88e8809d47b Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 4 Jan 2025 17:18:19 -0500 Subject: [PATCH] code cleanup --- gtsam/discrete/TableDistribution.cpp | 23 ----------------------- gtsam/discrete/TableDistribution.h | 20 -------------------- 2 files changed, 43 deletions(-) diff --git a/gtsam/discrete/TableDistribution.cpp b/gtsam/discrete/TableDistribution.cpp index aa639c126..a7883571a 100644 --- a/gtsam/discrete/TableDistribution.cpp +++ b/gtsam/discrete/TableDistribution.cpp @@ -49,12 +49,6 @@ TableDistribution::TableDistribution(const TableFactor& f) DecisionTreeFactor(f.discreteKeys(), ADT())), table_(f / (*f.sum(f.keys().size()))) {} -/* ************************************************************************** */ -TableDistribution::TableDistribution( - const DiscreteKeys& keys, const Eigen::SparseVector& potentials) - : BaseConditional(keys.size(), keys, DecisionTreeFactor(keys, ADT())), - table_(TableFactor(keys, normalizeSparseTable(potentials))) {} - /* ************************************************************************** */ TableDistribution::TableDistribution(const DiscreteKeys& keys, const std::vector& potentials) @@ -71,23 +65,6 @@ TableDistribution::TableDistribution(const DiscreteKeys& keys, keys, normalizeSparseTable(TableFactor::Convert(keys, potentials)))) { } -/* ************************************************************************** - */ -TableDistribution::TableDistribution(const TableFactor& joint, - const TableFactor& marginal) - : BaseConditional(joint.size() - marginal.size(), - joint.discreteKeys() & marginal.discreteKeys(), ADT()), - table_(joint / marginal) {} - -/* ************************************************************************** */ -TableDistribution::TableDistribution(const TableFactor& joint, - const TableFactor& marginal, - const Ordering& orderedKeys) - : TableDistribution(joint, marginal) { - keys_.clear(); - keys_.insert(keys_.end(), orderedKeys.begin(), orderedKeys.end()); -} - /* ************************************************************************** */ void TableDistribution::print(const string& s, const KeyFormatter& formatter) const { diff --git a/gtsam/discrete/TableDistribution.h b/gtsam/discrete/TableDistribution.h index 65e895a85..39a1c481f 100644 --- a/gtsam/discrete/TableDistribution.h +++ b/gtsam/discrete/TableDistribution.h @@ -61,12 +61,6 @@ class GTSAM_EXPORT TableDistribution : public DiscreteConditional { /// Construct from TableFactor. TableDistribution(const TableFactor& f); - /** - * Construct from DiscreteKeys and SparseVector. - */ - TableDistribution(const DiscreteKeys& keys, - const Eigen::SparseVector& potentials); - /** * Construct from DiscreteKeys and std::vector. */ @@ -91,20 +85,6 @@ class GTSAM_EXPORT TableDistribution : public DiscreteConditional { TableDistribution(const DiscreteKey& key, const std::string& potentials) : TableDistribution(DiscreteKeys(key), potentials) {} - /** - * @brief construct P(X|Y) = f(X,Y)/f(Y) from f(X,Y) and f(Y) - * Assumes but *does not check* that f(Y)=sum_X f(X,Y). - */ - TableDistribution(const TableFactor& joint, const TableFactor& marginal); - - /** - * @brief construct P(X|Y) = f(X,Y)/f(Y) from f(X,Y) and f(Y) - * Assumes but *does not check* that f(Y)=sum_X f(X,Y). - * Makes sure the keys are ordered as given. Does not check orderedKeys. - */ - TableDistribution(const TableFactor& joint, const TableFactor& marginal, - const Ordering& orderedKeys); - /// @} /// @name Testable /// @{