[pypy-commit] pypy ndarray-sort: fix default axis off-by-one

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: ndarray-sort
Changeset: r67265:656eded4a6ba
Date: 2013-10-09 23:13 +0300
http://bitbucket.org/pypy/pypy/changeset/656eded4a6ba/

Log:	fix default axis off-by-one

diff --git a/pypy/module/micronumpy/arrayimpl/sort.py b/pypy/module/micronumpy/arrayimpl/sort.py
--- a/pypy/module/micronumpy/arrayimpl/sort.py
+++ b/pypy/module/micronumpy/arrayimpl/sort.py
@@ -137,8 +137,8 @@
         else:
             shape = arr.get_shape()
             if axis < 0:
-                axis = len(shape) + axis - 1
-            if axis < 0 or axis > len(shape):
+                axis = len(shape) + axis
+            if axis < 0 or axis >= len(shape):
                 raise OperationError(space.w_IndexError, space.wrap(
                                                     "Wrong axis %d" % axis))
             iterable_shape = shape[:axis] + [0] + shape[axis + 1:]
@@ -270,7 +270,7 @@
 
     def sort(arr, space, w_axis, itemsize):
         if w_axis is space.w_None:
-            # note that it's fine ot pass None here as we're not going
+            # note that it's fine to pass None here as we're not going
             # to pass the result around (None is the link to base in slices)
             arr = arr.reshape(space, None, [arr.get_size()])
             axis = 0
@@ -286,8 +286,8 @@
         else:
             shape = arr.get_shape()
             if axis < 0:
-                axis = len(shape) + axis - 1
-            if axis < 0 or axis > len(shape):
+                axis = len(shape) + axis
+            if axis < 0 or axis >= len(shape):
                 raise OperationError(space.w_IndexError, space.wrap(
                                                     "Wrong axis %d" % axis))
             iterable_shape = shape[:axis] + [0] + shape[axis + 1:]
diff --git a/pypy/module/micronumpy/test/test_sorting.py b/pypy/module/micronumpy/test/test_sorting.py
--- a/pypy/module/micronumpy/test/test_sorting.py
+++ b/pypy/module/micronumpy/test/test_sorting.py
@@ -96,7 +96,7 @@
         # test doubles and complex doubles as the logic is the same.
 
         # check doubles
-        from numpypy import array, nan, zeros, complex128, arange, dtype
+        from numpypy import array, nan, zeros, complex128, arange
         from numpy import isnan
         a = array([nan, 1, 0])
         b = a.copy()
@@ -152,19 +152,6 @@
             c.sort(kind=kind)
             assert (c == ai).all(), msg
 
-        # test string sorts.
-        s = 'aaaaaaaa'
-        a = array([s + chr(i) for i in range(101)])
-        b = a[::-1].copy()
-        for kind in ['q', 'm', 'h'] :
-            msg = "string sort, kind=%s" % kind
-            c = a.copy();
-            c.sort(kind=kind)
-            assert (c == a).all(), msg
-            c = b.copy();
-            c.sort(kind=kind)
-            assert (c == a).all(), msg
-
         # check axis handling. This should be the same for all type
         # specific sorts, so we only check it for one type and one kind
         a = array([[3, 2], [1, 0]])
@@ -180,6 +167,22 @@
         d.sort()
         assert (d == c).all(), "test sort with default axis"
 
+    def test_sort_corner_cases_string_records(self):
+        skip('not implemented yet')
+        from numpypy import array, dtype
+        # test string sorts.
+        s = 'aaaaaaaa'
+        a = array([s + chr(i) for i in range(101)])
+        b = a[::-1].copy()
+        for kind in ['q', 'm', 'h'] :
+            msg = "string sort, kind=%s" % kind
+            c = a.copy();
+            c.sort(kind=kind)
+            assert (c == a).all(), msg
+            c = b.copy();
+            c.sort(kind=kind)
+            assert (c == a).all(), msg
+
 
         # test record array sorts.
         dt =dtype([('f', float), ('i', int)])
@@ -263,6 +266,7 @@
         from numpypy import array, zeros
         from sys import byteorder
         # Test sorting an array with fields
+        skip('not implemented yet')
         x1 = array([21, 32, 14])
         x2 = array(['my', 'first', 'name'])
         x3=array([3.1, 4.5, 6.2])
@@ -301,6 +305,7 @@
 
 # tests from numpy/tests/test_regression.py
     def test_sort_bigendian(self):
+        skip('not implemented yet')
         from numpypy import array, dtype
         a = array(range(11),dtype='float64')
         c = a.astype(dtype('<f8'))
@@ -308,6 +313,7 @@
         assert max(abs(a-c)) < 1e-32
 
     def test_string_sort_with_zeros(self):
+        skip('not implemented yet')
         from numpypy import fromstring
         """Check sort for strings containing zeros."""
         x = fromstring("\x00\x02\x00\x01", dtype="S2")