type: fix

description:
  - removed python-interface module because it is not working anymore in python3.7+
  - moved the cars_dataset to another repository
  - added a setup.py that produces an installable wheel for pip

AnnotationProcessing.py → impy/AnnotationProcessing.py

@@ -1,7 +1,7 @@
 """
 Author: Rodrigo Loza
 Email: [email protected]
-Description: A class that performs processing operations with image annotations.
+Description: A class that performs processing operations for image annotations.
 """
 # General purpose
 import os 

AnnotationProcessing_test.py → impy/AnnotationProcessing_test.py

@@ -55,9 +55,3 @@ def test_nms(self):
 
 if __name__ == "__main__":
 	unittest.main()
-
-# from impy.ImageLocalizationDataset import *
-# imda = ImageLocalizationDataset(imagesDirectory = os.path.join(os.getcwd(), "images"),
-#                                   annotationsDirectory = os.path.join(os.getcwd(), "annotations"),
-#                                   databaseName = "SPID")
-# imda.computeBoundingBoxStats()

ApplyAugmentation.py → impy/ApplyAugmentation.py

@@ -5,21 +5,9 @@
 """
 
 import numpy as np
-
-try:
-	from .BoundingBoxAugmenters import *
-except:
-	from BoundingBoxAugmenters import *
-
-try:
-	from .ColorAugmenters import *
-except:
-	from ColorAugmenters import * 
-
-try:
-	from .GeometricAugmenters import *
-except:
-	from GeometricAugmenters import *
+from BoundingBoxAugmenters import *
+from ColorAugmenters import *
+from GeometricAugmenters import *
 
 bndboxAugmenter = BoundingBoxAugmenters()
 colorAugmenter = ColorAugmenters()

AugmentationConfigurationFile.py → impy/AugmentationConfigurationFile.py

@@ -7,7 +7,7 @@
 import os
 import json
 import numpy as np
-from interface import implements
+# from interface import implements
 
 class AugmentationConfigurationFile(object):
 	def __init__(self, file = None):

BoundingBoxAugmenters.py → impy/BoundingBoxAugmenters.py

@@ -35,33 +35,20 @@
 		Sets pixels to zero with probability P.
 """
 # Libraries
-from interface import implements
+# from interface import implements
 import math
 import random
 import cv2
 import numpy as np
 # Other libraries
-try:
-	from .ImagePreprocess import *
-except:
-	from ImagePreprocess import *
+from ImagePreprocess import *
 # Interface
-try:
-	from .BoundingBoxAugmentersMethods import *
-except:
-	from BoundingBoxAugmentersMethods import *
+from BoundingBoxAugmentersMethods import *
+from GeometricAugmenters import *
+from AssertDataTypes import *
 
-try:
-	from .GeometricAugmenters import *
-except:
-	from GeometricAugmenters import *
-
-try:
-	from .AssertDataTypes import *
-except:
-	from AssertDataTypes import *
-
-class BoundingBoxAugmenters(implements(BoundingBoxAugmentersMethods)):
+# class BoundingBoxAugmenters(implements(BoundingBoxAugmentersMethods)):
+class BoundingBoxAugmenters(object):
 	"""
 	BoundingBoxAugmenters class. This class implements a set of data augmentation
 	tools for bouding boxes.

BoundingBoxAugmentersMethods.py → impy/BoundingBoxAugmentersMethods.py

@@ -6,9 +6,10 @@
 labels.
 """
 # Libraries
-from interface import Interface
+# from interface import Interface
 
