From 0b3477fc5ab428a6bbc65ca2b95e02d84b982593 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 7 Dec 2024 19:39:44 -0500 Subject: [PATCH] get different classes to play nicely --- gtsam/discrete/DiscreteConditional.h | 4 ++-- gtsam/discrete/DiscreteDistribution.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index ec2c5c38d..77003f232 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -173,8 +173,8 @@ class GTSAM_EXPORT DiscreteConditional return ADT::operator()(values); } - using DiscreteFactor::error; ///< DiscreteValues version - using DiscreteFactor::operator(); ///< DiscreteValues version + using DecisionTreeFactor::error; ///< DiscreteValues version + using DecisionTreeFactor::operator(); ///< DiscreteValues version /** * @brief restrict to given *parent* values. diff --git a/gtsam/discrete/DiscreteDistribution.h b/gtsam/discrete/DiscreteDistribution.h index 09ea50332..28e509f15 100644 --- a/gtsam/discrete/DiscreteDistribution.h +++ b/gtsam/discrete/DiscreteDistribution.h @@ -86,8 +86,7 @@ class GTSAM_EXPORT DiscreteDistribution : public DiscreteConditional { double operator()(size_t value) const; /// We also want to keep the Base version, taking DiscreteValues: - // TODO(dellaert): does not play well with wrapper! - // using Base::operator(); + using Base::operator(); /// Return entire probability mass function. std::vector pmf() const;