* tests/core/image/line_graph_image.cc: Remove useless #include's. Move morpho-related tests... * tests/morpho/line_graph_image_morpho.cc: ...here. * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable line_graph_image. (line_graph_image_SOURCES): Re-enable. * tests/morpho/Makefile.am (check_PROGRAMS): Add line_graph_image_morpho. (line_graph_image_morpho_SOURCES): New. --- milena/ChangeLog | 14 ++++++++ milena/tests/core/image/Makefile.am | 4 +- milena/tests/core/image/line_graph_image.cc | 21 ------------ milena/tests/morpho/Makefile.am | 2 + .../line_graph_image_morpho.cc} | 35 +------------------- 5 files changed, 19 insertions(+), 57 deletions(-) copy milena/tests/{core/image/line_graph_image.cc => morpho/line_graph_image_morpho.cc} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b9944a..ad04ece 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Re-enable some tests on line graph entities. + + * tests/core/image/line_graph_image.cc: Remove useless #include's. + Move morpho-related tests... + * tests/morpho/line_graph_image_morpho.cc: ...here. + * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable + line_graph_image. + (line_graph_image_SOURCES): Re-enable. + * tests/morpho/Makefile.am (check_PROGRAMS): Add + line_graph_image_morpho. + (line_graph_image_morpho_SOURCES): New. + +2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Update morpho::meyer_wst. * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 28024e7..5c7e6ac 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -17,7 +17,7 @@ check_PROGRAMS = \ image3d \ image_if \ ## interpolated \ -## line_graph_image \ + line_graph_image \ mono_obased_rle_image \ mono_rle_image \ obased_rle_image \ @@ -45,7 +45,7 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc image_if_SOURCES = image_if.cc ##interpolated_SOURCES = interpolated.cc -##line_graph_image_SOURCES = line_graph_image.cc +line_graph_image_SOURCES = line_graph_image.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/core/image/line_graph_image.cc index c57f3ab..2e7fbe4 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/core/image/line_graph_image.cc @@ -37,10 +37,6 @@ #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -137,21 +133,4 @@ int main() << std::endl; } std::cout << std::endl; - - /*--------------------------. - | Processing graph images. | - `--------------------------*/ - - line_graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - // Manual iteration over the domain of IMA_DIL. - mln_piter_(ima_t) p_dil(ima_dil.domain()); - for_all (p_dil) - std::cout << "ima_dil (" << p_dil << ") = " << ima_dil(p_dil) << std::endl; - std::cout << std::endl; - - line_graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - // Manual iteration over the domain of IMA_ERO. - mln_piter_(ima_t) p_ero(ima_ero.domain()); - for_all (p_ero) - std::cout << "ima_ero (" << p_ero << ") = " << ima_ero(p_ero) << std::endl; } diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index b913846..8955692 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -20,6 +20,7 @@ check_PROGRAMS = \ ## lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ ## line_graph_image_wst \ + line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ @@ -51,6 +52,7 @@ hit_or_miss_SOURCES = hit_or_miss.cc laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc +line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/morpho/line_graph_image_morpho.cc similarity index 81% copy from milena/tests/core/image/line_graph_image.cc copy to milena/tests/morpho/line_graph_image_morpho.cc index c57f3ab..2306513 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -35,12 +35,9 @@ #include <mln/core/image/line_graph_elt_window.hh> #include <mln/core/image/line_graph_window_piter.hh> +#include <mln/morpho/erosion.hh> #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -89,13 +86,6 @@ int main() p_line_graph<point2d> plg(g); - // Check adjacencies of edge 1. - mln_assertion( plg.adjacent(1, 0)); - mln_assertion(!plg.adjacent(1, 1)); - mln_assertion( plg.adjacent(1, 2)); - mln_assertion(!plg.adjacent(1, 3)); - mln_assertion( plg.adjacent(1, 4)); - /*-------------------. | Line graph image. | `-------------------*/ @@ -115,29 +105,6 @@ int main() typedef line_graph_image<point2d, int> ima_t; ima_t ima(plg, vertex_values, edge_values); - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" << p << ") = " << ima(p) << std::endl; - - // Manual iterations over the neighborhoods of each point site of IMA. - typedef line_graph_elt_window<point2d> win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "sites adjacent to " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" - << std::endl; - } - std::cout << std::endl; - /*--------------------------. | Processing graph images. | `--------------------------*/ -- 1.6.0.1