Fix segfault on indexing (but functionality still not working). Add vectorize test-case (ticket #52). Improve comments on broadcast failure.

teoliphant · teoliphant · commit 964039632baa · 2006-04-13T15:13:57.000Z
diff --git a/THANKS.txt b/THANKS.txt
@@ -13,7 +13,8 @@ Chris Hanley for help with records.py, testing, and bug fixes.
 Travis Vaught and Joe Cooper for administration of numpy.org web site and SVN 
 Eric Firing for bugfixes.
 Arnd Baecker for 64-bit testing
-David Cooke for many code improvements including the auto-generated C-API
+David Cooke for many code improvements including the auto-generated C-API, and optimizations.
 Alexander Belopolsky (Sasha) for Masked array bug-fixes and tests and rank-0 array improvements and other code additions
 Francesc Altet for unicode and nested record tests and help with nested records
-Tim Hochberg for getting the build working on MSVC
+Tim Hochberg for getting the build working on MSVC, optimization improvements, and code review
+Charles Harris for the sorting code originally written for Numarray.
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
@@ -1777,8 +1777,10 @@ PyArray_SetMap(PyArrayMapIterObject *mit, PyObject *op)
 	if ((mit->subspace != NULL) && (mit->consec)) {
 		if (mit->iteraxes[0] > 0) {  /* then we need to swap */
 			_swap_axes(mit, (PyArrayObject **)&arr);
+			if (arr == NULL) return -1;
 		}
 	}
+	
 
 	if ((it = (PyArrayIterObject *)PyArray_IterNew(arr))==NULL) {
 		Py_DECREF(arr);
@@ -7522,9 +7524,9 @@ PyArray_Broadcast(PyArrayMultiIterObject *mit)
 					mit->dimensions[i] = tmp;
 				else if (mit->dimensions[i] != tmp) {
 					PyErr_SetString(PyExc_ValueError,
-							"index objects are " \
-							"not broadcastable " \
-							"to a single shape");
+							"shape mismatch: objects" \
+							" cannot be broadcast" \
+							" to a single shape");
 					return -1;
 				}
 			}
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
@@ -327,7 +327,12 @@ def check_simple(self):
         (a,b)=histogram(linspace(0,10,100))
         assert(all(a==10))
 
-
+class test_vectorize( ScipyTestCase ): 
+    def check_vectorize( self ): 
+        x = linspace(-3,2,10000) 
+        f = vectorize(lambda x: x) 
+        y = f(x) 
+        assert_array_equal(y, x) 
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -1777,8 +1777,10 @@ PyArray_SetMap(PyArrayMapIterObject mit, PyObject op)`
`1777`	`1777`	`if ((mit->subspace != NULL) && (mit->consec)) {`
`1778`	`1778`	`if (mit->iteraxes[0] > 0) { /* then we need to swap */`
`1779`	`1779`	`_swap_axes(mit, (PyArrayObject **)&arr);`
	`1780`	`+ if (arr == NULL) return -1;`
`1780`	`1781`	`}`
`1781`	`1782`	`}`
	`1783`	`+`
`1782`	`1784`
`1783`	`1785`	`if ((it = (PyArrayIterObject *)PyArray_IterNew(arr))==NULL) {`
`1784`	`1786`	`Py_DECREF(arr);`
`@@ -7522,9 +7524,9 @@ PyArray_Broadcast(PyArrayMultiIterObject *mit)`
`7522`	`7524`	`mit->dimensions[i] = tmp;`
`7523`	`7525`	`else if (mit->dimensions[i] != tmp) {`
`7524`	`7526`	`PyErr_SetString(PyExc_ValueError,`
`7525`		`- "index objects are " \`
`7526`		`- "not broadcastable " \`
`7527`		`- "to a single shape");`
	`7527`	`+ "shape mismatch: objects" \`
	`7528`	`+ " cannot be broadcast" \`
	`7529`	`+ " to a single shape");`
`7528`	`7530`	`return -1;`
`7529`	`7531`	`}`
`7530`	`7532`	`}`