Changeset 6153

Timestamp:

Jan 13, 2009, 2:49:15 PM (16 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (28 diffs)
• test_geospatial_data.py (modified) (88 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -9 +9 @@
 from warnings import warn
 from string import lower
-from Numeric import concatenate, array, Float, shape, reshape, ravel, take, \
-                    size, shape
 from RandomArray import randint, seed, get_seed
 from copy import deepcopy
 from Scientific.IO.NetCDF import NetCDFFile
+
+import Numeric as num
+
 from anuga.coordinate_transforms.lat_long_UTM_conversion import UTMtoLL
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -486 +487 @@
             zone2 = geo_ref2.get_zone()
             geo_ref1.reconcile_zones(geo_ref2)
-            new_points = concatenate((self.get_data_points(absolute=True),
-                                      other.get_data_points(absolute=True)),
-                                     axis = 0)
+            new_points = num.concatenate((self.get_data_points(absolute=True),
+                                          other.get_data_points(absolute=True)),
+                                         axis = 0)
 
             # Concatenate attributes if any
@@ -504 +505 @@
                         attrib1 = self.attributes[x]
                         attrib2 = other.attributes[x]
-                        new_attributes[x] = concatenate((attrib1, attrib2))
+                        new_attributes[x] = num.concatenate((attrib1, attrib2))
                     else:
                         msg = 'Geospatial data must have the same \n'
@@ -660 +661 @@
         #FIXME: add the geo_reference to this
         points = self.get_data_points()
-        sampled_points = take(points, indices)
+        sampled_points = num.take(points, indices)
 
         attributes = self.get_all_attributes()
@@ -667 +668 @@
         if attributes is not None:
             for key, att in attributes.items():
-                sampled_attributes[key] = take(att, indices)
+                sampled_attributes[key] = num.take(att, indices)
 
         return Geospatial_data(sampled_points, sampled_attributes)
@@ -706 +707 @@
         if verbose: print "make unique random number list and get indices"
 
-        total=array(range(self_size))
+        total=num.array(range(self_size))
         total_list = total.tolist()
 
@@ -959 +960 @@
             raise ValueError, msg
         lats_longs = ensure_numeric(data_points)
-        latitudes = ravel(lats_longs[:,0:1])
-        longitudes = ravel(lats_longs[:,1:])
+        latitudes = num.ravel(lats_longs[:,0:1])
+        longitudes = num.ravel(lats_longs[:,1:])
 
     if latitudes is None and longitudes is None:
@@ -1004 +1005 @@
     fid = NetCDFFile(file_name, netcdf_mode_r)
 
-    pointlist = array(fid.variables['points'])
+    pointlist = num.array(fid.variables['points'])
     keys = fid.variables.keys()
 
@@ -1020 +1021 @@
         if verbose: print "reading attribute '%s'" % key
 
-        attributes[key] = array(fid.variables[key])
+        attributes[key] = num.array(fid.variables[key])
 
     try:
@@ -1138 +1139 @@
                       "There might be a problem with the file header."
                 raise SyntaxError, msg
-            for i,num in enumerate(numbers):
-                num.strip()
-                if num != '\n' and num != '':
-                    #attributes.append(float(num))
-                    att_dict.setdefault(header[i],[]).append(float(num))
+            for i,n in enumerate(numbers):
+                n.strip()
+                if n != '\n' and n != '':
+                    #attributes.append(float(n))
+                    att_dict.setdefault(header[i],[]).append(float(n))
         except ValueError:
             raise SyntaxError
@@ -1149 +1150 @@
         raise StopIteration
 
-    pointlist = array(points).astype(Float)
+    pointlist = num.array(points).astype(num.Float)
     for key in att_dict.keys():
-        att_dict[key] = array(att_dict[key]).astype(Float)
+        att_dict[key] = num.array(att_dict[key]).astype(num.Float)
 
     # Do stuff here so the info is in lat's and longs
@@ -1160 +1161 @@
        and (y_header == 'lon' or  y_header == 'lat'):
         if x_header == 'lon':
-            longitudes = ravel(pointlist[:,0:1])
-            latitudes = ravel(pointlist[:,1:])
+            longitudes = num.ravel(pointlist[:,0:1])
+            latitudes = num.ravel(pointlist[:,1:])
         else:
-            latitudes = ravel(pointlist[:,0:1])
-            longitudes = ravel(pointlist[:,1:])
+            latitudes = num.ravel(pointlist[:,0:1])
+            longitudes = num.ravel(pointlist[:,1:])
 
         pointlist, geo_ref = _set_using_lat_long(latitudes,
@@ -1214 +1215 @@
     """
 
-    pointlist = array(fid.variables['points'][start_row:fin_row])
+    pointlist = num.array(fid.variables['points'][start_row:fin_row])
 
     attributes = {}
     for key in keys:
-        attributes[key] = array(fid.variables[key][start_row:fin_row])
+        attributes[key] = num.array(fid.variables[key][start_row:fin_row])
 
     return pointlist, attributes
@@ -1266 +1267 @@
 
     # Variable definition
-    outfile.createVariable('points', Float, ('number_of_points',
-                                             'number_of_dimensions'))
+    outfile.createVariable('points', num.Float, ('number_of_points',
+                                                 'number_of_dimensions'))
 
     #create variables
@@ -1274 +1275 @@
     if write_attributes is not None:
         for key in write_attributes.keys():
-            outfile.createVariable(key, Float, ('number_of_points',))
+            outfile.createVariable(key, num.Float, ('number_of_points',))
             outfile.variables[key][:] = write_attributes[key] #.astype(Float32)
 
@@ -1360 +1361 @@
 # @return ??
 def _point_atts2array(point_atts):
-    point_atts['pointlist'] = array(point_atts['pointlist']).astype(Float)
+    point_atts['pointlist'] = num.array(point_atts['pointlist']).astype(num.Float)
 
     for key in point_atts['attributelist'].keys():
         point_atts['attributelist'][key] = \
-                array(point_atts['attributelist'][key]).astype(Float)
+                num.array(point_atts['attributelist'][key]).astype(num.Float)
 
     return point_atts
@@ -1469 +1470 @@
         assert geo_reference == None, msg
     else:
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
 
     # Sort of geo_reference and convert points
@@ -1513 +1514 @@
     else:
         # List or numeric array of absolute points
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
 
     # Sort out geo reference
@@ -1609 +1610 @@
     from anuga.pmesh.mesh_interface import create_mesh_from_regions
     from anuga.utilities.numerical_tools import cov
-    from Numeric import array, resize,shape,Float,zeros,take,argsort,argmin
     from anuga.utilities.polygon import is_inside_polygon
     from anuga.fit_interpolate.benchmark_least_squares import mem_usage
@@ -1671 +1671 @@
     #4 onwards is the elevation_predicted using the alpha, which will
     #be compared later against the real removed data
-    data = array([], typecode=Float)
-
-    data=resize(data, (len(points), 3+len(alphas)))
+    data = num.array([], typecode=num.Float)
+
+    data=num.resize(data, (len(points), 3+len(alphas)))
 
     #gets relative point from sample
@@ -1681 +1681 @@
     data[:,2] = elevation_sample
 
-    normal_cov=array(zeros([len(alphas), 2]), typecode=Float)
+    normal_cov=num.array(num.zeros([len(alphas), 2]), typecode=num.Float)
 
     if verbose: print 'Setup computational domains with different alphas'
@@ -1720 +1720 @@
 
     normal_cov0 = normal_cov[:,0]
-    normal_cov_new = take(normal_cov, argsort(normal_cov0))
+    normal_cov_new = num.take(normal_cov, num.argsort(normal_cov0))
 
     if plot_name is not None:
@@ -1738 +1738 @@
                   % (normal_cov[i][0], normal_cov[i][1])
         print '\n Optimal alpha is: %s ' \
-              % normal_cov_new[(argmin(normal_cov_new, axis=0))[1], 0]
+              % normal_cov_new[(num.argmin(normal_cov_new, axis=0))[1], 0]
 
     # covariance and optimal alpha
     return (min(normal_cov_new[:,1]),
-            normal_cov_new[(argmin(normal_cov_new,axis=0))[1],0])
+            normal_cov_new[(num.argmin(normal_cov_new,axis=0))[1],0])
 
 
@@ -1817 +1817 @@
     from anuga.pmesh.mesh_interface import create_mesh_from_regions
     from anuga.utilities.numerical_tools import cov
-    from Numeric import array, resize,shape,Float,zeros,take,argsort,argmin
     from anuga.utilities.polygon import is_inside_polygon
     from anuga.fit_interpolate.benchmark_least_squares import mem_usage
@@ -1906 +1905 @@
     #4 onwards is the elevation_predicted using the alpha, which will
     #be compared later against the real removed data
-    data = array([], typecode=Float)
-
-    data = resize(data, (len(points), 3+len(alphas)))
+    data = num.array([], typecode=num.Float)
+
+    data = num.resize(data, (len(points), 3+len(alphas)))
 
     #gets relative point from sample
@@ -1916 +1915 @@
     data[:,2] = elevation_sample
 
-    normal_cov = array(zeros([len(alphas), 2]), typecode=Float)
+    normal_cov = num.array(num.zeros([len(alphas), 2]), typecode=num.Float)
 
     if verbose:
@@ -1940 +1939 @@
 
     normal_cov0 = normal_cov[:,0]
-    normal_cov_new = take(normal_cov, argsort(normal_cov0))
+    normal_cov_new = num.take(normal_cov, num.argsort(normal_cov0))
 
     if plot_name is not None:
@@ -1952 +1951 @@
 
     return (min(normal_cov_new[:,1]),
-            normal_cov_new[(argmin(normal_cov_new, axis=0))[1],0])
+            normal_cov_new[(num.argmin(normal_cov_new, axis=0))[1],0])
 
 

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -4 +4 @@
 import unittest
 import os
-from Numeric import zeros, array, allclose, concatenate,sort
 from math import sqrt, pi
 import tempfile
 from sets import ImmutableSet
+
+import Numeric as num
 
 from anuga.geospatial_data.geospatial_data import *
@@ -31 +32 @@
         G = Geospatial_data(points)
 
-        assert allclose(G.data_points, [[1.0, 2.1], [3.0, 5.3]])
+        assert num.allclose(G.data_points, [[1.0, 2.1], [3.0, 5.3]])
 
         # Check __repr__
@@ -42 +43 @@
 
         #Check getter
-        assert allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3]])
+        assert num.allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3]])
         
         #Check defaults
@@ -57 +58 @@
         G = Geospatial_data(points, attributes)       
         assert G.attributes.keys()[0] == DEFAULT_ATTRIBUTE
-        assert allclose(G.attributes.values()[0], [2, 4])
+        assert num.allclose(G.attributes.values()[0], [2, 4])
         
 
@@ -81 +82 @@
 
         P = G.get_data_points(absolute=False)
-        assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
+        assert num.allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
 
         P = G.get_data_points(absolute=True)
-        assert allclose(P, [[101.0, 202.1], [103.0, 205.3]])        
+        assert num.allclose(P, [[101.0, 202.1], [103.0, 205.3]])        
 
         V = G.get_attributes() #Simply get them
-        assert allclose(V, [2, 4])
+        assert num.allclose(V, [2, 4])
 
         V = G.get_attributes(DEFAULT_ATTRIBUTE) #Get by name
-        assert allclose(V, [2, 4])
+        assert num.allclose(V, [2, 4])
 
     def test_get_attributes_2(self):
@@ -105 +106 @@
 
         P = G.get_data_points(absolute=False)
-        assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
+        assert num.allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
         
         V = G.get_attributes() #Get default attribute
-        assert allclose(V, [2, 4])
+        assert num.allclose(V, [2, 4])
 
         V = G.get_attributes('a0') #Get by name
-        assert allclose(V, [0, 0])
+        assert num.allclose(V, [0, 0])
 
         V = G.get_attributes('a1') #Get by name
-        assert allclose(V, [2, 4])
+        assert num.allclose(V, [2, 4])
 
         V = G.get_attributes('a2') #Get by name
-        assert allclose(V, [79.4, -7])
+        assert num.allclose(V, [79.4, -7])
 
         try:
@@ -137 +138 @@
         results = spatial.get_data_points(absolute=False)
         
-        assert allclose(results, points_rel)
+        assert num.allclose(results, points_rel)
         
         x_p = -1770
@@ -146 +147 @@
                   ( geo_reference=geo_ref)
         
-        assert allclose(results, points_rel)
+        assert num.allclose(results, points_rel)
 
   
@@ -165 +166 @@
         #print "test_get_data_points_lat_long - results", results
         #print "points_Lat_long",points_Lat_long 
-        assert allclose(results, points_Lat_long)
+        assert num.allclose(results, points_Lat_long)
       
     def test_get_data_points_lat_longII(self):
@@ -179 +180 @@
         #print "seg_lat_long", seg_lat_long [0][0]
         #print "lat_result",lat_result 
-        assert allclose(seg_lat_long[0][0], lat_result)#lat
-        assert allclose(seg_lat_long[0][1], long_result)#long
+        assert num.allclose(seg_lat_long[0][0], lat_result)#lat
+        assert num.allclose(seg_lat_long[0][1], long_result)#long
 
 
@@ -200 +201 @@
         #print "seg_lat_long", seg_lat_long [0]
         #print "lat_result",lat_result 
-        assert allclose(seg_lat_long[0][0], lat_result)#lat
-        assert allclose(seg_lat_long[0][1], long_result)#long
+        assert num.allclose(seg_lat_long[0][0], lat_result)#lat
+        assert num.allclose(seg_lat_long[0][1], long_result)#long
 
 
@@ -220 +221 @@
         # Create without geo_ref properly set
         G = Geospatial_data(points_rel)        
-        assert not allclose(points_ab, G.get_data_points(absolute=True))
+        assert not num.allclose(points_ab, G.get_data_points(absolute=True))
         
         # Create the way it should be
         G = Geospatial_data(points_rel, geo_reference=geo_ref)
-        assert allclose(points_ab, G.get_data_points(absolute=True))
+        assert num.allclose(points_ab, G.get_data_points(absolute=True))
         
         # Change georeference and check that absolute values are unchanged.
@@ -231 +232 @@
         new_geo_ref = Geo_reference(56, x_p, y_p)
         G.set_geo_reference(new_geo_ref)
-        assert allclose(points_ab, G.get_data_points(absolute=True))
+        assert num.allclose(points_ab, G.get_data_points(absolute=True))
         
 
@@ -254 +255 @@
         assert points_dict.has_key('geo_reference')
 
-        assert allclose( points_dict['pointlist'], points )
+        assert num.allclose( points_dict['pointlist'], points )
 
         A = points_dict['attributelist']
@@ -261 +262 @@
         assert A.has_key('a2')        
 
-        assert allclose( A['a0'], [0, 0] )
-        assert allclose( A['a1'], [2, 4] )        
-        assert allclose( A['a2'], [79.4, -7] )
+        assert num.allclose( A['a0'], [0, 0] )
+        assert num.allclose( A['a1'], [2, 4] )        
+        assert num.allclose( A['a2'], [79.4, -7] )
 
 
@@ -288 +289 @@
 
         P = G.get_data_points(absolute=False)
-        assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
+        assert num.allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
         
         #V = G.get_attribute_values() #Get default attribute
@@ -294 +295 @@
 
         V = G.get_attributes('a0') #Get by name
-        assert allclose(V, [0, 0])
+        assert num.allclose(V, [0, 0])
 
         V = G.get_attributes('a1') #Get by name
-        assert allclose(V, [2, 4])
+        assert num.allclose(V, [2, 4])
 
         V = G.get_attributes('a2') #Get by name
-        assert allclose(V, [79.4, -7])
+        assert num.allclose(V, [79.4, -7])
 
     def test_add(self):
@@ -319 +320 @@
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
-        assert allclose(G.attributes['depth'], [2, 4, 2, 4])
-        assert allclose(G.attributes['elevation'], [6.1, 5, 2.5, 1])
-        assert allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3],
-                                              [1.0, 2.1], [3.0, 5.3]])
-        
+        assert num.allclose(G.attributes['depth'], [2, 4, 2, 4])
+        assert num.allclose(G.attributes['elevation'], [6.1, 5, 2.5, 1])
+        assert num.allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3],
+                                                  [1.0, 2.1], [3.0, 5.3]])
+
     def test_addII(self):
         """ test the addition of two geospatical objects
@@ -343 +344 @@
         assert G.attributes.has_key('depth') 
         assert G.attributes.keys(), ['depth']
-        assert allclose(G.attributes['depth'], [2, 4, 200, 400])
-        assert allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3],
-                                              [5.0, 2.1], [3.0, 50.3]])
+        assert num.allclose(G.attributes['depth'], [2, 4, 200, 400])
+        assert num.allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3],
+                                                  [5.0, 2.1], [3.0, 50.3]])
     def test_add_with_geo (self):
         """
@@ -367 +368 @@
         #Check that absolute values are as expected
         P1 = G1.get_data_points(absolute=True)
-        assert allclose(P1, [[2.0, 4.1], [4.0, 7.3]])
+        assert num.allclose(P1, [[2.0, 4.1], [4.0, 7.3]])
 
         P2 = G2.get_data_points(absolute=True)
-        assert allclose(P2, [[5.1, 9.1], [6.1, 6.3]])        
+        assert num.allclose(P2, [[5.1, 9.1], [6.1, 6.3]])        
         
         G = G1 + G2
 
         # Check absoluteness
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
 
         P = G.get_data_points(absolute=True)
@@ -384 +385 @@
         #assert allclose(P_relative, P - [0.1, 2.0])
 
-        assert allclose(P, concatenate( (P1,P2) ))
-        assert allclose(P, [[2.0, 4.1], [4.0, 7.3],
-                            [5.1, 9.1], [6.1, 6.3]])
+        assert num.allclose(P, num.concatenate( (P1,P2) ))
+        assert num.allclose(P, [[2.0, 4.1], [4.0, 7.3],
+                                [5.1, 9.1], [6.1, 6.3]])
         
 
@@ -396 +397 @@
         Difference in Geo_reference resolved
         """
