[python-dtcwt] 303/497: tests: use datasets.lena() to load lena image

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit 7884f7f1057448613b51f3a65b01b874850ce56d
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Fri Jan 31 15:47:37 2014 +0000

    tests: use datasets.lena() to load lena image
    
    There is tests.datasets.lena(). Use it.
---
 tests/testagainstmatlab.py   | 3 ++-
 tests/testcoldfilt.py        | 4 +++-
 tests/testcolfilter.py       | 4 +++-
 tests/testcolifilt.py        | 4 +++-
 tests/testifm2.py            | 3 ++-
 tests/testopenclcoldfilt.py  | 3 ++-
 tests/testopenclcolfilter.py | 3 ++-
 tests/testopenclcolifilt.py  | 3 ++-
 tests/testopenclxfm2.py      | 3 ++-
 tests/testxfm2.py            | 3 ++-
 10 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/tests/testagainstmatlab.py b/tests/testagainstmatlab.py
index c7ad694..175709e 100644
--- a/tests/testagainstmatlab.py
+++ b/tests/testagainstmatlab.py
@@ -8,6 +8,7 @@ from dtcwt.lowlevel import coldfilt, colifilt
 from dtcwt.sampling import rescale_highpass
 
 from .util import assert_almost_equal, summarise_mat, assert_percentile_almost_equal
+import tests.datasets as datasets
 
 ## IMPORTANT NOTE ##
 
@@ -43,7 +44,7 @@ def assert_percentile_almost_equal_to_summary(a, summary, *args, **kwargs):
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
     global verif
     verif = np.load(os.path.join(os.path.dirname(__file__), 'verification.npz'))
diff --git a/tests/testcoldfilt.py b/tests/testcoldfilt.py
index 422148f..8c59c0e 100644
--- a/tests/testcoldfilt.py
+++ b/tests/testcoldfilt.py
@@ -5,9 +5,11 @@ from dtcwt.lowlevel import coldfilt
 
 from nose.tools import raises
 
+import tests.datasets as datasets
+
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testcolfilter.py b/tests/testcolfilter.py
index dc1f7ca..37e900b 100644
--- a/tests/testcolfilter.py
+++ b/tests/testcolfilter.py
@@ -4,9 +4,11 @@ import numpy as np
 from dtcwt import biort, qshift
 from dtcwt.lowlevel import colfilter
 
+import tests.datasets as datasets
+
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testcolifilt.py b/tests/testcolifilt.py
index 7135f5b..3af4132 100644
--- a/tests/testcolifilt.py
+++ b/tests/testcolifilt.py
@@ -5,9 +5,11 @@ from dtcwt.lowlevel import colifilt
 
 from nose.tools import raises
 
+import tests.datasets as datasets
+
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testifm2.py b/tests/testifm2.py
index 24095d1..37bf3fd 100644
--- a/tests/testifm2.py
+++ b/tests/testifm2.py
@@ -4,12 +4,13 @@ from nose.plugins.attrib import attr
 
 import numpy as np
 from dtcwt import dtwavexfm2, dtwaveifm2, biort, qshift
+import tests.datasets as datasets
 
 TOLERANCE = 1e-12
 
 def setup():
     global lena, lena_crop
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena'].astype(np.float64)
+    lena = datasets.lena().astype(np.float64)
     lena_crop = lena[:233, :301]
 
 def test_lena_loaded():
diff --git a/tests/testopenclcoldfilt.py b/tests/testopenclcoldfilt.py
index ede5828..d4b383d 100644
--- a/tests/testopenclcoldfilt.py
+++ b/tests/testopenclcoldfilt.py
@@ -8,10 +8,11 @@ from dtcwt.coeffs import biort, qshift
 from nose.tools import raises
 
 from .util import assert_almost_equal, skip_if_no_cl
+import tests.datasets as datasets
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testopenclcolfilter.py b/tests/testopenclcolfilter.py
index 289e3c0..bb08795 100644
--- a/tests/testopenclcolfilter.py
+++ b/tests/testopenclcolfilter.py
@@ -6,10 +6,11 @@ from dtcwt.backend.backend_opencl.lowlevel import colfilter
 from dtcwt.lowlevel import colfilter as colfilter_gold
 
 from .util import assert_almost_equal, skip_if_no_cl
+import tests.datasets as datasets
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testopenclcolifilt.py b/tests/testopenclcolifilt.py
index 90a79f2..6cea09e 100644
--- a/tests/testopenclcolifilt.py
+++ b/tests/testopenclcolifilt.py
@@ -8,10 +8,11 @@ from dtcwt.coeffs import biort, qshift
 from nose.tools import raises
 
 from .util import assert_almost_equal, skip_if_no_cl
+import tests.datasets as datasets
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testopenclxfm2.py b/tests/testopenclxfm2.py
index 545fbe6..ab6254a 100644
--- a/tests/testopenclxfm2.py
+++ b/tests/testopenclxfm2.py
@@ -8,13 +8,14 @@ from dtcwt import dtwavexfm2 as dtwavexfm2_np, dtwaveifm2
 from dtcwt.backend.backend_opencl.transform2d import dtwavexfm2 as dtwavexfm2_cl
 
 from .util import assert_almost_equal, skip_if_no_cl
+import tests.datasets as datasets
 
 TOLERANCE = 1e-12
 GOLD_TOLERANCE = 1e-5
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)
diff --git a/tests/testxfm2.py b/tests/testxfm2.py
index b568271..7867ddd 100644
--- a/tests/testxfm2.py
+++ b/tests/testxfm2.py
@@ -4,12 +4,13 @@ from nose.plugins.attrib import attr
 
 import numpy as np
 from dtcwt import dtwavexfm2, dtwaveifm2, biort, qshift
+import tests.datasets as datasets
 
 TOLERANCE = 1e-12
 
 def setup():
     global lena
-    lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']
+    lena = datasets.lena()
 
 def test_lena_loaded():
     assert lena.shape == (512, 512)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git