Changeset 6517 for branches/numpy/anuga/alpha_shape

Timestamp:

Mar 16, 2009, 11:06:22 AM (16 years ago)

Author:

rwilson

Message:

Hand-merged recent changes in main trunk. Still work to be done in shallow_water.

File:

• branches/numpy/anuga/alpha_shape/alpha_shape.py (modified) (1 diff)

branches/numpy/anuga/alpha_shape/alpha_shape.py

@@ -289 +289 @@
                        (denom[k]< EPSILON and  denom[k] > -EPSILON)]
 
-        if num.any(denom == 0.0):
-            raise AlphaError
-
-        dx = num.divide(y31*dist21 - y21*dist31, denom)
-        dy = num.divide(x21*dist31 - x31*dist21, denom)
-
+        if num.alltrue(denom != 0.0):               
+            dx = num.divide(y31*dist21 - y21*dist31,denom)
+            dy = num.divide(x21*dist31 - x31*dist21,denom)
+        else:
+            raise  AlphaError
+            
         self.triradius = 0.5*num.sqrt(dx*dx + dy*dy)
         #print "triangle radii", self.triradius