Changeset 7715

Timestamp:

May 11, 2010, 1:28:44 PM (15 years ago)

Author:

hudson

Message:

New MeshQuadtree? module, removed unneeded arguments from search.

Location:

anuga_core/source/anuga/fit_interpolate

Files:

• fit.py (modified) (1 diff)
• general_fit_interpolate.py (modified) (1 diff)
• interpolate.py (modified) (1 diff)
• mesh_quadtree.py (moved) (moved from anuga_core/source/anuga/fit_interpolate/search_functions.py)
• test_meshquad.py (modified) (4 diffs)
• test_search_functions.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -35 +35 @@
 from anuga.utilities.sparse import Sparse, Sparse_CSR
 from anuga.geometry.polygon import inside_polygon, is_inside_polygon
-from anuga.fit_interpolate.search_functions import search_tree_of_vertices
+from anuga.fit_interpolate.mesh_quadtree import search_tree_of_vertices
 
 from anuga.utilities.cg_solve import conjugate_gradient

anuga_core/source/anuga/fit_interpolate/general_fit_interpolate.py

@@ -31 +31 @@
 from anuga.geospatial_data.geospatial_data import Geospatial_data, \
      ensure_absolute
-from anuga.fit_interpolate.search_functions import set_last_triangle, MeshQuadtree
+from anuga.fit_interpolate.mesh_quadtree import set_last_triangle, MeshQuadtree
 import anuga.utilities.log as log
 

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -33 +33 @@
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.geospatial_data.geospatial_data import ensure_absolute
-from anuga.fit_interpolate.search_functions import search_tree_of_vertices
+from anuga.fit_interpolate.mesh_quadtree import search_tree_of_vertices
 from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
 from anuga.abstract_2d_finite_volumes.file_function import file_function

anuga_core/source/anuga/fit_interpolate/test_meshquad.py

@@ -4 +4 @@
 from anuga.geometry.aabb import AABB
 from anuga.geometry.quad import Cell
-from anuga.fit_interpolate.search_functions import MeshQuadtree
+from anuga.fit_interpolate.mesh_quadtree import MeshQuadtree
 from anuga.abstract_2d_finite_volumes.general_mesh import General_mesh as Mesh
 
@@ -43 +43 @@
 
         # test a point that falls within a triangle
-        result = Q.search(10, 10)
+        result = Q.search([10, 10])
         assert type(result) in [types.ListType,types.TupleType],\
                             'should be a list'
@@ -136 +136 @@
 
         Q = MeshQuadtree(mesh)
-        results = Q.search(4.5, 3)
+        results = Q.search([4.5, 3])
         assert len(results) == 1
         idx, _ = results[0]
         self.assertEqual(idx, 2)
-        results = Q.search(5,4.)
+        results = Q.search([5,4.])
         self.assertEqual(len(results),1)
         idx, _ = results[0]
@@ -162 +162 @@
 
         Q = MeshQuadtree(mesh)
-        results = Q.search(4.5, 3)
+        results = Q.search([4.5, 3])
         assert len(results) == 1
         self.assertEqual(results[0], 2)
-        results = Q.search(5,4.)
+        results = Q.search([5,4.])
         self.assertEqual(len(results),1)
         self.assertEqual(results[0], 2)     

anuga_core/source/anuga/fit_interpolate/test_search_functions.py

@@ -3 +3 @@
 
 import unittest
-from search_functions import search_tree_of_vertices, set_last_triangle
-from search_functions import _search_triangles_of_vertices
-from search_functions import _trilist_from_data
-from search_functions import compute_interpolation_values, MeshQuadtree
+from mesh_quadtree import search_tree_of_vertices, set_last_triangle
+from mesh_quadtree import _search_triangles_of_vertices
+from mesh_quadtree import _trilist_from_data
+from mesh_quadtree import compute_interpolation_values, MeshQuadtree
 
 from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
@@ -156 +156 @@
         x = ensure_numeric([0.5, 0.5])
 
-        triangles = _trilist_from_data(mesh, root.search(x[0], x[1]))
+        triangles = _trilist_from_data(mesh, root.search(x))
     
         found, sigma0, sigma1, sigma2, k = \
@@ -175 +175 @@
                   [10, 3]]:
                 
-            triangles = _trilist_from_data(mesh, root.search(x[0], x[1]))
+            triangles = _trilist_from_data(mesh, root.search(x))
 
             #print x, candidate_vertices