From 31cf8a110da7ec3a918b5a3d30cb19eb0e40c9eb Mon Sep 17 00:00:00 2001 From: Skudalen Date: Wed, 7 Jul 2021 10:33:53 +0200 Subject: [PATCH] fix: fix functionality of mfcc table func --- Handle_emg_data.py | 31 ++++++++++++--------- Present_data.py | 20 +++++-------- __pycache__/Handle_emg_data.cpython-38.pyc | Bin 25435 -> 26464 bytes 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Handle_emg_data.py b/Handle_emg_data.py index c8030fb..9dce2cc 100644 --- a/Handle_emg_data.py +++ b/Handle_emg_data.py @@ -574,22 +574,27 @@ class DL_data_handler: self.samples_per_subject[subject_nr+1] = subj_samples - def make_mfcc_table_of_emglist(self, emg_list, df_original): - samplerate = get_samplerate(df_original) - signal = get_xory_from_df('y', emg_list[0]) - mfcc_0 = mfcc_custom(signal, samplerate, MFCC_WINDOWSIZE, MFCC_STEPSIZE, NR_COEFFICIENTS, NR_MEL_BINS) - df = DataFrame(mfcc_0) + def make_mfcc_df_from_session_df(self, session_df): + session_df.rename(columns={0:'timestamp'}, inplace=True) + samplerate = get_samplerate(session_df) + #attach_func = lambda list_1, list_2: list_1.tolist().extend(list_2.tolist()) attach_func = lambda list_1, list_2: list_1.extend(list_2) - - for i in range(15): - signal = get_xory_from_df('y', emg_list[i+1]) - mfcc_i = mfcc_custom(signal, samplerate, MFCC_WINDOWSIZE, MFCC_STEPSIZE, NR_COEFFICIENTS, NR_MEL_BINS) - mfcc_i = DataFrame(mfcc_i) - df.combine(mfcc_i, attach_func) - return df + signal = session_df[1] + mfcc_0 = mfcc_custom(signal, samplerate, MFCC_WINDOWSIZE, MFCC_STEPSIZE, NR_COEFFICIENTS, NR_MEL_BINS) + df = DataFrame(mfcc_0).dropna() + df['combined'] = df.values.tolist() + result_df = df['combined'] + #print(result_df) - pass + for i in range(2, 17): + signal_i = session_df[i] + mfcc_i = mfcc_custom(signal_i, samplerate, MFCC_WINDOWSIZE, MFCC_STEPSIZE, NR_COEFFICIENTS, NR_MEL_BINS) + mfcc_i = DataFrame(mfcc_i).dropna() + mfcc_i['combined'] = mfcc_i.values.tolist() + df = result_df.combine(mfcc_i['combined'], attach_func) + + return result_df def store_mfcc_samples(self): for subject_nr in range(5): diff --git a/Present_data.py b/Present_data.py index e5a633d..2e0d932 100644 --- a/Present_data.py +++ b/Present_data.py @@ -221,19 +221,13 @@ def main(): csv_handler = CSV_handler() csv_handler.load_data('soft') dl_data_handler = DL_data_handler(csv_handler) - dl_data_handler.store_samples(5) - dict = dl_data_handler.samples_per_subject - #print(dict.get(1)[2][0], dict.get(1)[10][1]) - #print(dict.get(1)[15][0], dict.get(1)[10][1]) - #print(dict.get(1)) - ''' - print(len(dict.get(1))) - print(len(dict.get(2))) - print(len(dict.get(3))) - print(len(dict.get(4))) - print(len(dict.get(5))) - ''' - dl_data_handler.save_mfcc() + emg_list = dl_data_handler.get_emg_list(1, 1) + session_df = dl_data_handler.make_subj_sample(emg_list) + print(session_df) + df = dl_data_handler.make_mfcc_df_from_session_df(session_df) + print(df) + print(len(df.iloc[0])) + diff --git a/__pycache__/Handle_emg_data.cpython-38.pyc b/__pycache__/Handle_emg_data.cpython-38.pyc index 466b45f08808c69e042dd3d438e274958c9f3fd2..32f613d046784b706d4da0d1e9a031afc70c750d 100644 GIT binary patch delta 4954 zcmb_gYit}>6`nggJ3IUI`&lR1Bzs!FCHQIOpXwHz3iH$9gIyii+*m0VA-6~PJ7HsDE3`5S+m1xI$d^l0*O+Be zBkNv)8C>pbIXiC^&4LxQN~SmC%QRQV){hj-OO`=%JNa4lQL=+qRI6j>8t05Ec(ENg zu#5jo?Tyz+#rH%y$Xi)n{!0 ze(Xe%TJr;pIV=;Y-3}@CAnZlhhtP{qE5X~*ZgP-+H#z}wG{g?<6GtO6vDw2woCyUS z1q(4+vl{08E`B%GMb50=jQu^?zaK{u$Ibkld&xX$GV2nH)(tr>JAgx}fXcaIK5vd^PQW!<%<%(IrtWTe|Pih$D4nVyoj>1XAw|j_8bCA%8npBiSRtarxA`K z)C=o6Id5cyeFo=_Bh+rWWp}syJ+bBL`@63v&;QTcDR?#y*zAW-r@@7848FU1v;UR< z$6lz~1NL$T(}b=9@Q}j%` zXtDdO6N%e^4|tc6V@|=KU?~Q*v)-?GYUuXN5D>5dgkgk1fW`P3<`k#XcCj?)Wy0(v zPMknEh42D^A03#_S|tx8$jE_p3p=X0EkTucARge3zvG)umiAXY<225tP$<_dl=2oc zJ?lOd*^9W@F8a|=IE%2cuV{%7n1%_AdM@sx$(qXF8tx!z{yy16uJGRuzpy7r5s-jHZqO4D z>sufnw9+<+^(iZq3vvU|8>kG?y^}w4YGGX1vhW(=Fv3^RP2hNSc=;{CQMpFRVum|6 zHEU(PwWCLZ8d=vP^*?xgWIPB*gq=sCNAIWf8#gY(6^23hnN9g~%+n#y-EkVP+z&zG@xwO8bs>|l z%s_Ht2F$TZBv6^iOzbhy0T0TWUM3-oSx?qVWw0r}bL=GPNHKdp2MuFmTn)TBkQU-`n}cnzWM{!`txRCikgQ9fa^!VOIkeq=6Kt1A(zdrhwnAlp}D^P zypuKa?qO&I>lm7vuVtOW6yyRby!Aujs7dC)6dMQNALuVsgoElTWlpJR3Ip?1&q475 zUx`$CWa7dfHar$;H?$2sZhD@XoiTEA#jLNo_H@zA>#C4+kMLqW$}D#-k9mh(#uZvX zWY|D<4mGmt_3sg`^Z;#-z?rz{*b-?b5O(1+pqV5{ifAEts_kZZaTlCevOa8S^! zdwT_JMub6hWJsVL@CwSod2FE@vIT@X4{HuQOh{i1_h(RTv?~deRp99iEp9tH6lC!k zvq&L(_SG*_E%y##y}WqlwTcKXXcufZ0*09&ioXJ_u?%6C;0-bg`w&87JY*#VG?%sN zTf_*c)9vE=jYdsM?cy}{KOtVQtFU@%)jRuRQo*ROsEr0$E6u)$-G2itBtfWu z8b&L=nsZpe^!%t*oGXZWgIz)LM$dxmgOSf+#?%~Spk)|l*APC3@G8P<2%iV=!|se( zviwlNE;0{CU&c|zfz0PCv#tY3=L)4vQ;(Ji`K5iQyP1T z|MmRdgJ@o0PWUYdFDy%I_z6~%F!m1GGdy6=A`7$YeB#2uS+r7cnyPJpkl+x(*ohtGcv`oMe=UP9wc*eCNo zSr9_Pg+VPG>{ho&bM>nv159^8?50QD ztF{N_Mg3`s5^vsN3)N46+R$O4r37jQ0R4D zo;;Sm_mG6Y{0zClBS~Sl%>OufU5LJ@j-s<1T8x=qdaYtr1DiXDY@b31>Kbf)836uo zfUd#b2GAQszAb=v8$lT-PPA_SF9GGRasL=JB*+9Q_^YG{!->o`NNWovh%gMr)7!xN zOACEjsAKv}#>|Bhvx^?X1g=Mexx78a6zr=dxNy@A%EJi$=K`lNYxrS7DguDs6p#fx za}55~0UGkDsR0r6*jIr*h$JGWyoy~BPQ=GZ8oTIWfpH2ux{F;j1#u-oJVIS+?o=Fs ua09Ks;Ly3ebr>_7`y2q;eFBal!5_|UYul?SsfZRy#Zyt4h`)cwBL4;42UVc} delta 4006 zcmb_fTWnlM8Q$5;*|S%#@7LIyOB>dyounyAuuLv(oj5mV8#@j;NqTa!Giz_Md(QSh z$BFGW@J00r^?bL@EI z23{c1erM*Ne`fysKmOgv?6<#Q*|V8UGKBvwo&Uq-pWMHl?F)Yvy8TRk$%yd~k5;u> z+=#Ofjw4mwNZ>bCP1aIIYL%8Y(jt8|b1#c4+WTQejaQp$IU~2q(QGtx-Du$nqm?I( zHl8xtkA`@fXO=@eb1Q6g;4I6VaMpygPMqa<^YT)NH{-O6xA4~GkkKttyzMUI?Yv_- zYV`0<-i6fORcbfyL2BRXte5xUY?EjeEuu}dm!o_W?_Xv{KOf+E+%>=>lcB=qhop6Z z`I%$3CuRg3aiC^-NQmNRcI9REA=A>x0vXv8F*Css=MO^ADPNDAWbN|Tk;-514&;W{^T z5EeH}?sZ)0ko&d1uE+QL@tSo_n7lkFtJ>3SyOf&f99%o1pnK4jg+XU$N_RULgi2XO)cNZ;>)nZHO5e9>&(u zCau#8XH`O|gjBhx(vUI`jd>nFersSA*Q^UL-MK4QMaf%p3^6pw_Nes#P3|n7?aR|C z3@#AUQyVzty<$5H$q$P=nIS(d{^})FjYyVpniI7SGD4Lk(J_^IhIp5Dk&0l`X%|vT z7cL{Ck!ny4UO@`h6qR|dAF}|g1yxFn6xEH2U2$gxhiPQn=#7l)IVljUTDwE?)Vaga z2Mh}GtqX4~DV>z&&(L1dPKC(BW*kjnkX^+u))Si+RA7)Bz#*8TrPU_`#e;#5i;9hf z4C*vXSe#ev8Ja&qF1U_7hgR-f{5e~qz+BWPgA~ZaYcy?27Qrb|5w&MV@~_?uT(BqW8QZEFsbG$gidQI6l?k8aINdYB$jdc z4|9kyS-3p7l!eDDqmej1d3wSu9-bNps$xN-+CG|))qi@Q#W;GpXS@y?zzG=1XrwGD`=?^~Y<+6UFI*jspDU65V z58Il`Z&;Kkt+62rM67;a#}69Rn#UeXF{KFbT^co_KZeuTA>keQ&^mDO zJHa`0lTxn`^Vz)57J{x6rN;Wi9^A6}FbTVuqB1zJ$dWOJb#ByzD7_b zpc;lr@VKnh{;^PT7j6*Glfs{p=QdqHm61Apj%C9-OJeVXDQT9tO|gy^xr-lom&Oqz zTB$lE6`F85plI_ZhURK5h`To`9#*YJQz4t5qk=r|z{2VaqkNYxrcMwFx3RW=X;HW@ zck|~md8B}bfEq~&{Aj+x=(M(s@BwYcUnmrVW%(QamUVC@%Ri#i|n6Xb#whOAd%(^>~4p zq=*J*!8vaXp?*WfNhh{{J%>|2KEHYuEq)