From: <js...@us...> - 2007-11-04 01:02:10
|
Revision: 4101 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4101&view=rev Author: jswhit Date: 2007-11-03 18:02:08 -0700 (Sat, 03 Nov 2007) Log Message: ----------- remove use of ravel Modified Paths: -------------- trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py Modified: trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py =================================================================== --- trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-03 12:31:59 UTC (rev 4100) +++ trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-04 01:02:08 UTC (rev 4101) @@ -653,8 +653,8 @@ self.latmax = 90. else: lons, lats = self.makegrid(101,101) - self.latmin = min(NX.ravel(lats)) - self.latmax = max(NX.ravel(lats)) + self.latmin = lats.min() + self.latmax = lats.max() # if ax == None, pylab.gca may be used. self.ax = ax @@ -2844,10 +2844,10 @@ # check that xout,yout are # within region defined by xin,yin. if checkbounds: - if min(NX.ravel(xout)) < min(xin) or \ - max(NX.ravel(xout)) > max(xin) or \ - min(NX.ravel(yout)) < min(yin) or \ - max(NX.ravel(yout)) > max(yin): + if xout.min() < xin.min() or \ + xout.max() > xin.max() or \ + yout.min() < yin.min() or \ + yout.max() > yin.max(): raise ValueError, 'yout or xout outside range of yin or xin' # compute grid coordinates of output grid. delx = xin[1:]-xin[0:-1] @@ -2858,7 +2858,7 @@ ycoords = (len(yin)-1)*(yout-yin[0])/(yin[-1]-yin[0]) else: # irregular (but still rectilinear) input grid. - xoutflat = NX.ravel(xout); youtflat = NX.ravel(yout) + xoutflat = xout.flatten(); youtflat = yout.flatten() ix = (NX.searchsorted(xin,xoutflat)-1).tolist() iy = (NX.searchsorted(yin,youtflat)-1).tolist() xoutflat = xoutflat.tolist(); xin = xin.tolist() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |