Skip to content

Commit f5bbbc9

Browse files
committed
GJK: make default cv criterion absolute and relative
TODO: use different values for absolute/relative tolerances, both for GJK and EPA. Also remove other convergence criteria for GJK, they are not used.
1 parent 205c46c commit f5bbbc9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/narrowphase/gjk.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ bool GJK::checkConvergence(const Vec3f& w, const FCL_REAL& rl, FCL_REAL& alpha,
834834
std::logic_error);
835835
break;
836836
case Relative:
837-
check_passed = (diff - tolerance * rl) <= 0;
837+
check_passed = (diff - (tolerance + tolerance * rl)) <= 0;
838838
break;
839839
default:
840840
HPP_FCL_THROW_PRETTY("Invalid convergence criterion type.",

0 commit comments

Comments
 (0)