Changeset 2666 for inundation/pyvolution/test_least_squares.py

Timestamp:

Apr 6, 2006, 11:07:20 AM (19 years ago)

Author:

ole

Message:

Introduced acceptable_overhoot limit in least_squares and tested it

File:

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

inundation/pyvolution/test_least_squares.py

@@ -1856 +1856 @@
         #Fit surface to mesh
         z = linear_function(data_points1) #Example z-values
-        v = fit_to_mesh(points, triangles, data_points1, z, alpha=0.0, 
-                        precrop=True, verbose=False)
+        v = fit_to_mesh(points, triangles, data_points1, z, alpha=0.0,
+                        precrop=True, verbose=False)
+
         assert allclose(linear_function(points), v)
+
+
+        
+    def test_acceptable_overshoot(self):
+        """Fit a surface to one set of points. Then interpolate that surface
+        using another set of points.
+        Check that exceedance in fitted values are caught.
+        """
+        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],
+                        [ 15, -17],   #Outside mesh
+                        [ 1.0, 2.0],
+                        [ 1.0, 3.0],
+                        [ 2.0, 1.0],
+                        [ 3.0, 0.0],
+                        [ 3.0, 1.0]]
+
+        #Fit surface to mesh
+        z = linear_function(data_points1) #Example z-values
+
+        try:
+            v = fit_to_mesh(points, triangles, data_points1, z, alpha=0.0,
+                            acceptable_overshoot = 0.2,
+                            precrop=True, verbose=False)
+        except FittingError, e:
+            pass
+        else:
+            raise 'Should have raised exception'
+            
+
+        #assert allclose(linear_function(points), v)
+        
 
         
@@ -1864 +1919 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Least_Squares,'test_smooth_attributes_to_mesh_function')
-    suite = unittest.makeSuite(Test_Least_Squares,'test_fit_using_fit_to_mesh')
+    suite = unittest.makeSuite(Test_Least_Squares,'test')
 
     #suite = unittest.makeSuite(Test_Least_Squares,'test_fit_to_msh_netcdf_fileII')