Rename C sparse structure to M in mjdata, improve docstrings.
PiperOrigin-RevId: 758636638 Change-Id: If78acc423601d2911f514929b27f7b6d0af9ef58
This commit is contained in:
committed by
Copybara-Service
parent
4ba04586ae
commit
dd28b887d4
@@ -1047,14 +1047,14 @@ void mj_mulM2(const mjModel* m, const mjData* d, mjtNum* res, const mjtNum* vec)
|
||||
|
||||
// non-simple: add off-diagonals
|
||||
if (!m->dof_simplenum[i]) {
|
||||
int adr = d->C_rowadr[i];
|
||||
res[i] += mju_dotSparse(qLD+adr, vec, d->C_rownnz[i] - 1, d->C_colind+adr);
|
||||
int adr = d->M_rowadr[i];
|
||||
res[i] += mju_dotSparse(qLD+adr, vec, d->M_rownnz[i] - 1, d->M_colind+adr);
|
||||
}
|
||||
}
|
||||
|
||||
// res *= sqrt(D)
|
||||
for (int i=0; i < nv; i++) {
|
||||
int diag = d->C_rowadr[i] + d->C_rownnz[i] - 1;
|
||||
int diag = d->M_rowadr[i] + d->M_rownnz[i] - 1;
|
||||
res[i] *= mju_sqrt(qLD[diag]);
|
||||
}
|
||||
}
|
||||
@@ -1072,10 +1072,10 @@ void mj_addM(const mjModel* m, mjData* d, mjtNum* dst,
|
||||
|
||||
// gather C <- qM (legacy to CSR)
|
||||
mjtNum* C = mjSTACKALLOC(d, nC, mjtNum);
|
||||
mju_gather(C, d->qM, d->mapM2C, nC);
|
||||
mju_gather(C, d->qM, d->mapM2M, nC);
|
||||
|
||||
// add to dst
|
||||
mj_addMSparse(m, d, dst, rownnz, rowadr, colind, C, d->C_rownnz, d->C_rowadr, d->C_colind);
|
||||
mj_addMSparse(m, d, dst, rownnz, rowadr, colind, C, d->M_rownnz, d->M_rowadr, d->M_colind);
|
||||
mj_freeStack(d);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user