Fix typo in oldnumeric and add Rick White's improvement to histogram …

…for large arrays.
immerrr · Dec 14, 2006 · 32789fd · 32789fd
1 parent 8bd6fb7
commit 32789fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
@@ -93,7 +93,11 @@ def histogram(a, bins=10, range=None, normed=False):
             mx += 0.5
         bins = linspace(mn, mx, bins, endpoint=False)
 
-    n = sort(a).searchsorted(bins)
+    # best block size probably depends on processor cache size
+    block = 65536
+    n = sort(a[:block]).searchsorted(bins)
+    for i in xrange(block, a.size, block):
+        n += sort(a[i:i+block]).searchsorted(bins)
     n = concatenate([n, [len(a)]])
     n = n[1:]-n[:-1]
 

diff --git a/numpy/oldnumeric/compat.py b/numpy/oldnumeric/compat.py
@@ -56,7 +56,7 @@ def array_constructor(shape, typecode, thestr, Endian=LittleEndian):
         x = mu.fromstring(thestr, typecode)
     x.shape = shape
     if LittleEndian != Endian:
-        return x.byteswap(TRUE)
+        return x.byteswap(True)
     else:
         return x