Add tests

apaszke · apaszke · commit cfcc6a0e9b47 · 2020-03-06T11:30:04.000+01:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1091,7 +1091,6 @@ def set_verts(self, verts, closed=True):
             connection at the end.
         """
         self.stale = True
-        # This is much faster than having Path do it one at a time.
         if isinstance(verts, np.ma.MaskedArray):
             verts = verts.astype(float).filled(np.nan)
 
@@ -1102,7 +1101,9 @@ def set_verts(self, verts, closed=True):
 
         # Fast path for arrays
         if isinstance(verts, np.ndarray):
-            verts_pad = np.concatenate((verts, verts[:, -1:]), axis=1)
+            verts_pad = np.concatenate((verts, verts[:, 0:1]), axis=1)
+            # Creating the codes once is much faster than having Path do it
+            # separately each time by passing closed=True.
             codes = np.empty(verts_pad.shape[1], dtype=mpath.Path.code_type)
             codes[:] = mpath.Path.LINETO
             codes[0] = mpath.Path.MOVETO
@@ -1118,11 +1119,7 @@ def set_verts(self, verts, closed=True):
                 else:
                     xy = np.asarray(xy)
                     xy = np.concatenate([xy, xy[0:1]])
-                codes = np.empty(xy.shape[0], dtype=mpath.Path.code_type)
-                codes[:] = mpath.Path.LINETO
-                codes[0] = mpath.Path.MOVETO
-                codes[-1] = mpath.Path.CLOSEPOLY
-                self._paths.append(mpath.Path(xy, codes))
+                self._paths.append(mpath.Path(xy, closed=True))
             else:
                 self._paths.append(mpath.Path(xy))
 
diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py
@@ -12,7 +12,8 @@
 import matplotlib.pyplot as plt
 import matplotlib.collections as mcollections
 import matplotlib.transforms as mtransforms
-from matplotlib.collections import Collection, LineCollection, EventCollection
+from matplotlib.collections import (Collection, LineCollection,
+                                    EventCollection, PolyCollection)
 from matplotlib.testing.decorators import image_comparison
 
 
@@ -612,3 +613,13 @@ def test_EventCollection_nosort():
     arr = np.array([3, 2, 1, 10])
     coll = EventCollection(arr)
     np.testing.assert_array_equal(arr, np.array([3, 2, 1, 10]))
+
+
+def test_collection_set_verts_array():
+    verts = np.arange(80, dtype=np.double).reshape(10, 4, 2)
+    col_arr = PolyCollection(verts)
+    col_list = PolyCollection(list(verts))
+    assert len(col_arr._paths) == len(col_list._paths)
+    for ap, lp in zip(col_arr._paths, col_list._paths):
+        assert np.array_equal(ap._vertices, lp._vertices)
+        assert np.array_equal(ap._codes, lp._codes)