-        points1 = array([[2.0, 4.1], [4.0, 7.3]])
-        points2 = array([[5.1, 9.1], [6.1, 6.3]])        
+        points1 = num.array([[2.0, 4.1], [4.0, 7.3]])
+        points2 = num.array([[5.1, 9.1], [6.1, 6.3]])        
         attributes1 = [2, 4]
         attributes2 = [5, 76]
@@ -413 +414 @@
         #Check that absolute values are as expected
         P1 = G1.get_data_points(absolute=True)
-        assert allclose(P1, points1)
+        assert num.allclose(P1, points1)
 
         P1 = G1.get_data_points(absolute=False)
-        assert allclose(P1, points1 - [geo_ref1.get_xllcorner(), geo_ref1.get_yllcorner()])        
+        assert num.allclose(P1, points1 - [geo_ref1.get_xllcorner(), geo_ref1.get_yllcorner()])        
 
         P2 = G2.get_data_points(absolute=True)
-        assert allclose(P2, points2)
+        assert num.allclose(P2, points2)
 
         P2 = G2.get_data_points(absolute=False)
-        assert allclose(P2, points2 - [geo_ref2.get_xllcorner(), geo_ref2.get_yllcorner()])                
+        assert num.allclose(P2, points2 - [geo_ref2.get_xllcorner(), geo_ref2.get_yllcorner()])                
         
         G = G1 + G2
