Index: olena/ChangeLog from Giovanni Palma &lt;giovanni(a)lrde.epita.fr&gt; * tests/morpho/tests/attribute: Correct function name problems. * tests/morpho/tests/area: Likewise. Index: olena/tests/morpho/tests/area --- olena/tests/morpho/tests/area Fri, 06 Feb 2004 15:26:24 +0100 van-vl_n (oln/j/44_area 1.1 644) +++ olena/tests/morpho/tests/area Mon, 15 Mar 2004 16:59:27 +0100 palma_g (oln/j/44_area 1.1 644) @@ -41,7 +41,7 @@ im(10) = 0; image1d<int_u8> im2 = - morpho::tarjan::area_opening(im, neighb_c2(), 2); + morpho::fast::card_opening(im, neighb_c2(), 2); fail = fail || im2(0) != 0 || @@ -57,7 +57,7 @@ im2(10)!= 0; image1d<int_u8> im3 = - morpho::tarjan::area_opening(im, neighb_c2(), 3); + morpho::fast::card_opening(im, neighb_c2(), 3); fail = fail || im3(0) != 0 || im3(1) != 0 || @@ -72,7 +72,7 @@ im3(10)!= 0; image1d<int_u8> im4 = - morpho::tarjan::area_opening(im, neighb_c2(), 4); + morpho::fast::card_opening(im, neighb_c2(), 4); fail = fail || im4(0) != 0 || im4(1) != 0 || @@ -111,7 +111,7 @@ im(10) = -4; image1d<int_s<3> > im2 = - morpho::tarjan::area_opening(im, neighb_c2(), 2); + morpho::fast::card_opening(im, neighb_c2(), 2); fail = fail || im2(0) != -4 || @@ -127,7 +127,7 @@ im2(10)!= -4; image1d<int_s<3> > im3 = - morpho::tarjan::area_opening(im, neighb_c2(), 3); + morpho::fast::card_opening(im, neighb_c2(), 3); fail = fail || im3(0) != -4 || im3(1) != -4 || @@ -142,7 +142,7 @@ im3(10)!= -4; image1d<int_s<3> > im4 = - morpho::tarjan::area_opening(im, neighb_c2(), 4); + morpho::fast::card_opening(im, neighb_c2(), 4); fail = fail || im4(0) != -4 || im4(1) != -4 || @@ -165,7 +165,7 @@ bool fail(false); image2d<int_u8> lena = load(rdata("lena.pgm")); - image2d<int_u8> lena5 = morpho::tarjan::area_closing(lena, neighb_c8(), 100); + image2d<int_u8> lena5 = morpho::fast::card_closing(lena, neighb_c8(), 100); unsigned l = 0; image2d<int_u8>::iter_type it_l(lena5); Index: olena/tests/morpho/tests/attribute --- olena/tests/morpho/tests/attribute Wed, 10 Mar 2004 16:20:23 +0100 palma_g (oln/j/51_attribute 1.3 644) +++ olena/tests/morpho/tests/attribute Mon, 15 Mar 2004 17:04:59 +0100 palma_g (oln/j/51_attribute 1.3 644) @@ -28,7 +28,7 @@ bool fail(false); typedef image2d<int_u8> img_type; - typedef oln::morpho::cart_type<unsigned> area_type; + typedef oln::morpho::card_type<unsigned> area_type; const area_type::lambda_type area = 100; const neighborhood2d nb = neighb_c8(); // const oln::morpho::NullEnv env; -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74