From 3b2a4491b35903bc991b59290988cb9acb6aff49 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Fri, 7 Jun 2024 14:35:09 -0500 Subject: [PATCH] Fix windows issue in kinematics_limits.h with using eigen array max and min --- .../include/tesseract_common/kinematic_limits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tesseract_common/include/tesseract_common/kinematic_limits.h b/tesseract_common/include/tesseract_common/kinematic_limits.h index 4eca0951137..0b816c8d392 100644 --- a/tesseract_common/include/tesseract_common/kinematic_limits.h +++ b/tesseract_common/include/tesseract_common/kinematic_limits.h @@ -104,12 +104,12 @@ bool satisfiesLimits(const Eigen::Ref l0 || lower_diff || lower_relative_diff; auto upper_diff_abs = (p - l1).abs(); auto upper_diff = (upper_diff_abs <= md); - auto upper_relative_diff = (upper_diff_abs <= mrd * p.abs().max(l1.abs())); + auto upper_relative_diff = (upper_diff_abs <= mrd * (p.abs().max)(l1.abs())); auto upper_check = p < l1 || upper_diff || upper_relative_diff; return (lower_check.all() && upper_check.all()); @@ -146,7 +146,7 @@ template void enforceLimits(Eigen::Ref> values, const Eigen::Ref>& limits) { - values = values.array().min(limits.col(1).array()).max(limits.col(0).array()); + values = ((values.array().min)(limits.col(1).array()).max)(limits.col(0).array()); } } // namespace tesseract_common