Changeset 6304 for branches/numpy/anuga/alpha_shape

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/alpha_shape/alpha_shape.py (modified) (3 diffs)
• anuga/alpha_shape/test_alpha_shape.py (modified) (1 diff)

branches/numpy/anuga/alpha_shape/alpha_shape.py

@@ -25 +25 @@
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 
-import Numeric as num
+import numpy as num
 
 
@@ -88 +88 @@
                 raise PointError, "Three points on a straight line"
         
-        #Convert input to Numeric arrays
-        self.points = num.array(points, num.Float)
+        #Convert input to numeric arrays
+        self.points = num.array(points, num.float)
 
     
@@ -288 +288 @@
             zeroind = [k for k in range(len(denom)) if \
                        (denom[k]< EPSILON and  denom[k] > -EPSILON)]
-        try:
-            dx = num.divide_safe(y31*dist21 - y21*dist31,denom)
-            dy = num.divide_safe(x21*dist31 - x31*dist21,denom)
-        except ZeroDivisionError:
-            raise  AlphaError
-            
+
+        if num.any(denom == 0.0):
+            raise AlphaError
+
+        dx = num.divide(y31*dist21 - y21*dist31, denom)
+        dy = num.divide(x21*dist31 - x31*dist21, denom)
+
         self.triradius = 0.5*num.sqrt(dx*dx + dy*dy)
         #print "triangle radii", self.triradius

branches/numpy/anuga/alpha_shape/test_alpha_shape.py

@@ -5 +5 @@
 import unittest
 
-import Numeric as num
+import numpy as num
 
 try: