From e9dc28dc2ac6ab5e1b8845fc1cb2cc4293d23a01 Mon Sep 17 00:00:00 2001 From: Benjamin Loison Date: Sat, 27 Apr 2024 16:06:47 +0200 Subject: [PATCH] Simplify and clean `split_and_compare_prnus_of_subgroups.py` --- .../raise/split_and_compare_prnus_of_subgroups.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/datasets/raise/split_and_compare_prnus_of_subgroups.py b/datasets/raise/split_and_compare_prnus_of_subgroups.py index aa785c3..d3e77c4 100644 --- a/datasets/raise/split_and_compare_prnus_of_subgroups.py +++ b/datasets/raise/split_and_compare_prnus_of_subgroups.py @@ -5,6 +5,7 @@ from tqdm import tqdm from utils import denoise from skimage import img_as_float import sys +import os sys.path.insert(0, '../../algorithms/distance/') @@ -12,19 +13,18 @@ from rms_diff import rmsDiffNumpy NUMBER_OF_SUBGROUPS = 1 DENOISER = 'wavelet' - IMAGES_FOLDER = 'flat-field/TIF' + imagesFileNames = os.listdir(IMAGES_FOLDER) numberOfImagesPerSubgroup = len(imagesFileNames) // NUMBER_OF_SUBGROUPS - -# 1 numberOfImagesThresholds = range(numberOfImagesPerSubgroup, numberOfImagesPerSubgroup + 1) # Assume random image order to not introduce a bias. subgroupsPrnuEstimatesNpArray = [] -for subgroupIndex in range(NUMBER_OF_SUBGROUPS): +for subgroupIndex in tqdm(range(NUMBER_OF_SUBGROUPS), 'Subgroup'): imagesPrnuEstimateNpArray = [] - for imageFileName in tqdm(imagesFileNames[numberOfImagesPerSubgroup * subgroupIndex : numberOfImagesPerSubgroup * (subgroupIndex + 1)]): + subgroupImagesFileNames = imagesFileNames[numberOfImagesPerSubgroup * subgroupIndex : numberOfImagesPerSubgroup * (subgroupIndex + 1)] + for imageFileName in tqdm(subgroupImagesFileNames, f'Image of subgroup {subgroupIndex}'): imagePath = f'{IMAGES_FOLDER}/{imageFileName}' imagePil = Image.open(imagePath) imageNpArray = img_as_float(np.array(imagePil)) @@ -39,7 +39,7 @@ for subgroupIndex in range(NUMBER_OF_SUBGROUPS): subgroupsPrnuEstimatesNpArray += [subgroupPrnuEstimateNpArray] rmss = [] -for numberOfImagesIndex, numberOfImages in enumerate(numberOfImagesThresholds): +for numberOfImagesIndex in range(len(numberOfImagesThresholds)): rms = rmsDiffNumpy(subgroupsPrnuEstimatesNpArray[0][numberOfImagesIndex], subgroupsPrnuEstimatesNpArray[1][numberOfImagesIndex]) rmss += [rms]