- Olena-patches

milena r1666: Add processing pipeline for recognize scores
by nivaul_s＠lrde.epita.fr 15 Jan '08

15 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add processing pipeline for recognize scores. * sandbox/nivault/extract_score.cc: New. --- extract_score.cc | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) Index: trunk/milena/sandbox/nivault/extract_score.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_score.cc (revision 0) +++ trunk/milena/sandbox/nivault/extract_score.cc (revision 1666) @@ -0,0 +1,148 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +# include <vector> + +# include <mln/core/image2d.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/ppm/save.hh> +# include <mln/debug/println.hh> +# include <mln/logical/not.hh> +# include <mln/logical/or.hh> +# include <mln/io/pbm/save.hh> + +# include <mln/morpho/erosion.hh> +# include <mln/morpho/dilation.hh> +# include <mln/morpho/complementation.hh> +# include <mln/morpho/closing.hh> +# include <mln/morpho/opening.hh> +# include <mln/make/w_window2d.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/win/vline2d.hh> +# include <mln/win/hline2d.hh> +# include <mln/win/disk2d.hh> +# include <mln/level/fill.hh> +# include <mln/labeling/blobs.hh> +# include <mln/core/neighb2d.hh> + +# include <mln/accu/mean.hh> +# include <mln/accu/bbox.hh> +# include <mln/accu/p.hh> +# include <mln/accu/count.hh> + +# include <mln/value/scalar.hh> +# include <mln/make/voronoi.hh> +# include <mln/geom/seeds2tiling.hh> +# include <mln/core/mesh_p.hh> +# include <mln/draw/mesh.hh> + +# include <mln/level/stretch.hh> + +# include <mln/core/image_if_value.hh> +# include <mln/core/sub_image.hh> +# include <mln/level/paste.hh> +# include <mln/literal/all.hh> +# include <mln/value/rgb8.hh> +# include <mln/morpho/opening_area.hh> + +using namespace mln; + +using value::int_u8; +using value::rgb8; + +typedef point2d P; +typedef image2d<bool> IB; +typedef image2d<int_u8> IU; +typedef image2d<value::rgb8> O; + +template <typename I> +void +draw_bbox(I& image, box2d box, value::rgb8 val) +{ + 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, val); + draw::line (image, p2, p4, val); + draw::line (image, p4, p3, val); + draw::line (image, p3, p1, val); +} + +IB to_binary(IU in, mln_value_(IU) val) +{ +// Divise L'image en deux : +// box2d gb = score_u.domain(); +// box2d sb(gb.nrows() / 2, gb.ncols() / 2); + +// image2d< accu::mean_<int_u8> > ima_mean(sb); + +// { +// mln_piter_(IU) p(gb); + +// for_all(p) +// ima_mean(point2d(p[0] / 2, p[1] / 2)).take(score_u(p)); +// } + + IB score_b(in.domain()); + + { + mln_piter_(IU) p(in.domain()); + + for_all(p) + score_b(p) = in(p) < val; +// score_b(p) = ima_mean(p).to_result() < 175; + } + return score_b; +} + +int +main(int argc, char** argv) +{ + + if (argc != 3) + { + std::cerr << "Usage : " << argv[0] + << " input.pgm output.pbm" << std::endl; + exit(1); + } + + IU score_u; + + io::pgm::load(score_u, argv[1]); + + IB score_b = to_binary(score_u, 175); + + io::pbm::save(score_b, argv[2]); +} +

1 0

milena r1665: Fix my previous patch
by Matthieu Garrigues 15 Jan '08

15 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * ChangeLog: Fix my previous patch. * mln/draw/box.hh: Fix licence. --- 0 files changed Index: trunk/milena/mln/draw/box.hh ===================================================================

2 1

milena r1662: Fix bug in extract_character
by Guillaume Duhamel 15 Jan '08

