- Olena-patches

milena r1655: Update and clean extract character example
by Guillaume Duhamel 11 Jan '08

11 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update and clean extract character example. * sandbox/nivault/extract_character.cc: Clean and update. --- extract_character.cc | 287 +++++++++++++++++++++++++++------------------------ 1 file changed, 152 insertions(+), 135 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1654) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1655) @@ -71,20 +71,125 @@ using namespace mln; +bool +is_character(box2d box, unsigned cardinality) +{ + unsigned rows = box.nrows(); + unsigned cols = box.ncols(); + unsigned size = rows * cols; + float ratio = (float) (rows * cols) / cardinality; + + /// Remove noise. + if ((rows < 5) && (cols < 5)) + return true; + +// if (rows < cols) +// ratio = cols / rows; +// else +// ratio = rows / cols; + +// if (ratio > 3) +// return true; + +// if (vec_card[i].to_result () /*rows * cols*/ < 200) + +// if (size / card < 0.3) +// return true; + +// if (((float)card / (float)size) > 0.7) +// return true; + +// if (((float)card / (float)size) < 0.3) +// return true; + +// if (cols > 20) +// return true; + +// if (cols < 10) +// return true; + + float min = 0.2; + float max = 0.7; + + if (cardinality < size * min) + return true; + + if (cardinality > size * max) + return true; + + return false; +} + +template <typename I> +void +draw_bbox(I& image, box2d box) +{ + point2d pmin = box.pmin(); + point2d pmax = box.pmax(); + + point2d p1 (pmin[0], pmin[1]); + point2d p2 (pmax[0], pmin[1]); + point2d p3 (pmin[0], pmax[1]); + point2d p4 (pmax[0], pmax[1]); + + draw::line (image, p1, p2, literal::red); + draw::line (image, p2, p4, literal::red); + draw::line (image, p4, p3, literal::red); + draw::line (image, p3, p1, literal::red); +} + +template <typename I> +void +check_with_ref(I& image, std::string path_ref, std::string path_output) +{ + image2d<bool> ref = io::pbm::load (path_ref); + image2d<value::rgb8> mask (image.domain()); + unsigned cpt = 0; + unsigned ok = 0; + + mln_piter(I) p (image.domain ()); + + for_all (p) + { + if (image(p)) + if (ref(p)) + mask(p) = literal::red; + else + { + mask(p) = literal::white; + ++ok; + } + else + if (ref(p)) + { + ++ok; + mask(p) = literal::black; + } + else + mask(p) = literal::green; + ++cpt; + } + io::ppm::save(mask, path_output + "check.ppm"); + std::cout << "Reussite : " << (float)ok / (float)cpt * 100 << "% (" + << ok << "/" << cpt << ")." << std::endl; +} + + int main(int argc, char** argv) { using value::int_u8; + using value::rgb8; + typedef point2d P; typedef image2d<bool> I; typedef image2d<unsigned> I_LABEL; typedef image2d<value::rgb8> O; - typedef point2d P; if (argc != 3) { std::cerr << "Usage : " << argv[0] - << " input.pbm output.pbm" << std::endl; + << " input.pbm output" << std::endl; exit(1); } @@ -103,195 +208,107 @@ // input2 = morpho::dilation(input, win); // io::pbm::save (output, path_output); -/// Labeling. + +/// Labeling the input image. unsigned nb_labels; I_LABEL label_image = labeling::blobs(input, c8(), nb_labels); std::cout << "nb_labels = " << nb_labels << std::endl; /// Extraction of informations in the image (BoundingBox, Cardinality, ... ). - -// std::vector< accu::mean_ <point2d> > vec_mean (nb_labels + 1); -// std::vector< accu::p<accu::mean<point2d> >::ret > vec_mean (nb_labels + 1); std::vector< accu::bbox <point2d> > vec_bbox (nb_labels + 1); std::vector< accu::count_<point2d> > vec_card (nb_labels + 1); - mln_piter_(I_LABEL) p (label_image.domain ()); for_all (p) { if (input(p)) output(p) = literal::white; -// vec_mean[label_image(p)].take (p); vec_bbox[label_image(p)].take (p); vec_card[label_image(p)].take (p); } - I_LABEL text_ima (label_image.domain()); + /// Generation of the text image (text_image). + I_LABEL text_image (label_image.domain()); for (unsigned i = 0; i <= nb_labels; ++i) { - float ratio = 0; - unsigned rows = vec_bbox[i].to_result().nrows(); - unsigned cols = vec_bbox[i].to_result().ncols(); - unsigned size = rows * cols; - unsigned card = vec_card[i].to_result(); - - /// Remove noise. - if ((rows < 5) && (cols < 5)) - continue; - - /// Evaluation of kind of data (character or not). - { -// if (rows < cols) -// ratio = cols / rows; -// else -// ratio = rows / cols; - -// if (ratio > 3) -// continue; - -// if (vec_card[i].to_result () /*rows * cols*/ < 200) - -// if (size / card < 0.3) -// continue; - -// if (((float)card / (float)size) > 0.7) -// continue; - -// if (((float)card / (float)size) < 0.3) -// continue; - -// if (cols > 20) -// continue; - - if (cols < 10) - continue; - } - - - float min = 0.2; - float max = 0.7; - - if (card < size * min) - continue; - - if (card > size * max) + if (is_character(vec_bbox[i].to_result(), vec_card[i].to_result())) continue; + /// Copy text in an image (text_image). { typedef sub_image<I_LABEL, box2d> I_SUB; typedef image_if_value<I_SUB> I_VAL; - I_SUB sub_ima = (label_image | vec_bbox[i].to_result()); - I_VAL val_ima = (sub_ima | i); + I_SUB sub_image = (label_image | vec_bbox[i].to_result()); + I_VAL val_image = (sub_image | i); - mln_piter_(I_VAL) p(val_ima.domain()); + mln_piter_(I_VAL) p(val_image.domain()); + + /// Hack : problem with traits in image_if. for_all (p) - text_ima(p) = val_ima(p); + text_image(p) = val_image(p); -// /// Hack + /// Here is the good way to do the previous action. // level::paste (val_ima, text_ima); } } - - - - - /// Generation of the graph. - I_LABEL zi_image = geom::seeds2tiling(text_ima, c4 ()); - mesh_p<point2d> m = make::voronoi(zi_image, text_ima, c4()); - + /// Generation of the graph from text image. + I_LABEL zi_image = geom::seeds2tiling(text_image, c4 ()); + mesh_p<point2d> m = make::voronoi(zi_image, text_image, c4()); I_LABEL gr_image (label_image.domain ()); I_LABEL gr_image2 (label_image.domain ()); draw::mesh(gr_image, m, 255, 128); draw::mesh(gr_image2, m, 255, 0); + + + /// Dilation of node of the graph. win::disk2d win (30); I_LABEL pr = morpho::dilation(gr_image2, win); I bool_ima (label_image.domain ()); level::paste(pr, bool_ima); + /// Labeling the dilated image. + unsigned nb_dilated_node_labels; + I_LABEL label_image2 = labeling::blobs(bool_ima, c8(), nb_dilated_node_labels); + std::cout << "nb_dilated_node_labels = " << nb_dilated_node_labels << std::endl; + std::vector< accu::bbox <point2d> > vec_bbox2 (nb_dilated_node_labels + 1); - - /// Labeling2. - unsigned nb_labels2; - I_LABEL label_image2 = labeling::blobs(bool_ima, c8(), nb_labels2); - std::cout << "nb_labels = " << nb_labels2 << std::endl; - std::vector< accu::bbox <point2d> > vec_bbox2 (nb_labels2 + 1); - + /// Extract area of text. mln_piter_(I_LABEL) pl (label_image.domain ()); for_all (pl) - { vec_bbox2[label_image2(pl)].take (pl); - } - for (unsigned i = 0; i <= nb_labels2; ++i) - { - P pmin = vec_bbox2[i].to_result().pmin(); - P pmax = vec_bbox2[i].to_result().pmax(); - point2d p1 (pmin[0], pmin[1]); - point2d p2 (pmax[0], pmin[1]); - point2d p3 (pmin[0], pmax[1]); - point2d p4 (pmax[0], pmax[1]); - - draw::line (output, p1, p2, literal::red); - draw::line (output, p2, p4, literal::red); - draw::line (output, p4, p3, literal::red); - draw::line (output, p3, p1, literal::red); - } + /// Draw the bounding box of area of text in output. + for (unsigned i = 0; i <= nb_dilated_node_labels; ++i) + draw_bbox(output, vec_bbox2[i].to_result()); + + image2d<int_u8> out (label_image.domain ()); + + /// Save the influence area of the node of the graphe (seed2tiling result). + level::stretch (zi_image, out); + io::pgm::save(out, path_output + ".text_area.approx.pgm"); + std::cout << path_output + ".text_area.approx.pgm" << " generated" << std::endl; + + /// Save the graph of the text. + level::stretch (gr_image, out); + io::pgm::save(out, path_output + ".text_graph.pgm"); + std::cout << path_output + ".text_graph.pgm" << " generated" << std::endl; + + + /// Save the output image (input image + bounding box text in red). + io::ppm::save(output, path_output + ".ppm"); + std::cout << path_output + ".ppm" << " generated" << std::endl; - io::ppm::save(output, "rgb.ppm"); - // image2d<int_u8> process (label_image.domain ()); // level::stretch (label_image2, process); // io::pgm::save(process, "process.pgm"); -// // I ref = io::pbm::load ("ref_text.pbm"); -// // image2d<value::rgb8> mask (ref.domain()); -// // mln_piter_(I_LABEL) p_out (text_ima.domain ()); - -// // unsigned cpt = 0; -// // unsigned ok = 0; - -// // for_all (p_out) -// // { -// // if (text_ima(p_out)) -// // if (ref(p_out)) -// // mask(p_out) = literal::red; -// // else -// // { -// // mask(p_out) = literal::white; -// // ++ok; -// // } -// // else -// // if (ref(p_out)) -// // { -// // ++ok; -// // mask(p_out) = literal::black; -// // } -// // else -// // mask(p_out) = literal::green; -// // ++cpt; -// // } -// // io::ppm::save(mask, "rgb.ppm"); -// // std::cout << "Reussite : " << (float)ok / (float)cpt * 100 << "% (" -// // << ok << "/" << cpt << ")." << std::endl; - -// image2d<int_u8> out (label_image.domain ()); - - -// level::stretch (zi_image, out); -// io::pgm::save(out, "out.text_area.approx.pgm"); - -// level::stretch (gr_image, out); -// io::pgm::save(out, "out.text_graph.pgm"); - -// std::cout << path_output << " generated" << std::endl; - }

1 0

milena r1654: Update example character extraction
by Guillaume Duhamel 11 Jan '08

11 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update example character extraction. * sandbox/nivault/extract_character.cc: Update. --- extract_character.cc | 144 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 106 insertions(+), 38 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1653) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1654) @@ -78,6 +78,9 @@ typedef image2d<bool> I; typedef image2d<unsigned> I_LABEL; + typedef image2d<value::rgb8> O; + + typedef point2d P; if (argc != 3) { std::cerr << "Usage : " << argv[0] @@ -88,7 +91,8 @@ std::string path_input = argv[1]; std::string path_output = argv[2]; - image2d<bool> input = io::pbm::load (path_input); + I input = io::pbm::load (path_input); + O output (input.domain ()); /// Inversion video. morpho::complementation_inplace(input); @@ -96,12 +100,12 @@ /// FIXME : Some code was deleted here :-) (Remove noise) // win::disk2d win (2); -// I output = morpho::closing(input, win); +// input2 = morpho::dilation(input, win); // io::pbm::save (output, path_output); /// Labeling. unsigned nb_labels; - I_LABEL label_image = labeling::blobs(input, c4(), nb_labels); + I_LABEL label_image = labeling::blobs(input, c8(), nb_labels); std::cout << "nb_labels = " << nb_labels << std::endl; @@ -116,6 +120,8 @@ mln_piter_(I_LABEL) p (label_image.domain ()); for_all (p) { + if (input(p)) + output(p) = literal::white; // vec_mean[label_image(p)].take (p); vec_bbox[label_image(p)].take (p); vec_card[label_image(p)].take (p); @@ -131,6 +137,13 @@ unsigned size = rows * cols; unsigned card = vec_card[i].to_result(); + /// Remove noise. + if ((rows < 5) && (cols < 5)) + continue; + + + /// Evaluation of kind of data (character or not). + { // if (rows < cols) // ratio = cols / rows; // else @@ -150,13 +163,22 @@ // if (((float)card / (float)size) < 0.3) // continue; +// if (cols > 20) +// continue; - if (cols < 5) + if (cols < 10) continue; + } - if (cols > 20) + + float min = 0.2; + float max = 0.7; + + if (card < size * min) continue; + if (card > size * max) + continue; { typedef sub_image<I_LABEL, box2d> I_SUB; @@ -179,51 +201,97 @@ - /// Generation of the graph. -// I_LABEL zi_image = geom::seeds2tiling(label_image, c4 ()); -// mesh_p<point2d> m = make::voronoi(label_image, zi_image, c4()); + I_LABEL zi_image = geom::seeds2tiling(text_ima, c4 ()); + mesh_p<point2d> m = make::voronoi(zi_image, text_ima, c4()); -// I_LABEL gr_image (label_image.domain ()); -// draw::mesh(gr_image, m, 255, 128); + I_LABEL gr_image (label_image.domain ()); + I_LABEL gr_image2 (label_image.domain ()); + draw::mesh(gr_image, m, 255, 128); + draw::mesh(gr_image2, m, 255, 0); + win::disk2d win (30); + I_LABEL pr = morpho::dilation(gr_image2, win); + I bool_ima (label_image.domain ()); + level::paste(pr, bool_ima); - I ref = io::pbm::load ("ref_text.pbm"); - image2d<value::rgb8> mask (ref.domain()); - mln_piter_(I_LABEL) p_out (text_ima.domain ()); - unsigned cpt = 0; - unsigned ok = 0; - for_all (p_out) - { - if (text_ima(p_out)) - if (ref(p_out)) - mask(p_out) = literal::red; - else + /// Labeling2. + unsigned nb_labels2; + I_LABEL label_image2 = labeling::blobs(bool_ima, c8(), nb_labels2); + std::cout << "nb_labels = " << nb_labels2 << std::endl; + std::vector< accu::bbox <point2d> > vec_bbox2 (nb_labels2 + 1); + + mln_piter_(I_LABEL) pl (label_image.domain ()); + for_all (pl) { - mask(p_out) = literal::white; - ++ok; + vec_bbox2[label_image2(pl)].take (pl); } - else - if (ref(p_out)) + + for (unsigned i = 0; i <= nb_labels2; ++i) { - ++ok; - mask(p_out) = literal::black; - } - else - mask(p_out) = literal::green; - ++cpt; + P pmin = vec_bbox2[i].to_result().pmin(); + P pmax = vec_bbox2[i].to_result().pmax(); + + point2d p1 (pmin[0], pmin[1]); + point2d p2 (pmax[0], pmin[1]); + point2d p3 (pmin[0], pmax[1]); + point2d p4 (pmax[0], pmax[1]); + + draw::line (output, p1, p2, literal::red); + draw::line (output, p2, p4, literal::red); + draw::line (output, p4, p3, literal::red); + draw::line (output, p3, p1, literal::red); } - std::cout << "Reussite : " << (float)ok / (float)cpt * 100 << "% (" - << ok << "/" << cpt << ")." << std::endl; - image2d<int_u8> out (label_image.domain ()); - level::stretch (text_ima, out); - io::pgm::save(mask, "rgb.ppm"); - io::pgm::save(out, "out.pgm"); + io::ppm::save(output, "rgb.ppm"); + +// image2d<int_u8> process (label_image.domain ()); +// level::stretch (label_image2, process); +// io::pgm::save(process, "process.pgm"); + +// // I ref = io::pbm::load ("ref_text.pbm"); +// // image2d<value::rgb8> mask (ref.domain()); +// // mln_piter_(I_LABEL) p_out (text_ima.domain ()); + +// // unsigned cpt = 0; +// // unsigned ok = 0; + +// // for_all (p_out) +// // { +// // if (text_ima(p_out)) +// // if (ref(p_out)) +// // mask(p_out) = literal::red; +// // else +// // { +// // mask(p_out) = literal::white; +// // ++ok; +// // } +// // else +// // if (ref(p_out)) +// // { +// // ++ok; +// // mask(p_out) = literal::black; +// // } +// // else +// // mask(p_out) = literal::green; +// // ++cpt; +// // } +// // io::ppm::save(mask, "rgb.ppm"); +// // std::cout << "Reussite : " << (float)ok / (float)cpt * 100 << "% (" +// // << ok << "/" << cpt << ")." << std::endl; + +// image2d<int_u8> out (label_image.domain ()); + + +// level::stretch (zi_image, out); +// io::pgm::save(out, "out.text_area.approx.pgm"); + +// level::stretch (gr_image, out); +// io::pgm::save(out, "out.text_graph.pgm"); - std::cout << path_output << " generated" << std::endl; +// std::cout << path_output << " generated" << std::endl; }

1 0

1653: Fix some tests and get rid of many warnings.
by Roland Levillain 10 Jan '08

10 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix some tests and get rid of many warnings. * mln/value/int_u_sat.hh (int_u_sat<n>::int_u_sat(int)) (int_u_sat<n>::operator=(int)) * tests/accu/max_h.cc, * tests/accu/median.cc, * tests/accu/min_h.cc, * tests/labeling/level.cc, * tests/line_piter.cc, * tests/linear_log.cc, * tests/win/disk2d.cc, * tests/win/octagon2d.cc: Pacify the compiler w.r.t. comparisons between signed and unsigned values. * tests/border/fill.cc: Likewise. (check): Fix the return type of this function. * tests/win/diag2d.cc: Use English in messages, not French. * tests/value/graylevel.cc: Test the division of a gl8 value by an int_s8 value. * tests/line_convolve.cc: Adjust the call to mln::io::load to match the current interface. * tests/value/float01_bis.cc, * tests/sparse_image.cc, * tests/rle_image.cc Disable these tests. * tests/Makefile.am (check_PROGRAMS): Remove chamfer, fun_x2x_composed, fun_x2x_rotation, fun_x2x_translation, h_vec and run_pset. (chamfer_SOURCES, fun_x2x_composed_SOURCES) (fun_x2x_rotation_SOURCES, fun_x2x_translation_SOURCES) (run_pset_SOURCES): Remove. (h_vec_SOURCES): Move... * tests/core/Makefile.am: ...here. (check_PROGRAMS): Add h_vec. * tests/value/builtin.cc: Move... * tests/value/builtin/builtin.cc: ...here. Pacify the compiler w.r.t. unused variables. * tests/value/Makefile.am (check_PROGRAMS): Remove builtin. (builtin_SOURCES): Move... * tests/value/builtin/Makefile.am: ...here. (check_PROGRAMS, TESTS): New. mln/value/int_u_sat.hh | 11 ++++++----- tests/Makefile.am | 17 +++-------------- tests/accu/max_h.cc | 4 ++-- tests/accu/median.cc | 6 +++--- tests/accu/min_h.cc | 4 ++-- tests/border/fill.cc | 8 ++++---- tests/core/Makefile.am | 2 ++ tests/labeling/level.cc | 2 +- tests/line_convolve.cc | 6 +++--- tests/line_piter.cc | 4 ++-- tests/linear_log.cc | 2 +- tests/rle_image.cc | 12 ++++++++++++ tests/sparse_image.cc | 13 +++++++++++++ tests/value/Makefile.am | 2 -- tests/value/builtin/Makefile.am | 8 ++++++++ tests/value/builtin/builtin.cc | 6 +++++- tests/value/float01_bis.cc | 7 +++++++ tests/value/graylevel.cc | 13 +++++++++++-- tests/value/int_u8.cc | 2 ++ tests/win/diag2d.cc | 4 ++-- tests/win/disk2d.cc | 5 +++-- tests/win/octagon2d.cc | 4 ++-- 22 files changed, 94 insertions(+), 48 deletions(-) Index: tests/linear_log.cc --- tests/linear_log.cc (revision 1652) +++ tests/linear_log.cc (working copy) @@ -71,6 +71,6 @@ { int_u8 min, max; estim::min_max(out, min, max); - mln_assertion(min == 0 && max == 255); + mln_assertion(min == 0u && max == 255u); } } Index: tests/accu/max_h.cc --- tests/accu/max_h.cc (revision 1652) +++ tests/accu/max_h.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -58,5 +58,5 @@ a.take(234); a.take(234); a.take(234); - mln_assertion(a.to_result() == 234); + mln_assertion(a.to_result() == 234u); } Index: tests/accu/median.cc --- tests/accu/median.cc (revision 1652) +++ tests/accu/median.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -54,7 +54,7 @@ med.take(1); med.take(0); - mln_assertion(med.to_result() == 5); + mln_assertion(med.to_result() == 5u); } { @@ -64,6 +64,6 @@ med.take(7); med.take(0); - mln_assertion(med.to_result() == 7); + mln_assertion(med.to_result() == 7u); } } Index: tests/accu/min_h.cc --- tests/accu/min_h.cc (revision 1652) +++ tests/accu/min_h.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -58,5 +58,5 @@ a.take(234); a.take(234); a.take(234); - mln_assertion(a.to_result() == 42); + mln_assertion(a.to_result() == 42u); } Index: tests/value/float01_bis.cc --- tests/value/float01_bis.cc (revision 1652) +++ tests/value/float01_bis.cc (working copy) @@ -34,8 +34,14 @@ #include <mln/value/float01_8.hh> #include <mln/value/float01_16.hh> + int main() { + /* FIXME: The contents of this test seens to have nothing to do with + floats. I (Roland) suspect a copy-and-paste error here. Either + rename the test or turn it into an actual test on floats or get + rid of it. */ +#if 0 using namespace mln::value; float01_8 a; @@ -50,4 +56,5 @@ c = (a * 2) / 2; assert(c == white); +#endif } Index: tests/value/int_u8.cc --- tests/value/int_u8.cc (revision 1652) +++ tests/value/int_u8.cc (working copy) @@ -49,6 +49,7 @@ // Assignment. { i = 51; + // FIXME: Triggers a warning about signed vs unsigned comparison. sym_compare_assert(i, ==, 51); i = 51u; @@ -185,6 +186,7 @@ c /= 2; sym_compare_assert(c, ==, 50.f); + // FIXME: Triggers a warning about signed vs unsigned comparison. d /= 2.4f; } Index: tests/value/builtin/Makefile.am --- tests/value/builtin/Makefile.am (revision 1652) +++ tests/value/builtin/Makefile.am (working copy) @@ -1,3 +1,11 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + builtin + +# FIXME: Rename this test, as `builtin' is not enough relevant. +builtin_SOURCES = builtin.cc + +TESTS = $(check_PROGRAMS) Index: tests/value/builtin/builtin.cc --- tests/value/builtin/builtin.cc (revision 1651) +++ tests/value/builtin/builtin.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -114,9 +114,13 @@ { mln::trait::solve_binary< trait::op::test_2, int, value::scalar_< value::int_u8 > >::ret tmp; double& d = tmp; + // Avoid a warning about unused variable D. + d = d; } { mln::trait::solve_unary< trait::op::test, int >::ret tmp; double& d = tmp; + // Avoid a warning about unused variable D. + d = d; } } Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 1652) +++ tests/value/Makefile.am (working copy) @@ -12,7 +12,6 @@ check_PROGRAMS = \ bool \ - builtin \ equiv \ float01_bis \ float01 \ @@ -33,7 +32,6 @@ # rgb_full bool_SOURCES = bool.cc -builtin_SOURCES = builtin.cc equiv_SOURCES = equiv.cc float01_bis_SOURCES = float01_bis.cc float01_SOURCES = float01.cc Index: tests/value/graylevel.cc --- tests/value/graylevel.cc (revision 1652) +++ tests/value/graylevel.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -37,6 +37,7 @@ #include <mln/value/glf.hh> #include <mln/value/int_u8.hh> +#include <mln/value/int_s8.hh> #include <mln/value/float01_f.hh> #include <mln/value/float01_.hh> @@ -127,12 +128,20 @@ mln_assertion(a / true == a); // gl8 / Integer + /* FIXME: The compiler emits a warning about a comparison between + signed and unsigned for the first line, but not for the second. + This behavior is strange, since + + a * int_u(23); + + triggers no warning. See whether traits and conversions are + handled symmetrically for `*' and `/'. */ a / int_u8(23); + a / int_s8(23); // gl8 / Floating a / float01_f(.23); a / float01_<16>(.23); - } { Index: tests/border/fill.cc --- tests/border/fill.cc (revision 1652) +++ tests/border/fill.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -38,7 +38,7 @@ using namespace mln; -int +void check(int size, int border) { int w = size + 2 * border; @@ -48,11 +48,11 @@ border::fill (ima, 42); for(int i = 0; i < ww; ++i) if ((i / w < border) || (i / w > border + size)) - mln_assertion (ima[i] == 42); + mln_assertion (ima[i] == 42u); else if ((i % w < border) && (border + size <= i % w)) - mln_assertion (ima[i] == 42); + mln_assertion (ima[i] == 42u); } int Index: tests/win/disk2d.cc --- tests/win/disk2d.cc (revision 1652) +++ tests/win/disk2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -53,7 +53,8 @@ { mln_assertion(((abs(x) <= 27) && (abs(y) <= 27)) || !disk.has(dpoint2d(y, x))); - mln_assertion(((x * x + y * y) <= l2) == (disk.has(dpoint2d(y, x))) || + mln_assertion(((x * x + y * y) <= static_cast<int>(l2)) == + (disk.has(dpoint2d(y, x))) || abs(x) > 27 || abs(y) > 27); } Index: tests/win/octagon2d.cc --- tests/win/octagon2d.cc (revision 1652) +++ tests/win/octagon2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -52,7 +52,7 @@ { mln_assertion(((abs(x) <= 6) && (abs(y) <= 6)) || !oct.has(dpoint2d(y, x))); - mln_assertion((abs(x) + abs(y) <= l / 2 + l / 6) == + mln_assertion((abs(x) + abs(y) <= static_cast<int>(l / 2 + l / 6)) == (oct.has(dpoint2d(y, x))) || abs(x) > 2 || abs(y) > 2); Index: tests/win/diag2d.cc --- tests/win/diag2d.cc (revision 1652) +++ tests/win/diag2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -57,7 +57,7 @@ << ", y = " << y << " : " - << ((diag.has(dpoint2d(x, y))) ? "VRAI" : "FAUX") + << ((diag.has(dpoint2d(x, y))) ? "True" : "False") << std::endl; mln_assertion((x == -y) == (diag.has(dpoint2d(y, x))) || abs(x) > 2 || abs(y) > 2); Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 1652) +++ tests/labeling/level.cc (working copy) @@ -60,7 +60,7 @@ { image2d<unsigned> labels = labeling::level(lena, l, c4(), n); unsigned npix = - accu::compute<accu::count>(labels | (pw::value(labels) != pw::cst(0))); + accu::compute<accu::count>(labels | (pw::value(labels) != pw::cst(0u))); npixels += npix; } mln_assertion(npixels == lena.npoints()); Index: tests/sparse_image.cc --- tests/sparse_image.cc (revision 1652) +++ tests/sparse_image.cc (working copy) @@ -29,6 +29,14 @@ * * \brief Tests on mln::sparse_image. */ + + +// FIXME: There's already a test named sparse_image.cc in tests/core. +// It seems to be pretty old material, not in sync with the current +// version of sparse_image for a long time. Disable it before asking +// for its deletion. + + #include <mln/core/image2d.hh> #include <mln/core/sparse_image.hh> #include <mln/core/sparse_encode.hh> @@ -70,6 +78,9 @@ int main() { + // FIXME: Disabled (cf. supra). +#if 0 + mln::point2d p, q, r; p = mln::make::point2d(0, 1); q = mln::make::point2d(3, 0); @@ -109,4 +120,6 @@ // std::cout << std::endl; return 0; + +#endif } Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 1652) +++ tests/core/Makefile.am (working copy) @@ -6,6 +6,7 @@ category \ clone \ exact \ + h_vec \ initialize \ mesh_elt_window \ mesh_image \ @@ -25,6 +26,7 @@ category_SOURCES = category.cc clone_SOURCES = clone.cc exact_SOURCES = exact.cc +h_vec_SOURCES = h_vec.cc initialize_SOURCES = initialize.cc mesh_elt_window_SOURCES = mesh_elt_window.cc mesh_image_SOURCES = mesh_image.cc Index: tests/line_convolve.cc --- tests/line_convolve.cc (revision 1652) +++ tests/line_convolve.cc (working copy) @@ -52,9 +52,9 @@ border::thickness = 4; - image2d<int_u8> - lena = io::pgm::load(MLN_IMG_DIR "/lena.pgm"), - out(lena.domain()); + image2d<int_u8> lena; + io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); + image2d<int_u8> out(lena.domain()); image2d<float> tmp(lena.domain()); float ws[] = { .11, .11, .11, .11, .11, .11, .11, .11, .11 }; Index: tests/rle_image.cc --- tests/rle_image.cc (revision 1652) +++ tests/rle_image.cc (working copy) @@ -32,6 +32,13 @@ * \todo Trouble with ctor/init since there is no ctor with arg! */ + +// FIXME: There's already a test named rle_image.cc in tests/core. It +// seems to be pretty old material, not in sync with the current +// version of rle_image for a long time. Disable it before asking for +// its deletion. + + #include <mln/core/image2d.hh> #include <mln/core/rle_image.hh> #include <mln/core/rle_encode.hh> @@ -55,6 +62,9 @@ int main() { + // FIXME: Disabled (cf. supra). +#if 0 + mln::point2d p, q, r; r = make::point2d(0, 1); q = make::point2d(2, 2); @@ -90,4 +100,6 @@ // std::cout << std::endl; return 0; + +#endif } Index: tests/Makefile.am --- tests/Makefile.am (revision 1652) +++ tests/Makefile.am (working copy) @@ -24,6 +24,9 @@ value \ win +# FIXME: rle_image.cc and sparse_image.cc are probably garbage now +# (superseded by core/rle_image.cc and core/sparse_image.cc). Ask +# Simon whether we can remove them. check_PROGRAMS = \ border_resize_image1d_1 \ border_resize_image1d_2 \ @@ -41,7 +44,6 @@ box3d \ \ cast_image \ - chamfer \ convert_to_image \ convert_to_tiles \ convert_to_p_array \ @@ -54,13 +56,8 @@ \ estim_mean \ \ - fun_x2x_composed \ - fun_x2x_rotation \ - fun_x2x_translation \ - \ hexa \ histo_to_image1d \ - h_vec \ \ image1d \ image2d \ @@ -101,7 +98,6 @@ pw_value \ \ rle_image \ - run_pset \ \ safe_image \ seed2tiling \ @@ -144,7 +140,6 @@ box3d_SOURCES = box3d.cc cast_image_SOURCES = cast_image.cc -chamfer_SOURCES = chamfer.cc convert_to_image_SOURCES = convert_to_image.cc convert_to_tiles_SOURCES = convert_to_tiles.cc convert_to_p_array_SOURCES = convert_to_p_array.cc @@ -157,13 +152,8 @@ estim_mean_SOURCES = estim_mean.cc -fun_x2x_composed_SOURCES = fun_x2x_composed.cc -fun_x2x_rotation_SOURCES = fun_x2x_rotation.cc -fun_x2x_translation_SOURCES = fun_x2x_translation.cc - hexa_SOURCES = hexa.cc histo_to_image1d_SOURCES = histo_to_image1d.cc -h_vec_SOURCES = h_vec.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc @@ -204,7 +194,6 @@ pw_value_SOURCES = pw_value.cc rle_image_SOURCES = rle_image.cc -run_pset_SOURCES = run_pset.cc safe_image_SOURCES = safe_image.cc seed2tiling_SOURCES = seed2tiling.cc Index: tests/line_piter.cc --- tests/line_piter.cc (revision 1652) +++ tests/line_piter.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -42,7 +42,7 @@ image2d<int> f(b, border); image2d<int>::line_piter p(f.domain()); - unsigned i = 1; + int i = 1; for_all(p) { mln_assertion(p[1] == 0 && p[0] == i++); Index: mln/value/int_u_sat.hh --- mln/value/int_u_sat.hh (revision 1652) +++ mln/value/int_u_sat.hh (working copy) @@ -151,10 +151,9 @@ static const unsigned max_ = mln_max(int_u<n>); if (i < 0) this->v_ = 0; - // FIXME: This comparison triggers a warning between signed and - // unsigned values from the compiler. If it is valid, use a - // cast and leave a comment about it. - else if (i > max_) + // Explicitly cast I to unsigned to avoid a warning between + // signed and unsigned values from the compiler. + else if (static_cast<unsigned>(i) > max_) this->v_ = max_; else this->v_ = i; @@ -175,7 +174,9 @@ static const unsigned max_ = mln_max(int_u<n>); if (i < 0) this->v_ = 0; - else if (i > max_) + // Explicitly cast I to unsigned to avoid a warning between + // signed and unsigned values from the compiler. + else if (static_cast<unsigned>(i) > max_) this->v_ = max_; else this->v_ = i;

