diff --git a/gtsam_unstable/discrete/AllDiff.h b/gtsam_unstable/discrete/AllDiff.h index 032808dcd..cfbd76e7c 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->toDecisionTreeFactor() * - df->toDecisionTreeFactor()); + return std::make_shared( + this->operator*(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 0ebae4d77..a1a2bf0a6 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->toDecisionTreeFactor() * - df->toDecisionTreeFactor()); + return std::make_shared( + this->operator*(df->toDecisionTreeFactor())); } /* diff --git a/gtsam_unstable/discrete/Domain.h b/gtsam_unstable/discrete/Domain.h index 9a4a21847..dea85934f 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->toDecisionTreeFactor() * - df->toDecisionTreeFactor()); + return std::make_shared( + this->operator*(df->toDecisionTreeFactor())); } /* diff --git a/gtsam_unstable/discrete/SingleValue.h b/gtsam_unstable/discrete/SingleValue.h index ebe23f7e4..8675c929b 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->toDecisionTreeFactor() * - df->toDecisionTreeFactor()); + return std::make_shared( + this->operator*(df->toDecisionTreeFactor())); } /*