15 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix bug in extract_character. * sandbox/nivault/extract_character.cc: Fix. --- extract_character.cc | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 54 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1661) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1662) @@ -154,22 +154,21 @@ point2d start = text_image.domain().pmin (); point2d end = text_image.domain().pmax (); + int limits = 50; - unsigned limits = 50; - - for (unsigned r = start[1]; r < end[1]; ++r) + for (int r = start[0]; r < end[0]; ++r) { - for (unsigned c = start[0]; c < end[0]; ++c) + for (int c = start[1]; c < end[1]; ++c) { bool ok = false; - unsigned i = 0; + int i = 0; accu::bbox<point2d> accu; { bool okk = true; while (okk) { okk = false; - for (i = c; i < end[0] && i < c + limits; ++i) + for (i = c; i < end[1] && i < c + limits; ++i) { unsigned value = image(point2d(r, i)); if (value != 0) @@ -333,54 +332,53 @@ extract_lines(text_image, output, vec_bbox); -// /// 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); - -// /// Extract area of text. -// mln_piter_(I_LABEL) pl (label_image.domain ()); -// for_all (pl) -// vec_bbox2[label_image2(pl)].take (pl); - - -// /// 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(), literal::red); - -// 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 graph of the text. -// level::stretch (text_image, out); -// io::pgm::save(out, path_output + ".text.pgm"); -// std::cout << path_output + ".text.pgm" << " generated" << std::endl; - + /// 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); + + /// Extract area of text. + mln_piter_(I_LABEL) pl (label_image.domain ()); + for_all (pl) + vec_bbox2[label_image2(pl)].take (pl); + + + /// 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(), literal::red); + + 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 graph of the text. + level::stretch (text_image, out); + io::pgm::save(out, path_output + ".text.pgm"); + std::cout << path_output + ".text.pgm" << " generated" << std::endl; /// Save the output image (input image + bounding box text in red). io::ppm::save(output, path_output + ".ppm");

2 1

milena r1663: Add a routine to draw a box
by Matthieu Garrigues 15 Jan '08

15 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * mln/draw/box.hh: New, Add a routine to draw a box. --- box.hh | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) Index: trunk/milena/mln/draw/box.hh =================================================================== --- trunk/milena/mln/draw/box.hh (revision 0) +++ trunk/milena/mln/draw/box.hh (revision 1663) @@ -0,0 +1,100 @@ +// Copyright (C) 2007,2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_DRAW_BOX_HH +# define MLN_DRAW_BOX_HH + +/*! \file mln/draw/box.hh + * + * \brief Draw a box in an image. + */ + +# include <mln/core/concept/image.hh> +# include <mln/core/box2d.hh> +# include <mln/level/paste.hh> +# include <mln/draw/line.hh> +# include <mln/pw/image.hh> +# include <mln/pw/cst.hh> + + +namespace mln +{ + + namespace draw + { + + /*! Draw a box at value \p v in image \p ima + * + * \param[in,out] ima The image to be drawn. + * \param[in] b the boxto draw. + * \param[in] v The value to assign to all drawn pixels. + * + * \pre \p ima has to be initialized. + * \pre \p ima has \p beg. + * \pre \p ima has \p end. + * + */ + template <typename I, typename B> + void box(Image& ima, + const Box& b, + const mln_value(I)& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename B> + inline + void box(Image& ima, + const Box& b, + const mln_value(I)& v) + { + mln_precondition(exact(ima).has_data()); + + mln_point(I) pmin = exact(b).pmin(); + mln_point(I) pmax = exact(b).pmax(); + + mln_precondition(exact(ima).has(pmin) && exact(ima).has(pmax)); + + mln_point(I) p1 (pmin[0], pmin[1]); + mln_point(I) p2 (pmax[0], pmin[1]); + mln_point(I) p3 (pmin[0], pmax[1]); + mln_point(I) p4 (pmax[0], pmax[1]); + + draw::line (ima, p1, p2, v); + draw::line (ima, p2, p4, v); + draw::line (ima, p4, p3, v); + draw::line (ima, p3, p1, v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::draw + +} // end of namespace mln + + +#endif // ! MLN_DRAW_BOX_HH

2 1

milena r1664: Add util::lemmings
by nivaul_s＠lrde.epita.fr 15 Jan '08

15 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-15 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add util::lemmings. * mln/util/lemmings.hh: New. * tests/util/Makefile.am: Add the following test. * tests/util/lemmings.cc: New. --- mln/util/lemmings.hh | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/util/Makefile.am | 2 tests/util/lemmings.cc | 74 ++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+) Index: trunk/milena/tests/util/lemmings.cc =================================================================== --- trunk/milena/tests/util/lemmings.cc (revision 0) +++ trunk/milena/tests/util/lemmings.cc (revision 1664) @@ -0,0 +1,74 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/lemmings.cc + * + * \brief test of mln::util::lemmings + * + */ + +#include <mln/util/lemmings.hh> +#include <mln/core/image2d.hh> + +int main () +{ + using namespace mln; + + typedef image2d<int> I; + + int vals[4][4] = {{2, 2, 6, 6}, + {2, 2, 6, 6}, + {3, 3, 4, 4}, + {3, 3, 4, 4}}; + + I ima = make::image2d<int>(vals); + + mln_point_(I) pt1(1, 0); + mln_point_(I) pt2(0, 2); + mln_point_(I) pt3(2, 3); + mln_point_(I) pt4(3, 1); + mln_point_(I) pt5(1, 1); + + mln_value_(I) vl1 = ima(pt1); + mln_value_(I) vl2 = ima(pt2); + mln_value_(I) vl3 = ima(pt3); + mln_value_(I) vl4 = ima(pt4); + mln_value_(I) vl5 = ima(pt5); + + mln_point_(I) ptl1 = util::lemmings(ima, ima.domain(), pt1, right, vl1); + mln_point_(I) ptl2 = util::lemmings(ima, ima.domain(), pt2, down, vl2); + mln_point_(I) ptl3 = util::lemmings(ima, ima.domain(), pt3, left, vl3); + mln_point_(I) ptl4 = util::lemmings(ima, ima.domain(), pt4, up, vl4); + mln_point_(I) ptl5 = util::lemmings(ima, ima.domain(), pt5, up, vl5); + + mln_assertion(ptl1 == point2d(1, 2)); + mln_assertion(ptl2 == point2d(2, 2)); + mln_assertion(ptl3 == point2d(2, 1)); + mln_assertion(ptl4 == point2d(1, 1)); + mln_assertion(ptl5 == point2d(-1, 1)); +} Index: trunk/milena/tests/util/Makefile.am =================================================================== --- trunk/milena/tests/util/Makefile.am (revision 1663) +++ trunk/milena/tests/util/Makefile.am (revision 1664) @@ -9,6 +9,7 @@ eat \ graph \ lazy_set \ + lemmings \ ordpair \ tree \ tree_fast \ @@ -21,6 +22,7 @@ eat_SOURCES = eat.cc graph_SOURCES = graph.cc lazy_set_SOURCES = lazy_set.cc +lemmings_SOURCES = lemmings.cc ordpair_SOURCES = ordpair.cc tree_SOURCES = tree.cc tree_fast_SOURCES = tree_fast.cc Index: trunk/milena/mln/util/lemmings.hh =================================================================== --- trunk/milena/mln/util/lemmings.hh (revision 0) +++ trunk/milena/mln/util/lemmings.hh (revision 1664) @@ -0,0 +1,128 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_UTIL_LEMMINGS_HH +# define MLN_UTIL_LEMMINGS_HH + +/*! \file mln/util/lemmings.hh + * + * \brief Definition of an "lemmings" object. + */ + +# include <mln/core/concept/image.hh> +# include <mln/set/is_subset_of.hh> + + +namespace mln +{ + + namespace util + { + + /*! \brief Lemmings tool. + * + */ + template <typename I> + struct lemmings_ : public Object< lemmings_ > + { + lemmings_(const Image& ima, const mln_pset(I)& domain, + const mln_point(I)& pt, const mln_dpoint(I)& dpt, + const mln_value(I)& val); + + mln_point(I) operator()(); + + const I& ima_; + const mln_pset(I)& domain_; + mln_point(I) pt_; + const mln_dpoint(I)& dpt_; + const mln_value(I)& val_; + }; + + /*! \brief Launch a lemmings on an image. + ** + ** A lemmings is the point \p pt that you put on an image \p ima + ** . This point will move through the image using the delta-point + ** \p dpt while consider his value on the given image. + ** + ** @return The first point that is not in the domain \p domain or + ** which value on the given image is different to the value \p + ** val. + ** + ** \pre The domain \p domain must be contained in the domain of \p + ** ima. + */ + template <typename I> + mln_point(I) + lemmings(const Image& ima, const mln_pset(I)& domain, + const mln_point(I)& pt, const mln_dpoint(I)& dpt, + const mln_value(I)& val); + +# ifndef MLN_INCLUDE_ONLY + + // lemmings + + template <typename I> + inline + lemmings_::lemmings_(const Image& ima, const mln_pset(I)& domain, + const mln_point(I)& pt, const mln_dpoint(I)& dpt, + const mln_value(I)& val) + : ima_(exact(ima)), + domain_(domain), + pt_(pt), + dpt_(dpt), + val_(val) + { + mln_precondition(set::is_subset_of(domain, ima_.domain())); + } + + template <typename I> + mln_point(I) + lemmings_::operator()() + { + while (domain_.has(pt_) && ima_(pt_) == val_) + pt_ += dpt_; + return pt_; + } + + template <typename I> + mln_point(I) + lemmings(const Image& ima, const mln_pset(I)& domain, + const mln_point(I)& pt, const mln_dpoint(I)& dpt, + const mln_value(I)& val) + { + lemmings_ lm(ima, domain, pt, dpt, val); + return lm(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::util + +} // end of namespace mln + + +#endif // ! MLN_UTIL_LEMMINGS_HH

2 1

1660: Remove outdated tests on rle_image and sparse_image.
by Roland Levillain 14 Jan '08

14 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Remove outdated tests on rle_image and sparse_image. * tests/sparse_image.cc, * tests/rle_image.cc: Remove. * tests/Makefile.am (check_PROGRAMS): Remove rle_image and sparse_image. (rle_image_SOURCES, sparse_image_SOURCES): Remove. Makefile.am | 10 ---------- 1 file changed, 10 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 1659) +++ tests/Makefile.am (working copy) @@ -24,9 +24,6 @@ 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 \ @@ -97,11 +94,8 @@ pw_image \ pw_value \ \ - rle_image \ - \ safe_image \ seed2tiling \ - sparse_image \ stack \ sub_image \ \ @@ -193,11 +187,8 @@ pw_image_SOURCES = pw_image.cc pw_value_SOURCES = pw_value.cc -rle_image_SOURCES = rle_image.cc - safe_image_SOURCES = safe_image.cc seed2tiling_SOURCES = seed2tiling.cc -sparse_image_SOURCES = sparse_image.cc stack_SOURCES = stack.cc sub_image_SOURCES = sub_image.cc @@ -226,7 +217,6 @@ fi_adaptor_SOURCES = fi_adaptor.cc fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) - endif TESTS = $(check_PROGRAMS)

1 0

1658: Speed up execution times of tests on the median operators.
by Roland Levillain 14 Jan '08

14 Jan '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Speed up execution times of tests on the median operators. * tests/tests.mk (LONG_TESTS_CXXFLAGS): New. Set to -O3. * tests/level/approx/Makefile.am, tests/level/naive/Makefile.am (median_CXXFLAGS): New. Set to $(LONG_TESTS_CXXFLAGS). level/approx/Makefile.am | 10 ++++++++++ level/naive/Makefile.am | 10 ++++++++++ tests.mk | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) Index: tests/tests.mk --- tests/tests.mk (revision 1658) +++ tests/tests.mk (working copy) @@ -8,7 +8,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution, instead of using the -# hand-made TESTS_CXXFLAGS. +# when oln.m4 (or just a part of it) is available in the distribution, +# instead of using the hand-made TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ AM_CXXFLAGS = $(TESTS_CXXFLAGS) + +# FIXME: Likewise, we should compute these values at configure time. +# Hard-code them for the moment. +LONG_TESTS_CXXFLAGS = -O3 Index: tests/level/approx/Makefile.am --- tests/level/approx/Makefile.am (revision 1658) +++ tests/level/approx/Makefile.am (working copy) @@ -6,5 +6,15 @@ median median_SOURCES = median.cc +# FIXME: The current median test is way too long to run. Break it +# into two tests: a fast one, executed during `make check', compiled +# with no optimization, using a small kernel and a small image; and a +# second one, run during `make check-full', using a big kernel on a +# normal image (e.g. Lena) and full optimization (`-O3'). +# +# For the moment, we just have the second test. We run it during +# target `check', but we shall move it to target `check-full' as soon +# as a smaller and faster test is written. +median_CXXFLAGS = $(LONG_TESTS_CXXFLAGS) TESTS = $(check_PROGRAMS) Index: tests/level/naive/Makefile.am --- tests/level/naive/Makefile.am (revision 1658) +++ tests/level/naive/Makefile.am (working copy) @@ -6,5 +6,15 @@ median median_SOURCES = median.cc +# FIXME: The current median test is way too long to run. Break it +# into two tests: a fast one, executed during `make check', compiled +# with no optimization, using a small kernel and a small image; and a +# second one, run during `make check-full', using a big kernel on a +# normal image (e.g. Lena) and full optimization (`-O3'). +# +# For the moment, we just have the second test. We run it during +# target `check', but we shall move it to target `check-full' as soon +# as a smaller and faster test is written. +median_CXXFLAGS = $(LONG_TESTS_CXXFLAGS) TESTS = $(check_PROGRAMS)

1 0

milena r1658: Clean input image for extract character
by Guillaume Duhamel 14 Jan '08

14 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-14 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Clean input image for extract character. * sandbox/nivault/extract_character.cc: Remove noise on input image. --- extract_character.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1657) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1658) @@ -68,6 +68,7 @@ # include <mln/level/paste.hh> # include <mln/literal/all.hh> # include <mln/value/rgb8.hh> +# include <mln/morpho/opening_area.hh> using namespace mln; @@ -272,10 +273,18 @@ /// Inversion video. morpho::complementation_inplace(input); + /// Clean input image (remove noise with area opening) + image2d<bool> input2 (input.domain()); + morpho::opening_area(input, c4(), 5, input2); + +// image2d<int_u8> process (input.domain ()); +// level::stretch (output_2, process); +// io::pgm::save(process, "process.pgm"); + /// Labeling the input image. unsigned nb_labels; - I_LABEL label_image = labeling::blobs(input, c8(), nb_labels); + I_LABEL label_image = labeling::blobs(input2, c8(), nb_labels); std::cout << "nb_labels = " << nb_labels << std::endl; /// Extraction of informations in the image (BoundingBox, Cardinality, ... ). @@ -377,10 +386,5 @@ io::ppm::save(output, path_output + ".ppm"); std::cout << path_output + ".ppm" << " generated" << std::endl; - -// image2d<int_u8> process (label_image.domain ()); -// level::stretch (label_image2, process); -// io::pgm::save(process, "process.pgm"); - }

