Make the default array type float.

2 files changed, 51 insertions, 0 deletions

diff --git a/numpy/oldnumeric/__init__.py b/numpy/oldnumeric/__init__.py
index 768b407df..439cfe907 100644
--- a/numpy/oldnumeric/__init__.py
+++ b/numpy/oldnumeric/__init__.py
@@ -1,15 +1,21 @@
 
 from numpy import *
 from compat import *
+from olddefaults import *
 
 import numpy
 import compat
+import olddefaults
 
 __version__ = numpy.__version__
 
 __all__ = ['__version__']
 __all__ += numpy.__all__
 __all__ += compat.__all__
+for name in olddefaults.__all__:
+    if name not in __all__:
+        __all__.append(name)
 
 del numpy
 del compat
+del olddefaults
diff --git a/numpy/oldnumeric/olddefaults.py b/numpy/oldnumeric/olddefaults.py
new file mode 100644
index 000000000..d818ed57c
--- /dev/null
+++ b/numpy/oldnumeric/olddefaults.py
@@ -0,0 +1,45 @@
+__all__ = ['ones', 'empty', 'identity', 'zeros', 'eye', 'tri']
+
+import numpy.core.multiarray as mu
+import numpy.core.numeric as nn
+
+def ones(shape, dtype=int, order='C'):
+    """ones(shape, dtype=int) returns an array of the given
+    dimensions which is initialized to all ones.
+    """
+    a = mu.empty(shape, dtype, order)
+    a.fill(1)
+    return a
+
+def zeros(shape, dtype=int, order='C'):
+    """zeros(shape, dtype=int) returns an array of the given
+    dimensions which is initialized to all zeros
+    """
+    return mu.zeros(shape, dtype, order)
+
+def identity(n,dtype=int):
+    """identity(n) returns the identity 2-d array of shape n x n.
+    """
+    return nn.identity(n, dtype)
+
+def eye(N, M=None, k=0, dtype=int):
+    """ eye returns a N-by-M 2-d array where the  k-th diagonal is all ones,
+        and everything else is zeros.
+    """
+    if M is None: M = N
+    m = equal(subtract.outer(arange(N), arange(M)),-k)
+    if m.dtype != dtype:
+        return m.astype(dtype)
+    
+def tri(N, M=None, k=0, dtype=int):
+    """ returns a N-by-M array where all the diagonals starting from
+        lower left corner up to the k-th are all ones.
+    """
+    if M is None: M = N
+    m = greater_equal(subtract.outer(arange(N), arange(M)),-k)
+    if m.dtype != dtype:
+        return m.astype(dtype)
+
+def empty(shape, dtype=int, order='C'):
+    return mu.empty(shape, dtype, order)
+