1 0

1651: Clean up configure.ac.
by Roland Levillain 10 Jan '08

10 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Clean up configure.ac. * configure.ac: Sort the list of configured Makefiles from milena/tests/ alphabetically. configure.ac | 78 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 38 deletions(-) Index: configure.ac --- configure.ac (revision 1651) +++ configure.ac (working copy) @@ -78,66 +78,68 @@ ## Tests. ## ## ------- ## -# +# Ask for the creation of a milena/tests/data.hh, used to access to +# data (images) from tests. AC_CONFIG_FILES([milena/tests/data.hh]) # FIXME: Should be performed through oln.m4 macros, as we did in Olena 0.11? +# Ask for the creation of tests' Makefiles. AC_CONFIG_FILES([ milena/tests/Makefile - milena/tests/core/Makefile - milena/tests/norm/Makefile - milena/tests/geom/Makefile - milena/tests/literal/Makefile - milena/tests/level/Makefile - milena/tests/level/naive/Makefile - milena/tests/level/approx/Makefile - milena/tests/draw/Makefile + milena/tests/accu/Makefile milena/tests/arith/Makefile + milena/tests/border/Makefile milena/tests/canvas/Makefile milena/tests/canvas/browsing/Makefile milena/tests/canvas/morpho/Makefile - milena/tests/math/Makefile - milena/tests/border/Makefile - milena/tests/logical/Makefile - milena/tests/trait/Makefile - milena/tests/trait/image/Makefile - milena/tests/trait/value/Makefile - milena/tests/trait/op/Makefile - milena/tests/histo/Makefile - milena/tests/tag/Makefile - milena/tests/debug/Makefile - milena/tests/metal/Makefile - milena/tests/metal/math/Makefile - milena/tests/metal/make/Makefile - milena/tests/accu/Makefile - milena/tests/linear/Makefile - milena/tests/linear/local/Makefile - milena/tests/value/Makefile - milena/tests/value/concept/Makefile - milena/tests/value/builtin/Makefile milena/tests/convert/Makefile + milena/tests/core/Makefile + milena/tests/debug/Makefile + milena/tests/display/Makefile + milena/tests/draw/Makefile milena/tests/estim/Makefile - milena/tests/pw/Makefile milena/tests/fun/Makefile milena/tests/fun/i2v/Makefile - milena/tests/fun/x2x/Makefile milena/tests/fun/p2b/Makefile milena/tests/fun/p2v/Makefile milena/tests/fun/v2v/Makefile - milena/tests/set/Makefile - milena/tests/win/Makefile - milena/tests/trace/Makefile - milena/tests/morpho/Makefile + milena/tests/fun/x2x/Makefile + milena/tests/geom/Makefile + milena/tests/histo/Makefile milena/tests/io/Makefile + milena/tests/io/fits/Makefile + milena/tests/io/pbm/Makefile milena/tests/io/pfm/Makefile milena/tests/io/pgm/Makefile - milena/tests/io/fits/Makefile milena/tests/io/pnm/Makefile milena/tests/io/ppm/Makefile - milena/tests/io/pbm/Makefile - milena/tests/util/Makefile - milena/tests/display/Makefile + milena/tests/norm/Makefile milena/tests/labeling/Makefile + milena/tests/level/Makefile + milena/tests/level/approx/Makefile + milena/tests/level/naive/Makefile + milena/tests/linear/Makefile + milena/tests/linear/local/Makefile + milena/tests/literal/Makefile + milena/tests/logical/Makefile + milena/tests/math/Makefile + milena/tests/metal/Makefile + milena/tests/metal/make/Makefile + milena/tests/metal/math/Makefile + milena/tests/morpho/Makefile + milena/tests/pw/Makefile + milena/tests/set/Makefile + milena/tests/tag/Makefile + milena/tests/trace/Makefile + milena/tests/trait/Makefile + milena/tests/trait/image/Makefile + milena/tests/trait/op/Makefile + milena/tests/trait/value/Makefile + milena/tests/util/Makefile + milena/tests/value/Makefile + milena/tests/value/builtin/Makefile + milena/tests/value/concept/Makefile + milena/tests/win/Makefile ]) AC_OUTPUT

