From cfc3262b1c761f6774aaa930935ae898224e6d38 Mon Sep 17 00:00:00 2001 From: lcalmettes <leo.calmettes@etu.ec-lyon.fr> Date: Wed, 2 Apr 2025 10:43:38 +0200 Subject: [PATCH] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20image=5Fprocessing/build=5Fdataset.py=20=09modifi=C3=A9?= =?UTF-8?q?=C2=A0:=20=20=20=20=20=20=20=20=20main.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- image_processing/build_dataset.py | 6 +++--- main.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/image_processing/build_dataset.py b/image_processing/build_dataset.py index d2820b2..0460fd4 100644 --- a/image_processing/build_dataset.py +++ b/image_processing/build_dataset.py @@ -145,7 +145,7 @@ def create_antibio_dataset(path='../data/label_raw/230804_strain_peptides_antibi l = split_before_number(s) species = l[0] nb = l[1] - return '{}-{}-{}{}.mzML'.format(species,nb,analyse,suffix) + return f'{species}-{nb}-{analyse}{suffix}.mzML' df['path_ana'] = df['sample_name'].map(lambda x: create_fname(x,analyse='ANA')) df['path_aer'] = df['sample_name'].map(lambda x: create_fname(x, analyse='AER')) @@ -172,8 +172,8 @@ def create_dataset(): name = label[label['path_aer'] == path.split("/")[-1]]['sample_name'].values[0] analyse = 'AER' if species is not None: #save image in species specific dir - directory_path_png = '../data/processed_data/png_image/{}'.format(species) - directory_path_npy = '../data/processed_data/npy_image/{}'.format(species) + directory_path_png = f'../data/processed_data/png_image/{species}' + directory_path_npy = f'../data/processed_data/npy_image/{species}' if not os.path.isdir(directory_path_png): os.makedirs(directory_path_png) if not os.path.isdir(directory_path_npy): diff --git a/main.py b/main.py index 91a64ce..d9d63da 100644 --- a/main.py +++ b/main.py @@ -11,6 +11,7 @@ from sklearn.metrics import confusion_matrix import seaborn as sn import pandas as pd +#test modif git def train(model, data_train, optimizer, loss_function, epoch): -- GitLab