diff options
| author | rgommers <ralf.gommers@googlemail.com> | 2010-07-31 10:04:54 +0000 |
|---|---|---|
| committer | rgommers <ralf.gommers@googlemail.com> | 2010-07-31 10:04:54 +0000 |
| commit | 7225d6d9c36c2df1599960935938f5c46549268d (patch) | |
| tree | 6febfd715f071001e0502bf706807f21e38214b4 /numpy/matrixlib/defmatrix.py | |
| parent | d0a25f19139a2987af5a4e2d1ebf4badb2802c16 (diff) | |
| download | numpy-7225d6d9c36c2df1599960935938f5c46549268d.tar.gz | |
DOC: wiki merge, matrlixlib and some ndarray methods.
Diffstat (limited to 'numpy/matrixlib/defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/defmatrix.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py index a6570eedd..a5aa84f6d 100644 --- a/numpy/matrixlib/defmatrix.py +++ b/numpy/matrixlib/defmatrix.py @@ -196,23 +196,22 @@ class matrix(N.ndarray): """ matrix(data, dtype=None, copy=True) - Returns a matrix from an array-like object, or from a string - of data. A matrix is a specialized 2-d array that retains - its 2-d nature through operations. It has certain special - operators, such as ``*`` (matrix multiplication) and - ``**`` (matrix power). + Returns a matrix from an array-like object, or from a string of data. + A matrix is a specialized 2-D array that retains its 2-D nature + through operations. It has certain special operators, such as ``*`` + (matrix multiplication) and ``**`` (matrix power). Parameters ---------- data : array_like or string - If data is a string, the string is interpreted as a matrix - with commas or spaces separating columns, and semicolons - separating rows. + If `data` is a string, it is interpreted as a matrix with commas + or spaces separating columns, and semicolons separating rows. dtype : data-type Data-type of the output matrix. copy : bool - If data is already an ndarray, then this flag determines whether - the data is copied, or whether a view is constructed. + If `data` is already an `ndarray`, then this flag determines + whether the data is copied (the default), or whether a view is + constructed. See Also -------- @@ -1009,9 +1008,9 @@ def bmat(obj, ldict=None, gdict=None): Parameters ---------- - obj : string, sequence or array - Input data. Variables names in the current scope may - be referenced, even if `obj` is a string. + obj : str or array_like + Input data. Names of variables in the current scope may be + referenced, even if `obj` is a string. Returns ------- |