Changeset 2573

Timestamp:

Mar 22, 2006, 2:05:01 PM (19 years ago)

Author:

duncan

Message:

bug fixing, adding infinite variable to use with Numeric

Location:

inundation

Files:

• fit_interpolate/benchmark_least_squares.py (modified) (1 diff)
• fit_interpolate/interpolate.py (modified) (3 diffs)
• utilities/numerical_tools.py (modified) (1 diff)

inundation/fit_interpolate/benchmark_least_squares.py

@@ -172 +172 @@
 
         for point in range(num_of_points):
-            points.append([random()*100, random()*100])
+            points.append([random(), random()])
             point_atts.append(10.0)
 

inundation/fit_interpolate/interpolate.py

@@ -30 +30 @@
 from coordinate_transforms.geo_reference import Geo_reference
 from pyvolution.quad import build_quadtree
-from utilities.numerical_tools import ensure_numeric, mean
+from utilities.numerical_tools import ensure_numeric, mean, INF
 from utilities.polygon import inside_polygon
 
@@ -83 +83 @@
         #       The functionality of boundary_polygon is needed for that
 
-        #FIXME - geo ref does not have to go into mesh.
-        # Change the point co-ords to conform to the
-        # mesh co-ords early in the code
-
         #FIXME: geo_ref can also be a geo_ref object
         #FIXME: move this to interpolate_block
+
+        #Note: not so keen to use geospacial to represent the mesh,
+        # since the data structure is
+        # points, geo-ref and triangles, rather than just points and geo-ref
+        # this info will usually be coming from a domain instance.
         if mesh_origin is None:
             geo = None
@@ -97 +98 @@
         
         self.mesh.check_integrity()
-
         self.root = build_quadtree(self.mesh,
                               max_points_per_cell = max_vertices_per_cell)
+        #print "self.root",self.root.show() 
         
         

inundation/utilities/numerical_tools.py

@@ -12 +12 @@
     print 'Could not find scipy - using Numeric'
     from Numeric import ArrayType, array, sum, innerproduct, ravel, sqrt, searchsorted, sort, concatenate    
-    
+
+# Getting an infinate number to use when using Numeric
+INF = (array([1])/0.)[0]
 
 def angle(v):