Changeset 7675 for anuga_core/source/anuga/fit_interpolate/test_interpolate.py

Timestamp:

Apr 6, 2010, 8:23:54 PM (14 years ago)

Author:

hudson

Message:

Ticket 113 is complete, and all tests pass.
A centroid list is built by Interpolation_function as it calculates the interpolation matrix, and this is passed out as extra quantities which are output into the gauge.csv file.

File:

• anuga_core/source/anuga/fit_interpolate/test_interpolate.py (modified) (11 diffs)

anuga_core/source/anuga/fit_interpolate/test_interpolate.py

@@ -104 +104 @@
 
         interp = Interpolate(points, vertices)
-        A, _, _ = interp._build_interpolation_matrix_A(data)
+        A, _, _, _ = interp._build_interpolation_matrix_A(data)
         assert num.allclose(A.todense(), [[1./3, 1./3, 1./3]])
 
@@ -285 +285 @@
                       0., 0. , 0., 0., 0., 0.]]
 
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         assert num.allclose(A.todense(), answer)
         
@@ -294 +294 @@
                       0., 0. , 0., 0., 0., 0.]]
         
-        A,_,_ = interp._build_interpolation_matrix_A(data)        
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)        
         assert num.allclose(A.todense(), answer)
 
@@ -305 +305 @@
                       0., 0. , 0., 0., 0., 0.]]
                       
-        A,_,_ = interp._build_interpolation_matrix_A(data)        
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)        
         assert num.allclose(A.todense(), answer)
 
@@ -326 +326 @@
                    [0., 0., 1.]]
                    
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         assert num.allclose(A.todense(), answer)
 
@@ -347 +347 @@
         interp = Interpolate(points, vertices)
 
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         assert num.allclose(A.todense(), answer)
 
@@ -368 +368 @@
         interp = Interpolate(points, vertices)
 
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         assert num.allclose(A.todense(), answer)
 
@@ -387 +387 @@
         #print "interp.get_A()", interp.get_A()
         
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         results = A.todense()
         assert num.allclose(num.sum(results, axis=1), 1.0)
@@ -410 +410 @@
         answer = [third, third, third]
                 
-        A,_,_ = interp._build_interpolation_matrix_A(data, output_centroids=True)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data, output_centroids=True)
         results = A.todense()
         assert num.allclose(results, answer)            
@@ -430 +430 @@
         interp = Interpolate(points, vertices)
         
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         results = A.todense()
         assert num.allclose(num.sum(results, axis=1), [1,1,1,0])
@@ -461 +461 @@
 
 
-        A,_,_ = interp._build_interpolation_matrix_A(data)
+        A,_,_,_ = interp._build_interpolation_matrix_A(data)
         A = A.todense()
         for i in range(A.shape[0]):