summaryrefslogtreecommitdiff
path: root/scipy/base/numeric.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2005-09-16 21:11:54 +0000
committerTravis Oliphant <oliphant@enthought.com>2005-09-16 21:11:54 +0000
commit325306f18aac4f9581bc3aae49da30d09a1bd410 (patch)
tree36b4c02aa691c45d9fb5217050dc3652101a5d94 /scipy/base/numeric.py
parente4e9c0eb0c78db4cc0afd4e81d0af38c5ccaf02c (diff)
downloadnumpy-325306f18aac4f9581bc3aae49da30d09a1bd410.tar.gz
Added isnan, isinf, isfinite, and signbit
Diffstat (limited to 'scipy/base/numeric.py')
-rw-r--r--scipy/base/numeric.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py
index 9a5f0cd14..e6e8b9f2f 100644
--- a/scipy/base/numeric.py
+++ b/scipy/base/numeric.py
@@ -1,7 +1,7 @@
import sys
import multiarray
-from umath import *
+from umath import *
from numerictypes import *
#import _numpy # for freeze dependency resolution (at least on Mac)
@@ -89,6 +89,7 @@ except ImportError:
def restoredot():
pass
+
def _move_axis_to_0(a, axis):
if axis == 0:
return a
@@ -138,10 +139,11 @@ def cross(a, b, axisa=-1, axisb=-1, axisc=-1):
else:
return cp.swapaxes(0,axisc)
-
+
#Use numarray's printing function
from arrayprint import array2string, get_printoptions, set_printoptions
+
_typelessdata = [int, float, complex]
if issubclass(intc, pyint):
_typelessdata.append(intc)
@@ -171,6 +173,7 @@ set_string_function = multiarray.set_string_function
set_string_function(array_str, 0)
set_string_function(array_repr, 1)
+
little_endian = (sys.byteorder == 'little')
def indices(dimensions, dtype=intp):
@@ -202,6 +205,7 @@ def load(file):
file = _file(file,"rb")
return _cload(file)
+
# These are all essentially abbreviations
# These might wind up in a special abbreviations module
@@ -291,4 +295,3 @@ def geterr():
return res
-