summaryrefslogtreecommitdiff
path: root/numpy/matrixlib/defmatrix.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-08-04 14:31:15 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-08-04 14:31:15 -0600
commit74bd706d6fccb0512b276a038274680fd6568b75 (patch)
tree596c8ed4404c7426a1a8aceb2937e0e41343108b /numpy/matrixlib/defmatrix.py
parentbf04603cb55d10e22ae84a8683a9881e0043ca84 (diff)
parentd71637bb914a9b1140c8173024533cf3504ecad8 (diff)
downloadnumpy-74bd706d6fccb0512b276a038274680fd6568b75.tar.gz
Merge pull request #4932 from argriffing/ravel-docstrings
DOC: clarify matrix.ravel docstring and add tests
Diffstat (limited to 'numpy/matrixlib/defmatrix.py')
-rw-r--r--numpy/matrixlib/defmatrix.py40
1 files changed, 40 insertions, 0 deletions
diff --git a/numpy/matrixlib/defmatrix.py b/numpy/matrixlib/defmatrix.py
index c054f5432..22ff4790b 100644
--- a/numpy/matrixlib/defmatrix.py
+++ b/numpy/matrixlib/defmatrix.py
@@ -1015,6 +1015,46 @@ class matrix(N.ndarray):
"""
return self.__array__().ravel()
+
+ def ravel(self, order='C'):
+ """
+ Return a flattened matrix.
+
+ Refer to `numpy.ravel` for more documentation.
+
+ Parameters
+ ----------
+ order : {'C', 'F', 'A', 'K'}, optional
+ The elements of `m` are read using this index order. 'C' means to
+ index the elements in C-like order, with the last axis index
+ changing fastest, back to the first axis index changing slowest.
+ 'F' means to index the elements in Fortran-like index order, with
+ the first index changing fastest, and the last index changing
+ slowest. Note that the 'C' and 'F' options take no account of the
+ memory layout of the underlying array, and only refer to the order
+ of axis indexing. 'A' means to read the elements in Fortran-like
+ index order if `m` is Fortran *contiguous* in memory, C-like order
+ otherwise. 'K' means to read the elements in the order they occur
+ in memory, except for reversing the data when strides are negative.
+ By default, 'C' index order is used.
+
+ Returns
+ -------
+ ret : matrix
+ Return the matrix flattened to shape `(1, N)` where `N`
+ is the number of elements in the original matrix.
+ A copy is made only if necessary.
+
+ See Also
+ --------
+ matrix.flatten : returns a similar output matrix but always a copy
+ matrix.flat : a flat iterator on the array.
+ numpy.ravel : related function which returns an ndarray
+
+ """
+ return N.ndarray.ravel(self, order=order)
+
+
def getT(self):
"""
Returns the transpose of the matrix.