Menu
▾
▴
[Matplotlib-checkins] SF.net SVN: matplotlib: [3583] trunk/matplotlib
|
From: <ef...@us...> - 2007-07-20 08:49:03
|
Revision: 3583
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3583&view=rev
Author: efiring
Date: 2007-07-20 01:49:00 -0700 (Fri, 20 Jul 2007)
Log Message:
-----------
Reversed last commit
Removed Paths:
-------------
trunk/matplotlib/_na_imports.py
trunk/matplotlib/_nc_imports.py
trunk/matplotlib/_sp_imports.py
trunk/matplotlib/fft/
trunk/matplotlib/linear_algebra/
trunk/matplotlib/ma/
trunk/matplotlib/mlab/
trunk/matplotlib/npyma/
trunk/matplotlib/random_array/
Deleted: trunk/matplotlib/_na_imports.py
===================================================================
--- trunk/matplotlib/_na_imports.py 2007-07-20 08:23:01 UTC (rev 3582)
+++ trunk/matplotlib/_na_imports.py 2007-07-20 08:49:00 UTC (rev 3583)
@@ -1,76 +0,0 @@
-"""Imports from numarray for numerix, the numarray/Numeric interchangeability
-module. These array functions are used when numarray is chosen.
-"""
-from numarray import Int8, UInt8, Int16, UInt16, Int32, UInt32, \
- Float32, Float64, Complex32, Complex64, Float, Int, Complex,\
- typecode
-import numarray.ieeespecial as _ieee
-inf = infinity = infty = Infinity = _ieee.inf
-isnan = _ieee.isnan
-
-class _TypeNamespace:
- """Numeric compatible type aliases for use with extension functions."""
- Int8 = typecode[Int8]
- UInt8 = typecode[UInt8]
- Int16 = typecode[Int16]
- UInt16 = typecode[UInt16]
- Int32 = typecode[Int32]
- #UInt32 = typecode[UInt32] # Todd: this appears broken
- Float32 = typecode[Float32]
- Float64 = typecode[Float64]
- Complex32 = typecode[Complex32]
- Complex64 = typecode[Complex64]
-
-nx = _TypeNamespace()
-
-from numarray import asarray, dot, fromlist, NumArray, shape, alltrue
-from numarray import all as _all
-
-def all(a, axis=None):
- '''Numpy-compatible version of all()'''
- if axis is None:
- return _all(a)
- return alltrue(a, axis)
-
-class _Matrix(NumArray):
- """_Matrix is a ported, stripped down version of the Numeric Matrix
- class which supplies only matrix multiplication.
- """
- def _rc(self, a):
- if len(shape(a)) == 0:
- return a
- else:
- return Matrix(a)
-
- def __mul__(self, other):
- aother = asarray(other)
- #if len(aother.shape) == 0:
- # return self._rc(self*aother)
- #else:
- # return self._rc(dot(self, aother))
- #return self._rc(dot(self, aother))
- return dot(self, aother)
-
- def __rmul__(self, other):
- aother = asarray(other)
- if len(aother.shape) == 0:
- return self._rc(aother*self)
- else:
- return self._rc(dot(aother, self))
-
- def __imul__(self,other):
- aother = asarray(other)
- self[:] = dot(self, aother)
- return self
-
-def Matrix(data, typecode=None, copy=1, savespace=0):
- """Matrix constructs new matrices from 2D nested lists of numbers"""
- if isinstance(data, type("")):
- raise TypeError("numerix Matrix does not support Numeric matrix string notation. Use nested lists.")
- a = fromlist(data, type=typecode)
- if a.rank == 0:
- a.shape = (1,1)
- elif a.rank == 1:
- a.shape = (1,) + a.shape
- a.__class__ = _Matrix
- return a
Deleted: trunk/matplotlib/_nc_imports.py
===================================================================
--- trunk/matplotlib/_nc_imports.py 2007-07-20 08:23:01 UTC (rev 3582)
+++ trunk/matplotlib/_nc_imports.py 2007-07-20 08:49:00 UTC (rev 3583)
@@ -1,42 +0,0 @@
-from Numeric import array, ravel, reshape, shape, alltrue, sometrue
-from Numeric import Int8, UInt8, Int16, UInt16, Int32, UInt32, \
- Float32, Float64, Complex32, Complex64, Float, Int, Complex
-from numpy import isnan as _isnan
-
-class _TypeNamespace:
- """Numeric compatible type aliases for use with extension functions."""
- Int8 = Int8
- UInt8 = UInt8
- Int16 = Int16
- UInt16 = UInt16
- Int32 = Int32
- UInt32 = UInt32
- Float32 = Float32
- Float64 = Float64
- Complex32 = Complex32
- Complex64 = Complex64
-
-nx = _TypeNamespace()
-
-def isnan(a):
- """y = isnan(x) returns True where x is Not-A-Number"""
- return reshape(array([_isnan(i) for i in ravel(a)],'b'), shape(a))
-
-def all(a, axis=None):
- '''Numpy-compatible version of all()'''
- if axis is None:
- return alltrue(ravel(a))
- else:
- return alltrue(a, axis)
-
-def any(a, axis=None):
- if axis is None:
- return sometrue(ravel(a))
- else:
- return sometrue(a, axis)
-
-
-# inf is useful for testing infinities in results of array divisions
-# (which don't raise exceptions)
-
-inf = infty = infinity = Infinity = (array([1])/0.0)[0]
Deleted: trunk/matplotlib/_sp_imports.py
===================================================================
--- trunk/matplotlib/_sp_imports.py 2007-07-20 08:23:01 UTC (rev 3582)
+++ trunk/matplotlib/_sp_imports.py 2007-07-20 08:49:00 UTC (rev 3583)
@@ -1,34 +0,0 @@
-try:
- from numpy.oldnumeric import Int8, UInt8, \
- Int16, UInt16, \
- Int32, UInt32, \
- Float32, Float64, \
- Complex32, Complex64, \
- Float, Int, Complex
-except ImportError:
- from numpy import Int8, UInt8, \
- Int16, UInt16, \
- Int32, UInt32, \
- Float32, Float64, \
- Complex32, Complex64, \
- Float, Int, Complex
-
-class _TypeNamespace:
- """Numeric compatible type aliases for use with extension functions."""
- Int8 = Int8
- UInt8 = UInt8
- Int16 = Int16
- UInt16 = UInt16
- Int32 = Int32
- UInt32 = UInt32
- Float32 = Float32
- Float64 = Float64
- Complex32 = Complex32
- Complex64 = Complex64
-
-nx = _TypeNamespace()
-
-from numpy import inf, infty, Infinity
-from numpy.random import rand, randn
-infinity = Infinity
-from numpy import all, isnan, any
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
