diff --git a/data_viz.py b/data_viz.py index 8b71678f6c4db51efcc7ce8cfff93820dc79e32a..9a609cc9b838e896c09ef4e47aa15c6d4dd69720 100644 --- a/data_viz.py +++ b/data_viz.py @@ -253,19 +253,19 @@ def add_length(dataframe): dataframe['length']=dataframe['seq'].map(fonc) -# df = pd.read_csv('output/output_common_data_ISA.csv') -# add_length(df) -# df['abs_error'] = np.abs(df['rt pred']-df['true rt']) -# histo_abs_error(df, display=False, save=True, path='fig/custom model res/histo_ISA_ISA.png') -# scatter_rt(df, display=False, save=True, path='fig/custom model res/RT_pred_ISA_ISA.png', color=True) -# histo_length_by_error(df, bins=10, display=False, save=True, path='fig/custom model res/histo_length_ISA_ISA.png') -# -# df = pd.read_csv('output/out_prosit_common.csv') -# add_length(df) -# df['abs_error'] = np.abs(df['rt pred']-df['true rt']) -# histo_abs_error(df, display=False, save=True, path='fig/custom model res/histo_prosit_prosit.png') -# scatter_rt(df, display=False, save=True, path='fig/custom model res/RT_pred_prosit_prosit.png', color=True) -# histo_length_by_error(df, bins=10, display=False, save=True, path='fig/custom model res/histo_length_prosit_prosit.png') +df = pd.read_csv('output/out_common_ISA_ISA_eval.csv') +add_length(df) +df['abs_error'] = np.abs(df['rt pred']-df['true rt']) +histo_abs_error(df, display=False, save=True, path='fig/custom model res/histo_ISA_ISA_eval.png') +scatter_rt(df, display=False, save=True, path='fig/custom model res/RT_pred_ISA_ISA_eval.png', color=True) +histo_length_by_error(df, bins=10, display=False, save=True, path='fig/custom model res/histo_length_ISA_ISA_eval.png') + +df = pd.read_csv('output/out_common_prosit_prosit_eval.csv') +add_length(df) +df['abs_error'] = np.abs(df['rt pred']-df['true rt']) +histo_abs_error(df, display=False, save=True, path='fig/custom model res/histo_prosit_prosit_eval.png') +scatter_rt(df, display=False, save=True, path='fig/custom model res/RT_pred_prosit_prosit_eval.png', color=True) +histo_length_by_error(df, bins=10, display=False, save=True, path='fig/custom model res/histo_length_prosit_prosit_eval.png') df = pd.read_csv('output/out_common_transfereval.csv') add_length(df) diff --git a/database/data_DIA_ISA_55_test.pkl b/database/data_DIA_ISA_55_test.pkl index acd3f16f3327a11b7add15c1c0a5521e28a44c46..752b770da36cfc1adabd939995e9be05d5f02c86 100644 Binary files a/database/data_DIA_ISA_55_test.pkl and b/database/data_DIA_ISA_55_test.pkl differ diff --git a/database/data_DIA_ISA_55_train.pkl b/database/data_DIA_ISA_55_train.pkl index bcdd924040a7188f2cb1a2ca2a0ec99ee2cda6c1..2e190b4b6bb9f2577b66f36ab0e7c9efa44366e9 100644 Binary files a/database/data_DIA_ISA_55_train.pkl and b/database/data_DIA_ISA_55_train.pkl differ diff --git a/main_custom.py b/main_custom.py index 716029cfb65371b25803784cd9655a0fa40f3f35..e54c69efd5349982013a2e757f48dd27348e8a4a 100644 --- a/main_custom.py +++ b/main_custom.py @@ -272,7 +272,9 @@ def get_n_params(model): pp += nn return pp -def save_pred(model, data_val, forward, output_path): +def save_pred(model, data_val, forward, output_path, file = False): + if file : + data_val.data.set_file_mode(True) data_frame = pd.DataFrame() model.eval() for param in model.parameters(): @@ -331,7 +333,7 @@ def save_pred(model, data_val, forward, output_path): data_frame['pred int'] = pred_int data_frame['true int'] = true_int data_frame['charge'] = charges - + data_val.data.set_file_mode(False) data_frame.to_csv(output_path)