-class BoundingBoxAugmentersMethods(Interface):
+# class BoundingBoxAugmentersMethods(Interface):
+class BoundingBoxAugmentersMethods(object):
 
 	def scale(self, frame = None, boundingBoxes = None, size = None, zoom = None, interpolationMethod = None):
 		"""

BoundingBoxAugmenters_test.py → impy/BoundingBoxAugmenters_test.py

@@ -10,14 +10,14 @@
 import numpy as np
 import cv2
 from BoundingBoxAugmenters import *
-from ImageAnnotation import * 
+from ImageAnnotation import *
 from VectorOperations import *
 
 class BoundingBoxAugmenters_test(unittest.TestCase):
 
 	def setUp(self):
-		img_path = os.path.join(os.getcwd(), "tests/cars_dataset/images/cars0.png")
-		annotation_path = os.path.join(os.getcwd(), "tests/cars_dataset/annotations/xmls/cars0.xml")
+		img_path = os.path.join(os.getcwd(), "../../cars_dataset/images/cars0.png")
+		annotation_path = os.path.join(os.getcwd(), "../../cars_dataset/annotations/xmls/cars0.xml")
 		assert os.path.isfile(img_path)
 		assert os.path.isfile(annotation_path)
 		# Image.
@@ -30,7 +30,7 @@ def setUp(self):
 		self.augmenter = BoundingBoxAugmenters()
 		# Testing options.
 		self.visualize = True
-		self.waitTime = 1000
+		self.waitTime = 100
 		self.windowSize = (800, 800)
 
 	def tearDown(self):

ColorAugmenters.py → impy/ColorAugmenters.py

@@ -36,28 +36,18 @@
 		of color's space PCA.
 """
 # Libraries
-from interface import implements
+# from interface import implements
 import math
 import random
 import cv2
 import numpy as np
 
-try:
-	from .ColorAugmentersMethods import *
-except:
-	from ColorAugmentersMethods import *
+from ColorAugmentersMethods import *
+from VectorOperations import *
+from AssertDataTypes import *
 
-try:
-	from .VectorOperations import *
-except:
-	from VectorOperations import *
-
-try:
-	from .AssertDataTypes import *
-except:
-	from AssertDataTypes import *
-
-class ColorAugmenters(implements(ColorAugmentersMethods)):
+# class ColorAugmenters(implements(ColorAugmentersMethods)):
+class ColorAugmenters(object):
 	"""
 	ImageAugmenters class. This class implements a set of data augmentation
 	tools for bouding boxes.

ColorAugmentersMethods.py → impy/ColorAugmentersMethods.py

@@ -4,9 +4,10 @@
 Author: Rodrigo Loza
 Description: Common data augmentation methods for images.
 """
-from interface import Interface
+# from interface import Interface
 
-class ColorAugmentersMethods(Interface):
+# class ColorAugmentersMethods(Interface):
+class ColorAugmentersMethods(object):
 
 	def invertColor(self, frame = None, CSpace = None):
 		"""

ColorAugmenters_test.py → impy/ColorAugmenters_test.py

@@ -14,15 +14,15 @@
 class ColorAugmenters_test(unittest.TestCase):
 
 	def setUp(self):
-		img_path = os.path.join(os.getcwd(), "tests/cars_dataset/images/cars0.png")
+		img_path = os.path.join(os.getcwd(), "../../cars_dataset/images/cars0.png")
 		assert os.path.isfile(img_path)
 		# Image
 		self.frame = cv2.imread(img_path)
 		# Augmenters
 		self.augmenter = ColorAugmenters()
 		# Testing options
 		self.visualize = True
-		self.waitTime = 500
+		self.waitTime = 50
 		self.windowSize = (800, 800)
 
 	def tearDown(self):

GeometricAugmenters.py → impy/GeometricAugmenters.py

@@ -30,28 +30,18 @@
 		Randomly rotates the bounding boxes.
 """
 # Libraries
-from interface import implements
+# from interface import implements
 import math
 import random
 import cv2
 import numpy as np
 
-try:
-	from .GeometricAugmentersMethods import *
-except:
-	from GeometricAugmentersMethods import *
+from GeometricAugmentersMethods import *
+from VectorOperations import *
+from AssertDataTypes import *
 
-try:
-	from .VectorOperations import *
-except:
-	from VectorOperations import *
-
-try:
-	from .AssertDataTypes import *
-except:
-	from AssertDataTypes import *
-
-class GeometricAugmenters(implements(GeometricAugmentersMethods)):
+# class GeometricAugmenters(implements(GeometricAugmentersMethods)):
+class GeometricAugmenters(object):
 	"""
 	GeometricAugmenters class. This class implements a set of data augmentation
 	tools for bouding boxes.

GeometricAugmentersMethods.py → impy/GeometricAugmentersMethods.py

@@ -4,9 +4,10 @@
 Author: Rodrigo Loza
 Description: Common data augmentation methods for images.
 """
