12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

undo more changes in TableFactor

release/4.3a0
Varun Agrawal 2023-07-25 11:13:25 -04:00
parent 3a78499d36
commit 8c9fad8cb1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/discrete/TableFactor.h
View File

@ -175,12 +175,12 @@ class GTSAM_EXPORT TableFactor : public DiscreteFactor {
/// Calculate error for DiscreteValues `x`, is -log(probability). /// Calculate error for DiscreteValues `x`, is -log(probability).
double error(const DiscreteValues& values) const; double error(const DiscreteValues& values) const;
/// multiple two TableFactors /// multiply two TableFactors
TableFactor operator*(const TableFactor& f) const { TableFactor operator*(const TableFactor& f) const {
return apply(f, Ring::mul); return apply(f, Ring::mul);
}; };
/// multiply with DecisionTreeFactor /// multiple with DecisionTreeFactor
DecisionTreeFactor operator*(const DecisionTreeFactor& f) const override; DecisionTreeFactor operator*(const DecisionTreeFactor& f) const override;
static double safe_div(const double& a, const double& b); static double safe_div(const double& a, const double& b);

1
gtsam/discrete/tests/testTableFactor.cpp
View File

@ -19,7 +19,6 @@
#include <CppUnitLite/TestHarness.h> #include <CppUnitLite/TestHarness.h>
#include <gtsam/base/Testable.h> #include <gtsam/base/Testable.h>
#include <gtsam/base/serializationTestHelpers.h> #include <gtsam/base/serializationTestHelpers.h>
#include <gtsam/discrete/DiscreteConditional.h>
#include <gtsam/discrete/DiscreteDistribution.h> #include <gtsam/discrete/DiscreteDistribution.h>
#include <gtsam/discrete/Signature.h> #include <gtsam/discrete/Signature.h>
#include <gtsam/discrete/TableFactor.h> #include <gtsam/discrete/TableFactor.h>