diff options
author | Mark Wiebe <mwwiebe@gmail.com> | 2011-08-16 16:54:16 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-27 07:26:55 -0600 |
commit | 9194b3af704df71aa9b1ff2f53f169848d0f9dc7 (patch) | |
tree | 1e6624032156dfa190e1adba79cc76e5700f19ce /doc | |
parent | 99a21efff4b1f2292dc370c7c9c7c58f10385f2a (diff) | |
download | numpy-9194b3af704df71aa9b1ff2f53f169848d0f9dc7.tar.gz |
ENH: missingdata: Rewrite PyArray_Concatenate to work with NA masks
It should also have less memory usage for heterogeneous inputs,
because it no longer makes extra copies in that case.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/release/2.0.0-notes.rst | 3 | ||||
-rw-r--r-- | doc/source/reference/c-api.array.rst | 26 |
2 files changed, 17 insertions, 12 deletions
diff --git a/doc/release/2.0.0-notes.rst b/doc/release/2.0.0-notes.rst index d5aa99639..ddedf85de 100644 --- a/doc/release/2.0.0-notes.rst +++ b/doc/release/2.0.0-notes.rst @@ -29,9 +29,12 @@ What works with NA: * Array methods: + ndarray.clip, ndarray.min, ndarray.max, ndarray.sum, ndarray.prod, ndarray.conjugate, ndarray.diagonal + + numpy.concatenate What doesn't work with NA: * Fancy indexing, such as with lists and partial boolean masks. + * ndarray.flat and any other methods that use the old iterator + mechanism instead of the newer nditer. * UFunc.reduce of multi-dimensional arrays, with skipna=True and a ufunc that doesn't have an identity. * UFunc.accumulate, UFunc.reduceat. diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst index 498b2a448..369360407 100644 --- a/doc/source/reference/c-api.array.rst +++ b/doc/source/reference/c-api.array.rst @@ -1667,18 +1667,20 @@ Conversion copied into every location. A -1 is returned if an error occurs, otherwise 0 is returned. -.. cfunction:: PyObject* PyArray_View(PyArrayObject* self, PyArray_Descr* dtype) - - Equivalent to :meth:`ndarray.view` (*self*, *dtype*). Return a new view of - the array *self* as possibly a different data-type, *dtype*. If - *dtype* is ``NULL``, then the returned array will have the same - data type as *self*. The new data-type must be consistent with - the size of *self*. Either the itemsizes must be identical, or - *self* must be single-segment and the total number of bytes must - be the same. In the latter case the dimensions of the returned - array will be altered in the last (or first for Fortran-style - contiguous arrays) dimension. The data area of the returned array - and self is exactly the same. +.. cfunction:: PyObject* PyArray_View(PyArrayObject* self, PyArray_Descr* dtype, PyTypeObject *ptype) + + Equivalent to :meth:`ndarray.view` (*self*, *dtype*). Return a new + view of the array *self* as possibly a different data-type, *dtype*, + and different array subclass *ptype*. + + If *dtype* is ``NULL``, then the returned array will have the same + data type as *self*. The new data-type must be consistent with the + size of *self*. Either the itemsizes must be identical, or *self* must + be single-segment and the total number of bytes must be the same. + In the latter case the dimensions of the returned array will be + altered in the last (or first for Fortran-style contiguous arrays) + dimension. The data area of the returned array and self is exactly + the same. Shape Manipulation |