Minor pep8 formatting changes

This commit is contained in:
Scott Lawson 2016-11-21 20:11:31 -08:00
parent 1e630f2151
commit 4dcf3e9a49
1 changed files with 7 additions and 7 deletions

View File

@ -45,7 +45,7 @@ def hertz_to_mel(freq):
mel : scalar or ndarray
Mel-frequency value or ndarray in Mel
"""
return 2595.0 * log10(1 + (freq/700.0))
return 2595.0 * log10(1 + (freq / 700.0))
def mel_to_hertz(mel):
@ -59,7 +59,7 @@ def mel_to_hertz(mel):
freq : scalar or ndarray
Frequency value or array in Hz.
"""
return 700.0 * (10**(mel/2595.0)) - 700.0
return 700.0 * (10**(mel / 2595.0)) - 700.0
def melfrequencies_mel_filterbank(num_bands, freq_min, freq_max, num_fft_bands):
@ -84,7 +84,7 @@ def melfrequencies_mel_filterbank(num_bands, freq_min, freq_max, num_fft_bands):
mel_max = hertz_to_mel(freq_max)
mel_min = hertz_to_mel(freq_min)
delta_mel = abs(mel_max - mel_min) / (num_bands + 1.0)
frequencies_mel = mel_min + delta_mel*arange(0, num_bands+2)
frequencies_mel = mel_min + delta_mel * arange(0, num_bands + 2)
lower_edges_mel = frequencies_mel[:-2]
upper_edges_mel = frequencies_mel[2:]
center_frequencies_mel = frequencies_mel[1:-1]
@ -130,19 +130,19 @@ def compute_melmat(num_mel_bands=12, freq_min=64, freq_max=8000,
freq_min,
freq_max,
num_fft_bands
)
)
len_fft = float(num_fft_bands) / sample_rate
center_frequencies_hz = mel_to_hertz(center_frequencies_mel)
lower_edges_hz = mel_to_hertz(lower_edges_mel)
upper_edges_hz = mel_to_hertz(upper_edges_mel)
freqs = linspace(0.0, sample_rate/2.0, num_fft_bands)
freqs = linspace(0.0, sample_rate / 2.0, num_fft_bands)
melmat = zeros((num_mel_bands, num_fft_bands))
for imelband, (center, lower, upper) in enumerate(zip(
center_frequencies_hz, lower_edges_hz, upper_edges_hz)):
left_slope = (freqs >= lower) == (freqs <= center)
left_slope = (freqs >= lower) == (freqs <= center)
melmat[imelband, left_slope] = (
(freqs[left_slope] - lower) / (center - lower)
)
@ -152,4 +152,4 @@ def compute_melmat(num_mel_bands=12, freq_min=64, freq_max=8000,
(upper - freqs[right_slope]) / (upper - center)
)
return melmat, (center_frequencies_mel, freqs)
return melmat, (center_frequencies_mel, freqs)