https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Miscellaneous clean up in tests. * tests/core/graph_image.cc, * tests/core/line_graph_image.cc: Aesthetics changes. Remove dead code. * tests/morpho/lena_line_graph_image_wst2.cc: Typos. * mln/util/graph.hh: Remove old FIXME. * doc/Makefile.am: Add a FIXME. doc/Makefile.am | 1 + mln/util/graph.hh | 4 ---- tests/core/graph_image.cc | 4 ++-- tests/core/line_graph_image.cc | 26 ++------------------------ tests/morpho/lena_line_graph_image_wst2.cc | 8 ++++---- 5 files changed, 9 insertions(+), 34 deletions(-) Index: tests/core/graph_image.cc --- tests/core/graph_image.cc (revision 1885) +++ tests/core/graph_image.cc (working copy) @@ -136,9 +136,9 @@ } std::cout << std::endl; - /*-------------------------. + /*--------------------------. | Processing graph images. | - `-------------------------*/ + `--------------------------*/ graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); draw::graph(ima_rep, ima_dil, 9); Index: tests/core/line_graph_image.cc --- tests/core/line_graph_image.cc (revision 1885) +++ tests/core/line_graph_image.cc (working copy) @@ -118,9 +118,9 @@ } 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. @@ -134,26 +134,4 @@ 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; - - -// /* FIXME: When implementing convert::to_line_graph_image, don't -// forget to give a second argument defaulting to something like -// fun::vv2v::max(). This second argument is a functor used to -// compute the values of the edges of the line graph image. */ -// image2d ima; // = ... -// lg_ima_t lg_ima = convert::to_line_graph_image (ima); - -// // Image2d representation. -// image2d<value_t> out = convert::to_image2d (lg_ima); -// io::pgm::save(out, "out.pgm"); - -// /* FIXME: Then, add some real processing on the line graph image -// before converting to an image2d: -// - erosion/dilation, -// - Beucher's gradient, -// - Meyer's WST (on the gradient of LG_IMA?), -// - attribute filters (see my notes on Laurent's remarks about -// attributes), -// - etc. -// Creating seperate tests for all these would be wise. */ } Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 1885) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -37,12 +37,12 @@ The scenario is as follows: \li load a 2-D, gray-level image from a PGM file; \li convert this 2-D image into a line graph-based one, where values - on edges are computed as the absolute value f the difference + on edges are computed as the absolute value of the difference between the values on the nodes adjacent to the edge, so as to - create a (norm of the gradient) ``between the pixels'' of the + create a (norm of the) gradient ``between the pixels'' of the input image; - \li reduce the number of minima using an area opening (computing the - area using the vertices, not the edges); + \li reduce the number of minima using an area opening (counting the + vertices to compute the area, not the edges); \li perform a WST on this simplified line graph image; \li reduce the quantification of the result of the WST; \li create an 2-D, color output image with height and width double Index: mln/util/graph.hh --- mln/util/graph.hh (revision 1885) +++ mln/util/graph.hh (working copy) @@ -33,12 +33,8 @@ # include <mln/util/internal/graph_base.hh> - -// FIXME: More doc! - // FIXME: Rename node(s) as vertex (vertices). - namespace mln { Index: doc/Makefile.am --- doc/Makefile.am (revision 1885) +++ doc/Makefile.am (working copy) @@ -1,4 +1,5 @@ # FIXME: To be overhauled! (See ticket #134). +# FIXME: Rename `internal' as `all' or `complete'. DOXYGEN = doxygen