... and some more cleanups to transforms.py.

anntzer · anntzer · commit e1ce046ac5b4 · 2016-11-03T01:44:10.000-07:00
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -368,16 +368,14 @@ def min(self):
         """
         (property) :attr:`min` is the bottom-left corner of the bounding box.
         """
-        return [min(self.get_points()[:, 0]),
-                min(self.get_points()[:, 1])]
+        return np.min(self.get_points(), axis=0)
 
     @property
     def max(self):
         """
         (property) :attr:`max` is the top-right corner of the bounding box.
         """
-        return [max(self.get_points()[:, 0]),
-                max(self.get_points()[:, 1])]
+        return np.max(self.get_points(), axis=1)
 
     @property
     def intervalx(self):
@@ -695,50 +693,23 @@ def union(bboxes):
         """
         if not len(bboxes):
             raise ValueError("'bboxes' cannot be empty")
-
-        if len(bboxes) == 1:
-            return bboxes[0]
-
-        x0 = np.inf
-        y0 = np.inf
-        x1 = -np.inf
-        y1 = -np.inf
-
-        for bbox in bboxes:
-            points = bbox.get_points()
-            xs = points[:, 0]
-            ys = points[:, 1]
-            x0 = min(x0, np.min(xs))
-            y0 = min(y0, np.min(ys))
-            x1 = max(x1, np.max(xs))
-            y1 = max(y1, np.max(ys))
-
-        return Bbox.from_extents(x0, y0, x1, y1)
+        x0 = min(bbox.xmin for bbox in bboxes)
+        x1 = max(bbox.xmax for bbox in bboxes)
+        y0 = min(bbox.ymin for bbox in bboxes)
+        y1 = max(bbox.ymax for bbox in bboxes)
+        return Bbox([[x0, y0], [x1, y1]])
 
     @staticmethod
     def intersection(bbox1, bbox2):
         """
         Return the intersection of the two bboxes or None
         if they do not intersect.
-
-        Implements the algorithm described at:
-
-            http://www.tekpool.com/node/2687
-
         """
-        intersects = not (bbox2.xmin > bbox1.xmax or
-                          bbox2.xmax < bbox1.xmin or
-                          bbox2.ymin > bbox1.ymax or
-                          bbox2.ymax < bbox1.ymin)
-
-        if intersects:
-            x0 = max([bbox1.xmin, bbox2.xmin])
-            x1 = min([bbox1.xmax, bbox2.xmax])
-            y0 = max([bbox1.ymin, bbox2.ymin])
-            y1 = min([bbox1.ymax, bbox2.ymax])
-            return Bbox.from_extents(x0, y0, x1, y1)
-
-        return None
+        x0 = max(bbox1.xmin, bbox2.xmin)
+        x1 = min(bbox1.xmax, bbox2.xmax)
+        y0 = max(bbox1.ymin, bbox2.ymin)
+        y1 = min(bbox1.ymax, bbox2.ymax)
+        return Bbox([[x0, y0], [x1, y1]]) if x0 <= x1 and y0 <= y1 else None
 
 
 class Bbox(BboxBase):
