summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorrgommers <ralf.gommers@googlemail.com>2011-03-02 12:43:47 +0800
committerrgommers <ralf.gommers@googlemail.com>2011-03-02 13:23:48 +0800
commit4ca2465fe169576b46dee783dd0279cfd536d9c4 (patch)
treed682c1b79e51bb52dd5493337facf2afc5dbca76 /numpy/ma
parent7ef5d601b4fe281c797fa497c317861c7340e3ec (diff)
downloadnumpy-4ca2465fe169576b46dee783dd0279cfd536d9c4.tar.gz
DOC: merge more doc wiki edits.
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/core.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 673cfb1ab..48ed424ff 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -2580,9 +2580,9 @@ class MaskedArray(ndarray):
Construction::
- x = MaskedArray(data, mask=nomask, dtype=None, copy=True,
- fill_value=None, keep_mask=True, hard_mask=False,
- shrink=True)
+ x = MaskedArray(data, mask=nomask, dtype=None,
+ copy=False, subok=True, ndmin=0, fill_value=None,
+ keep_mask=True, hard_mask=None, flag=None, shrink=True)
Parameters
----------
@@ -3373,6 +3373,12 @@ class MaskedArray(ndarray):
The value to use for invalid entries (None by default).
If None, the `fill_value` attribute of the array is used instead.
+ Returns
+ -------
+ filled_array : ndarray
+ A copy of ``self`` with invalid entries replaced by *fill_value*
+ (be it the function argument or the attribute of ``self``.
+
Notes
-----
The result is **not** a MaskedArray!