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

Fix equality

release/4.3a0
Frank Dellaert 2024-09-29 23:57:37 -07:00
parent 846c7a1a99
commit 21171b3a9a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtsam/hybrid/HybridGaussianConditional.cpp
View File

@ -192,11 +192,10 @@ bool HybridGaussianConditional::equals(const HybridFactor &lf,
// Check the base and the factors: // Check the base and the factors:
return BaseFactor::equals(*e, tol) && return BaseFactor::equals(*e, tol) &&
conditionals_.equals(e->conditionals_, conditionals_.equals(
[tol](const GaussianConditional::shared_ptr &f1, e->conditionals_, [tol](const auto &f1, const auto &f2) {
const GaussianConditional::shared_ptr &f2) { return (!f1 && !f2) || (f1 && f2 && f1->equals(*f2, tol));
return f1->equals(*(f2), tol); });
});
} }
/* *******************************************************************************/ /* *******************************************************************************/

7
gtsam/hybrid/HybridGaussianFactor.cpp
View File

@ -154,10 +154,9 @@ bool HybridGaussianFactor::equals(const HybridFactor &lf, double tol) const {
// Check the base and the factors: // Check the base and the factors:
return Base::equals(*e, tol) && return Base::equals(*e, tol) &&
factors_.equals(e->factors_, factors_.equals(e->factors_, [tol](const auto &f1, const auto &f2) {
[tol](const sharedFactor &f1, const sharedFactor &f2) { return (!f1 && !f2) || (f1 && f2 && f1->equals(*f2, tol));
return f1->equals(*f2, tol); });
});
} }
/* *******************************************************************************/ /* *******************************************************************************/