jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils.curves.bezier] Fix and clarify bezier() code

Browse Source 
- Accuracy fix (incorrect +1 term)
- Explicitly index last dim of `nodes`
- Suppress warnings about div by zero
- simplify `umul` and `udiv` calculation
This commit is contained in:
Jan Petykiewicz 2025-03-04 23:00:52 -08:00
parent 858ef4a114
commit 6567394fbf
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
masque/utils/curves.py
View File

@ -27,19 +27,17 @@ def bezier(
nn = nodes.shape[0] nn = nodes.shape[0]
weights = numpy.ones(nn) if weights is None else numpy.asarray(weights) weights = numpy.ones(nn) if weights is None else numpy.asarray(weights)
t_half0 = tt <= 0.5 with numpy.errstate(divide='ignore'):
umul = tt / (1 - tt) umul = (tt / (1 - tt)).clip(max=1)
udiv = 1 / umul udiv = ((1 - tt) / tt).clip(max=1)
umul[~t_half0] = 1
udiv[t_half0] = 1
hh = numpy.ones((tt.size,)) hh = numpy.ones((tt.size,))
qq = nodes[None, 0] * hh[:, None] qq = nodes[None, 0, :] * hh[:, None]
for kk in range(1, nn): for kk in range(1, nn):
hh *= umul * (nn + 1 - kk) * weights[kk] hh *= umul * (nn - kk) * weights[kk]
hh /= kk * udiv * weights[kk - 1] + hh hh /= kk * udiv * weights[kk - 1] + hh
qq *= 1.0 - hh[:, None] qq *= 1.0 - hh[:, None]
qq += hh[:, None] * nodes[None, kk] qq += hh[:, None] * nodes[None, kk, :]
return qq return qq