Changeset 7276 for misc/tools/pytools/test_pytools.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• misc/tools/pytools/test_pytools.py (modified) (3 diffs)

misc/tools/pytools/test_pytools.py

@@ -1 +1 @@
 import unittest
-import Numeric
+import numpy as num
 from combinatorics import bitvector
 from numtools import expand 
@@ -14 +14 @@
 
         d = 4
-        assert Numeric.allclose(bitvector(0, d), Numeric.array([0,0,0,0]))
-        assert Numeric.allclose(bitvector(1, d), Numeric.array([1,0,0,0]))
-        assert Numeric.allclose(bitvector(2, d), Numeric.array([0,1,0,0]))
-        assert Numeric.allclose(bitvector(3, d), Numeric.array([1,1,0,0]))
-        assert Numeric.allclose(bitvector(4, d), Numeric.array([0,0,1,0]))
-        assert Numeric.allclose(bitvector(5, d), Numeric.array([1,0,1,0]))
-        assert Numeric.allclose(bitvector(6, d), Numeric.array([0,1,1,0]))
-        assert Numeric.allclose(bitvector(7, d), Numeric.array([1,1,1,0]))
-        assert Numeric.allclose(bitvector(8, d), Numeric.array([0,0,0,1]))
-        assert Numeric.allclose(bitvector(9, d), Numeric.array([1,0,0,1]))
-        assert Numeric.allclose(bitvector(10, d), Numeric.array([0,1,0,1]))
-        assert Numeric.allclose(bitvector(11, d), Numeric.array([1,1,0,1]))
-        assert Numeric.allclose(bitvector(12, d), Numeric.array([0,0,1,1]))
-        assert Numeric.allclose(bitvector(13, d), Numeric.array([1,0,1,1]))
-        assert Numeric.allclose(bitvector(14, d), Numeric.array([0,1,1,1]))
-        assert Numeric.allclose(bitvector(15, d), Numeric.array([1,1,1,1]))
+        assert num.allclose(bitvector(0, d), num.array([0,0,0,0]))
+        assert num.allclose(bitvector(1, d), num.array([1,0,0,0]))
+        assert num.allclose(bitvector(2, d), num.array([0,1,0,0]))
+        assert num.allclose(bitvector(3, d), num.array([1,1,0,0]))
+        assert num.allclose(bitvector(4, d), num.array([0,0,1,0]))
+        assert num.allclose(bitvector(5, d), num.array([1,0,1,0]))
+        assert num.allclose(bitvector(6, d), num.array([0,1,1,0]))
+        assert num.allclose(bitvector(7, d), num.array([1,1,1,0]))
+        assert num.allclose(bitvector(8, d), num.array([0,0,0,1]))
+        assert num.allclose(bitvector(9, d), num.array([1,0,0,1]))
+        assert num.allclose(bitvector(10, d), num.array([0,1,0,1]))
+        assert num.allclose(bitvector(11, d), num.array([1,1,0,1]))
+        assert num.allclose(bitvector(12, d), num.array([0,0,1,1]))
+        assert num.allclose(bitvector(13, d), num.array([1,0,1,1]))
+        assert num.allclose(bitvector(14, d), num.array([0,1,1,1]))
+        assert num.allclose(bitvector(15, d), num.array([1,1,1,1]))
         
 
@@ -35 +35 @@
 
         d = 4
-        mask = Numeric.array([0,1,1,0,1])
-        v = Numeric.array([2,3,4])
+        mask = num.array([0,1,1,0,1])
+        v = num.array([2,3,4])
 
-        assert Numeric.allclose(expand(v, mask), Numeric.array([0,2,3,0,4]))
+        assert num.allclose(expand(v, mask), num.array([0,2,3,0,4]))