Merge pull request matplotlib#4184 from ianthomas23/4180_trirefiner_fortran_contiguous_triangles

efiring · efiring · commit 98d1d24ec597 · 2015-03-03T11:26:10.000-10:00
Fix for issue matplotlib#4180 trirefiner not dealing with fortran contiguous triangles
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -6,7 +6,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.tri as mtri
-from nose.tools import assert_equal, assert_raises
+from nose.tools import assert_equal, assert_raises, assert_true, assert_false
 from numpy.testing import assert_array_equal, assert_array_almost_equal,\
     assert_array_less
 import numpy.ma.testutils as matest
@@ -962,6 +962,29 @@ def test_triplot_return():
         raise AssertionError("triplot should return the artist it adds")
 
 
+def test_trirefiner_fortran_contiguous_triangles():
+    # github issue 4180.  Test requires two arrays of triangles that are
+    # identical except that one is C-contiguous and one is fortran-contiguous.
+    triangles1 = np.array([[2, 0, 3], [2, 1, 0]])
+    assert_false(np.isfortran(triangles1))
+
+    triangles2 = np.copy(triangles1, order='F')
+    assert_true(np.isfortran(triangles2))
+
+    x = np.array([0.39, 0.59, 0.43, 0.32])
+    y = np.array([33.99, 34.01, 34.19, 34.18])
+    triang1 = mtri.Triangulation(x, y, triangles1)
+    triang2 = mtri.Triangulation(x, y, triangles2)
+
+    refiner1 = mtri.UniformTriRefiner(triang1)
+    refiner2 = mtri.UniformTriRefiner(triang2)
+
+    fine_triang1 = refiner1.refine_triangulation(subdiv=1)
+    fine_triang2 = refiner2.refine_triangulation(subdiv=1)
+
+    assert_array_equal(fine_triang1.triangles, fine_triang2.triangles)
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
@@ -57,7 +57,7 @@ def __init__(self, x, y, triangles=None, mask=None):
         else:
             # Triangulation specified. Copy, since we may correct triangle
             # orientation.
-            self.triangles = np.array(triangles, dtype=np.int32)
+            self.triangles = np.array(triangles, dtype=np.int32, order='C')
             if self.triangles.ndim != 2 or self.triangles.shape[1] != 3:
                 raise ValueError('triangles must be a (?,3) array')
             if self.triangles.max() >= len(self.x):
