From a7fc6e3763d4dc5ea5019906be37e05613d3f9d9 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sun, 5 Jan 2025 15:08:58 -0500 Subject: [PATCH] convert everything to DecisionTreeFactor so we can use override operator* method --- gtsam_unstable/discrete/AllDiff.h | 4 ++-- gtsam_unstable/discrete/BinaryAllDiff.h | 4 ++-- gtsam_unstable/discrete/Domain.h | 4 ++-- gtsam_unstable/discrete/SingleValue.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtsam_unstable/discrete/AllDiff.h b/gtsam_unstable/discrete/AllDiff.h index cfbd76e7c..032808dcd 100644 --- a/gtsam_unstable/discrete/AllDiff.h +++ b/gtsam_unstable/discrete/AllDiff.h @@ -56,8 +56,8 @@ class GTSAM_UNSTABLE_EXPORT AllDiff : public Constraint { /// Multiply factors, DiscreteFactor::shared_ptr edition DiscreteFactor::shared_ptr multiply( const DiscreteFactor::shared_ptr& df) const override { - return std::make_shared( - this->operator*(df->toDecisionTreeFactor())); + return std::make_shared(this->toDecisionTreeFactor() * + df->toDecisionTreeFactor()); } /// Compute error for each assignment and return as a tree diff --git a/gtsam_unstable/discrete/BinaryAllDiff.h b/gtsam_unstable/discrete/BinaryAllDiff.h index a1a2bf0a6..0ebae4d77 100644 --- a/gtsam_unstable/discrete/BinaryAllDiff.h +++ b/gtsam_unstable/discrete/BinaryAllDiff.h @@ -72,8 +72,8 @@ class BinaryAllDiff : public Constraint { /// Multiply factors, DiscreteFactor::shared_ptr edition DiscreteFactor::shared_ptr multiply( const DiscreteFactor::shared_ptr& df) const override { - return std::make_shared( - this->operator*(df->toDecisionTreeFactor())); + return std::make_shared(this->toDecisionTreeFactor() * + df->toDecisionTreeFactor()); } /* diff --git a/gtsam_unstable/discrete/Domain.h b/gtsam_unstable/discrete/Domain.h index dea85934f..9a4a21847 100644 --- a/gtsam_unstable/discrete/Domain.h +++ b/gtsam_unstable/discrete/Domain.h @@ -93,8 +93,8 @@ class GTSAM_UNSTABLE_EXPORT Domain : public Constraint { /// Multiply factors, DiscreteFactor::shared_ptr edition DiscreteFactor::shared_ptr multiply( const DiscreteFactor::shared_ptr& df) const override { - return std::make_shared( - this->operator*(df->toDecisionTreeFactor())); + return std::make_shared(this->toDecisionTreeFactor() * + df->toDecisionTreeFactor()); } /* diff --git a/gtsam_unstable/discrete/SingleValue.h b/gtsam_unstable/discrete/SingleValue.h index 8675c929b..ebe23f7e4 100644 --- a/gtsam_unstable/discrete/SingleValue.h +++ b/gtsam_unstable/discrete/SingleValue.h @@ -66,8 +66,8 @@ class GTSAM_UNSTABLE_EXPORT SingleValue : public Constraint { /// Multiply factors, DiscreteFactor::shared_ptr edition DiscreteFactor::shared_ptr multiply( const DiscreteFactor::shared_ptr& df) const override { - return std::make_shared( - this->operator*(df->toDecisionTreeFactor())); + return std::make_shared(this->toDecisionTreeFactor() * + df->toDecisionTreeFactor()); } /*