1 0

1651: Fix dates in copyright header of mln/linear/sobel.hh.
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/linear/sobel.hh: Fix dates in copyright header. sobel.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mln/linear/sobel.hh --- mln/linear/sobel.hh (revision 1650) +++ mln/linear/sobel.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms

1 0

1650: Documentation and aesthetic changes.
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Documentation and aesthetic changes. * mln/core/trait/qlf_value.hh, * mln/core/internal/image_value_morpher.hh, * mln/fun/c.hh, * mln/metal/is_a.hh: More Doxygen documentation. * mln/level/transform.hh, * mln/core/tr_image.hh, * mln/value/ops.hh: Wrap long lines. core/internal/image_morpher.hh | 4 ++++ core/internal/image_value_morpher.hh | 5 ++++- core/tr_image.hh | 16 ++++++++++++---- core/trait/qlf_value.hh | 4 +++- fun/c.hh | 3 ++- fun/v2v/norm.hh | 2 ++ level/stretch.hh | 1 + level/transform.hh | 9 ++++++--- metal/is_a.hh | 8 ++++++++ norm/l1.hh | 2 ++ norm/l2.hh | 3 +++ value/ops.hh | 7 ++++--- 12 files changed, 51 insertions(+), 13 deletions(-) Index: mln/core/internal/image_value_morpher.hh --- mln/core/internal/image_value_morpher.hh (revision 1649) +++ mln/core/internal/image_value_morpher.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,6 +31,9 @@ /*! \file mln/core/internal/image_value_morpher.hh * * \brief Definition of a base class for image morphers w.r.t. value. + * + * A value morpher alters methods dealing with values (even if the + * actual values are not changed), but leaves the domain untouched. */ # include <mln/core/internal/image_morpher.hh> Index: mln/core/internal/image_morpher.hh --- mln/core/internal/image_morpher.hh (revision 1649) +++ mln/core/internal/image_morpher.hh (working copy) @@ -55,9 +55,13 @@ typedef I delegatee; + /* FIXME: Change the interface of this method: return a reference + instead of a pointer. */ /// Return the delegatee_ pointer; default code. mlc_const(I)* delegatee_() const; + /* FIXME: Change the interface of this method: return a reference + instead of a pointer. */ /// Return the delegatee_ pointer (non-const version); default code. I* delegatee_(); Index: mln/core/tr_image.hh --- mln/core/tr_image.hh (revision 1649) +++ mln/core/tr_image.hh (working copy) @@ -30,8 +30,8 @@ /*! \file mln/core/tr_image.hh * - * \brief Definition of a morpher that makes an image become - * transformed by a given transformation. + * \brief Definition of the morpher mln::tr_image presenting an image + * through a (bijective) transformation. * */ @@ -68,11 +68,13 @@ * */ template <typename T, typename I> - struct tr_image : public mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > + struct tr_image : + public mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > { /// Super type. - typedef mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > super_; + typedef + mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; @@ -96,6 +98,12 @@ /// Constructors. tr_image(I& ima, T& tr); + /* FIXME: What's the purpose of this ctor? AFAIK, morphers + objects (and images in general) cannot have their structure / + core data altered after they're built. Here, there's a + (partial) exception: this morpher provides set_tr(), but has no + set_ima(). I (Roland) don't see the point in keeping this ctor + if we do not provide set_ima(). */ tr_image(); Index: mln/core/trait/qlf_value.hh --- mln/core/trait/qlf_value.hh (revision 1649) +++ mln/core/trait/qlf_value.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,6 +31,8 @@ /*! \file mln/core/trait/qlf_value.hh * * \brief Definition of the qlf_value image trait. + * + * qlf stands for ``qualified''. */ # include <mln/core/macros.hh> Index: mln/metal/is_a.hh --- mln/metal/is_a.hh (revision 1649) +++ mln/metal/is_a.hh (working copy) @@ -36,6 +36,14 @@ # include <mln/metal/bool.hh> +/// \brief Expand to a "metalic" boolean expression stating whether \a +/// T is a subclass of \a U or not. +/// +/// In the current implementation, \a U must be template class with +/// exactly one, non template parameter. +/// +/// This macro is the recommended user interface of the "is_a" +/// facility. # define mlc_is_a(T, U) mln::metal::is_a< T, U > Index: mln/level/transform.hh --- mln/level/transform.hh (revision 1649) +++ mln/level/transform.hh (working copy) @@ -65,7 +65,8 @@ * \pre \p output.domain >= \p input.domain */ template <typename I, typename F, typename O> - void transform(const Image& input, const Function_v2v<F>& f, Image<O>& output); + void transform(const Image& input, const Function_v2v<F>& f, + Image<O>& output); template <typename I, typename F> @@ -83,7 +84,8 @@ template <typename I, typename F, typename O> inline - void transform_(const Image& input_, const Function_v2v<F>& f_, Image<O>& output_) + void transform_(const Image& input_, const Function_v2v<F>& f_, + Image<O>& output_) { trace::entering("level::impl::generic::transform"); @@ -107,7 +109,8 @@ template <typename I, typename F, typename O> inline - void transform(const Image& input, const Function_v2v<F>& f, Image<O>& output) + void transform(const Image& input, const Function_v2v<F>& f, + Image<O>& output) { trace::entering("level::transform"); Index: mln/level/stretch.hh --- mln/level/stretch.hh (revision 1649) +++ mln/level/stretch.hh (working copy) @@ -62,6 +62,7 @@ namespace impl { + // FIXME: The first argument seems to have no effect. template <unsigned n, typename I, typename O> inline void stretch(value::int_u<n>, Index: mln/value/ops.hh --- mln/value/ops.hh (revision 1649) +++ mln/value/ops.hh (working copy) @@ -43,13 +43,14 @@ # include <mln/literal/ops.hh> # include <mln/metal/ret.hh> +/// Type trait for value sum. +# define mln_trait_value_sum_x(T, U) \ + typename mln::trait::value_< mln_trait_op_times(T,U) >::sum -# define mln_trait_value_sum_x(T, U) typename mln::trait::value_< mln_trait_op_times(T,U) >::sum - +/// Shortcut for type trait for value sum. # define mln_sum_x(T, U) mln_trait_value_sum_x(T, U) - // FIXME: In the definitions below, is that equiv or interop? Index: mln/fun/c.hh --- mln/fun/c.hh (revision 1649) +++ mln/fun/c.hh (working copy) @@ -30,7 +30,8 @@ /*! \file mln/fun/c.hh * - * \brief FIXME. + * \brief Encapsulate a plain (C language-like) pointer to function + * into a functor. */ # include <mln/fun/internal/selector.hh> Index: mln/fun/v2v/norm.hh --- mln/fun/v2v/norm.hh (revision 1649) +++ mln/fun/v2v/norm.hh (working copy) @@ -35,6 +35,8 @@ * \see mln/norm/. */ +// FIXME: Move to mln/fun/x2v/? + # include <mln/core/concept/function.hh> # include <mln/trait/value_.hh> Index: mln/norm/l1.hh --- mln/norm/l1.hh (revision 1649) +++ mln/norm/l1.hh (working copy) @@ -37,6 +37,8 @@ # include <mln/math/abs.hh> # include <mln/metal/vec.hh> +// FIXME: Use mln_sum_x (to be renamed as mln_sum_product) instead of +// mln_sum. namespace mln { Index: mln/norm/l2.hh --- mln/norm/l2.hh (revision 1649) +++ mln/norm/l2.hh (working copy) @@ -39,6 +39,9 @@ # include <mln/metal/vec.hh> +// FIXME: Use mln_sum_x (to be renamed as mln_sum_product) instead of +// mln_sum. + namespace mln {

