[Numpy-svn] r6006 - trunk/numpy/core/tests

[numpy-svn at scipy.org]

Author: charris
Date: 2008-11-11 12:03:47 -0600 (Tue, 11 Nov 2008)
New Revision: 6006

Modified:
   trunk/numpy/core/tests/test_umath.py
Log:
Comment out tests that hang on some machines.
Add tests that might hang in more informative places.

Modified: trunk/numpy/core/tests/test_umath.py
===================================================================
--- trunk/numpy/core/tests/test_umath.py	2008-11-11 08:36:22 UTC (rev 6005)
+++ trunk/numpy/core/tests/test_umath.py	2008-11-11 18:03:47 UTC (rev 6006)
@@ -54,16 +54,17 @@
             assert_almost_equal(np.exp2(yf), xf)
 
 class TestLogAddExp2(object):
+    pass
     # Need test for intermediate precisions
-    def test_logaddexp2_values(self) :
-        x = [1, 2, 3, 4, 5]
-        y = [5, 4, 3, 2, 1]
-        z = [6, 6, 6, 6, 6]
-        for dt, dec in zip(['f','d','g'],[6, 15, 15]) :
-            xf = np.log2(np.array(x, dtype=dt))
-            yf = np.log2(np.array(y, dtype=dt))
-            zf = np.log2(np.array(z, dtype=dt))
-            assert_almost_equal(np.logaddexp2(xf, yf), zf, decimal=dec)
+#    def test_logaddexp2_values(self) :
+#        x = [1, 2, 3, 4, 5]
+#        y = [5, 4, 3, 2, 1]
+#        z = [6, 6, 6, 6, 6]
+#        for dt, dec in zip(['f','d','g'],[6, 15, 15]) :
+#            xf = np.log2(np.array(x, dtype=dt))
+#            yf = np.log2(np.array(y, dtype=dt))
+#            zf = np.log2(np.array(z, dtype=dt))
+#            assert_almost_equal(np.logaddexp2(xf, yf), zf, decimal=dec)
 
 #    def test_logaddexp2_range(self) :
 #        x = [1000000., -1000000., 1000200., -1000200.]
@@ -96,15 +97,16 @@
             assert_almost_equal(np.exp(yf), xf)
 
 class TestLogAddExp(object):
-    def test_logaddexp_values(self) :
-        x = [1, 2, 3, 4, 5]
-        y = [5, 4, 3, 2, 1]
-        z = [6, 6, 6, 6, 6]
-        for dt, dec in zip(['f','d','g'],[6, 15, 15]) :
-            xf = np.log(np.array(x, dtype=dt))
-            yf = np.log(np.array(y, dtype=dt))
-            zf = np.log(np.array(z, dtype=dt))
-            assert_almost_equal(np.logaddexp(xf, yf), zf, decimal=dec)
+    pass
+#    def test_logaddexp_values(self) :
+#        x = [1, 2, 3, 4, 5]
+#        y = [5, 4, 3, 2, 1]
+#        z = [6, 6, 6, 6, 6]
+#        for dt, dec in zip(['f','d','g'],[6, 15, 15]) :
+#            xf = np.log(np.array(x, dtype=dt))
+#            yf = np.log(np.array(y, dtype=dt))
+#            zf = np.log(np.array(z, dtype=dt))
+#            assert_almost_equal(np.logaddexp(xf, yf), zf, decimal=dec)
 
 #    def test_logaddexp_range(self) :
 #        x = [1000000., -1000000., 1000200., -1000200.]
@@ -117,8 +119,16 @@
 #            assert_almost_equal(np.logaddexp(logxf, logyf), logzf)
 
 class TestLog1p(TestCase):
+    def test_log1p_d(self):
+        np.log1p(np.array(1e-100, dtype='d'))
+
+    def test_log1p_f(self):
+        np.log1p(np.array(1e-100, dtype='f'))
+
+    def test_log1p_g(self):
+        np.log1p(np.array(1e-100, dtype='g'))
+
     def test_log1p(self):
-        np.log1p(1e-100)
         assert_almost_equal(ncu.log1p(0.2), ncu.log(1.2))
         assert_almost_equal(ncu.log1p(1e-6), ncu.log(1+1e-6))