Changeset 6158 for anuga_core/source/anuga/utilities/polygon.py

Timestamp:

Jan 14, 2009, 9:48:37 AM (15 years ago)

Author:

rwilson

Message:

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

File:

• anuga_core/source/anuga/utilities/polygon.py (modified) (22 diffs)

anuga_core/source/anuga/utilities/polygon.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """Polygon manipulations
-
 """
 
-
-#try:
-#    from scipy import Float, Int, zeros, ones, array, concatenate, reshape, dot
-#except:
-#    #print 'Could not find scipy - using Numeric'
-
-from Numeric import Float, Int, zeros, ones, array, concatenate, reshape, dot, allclose
-
+import Numeric as num
 
 from math import sqrt
@@ -49 +41 @@
 # result functions for possible states
 def lines_dont_coincide(p0,p1,p2,p3):               return (3, None)
-def lines_0_fully_included_in_1(p0,p1,p2,p3):       return (2, array([p0,p1]))
-def lines_1_fully_included_in_0(p0,p1,p2,p3):       return (2, array([p2,p3]))
-def lines_overlap_same_direction(p0,p1,p2,p3):      return (2, array([p0,p3]))
-def lines_overlap_same_direction2(p0,p1,p2,p3):     return (2, array([p2,p1]))
-def lines_overlap_opposite_direction(p0,p1,p2,p3):  return (2, array([p0,p2]))
-def lines_overlap_opposite_direction2(p0,p1,p2,p3): return (2, array([p3,p1]))
+def lines_0_fully_included_in_1(p0,p1,p2,p3):       return (2, num.array([p0,p1]))
+def lines_1_fully_included_in_0(p0,p1,p2,p3):       return (2, num.array([p2,p3]))
+def lines_overlap_same_direction(p0,p1,p2,p3):      return (2, num.array([p0,p3]))
+def lines_overlap_same_direction2(p0,p1,p2,p3):     return (2, num.array([p2,p1]))
+def lines_overlap_opposite_direction(p0,p1,p2,p3):  return (2, num.array([p0,p2]))
+def lines_overlap_opposite_direction2(p0,p1,p2,p3): return (2, num.array([p3,p1]))
 
 # this function called when an impossible state is found
@@ -108 +100 @@
     # FIXME (Ole): Write this in C
 
-    line0 = ensure_numeric(line0, Float)
-    line1 = ensure_numeric(line1, Float)    
+    line0 = ensure_numeric(line0, num.Float)
+    line1 = ensure_numeric(line1, num.Float)    
 
     x0 = line0[0,0]; y0 = line0[0,1]
@@ -121 +113 @@
     u1 = (x2-x0)*(y1-y0) - (y2-y0)*(x1-x0)
         
-    if allclose(denom, 0.0, rtol=rtol, atol=atol):
+    if num.allclose(denom, 0.0, rtol=rtol, atol=atol):
         # Lines are parallel - check if they are collinear
