Changeset 3022

Timestamp:

May 30, 2006, 4:26:26 PM (19 years ago)

Author:

steve

Message:

Slight problem with triangle test, had to change import command for windows

File:

• inundation/triangle/test_triangmodule.py (modified) (26 diffs)

inundation/triangle/test_triangmodule.py

@@ -5 +5 @@
 
 import unittest
-import triang
+from triangle import triang
 
 
@@ -11 +11 @@
     def setUp(self):
         pass
-        
+
     def tearDown(self):
         pass
- 
+
     def testrectangle(self):
 
@@ -46 +46 @@
                                                       (3.0, 0.0), (3.0, 10.0)],
                         ' is wrong!')
-        
+
         #print "data['generatedtriangleneighborlist']",
-        #data['generatedtriangleneighborlist'] 
+        #data['generatedtriangleneighborlist']
         self.failUnless(data['generatedtriangleneighborlist'] ==[(-1, 1, -1),
                                                                  (-1, 0, -1)],
                         'generatedtriangleneighborlist is wrong!')
 
-        
+
     def testrectangleII(self):
 
@@ -70 +70 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist,trilist, mode)
-        
+
         self.failUnless(data['generatedtrianglelist'] ==[(1, 0, 2), (2, 3, 1)],
                         'trianglelist is wrong!')
@@ -79 +79 @@
                                                       (3.0, 0.0), (3.0, 10.0)],
                         ' is wrong!')
-   
+
     def testsegmarker(self):
 
@@ -96 +96 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist,trilist, mode)
-        
+
         self.failUnless(data['generatedtrianglelist'] ==[(1, 0, 2), (2, 3, 1)],
                         'trianglelist is wrong!')
@@ -107 +107 @@
         self.failUnless(data['generatedsegmentmarkerlist'] ==[1,2,3,4],
                         ' is wrong!')
-             
+
     def testbad_region(self):
 
@@ -125 +125 @@
                                   regionlist,pointattlist,segattlist,
                                   trilist, mode)
-            
+
         except TypeError:
             pass
@@ -131 +131 @@
             self.failUnless(0 ==1,
                         'bad region list did not raise error!')
-      
+
     def testregion_with_maxarea(self):
 
@@ -147 +147 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, trilist, mode)
-        
+
         self.failUnless(len(data['generatedtrianglelist']) == 2,
                         'testregion_with_maxarea 1: # of tris is wrong!')
-        ## Another test case    
+        ## Another test case
         regionlist = [(3,1,1.0),(1,3,1.0,8.0)]
         mode = "Qzp21na36a"
@@ -163 +163 @@
         # causing the different results, and we are treating
         # triangle as a back box.
-       
+
         self.failUnless(len(data['generatedtrianglelist']) >= 6,
                         'testregion_with_maxarea 2: # of tris is wrong!')
-        ## Another test case    
+        ## Another test case
         regionlist = [(3,1,1.0,8.0),(1,3,1.0,8.0)]
         mode = "Qzpna36a"
@@ -176 +176 @@
         self.failUnless(len(data['generatedtrianglelist']) >= 8,
                         'testregion_with_maxarea 3: # of tris is wrong!')
-                  
-        ## Another test case    
+
+        ## Another test case
         regionlist = [(3,1,1.0),(1,3,1.0,8.0)]
         mode = "Qzpna8a"
@@ -185 +185 @@
         # On unix this returns a 10 triangle result.
         # Windows returns a 8 triangle result.
-        
+
         self.failUnless(len(data['generatedtrianglelist']) >= 8,
                         'testregion_with_maxarea 4: # of tris is wrong!')
-                  
+
     def testbad_point(self):
 
@@ -203 +203 @@
             data = triang.genMesh(points,seglist,holelist,regionlist,
                                   pointattlist,segattlist, trilist, mode)
-            
+
         except TypeError:
             pass
@@ -209 +209 @@
             self.failUnless(0 ==1,
                         'bad point list did not raise error!')
-      
+
     def testbad_hole(self):
 
@@ -224 +224 @@
             data = triang.genMesh(points,seglist,holelist,regionlist,
                                   pointattlist,segattlist, trilist, mode)
-            
+
         except TypeError:
             pass
@@ -230 +230 @@
             self.failUnless(0 ==1,
                         'bad hole list did not raise error!')
-      
+
     def testbad_segment(self):
 
@@ -245 +245 @@
             data = triang.genMesh(points,seglist,holelist,regionlist,
                                   pointattlist,segattlist, trilist, mode)
-            
+
         except TypeError:
             pass
@@ -251 +251 @@
             self.failUnless(0 ==1,
                         'bad segment list did not raise error!')
-     
+
     def testbad_segattlist(self):
 
@@ -266 +266 @@
             data = triang.genMesh(points,seglist,holelist,regionlist,
                                   pointattlist,segattlist, trilist, mode)
-            
+
             self.failUnless(data['trianglelist'] ==[(1, 0, 2), (2, 3, 1)],
                         'trianglelist is wrong!')
@@ -274 +274 @@
             self.failUnless(0 ==1,
                         'bad segment attribute list did not raise error!')
-            
+
     def testrectangle_regions(self):
 
@@ -294 +294 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, trilist, mode)
-           
+
         self.failUnless(data['generatedtriangleattributelist'] ==[[77.0], [77.0], [77.0], [77.0]],
                         'triangleattributelist is wrong!')
-        
-     
+
+
     def test_lone_verts(self):
 
@@ -328 +328 @@
                         'lonepointlist is wrong!')
         #print "", data['lonepointlist']
-   
+
     def test_lone_vertsII(self):
 
@@ -338 +338 @@
         points = [(0.0,0.0),(0.0,0.0),(0.0,10.0),(0.0,10.0),(10.0,10.0),
                   (10.0,10.0),(0.0,10.0),(10.0,0.0)]
-        
+
         pointattlist = []
         for point in points:
             pointattlist.append([])
-        seglist = [(0,1),(1,2),(2,3),(3,4),(4,5),(5,7),(7,0)]       
+        seglist = [(0,1),(1,2),(2,3),(3,4),(4,5),(5,7),(7,0)]
         segattlist = []
         for seg in seglist:
@@ -374 +374 @@
         points = [(0.0,0.0),(0.0,0.0),(0.0,10.0),(0.0,10.0),(10.0,10.0),
                   (10.0,10.0),(0.0,10.0),(10.0,0.0)]
-        
+
         pointattlist = []
         for point in points:
             pointattlist.append([])
-        seglist = []       
+        seglist = []
         segattlist = []
         for seg in seglist:
@@ -386 +386 @@
         data = triang.genMesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist,trilist, mode)
-       
+
         self.failUnless(data['lonepointlist'] ==[0,1,2,3,4,5,6,7],
                         'lonepointlist is wrong!')