notwa/dsp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update 39

Browse source
This commit is contained in:
Connor Olding 2018-02-20 04:04:25 -08:00
parent ec40a745f5
commit c2a3c65687
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/smoothfft.py
View file

@ -30,8 +30,8 @@ def smoothfft2(xs, ys, bw=1, precision=512, compensate=True):
for i, x in enumerate(xs): for i, x in enumerate(xs):
# before optimizations: dist = np.abs(np.log2(xs2/(x + 1e-35)))/bw # before optimizations: dist = np.abs(np.log2(xs2/(x + 1e-35)))/bw
dist = np.abs(log2_xs2 - np.log2(x + 1e-35))/bw dist = np.abs(log2_xs2 - np.log2(x + 1e-35))/bw
# window = np.maximum(0, 1 - dist) # triangle window # window = np.maximum(0, 1 - dist) # triangular
window = np.exp(-dist**2/(0.5/2)) # gaussian window (non-truncated) window = np.exp(-dist**2/(0.5/2)) # gaussian (untruncated)
ys2 += ys[i]*window ys2 += ys[i]*window
if compensate: if compensate:
_, temp = smoothfft2(xs, np.ones(len(xs)), _, temp = smoothfft2(xs, np.ones(len(xs)),
@ -45,14 +45,14 @@ def smoothfft3(ys, bw=1, precision=512):
size = len(ys) size = len(ys)
xs = np.arange(0, 1, 1/size) xs = np.arange(0, 1, 1/size)
xs2 = np.logspace(-np.log2(size), 1, precision, base=2) xs2 = np.logspace(-np.log2(size), 0, precision, base=2)
ys2 = np.zeros(precision) ys2 = np.zeros(precision)
comp = np.zeros(precision) comp = np.zeros(precision)
log2_xs2 = np.log2(xs2) log2_xs2 = np.log2(xs2)
for i, x in enumerate(xs): for i, x in enumerate(xs):
dist = np.abs(log2_xs2 - np.log2(x + 1e-35)) / bw dist = np.abs(log2_xs2 - np.log2(x + 1e-35)) / bw
window = np.exp(-dist**2 * 4) # gaussian window (non-truncated) window = np.exp(-dist**2 * 4) # gaussian (untruncated)
comp += window comp += window
ys2 += ys[i] * window ys2 += ys[i] * window