diff options
| author | Eric Firing <efiring@hawaii.edu> | 2012-02-18 22:06:44 -1000 |
|---|---|---|
| committer | Travis E. Oliphant <teoliphant@gmail.com> | 2012-02-22 19:37:46 -0600 |
| commit | 4c356098a81c019eb141e444a09f6ea2a14166a2 (patch) | |
| tree | 937f8f4f476e6587d46f9d733a98ab18fc91839a /numpy/ma | |
| parent | 0c1c499561066f0053b065830f5b4e900de590bc (diff) | |
| download | numpy-4c356098a81c019eb141e444a09f6ea2a14166a2.tar.gz | |
ENH: add angle() function to ma
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/core.py | 4 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index fdd5d2705..a57cdf5c1 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -27,7 +27,7 @@ __docformat__ = "restructuredtext en" __all__ = ['MAError', 'MaskError', 'MaskType', 'MaskedArray', 'bool_', 'abs', 'absolute', 'add', 'all', 'allclose', 'allequal', 'alltrue', - 'amax', 'amin', 'anom', 'anomalies', 'any', 'arange', + 'amax', 'amin', 'angle', 'anom', 'anomalies', 'any', 'arange', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctan2', 'arctanh', 'argmax', 'argmin', 'argsort', 'around', 'array', 'asarray', 'asanyarray', @@ -74,6 +74,7 @@ from numpy import ndarray, amax, amin, iscomplexobj, bool_ from numpy import array as narray import numpy.core.umath as umath +from numpy.lib.function_base import angle import numpy.core.numerictypes as ntypes from numpy.compat import getargspec, formatargspec from numpy import expand_dims as n_expand_dims @@ -1117,6 +1118,7 @@ sinh = _MaskedUnaryOperation(umath.sinh) cosh = _MaskedUnaryOperation(umath.cosh) tanh = _MaskedUnaryOperation(umath.tanh) abs = absolute = _MaskedUnaryOperation(umath.absolute) +angle = _MaskedUnaryOperation(angle) # from numpy.lib.function_base fabs = _MaskedUnaryOperation(umath.fabs) negative = _MaskedUnaryOperation(umath.negative) floor = _MaskedUnaryOperation(umath.floor) diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index f4ec54dc4..0175c1213 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -811,6 +811,8 @@ class TestMaskedArrayArithmetic(TestCase): assert_equal(np.arctan(z), arctan(zm)) assert_equal(np.arctan2(x, y), arctan2(xm, ym)) assert_equal(np.absolute(x), absolute(xm)) + assert_equal(np.angle(x + 1j*y), angle(xm + 1j*ym)) + assert_equal(np.angle(x + 1j*y, deg=True), angle(xm + 1j*ym, deg=True)) assert_equal(np.equal(x, y), equal(xm, ym)) assert_equal(np.not_equal(x, y), not_equal(xm, ym)) assert_equal(np.less(x, y), less(xm, ym)) |