From e7e60a6cdb8f11c460b4a6507986ebf7dc3ab028 Mon Sep 17 00:00:00 2001 From: Olivier Debeir Date: Tue, 16 Oct 2012 14:40:42 +0200 Subject: [PATCH] keep true test in /test, move temporary tests in local --- skimage/rank/local/__init__.py | 1 + skimage/rank/{tests => local}/demo_16bitbilateral.py | 0 skimage/rank/{tests => local}/demo_all.py | 0 skimage/rank/{tests => local}/demo_benchmark.py | 2 +- skimage/rank/{tests => local}/demo_single.py | 0 skimage/rank/{tests => local}/test_morph_contr_enh.py | 0 skimage/rank/{tests => local}/test_rank.py | 0 skimage/rank/{tests => local}/tools.py | 0 skimage/rank/tests/test_suite.py | 2 +- 9 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 skimage/rank/local/__init__.py rename skimage/rank/{tests => local}/demo_16bitbilateral.py (100%) rename skimage/rank/{tests => local}/demo_all.py (100%) rename skimage/rank/{tests => local}/demo_benchmark.py (98%) rename skimage/rank/{tests => local}/demo_single.py (100%) rename skimage/rank/{tests => local}/test_morph_contr_enh.py (100%) rename skimage/rank/{tests => local}/test_rank.py (100%) rename skimage/rank/{tests => local}/tools.py (100%) diff --git a/skimage/rank/local/__init__.py b/skimage/rank/local/__init__.py new file mode 100644 index 00000000..10b6fb15 --- /dev/null +++ b/skimage/rank/local/__init__.py @@ -0,0 +1 @@ +__author__ = 'olivier' diff --git a/skimage/rank/tests/demo_16bitbilateral.py b/skimage/rank/local/demo_16bitbilateral.py similarity index 100% rename from skimage/rank/tests/demo_16bitbilateral.py rename to skimage/rank/local/demo_16bitbilateral.py diff --git a/skimage/rank/tests/demo_all.py b/skimage/rank/local/demo_all.py similarity index 100% rename from skimage/rank/tests/demo_all.py rename to skimage/rank/local/demo_all.py diff --git a/skimage/rank/tests/demo_benchmark.py b/skimage/rank/local/demo_benchmark.py similarity index 98% rename from skimage/rank/tests/demo_benchmark.py rename to skimage/rank/local/demo_benchmark.py index c3046083..feae3a8b 100644 --- a/skimage/rank/tests/demo_benchmark.py +++ b/skimage/rank/local/demo_benchmark.py @@ -6,7 +6,7 @@ from skimage.morphology import dilation import skimage.rank as rank from skimage.filter import median_filter -from tools import log_timing +from skimage.rank.local.tools import log_timing @log_timing def cr_max(image,selem): diff --git a/skimage/rank/tests/demo_single.py b/skimage/rank/local/demo_single.py similarity index 100% rename from skimage/rank/tests/demo_single.py rename to skimage/rank/local/demo_single.py diff --git a/skimage/rank/tests/test_morph_contr_enh.py b/skimage/rank/local/test_morph_contr_enh.py similarity index 100% rename from skimage/rank/tests/test_morph_contr_enh.py rename to skimage/rank/local/test_morph_contr_enh.py diff --git a/skimage/rank/tests/test_rank.py b/skimage/rank/local/test_rank.py similarity index 100% rename from skimage/rank/tests/test_rank.py rename to skimage/rank/local/test_rank.py diff --git a/skimage/rank/tests/tools.py b/skimage/rank/local/tools.py similarity index 100% rename from skimage/rank/tests/tools.py rename to skimage/rank/local/tools.py diff --git a/skimage/rank/tests/test_suite.py b/skimage/rank/tests/test_suite.py index d0e2c319..9d2bcfea 100644 --- a/skimage/rank/tests/test_suite.py +++ b/skimage/rank/tests/test_suite.py @@ -66,7 +66,7 @@ class TestSequenceFunctions(unittest.TestCase): def test_bitdepth(self): # test the different bit depth for rank16 - + elem = np.ones((3,3),dtype='uint8') a16 = np.ones((100,100),dtype='uint16')*255 r = _crank16_percentiles.mean(image=a16,selem = elem,shift_x=0,shift_y=0,p0=.1,p1=.9,bitdepth=8)