Add more tests for utils

vanvalenlab · Jun 15, 2022 · eab280f · eab280f
1 parent 3852606
commit eab280f
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 7 deletions.
diff --git a/deepcell_spots/utils.py b/deepcell_spots/utils.py
@@ -141,8 +141,8 @@ def generate_transformation_matrix(transform_parameters, image_shape, img_row_ax
                 - `'zy'`: Float. Zoom in the y direction.
                 - `'flip_horizontal'`: Boolean. Horizontal flip. - NOT USED HERE
                 - `'flip_vertical'`: Boolean. Vertical flip. - NOT USED HERE
-                - `'channel_shift_intensity'`: Float. Channel shift intensity.
-                - `'brightness'`: Float. Brightness shift intensity.
+                - `'channel_shift_intensity'`: Float. Channel shift intensity. - NOT USED HERE
+                - `'brightness'`: Float. Brightness shift intensity. - NOT USED HERE
 
     Returns:
         (array, array): final_affine_matrix (2*2 matrix ,denote below: T),

diff --git a/deepcell_spots/utils_test.py b/deepcell_spots/utils_test.py
@@ -24,12 +24,14 @@
 # limitations under the License.
 # ==============================================================================
 
-"""Functions for utils"""
+"""Tests for utils"""
 
 import numpy as np
 from tensorflow.python.platform import test
 
-from deepcell_spots.utils import subpixel_distance_transform
+from deepcell_spots.utils import (affine_transform_points,
+                                  generate_transformation_matrix,
+                                  subpixel_distance_transform)
 
 
 class TestUtils(test.TestCase):
@@ -54,10 +56,58 @@ def test_subpixel_distance_transform(self):
         self.assertEqual(np.shape(delta_x), image_shape)
         self.assertEqual(np.shape(nearest_point), image_shape)
 
-        # are more tests needed?
+    def test_generate_transformation_matrix(self):
+        transform_parameters = {
+            'theta': 0,
+            'tx': 0,
+            'ty': 0,
+            'shear': 0,
+            'zx': 1,
+            'zy': 1
+        }
 
-    # def test_generate_transformation_matrix(self):
-    #     # not sure what to test beside the shape
+        image_shape = (10, 10)
+        img_row_axis = 0
+        img_col_axis = 1
+
+        final_affine_matrix, final_offset = generate_transformation_matrix(
+            transform_parameters,
+            image_shape,
+            img_row_axis,
+            img_col_axis
+        )
+
+        # null transformation matrix
+        transform_matrix = np.array([[1, 0, 0],
+                                     [0, 1, 0],
+                                     [0, 0, 1]])
+
+        self.assertEqual(np.shape(final_affine_matrix), (2, 2))
+        self.assertEqual(len(final_offset), 2)
+        self.assertAllEqual(final_affine_matrix, transform_matrix[:2, :2])
+        self.assertAllEqual(final_offset, transform_matrix[:2, 2])
+
+    def test_affine_transform_points(self):
+        num_points = 10
+        points = np.random.randint(low=0, high=10, size=(num_points, 2))
+
+        transform_parameters = {
+            'theta': 0,
+            'tx': 0,
+            'ty': 0,
+            'shear': 0,
+            'zx': 1,
+            'zy': 1
+        }
+
+        image_shape = (10, 10)
+
+        transformed_points_in_image = affine_transform_points(points,
+                                                              transform_parameters,
+                                                              image_shape)
+
+        self.assertEqual(np.shape(transformed_points_in_image), (num_points, 2))
+        self.assertAllEqual(points, transformed_points_in_image)
 
 
 if __name__ == '__main__':