From 8c9fad8cb16db195114a064a1a0e1c0d30002a93 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 25 Jul 2023 11:13:25 -0400 Subject: [PATCH] undo more changes in TableFactor --- gtsam/discrete/TableFactor.h | 4 ++-- gtsam/discrete/tests/testTableFactor.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gtsam/discrete/TableFactor.h b/gtsam/discrete/TableFactor.h index d5decd1a1..981e1507b 100644 --- a/gtsam/discrete/TableFactor.h +++ b/gtsam/discrete/TableFactor.h @@ -175,12 +175,12 @@ class GTSAM_EXPORT TableFactor : public DiscreteFactor { /// Calculate error for DiscreteValues `x`, is -log(probability). double error(const DiscreteValues& values) const; - /// multiple two TableFactors + /// multiply two TableFactors TableFactor operator*(const TableFactor& f) const { return apply(f, Ring::mul); }; - /// multiply with DecisionTreeFactor + /// multiple with DecisionTreeFactor DecisionTreeFactor operator*(const DecisionTreeFactor& f) const override; static double safe_div(const double& a, const double& b); diff --git a/gtsam/discrete/tests/testTableFactor.cpp b/gtsam/discrete/tests/testTableFactor.cpp index 7ad0ac1ff..e85e4254c 100644 --- a/gtsam/discrete/tests/testTableFactor.cpp +++ b/gtsam/discrete/tests/testTableFactor.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include