Changeset 997 for inundation/ga/storm_surge/pyvolution/test_least_squares.py

Timestamp:

Mar 3, 2005, 6:40:01 PM (20 years ago)

Author:

ole

Message:

Implemented precropping facility in least squares
Also optimised inside_polygon

File:

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

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -301 +301 @@
         assert allclose(sum(interp.get_A(), axis=1), 1.0)
         
-
-    # this causes a memory error in scipy.sparce       
+    def test_arbitrary_datapoints_some_outside(self):
+        """Try arbitrary datapoints one outside the triangle.
+        That one should be ignored
+        """
+
+        from Numeric import sum
+        
+        a = [0.0, 0.0]
+        b = [0.0, 2.0]
+        c = [2.0,0.0]
+        points = [a, b, c]
+        vertices = [ [1,0,2] ]   #bac
+
+        data = [ [0.2, 1.5], [0.123, 1.768], [1.43, 0.44], [5.0, 7.0]]
+
+
+        interp = Interpolation(points, vertices, data, precrop = True)
+        assert allclose(sum(interp.get_A(), axis=1), 1.0)
+
+        interp = Interpolation(points, vertices, data, precrop = False)
+        assert allclose(sum(interp.get_A(), axis=1), [1,1,1,0])
+        
+        
+
+    # this causes a memory error in scipy.sparse       
     def test_more_triangles(self):
         
@@ -844 +867 @@
                         [ 1.0, 0.0],
                         [ 1.0, 1.0],
+                        [ 15, -17],   #Outside mesh
                         [ 1.0, 2.0],
                         [ 1.0, 3.0],                                          
@@ -851 +875 @@
 
         #Fit surface to mesh
-        interp = Interpolation(points, triangles, data_points1, alpha=0.0)
+        interp = Interpolation(points, triangles, data_points1, alpha=0.0,
+                               precrop = True)
         z = linear_function(data_points1) #Example z-values
         f = interp.fit(z)                 #Fitted values at vertices
@@ -861 +886 @@
                         [ 0.5, 0.5],
                         [ 0.7, 0.7],
+                        [-13, 65],  #Outside
                         [ 1.0, 0.5],
                         [ 2.0, 0.4],
@@ -866 +892 @@
         
 
-        #Build new A matrix based on new points
-        interp.build_interpolation_matrix_A(data_points2)
+
+        #Build new A matrix based on new points (without precrop)
+        interp.build_interpolation_matrix_A(data_points2, precrop = False)
 
         #Interpolate using fitted surface
         z1 = interp.interpolate(f)
+
+        #import Numeric
+        #data_points2 = Numeric.take(data_points2, interp.point_indices)
+
+        #Desired result (OK for points inside)
+
+        answer = linear_function(data_points2)
+        import Numeric
+        z1 = Numeric.take(z1, [0,1,2,4,5,6])
+        answer = Numeric.take(answer, [0,1,2,4,5,6])                
+        assert allclose(z1, answer)
+
+        #Build new A matrix based on new points (with precrop)
+        interp.build_interpolation_matrix_A(data_points2, precrop = True)
+
+        #Interpolate using fitted surface
+        z1 = interp.interpolate(f)
+
+        import Numeric
+        data_points2 = Numeric.take(data_points2, interp.point_indices)
 
         #Desired result
@@ -1112 +1159 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(TestCase,'test')
-
     suite = unittest.makeSuite(TestCase,'test')
+
     #suite = unittest.makeSuite(TestCase,'test_arbitrary_datapoints')
     runner = unittest.TextTestRunner(verbosity=1)