From c54c266e62e3f7fd2598180bc1cb66c82dce30ca Mon Sep 17 00:00:00 2001 From: Ian Maloney Date: Fri, 6 Dec 2019 15:41:23 -0500 Subject: [PATCH 1/4] poop --- preprocess.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/preprocess.py b/preprocess.py index c03fb6ad..0e701f55 100644 --- a/preprocess.py +++ b/preprocess.py @@ -46,9 +46,26 @@ def walk_data2(): def walk_data(): """ walk through data set directory - :return: None, you should save all images to one directory + :return: list of absolute paths to images """ - pass + imgs = list() + q = Queue() + initial_itms = os.listdir("./data/") + for itm in initial_itms: + q.put(os.path.abspath(itm)) + while !q.empty(): + itm = q.get() + # checking if item is a file anf ends in jpeg/ jpg + if os.path.isfile(itm) and itm.lower().endswith((".jpg", ".jpeg")): + imgs.append(itm) + # checking if item is a directory + if os.path.isdir(itm): + itms = os.listdir(itm) + # adding all the items in the directory to the queue + for path in itms: + # putting absolute value in queue + q.put(os.path.abspath(path)) + return imgs def convert_to_LAB(): """ From 992fff1c1efb218c532d1f29c3f26655c01b2f27 Mon Sep 17 00:00:00 2001 From: Ian Maloney Date: Fri, 6 Dec 2019 15:41:23 -0500 Subject: [PATCH 2/4] poop --- preprocess.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/preprocess.py b/preprocess.py index da950977..08b044e0 100644 --- a/preprocess.py +++ b/preprocess.py @@ -46,9 +46,26 @@ def walk_data2(): def walk_data(): """ walk through data set directory - :return: None, you should save all images to one directory + :return: list of absolute paths to images """ - pass + imgs = list() + q = Queue() + initial_itms = os.listdir("./data/") + for itm in initial_itms: + q.put(os.path.abspath(itm)) + while !q.empty(): + itm = q.get() + # checking if item is a file anf ends in jpeg/ jpg + if os.path.isfile(itm) and itm.lower().endswith((".jpg", ".jpeg")): + imgs.append(itm) + # checking if item is a directory + if os.path.isdir(itm): + itms = os.listdir(itm) + # adding all the items in the directory to the queue + for path in itms: + # putting absolute value in queue + q.put(os.path.abspath(path)) + return imgs def convert_to_LAB(): """ From a6a735c9ba8175f76c58faebb303410bfea4d499 Mon Sep 17 00:00:00 2001 From: Ian Maloney Date: Fri, 6 Dec 2019 15:49:58 -0500 Subject: [PATCH 3/4] fixed exclamation --- preprocess.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/preprocess.py b/preprocess.py index 08b044e0..98015ada 100644 --- a/preprocess.py +++ b/preprocess.py @@ -53,7 +53,7 @@ def walk_data(): initial_itms = os.listdir("./data/") for itm in initial_itms: q.put(os.path.abspath(itm)) - while !q.empty(): + while not q.empty(): itm = q.get() # checking if item is a file anf ends in jpeg/ jpg if os.path.isfile(itm) and itm.lower().endswith((".jpg", ".jpeg")): @@ -83,4 +83,6 @@ def convert_to_LAB(): lab = np.asarray(lab) return lab -print(convert_to_LAB().shape) +# print(convert_to_LAB().shape) + +print(walk_data()) \ No newline at end of file From c3fde77101ce48044f5b98fdbd5572b5453ded27 Mon Sep 17 00:00:00 2001 From: Ian Maloney Date: Fri, 6 Dec 2019 16:06:44 -0500 Subject: [PATCH 4/4] small changes --- preprocess.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/preprocess.py b/preprocess.py index 98015ada..e81d2e70 100644 --- a/preprocess.py +++ b/preprocess.py @@ -1,8 +1,10 @@ import numpy as np import tensorflow as tf from os import walk +import os from os.path import join from shutil import copyfile +from queue import Queue import cv2 from PIL import Image # Python Image Library - Image Processing @@ -50,13 +52,16 @@ def walk_data(): """ imgs = list() q = Queue() - initial_itms = os.listdir("./data/") + initial_itms = os.listdir("./data/SUN2012/Images/") + print(initial_itms) for itm in initial_itms: q.put(os.path.abspath(itm)) + print(q.qsize()) while not q.empty(): itm = q.get() # checking if item is a file anf ends in jpeg/ jpg - if os.path.isfile(itm) and itm.lower().endswith((".jpg", ".jpeg")): + if os.path.isfile(itm) and itm[len(itm)- 5:] == '.jpg': + print("added to queue") imgs.append(itm) # checking if item is a directory if os.path.isdir(itm):