Changeset 7276 for anuga_core/source/anuga/alpha_shape/test_alpha_shape.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/alpha_shape/test_alpha_shape.py (modified) (2 diffs)

anuga_core/source/anuga/alpha_shape/test_alpha_shape.py

@@ -5 +5 @@
 import unittest
 
-import Numeric as num
+import numpy as num
 
 try:
@@ -394 +394 @@
                   (46, 45)]
         assert num.allclose(answer, result)    
+
 #-------------------------------------------------------------
+
 if __name__ == "__main__":
-    #print "starting tests \n"
     suite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner(verbosity=1)
     runner.run(suite)
-    #print "finished tests \n"
-    
-
-    
-    
-
-
-