Changeset 2577

Timestamp:

Mar 22, 2006, 5:28:24 PM (17 years ago)

Author:

duncan

Message:

changing interpolate to use geospatial_data objects

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (3 diffs)
• test_interpolate.py (modified) (2 diffs)

inundation/fit_interpolate/interpolate.py

@@ -32 +32 @@
 from utilities.numerical_tools import ensure_numeric, mean, INF
 from utilities.polygon import inside_polygon
+from geospatial_data.geospatial_data import Geospatial_data
 
 from search_functions import search_tree_of_vertices
@@ -188 +189 @@
           point_coordinates: Interpolate mesh data to these positions.
               List of coordinate pairs [x, y] of
-              data points (or an nx2 Numeric array)
+              data points or an nx2 Numeric array or a Geospatial_data object
+              
               If point_coordinates is absent, the points inputted last time
               this method was called are used, if possible.
@@ -198 +200 @@
         """
         #print "point_coordinates interpolate.interpolate",point_coordinates 
-        # Can I interpolate, based on previous point_coordinates? 
+        # Can I interpolate, based on previous point_coordinates?
+        if isinstance(point_coordinates,Geospatial_data):
+            point_coordinates = point_coordinates.get_data_points( \
+                absolute = True)
+        
         if point_coordinates is None:
             if self._A_can_be_reused is True and \

inundation/fit_interpolate/test_interpolate.py

@@ -22 +22 @@
 from utilities.numerical_tools import mean
 from data_manager import get_dataobject
+from geospatial_data.geospatial_data import Geospatial_data
 
 def distance(x, y):
@@ -792 +793 @@
             raise 'Should raise exception'
 
-        
-    def BADtest_interpolate_sww(self):
-        """Not a unit test, rather a system test for interpolate_sww
-        This function is obsolete
-        """
-        
-        self.domain.filename = 'datatest' + str(time.time())
-        self.domain.format = 'sww'
-        self.domain.smooth = True
-        self.domain.reduction = mean
-
-        sww = get_dataobject(self.domain)
-        sww.store_connectivity()
-        sww.store_timestep('stage')
-        self.domain.time = 2.
-        sww.store_timestep('stage')
-
-        #print "self.domain.filename",self.domain.filename
-        interp = interpolate_sww(sww.filename, [0.0, 2.0],
-                                 [[0,1],[0.5,0.5]],
-                                 ['stage'])
-        #assert allclose(interp,[0.0,2.0])
-
-        #Cleanup
-        os.remove(sww.filename)
+
+    def qtest_interpolation_interface(self):
+        a = [-1.0, 0.0]
+        b = [3.0, 4.0]
+        c = [4.0, 1.0]
+        d = [-3.0, 2.0] #3
+        e = [-1.0, -2.0]
+        f = [1.0, -2.0] #5
+
+        vertices = [a, b, c, d,e,f]
+        triangles = [[0,1,3], [1,0,2], [0,4,5], [0,5,2]] #abd bac aef afc
+
+        point_coords = [[-2.0, 2.0],
+                        [-1.0, 1.0],
+                        [0.0, 2.0],
+                        [1.0, 1.0],
+                        [2.0, 1.0],
+                        [0.0, 0.0],
+                        [1.0, 0.0],
+                        [0.0, -1.0],
+                        [-0.2, -0.5],
+                        [-0.9, -1.5],
+                        [0.5, -1.9],
+                        [999999, 9999999]]
+        geo_data = Geospatial_data(data_points = point_coords)
+
+        interp = Interpolate(vertices, triangles)
+        f = array([linear_function(vertices),2*linear_function(vertices) ])
+        f = transpose(f)
+        #print "f",f
+        z = interp.interpolate(f, geo_data)
+        #z = interp.interpolate(f, point_coords)
+        answer = [linear_function(point_coords),
+                  2*linear_function(point_coords) ]
+        answer = transpose(answer)
+        #print "z",z
+        #print "answer",answer
+        assert allclose(z, answer)
+
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Interpolate,'test')
+    suite = unittest.makeSuite(Test_Interpolate,'qtest')
     runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)