1 0

1649: Fix the computations of the Sobel gradients and norm(s).
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the computations of the Sobel gradients and norm(s). * mln/linear/sobel.hh (mln_gradient_component, mln_gradient): New macros. (mlc_internal_ensure_is_scalar): New local (workaround) macro. (mln::linear::sobel_v, mln::linear::sobel_h, mln::linear::sobel): Revamp these functions. Catch up with the current calling conventions (output passed as returned value). (mln::linear::impl_::sobel_v_, mln::linear::impl_::sobel_h_) (mln::linear::impl_::sobel_): Likewise. (mln::linear::sobel_norm, mln::linear::impl::sobel_norm_): New functions. * tests/linear_sobel._cc: Rename as... * tests/linear/sobel.cc: ...this. Use MLN_IMG_DIR from tests/data.hh to get the path to the img/ directory. Revamp this test. * tests/linear/Makefile.am (check_PROGRAMS, sobel_SOURCES, TESTS): New. mln/linear/sobel.hh | 214 +++++++++++++++++++++++++++++++++++------------ tests/linear/Makefile.am | 7 + tests/linear/sobel.cc | 32 +++++-- 3 files changed, 193 insertions(+), 60 deletions(-) Index: mln/linear/sobel.hh --- mln/linear/sobel.hh (revision 1648) +++ mln/linear/sobel.hh (working copy) @@ -31,12 +31,36 @@ /*! \file mln/linear/sobel.hh * * \brief Sobel filter. + * + * \todo Extends to the case of other dimensions (only the 2-d case + * is handled here). */ +# include <mln/trait/ch_value.hh> +# include <mln/trait/value/nature.hh> + +# include <mln/metal/int.hh> + # include <mln/arith/plus.hh> # include <mln/level/abs.hh> +# include <mln/fun/v2v/norm.hh> +# include <mln/level/transform.hh> # include <mln/linear/line_x2_convolve.hh> +# include <mln/value/stack.hh> + +// FIXME: We might want to move these macros to another file, like +// mln/core/gradient.hh. + + +/// \brief Get the gradient component image type associated to image \a I. +#define mln_gradient_component(I) \ + /* FIXME: Use mln_sum_x (or mln_sum_product) instead of mln_sum. */ \ + mln_ch_value(I, mln_sum(mln_value(I))) + +/// \brief Get the gradient image type associated to image \a I. +#define mln_gradient(I) \ + mln::value::stack_image<I::point::dim, mln_gradient_component(I)> namespace mln @@ -45,68 +69,132 @@ namespace linear { - /*! Convolution of an image \p input by the weighted window \p w_win. - * - * \warning Computation of \p output(p) is performed with the - * value type of \p output. - * - * \warning The weighted window is used as-is, considering that - * its symmetrization is handled by the client. - * - * \pre output.domain = input.domain - * - * \todo Only for 2D so check + generalize. - * - * \todo Suboptimal since it is not point-wise and it costs temp - * images. - */ - template <typename I, typename O> - void sobel_v(const Image& input, Image<O>& output); - - template <typename I, typename O> - void sobel_h(const Image& input, Image<O>& output); - - template <typename I, typename O> - void sobel(const Image& input, Image<O>& output); + /// Sobel gradient components. + /// \{ + /// Compute the vertical component of the Sobel gradient. + template <typename I> + mln_gradient_component(I) sobel_h(const Image& input); + + /// Compute the horizontal component of the Sobel gradient. + template <typename I> + mln_gradient_component(I) sobel_v(const Image& input); + /// \} + + /// Compute the Sobel gradient of an image. + /// + /// \param output A vectorial output image. + /// \param + template <typename I> + mln_gradient(I) sobel(const Image& input); + + /// Compute the norm of the Sobel gradient of an image. + /// + /// \param input a vectorial input image + /// \param output the norm-image of the Sobel gradient of the input image + /// \param norm a norm functor (\see mln/fun/v2v/norm.hh), + /// defaulting to the L1-norm (mln::fun::v2v::l1_norm). + /* FIXME: Add constraints on N (mln::Function_v2v<N>). */ + template <typename I, typename N> + mln_ch_value(I, mln_result(N)) sobel_norm(const Image& input, N norm); + + + /// \brief Compute the L-1 norm of the Sobel gradient of an image. + /// + /// This function is a shortcut for the general + /// mln::linear::sobel_norm function. + template <typename I> + mln_ch_value(I, mln_sum(mln_value(I))) sobel_norm(const Image& input); # ifndef MLN_INCLUDE_ONLY +/// \brief Ensure type \a V is a scalar value. +/// +/// For internal use only (#undef'd before the end of this file). (We +/// might want to export this macro to the user interface; if so, +/// rename it and move it elsewhere.) +/// +/* FIXME: At the moment (rev. 1645), we cannot use mlc_is_a to check + whether V derives from trait::value::nature::scalar like this + + mlc_is_a(trait::value_<V>::nature, trait::value::nature::scalar)::check() + + since `mlc_is_a' doesn't work on non template classes (yet). Hence + the ugly workaround based on comprehensive checks. */ +# define mlc_internal_ensure_is_scalar(V) \ + mlc_or(mlc_equal(typename mln::trait::value_<V>::nature, \ + mln::trait::value::nature::scalar), \ + mlc_or(mlc_equal(typename mln::trait::value_<V>::nature, \ + mln::trait::value::nature::integer), \ + mlc_equal(typename mln::trait::value_<V>::nature, \ + mln::trait::value::nature::floating)))::check() + namespace impl { - template <typename I, typename O> + template <typename I> inline - void sobel_h_(const Image& input, Image<O>& output) + mln_gradient_component(I) + sobel_h_(const Image& input) { - int wrow[] = { -1, 0, 1 }, wcol[] = { 1, + // We don't use const ints here, since it would confuse the + // STL allocators used within the windows used in the + // convolutions. + int wrow[] = { -1, 0, 1 }; + int wcol[] = { 1, 2, 1 }; + // FIXME: It'd probably be nicer to have a "functional" version + // of linear::line_x2_convolve. + mln_gradient_component(I) output(exact(input).domain()); linear::line_x2_convolve(input, wrow, wcol, output); + return output; } - template <typename I, typename O> + template <typename I> inline - void sobel_v_(const Image& input, Image<O>& output) + mln_gradient_component(I) + sobel_v_(const Image& input) { - int wrow[] = { 1, 2, 1 }, wcol[] = { -1, + // We don't use const ints here, since it would confuse the + // STL allocators used within the windows used in the + // convolutions. + int wrow[] = { 1, 2, 1 }; + int wcol[] = { -1, 0, +1 }; + // FIXME: It'd probably be nicer to have a "functional" version + // of linear::line_x2_convolve. + mln_gradient_component(I) output(exact(input).domain()); linear::line_x2_convolve(input, wrow, wcol, output); + return output; } - template <typename I, typename O> + template <typename I> inline - void sobel_(const Image& input, Image<O>& output) + mln_gradient(I) + sobel_(const Image& input) + { + /* FIXME: Not generic w.r.t. the dimension (only works on 2-D + images here). Anyway, we'd need a n-dimensional definition + of the Sobel gradient to. + + Stick with a very simple static assertion for the momemt, + and improve later. */ + mlc_equal(metal::int_<I::point::dim>, metal::int_<2>)::check(); + + mln_gradient_component(I) component_h = linear::sobel_h(input); + mln_gradient_component(I) component_v = linear::sobel_v(input); + return value::stack(component_h, component_v); + } + + /* FIXME: Add constraints on N (mln::Function_v2v<N>). */ + template <typename I, typename N> + mln_ch_value(I, mln_result(N)) + sobel_norm_(const Image& input, N norm) { - // h - sobel_h(input, output); - // v - O temp(exact(input).domain()); - sobel_v(input, temp); - // output - arith::plus_inplace(output, temp); // FIXME: abs before plus!!! - level::abs_inplace(output); + mln_gradient(I) gradient = mln::linear::sobel (input); + return level::transform (gradient, norm); } } // end of namespace mln::linear::impl @@ -114,30 +202,54 @@ // Facades. - template <typename I, typename O> + template <typename I> inline - void sobel_h(const Image& input, Image<O>& output) + mln_gradient_component(I) sobel_h(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); - impl::sobel_h_(exact(input), exact(output)); + mlc_internal_ensure_is_scalar(mln_value(I)); + return impl::sobel_h_(exact(input)); } - template <typename I, typename O> + template <typename I> inline - void sobel_v(const Image& input, Image<O>& output) + mln_gradient_component(I) sobel_v(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); - impl::sobel_v_(exact(input), exact(output)); + mlc_internal_ensure_is_scalar(mln_value(I)); + return impl::sobel_v_(exact(input)); } - template <typename I, typename O> + template <typename I> inline - void sobel(const Image& input, Image<O>& output) + mln_gradient(I) sobel(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); - impl::sobel_(exact(input), exact(output)); + mlc_internal_ensure_is_scalar(mln_value(I)); + return impl::sobel_(exact(input)); } + template <typename I, typename N> + inline + mln_ch_value(I, mln_result(N)) + sobel_norm(const Image& input, N norm) + { + mlc_internal_ensure_is_scalar(mln_value(I)); + return impl::sobel_norm_(exact(input), norm); + } + + template <typename I> + inline + mln_ch_value(I, mln_sum(mln_value(I))) + sobel_norm(const Image& input) + { + // The type of a component of a vector from the gradient. + typedef mln_sum(mln_value(I)) gradient_val_t; + // The type of a vector from the gradient. + typedef mln::metal::vec<I::point::dim, gradient_val_t> gradient_vec_t; + return sobel_norm(input, + fun::v2v::l1_norm<gradient_vec_t, gradient_val_t>()); + } + +# undef mlc_internal_ensure_is_scalar + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::linear Index: tests/linear/sobel.cc --- tests/linear/sobel.cc (revision 1643) +++ tests/linear/sobel.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -33,6 +33,7 @@ #include <mln/core/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/level/saturate.hh> +#include <mln/level/stretch.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -40,6 +41,10 @@ #include <mln/border/thickness.hh> #include <mln/linear/sobel.hh> +#include <mln/debug/println.hh> + +#include "tests/data.hh" + int main() { @@ -48,13 +53,22 @@ border::thickness = 1; - image2d<int_u8> - lena = io::pgm::load("../img/lena.pgm"), - out(lena.domain()); - - image2d<int> tmp(lena.domain()); - linear::sobel(lena, tmp); + image2d<int_u8> input; + io::pgm::load(input, MLN_IMG_DIR "/tiny.pgm"); - level::saturate(tmp, out); - io::pgm::save(out, "out.pgm"); + // Create unused objects, for test purpose. + linear::sobel_h(input); + linear::sobel_v(input); + linear::sobel(input); + + linear::sobel_norm(input); + + image2d<float> result = linear::sobel_norm(input); + image2d<int_u8> output (result.domain()); + level::stretch (result, output); + debug::println (output); + + image2d<int_u8> output_sat (output.domain()); + level::saturate(output, output_sat); + io::pgm::save(output_sat, "out.pgm"); } Index: tests/linear/Makefile.am --- tests/linear/Makefile.am (revision 1648) +++ tests/linear/Makefile.am (working copy) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + sobel + +sobel_SOURCES = sobel.cc + +TESTS = $(check_PROGRAMS)

