Changeset 1871

Timestamp:

01/10/06 21:25:42 (3 years ago)

Author:

sasha

Message:

implemented newaxis support for zero rank arrays

Files:

• trunk/numpy/core/src/arrayobject.c (modified) (2 diffs)
• trunk/numpy/core/tests/test_multiarray.py (modified) (5 diffs)

trunk/numpy/core/src/arrayobject.c

@@ -1763 +1763 @@
-static PyObject *iter_subscript(PyArrayIterObject *, PyObject *); 
-
+int
+count_new_axes_0d(PyObject *tuple)
+{
+        int i, argument_count;
+        int ellipsis_count = 0;
+        int newaxis_count = 0;
+        argument_count = PyTuple_GET_SIZE(tuple);
+        for (i = 0; i < argument_count; ++i) {
+                PyObject *arg = PyTuple_GET_ITEM(tuple, i);
+                ellipsis_count += (arg == Py_Ellipsis);
+                newaxis_count += (arg == Py_None);
+        }
+        if (newaxis_count + ellipsis_count != argument_count) {
+                PyErr_SetString(PyExc_IndexError,
+                                "0-d arrays can use a single ()"
+                                " or a list of ellipses and newaxis"
+                                " as an index");
+                return -1;
+        }
+        if (newaxis_count > MAX_DIMS) {
+                PyErr_SetString(PyExc_IndexError,
+                                "too many dimensions");
+                return -1;
+        }
+        return newaxis_count;
+
+}
+static PyObject *
+add_new_axes_0d(PyArrayObject *arr,  int newaxis_count)
+{
+        PyArrayObject *other;
+        intp dimensions[MAX_DIMS], strides[MAX_DIMS];
+        int i;
+        for (i = 0; i < newaxis_count; ++i) {
+                dimensions[i] = strides[i] = 1;
+        }
+        Py_INCREF(arr->descr);
+        if ((other = (PyArrayObject *)
+             PyArray_NewFromDescr(arr->ob_type, arr->descr,
+                                  newaxis_count, dimensions,
+                                  strides, arr->data,
+                                  arr->flags,
+                                  (PyObject *)arr)) == NULL) 
+                return NULL;
+
+        other->base = (PyObject *)arr;
+        Py_INCREF(arr);
+        
+        other ->flags &= ~OWNDATA;
+        
+        return (PyObject *)other;
+}
+
-static PyObject *
-array_subscript(PyArrayObject *self, PyObject *op) 
@@ -1797 +1850 @@
-        }
-        if (self->nd == 0) {
-
-
+
-                        return PyArray_ToScalar(self->data, self);
+                if (op == Py_None)
+                        return add_new_axes_0d(self, 1);
+                if (PyTuple_Check(op)) {
+                        if (0 == PyTuple_GET_SIZE(op))
+                                return PyArray_ToScalar(self->data, self);
+                        if ((nd = count_new_axes_0d(op)) == -1)
+                                return NULL;
+                        return add_new_axes_0d(self, nd);
+                }
-                PyErr_SetString(PyExc_IndexError, 
-                                "0-d arrays can't be indexed.");

trunk/numpy/core/tests/test_multiarray.py

@@ -76 +76 @@
-    def check_ellipsis_subscript(self):
-        a,b = self.d
-
-        self.failUnlessEqual(a[...], 0)
-        self.failUnlessEqual(b[...].item(), 'x')
@@ -84 +83 @@
-    def check_empty_subscript(self):
-        a,b = self.d
-
-        self.failUnlessEqual(a[()], 0)
-        self.failUnlessEqual(b[()].item(), 'x')
@@ -99 +97 @@
-    def check_ellipsis_subscript_assignment(self):
-        a,b = self.d
-
-        a[...] = 42
-        self.failUnlessEqual(a, 42)
@@ -107 +104 @@
-    def check_empty_subscript_assignment(self):
-        a,b = self.d
-
-        a[()] = 42
-        self.failUnlessEqual(a, 42)
@@ -121 +117 @@
-        self.failUnlessRaises(TypeError, assign, a, (), '')
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-if __name__ == "__main__":