Changeset 6147

Timestamp:

Jan 13, 2009, 12:04:14 PM (16 years ago)

Author:

rwilson

Message:

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

Location:

anuga_core/source/anuga/alpha_shape

Files:

• alpha_shape.py (modified) (6 diffs)
• test_alpha_shape.py (modified) (11 diffs)

anuga_core/source/anuga/alpha_shape/alpha_shape.py

@@ -20 +20 @@
 
 import exceptions
-from Numeric import array, Float, divide_safe, sqrt, product
 import random
 
 from load_mesh.loadASCII import export_boundary_file
 from anuga.geospatial_data.geospatial_data import Geospatial_data
+
+import Numeric as num
+
 
 class AlphaError(exceptions.Exception):pass
@@ -87 +89 @@
         
         #Convert input to Numeric arrays
-        self.points = array(points).astype(Float)
+        self.points = num.array(points).astype(num.Float)
 
     
@@ -240 +242 @@
         ind3 = [self.deltri[j][2] for j in range(len(self.deltri))]
 
-        x1 = array([ x[j] for j in ind1 ])
-        y1 = array([ y[j] for j in ind1 ])
-        x2 = array([ x[j] for j in ind2 ])
-        y2 = array([ y[j] for j in ind2 ])
-        x3 = array([ x[j] for j in ind3 ])
-        y3 = array([ y[j] for j in ind3 ])
+        x1 = num.array([ x[j] for j in ind1 ])
+        y1 = num.array([ y[j] for j in ind1 ])
+        x2 = num.array([ x[j] for j in ind2 ])
+        y2 = num.array([ y[j] for j in ind2 ])
+        x3 = num.array([ x[j] for j in ind3 ])
+        y3 = num.array([ y[j] for j in ind3 ])
 
         x21 = x2-x1
@@ -287 +289 @@
                        (denom[k]< EPSILON and  denom[k] > -EPSILON)]
         try:
-            dx = divide_safe(y31*dist21 - y21*dist31,denom)
-            dy = divide_safe(x21*dist31 - x31*dist21,denom)
+            dx = num.divide_safe(y31*dist21 - y21*dist31,denom)
+            dy = num.divide_safe(x21*dist31 - x31*dist21,denom)
         except ZeroDivisionError:
             raise  AlphaError
             
-        self.triradius = 0.5*sqrt(dx*dx + dy*dy)
+        self.triradius = 0.5*num.sqrt(dx*dx + dy*dy)
         #print "triangle radii", self.triradius
 
@@ -313 +315 @@
             tri = self.deltri[t]
             trinbr = self.deltrinbr[t]
-            dx = array([self.points[tri[(i+1)%3],0] -
-                        self.points[tri[(i+2)%3],0] for i in [0,1,2]])
-            dy = array([self.points[tri[(i+1)%3],1] -
-                        self.points[tri[(i+2)%3],1] for i in [0,1,2]])
-            elen = sqrt(dx*dx+dy*dy)
+            dx = num.array([self.points[tri[(i+1)%3],0] -
+                            self.points[tri[(i+2)%3],0] for i in [0,1,2]])
+            dy = num.array([self.points[tri[(i+1)%3],1] -
+                            self.points[tri[(i+2)%3],1] for i in [0,1,2]])
+            elen = num.sqrt(dx*dx+dy*dy)
             # really only need sign - not angle value:
-            anglesign = array([(-dx[(i+1)%3]*dx[(i+2)%3]-
-                                dy[(i+1)%3]*dy[(i+2)%3]) for i in [0,1,2]])
+            anglesign = num.array([(-dx[(i+1)%3]*dx[(i+2)%3]-
+                                    dy[(i+1)%3]*dy[(i+2)%3]) for i in [0,1,2]])
             
             #print "dx ",dx,"\n"
@@ -594 +596 @@
             tri = self.deltri[tind[0]]
             
-            dx = array([self.points[tri[(i+1)%3],0] - \
-                        self.points[tri[(i+2)%3],0] for i in [0,1,2]])
-            dy = array([self.points[tri[(i+1)%3],1] - \
-                        self.points[tri[(i+2)%3],1] for i in [0,1,2]])
-            anglesign = array([(-dx[(i+1)%3]*dx[(i+2)%3]-\
-                                dy[(i+1)%3]*dy[(i+2)%3]) for i in [0,1,2]])
+            dx = num.array([self.points[tri[(i+1)%3],0] - \
+                           self.points[tri[(i+2)%3],0] for i in [0,1,2]])
+            dy = num.array([self.points[tri[(i+1)%3],1] - \
+                           self.points[tri[(i+2)%3],1] for i in [0,1,2]])
+            anglesign = num.array([(-dx[(i+1)%3]*dx[(i+2)%3]-\
+                                   dy[(i+1)%3]*dy[(i+2)%3]) for i in [0,1,2]])
             # record any triangle that has an acute angle spanned by
             #two edges along the boundary..

anuga_core/source/anuga/alpha_shape/test_alpha_shape.py

@@ -4 +4 @@
 import sys
 import unittest
-from Numeric import allclose
+
+import Numeric as num
 
 try:
@@ -32 +33 @@
         result = alpha.get_delaunay()
         answer = [(0, 1, 5), (5, 1, 4), (4, 2, 3), (2, 4, 1)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
 
     def test_3_points_on_line(self):
@@ -63 +64 @@
         #print "result",result
         answer = [(5, 0), (0, 1), (4, 5), (2, 3), (3, 4), (1, 2)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
 
 
@@ -80 +81 @@
         #print "result",result
         answer = [(0, 3), (3, 6), (0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
 
 
@@ -97 +98 @@
         #print "result",result
         answer = [(5, 0), (0, 1), (4, 5), (2, 3), (3, 4), (1, 2)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
 
 
@@ -114 +115 @@
         #print "result",result
         answer = [(0, 3), (3, 6), (0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
    
 
@@ -132 +133 @@
         #print "result",result
         answer = [(0, 1), (1, 2), (2, 3), (3, 4), (4, 5), (5, 6), (6, 0)]
-        assert allclose(answer, result) 
+        assert num.allclose(answer, result) 
 
 
@@ -148 +149 @@
         result = alpha.get_boundary()
         answer = [(1, 0), (0, 5), (3, 2), (4, 3), (2, 6), (6, 1), (5, 4)]
-        assert allclose(answer, result)
+        assert num.allclose(answer, result)
 
 
@@ -222 +223 @@
         #print "result",result
         answer = [(1, 0), (4, 3), (0, 4), (3, 1)]
-        assert allclose(answer, result)
+        assert num.allclose(answer, result)
   
     def test_sharp_indents(self):
@@ -239 +240 @@
         #print "result",result
         answer = [(3, 4), (2, 3), (0, 1), (1, 2), (4, 0)]
-        assert allclose(answer, result)
+        assert num.allclose(answer, result)
 
         
@@ -392 +393 @@
                   (61, 62), (62, 63), (59, 60), (58, 59), (60, 61), \
                   (46, 45)]
-        assert allclose(answer, result)    
+        assert num.allclose(answer, result)    
 #-------------------------------------------------------------
 if __name__ == "__main__":