update 41

This commit is contained in:
Connor Olding 2018-03-01 04:04:27 -08:00
parent d903249930
commit 3968fbddc4

View file

@ -4,17 +4,16 @@ import numpy as np
import scipy.signal as sig import scipy.signal as sig
def magnitudes_window_setup(s, size=8192): def magnitudes_window_setup(s, size=8192, overlap=0.661):
# note: the default overlap value is only
# optimal for a blackman-harris window.
L = s.shape[0] L = s.shape[0]
overlap = 0.661
step = np.ceil(size*(1 - overlap)) step = np.ceil(size*(1 - overlap))
segs = np.ceil(L/step) segs = np.ceil(L/step)
return step, segs return step, segs
def magnitudes(s, size=8192): def magnitudes(s, size=8192):
import scipy.linalg as linalg
step, segs = magnitudes_window_setup(s, size) step, segs = magnitudes_window_setup(s, size)
L = s.shape[0] L = s.shape[0]
@ -26,7 +25,7 @@ def magnitudes(s, size=8192):
win_size = size win_size = size
win = sig.blackmanharris(win_size) win = sig.blackmanharris(win_size)
win /= linalg.norm(win) win /= np.sqrt(np.sum(np.square(win)))
count = 0 count = 0
for i in range(0, L - 1, int(step)): for i in range(0, L - 1, int(step)):