From 839225599b1fb18ebb09424459ebd2066a8f21f9 Mon Sep 17 00:00:00 2001
From: jaimefrio <jaime.frio@gmail.com>
Date: Thu, 30 Jan 2014 16:49:55 -0800
Subject: BUG: check for monotonic bin arrays in digitize

The check for monotonic bin arrays of digitize doesn't properly handle
inputs with repeated entries at the beginning of the array:

```
>>> np.__version__
'1.8.0'
>>> np.digitize([1], [0, 0 , 2])
array([2], dtype=int64)
>>> np.digitize([1], [2, 2, 0])
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ValueError: The bins must be monotonically increasing or decreasing
```

Modified `check_array_monotonic` in `_compiled_base.c` to skip over repeating
entries before deciding to check for increasing or decreasing monotonicity
and added relevant tests to `test_function_base.py`.
---
 numpy/lib/src/_compiled_base.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'numpy/lib/src')

diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c
index 328fc2d14..df4cf8191 100644
--- a/numpy/lib/src/_compiled_base.c
+++ b/numpy/lib/src/_compiled_base.c
@@ -66,32 +66,34 @@ decr_slot_right_(double x, double * bins, npy_intp lbins)
  * and 0 if the array is not monotonic.
  */
 static int
-check_array_monotonic(double * a, int lena)
+check_array_monotonic(const double *a, int lena)
 {
-    int i;
-
-    if (a [0] <= a [1]) {
-        /* possibly monotonic increasing */
-        for (i = 1; i < lena - 1; i ++) {
-            if (a [i] > a [i + 1]) {
+    /* This function is always called with lena>= 2 */
+    const double *a_next = a + 1;
+    /* Ignore repeating values at the beginning of the array */
+    while((--lena > 1) && (*a == *a_next)) {
+        a++;
+        a_next++;
+    }
+    if (*a < *a_next) { /* possibly monotonic increasing */
+        while(--lena) {
+            if (*(++a) > *(++a_next)) {
                 return 0;
             }
         }
         return 1;
-    }
-    else {
-        /* possibly monotonic decreasing */
-        for (i = 1; i < lena - 1; i ++) {
-            if (a [i] < a [i + 1]) {
+    } else if (*a > *a_next) { /* possibly monotonic decreasing */
+        while(--lena) {
+            if (*(++a) < *(++a_next)) {
                 return 0;
             }
         }
         return -1;
+    } else { /* all bins edges hold the same value */
+        return 1;
     }
 }
 
-
-
 /* find the index of the maximum element of an integer array */
 static npy_intp
 mxx (npy_intp *i , npy_intp len)
-- 
cgit v1.2.1