From 3771d638353d559f3b73cc5deb8cbabe36eac695 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Tue, 3 Jan 2023 13:37:32 -0500 Subject: [PATCH] simplify HybridConditional equality check --- gtsam/hybrid/HybridConditional.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/gtsam/hybrid/HybridConditional.cpp b/gtsam/hybrid/HybridConditional.cpp index 611f9b0e7..8371a3365 100644 --- a/gtsam/hybrid/HybridConditional.cpp +++ b/gtsam/hybrid/HybridConditional.cpp @@ -118,21 +118,8 @@ bool HybridConditional::equals(const HybridFactor &other, double tol) const { } return inner_->equals(*(e->inner_), tol); - if (inner_) { - if (e->inner_) { - // Both the inner_ factors are not null - return inner_->equals(*(e->inner_), tol); - } else { - return false; - } - } else { - if (e->inner_) { - return false; - } else { - // Both inner_ are null - return true; - } - } + return inner_ ? (e->inner_ ? inner_->equals(*(e->inner_), tol) : false) + : !(e->inner_); } /* ************************************************************************ */