summaryrefslogtreecommitdiff
path: root/numpy/core/src/arrayobject.c
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2007-03-30 05:09:53 +0000
committerTravis Oliphant <oliphant@enthought.com>2007-03-30 05:09:53 +0000
commit228bbb7950aac767321c15b33156fb7addc651f0 (patch)
tree19ccd0acee52185103d6710450910a68711f22bb /numpy/core/src/arrayobject.c
parent19cc4b93b3dd495fd355d77225d3f97e23f85ffb (diff)
downloadnumpy-228bbb7950aac767321c15b33156fb7addc651f0.tar.gz
Make a fastclip function (adapted from ticket #425 and fix conjugate method to use ufunc when complex matrix
Diffstat (limited to 'numpy/core/src/arrayobject.c')
-rw-r--r--numpy/core/src/arrayobject.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c
index 6439efad8..582421ee2 100644
--- a/numpy/core/src/arrayobject.c
+++ b/numpy/core/src/arrayobject.c
@@ -3167,7 +3167,8 @@ typedef struct {
*ceil,
*maximum,
*minimum,
- *rint;
+ *rint,
+ *conjugate;
} NumericOps;
static NumericOps n_ops; /* NB: static objects inlitialized to zero */
@@ -3224,6 +3225,7 @@ PyArray_SetNumericOps(PyObject *dict)
SET(maximum);
SET(minimum);
SET(rint);
+ SET(conjugate);
return 0;
}
@@ -3273,6 +3275,7 @@ PyArray_GetNumericOps(void)
GET(maximum);
GET(minimum);
GET(rint);
+ GET(conjugate);
return dict;
fail: