diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-09-26 16:15:42 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-09-26 16:15:42 +0000 |
| commit | b0d76351911cf56f32afb590a4b759e18a60dd50 (patch) | |
| tree | c31d13e6fd9d67194877515cd9e6c6c5ce0ded35 /scipy/base/matrix.py | |
| parent | 3bd3270fd807a931807b307d89275a98a8b62f52 (diff) | |
| download | numpy-b0d76351911cf56f32afb590a4b759e18a60dd50.tar.gz | |
Fixed up for release.
Diffstat (limited to 'scipy/base/matrix.py')
| -rw-r--r-- | scipy/base/matrix.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scipy/base/matrix.py b/scipy/base/matrix.py index fbe2c0490..3710dc4da 100644 --- a/scipy/base/matrix.py +++ b/scipy/base/matrix.py @@ -73,7 +73,7 @@ class matrix(N.ndarray): return data.astype(dtype) if dtype is None: - dtype = N.intp + dtype = N.float intype = N.obj2dtype(dtype) if isinstance(data, types.StringType): @@ -214,11 +214,14 @@ class matrix(N.ndarray): # inverse doesn't work yet.... def getI(self): - return self + from scipy.linalg import inv + return matrix(inv(self)) - A = property(getA, None, doc="Get base array") + A = property(getA, None, doc="base array") T = property(getT, None, doc="transpose") H = property(getH, None, doc="hermitian (conjugate) transpose") + I = property(getI, None, doc="inverse") + def _from_string(str,gdict,ldict): |