diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2006-09-02 22:33:40 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2006-09-02 22:33:40 +0000 |
| commit | 92abb2700078ae4a4e1da4df8a075e3134a86216 (patch) | |
| tree | 96174d1e67d32551cf958792ac42720945a03716 | |
| parent | e9b1afbc48f3653bddc1a3fb7ad6dc4d7b0ae877 (diff) | |
| download | numpy-92abb2700078ae4a4e1da4df8a075e3134a86216.tar.gz | |
Oops, previous commit was accidental and had a temporary mod I was using for
testing. Remove that mod. Meanwhile, have added a local_search_right function.
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 0fdd885bc..fd78f73a6 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -2592,9 +2592,9 @@ local_search_right(PyArrayObject *ap1, PyArrayObject *ap2, PyArrayObject *ret) for(i = 0; i < nkeys; ++i) { intp imin = 0; - intp ilen = nelts; + intp imax = nelts; while (imin < imax) { - intp imid = imin + (imax - imin >> 2); + intp imid = imin + ((imax - imin) >> 2); if (compare(p1 + elsize*imid, p2, ap2) < 0) { imin = imid + 1; } else { @@ -2641,7 +2641,7 @@ PyArray_SearchSorted(PyArrayObject *op1, PyObject *op2) } NPY_BEGIN_THREADS_DESCR(ap2->descr) - local_search_right(ap1, ap2, ret); + local_search_left(ap1, ap2, ret); NPY_END_THREADS_DESCR(ap2->descr) Py_DECREF(ap1); |