diff options
| author | Aron Ahmadia <aron@ahmadia.net> | 2012-07-17 16:59:50 -0500 |
|---|---|---|
| committer | Aron Ahmadia <aron@ahmadia.net> | 2012-07-17 16:59:50 -0500 |
| commit | a419a3036aa8202d00eb6e857c79d66adc56bed0 (patch) | |
| tree | 4a73e6fff2ee13b35c154c43bd7b58bb6c2af633 /doc/source/reference/routines.matlib.rst | |
| parent | 7316499dd60baa7bb260875b79f7d22be491c986 (diff) | |
| parent | 6c772fab57934d24b66638ea5001eb02d1662f5e (diff) | |
| download | numpy-a419a3036aa8202d00eb6e857c79d66adc56bed0.tar.gz | |
Merge branch 'master' of https://github.com/numpy/numpy into patch-2
Diffstat (limited to 'doc/source/reference/routines.matlib.rst')
| -rw-r--r-- | doc/source/reference/routines.matlib.rst | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/doc/source/reference/routines.matlib.rst b/doc/source/reference/routines.matlib.rst index 7f8a9eabb..a35eaec78 100644 --- a/doc/source/reference/routines.matlib.rst +++ b/doc/source/reference/routines.matlib.rst @@ -7,5 +7,30 @@ This module contains all functions in the :mod:`numpy` namespace, with the following replacement functions that return :class:`matrices <matrix>` instead of :class:`ndarrays <ndarray>`. -.. automodule:: numpy.matlib +.. currentmodule:: numpy + +Functions that are also in the numpy namespace and return matrices + +.. autosummary:: + + mat + matrix + asmatrix + bmat + + +Replacement functions in `matlib` + +.. currentmodule:: numpy.matlib + +.. autosummary:: + :toctree: generated/ + empty + zeros + ones + eye + identity + repmat + rand + randn |