Unwrap line string augmentation

changelogs/master/added/20190927_unwrapped_bb_aug.md

@@ -25,12 +25,12 @@
 * [breaking] Added parameter `parents` to `Augmenter.augment_bounding_boxes()`.
   This breaks if `hooks` was used as a *positional* argument in connection with
   that method.
-* [breaking] Added parameter `func_bounding_boxes` to `Lambda`. This
-  breaks if one relied on the order of the augmenter's parameters instead of
-  their names.
-* [breaking] Added parameter `func_bounding_boxes` to `AssertLambda`. This
-  breaks if one relied on the order of the augmenter's parameters instead of
-  their names.
-* [breaking] Added parameter `check_bounding_boxes` to `AssertShape`. This
-  breaks if one relied on the order of the augmenter's parameters instead of
-  their names.
+* [rarely breaking] Added parameter `func_bounding_boxes` to `Lambda`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.
+* [rarely breaking] Added parameter `func_bounding_boxes` to `AssertLambda`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.
+* [rarely breaking] Added parameter `check_bounding_boxes` to `AssertShape`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.

changelogs/master/added/20191002_unwrapped_ls_aug.md

@@ -0,0 +1,15 @@
+# Unwrapped Line String Augmentation #450
+
+* Added internal `_augment_line_strings()` methods to various augmenters.
+  This allows to individually control how line strings are supposed to
+  be augmented. Previously, the line string augmentation was a wrapper around
+  keypoint augmentation that did not allow such control.
+* [rarely breaking] Added parameter `func_line_strings` to `Lambda`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.
+* [rarely breaking] Added parameter `func_line_strings` to `AssertLambda`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.
+* [rarely breaking] Added parameter `check_line_strings` to `AssertShape`.
+  This breaks if one relied on the order of the augmenter's parameters instead
+  of their names.

imgaug/augmenters/blend.py

@@ -402,6 +402,12 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
             polygons_on_images, random_state, parents, hooks,
             "augment_polygons")
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_nonimages(
+            line_strings_on_images, random_state, parents, hooks,
+            "augment_line_strings")
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_nonimages(
@@ -679,6 +685,7 @@ def __init__(self, factor=0, first=None, second=None, per_channel=False,
         # keypoint mode currently also affects line strings
         self._keypoints_mode = self._MODE_POINTWISE
         self._polygons_mode = self._MODE_EITHER_OR
+        self._line_strings_mode = self._MODE_EITHER_OR
         self._bounding_box_mode = self._MODE_EITHER_OR
 
     def _augment_images(self, images, random_state, parents, hooks):
@@ -813,6 +820,14 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
             return self._augment_polygons_as_keypoints(
                 polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        # see notes under polygons
+        mode = self._line_strings_mode
+        with _switch_keypoint_mode_temporarily(self, mode):
+            return self._augment_line_strings_as_keypoints(
+                line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         # see notes under polygons

imgaug/augmenters/flip.py

@@ -908,6 +908,13 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
         return self._augment_polygons_as_keypoints(
             polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        # TODO maybe reverse the order of points afterwards? the flip probably
+        #      inverts them
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -1014,6 +1021,12 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
         return self._augment_polygons_as_keypoints(
             polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        # TODO how does flipping affect the point order?
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(

imgaug/augmenters/geometric.py

@@ -1099,6 +1099,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
         return self._augment_polygons_as_keypoints(
             polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -1816,6 +1821,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
         return self._augment_polygons_as_keypoints(
             polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -2262,6 +2272,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
             polygons_on_images, random_state, parents, hooks,
             recoverer=self.polygon_recoverer)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -2806,6 +2821,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
             polygons_on_images, random_state, parents, hooks,
             recoverer=self.polygon_recoverer)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -3424,6 +3444,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
             polygons_on_images, random_state, parents, hooks,
             recoverer=self.polygon_recoverer)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(
@@ -3915,6 +3940,11 @@ def _augment_polygons(self, polygons_on_images, random_state, parents,
         return self._augment_polygons_as_keypoints(
             polygons_on_images, random_state, parents, hooks)
 
+    def _augment_line_strings(self, line_strings_on_images, random_state,
+                              parents, hooks):
+        return self._augment_line_strings_as_keypoints(
+            line_strings_on_images, random_state, parents, hooks)
+
     def _augment_bounding_boxes(self, bounding_boxes_on_images, random_state,
                                 parents, hooks):
         return self._augment_bounding_boxes_as_keypoints(