diff --git a/Handle_emg_data.py b/Handle_emg_data.py index 11c9208..8926580 100644 --- a/Handle_emg_data.py +++ b/Handle_emg_data.py @@ -517,9 +517,13 @@ class DL_data_handler: 5: None } - def get_samples_dict(self): - return self.samples_per_subject + def get_reg_samples_dict(self): + return self.reg_samples_per_subject + def get_mfcc_samples_dict(self): + return self.mfcc_samples_per_subject + + def get_emg_list(self, subject_nr, session_nr) -> list: list_of_emgs = [] df, _ = self.csv_handler.get_data(subject_nr, 'left', session_nr, 1) @@ -626,7 +630,7 @@ class DL_data_handler: mfcc_df_i = self.make_mfcc_df_from_session_df(tot_session_df) subj_samples.append(mfcc_df_i) - result_df = pd.concat(subj_samples, axis=1, ignore_index=True) + result_df = pd.concat(subj_samples, axis=0, ignore_index=True) self.mfcc_samples_per_subject[subject_nr+1] = result_df diff --git a/Present_data.py b/Present_data.py index 2e0d932..0deaea6 100644 --- a/Present_data.py +++ b/Present_data.py @@ -221,12 +221,11 @@ def main(): csv_handler = CSV_handler() csv_handler.load_data('soft') dl_data_handler = DL_data_handler(csv_handler) - 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])) + dl_data_handler.store_mfcc_samples() + dict = dl_data_handler.get_mfcc_samples_dict() + subject1_df = dict.get(5) + print(subject1_df) + print(len(subject1_df.loc[1])) diff --git a/__pycache__/Handle_emg_data.cpython-38.pyc b/__pycache__/Handle_emg_data.cpython-38.pyc index 32f613d..e1dc91b 100644 Binary files a/__pycache__/Handle_emg_data.cpython-38.pyc and b/__pycache__/Handle_emg_data.cpython-38.pyc differ