diff options
Diffstat (limited to 'numpy/numarray')
| -rw-r--r-- | numpy/numarray/functions.py | 3 | ||||
| -rw-r--r-- | numpy/numarray/ufuncs.py | 26 |
2 files changed, 15 insertions, 14 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 3d223959f..d549f938f 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -30,7 +30,8 @@ ## 'sometrue', 'sort', 'swapaxes', 'sys', 'take', 'tcode', ## 'tensormultiply', 'tname', 'trace', 'transpose', 'typeDict', ## 'typecode', 'typecodes', 'typeconv', 'types', 'ufunc', -## 'ufuncFactory', 'value', ] +## 'ufuncFactory', 'value', 'ieeemask', 'cumproduct', 'cumsum', +## 'nonzero'] __all__ = ['asarray', 'ones', 'zeros', 'array', 'where'] diff --git a/numpy/numarray/ufuncs.py b/numpy/numarray/ufuncs.py index b6e12cfe1..685b76587 100644 --- a/numpy/numarray/ufuncs.py +++ b/numpy/numarray/ufuncs.py @@ -1,21 +1,21 @@ __all__ = ['abs', 'absolute', 'add', 'arccos', 'arccosh', 'arcsin', 'arcsinh', 'arctan', 'arctan2', 'arctanh', 'bitwise_and', 'bitwise_not', - 'bitwise_or', 'bitwise_xor', 'ceil', 'cos', 'cosh', 'cumproduct', - 'cumsum', 'divide', 'equal', 'exp', 'fabs', 'floor', 'floor_divide', - 'fmod', 'greater', 'greater_equal', 'hypot', 'ieeemask', 'isnan', + 'bitwise_or', 'bitwise_xor', 'ceil', 'cos', 'cosh', 'divide', + 'equal', 'exp', 'fabs', 'floor', 'floor_divide', + 'fmod', 'greater', 'greater_equal', 'hypot', 'isnan', 'less', 'less_equal', 'log', 'log10', 'logical_and', 'logical_not', 'logical_or', 'logical_xor', 'lshift', 'maximum', 'minimum', - 'minus', 'multiply', 'negative', 'nonzero', 'not_equal', + 'minus', 'multiply', 'negative', 'not_equal', 'power', 'product', 'remainder', 'rshift', 'sin', 'sinh', 'sqrt', 'subtract', 'sum', 'tan', 'tanh', 'true_divide'] -from numpy import abs, absolute, add, arccos, arccosh, arcsin, arcsinh, \ - arctan, arctan2, arctanh, bitwise_and, bitwise_not, bitwise_or, \ - bitwise_xor, ceil, cos, cosh, cumproduct, cumsum, divide, equal, \ - exp, fabs, floor, floor_divide, fmod, greater, greater_equal, hypot, \ - ieeemask, isnan, less, less_equal, log, log10, logical_and, \ - logical_not, logical_or, logical_xor, lshift, maximum, minimum, \ - minus, multiply, negative, nonzero, not_equal, power, product, \ - remainder, rshift, sin, sinh, sqrt, subtract, sum, tan, tanh, \ - true_divide +from numpy import absolute as abs, absolute, add, arccos, arccosh, arcsin, \ + arcsinh, arctan, arctan2, arctanh, bitwise_and, invert as bitwise_not, \ + bitwise_or, bitwise_xor, ceil, cos, cosh, divide, \ + equal, exp, fabs, floor, floor_divide, fmod, greater, greater_equal, \ + hypot, isnan, less, less_equal, log, log10, logical_and, \ + logical_not, logical_or, logical_xor, left_shift as lshift, \ + maximum, minimum, negative as minus, multiply, negative, \ + not_equal, power, product, remainder, right_shift as rshift, sin, \ + sinh, sqrt, subtract, sum, tan, tanh, true_divide |