-        if allclose([u0, u1], 0.0, rtol=rtol, atol=atol):
+        if num.allclose([u0, u1], 0.0, rtol=rtol, atol=atol):
             # We now know that the lines are collinear
             state_tuple = (point_on_line([x0, y0], line1, rtol=rtol, atol=atol),
@@ -143 +135 @@
 
         # Sanity check - can be removed to speed up if needed
-        assert allclose(x, x2 + u1*(x3-x2), rtol=rtol, atol=atol)
-        assert allclose(y, y2 + u1*(y3-y2), rtol=rtol, atol=atol)        
+        assert num.allclose(x, x2 + u1*(x3-x2), rtol=rtol, atol=atol)
+        assert num.allclose(y, y2 + u1*(y3-y2), rtol=rtol, atol=atol)        
 
         # Check if point found lies within given line segments
         if 0.0 <= u0 <= 1.0 and 0.0 <= u1 <= 1.0: 
             # We have intersection
-            return 1, array([x, y])
+            return 1, num.array([x, y])
         else:
             # No intersection
@@ -184 +176 @@
 
 
-    line0 = ensure_numeric(line0, Float)
-    line1 = ensure_numeric(line1, Float)    
+    line0 = ensure_numeric(line0, num.Float)
+    line1 = ensure_numeric(line1, num.Float)    
 
     status, value = _intersection(line0[0,0], line0[0,1],
@@ -251 +243 @@
     if len(points.shape) == 1:
         # Only one point was passed in. Convert to array of points
-        points = reshape(points, (1,2))
+        points = num.reshape(points, (1,2))
 
     indices, count = separate_points_by_polygon(points, polygon,
@@ -293 +285 @@
     #if verbose: print 'Checking input to outside_polygon'
     try:
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
     except NameError, e:
         raise NameError, e
@@ -301 +293 @@
 
     try:
-        polygon = ensure_numeric(polygon, Float)
+        polygon = ensure_numeric(polygon, num.Float)
     except NameError, e:
         raise NameError, e
@@ -311 +303 @@
     if len(points.shape) == 1:
         # Only one point was passed in. Convert to array of points
-        points = reshape(points, (1,2))
+        points = num.reshape(points, (1,2))
 
     indices, count = separate_points_by_polygon(points, polygon,
@@ -320 +312 @@
     if count == len(indices):
         # No points are outside
-        return array([])
+        return num.array([])
     else:
         return indices[count:][::-1]  #return reversed
@@ -335 +327 @@
     #if verbose: print 'Checking input to outside_polygon'
     try:
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
     except NameError, e:
         raise NameError, e
@@ -343 +335 @@
 
     try:
-        polygon = ensure_numeric(polygon, Float)
+        polygon = ensure_numeric(polygon, num.Float)
     except NameError, e:
         raise NameError, e
@@ -352 +344 @@
     if len(points.shape) == 1:
         # Only one point was passed in. Convert to array of points
-        points = reshape(points, (1,2))
+        points = num.reshape(points, (1,2))
 
 
@@ -422 +414 @@
 
     try:
-        points = ensure_numeric(points, Float)
+        points = ensure_numeric(points, num.Float)
     except NameError, e:
         raise NameError, e
@@ -431 +423 @@
     #if verbose: print 'Checking input to separate_points_by_polygon 2'
     try:
-        polygon = ensure_numeric(polygon, Float)
+        polygon = ensure_numeric(polygon, num.Float)
     except NameError, e:
         raise NameError, e
@@ -453 +445 @@
         # Only one point was passed in.
         # Convert to array of points
-        points = reshape(points, (1,2))
+        points = num.reshape(points, (1,2))
 
     
@@ -472 +464 @@
 
 
-    indices = zeros( M, Int )
+    indices = num.zeros( M, num.Int )
 
     count = _separate_points_by_polygon(points, polygon, indices,
@@ -607 +599 @@
 
     try:
-        polygon = ensure_numeric(polygon, Float)
+        polygon = ensure_numeric(polygon, num.Float)
     except NameError, e:
         raise NameError, e
@@ -616 +608 @@
     x = polygon[:,0]
     y = polygon[:,1]
-    x = concatenate((x, [polygon[0,0]]), axis = 0)
-    y = concatenate((y, [polygon[0,1]]), axis = 0)
+    x = num.concatenate((x, [polygon[0,0]]), axis = 0)
+    y = num.concatenate((y, [polygon[0,1]]), axis = 0)
     
     return x, y
@@ -716 +708 @@
 
     def __call__(self, x, y):
-        x = array(x).astype(Float)
-        y = array(y).astype(Float)
+        x = num.array(x).astype(num.Float)
+        y = num.array(y).astype(num.Float)
 
         N = len(x)
         assert len(y) == N
 
-        points = concatenate( (reshape(x, (N, 1)),
-                               reshape(y, (N, 1))), axis=1 )
+        points = num.concatenate( (num.reshape(x, (N, 1)),
+                                   num.reshape(y, (N, 1))), axis=1 )
 
         if callable(self.default):
             z = self.default(x,y)
         else:
-            z = ones(N, Float) * self.default
+            z = num.ones(N, num.Float) * self.default
 
         for polygon, value in self.regions:
@@ -736 +728 @@
             if callable(value):
                 for i in indices:
-                    xx = array([x[i]])
-                    yy = array([y[i]])
+                    xx = num.array([x[i]])
+                    yy = num.array([y[i]])
                     z[i] = value(xx, yy)[0]
             else: