Changeset 7720


Ignore:
Timestamp:
May 12, 2010, 10:13:37 AM (14 years ago)
Author:
hudson
Message:

Fixed failing unit tests.

Location:
anuga_core/source/anuga
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/fit_interpolate/test_search_functions.py

    r7718 r7720  
    152152        x = ensure_numeric([0.5, 0.5])
    153153
    154         triangles = root._trilist_from_data(root.search(x))
    155    
    156154        found, sigma0, sigma1, sigma2, k = \
    157                root._search_triangles_of_vertices(triangles, x)
     155               root._search_triangles_of_vertices(root.search(x), x)
    158156
    159157        if k >= 0:
  • anuga_core/source/anuga/geometry/quad.py

    r7719 r7720  
    8484           
    8585            # option 1 - try splitting 4 ways
    86             subregion11, subregion12 = subregion1.split()                               
    87             subregion21, subregion22 = subregion2.split()
    88             regions = [subregion11, subregion12, subregion21, subregion22]
    89             for region in regions:
    90                 if region.is_trivial_in(new_region):
    91                     self.children = [Cell(x, parent=self) for x in regions]
    92                     self._insert(new_leaf)
    93                     return               
     86            #subregion11, subregion12 = subregion1.split()                               
     87            #subregion21, subregion22 = subregion2.split()
     88            #regions = [subregion11, subregion12, subregion21, subregion22]
     89            #for region in regions:
     90                #if region.is_trivial_in(new_region):
     91                    #self.children = [Cell(x, parent=self) for x in regions]
     92                    #self._insert(new_leaf)
     93                    #return               
    9494
    9595            # option 2 - try splitting 2 ways
    96             #if subregion1.is_trivial_in(new_region):
    97                 #self.children = [Cell(subregion1, self), Cell(subregion2, self)]   
    98                 #self.children[0]._insert(new_leaf)
    99                 #return
    100             #elif subregion2.is_trivial_in(new_region):
    101                 #self.children = [Cell(subregion1, self), Cell(subregion2, self)]   
    102                 #self.children[1]._insert(new_leaf)
    103                 #return               
     96            if subregion1.is_trivial_in(new_region):
     97                self.children = [Cell(subregion1, self), Cell(subregion2, self)]   
     98                self.children[0]._insert(new_leaf)
     99                return
     100            elif subregion2.is_trivial_in(new_region):
     101                self.children = [Cell(subregion1, self), Cell(subregion2, self)]   
     102                self.children[1]._insert(new_leaf)
     103                return               
    104104   
    105105        # recursion ended without finding a fit, so attach it as a leaf
  • anuga_core/source/anuga/geometry/test_geometry.py

    r7716 r7720  
    8686        cell = Cell(AABB(0,10, 0,5), None)
    8787        cell.insert([(AABB(1,3, 1, 3), 111), (AABB(8,9, 1, 2), 222)])
     88
    8889        assert len(cell.children) == 2
    8990        assert cell.parent == None
  • anuga_core/source/anuga/geometry/test_meshquad.py

    r7718 r7720  
    4646        assert type(result) in [types.ListType,types.TupleType],\
    4747                            'should be a list'
    48         index, parent = result[0]
    49         self.assertEqual(index, 1)
     48                           
     49        self.assertEqual(result[0][0][0], 1)
    5050
    5151
     
    138138        results = Q.search([4.5, 3])
    139139        assert len(results) == 1
    140         idx, _ = results[0]
    141         self.assertEqual(idx, 2)
     140        self.assertEqual(results[0][0][0], 2)
    142141        results = Q.search([5,4.])
    143142        self.assertEqual(len(results),1)
    144         idx, _ = results[0]
    145         self.assertEqual(idx, 2)
     143        self.assertEqual(results[0][0][0], 2)
    146144       
    147145    def NOtest_num_visits(self):
Note: See TracChangeset for help on using the changeset viewer.