From 7c6650338203be0b7b08bb28ffd6376cd2da7d89 Mon Sep 17 00:00:00 2001 From: iperov Date: Sat, 16 Mar 2019 09:20:55 +0400 Subject: [PATCH] sorter: fix final sort --- mainscripts/Sorter.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/mainscripts/Sorter.py b/mainscripts/Sorter.py index 8d4d034..262cccf 100644 --- a/mainscripts/Sorter.py +++ b/mainscripts/Sorter.py @@ -632,21 +632,10 @@ def sort_final(input_path, include_by_blur=True): lack = imgs_per_grad - img_list_len total_lack += max(lack, 0) - imgs_per_grad += total_lack // grads - sharpned_imgs_per_grad = imgs_per_grad*10 - - for g in io.progress_bar_generator ( range (grads), "Normalizing"): - img_list = yaws_sample_list[g] - if img_list is None: - continue - - if len(img_list) > imgs_per_grad*2: - trash_img_list += img_list[len(img_list) // 2:] - img_list = img_list[0: len(img_list) // 2] - - yaws_sample_list[g] = img_list + imgs_per_grad += total_lack // grads if include_by_blur: + sharpned_imgs_per_grad = imgs_per_grad*10 for g in io.progress_bar_generator ( range (grads), "Sort by blur"): img_list = yaws_sample_list[g] if img_list is None: @@ -659,7 +648,7 @@ def sort_final(input_path, include_by_blur=True): img_list = img_list[0:sharpned_imgs_per_grad] yaws_sample_list[g] = img_list - + for g in io.progress_bar_generator ( range (grads), "Sort by hist"): img_list = yaws_sample_list[g] if img_list is None: