convert everything to DecisionTreeFactor so we can use override opera…

…tor* method
borglab · Jan 5, 2025 · a7fc6e3 · a7fc6e3
1 parent 13bafb0
commit a7fc6e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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<DecisionTreeFactor>(
-        this->operator*(df->toDecisionTreeFactor()));
+    return std::make_shared<DecisionTreeFactor>(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
@@ -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<DecisionTreeFactor>(
-        this->operator*(df->toDecisionTreeFactor()));
+    return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() *
+                                                df->toDecisionTreeFactor());
   }
 
   /*

diff --git 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<DecisionTreeFactor>(
-        this->operator*(df->toDecisionTreeFactor()));
+    return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() *
+                                                df->toDecisionTreeFactor());
   }
 
   /*

diff --git 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<DecisionTreeFactor>(
-        this->operator*(df->toDecisionTreeFactor()));
+    return std::make_shared<DecisionTreeFactor>(this->toDecisionTreeFactor() *
+                                                df->toDecisionTreeFactor());
   }
 
   /*