1 0

milena r1657: Update extract character
by Guillaume Duhamel 14 Jan '08

14 Jan '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-01-14 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update extract character. * sandbox/nivault/extract_character.cc: The lines of text have a green bbox in out.ppm. --- extract_character.cc | 170 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 121 insertions(+), 49 deletions(-) Index: trunk/milena/sandbox/nivault/extract_character.cc =================================================================== --- trunk/milena/sandbox/nivault/extract_character.cc (revision 1656) +++ trunk/milena/sandbox/nivault/extract_character.cc (revision 1657) @@ -77,7 +77,7 @@ unsigned rows = box.nrows(); unsigned cols = box.ncols(); unsigned size = rows * cols; - float ratio = (float) (rows * cols) / cardinality; +// float ratio = (float) (rows * cols) / cardinality; /// Remove noise. if ((rows < 5) && (cols < 5)) @@ -122,7 +122,7 @@ template <typename I> void -draw_bbox(I& image, box2d box) +draw_bbox(I& image, box2d box, value::rgb8 val) { point2d pmin = box.pmin(); point2d pmax = box.pmax(); @@ -132,12 +132,82 @@ 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); + draw::line (image, p1, p2, val); + draw::line (image, p2, p4, val); + draw::line (image, p4, p3, val); + draw::line (image, p3, p1, val); } +template <typename I, typename O> +void +extract_lines(I& text_image, O& output, + std::vector< accu::bbox <point2d> >& v_bbox) +{ + typedef image2d<unsigned> I_LABEL; + + typedef std::list< accu::bbox <point2d> > L; + + L list_lines; + + I image = clone(text_image); + + point2d start = text_image.domain().pmin (); + point2d end = text_image.domain().pmax (); + + unsigned limits = 50; + + for (unsigned r = start[1]; r < end[1]; ++r) + { + for (unsigned c = start[0]; c < end[0]; ++c) + { + bool ok = false; + unsigned i = 0; + accu::bbox<point2d> accu; + { + bool okk = true; + while (okk) + { + okk = false; + for (i = c; i < end[0] && i < c + limits; ++i) + { + unsigned value = image(point2d(r, i)); + if (value != 0) + { + typedef sub_image<I_LABEL, box2d> I_SUB; + typedef image_if_value<I_SUB> I_VAL; + + I_SUB sub_image = (text_image | v_bbox[value].to_result()); + I_VAL val_image = (sub_image | value); + + mln_piter_(I_VAL) p(val_image.domain()); + + for_all (p) + { + accu.take(p); + image(p) = 0; + } + ok = true; + okk = true; + c = i; + } + } + } + } + if (ok) + list_lines.push_back(accu); + } + } + + L::const_iterator it = list_lines.begin(); + for (; it != list_lines.end(); ++it) + { + box2d b = (*it).to_result (); + draw_bbox (output, b, literal::green); + } +} + + + template <typename I> void check_with_ref(I& image, std::string path_ref, std::string path_output) @@ -169,7 +239,7 @@ mask(p) = literal::green; ++cpt; } - io::ppm::save(mask, path_output + "check.ppm"); + io::ppm::save(mask, path_output + ".check.ppm"); std::cout << "Reussite : " << (float)ok / (float)cpt * 100 << "% (" << ok << "/" << cpt << ")." << std::endl; } @@ -203,18 +273,11 @@ morpho::complementation_inplace(input); - /// FIXME : Some code was deleted here :-) (Remove noise) -// win::disk2d win (2); -// input2 = morpho::dilation(input, win); -// io::pbm::save (output, path_output); - - /// 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::bbox <point2d> > vec_bbox (nb_labels + 1); std::vector< accu::count_<point2d> > vec_card (nb_labels + 1); @@ -228,7 +291,6 @@ vec_card[label_image(p)].take (p); } - /// Generation of the text image (text_image). I_LABEL text_image (label_image.domain()); for (unsigned i = 0; i <= nb_labels; ++i) @@ -253,52 +315,62 @@ text_image(p) = val_image(p); /// Here is the good way to do the previous action. -// level::paste (val_ima, text_ima); +// level::paste (val_ima, text_image } } - /// 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); + /// Extraction of lines. + extract_lines(text_image, output, vec_bbox); + + +// /// 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); - /// 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); - /// 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); +// /// Extract area of text. +// mln_piter_(I_LABEL) pl (label_image.domain ()); +// for_all (pl) +// vec_bbox2[label_image2(pl)].take (pl); - /// Extract area of text. - mln_piter_(I_LABEL) pl (label_image.domain ()); - for_all (pl) - vec_bbox2[label_image2(pl)].take (pl); +// /// 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(), 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 ()); - 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 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 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 graph of the text. +// level::stretch (text_image, out); +// io::pgm::save(out, path_output + ".text.pgm"); +// std::cout << path_output + ".text.pgm" << " generated" << std::endl; /// Save the output image (input image + bounding box text in red).

