Changeset 1941

Timestamp:

Oct 17, 2005, 11:25:38 AM (18 years ago)

Author:

duncan

Message:

adding diagnostic info

File:

• inundation/pyvolution/least_squares.py (modified) (10 diffs)

inundation/pyvolution/least_squares.py

@@ -23 +23 @@
 #from general_mesh import General_mesh
 from Numeric import zeros, array, Float, Int, dot, transpose, concatenate, ArrayType
-from mesh import Mesh
+from pyvolution.mesh import Mesh
 
 from Numeric import zeros, take, array, Float, Int, dot, transpose, concatenate, ArrayType
-from sparse import Sparse, Sparse_CSR
-from cg_solve import conjugate_gradient, VectorShapeError
+from pyvolution.sparse import Sparse, Sparse_CSR
+from pyvolution.cg_solve import conjugate_gradient, VectorShapeError
 
 from coordinate_transforms.geo_reference import Geo_reference
@@ -314 +314 @@
 
         """
-        from util import ensure_numeric
+        from pyvolution.util import ensure_numeric
 
         #Convert input to Numeric arrays
@@ -433 +433 @@
         #Maybe we need some sort of blocking
 
-        from quad import build_quadtree
+        from pyvolution.quad import build_quadtree
         from utilities.numerical_tools import ensure_numeric
         from utilities.polygon import inside_polygon
@@ -531 +531 @@
         root = build_quadtree(self.mesh,
                               max_points_per_cell = max_points_per_cell)
-
+        #root.show()
+        self.expanded_quad_searches = []
         #Compute matrix elements
         for i in range(n):
@@ -545 +546 @@
             element_found, sigma0, sigma1, sigma2, k = \
                 self.search_triangles_of_vertices(candidate_vertices, x)
+            first_expansion = True
             while not element_found and is_more_elements and expand_search:
-                #if verbose: print 'Expanding search'
+                if verbose: print 'Expanding search'
+                if first_expansion = True:
+                    expanded_quad_searches.append(1)
+                else:
+                    end = len(expanded_quad_searches) - 1
+                    assert end >= 0
+                    expanded_quad_searches[end] += 1
+                    print "expanded_quad_searches",expanded_quad_searches
+                self.expanded_quad_searches += 1
                 candidate_vertices, branch = root.expand_search()
                 if branch == []:
@@ -558 +568 @@
                       self.search_triangles_of_vertices(candidate_vertices, x)
 
-
+                
             #Update interpolation matrix A if necessary
             if element_found is True:
@@ -592 +602 @@
             sigma1 = -10.0
             k = -10.0
-
+            #print "*$* candidate_vertices", candidate_vertices
             #For all vertices in same cell as point x
             for v in candidate_vertices:
@@ -827 +837 @@
 
         #Convert input to Numeric arrays
-        from util import ensure_numeric
+        from pyvolution.util import ensure_numeric
         z = ensure_numeric(z, Float)
 
@@ -928 +938 @@
                             The arrays must either have dimensions pxm or mx1.
                             The resulting function will be time dependent in
-                            the former case while it will be constant with
+                            the former case while it will be constan with
                             respect to time in the latter case.
         
@@ -950 +960 @@
     """
 
-
-    #FIXME: Pending use case, Implement arbitrary expressions as with
-    #set_quantity and sww2dem using the underlying functionality for
-    #doing that.
+    
     
     def __init__(self,