1 0

1648: Solve infinite recursive calls in linear::impl::convolve_.
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Solve infinite recursive calls in linear::impl::convolve_. * mln/linear/convolve.hh (convolve_(any, const I&, const Weighted_Window<W>&, any, O&)): Move the body of this function... (convolve_(const I&, const Weighted_Window<W>&, O&)): ...here (new function). Use it to factor... (convolve_(Speed_I, const I&, const Weighted_Window<W>&, Speed_O, O&)) (convolve_(any, const I&, const Weighted_Window<W>&, any, O&)): ...the implementations of these functions. convolve.hh | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) Index: mln/linear/convolve.hh --- mln/linear/convolve.hh (revision 1647) +++ mln/linear/convolve.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -65,6 +65,54 @@ namespace impl { + /* FIXME: We must clean up the interface of + mln::linear::impl::convolve_: + + - either allow certain patterns of speed traits (e.g., + any/any, fastest/fastest, fastest/any, etc.). In this + case, the generic version should abort at compile time; + + - or accept all combinations (which is the current case), and + default to the slowest one (presumably any/any). + */ + + // Fwd decl. + template <typename I, typename W, typename O> + inline + void convolve_(const I& input, + const Weighted_Window<W>& w_win_, + O& output); + + /// Default version, delegating to the generic version. + template <typename Speed_I, typename I, typename W, + typename Speed_O, typename O> + inline + void convolve_(Speed_I, const I& input, + const Weighted_Window<W>& w_win_, + Speed_O, O& output) + { + /* Don't delegate using such a call: + + \code + impl::convolve_(trait::image::speed::any(), input, + w_win_, + trait::image::speed::any(), output); + \endcode + + since it would end up with infinite recursion. The reason + is that the compiler would select this function (in which + you read this very comment), instead of the next one (with + input and output speed traits set to `any'), to resolve the + call. This is because C++ overloading rules favor the + generic function over the more specialized one. And we + cannot use explicit partial specialization, since it just + doesn't exist for functions. + + Hence the chosen solution: create and call another + overloading for mln::linear::impl::convolve_, with no + unnatural selection behavior. */ + impl::convolve_(input, w_win_, output); + } template <typename I, typename W, typename O> inline @@ -72,6 +120,18 @@ const Weighted_Window<W>& w_win_, trait::image::speed::any, O& output) { + // Delegate the call to the generic version. + impl::convolve_(input, w_win_, output); + } + + /// A factored implementation of the most generic version of + /// mln::linear::impl::convolve_. + template <typename I, typename W, typename O> + inline + void convolve_(const I& input, + const Weighted_Window<W>& w_win_, + O& output) + { const W& w_win = exact(w_win_); mln_piter(I) p(input.domain());

1 0

1647: Add image traits for mln::value::stack_image.
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add image traits for mln::value::stack_image. * mln/value/stack.hh (mln::trait::image_< mln::value::stack_image<n, I> >): New specialization. stack.hh | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) Index: mln/value/stack.hh --- mln/value/stack.hh (revision 1646) +++ mln/value/stack.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -93,7 +93,44 @@ } // end of namespace mln::value::internal + } // end of namespace mln::value + + + namespace trait + { + template <unsigned n, typename I> + struct image_< mln::value::stack_image<n, I> > + : default_image_morpher_< I, + metal::vec<n, mln_value(I)>, + mln::value::stack_image<n, I> > + { + // FIXME: We shall carefully define the missing required traits + // here. + typedef trait::image::category::value_morpher category; + + typedef trait::image::value::vectorial value; + /* FIXME: Setting the speed trait of a stack_image to `fast' is + a bad approximation. + + The value cannot reasonnably be `fastest', as several images + in different memory locations are involved in a stack image. + So we cannot just rely on the speed trait of I. + Nevertheless, we cannot guarantee that a stack_image will be + a least `fast': think of a stack_image over a ``slow'' + image_type (e.g., an image whose values are computed). That + image would retain the `slow' value of the speed trait. + + In conclusion, this value of the speed trait should be + computed too. */ + typedef trait::image::speed::fast speed; + }; + + } // end of namespace mln::trait + + + namespace value + { /*! \brief stack image class. stack_image stores a * vector of n images of the same domain. *

1 0

1646: Fix the definition of static abortion.
by Roland Levillain 09 Jan '08

09 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the definition of static abortion. * mln/metal/abort.hh (mln::metal::abort): Rename as... (mln::metal::abort_): ...this, to avoid name clashes with the homonym (standard) macro. abort.hh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 1645) +++ mln/metal/abort.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_METAL_ABORT_HH # define MLN_METAL_ABORT_HH -/*! - * \file mln/metal/abort.hh +/*! \file mln/metal/abort.hh * - * \brief FIXME. + * \brief FIXME: Document. */ # include <mln/metal/bool.hh> @@ -44,10 +43,9 @@ { template <typename T> - struct abort : false_ + struct abort_ : false_ {}; - } // end of namespace mln::metal } // end of namespace mln

1 0