From 80e17afa0f6a79ea86d814a1c213cd1327d46e95 Mon Sep 17 00:00:00 2001
From: Schneider Leo <leo.schneider@etu.ec-lyon.fr>
Date: Fri, 4 Apr 2025 15:56:05 +0200
Subject: [PATCH] fix : no noise threshold on ref image
---
image_ref/config.py | 4 ++--
image_ref/dataset_ref.py | 2 --
image_ref/grad_cam.py | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/image_ref/config.py b/image_ref/config.py
index eae59848..bbb13530 100644
--- a/image_ref/config.py
+++ b/image_ref/config.py
@@ -4,13 +4,13 @@ import argparse
def load_args_contrastive():
parser = argparse.ArgumentParser()
- parser.add_argument('--epoches', type=int, default=0)
+ parser.add_argument('--epoches', type=int, default=100)
parser.add_argument('--save_inter', type=int, default=50)
parser.add_argument('--eval_inter', type=int, default=1)
parser.add_argument('--noise_threshold', type=int, default=500)
parser.add_argument('--lr', type=float, default=0.001)
parser.add_argument('--batch_size', type=int, default=64)
- parser.add_argument('--positive_prop', type=int, default=None)
+ parser.add_argument('--positive_prop', type=int, default=30)
parser.add_argument('--model', type=str, default='ResNet18')
parser.add_argument('--dataset_train_dir', type=str, default='data/processed_data/npy_image/data_training_contrastive')
parser.add_argument('--dataset_val_dir', type=str, default='data/processed_data/npy_image/data_test_contrastive')
diff --git a/image_ref/dataset_ref.py b/image_ref/dataset_ref.py
index 3472d627..e4014100 100644
--- a/image_ref/dataset_ref.py
+++ b/image_ref/dataset_ref.py
@@ -170,8 +170,6 @@ def load_data_duo(base_dir_train, base_dir_test, batch_size, shuffle=True, noise
ref_transform = transforms.Compose(
[transforms.Resize((224, 224)),
- Threshold_noise(noise_threshold),
- Log_normalisation(),
transforms.Normalize(0.5, 0.5)])
print('Default val transform')
diff --git a/image_ref/grad_cam.py b/image_ref/grad_cam.py
index 303f3139..f8613582 100644
--- a/image_ref/grad_cam.py
+++ b/image_ref/grad_cam.py
@@ -25,9 +25,9 @@ def compute_class_activation_map():
path_aer ='../data/processed_data/npy_image/data_test_contrastive/Citrobacter freundii/CITFRE17_AER.npy'
path_ana ='../data/processed_data/npy_image/data_test_contrastive/Citrobacter freundii/CITFRE17_ANA.npy'
- # path_ref ='../image_ref/img_ref/Citrobacter freundii.npy' #positive
+ path_ref ='../image_ref/img_ref/Citrobacter freundii.npy' #positive
# path_ref = '../image_ref/img_ref/Enterobacter hormaechei.npy' #negative
- path_ref = '../image_ref/img_ref/Proteus mirabilis.npy' # negative
+ # path_ref = '../image_ref/img_ref/Proteus mirabilis.npy' # negative
tensor_aer = npy_loader(path_aer)
tensor_ana = npy_loader(path_ana)
tensor_ref = npy_loader(path_ref)
@@ -36,7 +36,7 @@ def compute_class_activation_map():
tensor_aer = transform(tensor_aer)
tensor_ana = transform(tensor_ana)
- tensor_ref = transform(tensor_ref)
+ tensor_ref = ref_transform(tensor_ref)
tensor_aer = torch.unsqueeze(tensor_aer, dim=0)
tensor_ana = torch.unsqueeze(tensor_ana, dim=0)
--
GitLab