Changeset 642

Timestamp:

Nov 30, 2004, 3:28:49 PM (20 years ago)

Author:

ole

Message:

Added test

File:

• inundation/ga/storm_surge/pyvolution/test_least_squares.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -622 +622 @@
         z1 = interp.interpolate(f)
         assert allclose(z, z1)
+
+
+
+    def test_fit_and_interpolation_with_new_points(self):
+        """Fit a surface to one set of points. Then interpolate that surface
+        using another set of points.
+        """
+        from mesh import Mesh
+
+
+        #Setup mesh used to represent fitted function
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0, 0.0]
+        d = [0.0, 4.0]
+        e = [2.0, 2.0]
+        f = [4.0, 0.0]
+
+        points = [a, b, c, d, e, f]
+        #bac, bce, ecf, dbe, daf, dae 
+        triangles = [[1,0,2], [1,2,4], [4,2,5], [3,1,4]]
+
+        #Datapoints to fit from
+        data_points1 = [[ 0.66666667, 0.66666667],
+                        [ 1.33333333, 1.33333333],
+                        [ 2.66666667, 0.66666667],
+                        [ 0.66666667, 2.66666667],
+                        [ 0.0, 1.0],
+                        [ 0.0, 3.0],
+                        [ 1.0, 0.0],
+                        [ 1.0, 1.0],
+                        [ 1.0, 2.0],
+                        [ 1.0, 3.0],                                          
+                        [ 2.0, 1.0],
+                        [ 3.0, 0.0],
+                        [ 3.0, 1.0]]
+
+        #Fit surface to mesh
+        interp = Interpolation(points, triangles, data_points1, alpha=0.0)
+        z = linear_function(data_points1) #Example z-values
+        f = interp.fit(z)                 #Fitted values at vertices
+
+
+
+        #New datapoints where interpolated values are sought
+        data_points2 = [[ 0.0, 0.0],
+                        [ 0.5, 0.5],
+                        [ 0.7, 0.7],
+                        [ 1.0, 0.5],
+                        [ 2.0, 0.4],
+                        [ 2.8, 1.2]]                                          
+        
+
+        #Build new A matrix based on new points
+        interp.build_interpolation_matrix_A(data_points2)
+
+        #Interpolate using fitted surface
+        z1 = interp.interpolate(f)
+
+        #Desired result
+        answer = linear_function(data_points2)
+        assert allclose(z1, answer)
+
+
+
 
     def test_fit_to_mesh_file(self):
@@ -726 +791 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
+    #suite = unittest.makeSuite(TestCase,'test')
+
     suite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner(verbosity=1)