Changeset 5912

Timestamp:

Nov 6, 2008, 4:39:06 PM (16 years ago)

Author:

rwilson

Message:

NumPy? conversion.

Location:

anuga_core/source_numpy_conversion/anuga/pmesh

Files:

• Pmw.py (modified) (7 diffs)
• mesh.py (modified) (2 diffs)
• mesh_interface.py (modified) (2 diffs)
• test_mesh.py (modified) (11 diffs)
• view_tsh.py (modified) (1 diff)

anuga_core/source_numpy_conversion/anuga/pmesh/Pmw.py

@@ -2776 +2776 @@
     def index(self, index, forInsert = 0):
         listLength = len(self._buttonList)
-        if type(index) == types.IntType:
+        if isinstance(index, types.IntType):
             if forInsert and index <= listLength:
                 return index
@@ -3708 +3708 @@
             return
 
-        if type(traverseSpec) == types.IntType:
+        if isinstance(traverseSpec, types.IntType):
             kw['underline'] = traverseSpec
             return
@@ -3951 +3951 @@
             return
 
-        if type(traverseSpec) == types.IntType:
+        if isinstance(traverseSpec, types.IntType):
             kw['underline'] = traverseSpec
             return
@@ -4507 +4507 @@
     def index(self, index, forInsert = 0):
         listLength = len(self._pageNames)
-        if type(index) == types.IntType:
+        if isinstance(index, types.IntType):
             if forInsert and index <= listLength:
                 return index
@@ -4973 +4973 @@
     def index(self, index):
         listLength = len(self._itemList)
-        if type(index) == types.IntType:
+        if isinstance(index, types.IntType):
             if index < listLength:
                 return index
@@ -5224 +5224 @@
         # Parse <args> for options.
         for arg, value in args.items():
-            if type(value) == types.FloatType:
+            if isinstance(value, types.FloatType):
                 relvalue = value
                 value = self._absSize(relvalue)
@@ -5813 +5813 @@
 
         listLength = len(self._buttonList)
-        if type(index) == types.IntType:
+        if isinstance(index, types.IntType):
             if index < listLength:
                 return index

anuga_core/source_numpy_conversion/anuga/pmesh/mesh.py

@@ -22 +22 @@
 import types
 import exceptions
-from Numeric import array, Float, Int
-
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference, \
@@ -125 +123 @@
         __slots__ = ['x','y','attributes']
         
-        assert (type(X) == types.FloatType or type(X) == types.IntType)
-        assert (type(Y) == types.FloatType or type(Y) == types.IntType)
+        assert (isinstance(X, types.FloatType) or isinstance(X, types.IntType))
+        assert (isinstance(Y, types.FloatType) or isinstance(Y, types.IntType))
         self.x=X
         self.y=Y        

anuga_core/source_numpy_conversion/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 numpy
 from anuga.utilities.polygon import inside_polygon
 
@@ -150 +150 @@
 
     # Simple check
-    bounding_polygon = ensure_numeric(bounding_polygon, Float)
+    bounding_polygon = ensure_numeric(bounding_polygon, numpy.float)
     msg = 'Bounding polygon must be a list of points or an Nx2 array'
     assert len(bounding_polygon.shape) == 2, msg

anuga_core/source_numpy_conversion/anuga/pmesh/test_mesh.py

@@ -15 +15 @@
 from anuga.utilities.polygon import  is_inside_polygon ### inside_polygon
 
-from Numeric import alltrue, allclose
-
 class meshTestCase(unittest.TestCase):
     def setUp(self):
@@ -65 +63 @@
         self.failUnless(mesh.userSegments[0] == s3,
                         'Bad segment. ')        
-        self.failUnless(len(mesh.userSegments) == 1,
+        self.failUnless(len(mesh.userSegments) ==1,
                         'Segments not deleted.')
         self.failUnless(len(mesh.userVertices) == 2,
@@ -81 +79 @@
         s3 = Segment(a,f)
 
-        r1 = Region(0.3, 0.3, tag = 1.3, maxArea = .6)
+        r1 = Region(0.3, 0.3,tag = 1.3,maxArea = .6)
         #print r1
         m = Mesh(userVertices=[a,d,f], userSegments=[s1,s2,s3], regions=[r1] )
@@ -1578 +1576 @@
         
 
-        #print '**@@@@@******'
+        #print '**.flat@******'
         #print "new_m",new_m 
-        #print '**@@@@@******'
+        #print '**.flat@******'
         #print "m",m 
-        #print '**@@@@@******'
+        #print '**.flat@******'
         
         self.failUnless( new_m == m,
@@ -1658 +1656 @@
                          'test_Mesh2IOTriangulationDict failed. test 2')
 
-        self.failUnless( alltrue(dict['vertices'].flat == verts.flat),
+        self.failUnless( dict['vertices'] == verts,
                          'test_Mesh2IOTriangulationDict failed. test vert')
-        self.failUnless( alltrue(dict['vertex_attributes'].flat == vert_as.flat),
+        self.failUnless( dict['vertex_attributes'] == vert_as,
                          'test_Mesh2IOTriangulationDict failed. test vert ats')
 
-        self.failUnless( alltrue(dict['segments'][0] == [0,1]),
+        self.failUnless( dict['segments'][0] == [0,1],
                         'test_Mesh2IODict failed. test 3')
         
@@ -1669 +1667 @@
                         'test_Mesh2IODict failed. test 3')
         #print " dict['triangles'][0]", dict['triangles'][0] 
-        self.failUnless( alltrue(dict['triangles'][0] == [3,2,4]),
+        self.failUnless( dict['triangles'][0] == [3,2,4],
                         'test_Mesh2IODict failed. test 5')
-        self.failUnless( alltrue(dict['triangle_neighbors'][0] == [-1,2,3]),
+        self.failUnless( dict['triangle_neighbors'][0] == [-1,2,3],
                         'test_Mesh2IODict failed. test 6')
         #print "dict['triangle_tags'][0]", dict['triangle_tags'][0]
@@ -2180 +2178 @@
                         'FAILED!')
         vert= m.get_user_vertices(absolute=True)
-        
-        self.failUnless(allclose(vert, points_ab),
-                        'FAILED!')        
+        self.failUnless(vert==points_ab,
+                        'FAILED!')
 
     
@@ -2196 +2193 @@
         self.failUnless(4==len(vert),
                         'FAILED!')
-        vert = m.get_user_vertices(absolute=True)
-        
-        self.failUnless(alltrue(vert.flat == array(points).flat),
+        vert= m.get_user_vertices(absolute=True)
+        self.failUnless(vert==points,
                         'FAILED!')
     
@@ -2215 +2211 @@
                         'FAILED!')
         vert= m.get_user_vertices(absolute=True)
-        
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(vert==points_ab,
                         'FAILED!')
 
@@ -2232 +2227 @@
                         'FAILED!')
         vert= m.get_user_vertices(absolute=True)
-        
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(vert==points_ab,
                         'FAILED!')
 
@@ -2254 +2248 @@
                         'FAILED!')
         vert= m.get_user_vertices(absolute=True)
-        self.failUnless(allclose(vert, points_ab),
+        self.failUnless(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(points_ab==points_new,
                         'FAILED!')
 

anuga_core/source_numpy_conversion/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 *