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

use retstep instead of subtracting

Browse Source
This commit is contained in:
Jan Petykiewicz 2023-07-17 23:36:12 -07:00
parent 3fa124d13f
commit 0f9746c2a5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
masque/shapes/arc.py
View File

@ -204,10 +204,10 @@ class Arc(Shape):
# Approximate outer perimeter via numerical integration # Approximate outer perimeter via numerical integration
a0, a1 = a_ranges[1] # use outer arc a0, a1 = a_ranges[1] # use outer arc
t = numpy.linspace(a0, a1, 10_000) # NOTE: could probably use an adaptive number of points t, dt = numpy.linspace(a0, a1, 10_000, retstep=True) # NOTE: could probably use an adaptive number of points
r0sin = r0 * numpy.sin(t) r0sin = r0 * numpy.sin(t)
r1cos = r1 * numpy.cos(t) r1cos = r1 * numpy.cos(t)
perimeter = numpy.trapz(numpy.sqrt(r0sin * r0sin + r1cos * r1cos), dx=t[1] - t[0]) perimeter = numpy.trapz(numpy.sqrt(r0sin * r0sin + r1cos * r1cos), dx=dt)
#from scipy.special import ellipeinc #from scipy.special import ellipeinc
#m = 1 - (r1 / r0) ** 2 #m = 1 - (r1 / r0) ** 2