SF.net SVN: matplotlib:[5938] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap

[<js...@us...>]

Revision: 5938
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5938&view=rev
Author:   jswhit
Date:     2008-07-31 18:38:56 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
use 'import numpy as np'

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/proj.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py	2008-07-31 15:37:56 UTC (rev 5937)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/netcdftime.py	2008-07-31 18:38:56 UTC (rev 5938)
@@ -1,7 +1,8 @@
 """
 Performs conversions of netCDF time coordinate data to/from datetime objects.
 """
-import math, numpy, re, time
+import math, re, time
+import numpy as np
 from datetime import datetime as real_datetime
 
 _units = ['days','hours','minutes','seconds','day','hour','minute','second']
@@ -629,7 +630,7 @@
         except:
             isscalar = True
         if not isscalar:
-            date = numpy.array(date)
+            date = np.array(date)
             shape = date.shape
         if self.calendar in ['julian','standard','gregorian','proleptic_gregorian']:
             if isscalar:
@@ -656,7 +657,7 @@
             else:
                 jdelta = [_360DayFromDate(d)-self._jd0 for d in date.flat]
         if not isscalar:
-            jdelta = numpy.array(jdelta)
+            jdelta = np.array(jdelta)
         # convert to desired units, add time zone offset.
         if self.units in ['second','seconds']:
             jdelta = jdelta*86400. + self.tzoffset*60.
@@ -669,7 +670,7 @@
         if isscalar:
             return jdelta
         else:
-            return numpy.reshape(jdelta,shape)
+            return np.reshape(jdelta,shape)
 
     def num2date(self,time_value):
         """
@@ -681,8 +682,8 @@
 
 Resolution is 1 second.
 
-Works for scalars, sequences and numpy arrays.
-Returns a scalar if input is a scalar, else returns a numpy array.
+Works for scalars, sequences and np arrays.
+Returns a scalar if input is a scalar, else returns a np array.
 
 The datetime instances returned by C{num2date} are 'real' python datetime 
 objects if the date falls in the Gregorian calendar (i.e. 
@@ -699,7 +700,7 @@
         except:
             isscalar = True
         if not isscalar:
-            time_value = numpy.array(time_value)
+            time_value = np.array(time_value)
             shape = time_value.shape
         # convert to desired units, remove time zone offset.
         if self.units in ['second','seconds']:
@@ -734,7 +735,7 @@
         if isscalar:
             return date
         else:
-            return numpy.reshape(numpy.array(date),shape)
+            return np.reshape(np.array(date),shape)
 
 def _parse_date(origin):
     """Parses a date string and returns a tuple

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/proj.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/proj.py	2008-07-31 15:37:56 UTC (rev 5937)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/proj.py	2008-07-31 18:38:56 UTC (rev 5938)
@@ -1,4 +1,4 @@
-import numpy as npy
+import numpy as np
 import pyproj
 import math
 
@@ -92,15 +92,15 @@
             self._proj4 = pyproj.Proj(projparams)
             # find major and minor axes of ellipse defining map proj region.
             delta = 0.01
-            lats = npy.arange(0,90,delta)
+            lats = np.arange(0,90,delta)
             lon_0 = projparams['lon_0']
-            lons = lon_0*npy.ones(len(lats),'d')
+            lons = lon_0*np.ones(len(lats),'d')
             x, y = self._proj4(lons, lats)
             yi = (y > 1.e20).tolist()
             ny = yi.index(1)-1
             height = y[ny]
-            lons = npy.arange(lon_0,lon_0+90,delta)
-            lats = npy.zeros(len(lons),'d')
+            lons = np.arange(lon_0,lon_0+90,delta)
+            lats = np.zeros(len(lons),'d')
             x, y = self(lons, lats)
             xi = (x > 1.e20).tolist()
             nx = xi.index(1)-1
@@ -264,8 +264,8 @@
         """
         dx = (self.urcrnrx-self.llcrnrx)/(nx-1)
         dy = (self.urcrnry-self.llcrnry)/(ny-1)
-        x = self.llcrnrx+dx*npy.indices((ny,nx),npy.float32)[1,:,:]
-        y = self.llcrnry+dy*npy.indices((ny,nx),npy.float32)[0,:,:]
+        x = self.llcrnrx+dx*np.indices((ny,nx),np.float32)[1,:,:]
+        y = self.llcrnry+dy*np.indices((ny,nx),np.float32)[0,:,:]
         lons, lats = self(x, y, inverse=True)
         if returnxy:
             return lons, lats, x, y
@@ -280,9 +280,9 @@
         """
         dx = (self.urcrnrx-self.llcrnrx)/(nx-1)
         dy = (self.urcrnry-self.llcrnry)/(ny-1)
-        xy = npy.empty((ny,nx,2), npy.float64)
-        xy[...,0] = self.llcrnrx+dx*npy.indices((ny,nx),npy.float32)[1,:,:]
-        xy[...,1] = self.llcrnry+dy*npy.indices((ny,nx),npy.float32)[0,:,:]
+        xy = np.empty((ny,nx,2), np.float64)
+        xy[...,0] = self.llcrnrx+dx*np.indices((ny,nx),np.float32)[1,:,:]
+        xy[...,1] = self.llcrnry+dy*np.indices((ny,nx),np.float32)[0,:,:]
         lonlat = self(xy, inverse=True)
         if returnxy:
             return lonlat, xy
@@ -329,9 +329,9 @@
     t2 = time.clock()
     print 'compute lats/lons for all points on AWIPS 221 grid (%sx%s)' %(nx,ny)
     print 'max/min lons'
-    print min(npy.ravel(lons)),max(npy.ravel(lons))
+    print min(np.ravel(lons)),max(np.ravel(lons))
     print 'max/min lats'
-    print min(npy.ravel(lats)),max(npy.ravel(lats))
+    print min(np.ravel(lats)),max(np.ravel(lats))
     print 'took',t2-t1,'secs'
     print 'Same thing but with a single 3-D array'
     t1 = time.clock()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.