diff --git a/image_ref/config.py b/image_ref/config.py index eae59848a669a55b6635d10c58df5a9a921cc1b5..bbb1353005340adf9f20c153e74eaa2b955a4d0b 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 3472d627e5a61a4c7d5f2a7f0768486c80081375..e4014100ec99d2a808c98bee4b03f02e67155cf4 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 303f3139613f93fdd03c7830e62ea73023188e15..f861358260c5b049ca2b94d25dd520bd50987a4f 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)