Changeset 2787

Timestamp:

May 1, 2006, 4:01:21 PM (18 years ago)

Author:

duncan

Message:

added ability to pass geospatial instances into interpolate_block

Location:

inundation/fit_interpolate

Files:

• interpolate.py (modified) (2 diffs)
• test_interpolate.py (modified) (1 diff)

inundation/fit_interpolate/interpolate.py

@@ -10 +10 @@
 - if there are no global vars functions can be moved around alot easier
 
-* What will be the public interface to this class?
-
-TO DO
-* geo-ref (in interpolate_block)
+* The public interface
+__init__
+interpolate
+interpolate_block
+
 """
 
@@ -199 +200 @@
         See interpolate for doc info.
         """
+        if isinstance(point_coordinates,Geospatial_data):
+            point_coordinates = point_coordinates.get_data_points( \
+                absolute = True)
         if point_coordinates is not None:
             self._A =self._build_interpolation_matrix_A(point_coordinates,

inundation/fit_interpolate/test_interpolate.py

@@ -598 +598 @@
             assert allclose(z, answer)
 
+    def test_interpolate_geo_spatial(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_absolute = [[-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],
+                        [3.0, 1.0]]
+
+        geo = Geo_reference(57,100, 500)
+        point_coords = geo.change_points_geo_ref(point_coords_absolute)
+        point_coords = Geospatial_data(point_coords,geo_reference = geo)
+        
+        interp = Interpolate(vertices, triangles)
+        f = array([linear_function(vertices),2*linear_function(vertices) ])
+        f = transpose(f)
+        #print "f",f
+        for blocking_max in range(14):
+        #if True:
+         #   blocking_max = 5
+            z = interp.interpolate(f, point_coords,
+                                   start_blocking_len=blocking_max)
+            answer = [linear_function(point_coords.get_data_points( \
+                      absolute = True)),
+                      2*linear_function(point_coords.get_data_points( \
+                      absolute = True)) ]
+            answer = transpose(answer)
+            #print "z",z
+            #print "answer",answer
+            assert allclose(z, answer)
+            
+        f = array([linear_function(vertices),2*linear_function(vertices),
+                   2*linear_function(vertices) - 100  ])
+        f = transpose(f)
+        #print "f",f
+        for blocking_max in range(14):
+        #if True:
+         #   blocking_max = 5
+            z = interp.interpolate(f, point_coords,
+                                   start_blocking_len=blocking_max)
+            answer = array([linear_function(point_coords.get_data_points( \
+                      absolute = True)),
+                      2*linear_function(point_coords.get_data_points( \
+                      absolute = True)) ,
+                      2*linear_function(point_coords.get_data_points( \
+                      absolute = True))-100 ])
+            z = transpose(z)
+            #print "z",z
+            #print "answer",answer
+            assert allclose(z, answer)
+
+    def test_interpolate_geo_spatial(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_absolute = [[-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],
+                        [3.0, 1.0]]
+
+        geo = Geo_reference(57,100, 500)
+        point_coords = geo.change_points_geo_ref(point_coords_absolute)
+        point_coords = Geospatial_data(point_coords,geo_reference = geo)
+        
+        interp = Interpolate(vertices, triangles)
+        f = array([linear_function(vertices),2*linear_function(vertices) ])
+        f = transpose(f)
+        #print "f",f
+        z = interp.interpolate_block(f, point_coords)
+        answer = [linear_function(point_coords.get_data_points( \
+                      absolute = True)),
+                  2*linear_function(point_coords.get_data_points( \
+                      absolute = True)) ]
+        answer = transpose(answer)
+        #print "z",z
+        #print "answer",answer
+        assert allclose(z, answer)
+            
     def test_interpolate_reuse(self):
         a = [-1.0, 0.0]