Changeset 9203

Timestamp:

Jun 19, 2014, 6:49:04 PM (10 years ago)

Author:

steve

Message:

Got rid of a few print statments in test_spatialInputUtil

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• spatialInputUtil.py (modified) (2 diffs)
• test_spatialInputUtil.py (modified) (7 diffs)

trunk/anuga_core/source/anuga/utilities/spatialInputUtil.py

@@ -264 +264 @@
     segLen=(seg_unitVec_x**2+seg_unitVec_y**2)**0.5
     if(segLen==0.):
-        print line
-        print 'Pt'
-        print pt
-        raise Exception, 'Line has repeated points'
+        #print line
+        #print 'Pt'
+        #print pt
+        raise Exception, 'Line has repeated points: Line %s Pt %s' % (str(line),str(pt))
     seg_unitVec_x=seg_unitVec_x/segLen
     seg_unitVec_y=seg_unitVec_y/segLen
@@ -472 +472 @@
         if(L1_L2_intersect.GetGeometryCount()==1):
             if(not check_polygon_is_small(L1_L2_intersect, buf, tol2)):
-                print L1_L2_intersect.GetEnvelope()
-                raise Exception, 'line intersection is not allowed'
+                #print L1_L2_intersect.GetEnvelope()
+                raise Exception, 'line intersection is not allowed. Envelope %s '% str(L1_L2_intersect.GetEnvelope())
             # Seems to need special treatment with only 1 intersection point
             intersectionPts=[L1_L2_intersect.Centroid().GetPoint()]

trunk/anuga_core/source/anuga/utilities/test_spatialInputUtil.py

@@ -16 +16 @@
 from anuga.utilities import spatialInputUtil as su
         
+# pull -v argument from command line
+verbose = anuga.get_args().verbose
 
 class Test_spatialInputUtil(unittest.TestCase):
@@ -206 +208 @@
         seg2_wkb=su.ListPts2Wkb(seg2,geometry_type='line')
 
-        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=False)
+        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=verbose)
         newSeg1=su.Wkb2ListPts(newSeg1)
         newSeg2=su.Wkb2ListPts(newSeg2)
@@ -221 +223 @@
         seg1_wkb=su.ListPts2Wkb(seg1,geometry_type='line')
         seg2_wkb=su.ListPts2Wkb(seg2,geometry_type='line')
-        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=False)
+        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=verbose)
         newSeg1=su.Wkb2ListPts(newSeg1)
         newSeg2=su.Wkb2ListPts(newSeg2)
@@ -241 +243 @@
         seg2_wkb=su.ListPts2Wkb(seg2,geometry_type='line')
 
-        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=False,\
+        newSeg1,newSeg2=su.addIntersectionPtsToLines(seg1_wkb,seg2_wkb,verbose=verbose,\
                                 point_movement_threshold=0.01)
         newSeg1=su.Wkb2ListPts(newSeg1)
@@ -327 +329 @@
             newBP, newBL, newRW=su.add_intersections_to_domain_features(bounding_polygon,\
                                     breakLines, riverWalls, point_movement_threshold=0.02,\
-                                    verbose=False)
+                                    verbose=verbose)
             assert False
         except:
             assert True
 
+        #print 'After first add_iinersections'
         #################################################################
         # Fix the riverwall, and it should work
@@ -339 +342 @@
         newBP, newBL, newRW=su.add_intersections_to_domain_features(bounding_polygon,\
                                 breakLines, riverWalls, point_movement_threshold=0.02,\
-                                verbose=False)
+                                verbose=verbose)
 
         return
@@ -346 +349 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_spatialInputUtil, 'test')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)