From 199c0a0f24da5e040ec128b83ad1f9cb3e2ef8eb Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sun, 8 Dec 2024 17:15:22 -0500 Subject: [PATCH] keep using DecisionTreeFactor for DiscreteConditional --- gtsam/discrete/DiscreteConditional.cpp | 4 ++-- gtsam/discrete/DiscreteConditional.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp index bd10e28b4..399126d51 100644 --- a/gtsam/discrete/DiscreteConditional.cpp +++ b/gtsam/discrete/DiscreteConditional.cpp @@ -201,7 +201,7 @@ DiscreteConditional::shared_ptr DiscreteConditional::choose( } /* ************************************************************************** */ -DiscreteFactor::shared_ptr DiscreteConditional::likelihood( +DecisionTreeFactor::shared_ptr DiscreteConditional::likelihood( const DiscreteValues& frontalValues) const { // Get the big decision tree with all the levels, and then go down the // branches based on the value of the frontal variables. @@ -226,7 +226,7 @@ DiscreteFactor::shared_ptr DiscreteConditional::likelihood( } /* ****************************************************************************/ -DiscreteFactor::shared_ptr DiscreteConditional::likelihood( +DecisionTreeFactor::shared_ptr DiscreteConditional::likelihood( size_t frontal) const { if (nrFrontals() != 1) throw std::invalid_argument( diff --git a/gtsam/discrete/DiscreteConditional.h b/gtsam/discrete/DiscreteConditional.h index 75eaf9154..96ecefd7a 100644 --- a/gtsam/discrete/DiscreteConditional.h +++ b/gtsam/discrete/DiscreteConditional.h @@ -188,11 +188,11 @@ class GTSAM_EXPORT DiscreteConditional shared_ptr choose(const DiscreteValues& given) const; /** Convert to a likelihood factor by providing value before bar. */ - DiscreteFactor::shared_ptr likelihood( + DecisionTreeFactor::shared_ptr likelihood( const DiscreteValues& frontalValues) const; /** Single variable version of likelihood. */ - DiscreteFactor::shared_ptr likelihood(size_t frontal) const; + DecisionTreeFactor::shared_ptr likelihood(size_t frontal) const; /** * sample