Changeset 7720

Timestamp:

May 12, 2010, 10:13:37 AM (13 years ago)

Author:

hudson

Message:

Fixed failing unit tests.

Location:

anuga_core/source/anuga

Files:

• fit_interpolate/test_search_functions.py (modified) (1 diff)
• geometry/quad.py (modified) (1 diff)
• geometry/test_geometry.py (modified) (1 diff)
• geometry/test_meshquad.py (modified) (2 diffs)

anuga_core/source/anuga/fit_interpolate/test_search_functions.py

@@ -152 +152 @@
         x = ensure_numeric([0.5, 0.5])
 
-        triangles = root._trilist_from_data(root.search(x))
-    
         found, sigma0, sigma1, sigma2, k = \
-               root._search_triangles_of_vertices(triangles, x)
+               root._search_triangles_of_vertices(root.search(x), x)
 
         if k >= 0:

anuga_core/source/anuga/geometry/quad.py

@@ -84 +84 @@
             
             # option 1 - try splitting 4 ways
-            subregion11, subregion12 = subregion1.split()                                
-            subregion21, subregion22 = subregion2.split()
-            regions = [subregion11, subregion12, subregion21, subregion22]
-            for region in regions:
-                if region.is_trivial_in(new_region):
-                    self.children = [Cell(x, parent=self) for x in regions]
-                    self._insert(new_leaf)
-                    return               
+            #subregion11, subregion12 = subregion1.split()                                
+            #subregion21, subregion22 = subregion2.split()
+            #regions = [subregion11, subregion12, subregion21, subregion22]
+            #for region in regions:
+                #if region.is_trivial_in(new_region):
+                    #self.children = [Cell(x, parent=self) for x in regions]
+                    #self._insert(new_leaf)
+                    #return               
 
             # option 2 - try splitting 2 ways
-            #if subregion1.is_trivial_in(new_region):
-                #self.children = [Cell(subregion1, self), Cell(subregion2, self)]    
-                #self.children[0]._insert(new_leaf)
-                #return
-            #elif subregion2.is_trivial_in(new_region):
-                #self.children = [Cell(subregion1, self), Cell(subregion2, self)]    
-                #self.children[1]._insert(new_leaf)
-                #return                
+            if subregion1.is_trivial_in(new_region):
+                self.children = [Cell(subregion1, self), Cell(subregion2, self)]    
+                self.children[0]._insert(new_leaf)
+                return
+            elif subregion2.is_trivial_in(new_region):
+                self.children = [Cell(subregion1, self), Cell(subregion2, self)]    
+                self.children[1]._insert(new_leaf)
+                return                
     
         # recursion ended without finding a fit, so attach it as a leaf

anuga_core/source/anuga/geometry/test_geometry.py

@@ -86 +86 @@
         cell = Cell(AABB(0,10, 0,5), None)
         cell.insert([(AABB(1,3, 1, 3), 111), (AABB(8,9, 1, 2), 222)])
+
         assert len(cell.children) == 2
         assert cell.parent == None

anuga_core/source/anuga/geometry/test_meshquad.py

@@ -46 +46 @@
         assert type(result) in [types.ListType,types.TupleType],\
                             'should be a list'
-        index, parent = result[0]
-        self.assertEqual(index, 1)
+                            
+        self.assertEqual(result[0][0][0], 1)
 
 
@@ -138 +138 @@
         results = Q.search([4.5, 3])
         assert len(results) == 1
-        idx, _ = results[0]
-        self.assertEqual(idx, 2)
+        self.assertEqual(results[0][0][0], 2)
         results = Q.search([5,4.])
         self.assertEqual(len(results),1)
-        idx, _ = results[0]
-        self.assertEqual(idx, 2)
+        self.assertEqual(results[0][0][0], 2)
         
     def NOtest_num_visits(self):