1 0

milena r1656: Add extract array 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> Add extract array example. * sandbox/duhamel/extract_array.cc: New example of extract array. --- extract_array.cc | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) Index: trunk/milena/sandbox/duhamel/extract_array.cc =================================================================== --- trunk/milena/sandbox/duhamel/extract_array.cc (revision 0) +++ trunk/milena/sandbox/duhamel/extract_array.cc (revision 1656) @@ -0,0 +1,149 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +# include <string> +# include <mln/core/image2d.hh> +# include <mln/io/pbm/load.hh> +# include <mln/debug/println.hh> +# include <mln/logical/not.hh> +# include <mln/logical/or.hh> +# include <mln/io/pbm/save.hh> +# include <mln/io/pbm/load.hh> +# include <mln/io/ppm/save.hh> +# include <mln/io/pgm/save.hh> + +# include <mln/morpho/erosion.hh> +# include <mln/morpho/dilation.hh> +# include <mln/make/w_window2d.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/win/vline2d.hh> +# include <mln/win/hline2d.hh> +# include <mln/level/fill.hh> +# include <mln/literal/all.hh> +# include <mln/value/rgb8.hh> + + +using namespace mln; + +template <typename I, typename W> +mln_concrete(I) +pseudo(const I& input, const W& win, const float ratio) +{ + I output = clone (input); + unsigned ko = win.length () - (unsigned)(ratio * win.length ()); + std::cout << "ko : " << ko << std::endl; + mln_pixter(const I) p(input); + mln_pixter(I) p_out(output); + mln_qixter(const I, W) q(p, win); + + for_all_2(p, p_out) + { + unsigned cpt = 0; + + for_all(q) + { + if (! q.val ()) + { + if (++cpt > ko) + break; + } + } + p_out.val() = (cpt <= ko); + } + return output; +} + +template <typename I, typename J> +void +draw_array(I input, J image_bool) +{ + mln_piter(I) p (input.domain ()); + + for_all(p) + { + if (image_bool(p)) + input(p) = literal::red; + } +} + + +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; + + if (argc != 3) + { + std::cerr << "Usage : " << argv[0] + << " input.pbm output" << std::endl; + exit(1); + } + + std::string path_input = argv[1]; + std::string path_output = argv[2]; + + + I input = io::pbm::load (path_input); + O output (input.domain ()); + + /// Inversion video. + I inv_image = logical::not_(input); + + + mln_piter_(I) p (input.domain()); + + for_all(p) + { + if (inv_image(p)) + output(p) = literal::black; + else + output(p) = literal::white; + } + + + /// Extract horizontal axis of array. + win::hline2d h_line(51); + I h_axis_image = pseudo(inv_image, h_line, 0.7); + h_axis_image = morpho::erosion(h_axis_image, h_line); + draw_array(output, h_axis_image); + + /// Extract vertical axis of array. + win::vline2d v_line(11); + I v_axis_image = pseudo(inv_image, v_line, 0.75); + v_axis_image = morpho::erosion(v_axis_image, v_line); + draw_array(output, v_axis_image); + + io::ppm::save (output, path_output + ".ppm"); + std::cout << path_output + ".ppm generated" << std::endl; +} +

1 0