Changeset 6156

Timestamp:

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

Author:

rwilson

Message:

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

Location:

anuga_core/source/anuga/pmesh

Files:

• mesh.py (modified) (1 diff)
• mesh_interface.py (modified) (2 diffs)
• test_mesh.py (modified) (8 diffs)
• view_tsh.py (modified) (1 diff)

anuga_core/source/anuga/pmesh/mesh.py

@@ -22 +22 @@
 import types
 import exceptions
-from Numeric import array, Float, Int
 
 

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -3 +3 @@
 from anuga.utilities.polygon import  point_in_polygon ,populate_polygon
 from anuga.utilities.numerical_tools import ensure_numeric
-from Numeric import Float
+import Numeric as num
 from anuga.utilities.polygon import inside_polygon
 
@@ -150 +150 @@
 
     # Simple check
-    bounding_polygon = ensure_numeric(bounding_polygon, Float)
+    bounding_polygon = ensure_numeric(bounding_polygon, num.Float)
     msg = 'Bounding polygon must be a list of points or an Nx2 array'
     assert len(bounding_polygon.shape) == 2, msg

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -15 +15 @@
 from anuga.utilities.polygon import  is_inside_polygon ### inside_polygon
 
-from Numeric import alltrue, allclose
+import Numeric as num
 
 class meshTestCase(unittest.TestCase):
@@ -1658 +1658 @@
                          'test_Mesh2IOTriangulationDict failed. test 2')
 
-        self.failUnless( alltrue(dict['vertices'].flat == verts.flat),
+        self.failUnless(num.alltrue(dict['vertices'].flat == verts.flat),
                          'test_Mesh2IOTriangulationDict failed. test vert')
-        self.failUnless( alltrue(dict['vertex_attributes'].flat == vert_as.flat),
+        self.failUnless(num.alltrue(dict['vertex_attributes'].flat == vert_as.flat),
                          'test_Mesh2IOTriangulationDict failed. test vert ats')
 
-        self.failUnless( alltrue(dict['segments'][0] == [0,1]),
+        self.failUnless(num.alltrue(dict['segments'][0] == [0,1]),
                         'test_Mesh2IODict failed. test 3')
         
@@ -1669 +1669 @@
                         'test_Mesh2IODict failed. test 3')
         #print " dict['triangles'][0]", dict['triangles'][0] 
-        self.failUnless( alltrue(dict['triangles'][0] == [3,2,4]),
+        self.failUnless(num.alltrue(dict['triangles'][0] == [3,2,4]),
                         'test_Mesh2IODict failed. test 5')
-        self.failUnless( alltrue(dict['triangle_neighbors'][0] == [-1,2,3]),
+        self.failUnless(num.alltrue(dict['triangle_neighbors'][0] == [-1,2,3]),
                         'test_Mesh2IODict failed. test 6')
         #print "dict['triangle_tags'][0]", dict['triangle_tags'][0]
@@ -2181 +2181 @@
         vert= m.get_user_vertices(absolute=True)
         
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(num.allclose(vert, points_ab),
                         'FAILED!')        
 
@@ -2198 +2198 @@
         vert = m.get_user_vertices(absolute=True)
         
-        self.failUnless(alltrue(vert.flat == array(points).flat),
+        self.failUnless(num.alltrue(vert.flat == num.array(points).flat),
                         'FAILED!')
     
@@ -2216 +2216 @@
         vert= m.get_user_vertices(absolute=True)
         
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(num.allclose(vert, points_ab),
                         'FAILED!')
 
@@ -2233 +2233 @@
         vert= m.get_user_vertices(absolute=True)
         
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(num.allclose(vert, points_ab),
                         'FAILED!')
 
@@ -2254 +2254 @@
                         'FAILED!')
         vert= m.get_user_vertices(absolute=True)
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(num.allclose(vert, points_ab),
                         'FAILED!')
         vert= m.get_user_vertices(absolute=False)
         points_new = m.geo_reference.get_absolute(vert)
         
-        self.failUnless(allclose(points_ab, points_new),
+        self.failUnless(num.allclose(points_ab, points_new),
                         'FAILED!')
 

anuga_core/source/anuga/pmesh/view_tsh.py

@@ -11 +11 @@
 from anuga.pyvolution.util import file_function
 from anuga.utilities.polygon import Polygon_function, read_polygon
-from Numeric import zeros, Float, maximum, minimum
 from realtime_visualisation_new import *