summaryrefslogtreecommitdiff
path: root/numpy/core/ma.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-10 13:37:43 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-10 13:37:43 +0000
commit123a4350fcb303622a6a69d241385d1068cc8cac (patch)
treeaaac69bbedba40bed7ccdb721a88eb359052d731 /numpy/core/ma.py
parentc261b1f8fc16a0001d90fd3e024d2fd13f28ade1 (diff)
downloadnumpy-123a4350fcb303622a6a69d241385d1068cc8cac.tar.gz
Don't use masked output values for output array
Diffstat (limited to 'numpy/core/ma.py')
-rw-r--r--numpy/core/ma.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py
index 2335ed1cb..8a74580bb 100644
--- a/numpy/core/ma.py
+++ b/numpy/core/ma.py
@@ -1947,8 +1947,8 @@ def compress(condition, x, dimension=-1, out=None):
c = filled(condition, 0)
m = getmask(x)
if m is not nomask:
- m = numeric.compress(c, m, dimension, out)
- d = numeric.compress(c, filled(x), dimension, m)
+ m = numeric.compress(c, m, dimension)
+ d = numeric.compress(c, filled(x), dimension)
return masked_array(d, m)
class _minimum_operation:
@@ -2081,7 +2081,7 @@ def trace (a, offset=0, axis1=0, axis2=1, dtype=None, out=None):
"""trace(a,offset=0, axis1=0, axis2=1) returns the sum along diagonals
(defined by the last two dimenions) of the array.
"""
- return diagonal(a, offset, axis1, axis2).sum(dtype=dtype, out=out)
+ return diagonal(a, offset, axis1, axis2).sum(dtype=dtype)
def argsort (x, axis = -1, out=None, fill_value=None):
"""Treating masked values as if they have the value fill_value,