-from interface import Interface
+# from interface import Interface
 
-class GeometricAugmentersMethods(Interface):
+# class GeometricAugmentersMethods(Interface):
+class GeometricAugmentersMethods(object):
 
 	def scale(self, frame = None, size = None, interpolationMethod = None):
 		"""

GeometricAugmenters_test.py → impy/GeometricAugmenters_test.py

@@ -14,15 +14,15 @@
 class GeometricAugmenters_test(unittest.TestCase):
 
 	def setUp(self):
-		img_path = os.path.join(os.getcwd(), "tests/cars_dataset/images/cars0.png")
+		img_path = os.path.join(os.getcwd(), "../../cars_dataset/images/cars0.png")
 		assert os.path.isfile(img_path)
 		# Image.
 		self.frame = cv2.imread(img_path)
 		# Augmenters.
 		self.augmenter = GeometricAugmenters()
 		# Testing options.
 		self.visualize = True
-		self.waitTime = 2000
+		self.waitTime = 50
 		self.windowSize = (800, 800)
 
 	def tearDown(self):

ImageDataset.py → impy/ImageDataset.py

@@ -11,20 +11,9 @@
 from interface import implements
 from tqdm import tqdm
 
-try:
-	from .AugmentationConfigurationFile import *
-except:
-	from AugmentationConfigurationFile import *
-
-try:
-	from .ApplyAugmentation import applyGeometricAugmentation, applyColorAugmentation
-except:
-	from ApplyAugmentation import applyGeometricAugmentation, applyColorAugmentation
-
-try:
-	from .Util import *
-except:
-	from Util import *
+from AugmentationConfigurationFile import *
+from ApplyAugmentation import applyGeometricAugmentation, applyColorAugmentation
+from Util import *
 
 class ImageDataset(object):
 	def __init__(self, imagesDirectory = None, dbName = None):

ImageDataset_test.py → impy/ImageDataset_test.py

@@ -7,20 +7,20 @@
 
 class ImageDataset_test(unittest.TestCase):
 	def setUp(self):
-		self.imgs = os.path.join(os.getcwd(), "tests", "cars_dataset", "images")
+		self.imgs = os.path.join(os.getcwd(), "../", "../", "cars_dataset", "images")
 		self.imda = ImageDataset(imagesDirectory = self.imgs, \
 														dbName = "UnitTest")
 
 	def tearDown(self):
 		pass
 
 	def test_apply_data_augmentation(self):
-		os.system("rm {}/*".format(os.path.join(os.getcwd(), "tests", "cars_dataset", "images_single")))
-		conf_file = os.path.join(os.getcwd(), "confs_examples", \
+		os.system("rm {}/*".format(os.path.join(os.getcwd(), "../", "../", "cars_dataset", "images_single")))
+		conf_file = os.path.join(os.getcwd(), "../", "confs_examples", \
 								"aug_multiple_geometric_color_sequential.json")
 		self.imda.applyDataAugmentation(configurationFile = conf_file, \
 																outputImageDirectory = os.path.join(os.getcwd(), \
-														"tests", "cars_dataset", "images_single"))
+														"../", "../", "cars_dataset", "images_single"))
 
 if __name__ == "__main__":
 	unittest.main()

ImagePreprocess.py → impy/ImagePreprocess.py

@@ -3,13 +3,6 @@
 class: ImagePreprocess
 Author: Rodrigo Loza
 Description: Common pre-processing operations for images.
-Log:
-	August, 2017 -> Created class and added most relevant functions.
-	September, 2017 -> Created more features for the DivideIntoPatches method.
-	November, 2017 -> Refactored all the code to Google style and a more OOP paradigm approach.
-	December, 2017 -> Tested refactor to avoid breaking external code.
-	March, 2018 -> Refactored methods.
-	April, 2018 -> AdjustImage method added to class.
 """
 # Utils
 import numpy as np