Changeset 6155

Timestamp:

Jan 13, 2009, 3:13:33 PM (16 years ago)

Author:

rwilson

Message:

Change Numeric imports to general form - ready to change to NumPy?.

Location:

anuga_core/source/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (7 diffs)
• test_generate_mesh.py (modified) (10 diffs)

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -11 +11 @@
 #import anuga.mesh_engine.list_dic as triang
 
-from Numeric import array, Float, Int32, reshape
+import Numeric as num
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -46 +46 @@
         
     try:
-        points =  ensure_numeric(points, Float)
+        points =  ensure_numeric(points, num.Float)
     except ValueError:
         msg = 'ERROR: Inconsistent points array.'
@@ -61 +61 @@
     try:
         # If Int is used, instead of Int32, it fails in Linux
-        segments = ensure_numeric(segments, Int32)
+        segments = ensure_numeric(segments, num.Int32)
         
     except ValueError:
@@ -72 +72 @@
         
     try:
-        holes = ensure_numeric(holes, Float)
+        holes = ensure_numeric(holes, num.Float)
     except ValueError:
         msg = 'ERROR: Inconsistent holess array.'
@@ -80 +80 @@
     regions = add_area_tag(regions)
     try:
-        regions = ensure_numeric(regions, Float)
+        regions = ensure_numeric(regions, num.Float)
     except  (ValueError, TypeError):
         msg = 'ERROR: Inconsistent regions array.'
@@ -90 +90 @@
     
     try:
-        pointatts = ensure_numeric(pointatts, Float)
+        pointatts = ensure_numeric(pointatts, num.Float)
     except (ValueError, TypeError):
         msg = 'ERROR: Inconsistent point attributes array.'
@@ -100 +100 @@
         raise ANUGAError, msg
     if len(pointatts.shape) == 1:
-        pointatts = reshape(pointatts,(pointatts.shape[0],1))
-    
-    try:
-        segatts = ensure_numeric(segatts, Int32)
+        pointatts = num.reshape(pointatts,(pointatts.shape[0],1))
+    
+    try:
+        segatts = ensure_numeric(segatts, num.Int32)
     except ValueError:
         msg = 'ERROR: Inconsistent point attributes array.'

anuga_core/source/anuga/mesh_engine/test_generate_mesh.py

@@ -12 +12 @@
 from anuga.mesh_engine.mesh_engine import generate_mesh
 
-from Numeric import array, Float, Int, alltrue, allclose
+import Numeric as num
 
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -43 +43 @@
                               pointattlist,segattlist, mode, points)
 
-        correct = array([(1, 0, 2), (2, 3, 1)])
-        self.failUnless(alltrue(data['generatedtrianglelist'].flat == \
-                                correct.flat),
+        correct = num.array([(1, 0, 2), (2, 3, 1)])
+        self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \
+                                    correct.flat),
                         'trianglelist is wrong!')
-        correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])
-        self.failUnless(alltrue(data['generatedsegmentlist'].flat == \
-                                correct.flat),
+        correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)])
+        self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \
+                                    correct.flat),
                         'segmentlist is wrong!')
 
-        correct = array([(0.0, 0.0), (0.0, 10.0),
-                         (3.0, 0.0), (3.0, 10.0)])
-        self.failUnless(allclose(data['generatedpointlist'].flat, \
-                                correct.flat),
+        correct = num.array([(0.0, 0.0), (0.0, 10.0),
+                             (3.0, 0.0), (3.0, 10.0)])
+        self.failUnless(num.allclose(data['generatedpointlist'].flat, \
+                                     correct.flat),
                         'Failed')
      
@@ -74 +74 @@
         data = generate_mesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, mode, points)
-        correct = array([(1, 0, 2), (2, 3, 1)])
-        self.failUnless(alltrue(data['generatedtrianglelist'].flat == \
-                                correct.flat),
+        correct = num.array([(1, 0, 2), (2, 3, 1)])
+        self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \
+                                    correct.flat),
                         'trianglelist is wrong!')
-        correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])
-        self.failUnless(alltrue(data['generatedsegmentlist'].flat == \
-                                correct.flat),
+        correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)])
+        self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \
+                                    correct.flat),
                         'segmentlist is wrong!')
 
-        correct = array([(0.0, 0.0), (0.0, 10.0),
-                         (3.0, 0.0), (3.0, 10.0)])
-        self.failUnless(allclose(data['generatedpointlist'].flat, \
-                                correct.flat),
+        correct = num.array([(0.0, 0.0), (0.0, 10.0),
+                             (3.0, 0.0), (3.0, 10.0)])
+        self.failUnless(num.allclose(data['generatedpointlist'].flat, \
+                                     correct.flat),
                         'Failed')
 
@@ -154 +154 @@
                               pointattlist,segattlist, mode, points)
 
-        correct = array([(1, 0, 2), (2, 3, 1)])
-        self.failUnless(alltrue(data['generatedtrianglelist'].flat == \
-                                correct.flat),
+        correct = num.array([(1, 0, 2), (2, 3, 1)])
+        self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \
+                                    correct.flat),
                         'trianglelist is wrong!')
-        correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])
-        self.failUnless(alltrue(data['generatedsegmentlist'].flat == \
-                                correct.flat),
+        correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)])
+        self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \
+                                    correct.flat),
                         'segmentlist is wrong!')
 
