Author: Ilya Osadchiy <[email protected]>
Branch: numpy-impicit-convert
Changeset: r45098:3aff9add6a8d
Date: 2011-06-24 16:11 +0300
http://bitbucket.org/pypy/pypy/changeset/3aff9add6a8d/
Log: Some tests for conversion to numarray
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -96,7 +96,7 @@
for i in range(5):
assert b[i] == i + 5
- def test_add_other(self):
+ def test_add_list(self):
from numpy import array
a = array(range(5))
b = list(reversed(range(5)))
diff --git a/pypy/module/micronumpy/test/test_ufuncs.py
b/pypy/module/micronumpy/test/test_ufuncs.py
--- a/pypy/module/micronumpy/test/test_ufuncs.py
+++ b/pypy/module/micronumpy/test/test_ufuncs.py
@@ -23,14 +23,26 @@
assert isinstance(min_a_b, array)
for i in range(3):
assert min_a_b[i] == min(a[i], b[i])
+ min_b_a = minimum(b, a)
+ assert isinstance(min_b_a, array)
+ for i in range(3):
+ assert min_b_a[i] == min(a[i], b[i])
min_a_c = minimum(a, c)
assert isinstance(min_a_c, array)
for i in range(3):
assert min_a_c[i] == min(a[i], c)
+ min_c_a = minimum(c, a)
+ assert isinstance(min_c_a, array)
+ for i in range(3):
+ assert min_c_a[i] == min(a[i], c)
min_b_c = minimum(b, c)
assert isinstance(min_b_c, array)
for i in range(3):
assert min_b_c[i] == min(b[i], c)
+ min_c_b = minimum(c, b)
+ assert isinstance(min_c_b, array)
+ for i in range(3):
+ assert min_c_b[i] == min(b[i], c)
def test_negative(self):
from numpy import array, negative
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
