Fixing svn commit testing issues

1 files changed, 0 insertions, 210 deletions

diff --git a/scipy/testing/utils.py b/scipy/testing/utils.py
deleted file mode 100644
index 362f30fec..000000000
--- a/scipy/testing/utils.py
+++ /dev/null
@@ -1,210 +0,0 @@
-"""
-Utility function to facilitate testing.
-"""
-
-import os
-import sys
-import time
-import math
-
-__all__ = ['assert_equal', 'assert_almost_equal','assert_approx_equal',
-           'assert_array_equal', 'assert_array_less',
-           'assert_array_almost_equal', 'jiffies', 'memusage', 'rand']
-
-def rand(*args):
-    """Returns an array of random numbers with the given shape.
-    
-    This only uses the standard library, so it is useful for testing purposes. 
-    """
-    import random
-    from scipy.base import zeros, Float64
-    results = zeros(args,Float64)
-    f = results.flat
-    for i in range(len(f)):
-        f[i] = random.random()
-    return results
-
-if sys.platform[:5]=='linux':
-    def jiffies(_proc_pid_stat = '/proc/%s/stat'%(os.getpid()),
-                _load_time=time.time()):
-        """ Return number of jiffies (1/100ths of a second) that this
-    process has been scheduled in user mode. See man 5 proc. """
-        try:
-            f=open(_proc_pid_stat,'r')
-            l = f.readline().split(' ')
-            f.close()
-            return int(l[13])
-        except:
-            return int(100*(time.time()-_load_time))
-
-    def memusage(_proc_pid_stat = '/proc/%s/stat'%(os.getpid())):
-        """ Return virtual memory size in bytes of the running python.
-        """
-        try:
-            f=open(_proc_pid_stat,'r')
-            l = f.readline().split(' ')
-            f.close()
-            return int(l[22])
-        except:
-            return
-else:
-    # os.getpid is not in all platforms available.
-    # Using time is safe but inaccurate, especially when process
-    # was suspended or sleeping.
-    def jiffies(_load_time=time.time()):
-        """ Return number of jiffies (1/100ths of a second) that this
-    process has been scheduled in user mode. [Emulation with time.time]. """
-        return int(100*(time.time()-_load_time))
-
-    def memusage():
-        """ Return memory usage of running python. [Not implemented]"""
-        return
-
-def assert_equal(actual,desired,err_msg='',verbose=1):
-    """ Raise an assertion if two items are not
-        equal.  I think this should be part of unittest.py
-    """
-    from scipy.base import ArrayType
-    if isinstance(actual, ArrayType) or isinstance(desired, ArrayType):
-        return assert_array_equal(actual, desired, err_msg)
-    msg = '\nItems are not equal:\n' + err_msg
-    try:
-        if ( verbose and len(repr(desired)) < 100 and len(repr(actual)) ):
-            msg =  msg \
-                 + 'DESIRED: ' + repr(desired) \
-                 + '\nACTUAL: ' + repr(actual)
-    except:
-        msg =  msg \
-             + 'DESIRED: ' + repr(desired) \
-             + '\nACTUAL: ' + repr(actual)
-    assert desired == actual, msg
-
-
-def assert_almost_equal(actual,desired,decimal=7,err_msg='',verbose=1):
-    """ Raise an assertion if two items are not
-        equal.  I think this should be part of unittest.py
-    """
-    from scipy.base import ArrayType
-    if isinstance(actual, ArrayType) or isinstance(desired, ArrayType):
-        return assert_array_almost_equal(actual, desired, decimal, err_msg)
-    msg = '\nItems are not equal:\n' + err_msg
-    try:
-        if ( verbose and len(repr(desired)) < 100 and len(repr(actual)) ):
-            msg =  msg \
-                 + 'DESIRED: ' + repr(desired) \
-                 + '\nACTUAL: ' + repr(actual)
-    except:
-        msg =  msg \
-             + 'DESIRED: ' + repr(desired) \
-             + '\nACTUAL: ' + repr(actual)
-    assert round(abs(desired - actual),decimal) == 0, msg
-
-
-def assert_approx_equal(actual,desired,significant=7,err_msg='',verbose=1):
-    """ Raise an assertion if two items are not
-        equal.  I think this should be part of unittest.py
-        Approximately equal is defined as the number of significant digits
-        correct
-    """
-    msg = '\nItems are not equal to %d significant digits:\n' % significant
-    msg += err_msg
-    actual, desired = map(float, (actual, desired))
-    if desired==actual:
-        return
-    # Normalized the numbers to be in range (-10.0,10.0)
-    scale = float(pow(10,math.floor(math.log10(0.5*(abs(desired)+abs(actual))))))
-    try:
-        sc_desired = desired/scale
-    except ZeroDivisionError:
-        sc_desired = 0.0
-    try:
-        sc_actual = actual/scale
-    except ZeroDivisionError:
-        sc_actual = 0.0
-    try:
-        if ( verbose and len(repr(desired)) < 100 and len(repr(actual)) ):
-            msg =  msg \
-                 + 'DESIRED: ' + repr(desired) \
-                 + '\nACTUAL: ' + repr(actual)
-    except:
-        msg =  msg \
-             + 'DESIRED: ' + repr(desired) \
-             + '\nACTUAL: ' + repr(actual)
-    assert math.fabs(sc_desired - sc_actual) < pow(10.,-1*significant), msg
-
-
-def assert_array_equal(x,y,err_msg=''):
-    from scipy.base import asarray, alltrue, equal, shape, ravel, array2string
-    x,y = asarray(x), asarray(y)
-    msg = '\nArrays are not equal'
-    try:
-        assert 0 in [len(shape(x)),len(shape(y))] \
-               or (len(shape(x))==len(shape(y)) and \
-                   alltrue(equal(shape(x),shape(y)))),\
-                   msg + ' (shapes %s, %s mismatch):\n\t' \
-                   % (shape(x),shape(y)) + err_msg
-        reduced = ravel(equal(x,y))
-        cond = alltrue(reduced)
-        if not cond:
-            s1 = array2string(x,precision=16)
-            s2 = array2string(y,precision=16)
-            if len(s1)>120: s1 = s1[:120] + '...'
-            if len(s2)>120: s2 = s2[:120] + '...'
-            match = 100-100.0*reduced.tolist().count(1)/len(reduced)
-            msg = msg + ' (mismatch %s%%):\n\tArray 1: %s\n\tArray 2: %s' % (match,s1,s2)
-        assert cond,\
-               msg + '\n\t' + err_msg
-    except ValueError:
-        raise ValueError, msg
-
-
-def assert_array_almost_equal(x,y,decimal=6,err_msg=''):
-    from scipy.base import asarray, alltrue, equal, shape, ravel,\
-         array2string, less_equal, around
-    x = asarray(x)
-    y = asarray(y)
-    msg = '\nArrays are not almost equal'
-    try:
-        cond = alltrue(equal(shape(x),shape(y)))
-        if not cond:
-            msg = msg + ' (shapes mismatch):\n\t'\
-                  'Shape of array 1: %s\n\tShape of array 2: %s' % (shape(x),shape(y))
-        assert cond, msg + '\n\t' + err_msg
-        reduced = ravel(equal(less_equal(around(abs(x-y),decimal),10.0**(-decimal)),1))
-        cond = alltrue(reduced)
-        if not cond:
-            s1 = array2string(x,precision=decimal+1)
-            s2 = array2string(y,precision=decimal+1)
-            if len(s1)>120: s1 = s1[:120] + '...'
-            if len(s2)>120: s2 = s2[:120] + '...'
-            match = 100-100.0*reduced.tolist().count(1)/len(reduced)
-            msg = msg + ' (mismatch %s%%):\n\tArray 1: %s\n\tArray 2: %s' % (match,s1,s2)
-        assert cond,\
-               msg + '\n\t' + err_msg
-    except ValueError:
-        print sys.exc_value
-        print shape(x),shape(y)
-        print x, y
-        raise ValueError, 'arrays are not almost equal'
-
-def assert_array_less(x,y,err_msg=''):
-    from scipy.base import asarray, alltrue, less, equal, shape, ravel, array2string
-    x,y = asarray(x), asarray(y)
-    msg = '\nArrays are not less-ordered'
-    try:
-        assert alltrue(equal(shape(x),shape(y))),\
-               msg + ' (shapes mismatch):\n\t' + err_msg
-        reduced = ravel(less(x,y))
-        cond = alltrue(reduced)
-        if not cond:
-            s1 = array2string(x,precision=16)
-            s2 = array2string(y,precision=16)
-            if len(s1)>120: s1 = s1[:120] + '...'
-            if len(s2)>120: s2 = s2[:120] + '...'
-            match = 100-100.0*reduced.tolist().count(1)/len(reduced)
-            msg = msg + ' (mismatch %s%%):\n\tArray 1: %s\n\tArray 2: %s' % (match,s1,s2)
-        assert cond,\
-               msg + '\n\t' + err_msg
-    except ValueError:
-        print shape(x),shape(y)
-        raise ValueError, 'arrays are not less-ordered'