-        correct = array([(0.0, 0.0), (0.0, 10.0),
-                         (3.0, 0.0), (3.0, 10.0)])
-        self.failUnless(allclose(data['generatedpointlist'].flat, \
-                                correct.flat),
-                        'Failed')
-        
-        self.failUnless(alltrue(data['generatedsegmentmarkerlist'] == \
-                                array([1,2,3,4])),
+        correct = num.array([(0.0, 0.0), (0.0, 10.0),
+                             (3.0, 0.0), (3.0, 10.0)])
+        self.failUnless(num.allclose(data['generatedpointlist'].flat, \
+                                     correct.flat),
+                        'Failed')
+        
+        self.failUnless(num.alltrue(data['generatedsegmentmarkerlist'] == \
+                                    num.array([1,2,3,4])),
                         'Failed!')
         
@@ -338 +338 @@
                               pointattlist,segattlist, mode, points)
 
-        correct = array([[77.0], [77.0], [77.0], [77.0]])
-        self.failUnless(allclose(data['generatedtriangleattributelist'].flat, 
-                                 correct.flat),
+        correct = num.array([[77.0], [77.0], [77.0], [77.0]])
+        self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, 
+                                     correct.flat),
                         'Failed')
         
@@ -362 +362 @@
                               pointattlist,segattlist, mode, points)
 
-        correct = array([[77.0], [77.0], [77.0], [77.0]])
-        self.failUnless(allclose(data['generatedtriangleattributelist'].flat, 
-                                 correct.flat),
+        correct = num.array([[77.0], [77.0], [77.0], [77.0]])
+        self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, 
+                                     correct.flat),
                         'Failed')
 
@@ -388 +388 @@
 
      
-        correct = array([(1, 0, 2), (2, 3, 1)])
-        self.failUnless(alltrue(data['generatedtrianglelist'].flat == \
-                                correct.flat),
+        correct = num.array([(1, 0, 2), (2, 3, 1)])
+        self.failUnless(num.alltrue(data['generatedtrianglelist'].flat == \
+                                    correct.flat),
                         'trianglelist is wrong!')
-        correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])
-        self.failUnless(alltrue(data['generatedsegmentlist'].flat == \
-                                correct.flat),
+        correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)])
+        self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \
+                                    correct.flat),
                         'segmentlist is wrong!')
 
-        correct = array([(0.0, 0.0), (0.0, 10.0),
-                         (3.0, 0.0), (3.0, 10.0)])
-        self.failUnless(allclose(data['generatedpointlist'].flat, \
-                                correct.flat),
-                        'Failed')
-        
-        correct = array([[tri_tag], [tri_tag]])
-        self.failUnless(allclose(data['generatedtriangleattributelist'].flat, \
-                                correct.flat),
-                        'Failed')
-        correct = array([(0, 1), (1, 3), (3, 2), (2, 0)])
-        self.failUnless(alltrue(data['generatedsegmentlist'].flat == \
-                                correct.flat),
+        correct = num.array([(0.0, 0.0), (0.0, 10.0),
+                             (3.0, 0.0), (3.0, 10.0)])
+        self.failUnless(num.allclose(data['generatedpointlist'].flat, \
+                                     correct.flat),
+                        'Failed')
+        
+        correct = num.array([[tri_tag], [tri_tag]])
+        self.failUnless(num.allclose(data['generatedtriangleattributelist'].flat, \
+                                     correct.flat),
+                        'Failed')
+        correct = num.array([(0, 1), (1, 3), (3, 2), (2, 0)])
+        self.failUnless(num.alltrue(data['generatedsegmentlist'].flat == \
+                                    correct.flat),
                         'Failed!')
         
-        correct = array(segattlist)
-        self.failUnless(allclose(data['generatedsegmentmarkerlist'].flat, 
-                                 correct.flat),
+        correct = num.array(segattlist)
+        self.failUnless(num.allclose(data['generatedsegmentmarkerlist'].flat, 
+                                     correct.flat),
                         'Failed')
         
         # I copied these answers from the output, so bad test..
-        correct = array([(-1, 1, -1), (-1, 0, -1)])
-        self.failUnless(alltrue(data['generatedtriangleneighborlist'].flat == \
-                                correct.flat),
+        correct = num.array([(-1, 1, -1), (-1, 0, -1)])
+        self.failUnless(num.alltrue(data['generatedtriangleneighborlist'].flat == \
+                                    correct.flat),
                         'Failed!')
         
@@ -440 +440 @@
                               pointattlist,segattlist, mode, points)
 
-        correct = array([[0.0],[0.0],[10],[10]])
-        self.failUnless(allclose(data['generatedpointattributelist'].flat, \
-                                correct.flat),
+        correct = num.array([[0.0],[0.0],[10],[10]])
+        self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \
+                                     correct.flat),
                         'Failed')
         
@@ -449 +449 @@
         data = generate_mesh(points,seglist,holelist,regionlist,
                               pointattlist,segattlist, mode, points)
-        correct = array([[0.0],[0.0],[10],[10]])
-        self.failUnless(allclose(data['generatedpointattributelist'].flat, \
-                                correct.flat),
+        correct = num.array([[0.0],[0.0],[10],[10]])
+        self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \
+                                     correct.flat),
                         'Failed')
         
@@ -459 +459 @@
                               pointattlist,segattlist, mode, points)
         #print "data", data
-        correct = array(pointattlist)
-        self.failUnless(allclose(data['generatedpointattributelist'].flat, \
-                                correct.flat),
+        correct = num.array(pointattlist)
+        self.failUnless(num.allclose(data['generatedpointattributelist'].flat, \
+                                     correct.flat),
                         'Failed')