Changeset 5945 for anuga_core/source_numpy_conversion/anuga/geospatial_data

Timestamp:

Nov 12, 2008, 11:50:44 AM (16 years ago)

Author:

rwilson

Message:

More NumPy? changes.

Location:

anuga_core/source_numpy_conversion/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (11 diffs)
• test_geospatial_data.py (modified) (4 diffs)

anuga_core/source_numpy_conversion/anuga/geospatial_data/geospatial_data.py

@@ -14 +14 @@
 
 
-from Scientific.IO.NetCDF import NetCDFFile    
+from Scientific.IO.NetCDF import NetCDFFile
+from anuga.config import Float
 from anuga.coordinate_transforms.lat_long_UTM_conversion import UTMtoLL    
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -632 +633 @@
 #        print 'hello from get_sample'
         points = self.get_data_points()
-        sampled_points = take(points, indices)
+        sampled_points = numpy.take(points, indices)        ##FIX?
 
         attributes = self.get_all_attributes()
@@ -639 +640 @@
         if attributes is not None:
             for key, att in attributes.items():
-                sampled_attributes[key] = numpy.take(att, indices)
+                sampled_attributes[key] = numpy.take(att, indices)      ##FIX?
 
 #        print 'goodbye from get_sample'
@@ -689 +690 @@
         # plus recalcule seed when no seed provided.
         if seed_num != None:
-            numpy.random.seed(seed_num,seed_num)
+            numpy.random.seed(seed_num)
         else:
             numpy.random.seed()
@@ -695 +696 @@
         
         #print 'size',self_size, new_size
-        random_num = numpy.randint(0,self_size-1,(int(new_size),))
+        random_num = numpy.random.randint(0,self_size-1,(int(new_size),))
         #print 'random num',random_num
         random_num = random_num.tolist()
@@ -1182 +1183 @@
     
     # Variable definition
-    outfile.createVariable('points', numpy.float, ('number_of_points',
+    outfile.createVariable('points', Float, ('number_of_points',
                                              'number_of_dimensions'))
 
@@ -1190 +1191 @@
     if write_attributes is not None:
         for key in write_attributes.keys():
-            outfile.createVariable(key, numpy.float, ('number_of_points',))
+            outfile.createVariable(key, Float, ('number_of_points',))
             outfile.variables[key][:] = write_attributes[key] #.astype(Float32)
         
@@ -1472 +1473 @@
     
     from anuga.utilities.numerical_tools import cov
-##    from numpy.oldnumeric 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 
@@ -1585 +1585 @@
 
     normal_cov0=normal_cov[:,0]
-    normal_cov_new=numpy.take(normal_cov,numpy.argsort(normal_cov0))
+    normal_cov_new=numpy.take(normal_cov,numpy.argsort(normal_cov0))        ##FIX?
 
     if plot_name is not None:
@@ -1664 +1664 @@
     
     from anuga.utilities.numerical_tools import cov
-##    from numpy.oldnumeric 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 
@@ -1792 +1791 @@
 
     normal_cov0=normal_cov[:,0]
-    normal_cov_new=numpy.take(normal_cov,numpy.argsort(normal_cov0))
+    normal_cov_new=numpy.take(normal_cov,numpy.argsort(normal_cov0))        ##FIX?
 
     if plot_name is not None:

anuga_core/source_numpy_conversion/anuga/geospatial_data/test_geospatial_data.py

@@ -10 +10 @@
 from sets import ImmutableSet
 
+from anuga.config import Float
 from anuga.geospatial_data.geospatial_data import *
 from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
@@ -1450 +1451 @@
         mesh_origin = (56, 290000, 618000) #zone, easting, northing
 
-        data_points = numpy.zeros((ab_points.shape), Float)
+        data_points = numpy.zeros((ab_points.shape), numpy.float)
         #Shift datapoints according to new origins
         for k in range(len(ab_points)):
@@ -1511 +1512 @@
         mesh_origin = (56, 290000, 618000) #zone, easting, northing
 
-        data_points = numpy.zeros((ab_points.shape), Float)
+        data_points = numpy.zeros((ab_points.shape), numpy.float)
         #Shift datapoints according to new origins
         for k in range(len(ab_points)):
@@ -1844 +1845 @@
 
 ##            from numpy.oldnumeric.random_array import randint,seed
-            numpy.random.seed(100,100)
+            numpy.random.seed(100)
             a_points = numpy.random.randint(0,999999,(10,2))
             points = a_points.tolist()