Add round method to array scalars and fix a few reference count issues.

teoliphant · teoliphant · commit f909e9889cf1 · 2006-02-24T01:40:53.000Z
diff --git a/THANKS.txt b/THANKS.txt
@@ -14,6 +14,6 @@ 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
-Alexander Belopolsky (sasha) for Masked array bug-fixes and tests and rank-0 array improvements
+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
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
@@ -195,7 +195,7 @@ PyArray_Ravel(PyArrayObject *a, int fortran)
 	        return PyArray_Flatten(a, fortran);
 }
 
-double
+static double
 power_of_ten(int n)
 {
 	static const double p10[] = {1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8};
@@ -218,46 +218,57 @@ PyArray_Round(PyArrayObject *a, int decimals)
 {
 	/* do the most common case first */
 	if (decimals == 0) {
-		if (PyTypeNum_ISINTEGER(PyArray_TYPE(a))) {
+		if (PyArray_ISINTEGER(a)) {
 			Py_INCREF(a);
 			return (PyObject *)a;
 		}
 		return PyArray_GenericUnaryFunction((PyAO *)a, n_ops.rint);
 	}
 	if (decimals > 0) {
 		PyObject *f, *ret;
-		if (PyTypeNum_ISINTEGER(PyArray_TYPE(a))) {
+		if (PyArray_ISINTEGER(a)) {
 			Py_INCREF(a);
 			return (PyObject *)a;
 		}
 		f = PyFloat_FromDouble(power_of_ten(decimals));
+		if (f==NULL) return NULL;
 		ret = PyNumber_Multiply((PyObject *)a, f);
+		if (ret==NULL) {Py_DECREF(f); return NULL;}
 		if (PyArray_IsScalar(ret, Generic)) {
 			/* array scalars cannot be modified inplace */
 			PyObject *tmp;
 			tmp = PyObject_CallFunction(n_ops.rint, "O", ret);
 			Py_DECREF(ret);
-			ret = PyObject_CallFunction(n_ops.divide, "OO", tmp, f);
+			ret = PyObject_CallFunction(n_ops.divide, "OO", 
+						    tmp, f);
+			Py_DECREF(tmp);
 		} else {
 			PyObject_CallFunction(n_ops.rint, "OO", ret, ret);
-			PyObject_CallFunction(n_ops.divide, "OOO", ret, f, ret);
+			PyObject_CallFunction(n_ops.divide, "OOO", ret, 
+					      f, ret);
 		}
 		Py_DECREF(f);
 		return ret;
-	} else {
+	} 
+	else {
 		/* remaining case: decimals < 0 */
 		PyObject *f, *ret;
 		f = PyFloat_FromDouble(power_of_ten(-decimals));
+		if (f==NULL) return NULL;
 		ret = PyNumber_Divide((PyObject *)a, f);
+		if (ret==NULL) {Py_DECREF(f); return NULL;}
 		if (PyArray_IsScalar(ret, Generic)) {
 			/* array scalars cannot be modified inplace */
 			PyObject *tmp;
 			tmp = PyObject_CallFunction(n_ops.rint, "O", ret);
 			Py_DECREF(ret);
-			ret = PyObject_CallFunction(n_ops.multiply, "OO", tmp, f);
+			ret = PyObject_CallFunction(n_ops.multiply, "OO", 
+						    tmp, f);
+			Py_DECREF(tmp);
 		} else {
 			PyObject_CallFunction(n_ops.rint, "OO", ret, ret);
-			PyObject_CallFunction(n_ops.multiply, "OOO", ret, f, ret);
+			PyObject_CallFunction(n_ops.multiply, "OOO", ret, 
+					      f, ret);
 		}
 		Py_DECREF(f);
 		return ret;
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src
@@ -1124,7 +1124,7 @@ gentype_byteswap(PyObject *self, PyObject *args)
 
 /**begin repeat
 
-#name=take, getfield, put, putmask, repeat, tofile, mean, trace, diagonal, clip, std, var, sum, cumsum, prod, cumprod, compress, sort, argsort#
+#name=take, getfield, put, putmask, repeat, tofile, mean, trace, diagonal, clip, std, var, sum, cumsum, prod, cumprod, compress, sort, argsort, round#
 */
 
 static PyObject *
@@ -1391,6 +1391,8 @@ static PyMethodDef gentype_methods[] = {
 	 METH_VARARGS, NULL},
 	{"ravel", (PyCFunction)gentype_ravel,
 	 METH_VARARGS, NULL},
+	{"round", (PyCFunction)gentype_round,
+	 METH_VARARGS|METH_KEYWORDS, NULL},
 	{"setflags", (PyCFunction)gentype_setflags,
 	 METH_VARARGS|METH_KEYWORDS, NULL},
 	{"newbyteorder", (PyCFunction)gentype_newbyteorder,
