Merged in sergem/numpy/partition_for_unsigned (pull request ganesh-k13#9)

mattip · mattip · commit 24deb37bfde5 · 2016-03-12T21:34:27.000+02:00
Partition_for_unsigned
diff --git a/numpy/core/_partition_use.py b/numpy/core/_partition_use.py
@@ -7,6 +7,8 @@
 _type_to_suff = dict(zip(list_type, list_suff))
 _dtype_to_cffi_type = {dtype('int32'): 'npy_int',
                        dtype('int64'): 'npy_longlong',
+                       dtype('uint32'): 'npy_uint',
+                       dtype('uint64'): 'npy_ulonglong',
                        dtype('float64'): 'npy_double',
                        dtype('float32'): 'npy_float',
                        }
diff --git a/numpy/core/tests/test_partition.py b/numpy/core/tests/test_partition.py
@@ -0,0 +1,43 @@
+from __future__ import division, absolute_import, print_function
+
+import numpy as np
+from numpy.testing import TestCase
+import sys
+
+
+def is_pypy():
+    return '__pypy__' in sys.builtin_module_names
+
+
+class TestPartition(TestCase):
+    pivot = 2
+    pivot_index = 2
+
+    def test_uint16(self):
+        arr = np.arange(10, -1, -1, dtype='int16')
+
+        if is_pypy():
+            with self.assertRaises(NotImplementedError):
+                np.partition(arr, self.pivot_index)
+        else:
+            partition = np.partition(arr, self.pivot_index)
+            self._check_partition(partition, self.pivot_index, self.pivot)
+
+    def test_uint32(self):
+        arr = np.arange(10, -1, -1, dtype='int32')
+
+        partition = np.partition(arr, self.pivot_index)
+
+        self._check_partition(partition, self.pivot_index, self.pivot)
+
+    def test_uint64(self):
+        arr = np.arange(10, -1, -1, dtype='int64')
+
+        partition = np.partition(arr, self.pivot_index)
+
+        self._check_partition(partition, self.pivot_index, self.pivot)
+
+    def _check_partition(self, partition, pivot_index, pivot):
+        self.assertTrue(np.all(partition[:pivot_index] < partition[pivot_index]))
+        self.assertTrue(np.all(partition[pivot_index:] >= partition[pivot_index]))
+        self.assertTrue(partition[pivot_index] == pivot)

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`_type_to_suff = dict(zip(list_type, list_suff))`
`8`	`8`	`_dtype_to_cffi_type = {dtype('int32'): 'npy_int',`
`9`	`9`	`dtype('int64'): 'npy_longlong',`
	`10`	`+ dtype('uint32'): 'npy_uint',`
	`11`	`+ dtype('uint64'): 'npy_ulonglong',`
`10`	`12`	`dtype('float64'): 'npy_double',`
`11`	`13`	`dtype('float32'): 'npy_float',`
`12`	`14`	`}`