Changeset 2802

Timestamp:

May 5, 2006, 11:12:41 AM (19 years ago)

Author:

duncan

Message:

adding the fit class

Location:

inundation/fit_interpolate

Files:

• fit.py (added)
• general_fit_interpolate.py (added)
• interpolate.py (modified) (2 diffs)
• test_fit.py (added)

inundation/fit_interpolate/interpolate.py

@@ -33 +33 @@
 from utilities.polygon import in_and_outside_polygon
 from geospatial_data.geospatial_data import Geospatial_data
-from search_functions import search_tree_of_vertices
-
-
-
-class Interpolate:
-    
+from fit_interpolate.search_functions import search_tree_of_vertices
+from fit_interpolate.general_fit_interpolate import FitInterpolate
+
+
+
+class Interpolate (FitInterpolate):
+        
     def __init__(self,
                  vertex_coordinates,
@@ -77 +78 @@
         self._point_coordinates = None
         
-        #Convert input to Numeric arrays
-        triangles = ensure_numeric(triangles, Int)
-        
-        if isinstance(vertex_coordinates,Geospatial_data):
-            vertex_coordinates = vertex_coordinates.get_data_points( \
-                absolute = True)
-            msg = "Use a Geospatial_data object or a mesh origin. Not both."
-            assert mesh_origin == None, msg
-            
-        else:
-            vertex_coordinates = ensure_numeric(vertex_coordinates, Float)
-        #Build underlying mesh
-        if verbose: print 'Building mesh'
-        #self.mesh = General_mesh(vertex_coordinates, triangles,
-        #FIXME: Trying the normal mesh while testing precrop,
-        #       The functionality of boundary_polygon is needed for that
-        
-        if mesh_origin is None:
-            geo = None #Geo_reference()
-        else:
-            if isinstance(mesh_origin, Geo_reference):
-                geo = mesh_origin
-            else:
-                geo = Geo_reference(mesh_origin[0],
-                                    mesh_origin[1],
-                                    mesh_origin[2])
-            vertex_coordinates = geo.get_absolute(vertex_coordinates)
-        #Don't pass geo_reference to mesh.  It doesn't work.
-        self.mesh = Mesh(vertex_coordinates, triangles)
-        self.mesh.check_integrity()
-        self.root = build_quadtree(self.mesh,
-                              max_points_per_cell = max_vertices_per_cell)
-        #print "self.root",self.root.show() 
-        
-        
+        FitInterpolate.__init__(self,
+                 vertex_coordinates,
+                 triangles,
+                 mesh_origin,
+                 verbose,
+                 max_vertices_per_cell)
 
      # FIXME: What is a good start_blocking_len value?