@@ -435 +436 @@
         #assert allclose(P_relative, [[1.0, 2.1], [3.0, 5.3], [4.1, 7.1], [5.1, 4.3]])
 
-        assert allclose(P, concatenate( (points1,points2) ))
+        assert num.allclose(P, num.concatenate( (points1,points2) ))
 
 
@@ -442 +443 @@
         """
         
-        points1 = array([[2.0, 4.1], [4.0, 7.3]])
-        points2 = array([[5.1, 9.1], [6.1, 6.3]])        
+        points1 = num.array([[2.0, 4.1], [4.0, 7.3]])
+        points2 = num.array([[5.1, 9.1], [6.1, 6.3]])        
 
         geo_ref1= Geo_reference(55, 1.0, 2.0)
@@ -459 +460 @@
 
         G1 = Geospatial_data(points1, attributes1, geo_ref1)
-        assert allclose(G1.get_geo_reference().get_xllcorner(), 1.0)
-        assert allclose(G1.get_geo_reference().get_yllcorner(), 2.0)
+        assert num.allclose(G1.get_geo_reference().get_xllcorner(), 1.0)
+        assert num.allclose(G1.get_geo_reference().get_yllcorner(), 2.0)
         assert G1.attributes.has_key('depth')
         assert G1.attributes.has_key('elevation')
-        assert allclose(G1.attributes['depth'], [2, 4.7])
-        assert allclose(G1.attributes['elevation'], [6.1, 5])        
+        assert num.allclose(G1.attributes['depth'], [2, 4.7])
+        assert num.allclose(G1.attributes['elevation'], [6.1, 5])        
         
         G2 = Geospatial_data(points2, attributes2, geo_ref2)
-        assert allclose(G2.get_geo_reference().get_xllcorner(), 0.1)
-        assert allclose(G2.get_geo_reference().get_yllcorner(), 3.0)
+        assert num.allclose(G2.get_geo_reference().get_xllcorner(), 0.1)
+        assert num.allclose(G2.get_geo_reference().get_yllcorner(), 3.0)
         assert G2.attributes.has_key('depth')
         assert G2.attributes.has_key('elevation')
-        assert allclose(G2.attributes['depth'], [-2.3, 4])
-        assert allclose(G2.attributes['elevation'], [2.5, 1])        
+        assert num.allclose(G2.attributes['depth'], [-2.3, 4])
+        assert num.allclose(G2.attributes['elevation'], [2.5, 1])        
 
         #Check that absolute values are as expected
         P1 = G1.get_data_points(absolute=True)
-        assert allclose(P1, [[3.0, 6.1], [5.0, 9.3]])
+        assert num.allclose(P1, [[3.0, 6.1], [5.0, 9.3]])
 
         P2 = G2.get_data_points(absolute=True)
-        assert allclose(P2, [[5.2, 12.1], [6.2, 9.3]])        
+        assert num.allclose(P2, [[5.2, 12.1], [6.2, 9.3]])        
 
         # Normal add
@@ -486 +487 @@
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
-        assert allclose(G.attributes['depth'], [2, 4.7])
-        assert allclose(G.attributes['elevation'], [6.1, 5])        
+        assert num.allclose(G.attributes['depth'], [2, 4.7])
+        assert num.allclose(G.attributes['elevation'], [6.1, 5])        
 
         # Points are now absolute.
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
         P = G.get_data_points(absolute=True)        
-        assert allclose(P, [[3.0, 6.1], [5.0, 9.3]])
+        assert num.allclose(P, [[3.0, 6.1], [5.0, 9.3]])
 
 
@@ -499 +500 @@
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
-        assert allclose(G.attributes['depth'], [-2.3, 4])
-        assert allclose(G.attributes['elevation'], [2.5, 1])        
-
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+        assert num.allclose(G.attributes['depth'], [-2.3, 4])
+        assert num.allclose(G.attributes['elevation'], [2.5, 1])        
+
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
         P = G.get_data_points(absolute=True)        
-        assert allclose(P, [[5.2, 12.1], [6.2, 9.3]])
+        assert num.allclose(P, [[5.2, 12.1], [6.2, 9.3]])
         
 
@@ -514 +515 @@
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
-        assert allclose(G.attributes['depth'], [2, 4.7])
-        assert allclose(G.attributes['elevation'], [6.1, 5])        
+        assert num.allclose(G.attributes['depth'], [2, 4.7])
+        assert num.allclose(G.attributes['elevation'], [6.1, 5])        
 
         # Points are now absolute.
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
         P = G.get_data_points(absolute=True)        
-        assert allclose(P, [[3.0, 6.1], [5.0, 9.3]])        
+        assert num.allclose(P, [[3.0, 6.1], [5.0, 9.3]])        
 
 
@@ -527 +528 @@
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
-        assert allclose(G.attributes['depth'], [-2.3, 4])
-        assert allclose(G.attributes['elevation'], [2.5, 1])        
-
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+        assert num.allclose(G.attributes['depth'], [-2.3, 4])
+        assert num.allclose(G.attributes['elevation'], [2.5, 1])        
+
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
         P = G.get_data_points(absolute=True)        
-        assert allclose(P, [[5.2, 12.1], [6.2, 9.3]])
+        assert num.allclose(P, [[5.2, 12.1], [6.2, 9.3]])
 
         
@@ -554 +555 @@
         # First try the unit square    
         U = [[0,0], [1,0], [1,1], [0,1]] 
-        assert allclose(G.clip(U).get_data_points(), [[0.2, 0.5], [0.4, 0.3], [0, 0]])
+        assert num.allclose(G.clip(U).get_data_points(), [[0.2, 0.5], [0.4, 0.3], [0, 0]])
 
         # Then a more complex polygon
@@ -561 +562 @@
         G = Geospatial_data(points)
 
-        assert allclose(G.clip(polygon).get_data_points(),
+        assert num.allclose(G.clip(polygon).get_data_points(),
                         [[0.5, 0.5], [1, -0.5], [1.5, 0]])
 
@@ -577 +578 @@
         attributes = [2, -4, 5, 76, -2, 0.1, 3]
         att_dict = {'att1': attributes,
-                    'att2': array(attributes)+1}
+                    'att2': num.array(attributes)+1}
         
         G = Geospatial_data(points, att_dict)
@@ -583 +584 @@
         # First try the unit square    
         U = [[0,0], [1,0], [1,1], [0,1]] 
-        assert allclose(G.clip(U).get_data_points(), [[0.2, 0.5], [0.4, 0.3], [0, 0]])
-        assert allclose(G.clip(U).get_attributes('att1'), [-4, 76, 0.1])
-        assert allclose(G.clip(U).get_attributes('att2'), [-3, 77, 1.1])                
+        assert num.allclose(G.clip(U).get_data_points(), [[0.2, 0.5], [0.4, 0.3], [0, 0]])
+        assert num.allclose(G.clip(U).get_attributes('att1'), [-4, 76, 0.1])
+        assert num.allclose(G.clip(U).get_attributes('att2'), [-3, 77, 1.1])                
 
         # Then a more complex polygon
@@ -595 +596 @@
         G = Geospatial_data(points, attributes)
 
-        assert allclose(G.clip(polygon).get_data_points(),
+        assert num.allclose(G.clip(polygon).get_data_points(),
                         [[0.5, 0.5], [1, -0.5], [1.5, 0]])
-        assert allclose(G.clip(polygon).get_attributes(), [-4, 5, 76])
+        assert num.allclose(G.clip(polygon).get_attributes(), [-4, 5, 76])
         
 
@@ -613 +614 @@
         attributes = [2, -4, 5, 76, -2, 0.1, 3]
         att_dict = {'att1': attributes,
-                    'att2': array(attributes)+1}
+                    'att2': num.array(attributes)+1}
         G = Geospatial_data(points, att_dict)
         
         # First try the unit square    
         U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
-        assert allclose(G.clip(U).get_data_points(),
+        assert num.allclose(G.clip(U).get_data_points(),
                         [[0.2, 0.5], [0.4, 0.3], [0, 0]])
 
-        assert allclose(G.clip(U).get_attributes('att1'), [-4, 76, 0.1])
-        assert allclose(G.clip(U).get_attributes('att2'), [-3, 77, 1.1])                        
+        assert num.allclose(G.clip(U).get_attributes('att1'), [-4, 76, 0.1])
+        assert num.allclose(G.clip(U).get_attributes('att2'), [-3, 77, 1.1])                        
         
         # Then a more complex polygon
@@ -631 +632 @@
         
 
-        assert allclose(G.clip(polygon).get_data_points(),
-                        [[0.5, 0.5], [1, -0.5], [1.5, 0]])
-        assert allclose(G.clip(polygon).get_attributes(), [-4, 5, 76])
+        assert num.allclose(G.clip(polygon).get_data_points(),
+                            [[0.5, 0.5], [1, -0.5], [1.5, 0]])
+        assert num.allclose(G.clip(polygon).get_attributes(), [-4, 5, 76])
         
 
@@ -651 +652 @@
         # First try the unit square    
         U = [[0,0], [1,0], [1,1], [0,1]]
-        assert allclose(G.clip_outside(U).get_data_points(),
-                        [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
+        assert num.allclose(G.clip_outside(U).get_data_points(),
+                            [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
         #print G.clip_outside(U).get_attributes()
-        assert allclose(G.clip_outside(U).get_attributes(), [2, 5, -2, 3])        
+        assert num.allclose(G.clip_outside(U).get_attributes(), [2, 5, -2, 3])        
         
 
@@ -663 +664 @@
         G = Geospatial_data(points, attributes)
 
-        assert allclose(G.clip_outside(polygon).get_data_points(),
-                        [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
-        assert allclose(G.clip_outside(polygon).get_attributes(), [2, -2, 0.1])                
+        assert num.allclose(G.clip_outside(polygon).get_data_points(),
+                            [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
+        assert num.allclose(G.clip_outside(polygon).get_attributes(), [2, -2, 0.1])                
 
 
@@ -684 +685 @@
         # First try the unit square    
         U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
-        assert allclose(G.clip_outside(U).get_data_points(),
-                        [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
-        assert allclose(G.clip(U).get_attributes(), [-4, 76, 0.1])        
+        assert num.allclose(G.clip_outside(U).get_data_points(),
+                            [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]])
+        assert num.allclose(G.clip(U).get_attributes(), [-4, 76, 0.1])        
 
         # Then a more complex polygon
@@ -696 +697 @@
         
 
-        assert allclose(G.clip_outside(polygon).get_data_points(),
-                        [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
-        assert allclose(G.clip_outside(polygon).get_attributes(), [2, -2, 0.1])
+        assert num.allclose(G.clip_outside(polygon).get_data_points(),
+                            [[0.5, 1.4], [0.5, 1.5], [0.5, -0.5]])
+        assert num.allclose(G.clip_outside(polygon).get_attributes(), [2, -2, 0.1])
         
 
@@ -719 +720 @@
         U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
         G1 = G.clip(U)
-        assert allclose(G1.get_data_points(),[[0.2, 0.5], [0.4, 0.3], [0, 0]])
-        assert allclose(G.clip(U).get_attributes(), [-4, 76, 0.1])
+        assert num.allclose(G1.get_data_points(),[[0.2, 0.5], [0.4, 0.3], [0, 0]])
+        assert num.allclose(G.clip(U).get_attributes(), [-4, 76, 0.1])
         
         G2 = G.clip_outside(U)
-        assert allclose(G2.get_data_points(),[[-1, 4], [1.0, 2.1],
-                                              [3.0, 5.3], [2.4, 3.3]])
-        assert allclose(G.clip_outside(U).get_attributes(), [2, 5, -2, 3])                
+        assert num.allclose(G2.get_data_points(),[[-1, 4], [1.0, 2.1],
+                                                  [3.0, 5.3], [2.4, 3.3]])
+        assert num.allclose(G.clip_outside(U).get_attributes(), [2, 5, -2, 3])                
 
         
@@ -734 +735 @@
         new_attributes = [-4, 76, 0.1, 2, 5, -2, 3]                 
         
-        assert allclose((G1+G2).get_data_points(), new_points)
-        assert allclose((G1+G2).get_attributes(), new_attributes)
+        assert num.allclose((G1+G2).get_data_points(), new_points)
+        assert num.allclose((G1+G2).get_attributes(), new_attributes)
 
         G = G1+G2
@@ -747 +748 @@
 
         # Check result
-        assert allclose(G3.get_data_points(), new_points)        
-        assert allclose(G3.get_attributes(), new_attributes)        
+        assert num.allclose(G3.get_data_points(), new_points)        
+        assert num.allclose(G3.get_attributes(), new_attributes)        
         
         os.remove(FN)
@@ -769 +770 @@
         os.remove(fileName)
 #        print 'data', results.get_data_points()
-        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],
-                                                    [1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0, 10.4])
-        assert allclose(results.get_attributes(attribute_name='speed'),
-                        [0.0, 10.0, 40.0])
+        assert num.allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],
+                                                        [1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_attributes(attribute_name='speed'),
+                            [0.0, 10.0, 40.0])
 
 
@@ -820 +821 @@
 
 
-        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
-        assert allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
+        assert num.allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
 
         # Blocking
@@ -829 +830 @@
             geo_list.append(i)
             
-        assert allclose(geo_list[0].get_data_points(),
-                        [[1.0, 0.0],[0.0, 1.0]])
-
-        assert allclose(geo_list[0].get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0])
-        assert allclose(geo_list[1].get_data_points(),
-                        [[1.0, 0.0]])        
-        assert allclose(geo_list[1].get_attributes(attribute_name='elevation'),
-                        [10.4])
+        assert num.allclose(geo_list[0].get_data_points(),
+                            [[1.0, 0.0],[0.0, 1.0]])
+
+        assert num.allclose(geo_list[0].get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0])
+        assert num.allclose(geo_list[1].get_data_points(),
+                            [[1.0, 0.0]])        
+        assert num.allclose(geo_list[1].get_attributes(attribute_name='elevation'),
+                            [10.4])
            
         os.remove(fileName)         
@@ -980 +981 @@
         results = Geospatial_data(pts_file, max_read_lines=2)
 
-        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],
-                                                    [1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0, 10.4])
-        assert allclose(results.get_attributes(attribute_name='speed'),
-                        [0.0, 10.0, 40.0])
+        assert num.allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],
+                                                        [1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_attributes(attribute_name='speed'),
+                            [0.0, 10.0, 40.0])
 
         # Blocking
@@ -991 +992 @@
         for i in results:
             geo_list.append(i) 
-        assert allclose(geo_list[0].get_data_points(),
-                        [[1.0, 0.0],[0.0, 1.0]])
-        assert allclose(geo_list[0].get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0])
-        assert allclose(geo_list[1].get_data_points(),
-                        [[1.0, 0.0]])        
-        assert allclose(geo_list[1].get_attributes(attribute_name='elevation'),
-                        [10.4])
+        assert num.allclose(geo_list[0].get_data_points(),
+                            [[1.0, 0.0],[0.0, 1.0]])
+        assert num.allclose(geo_list[0].get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0])
+        assert num.allclose(geo_list[1].get_data_points(),
+                            [[1.0, 0.0]])        
+        assert num.allclose(geo_list[1].get_attributes(attribute_name='elevation'),
+                            [10.4])
            
         os.remove(fileName)  
@@ -1069 +1070 @@
         for i in results:
             geo_list.append(i) 
-        assert allclose(geo_list[0].get_data_points(),
-                        [[1.0, 0.0],[0.0, 1.0]])
-        assert allclose(geo_list[0].get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0])
-        assert allclose(geo_list[1].get_data_points(),
-                        [[1.0, 0.0],[0.0, 1.0] ])        
-        assert allclose(geo_list[1].get_attributes(attribute_name='elevation'),
-                        [10.0, 0.0])
+        assert num.allclose(geo_list[0].get_data_points(),
+                            [[1.0, 0.0],[0.0, 1.0]])
+        assert num.allclose(geo_list[0].get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0])
+        assert num.allclose(geo_list[1].get_data_points(),
+                            [[1.0, 0.0],[0.0, 1.0] ])        
+        assert num.allclose(geo_list[1].get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0])
            
         os.remove(fileName)  
@@ -1085 +1086 @@
     def test_new_export_pts_file(self):
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        att_dict['elevation'] = array([10.1, 0.0, 10.4])
-        att_dict['brightness'] = array([10.0, 1.0, 10.4])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = num.array([10.1, 0.0, 10.4])
+        att_dict['brightness'] = num.array([10.0, 1.0, 10.4])
         
         fileName = tempfile.mktemp(".pts")
@@ -1099 +1100 @@
         os.remove(fileName)
         
-        assert allclose(results.get_data_points(),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'), [10.1, 0.0, 10.4])
+        assert num.allclose(results.get_data_points(),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'), [10.1, 0.0, 10.4])
         answer = [10.0, 1.0, 10.4]
-        assert allclose(results.get_attributes(attribute_name='brightness'), answer)
+        assert num.allclose(results.get_attributes(attribute_name='brightness'), answer)
 
     def test_new_export_absolute_pts_file(self):
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        att_dict['elevation'] = array([10.1, 0.0, 10.4])
-        att_dict['brightness'] = array([10.0, 1.0, 10.4])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = num.array([10.1, 0.0, 10.4])
+        att_dict['brightness'] = num.array([10.0, 1.0, 10.4])
         geo_ref = Geo_reference(50, 25, 55)
         
@@ -1121 +1122 @@
         os.remove(fileName)
         
-        assert allclose(results.get_data_points(), G.get_data_points(True))
-        assert allclose(results.get_attributes(attribute_name='elevation'), [10.1, 0.0, 10.4])
+        assert num.allclose(results.get_data_points(), G.get_data_points(True))
+        assert num.allclose(results.get_attributes(attribute_name='elevation'), [10.1, 0.0, 10.4])
         answer = [10.0, 1.0, 10.4]
-        assert allclose(results.get_attributes(attribute_name='brightness'), answer)
+        assert num.allclose(results.get_attributes(attribute_name='brightness'), answer)
 
     def test_loadpts(self):
@@ -1139 +1140 @@
     
         # variable definitions
-        outfile.createVariable('points', Float, ('number_of_points',
-                                                 'number_of_dimensions'))
-        outfile.createVariable('elevation', Float, ('number_of_points',))
+        outfile.createVariable('points', num.Float, ('number_of_points',
+                                                     'number_of_dimensions'))
+        outfile.createVariable('elevation', num.Float, ('number_of_points',))
     
         # Get handles to the variables
@@ -1159 +1160 @@
         os.remove(fileName)
         answer =  [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]]
-        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
         
     def test_writepts(self):
@@ -1166 +1167 @@
         
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        att_dict['elevation'] = array([10.0, 0.0, 10.4])
-        att_dict['brightness'] = array([10.0, 0.0, 10.4])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = num.array([10.0, 0.0, 10.4])
+        att_dict['brightness'] = num.array([10.0, 0.0, 10.4])
         geo_reference=Geo_reference(56,1.9,1.9)
 
@@ -1178 +1179 @@
         os.remove(fileName)
 
-        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
         answer = [10.0, 0.0, 10.4]
-        assert allclose(results.get_attributes('brightness'), answer)
+        assert num.allclose(results.get_attributes('brightness'), answer)
         self.failUnless(geo_reference == geo_reference,
                          'test_writepts failed. Test geo_reference')
@@ -1189 +1190 @@
         
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        att_dict['elevation'] = array([10.0, 0.0, 10.4])
-        att_dict['brightness'] = array([10.0, 0.0, 10.4])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = num.array([10.0, 0.0, 10.4])
+        att_dict['brightness'] = num.array([10.0, 0.0, 10.4])
         geo_reference=Geo_reference(56,0,0)
         # Test txt format
@@ -1200 +1201 @@
         results = Geospatial_data(file_name=fileName)
         os.remove(fileName)
-        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
         answer = [10.0, 0.0, 10.4]
-        assert allclose(results.get_attributes('brightness'), answer)
+        assert num.allclose(results.get_attributes('brightness'), answer)
         
  
@@ -1210 +1211 @@
         
         att_dict = {}
-        pointlist = array([[-21.5,114.5],[-21.6,114.5],[-21.7,114.5]])
-        att_dict['elevation'] = array([10.0, 0.0, 10.4])
-        att_dict['brightness'] = array([10.0, 0.0, 10.4])
+        pointlist = num.array([[-21.5,114.5],[-21.6,114.5],[-21.7,114.5]])
+        att_dict['elevation'] = num.array([10.0, 0.0, 10.4])
+        att_dict['brightness'] = num.array([10.0, 0.0, 10.4])
         # Test txt format
         fileName = tempfile.mktemp(".txt")
@@ -1220 +1221 @@
         results = Geospatial_data(file_name=fileName)
         os.remove(fileName)
-        assert allclose(results.get_data_points(False, as_lat_long=True),
+        assert num.allclose(results.get_data_points(False, as_lat_long=True),
                         pointlist)
-        assert allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
         answer = [10.0, 0.0, 10.4]
-        assert allclose(results.get_attributes('brightness'), answer)
+        assert num.allclose(results.get_attributes('brightness'), answer)
         
     def test_writepts_no_attributes(self):
@@ -1231 +1232 @@
         
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
         geo_reference=Geo_reference(56,1.9,1.9)
 
@@ -1241 +1242 @@
         os.remove(fileName)
 
-        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
         self.failUnless(geo_reference == geo_reference,
                          'test_writepts failed. Test geo_reference')
@@ -1250 +1251 @@
         
         att_dict = {}
-        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        pointlist = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
         geo_reference=Geo_reference(56,0,0)
         # Test format
@@ -1258 +1259 @@
         results = Geospatial_data(file_name=fileName)
         os.remove(fileName)
-        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
 
          
@@ -1296 +1297 @@
     
         # variable definitions
-        outfile.createVariable('points', Float, ('number_of_points',
-                                                 'number_of_dimensions'))
-        outfile.createVariable('elevation', Float, ('number_of_points',))
+        outfile.createVariable('points', num.Float, ('number_of_points',
+                                                     'number_of_dimensions'))
+        outfile.createVariable('elevation', num.Float, ('number_of_points',))
     
         # Get handles to the variables
@@ -1315 +1316 @@
         G = Geospatial_data(file_name = FN)
 
-        assert allclose(G.get_geo_reference().get_xllcorner(), 0.0)
-        assert allclose(G.get_geo_reference().get_yllcorner(), 0.0)
-
-        assert allclose(G.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(G.get_attributes(), [10.0, 0.0, 10.4])
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), 0.0)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), 0.0)
+
+        assert num.allclose(G.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(G.get_attributes(), [10.0, 0.0, 10.4])
         os.remove(FN)
 
@@ -1343 +1344 @@
     
         # variable definitions
-        outfile.createVariable('points', Float, ('number_of_points',
-                                                 'number_of_dimensions'))
-        outfile.createVariable('elevation', Float, ('number_of_points',))
+        outfile.createVariable('points', num.Float, ('number_of_points',
+                                                     'number_of_dimensions'))
+        outfile.createVariable('elevation', num.Float, ('number_of_points',))
     
         # Get handles to the variables
@@ -1362 +1363 @@
         G = Geospatial_data(file_name = FN)
 
-        assert allclose(G.get_geo_reference().get_xllcorner(), xll)
-        assert allclose(G.get_geo_reference().get_yllcorner(), yll)
-
-        assert allclose(G.get_data_points(), [[1.0+xll, 0.0+yll],
-                                              [0.0+xll, 1.0+yll],
-                                              [1.0+xll, 0.0+yll]])
-        
-        assert allclose(G.get_attributes(), [10.0, 0.0, 10.4])
+        assert num.allclose(G.get_geo_reference().get_xllcorner(), xll)
+        assert num.allclose(G.get_geo_reference().get_yllcorner(), yll)
+
+        assert num.allclose(G.get_data_points(), [[1.0+xll, 0.0+yll],
+                                                  [0.0+xll, 1.0+yll],
+                                                  [1.0+xll, 0.0+yll]])
+        
+        assert num.allclose(G.get_attributes(), [10.0, 0.0, 10.4])
         os.remove(FN)
 
@@ -1380 +1381 @@
         # create files
         att_dict1 = {}
-        pointlist1 = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        att_dict1['elevation'] = array([-10.0, 0.0, 10.4])
-        att_dict1['brightness'] = array([10.0, 0.0, 10.4])
+        pointlist1 = num.array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict1['elevation'] = num.array([-10.0, 0.0, 10.4])
+        att_dict1['brightness'] = num.array([10.0, 0.0, 10.4])
         geo_reference1 = Geo_reference(56, 2.0, 1.0)
         
         att_dict2 = {}
-        pointlist2 = array([[2.0, 1.0],[1.0, 2.0],[2.0, 1.0]])
-        att_dict2['elevation'] = array([1.0, 15.0, 1.4])
-        att_dict2['brightness'] = array([14.0, 1.0, -12.4])
+        pointlist2 = num.array([[2.0, 1.0],[1.0, 2.0],[2.0, 1.0]])
+        att_dict2['elevation'] = num.array([1.0, 15.0, 1.4])
+        att_dict2['brightness'] = num.array([14.0, 1.0, -12.4])
         geo_reference2 = Geo_reference(56, 1.0, 2.0) 
 
@@ -1412 +1413 @@
 #        print'res', G.get_data_points()
 #        print'res1', G.get_data_points(False)
-        assert allclose(G.get_data_points(),
-                        [[ 3.0, 1.0], [ 2.0, 2.0],
-                         [ 3.0, 1.0], [ 3.0, 3.0],
-                         [ 2.0, 4.0], [ 3.0, 3.0]])
+        assert num.allclose(G.get_data_points(),
+                            [[ 3.0, 1.0], [ 2.0, 2.0],
+                             [ 3.0, 1.0], [ 3.0, 3.0],
+                             [ 2.0, 4.0], [ 3.0, 3.0]])
                          
-        assert allclose(G.get_attributes(attribute_name='elevation'),
-                        [-10.0, 0.0, 10.4, 1.0, 15.0, 1.4])
+        assert num.allclose(G.get_attributes(attribute_name='elevation'),
+                            [-10.0, 0.0, 10.4, 1.0, 15.0, 1.4])
         
         answer = [10.0, 0.0, 10.4, 14.0, 1.0, -12.4]
-        assert allclose(G.get_attributes(attribute_name='brightness'), answer)
+        assert num.allclose(G.get_attributes(attribute_name='brightness'), answer)
         
         self.failUnless(G.get_geo_reference() == geo_reference1,
@@ -1435 +1436 @@
         new_points = ensure_absolute(points)
         
-        assert allclose(new_points, points)
-
-        points = array([[2.0, 0.0],[1.0, 1.0],
-                         [2.0, 0.0],[2.0, 2.0],
-                         [1.0, 3.0],[2.0, 2.0]])
+        assert num.allclose(new_points, points)
+
+        points = num.array([[2.0, 0.0],[1.0, 1.0],
+                            [2.0, 0.0],[2.0, 2.0],
+                            [1.0, 3.0],[2.0, 2.0]])
         new_points = ensure_absolute(points)
         
-        assert allclose(new_points, points)
-        
-        ab_points = array([[2.0, 0.0],[1.0, 1.0],
-                         [2.0, 0.0],[2.0, 2.0],
-                         [1.0, 3.0],[2.0, 2.0]])
+        assert num.allclose(new_points, points)
+        
+        ab_points = num.array([[2.0, 0.0],[1.0, 1.0],
+                               [2.0, 0.0],[2.0, 2.0],
+                               [1.0, 3.0],[2.0, 2.0]])
         
         mesh_origin = (56, 290000, 618000) #zone, easting, northing
 
-        data_points = zeros((ab_points.shape), Float)
+        data_points = num.zeros((ab_points.shape), num.Float)
         #Shift datapoints according to new origins
         for k in range(len(ab_points)):
@@ -1461 +1462 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
 
         geo = Geo_reference(56,67,-56)
@@ -1471 +1472 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
 
 
@@ -1486 +1487 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
 
 
@@ -1496 +1497 @@
         new_points = ensure_geospatial(points)
         
-        assert allclose(new_points.get_data_points(absolute = True), points)
-
-        points = array([[2.0, 0.0],[1.0, 1.0],
-                         [2.0, 0.0],[2.0, 2.0],
-                         [1.0, 3.0],[2.0, 2.0]])
+        assert num.allclose(new_points.get_data_points(absolute = True), points)
+
+        points = num.array([[2.0, 0.0],[1.0, 1.0],
+                            [2.0, 0.0],[2.0, 2.0],
+                            [1.0, 3.0],[2.0, 2.0]])
         new_points = ensure_geospatial(points)
         
-        assert allclose(new_points.get_data_points(absolute = True), points)
-        
-        ab_points = array([[2.0, 0.0],[1.0, 1.0],
-                         [2.0, 0.0],[2.0, 2.0],
-                         [1.0, 3.0],[2.0, 2.0]])
+        assert num.allclose(new_points.get_data_points(absolute = True), points)
+        
+        ab_points = num.array([[2.0, 0.0],[1.0, 1.0],
+                               [2.0, 0.0],[2.0, 2.0],
+                               [1.0, 3.0],[2.0, 2.0]])
         
         mesh_origin = (56, 290000, 618000) #zone, easting, northing
 
-        data_points = zeros((ab_points.shape), Float)
+        data_points = num.zeros((ab_points.shape), num.Float)
         #Shift datapoints according to new origins
         for k in range(len(ab_points)):
@@ -1523 +1524 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
 
         geo = Geo_reference(56,67,-56)
@@ -1534 +1535 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
 
 
@@ -1550 +1551 @@
         #print "ab_points",ab_points
            
-        assert allclose(new_points, ab_points)
+        assert num.allclose(new_points, ab_points)
         
     def test_isinstance(self):
@@ -1565 +1566 @@
 
         results = Geospatial_data(fileName)
-        assert allclose(results.get_data_points(absolute=True), \
-                        [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'), \
-                        [10.0, 0.0, 10.4])
-        assert allclose(results.get_attributes(attribute_name='speed'), \
-                        [0.0, 10.0, 40.0])
+        assert num.allclose(results.get_data_points(absolute=True),
+                            [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert num.allclose(results.get_attributes(attribute_name='elevation'),
+                            [10.0, 0.0, 10.4])
+        assert num.allclose(results.get_attributes(attribute_name='speed'),
+                            [0.0, 10.0, 40.0])
 
         os.remove(fileName)
@@ -1602 +1603 @@
         points = results.get_data_points()
         
-        assert allclose(points[0][0], 308728.009)
-        assert allclose(points[0][1], 6180432.601)
-        assert allclose(points[1][0],  222908.705)
-        assert allclose(points[1][1], 6233785.284)
+        assert num.allclose(points[0][0], 308728.009)
+        assert num.allclose(points[0][1], 6180432.601)
+        assert num.allclose(points[1][0],  222908.705)
+        assert num.allclose(points[1][1], 6233785.284)
         
       
@@ -1623 +1624 @@
         points = results.get_data_points()
         
-        assert allclose(points[0][0], 308728.009)
-        assert allclose(points[0][1], 6180432.601)
-        assert allclose(points[1][0],  222908.705)
-        assert allclose(points[1][1], 6233785.284)
+        assert num.allclose(points[0][0], 308728.009)
+        assert num.allclose(points[0][1], 6180432.601)
+        assert num.allclose(points[1][0],  222908.705)
+        assert num.allclose(points[1][1], 6233785.284)
 
           
@@ -1663 +1664 @@
         points = gsd.get_data_points(absolute=True)
         
-        assert allclose(points[0][0], 308728.009)
-        assert allclose(points[0][1], 6180432.601)
-        assert allclose(points[1][0],  222908.705)
-        assert allclose(points[1][1], 6233785.284)
+        assert num.allclose(points[0][0], 308728.009)
+        assert num.allclose(points[0][1], 6180432.601)
+        assert num.allclose(points[1][0],  222908.705)
+        assert num.allclose(points[1][1], 6233785.284)
         self.failUnless(gsd.get_geo_reference().get_zone() == 56,
                         'Bad zone error!')
@@ -1716 +1717 @@
         points = gsd.get_data_points(absolute=True)
         
-        assert allclose(points[0][0], 308728.009)
-        assert allclose(points[0][1], 6180432.601)
-        assert allclose(points[1][0],  222908.705)
-        assert allclose(points[1][1], 6233785.284)
+        assert num.allclose(points[0][0], 308728.009)
+        assert num.allclose(points[0][1], 6180432.601)
+        assert num.allclose(points[1][0],  222908.705)
+        assert num.allclose(points[1][1], 6233785.284)
         self.failUnless(gsd.get_geo_reference().get_zone() == 56,
                         'Bad zone error!')
@@ -1771 +1772 @@
         # and it changes from windows to linux
         try:
-            assert allclose(points[1][0], 308728.009)
-            assert allclose(points[1][1], 6180432.601)
-            assert allclose(points[0][0],  222908.705)
-            assert allclose(points[0][1], 6233785.284)
+            assert num.allclose(points[1][0], 308728.009)
+            assert num.allclose(points[1][1], 6180432.601)
+            assert num.allclose(points[0][0],  222908.705)
+            assert num.allclose(points[0][1], 6233785.284)
         except AssertionError:
-            assert allclose(points[0][0], 308728.009)
-            assert allclose(points[0][1], 6180432.601)
-            assert allclose(points[1][0],  222908.705)
-            assert allclose(points[1][1], 6233785.284)
+            assert num.allclose(points[0][0], 308728.009)
+            assert num.allclose(points[0][1], 6180432.601)
+            assert num.allclose(points[1][0],  222908.705)
+            assert num.allclose(points[1][1], 6233785.284)
             
         self.failUnless(gsd.get_geo_reference().get_zone() == 56,
@@ -1786 +1787 @@
         #print "test_lat_long_set points", points
         try:
-            assert allclose(points[0][0], -34)
-            assert allclose(points[0][1], 150)
+            assert num.allclose(points[0][0], -34)
+            assert num.allclose(points[0][1], 150)
         except AssertionError:
-            assert allclose(points[1][0], -34)
-            assert allclose(points[1][1], 150)
+            assert num.allclose(points[1][0], -34)
+            assert num.allclose(points[1][1], 150)
 
     def test_len(self):
@@ -1829 +1830 @@
             G1, G2  = G.split(factor,100) 
             
-            assert allclose(len(G), len(G1)+len(G2))
-            assert allclose(round(len(G)*factor), len(G1))
+            assert num.allclose(len(G), len(G1)+len(G2))
+            assert num.allclose(round(len(G)*factor), len(G1))
     
             P = G1.get_data_points(absolute=False)
-            assert allclose(P, [[5.0,4.0],[4.0,3.0],[4.0,2.0],[3.0,1.0],[2.0,3.0]])
+            assert num.allclose(P, [[5.0,4.0],[4.0,3.0],[4.0,2.0],[3.0,1.0],[2.0,3.0]])
     
             A = G1.get_attributes()
-            assert allclose(A,[24, 18, 17, 11, 8])
+            assert num.allclose(A,[24, 18, 17, 11, 8])
         
     def test_split1(self):
@@ -1857 +1858 @@
             
     #        print 'G1',G1
-            assert allclose(len(G), len(G1)+len(G2))
-            assert allclose(round(len(G)*factor), len(G1))
+            assert num.allclose(len(G), len(G1)+len(G2))
+            assert num.allclose(round(len(G)*factor), len(G1))
     
             P = G1.get_data_points(absolute=False)
-            assert allclose(P, [[982420.,28233.]])
+            assert num.allclose(P, [[982420.,28233.]])