Commit 7d2b6f2a authored by LucasDANIELE's avatar LucasDANIELE
Browse files

nettoyage

parent 230f0071
...@@ -62,7 +62,7 @@ def afficherAvancement(t,T): ...@@ -62,7 +62,7 @@ def afficherAvancement(t,T):
for i in range(int(np.round(np.round(t/T,2)*50))): for i in range(int(np.round(np.round(t/T,2)*50))):
barre += "#" barre += "#"
for i in range(50-int(np.round(np.round(t/T,2)*50))): for i in range(50-int(np.round(np.round(t/T,2)*50))):
barre += " " barre += "_"
barre +="| " barre +="| "
barre += str(np.round(t/T,2)) + " %" barre += str(np.round(t/T,2)) + " %"
print(barre) print(barre)
......
...@@ -88,26 +88,4 @@ def freq_from_HPS(sig, fs): ...@@ -88,26 +88,4 @@ def freq_from_HPS(sig, fs):
resarray.append(res) resarray.append(res)
c *= a c *= a
show() show()
return mean(resarray[1:3]) return mean(resarray[1:3])
\ No newline at end of file
def hello(signal, fs):
print('Calculating frequency from FFT:', end=' ')
start_time = time()
print('%f Hz' % freq_from_fft(signal, fs))
print('Time elapsed: %.3f s\n' % (time() - start_time))
print('Calculating frequency from zero crossings:', end=' ')
start_time = time()
print('%f Hz' % freq_from_crossings(signal, fs))
print('Time elapsed: %.3f s\n' % (time() - start_time))
print('Calculating frequency from autocorrelation:', end=' ')
start_time = time()
print('%f Hz' % freq_from_autocorr(signal, fs))
print('Time elapsed: %.3f s\n' % (time() - start_time))
# print('Calculating frequency from harmonic product spectrum:')
# start_time = time()
# freq_from_HPS(signal, fs)
# print('Time elapsed: %.3f s\n' % (time() - start_time))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment