[Numpy-svn] r3103 - trunk/numpy/core/src

numpy-svn at scipy.org numpy-svn at scipy.org
Sat Sep 2 17:33:42 CDT 2006


Author: charris
Date: 2006-09-02 17:33:40 -0500 (Sat, 02 Sep 2006)
New Revision: 3103

Modified:
   trunk/numpy/core/src/multiarraymodule.c
Log:
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.


Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-09-02 22:27:28 UTC (rev 3102)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-09-02 22:33:40 UTC (rev 3103)
@@ -2592,9 +2592,9 @@
 
 	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 @@
 	}
 
 	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);



More information about the Numpy-svn mailing list