Changeset 2526 for inundation/pyvolution/util.py

Timestamp:

Mar 12, 2006, 9:25:40 PM (18 years ago)

Author:

ole

Message:

Moved more general numerical functionality into utilities/numerical_tools.py

File:

• inundation/pyvolution/util.py (modified) (2 diffs)

inundation/pyvolution/util.py

@@ -8 +8 @@
 import utilities.polygon
 from warnings import warn
-
-
-def angle(v):
-    """Compute angle between e1 (the unit vector in the x-direction)
-    and the specified vector
-    """
-
-    from math import acos, pi, sqrt
-    from Numeric import sum, array
-
-    l = sqrt( sum (array(v)**2))
-    v1 = v[0]/l
-    v2 = v[1]/l
-
-
-    theta = acos(v1)
-    
-    #try:
-    #   theta = acos(v1)
-    #except ValueError, e:
-    #    print 'WARNING (util.py): Angle acos(%s) failed: %s' %(str(v1), e)
-    #
-    #    #FIXME, hack to avoid acos(1.0) Value error
-    #    # why is it happening?
-    #    # is it catching something we should avoid?
-    #    #FIXME (Ole): When did this happen? We need a unit test to
-    #    #reveal this condition or otherwise remove the hack
-    #    
-    #    s = 1e-6
-    #    if (v1+s >  1.0) and (v1-s < 1.0) :
-    #        theta = 0.0
-    #    elif (v1+s >  -1.0) and (v1-s < -1.0):
-    #        theta = 3.1415926535897931
-    #    print 'WARNING (util.py): angle v1 is %f, setting acos to %f '\
-    #          %(v1, theta)
-
-    if v2 < 0:
-        #Quadrant 3 or 4
-        theta = 2*pi-theta
-
-    return theta
-
-
-def anglediff(v0, v1):
-    """Compute difference between angle of vector x0, y0 and x1, y1.
-    This is used for determining the ordering of vertices,
-    e.g. for checking if they are counter clockwise.
-
-    Always return a positive value
-    """
-
-    from math import pi
-
-    a0 = angle(v0)
-    a1 = angle(v1)
-
-    #Ensure that difference will be positive
-    if a0 < a1:
-        a0 += 2*pi
-
-    return a0-a1
-
-
-def mean(x):
-    from Numeric import sum
-    return sum(x)/len(x)
-
 
 
@@ -465 +398 @@
 
 
+def angle(v):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT      
+    
+    msg = 'angle has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import angle"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.angle(v)
+    
+def anglediff(v0, v1):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT
+    
+    msg = 'anglediff has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import anglediff"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.anglediff(v0, v1)    
+
+    
+def mean(x):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT    
+    
+    msg = 'mean has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import mean"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.mean(x)    
+
 def point_on_line(*args, **kwargs):
     """Temporary Interface to new location"""