Helpers (#4)

Update helper methods

Author: vfdev-5

image_dataset_viz/__init__.py

@@ -1,5 +1,5 @@
 
-__version__ = '0.2.1'
+__version__ = '0.2.1.1'
 
 import numpy as np
 
@@ -10,13 +10,13 @@ def bbox_to_points(bbox_xyxy):
     """Helper method to convert bounding box as list/tuple of [x1, y1, x2, y2] into points `ndarray` of shape (N, 2)
 
     Args:
-        bbox_xyxy (list or tuple): bounding box as list/tuple of [x1, y1, x2, y2]
+        bbox_xyxy (list or tuple or ndarray): bounding box as list/tuple of [x1, y1, x2, y2]
 
     Returns:
         ndarray of points
 
     """
-    assert isinstance(bbox_xyxy, (list, tuple)) and len(bbox_xyxy) == 4, \
+    assert isinstance(bbox_xyxy, (list, tuple, np.ndarray)) and len(bbox_xyxy) == 4, \
         "Argument bbox_xyxy should be a list/tuple of [x1, y1, x2, y2]"
 
     return np.array([
@@ -37,7 +37,7 @@ def xywh_to_xyxy(xywh):
         list [x1, y1, x2, y2]
 
     """
-    assert isinstance(xywh, (list, tuple)) and len(xywh) == 4, \
+    assert isinstance(xywh, (list, tuple, np.ndarray)) and len(xywh) == 4, \
         "Argument xywh should be a list/tuple of [x1, y1, width, height]"
     x1, y1 = xywh[0], xywh[1]
     x2 = x1 + max(0, xywh[2] - 1)
@@ -55,7 +55,7 @@ def xyxy_to_xywh(xyxy):
         list [x1, y1, width, height]
 
     """
-    assert isinstance(xyxy, (list, tuple)) and len(xyxy) == 4, \
+    assert isinstance(xyxy, (list, tuple, np.ndarray)) and len(xyxy) == 4, \
         "Argument xyxy should be a list/tuple of [x1, y1, x2, y2]"
     x1, y1 = xyxy[0], xyxy[1]
     w = xyxy[2] - x1 + 1

tests/test_image_dataset_viz.py

@@ -7,32 +7,45 @@
 
 class TestHelperMethods(TestCase):
 
-    def test_bbox_to_points(self):
+    def _test_func(self, input_, true_output, func):
+
+        output = func(list(input_))
+        self.assertTrue(np.equal(true_output, output).all())
+
+        output = func(tuple(input_))
+        self.assertTrue(np.equal(true_output, output).all())
+
+        output = func(np.array(input_))
+        self.assertTrue(np.equal(true_output, output).all())
+
+        with self.assertRaises(AssertionError):
+            func("1234")
+
+        with self.assertRaises(AssertionError):
+            func([1, 2])
 
+        with self.assertRaises(AssertionError):
+            func([1, 2, 3, 4, 5])
+
+    def test_bbox_to_points(self):
         bbox = (10, 12, 34, 45)
         true_points = np.array([
             [10, 12],
             [34, 12],
             [34, 45],
             [10, 45]
         ])
-        points = bbox_to_points(bbox)
-
-        self.assertTrue((true_points == points).all())
+        self._test_func(bbox, true_points, bbox_to_points)
 
     def test_xywh_to_xyxy(self):
-
         xywh = (10, 12, 34, 45)
         true_xyxy = [10, 12, 43, 56]
-        xyxy = xywh_to_xyxy(xywh)
-        self.assertEqual(true_xyxy, xyxy)
+        self._test_func(xywh, true_xyxy, xywh_to_xyxy)
 
     def test_xyxy_to_xywh(self):
-
         xyxy = [10, 12, 43, 56]
         true_xywh = [10, 12, 34, 45]
-        xywh = xyxy_to_xywh(xyxy)
-        self.assertEqual(true_xywh, xywh)
+        self._test_func(xyxy, true_xywh, xyxy_to_xywh)
 
 
 if __name__ == "__main__":