Changeset 6533 for branches/numpy/anuga/alpha_shape

Timestamp:

Mar 17, 2009, 4:02:54 PM (16 years ago)

Author:

rwilson

Message:

Revert back to 6481, prior to auto-merge of trunk and numpy branch.

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.alltrue(denom != 0.0):               
-            dx = num.divide(y31*dist21 - y21*dist31,denom)
-            dy = num.divide(x21*dist31 - x31*dist21,denom)
-        else:
-            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