[Numpy-svn] r3196 - in trunk/numpy: . core/src lib

numpy-svn at scipy.org numpy-svn at scipy.org
Wed Sep 20 14:01:14 CDT 2006


Author: oliphant
Date: 2006-09-20 14:01:00 -0500 (Wed, 20 Sep 2006)
New Revision: 3196

Modified:
   trunk/numpy/__init__.py
   trunk/numpy/core/src/multiarraymodule.c
   trunk/numpy/lib/arraysetops.py
Log:
Remove sorted from unique1d.  Add testall to test if level > 10.  Remove compiler warning.

Modified: trunk/numpy/__init__.py
===================================================================
--- trunk/numpy/__init__.py	2006-09-20 10:53:30 UTC (rev 3195)
+++ trunk/numpy/__init__.py	2006-09-20 19:01:00 UTC (rev 3196)
@@ -82,7 +82,10 @@
 """
 
     def test(level=1, verbosity=1):
-        return NumpyTest().test(level, verbosity)
+        if level <= 10:	
+           return NumpyTest().test(level, verbosity)
+        else:
+           return NumpyTest().testall(level, verbosity)
     test.__doc__ = NumpyTest.test.__doc__
 
     import add_newdocs

Modified: trunk/numpy/core/src/multiarraymodule.c
===================================================================
--- trunk/numpy/core/src/multiarraymodule.c	2006-09-20 10:53:30 UTC (rev 3195)
+++ trunk/numpy/core/src/multiarraymodule.c	2006-09-20 19:01:00 UTC (rev 3196)
@@ -4529,7 +4529,7 @@
 	totalsize = 0;
 	for(i=0; i<n; i++) {
 		PyObject *tup, *descr, *index, *item, *name, *off;
-		int len, ret, _align;
+		int len, ret, _align=1;
 		PyArray_Descr *newdescr;
 
 		/* Build item to insert (descr, offset, [title])*/

Modified: trunk/numpy/lib/arraysetops.py
===================================================================
--- trunk/numpy/lib/arraysetops.py	2006-09-20 10:53:30 UTC (rev 3195)
+++ trunk/numpy/lib/arraysetops.py	2006-09-20 19:01:00 UTC (rev 3196)
@@ -64,7 +64,7 @@
         return perm.compress(flag), aux.compress(flag)
     
     else:
-        ar = numpy.array(sorted(ar))
+        ar.sort()
         return ar.compress(ediff1d(ar, 1) != 0)
 
 ##



More information about the Numpy-svn mailing list