From 452a591837a9116ddaf0fa982a39c84e799e8ae3 Mon Sep 17 00:00:00 2001
From: Skudalen <markusskudal@gmail.com>
Date: Mon, 28 Jun 2021 10:57:08 +0200
Subject: [PATCH] feat: clone and import python_speech_features and add a mfcc
 func

---
 .DS_Store                                  | Bin 6148 -> 6148 bytes
 .gitignore                                 |   2 +-
 Handle_emg_data.py                         |   1 -
 Present_data.py                            |  31 +++++++++++++++------
 Signal_prep.py                             |  15 +++++-----
 __pycache__/Handle_emg_data.cpython-38.pyc | Bin 19853 -> 19853 bytes
 __pycache__/Signal_prep.cpython-38.pyc     | Bin 2298 -> 2414 bytes
 7 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 7540a211d0ba30806938eed34b14c4278beedbdd..fe642e2d5ff653091ebb431a3a9c69f11c4c2c4c 100644
GIT binary patch
delta 87
zcmZoMXfc@J&&abeU^g=(&tx8!y2%?@#5XTw@nSS&00J?F0)|S45{3+he1<%Rc!pvi
iKNSd*fg<q?X+TyYP_~qz2*@hl{FwDM<7Re_zx)8Z*A^B4

delta 42
ycmZoMXfc@J&&a(oU^g=(_hcTHI!4CH8(G9QFJ$pz+^oX(m~mo*<z{w{zx)6ZC=DC{

diff --git a/.gitignore b/.gitignore
index efb7fcd..049dc59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 Exp20201205_2myo_hard**
 Exp20201205_2myo_soft**
 Documents
-python_speech_features
\ No newline at end of file
+python_speech_features**
\ No newline at end of file
diff --git a/Handle_emg_data.py b/Handle_emg_data.py
index 2c034fe..4956cbb 100644
--- a/Handle_emg_data.py
+++ b/Handle_emg_data.py
@@ -1,7 +1,6 @@
 import pandas as pd
 from pathlib import Path
 import numpy as np
-
 from pandas.core.frame import DataFrame
 
 class Data_container:
diff --git a/Present_data.py b/Present_data.py
index 09b0bcb..88a7636 100644
--- a/Present_data.py
+++ b/Present_data.py
@@ -1,5 +1,7 @@
 from Handle_emg_data import *
 from Signal_prep import *
+import matplotlib.pyplot as plt
+from matplotlib import cm
 
 # PLOT FUNCTIONS:
 
@@ -9,7 +11,7 @@ def plot_df(df:DataFrame):
     plt.show()
 
 # Plots ndarrays after transformations 
-def plot_arrays(N, N_name, y, y_name):
+def plot_array(N, y):
     plt.plot(N, np.abs(y))
     plt.show()
 
@@ -25,6 +27,12 @@ def plot_compare_two_df(df_old, old_name, df_new, new_name):
     axis[1].set_title(new_name)
     plt.show()
 
+def plot_mfcc(mfcc_data):
+    fig, ax = plt.subplots()
+    mfcc_data= np.swapaxes(mfcc_data, 0 ,1)
+    cax = ax.imshow(mfcc_data, interpolation='nearest', cmap=cm.coolwarm, origin='lower')
+    ax.set_title('MFCC')
+    plt.show() 
 
 # DATA FUNCTIONS:
 
@@ -59,6 +67,17 @@ def denoice_dataset(handler:Handler.CSV_handler, subject_nr, which_arm, round, e
     return df_new
 
 
+# CASE FUNTIONS 
+
+def compare_with_wavelet(data_frame):
+    N_trans, cA, cD = wavelet_db4(data_frame)
+    data_frame_freq = make_df_from_xandy(N_trans, cA, 1)
+
+    cA_filt, cD_filt = soft_threshold_filter(cA, cD)
+    data_frame_freq_filt = make_df_from_xandy(N_trans, cD_filt, 1)
+
+    plot_compare_two_df(data_frame_freq, 'Original data', data_frame_freq_filt, 'Analyzed data')
+
 
 # MAIN:
 
@@ -68,13 +87,9 @@ def main():
     load_data(csv_handler, 'hard')
     data_frame = get_data(csv_handler, 1, 'left', 1, 1)
 
-    N_trans, cA, cD = wavelet_db4(data_frame)
-    data_frame_freq = make_df_from_xandy(N_trans, cA, 1)
-
-    cA_filt, cD_filt = soft_threshold_filter(cA, cD)
-    data_frame_freq_filt = make_df_from_xandy(N_trans, cD_filt, 1)
-
-    plot_compare_two_df(data_frame_freq, 'Original data', data_frame_freq_filt, 'Analyzed data')
+    N, y_mfcc = mfcc(data_frame)
+    plt.plot(y_mfcc)
+    plt.show()
 
     return None
 
diff --git a/Signal_prep.py b/Signal_prep.py
index 032eda7..a8a0b19 100644
--- a/Signal_prep.py
+++ b/Signal_prep.py
@@ -1,12 +1,11 @@
 import numpy as np 
-import matplotlib.pyplot as plt
-import pandas
 from pandas.core.frame import DataFrame
 from scipy.fft import fft, fftfreq
 import pywt
-import pyhton_speech_features as psf
-#from scipy.signal import wavelets
-#import pyyawt
+#from pyhton_speech_features.base import mfcc
+import sys
+sys.path.insert(0, '/Users/Markus/Prosjekter git/Slovakia 2021/python_speech_features/python_speech_features')
+from python_speech_features.python_speech_features import *
 
 import Handle_emg_data as Handler
 
@@ -78,9 +77,9 @@ def cepstrum(df:DataFrame):
     
     return None
 
-'''
 def mfcc(df:DataFrame):
     N = get_xory_from_df('x', df)
     y = get_xory_from_df('y', df)
-    spf.mfcc(y, )
-'''
+    return N, base.mfcc(y, SAMPLE_RATE)
+    
+
diff --git a/__pycache__/Handle_emg_data.cpython-38.pyc b/__pycache__/Handle_emg_data.cpython-38.pyc
index f736d9e9ffab49374cd0f3c1f89911a7d199b710..f9eade7b12190baa235b50821a140d6f95f01104 100644
GIT binary patch
delta 659
zcmZ{hO-~bH5XYT%ciYkzNJv<G!KDRiOI7p$vGFawQfOB>s0o`8^4Ko4p=_Jkg-GIo
zFTjPlm~b<CFrLiD#6<6Y1jAlE$#)>}nO&j@348cu=KuV6o|$>}4q)#9(l4{wfphXZ
z#=|e^UkX_CTUiH#>Z+|5q>j2oS;Ik&4aNlhRCl!~^iAy*K#@KqDi<P!9ak77MwyYP
zKZ&<cqP65RDEVKLh1{KKsRx;w=x(_i!W3w4VC9t5bMY!mxyaSq77uOV3A{$b`s`Ss
zwFS18mOg2yuuDbZtlKyvW4z(p`n-~{QeAt^TkUpS&!TS^KM(!yXo78q?_T<tOK~fB
zQ-Z!%jq|gd%`p;;BqJpe_{){%DYF)t{iEvc87J>*ZGdTl#o~CllW-m3<zup@m1_1J
zPjnm`<&KQTD6KB8-1@h49O2803?A`hHjZvH?lSH(9xxv5$44nse=#^Ivob`_2J*3b
z^-A(_q~+;-{rS)oCu&$dh&g?WpfQ}zbB%dMO?Fa+1zK+0n|i|581nBJ=U5HkO#nN{
zGXzSj)AVHLKN@q_O+L+9T3<LV;o@aJPxOV??si^dOlFqqY;E>;@F~YMZWhvE)diWN
LxgXc5WtRT}^rDnG

delta 659
zcmZ{h&ui3B5XYU}B)jYW=t991wKb%_jL}68troOMLAz|Sx`!&XAmzE6c9*W%Ws-^o
z5B&#v>0E@~L=WOgg5bfse?bx6)sy}ezDY!(U=AN<zVDlPGxLs4;OGR(PpZ}P=hPRT
zo_;ES*Fe$_Z5J%^^uU}|I+_ZOffF2Cj5+$I9~xPhw2h|#i}bGGUd$ABTxB?nYYdxy
z7G8rxJH<!fB%h0R?XIhIS!s&lezYgr0)sugenuKac!Q-{<{G^eYk`ObHfYjZn%*+{
z0(+g#2Lm;B=_tb80B@=oZzX}bu2p1d80^H`!$A~F`f}-G{a;6OY_pQ+^7|Uu?#yh1
z^CiYI<2IwfC^AY4Tgj%|P0jVQ=H%DP;eSrvH2VN9L2JQEcap9ny?k2Ll%?({jKv@f
zQ0?f7KSkTEXLtTC9WU_Ziwqv|&ukpsW2`dnGu9Xnj`LGg@ir#rRpvnUY@i-%<hjL%
znP$^l?{R&B6FsdibKzJL_>*OuYqS`i>SP6c+VofF*V&pw{vGoi>k?i`I6$63YP~@>
zR-J$Kmm3{Etx97o!k&n5hR+LQ5%-6K=a}P65BFb;53tEGS#7(VR`peio#VVoy|(ik
DhTN9a

diff --git a/__pycache__/Signal_prep.cpython-38.pyc b/__pycache__/Signal_prep.cpython-38.pyc
index 519d5594fc6a60b7499ec3bdef1e1fce44aa78c5..74d4c0f3b0405d8ac66bd6d73591427ab32ed364 100644
GIT binary patch
delta 1370
zcmZuw&u<$=6yDig@2(wZZ6|gT8Um;dwA&C0p`xn9uZkWjkPvF9+AN1<vol*8t=HC@
zO@iAX3pK}HqCFrX4#|N-{ufT%m@B7VxN+eCyf-#gWirxy@6CH}X1;mv&0noQ7B=q9
z&({nb`%i!SdK0zZY4PH)aq%%u`OERfr{lV)e=~pLbA#KbCNof0vc{JrS=J0&+zA(i
z%iW(C_jvWl4i|Zi&m9?Idupxod9-$>E1x%TwZxmeg)z%~fiI$5nR?s2gWi{>t0lgC
zWP9NS&bEzU<@nc2=A#GY&un9BI4Zh>Jd#5pl5UiWxYz?BubpoWm||Ct|NOD#;*&yG
z9`uT?fHMR9@`Qb{xIho}5Dc@;+J8GXG)v3e-J%qM{~Q{qDL)@TKhAoOM061EiwkIz
zlq`cSG3b;(m|v~vZFF4VKof<sC5EH3X018I0NUlIwfgqV$<;J1qCpz*^i_<Jbp(Ue
zn8Q5g<Al}nTkG+d4p$c6y$*E4GZP`0n_e><9TdvFkF+vTgcd(2phe-87$6?03dH$C
zp{!nBs7jg*1^`Rw4qYyiC=)r-ov@=lF1-$qQD$-r=WU>uf`3gTfzHO<G%7+uSI{bn
z9<nxTtjVr0xLlsvJL5I91vb2bLRE_{)~P$l_=KA!3y!|m(Fbo(fScTk(q4uSNp5Rp
zwgMeFz(hSiM#l)aiF>7kK!w0kyop+3(b_0SmG3`z85JOQ&;G#?R5Tl)Oow(4Go>ud
zfX-v!PSS9dc5D!=mp7dC*JjGq=;iwY<fIKSQ6H6$owe~h7@shN{{~T@`3X+Bf>7Y6
zIW(S_-!arot(n}|HqNZip^AP@GGLm@nKhw8`?P&F7hWQUvVgt*XLP({j8S0E)GWA;
z+W&}9qiP}-Q8|yuAuHI4d1#)p)Z8{;3&R3y+FiS`6w2<WNdoVpeTE9Whqk*^;%OC-
z1=Gf0RaNr6{%{1Xvf=HFbsJc6B$Yjki>`8dxfD=@o9F-Cx6U`K#+^9lnTSOHVZ`Gi
zR_??AuuSae<3WdDmEbY~^#trtiFA52yBD6J3#{APd%r*6dztu<Dk;|yJXXg)SjVpR
XO#L5C&$Mmd^D2JTZ+VVa_uYR1iJ>h#

delta 1303
zcmZ8hOOF#r5T2g5A2YVs50nj{L_Ctg7m^SqL;+<52t<-qlqI0Gh$dcl8=Kf;RNaf&
zWCkCWTXI3e32^{!Nc@PL6XhPwDN;^ca*j|$QZ=>~YuoDTuIlRQud2TB-zzU`?QcA<
zsNwkS*FU~{fV;m)Ssn%|pW&2G@3$|1>v6N=3x`{e7`M4|&+JsV%M16kPIX}|@)BBW
z3$4sO)K<99E9g__RbIojA-tPSzJf98yn*K}&Nj55dH>%d>0S1)W#e-lM^1-oAmEt>
z9_lYor*E@%x~acauMrv-g{C)H<CSefCH-07dcS~{+;=W~R5L%Cz_>da{vg6>_qKQg
zZPG-cu@-|y%FIT3%D6bouR3TBY^dOpnG&x+1Ghl#S!rYK%dft;5PrRO<pNMi(2-z5
zole<$X3|5MvmPqwMzUk<g#G<k3jMwcC;gE3591|SMxn7HvzhBKpScWH5zmh&2}@@1
zty4gNUg#)-(gM}3ovF&4YnaJMsE)y>3aaUI^Kh$)ULA*vUN{ob9=7yPv-u(AydO%5
zih&_QeC8cImpKPmQ7^J8dzZoS^n|r}`5--Q!XaF;f*OF3gUN_Pm2^WYj%P=4568&h
z^wz@uaD?!B=kv|-o9XY?YVBimlT<V+K9;|o{$u@g=1tUra(?k2j=;*F1FBHR9Abi*
zff?oL2hP0Y0o^!3;z;_7eRM|jSZaA?7~K{i=MBdk&*HJ9PExU{&NN+C##v=>672!Y
zoIy9@BLO{&92bKaM0n5Plvhy1+G8zdu^t<-`NT{t#W;&+)~=q|N{_8wcHKyv#7zpy
zh~2obt6$fXVp39OY{kX6v}+_~Wj(fIJ1%1YBk^Jnd9SYnu{m(E<_&5|AE`4LhrFx0
zAs_Zso;(~!7ig0p$eD9#4mewxjl18Ay<2zCyc78F9yt}|_SQ|&Q(**IVLBN024NRj
zYQbbX;+ZYRH}GU$)B_Ybr^;SS;dP;NmfMId64T|r(jy;LxQHgh9%4YmQmD_-DyeoF
zt0JL%{FQZ|!6#@54rEreJ-)SryglP?&T?*5=DCD~hho47=m{+n^fAsq!&TbtD?;hq
z#?^4qxjg(5wwx9De}Mbxc*3_w;w-}ul1M%8ewkJ4%(YzIG=0~#{DNO|ZP)uBF@GCa