[Numpy-svn] r2977 - trunk/numpy/numarray

numpy-svn at scipy.org numpy-svn at scipy.org
Tue Aug 8 11:06:02 CDT 2006


Author: oliphant
Date: 2006-08-08 11:05:59 -0500 (Tue, 08 Aug 2006)
New Revision: 2977

Modified:
   trunk/numpy/numarray/functions.py
   trunk/numpy/numarray/ufuncs.py
Log:
Fix numarray compatibility layer so it at least imports.  It's not finished yet, but some functionality is there.

Modified: trunk/numpy/numarray/functions.py
===================================================================
--- trunk/numpy/numarray/functions.py	2006-08-08 15:48:38 UTC (rev 2976)
+++ trunk/numpy/numarray/functions.py	2006-08-08 16:05:59 UTC (rev 2977)
@@ -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']

Modified: trunk/numpy/numarray/ufuncs.py
===================================================================
--- trunk/numpy/numarray/ufuncs.py	2006-08-08 15:48:38 UTC (rev 2976)
+++ trunk/numpy/numarray/ufuncs.py	2006-08-08 16:05:59 UTC (rev 2977)
@@ -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



More information about the Numpy-svn mailing list