Honor lower-triangle contract for H in mju_boxQP.
mju_boxQP documents that only the lower triangle of the Hessian H is read, but the gradient and search-direction updates inside mju_boxQPoption still called the dense mju_mulMatVec, which reads the upper triangle as well. This violated the documented contract and prevented callers from safely leaving the upper triangle uninitialized. Add a file-local mulMatVecSym helper that computes res = H*vec while reading only the lower triangle of H (mirroring the convention of the existing mulVecMatVecSym quadratic-form helper), and use it in place of mju_mulMatVec in both call sites. Extend the BoxQP test suite with UpperTrianglePoisoned, which fills the strict upper triangle of H with NaN and verifies that the solver produces the same result as on the clean symmetric input. Reported by @lshdlut. Fixes #3275
This commit is contained in:
@@ -1407,6 +1407,21 @@ static mjtNum mulVecMatVecSym(const mjtNum* vec, const mjtNum* mat, int n) {
|
||||
}
|
||||
|
||||
|
||||
// multiply symmetric matrix with vector: res = mat*vec
|
||||
// assumes symmetry of mat, ignores upper triangle
|
||||
// res must not alias vec
|
||||
static void mulMatVecSym(mjtNum* res, const mjtNum* mat, const mjtNum* vec, int n) {
|
||||
for (int i=0; i < n; i++) {
|
||||
// diagonal + strict lower triangle: res[i] = sum_{j<=i} mat[i,j] * vec[j]
|
||||
res[i] = mat[n*i+i] * vec[i] + mju_dot(mat+n*i, vec, i);
|
||||
// strict upper mirror contribution: res[k] += mat[i,k] * vec[i] for k < i
|
||||
for (int k=0; k < i; k++) {
|
||||
res[k] += mat[n*i+k] * vec[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// minimize 0.5*x'*H*x + x'*g s.t. lower <= x <=upper, explicit options
|
||||
// additional arguments to mju_boxQP (see mju_boxQP documentation):
|
||||
// maxiter maximum number of iterations
|
||||
@@ -1512,7 +1527,7 @@ int mju_boxQPoption(mjtNum* res, mjtNum* R, int* index, // outputs
|
||||
oldvalue = value;
|
||||
|
||||
// compute gradient
|
||||
mju_mulMatVec(grad, H, res, n, n);
|
||||
mulMatVecSym(grad, H, res, n);
|
||||
mju_addTo(grad, g, n);
|
||||
|
||||
// find clamped dimensions
|
||||
@@ -1555,7 +1570,7 @@ int mju_boxQPoption(mjtNum* res, mjtNum* R, int* index, // outputs
|
||||
for (int i=0; i < n; i++) {
|
||||
temp[i] = clamped[i] ? res[i] : 0;
|
||||
}
|
||||
mju_mulMatVec(search, H, temp, n, n);
|
||||
mulMatVecSym(search, H, temp, n);
|
||||
mju_addTo(search, g, n);
|
||||
|
||||
// search = compress_free(search)
|
||||
|
||||
Reference in New Issue
Block a user