Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 2646: INIM: Classif++.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif++. * classif/iccvg04.cc: iccvg04.cc. * classif/Makefile: Makefile. Makefile | 3 + iccvg04.cc | 99 ++++++------------------------------------------------------- 2 files changed, 12 insertions(+), 90 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2645) +++ classif/iccvg04.cc (working copy) @@ -32,16 +32,17 @@ template <typename I> mln::image3d<unsigned> -fill_histo(const I& ima) +fill_histo(const I& ima, int f) { - image3d< unsigned > histo(128,128,128); + const mln_value(I) v = mln_max(mln_value(I)) / f; + image3d< unsigned > histo(v,v,v); level::fill(histo, 0); unsigned i = 0; mln_piter(I) p(ima.domain()); for_all(p) { - point3d p3(ima(p).red()/2,ima(p).green()/2, ima(p).blue()/2); + point3d p3(ima(p).red()/f,ima(p).green()/f, ima(p).blue()/f); histo(p3)++; } return histo; @@ -86,90 +87,10 @@ chdir(".."); } -template <typename I> -void display_proj_revert(const I& histo, const char * s) -{ - image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); - level::fill(proj_histo, 0); - - mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); - double max = 0; - for_all(p) - { - for (unsigned i = 0; i < geom::nslis(histo); i++) -// if (histo(point3d(p[0], p[1], i)) < 255) - proj_histo(p) += histo(point3d(p[0], p[1], i)); - - if (proj_histo(p) > max) - max = proj_histo(p); - } - - image2d< value::int_u8 > out(proj_histo.domain()); - for_all(p) - { - out(p) = (proj_histo(p) / max) * 255; - - if (out(p) < 255) - out(p) -= (255 - out(p)) * 10; - } - - io::pgm::save(out,s); -} - -template <typename I> -void display_proj_min(const I& histo, const char * s) -{ - image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); - level::fill(proj_histo, 0); - - mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); - double max = 0; - for_all(p) - { - unsigned min = 9999999; - for (unsigned i = 0; i < geom::nslis(histo); i++) - if (histo(point3d(p[0], p[1], i)) < min) - min = histo(point3d(p[0], p[1], i)); - proj_histo(p) = min; - - if (proj_histo(p) > max) - max = proj_histo(p); - } - - image2d< value::int_u8 > out(proj_histo.domain()); - for_all(p) - { - out(p) = (proj_histo(p) / max) * 255; - } - - io::pgm::save(out, s); -} - - -template <typename I> -mln_ch_value(I, value::int_u8) normalizeu8(const I& ima) -{ - mln_ch_value(I, value::int_u8) res(ima.domain()); - level::fill(res, literal::zero); - - mln_piter(I) p(ima.domain()); - mln_value(I) max = 0; - for_all(p) - { - if (ima(p) > max) - max = ima(p); - } - - for_all(p) - { - res(p) = (ima(p) / (double) max) * 255; - } - - return res; -} template <typename I, typename J, typename K> -mln_ch_value(I, value::int_u8) donne_tout(const I& ima, const J& histo, const K& ws, int nbasins) +mln_concrete(I) +classify_image(const I& ima, const J& histo, const K& ws, int nbasins) { image2d<value::rgb8> out(ima.domain()); @@ -192,24 +113,24 @@ ima = io::ppm::load<value::rgb8>(argv[1]); //make histo - image3d<unsigned> histo = fill_histo(ima); + image3d<unsigned> histo = fill_histo(ima,4); { unsigned m, M; estim::min_max(histo, m, M); std::cout << m << ' ' << M << std::endl; } - image3d<value::int_u8> nhisto = normalizeu8(histo); + /* image3d<value::int_u8> nhisto = normalizeu8(histo); { value::int_u8 m, M; estim::min_max(nhisto, m, M); std::cout << m << ' ' << M << std::endl; - } + }*/ //display(nhisto, "histo"); //revert histo - image3d<value::int_u8> rhisto = arith::revert(nhisto); + image3d<value::int_u8> rhisto = arith::revert(histo); { value::int_u8 m, M; estim::min_max(rhisto, m, M); Index: classif/Makefile --- classif/Makefile (revision 2645) +++ classif/Makefile (working copy) @@ -1,2 +1,4 @@ +CCFLAGS=-I../.. -O1 -DNDEBUG + all: - g++ *.cc -I../../ -O1 -DNDEBUG \ No newline at end of file + g++ iccvg04.cc $(CCFLAGS) \ No newline at end of file

16 years, 3 months

cleanup-2008 2645: Update make mat.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update make mat. * tests/make/mat.cc: New. * tests/make/Makefile.am: Update. * mln/make/mat.hh: Overload. mln/make/mat.hh | 68 +++++++++++++++++++++++++++++++++++++++++-------- tests/make/Makefile.am | 4 ++ tests/make/mat.cc | 42 ++++++++++++------------------ 3 files changed, 79 insertions(+), 35 deletions(-) Index: tests/make/mat.cc --- tests/make/mat.cc (revision 2637) +++ tests/make/mat.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// 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 @@ -25,16 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/algebra/mat.cc +/*! \file tests/make/mat.cc * - * \brief Tests on mln::algebra::mat. + * \brief Tests on mln::make::mat. */ - -#include <iostream> -#include <mln/fun/i2v/all_to.hh> #include <mln/algebra/mat.hh> -#include <mln/algebra/h_mat.hh> @@ -42,26 +38,24 @@ { using namespace mln; - algebra::mat<1,3,float> m1(all_to(4.)); - algebra::mat<2,2,float> m2 = algebra::mat<2,2,float>::Id; + { + int vals[] = { 1, 0, + 0, 1 }; + algebra::mat<2,2,int> m = make::mat(vals); + } - algebra::h_mat<1,float> hm1(m2); - algebra::h_mat<2,float> hm2; - algebra::h_mat<3,float> hm3(all_to(1.5)); - - algebra::mat<4,4,float> m4 = hm3; - - std::cout << "m1 = " << m1 << ";" << std::endl; - std::cout << "m2 = " << m2 << ";" << std::endl; - std::cout << "m4 = " << m4 << ";" << std::endl; - std::cout << "hm1 = " << hm1 << ";" << std::endl; - std::cout << "hm2 = " << hm2 << ";" << std::endl; - std::cout << "hm3 = " << hm3 << ";" << std::endl; + { + int vals[] = { 1, 2, 3, + 4, 5, 6 }; + algebra::mat<2,3,int> m = make::mat<2,3>(vals); + std::cout << m << std::endl; + } { - algebra::h_mat<2,float> m, m2; - m = m2; - // FIXME: Test *many* => runs ok... + int vals[][3] = { { 1, 2, 3 }, + { 4, 5, 6 } }; + algebra::mat<2,3,int> m = make::mat(vals); + std::cout << m << std::endl; } } Index: tests/make/Makefile.am --- tests/make/Makefile.am (revision 2644) +++ tests/make/Makefile.am (working copy) @@ -3,8 +3,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - dual_neighb + dual_neighb \ + mat dual_neighb_SOURCES = dual_neighb.cc +mat_SOURCES = mat.cc TESTS = $(check_PROGRAMS) Index: mln/make/mat.hh --- mln/make/mat.hh (revision 2644) +++ mln/make/mat.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory +// Copyright (C) 2006, 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 @@ -34,38 +34,86 @@ */ # include <mln/algebra/mat.hh> +# include <mln/metal/math/sqrt.hh> + namespace mln { namespace make { + /*! \brief Create an mln::algebra::mat<n,m,T>. * - * \param[in] tab Tab of value. + * \param[in] tab Array of values. * - * \pre The dimension table N is such as N = n * m - * with n and m, the dimensions oh the matrix. + * \pre The array dimension has to be n * m. */ - template <unsigned n, unsigned m, unsigned N, typename T> - algebra::mat<n,m,T> mat(const T tab[N]); + template <unsigned n, unsigned m, typename T> + algebra::mat<n,m,T> mat(const T (&tab)[n*m]); + + + /*! \brief Create an mln::algebra::mat<n,m,T>. + * + * \param[in] tab Array of values. + * + * \pre The array dimension has to be n * m. + */ + template <typename T, unsigned n, unsigned m> + algebra::mat<n,m,T> mat(const T (&tab)[n][m]); + + + /*! \brief Create an mln::algebra::mat<n,n,T>. + * + * \param[in] tab C-array of values. + * + * \pre The array dimension N has to be square (N = n * n). + */ + template <typename T, unsigned N> + algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> + mat(const T (&tab)[N]); + template <unsigned n, unsigned m, typename T> algebra::mat<n,m,T> mat(algebra::vec<n,T> v); + + # ifndef MLN_INCLUDE_ONLY - template <unsigned n, unsigned m, unsigned N, typename T> + template <unsigned n, unsigned m, typename T> inline - algebra::mat<n,m,T> mat(const T tab[N]) + algebra::mat<n,m,T> mat(const T (&tab)[n*m]) { - mln_precondition(n * m == N); algebra::mat<n,m,T> tmp; - for (unsigned i = 0; i < N; ++i) + for (unsigned i = 0; i < n*m; ++i) tmp(i / m, i % m) = tab[i]; return tmp; } + template <typename T, unsigned n, unsigned m> + algebra::mat<n,m,T> mat(const T (&tab)[n][m]) + { + algebra::mat<n,m,T> tmp; + for (unsigned i = 0; i < n; ++i) + for (unsigned j = 0; j < m; ++j) + tmp(i, j) = tab[i][j]; + return tmp; + } + + template <typename T, unsigned N> + inline + algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> + mat(const T (&tab)[N]) + { + enum { n = mlc_sqrt_int(N) }; + mlc_bool(N == n * n)::check(); + algebra::mat<n,n,T> tmp; + for (unsigned i = 0; i < N; ++i) + tmp(i / n, i % n) = tab[i]; + return tmp; + } + template <unsigned n, typename T> algebra::mat<n,1,T> mat(algebra::vec<n,T> v) {

16 years, 3 months

cleanup-2008 2644: INIM: Classification: Clean up directory.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classification: Clean up directory. * classif/images, * classif/images/caf_0009.jpg, * classif/images/caf_0028.jpg, * classif/images/edfverso06.JPG, * classif/images/capture.png, * classif/images/vpc_0001.jpg, * classif/images/caf_0010.jpg, * classif/images/caf_0013.jpg, * classif/images/caf_0005.jpg, * classif/images/caf_0034.jpg: Remove. 0 files changed Index: classif/images/caf_0009.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/caf_0028.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/edfverso06.JPG Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/capture.png Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/vpc_0001.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/caf_0010.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/caf_0013.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/caf_0005.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: classif/images/caf_0034.jpg Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream

16 years, 3 months

cleanup-2008 2643: Update classif main.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update classif main. * classif/iccvg04.cc: Update. iccvg04.cc | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2642) +++ classif/iccvg04.cc (working copy) @@ -18,9 +18,10 @@ #include <mln/geom/all.hh> #include <mln/io/ppm/load.hh> - #include <mln/io/pgm/save.hh> +#include <mln/estim/min_max.hh> + #include <sys/stat.h> #include <sstream> @@ -63,9 +64,10 @@ mkdir(dir, 0777); chdir(dir); + image2d< mln_value(I) > out(geom::nrows(ima), geom::ncols(ima)); + for (int s = 0; s < geom::nslis(ima); ++s) { - image2d< mln_value(I) > out(geom::nrows(ima), geom::ncols(ima)); // image2d< value::int_u8 > out(geom::nrows(ima), geom::ncols(ima)); for (int r = 0; r < geom::nrows(ima); ++r) { @@ -76,7 +78,7 @@ } std::ostringstream is; - is << "out_" << s << ".ppm"; + is << "out_" << s << ".pgm"; io::pgm::save(out, is.str()); } @@ -191,23 +193,48 @@ //make histo image3d<unsigned> histo = fill_histo(ima); + { + unsigned m, M; + estim::min_max(histo, m, M); + std::cout << m << ' ' << M << std::endl; + } + image3d<value::int_u8> nhisto = normalizeu8(histo); + { + value::int_u8 m, M; + estim::min_max(nhisto, m, M); + std::cout << m << ' ' << M << std::endl; + } //display(nhisto, "histo"); //revert histo image3d<value::int_u8> rhisto = arith::revert(nhisto); + { + value::int_u8 m, M; + estim::min_max(rhisto, m, M); + std::cout << m << ' ' << M << std::endl; + } //display(rhisto, "rhisto"); //compute closing_area of histo image3d<value::int_u8> histo_closure(histo.domain()); - morpho::closing_area(rhisto, c6(), 420, histo_closure); + morpho::closing_area(rhisto, c6(), 20, histo_closure); + { + value::int_u8 m, M; + estim::min_max(histo_closure, m, M); + std::cout << m << ' ' << M << std::endl; + } + + //display_proj_revert(histo_closure, "chisto.ppm"); //watershed over histo_closure - value::int_u16 nbasins; - image3d<value::int_u16> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + value::int_u8 nbasins; + image3d<value::int_u8> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + + std::cout << nbasins << std::endl; display(ws, "ws"); display_proj_revert(ws, "whisto.ppm");

16 years, 3 months

2642: Fix bad deletion of small components.

by Guillaume Lazzara

* scribo/demat.hh: - Correctly relabel. - Correctly erase components. --- milena/sandbox/ChangeLog | 8 ++ milena/sandbox/scribo/demat.hh | 165 +++++++++++++++++++--------------------- 2 files changed, 86 insertions(+), 87 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 2ecca11..e8cd9d9 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix bad deletion of small components. + + * scribo/demat.hh: + - Correctly relabel. + - Correctly erase components. + 2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> Extract text bboxes for Scribo. diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index 06f54e9..a824d11 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -68,6 +68,7 @@ # include <mln/level/fill.hh> # include <mln/level/paste.hh> +# include <mln/level/apply.hh> # include <mln/morpho/hit_or_miss.hh> # include <mln/morpho/opening.hh> @@ -98,6 +99,7 @@ namespace scribo util::array<box2d> component_boxes(const image2d<bool>& filter) { + std::cout << "component boxes" << std::endl; int_u16 nlabels; image2d<int_u16> lbl = labeling::blobs(filter, c4(), nlabels); @@ -105,14 +107,16 @@ namespace scribo } - /// Remove bboxes from an image. - void erase_boxes(image2d<bool>& ima, + /// Remove table bboxes from an image. + void erase_table_boxes(image2d<bool>& ima, const util::array<box2d>& boxes, unsigned bbox_larger) { - for (unsigned i = 1; i <= boxes.nelements(); ++i) + std::cout << "erase table boxes " << std::endl; + for (unsigned i = 1; i < boxes.nelements(); ++i) level::paste((pw::cst(false) - | boxes[i].to_larger(bbox_larger)), ima); + | (boxes[i].to_larger(bbox_larger) | (pw::value(ima) == pw::cst(true)))), ima); + } @@ -126,20 +130,28 @@ namespace scribo typedef util::array<mln_result_(A)> boxes_t; // Lignes verticales + std::cout << "Removing vertical lines" << std::endl; win::rectangle2d vwin(h, w); image2d<bool> vfilter = morpho::opening(in, vwin); - //io::pbm::save(vfilter, "./table-vfilter.pbm"); +#ifndef NOUT + io::pbm::save(vfilter, "./table-vfilter.pbm"); +#endif boxes_t vboxes = component_boxes(vfilter); - erase_boxes(in, vboxes, n); + erase_table_boxes(in, vboxes, n); // Lignes horizontales + std::cout << "Removing horizontal lines" << std::endl; win::rectangle2d hwin(w, h); image2d<bool> hfilter = morpho::opening(in, hwin); - //io::pbm::save(hfilter, "./table-hfilter.pbm"); +#ifndef NOUT + io::pbm::save(hfilter, "./table-hfilter.pbm"); +#endif boxes_t hboxes = component_boxes(hfilter); - erase_boxes(in, hboxes, n); + erase_table_boxes(in, hboxes, n); - //io::pbm::save(in, "./table-filtered.pbm"); +#ifndef NOUT + io::pbm::save(in, "./table-filtered.pbm"); +#endif return std::make_pair(vboxes, hboxes); } @@ -152,22 +164,15 @@ namespace scribo /// \{ int_u16 - anc(const fun::i2v::array<int_u16>& f, unsigned i) + most_left(const fun::i2v::array<int_u16>& left_link, unsigned i) { - while (f(i) != i) - i = f(i); + while (left_link(i) != i) + i = left_link(i); return i; } - void do_curri(fun::i2v::array<int_u16>& f, int_u16 i) - { - if (f(i) != i) - f(i) = anc(f, f(i)); - } - - void - remove_small_comps_i2v(image2d<int_u16>& ima, image2d<int_u16>& lbl, + remove_small_comps_i2v(image2d<int_u16>& lbl, util::array<box2d>& cboxes, int_u16& ncomps, unsigned min_comp_size) { @@ -178,18 +183,13 @@ namespace scribo comps(0) = 0; // Construct the transform function. - for (int i = 1; i < ncomps;) + for (int i = 1; i <= ncomps;) { // On aimerait avoir une routine qui nous le fait toute seule et qui // soit optimisee. if (estim::nsites(cboxes[i]) < min_comp_size) { comps(current) = 0; - - /// DEBUG - level::paste(pw::cst(false) | cboxes[i], ima); - /// DEBUG - cboxes[i] = cboxes[ncomps]; comps(ncomps) = i; current = ncomps--; @@ -198,64 +198,55 @@ namespace scribo { comps(current) = i; current = ++i; - //draw::box(ima, cboxes[i], 150u); } } //Relabel - lbl = level::transform(lbl, comps); + level::apply(lbl, comps); cboxes.resize(ncomps + 1); } /// Merge bboxes according to their left box neighbor. - util::array< accu::bbox<point2d> > - group_bboxes(fun::i2v::array<int_u16>& left, image2d<int_u16>& lbl, + util::array< box2d > + group_bboxes(fun::i2v::array<int_u16>& left_link, image2d<int_u16>& lbl, util::array<box2d>& cboxes, unsigned ncomp) { - // Currify left lookup table and compute text area bboxes. + // Currify left_link lookup table and compute text area bboxes. util::array< accu::bbox<point2d> > tboxes; tboxes.resize(ncomp + 1); for (unsigned i = 1; i <= ncomp; ++i) { - do_curri(left, i); - tboxes[left(i)].take(cboxes[i]); + if (left_link(i) != i) + left_link(i) = most_left(left_link, left_link(i)); + tboxes[left_link(i)].take(cboxes[i]); } - //Update labels - level::transform(lbl, left); + //Update labels - FIXME: Do we need to do that? + level::apply(lbl, left_link); - return tboxes; - } + util::array<box2d> result; + for (unsigned i = 1; i <= ncomp; ++i) + result.append(tboxes[i].to_result()); - bool - has_valid_left_link(const fun::i2v::array<int_u16>& left, unsigned j) - { - return left(j) == j; + return result; } - - bool - is_valid_comp_neigh(const point2d& p, const point2d& c, unsigned dmax) - { - return (p.col() - c.col()) < dmax; - } - - - /// Update the lookup table \p left if a neighbor is found on the right of /// the current bbox. void update_link(fun::i2v::array<int_u16>& left_link, image2d<int_u16>& lbl, const point2d& p, const point2d& c, unsigned i, unsigned dmax) { - if (lbl.domain().has(p) && lbl(p) != 0 - && is_valid_comp_neigh(p, c, dmax) - && has_valid_left_link(left_link, lbl(p))) - left_link(lbl(p)) = i; - else if (!has_valid_left_link(left_link, lbl(p)) && lbl(p) != 0) - left_link(lbl(p)) = 0; + if (lbl.domain().has(p) && lbl(p) != 0 && lbl(p) != i + && (p.col() - c.col()) < dmax) + { + if (left_link(lbl(p)) == lbl(p)) + left_link(lbl(p)) = i; +// else +// left_link(lbl(p)) = 0;//FIXME: should be uncommented? + } } @@ -278,15 +269,16 @@ namespace scribo { unsigned midcol = (cboxes[i].pmax().col() - cboxes[i].pmin().col()) / 2; unsigned dmax = midcol + bbox_distance; - /// Box center => Routine? - point2d c (cboxes[i].pmin().row() + ((cboxes[i].pmax().row() - cboxes[i].pmin().row()) / 2), + /// FIXME: Box center => Routine? + point2d c (cboxes[i].pmin().row() + + ((cboxes[i].pmax().row() - cboxes[i].pmin().row()) / 2), cboxes[i].pmin().col() + midcol); - /// First point on the right of c + /// First site on the right of the center site point2d p(c.row(), c.col() + 1); - // Lemmings avec condition sur la distance en plus => Faire une version speciale? + // FIXME: Lemmings with a condition on the distance => write a special version? while (lbl.domain().has(p) && (lbl(p) == 0 || lbl(p) == i) - && is_valid_comp_neigh(p, c, dmax)) + && (p.col() - c.col()) < dmax) ++p.col(); update_link(left_link, lbl, p, c, i, dmax); @@ -297,9 +289,13 @@ namespace scribo - void - extract_text(image2d<bool>& in, unsigned bbox_distance, unsigned min_comp_size) + util::array<box2d> + extract_text(image2d<bool>& in, + unsigned bbox_distance, + unsigned min_comp_size) { + std::cout << "extracting text..." << std::endl; + typedef int_u16 V; typedef image2d<V> I; typedef util::array<box2d> boxes_t; @@ -309,47 +305,37 @@ namespace scribo image2d<V> lbl = labeling::blobs(in, c4(), nlabels); boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); +# ifndef NOUT std::cout << "nlabels = " << nlabels << std::endl; - - //DEBUG PURPOSE - //FIXME: don't know how to clone and convert to image<int> properly - // \{ I ima(in.domain()); - level::paste(in, ima); level::paste(pw::cst(100) - | (in | (pw::value(in) == pw::cst(true))).domain(), ima); - // \} + | (in.domain() | (pw::value(in) == pw::cst(true))), ima); +#endif //Remove small components. int_u16 ncomp; - remove_small_comps_i2v(ima, lbl, cboxes, ncomp, min_comp_size); + remove_small_comps_i2v(lbl, cboxes, ncomp, min_comp_size); - std::cout << "ncomp = " << ncomp << std::endl; +#ifndef NOUT + io::pgm::save(ima, "./text-wo-small.pgm"); +#endif //Link character bboxes to their left neighboor if possible. fun::i2v::array<int_u16> left = link_character_bboxes(lbl, cboxes, ncomp, bbox_distance); //Merge character bboxes according to their left neighbor. - util::array< accu::bbox<point2d> > tboxes = group_bboxes(left, lbl, cboxes, ncomp); - - /// DEBUG PURPOSE - /// \{ - io::pgm::save(lbl, "./textlbl.pgm"); - io::pgm::save(ima, "./text.pgm"); + util::array<box2d> tboxes = group_bboxes(left, lbl, cboxes, ncomp); +#ifndef NOUT for (unsigned i = 1; i <= ncomp; ++i) if (tboxes[i].is_valid()) - draw::box(ima, tboxes[i].to_result(), 254u); - - for (unsigned i = 1; i <= ncomp; ++i) - if (tboxes[i].is_valid()) - draw::box(in, tboxes[i].to_result(), true); + draw::box(ima, tboxes[i], 254u); io::pgm::save(ima, "./bbtext.pgm"); - io::pbm::save(in, "./intext.pgm"); - /// \} +#endif + return tboxes; } /// \} @@ -363,7 +349,8 @@ namespace scribo void demat(char *argv[]) { using namespace mln; - border::thickness = 0; + border::thickness = 3; + trace::quiet = true; //Useful debug variables unsigned h = atoi(argv[2]); @@ -378,7 +365,11 @@ namespace scribo internal::extract_tables(in, h, w, bbox_larger); - internal::extract_text(in, bbox_distance, min_comp_size); + util::array<box2d> tboxes = + internal::extract_text(in, bbox_distance, min_comp_size); + + /// Use txt bboxes here with Tesseract + /// => in | tboxes[i] } } // end of namespace scribo -- 1.5.6.5

16 years, 3 months

2641: Use util::ord with std::set.

by Guillaume Lazzara

* mln/set/inter.hh, * mln/set/sym_diff.hh, * mln/set/uni.hh: Use util::ord as comparison operator. --- milena/ChangeLog | 10 ++++++++++ milena/mln/set/inter.hh | 3 ++- milena/mln/set/sym_diff.hh | 7 ++++--- milena/mln/set/uni.hh | 8 ++++---- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 75d390b..3aa06c7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Use util::ord with std::set. + + * mln/set/inter.hh, + * mln/set/sym_diff.hh, + * mln/set/uni.hh: + Use util::ord as comparison operator. + + +2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing resize() method to util::array. * mln/util/array.hh: add resize(). diff --git a/milena/mln/set/inter.hh b/milena/mln/set/inter.hh index 5ad244f..39612e1 100644 --- a/milena/mln/set/inter.hh +++ b/milena/mln/set/inter.hh @@ -37,6 +37,7 @@ # include <mln/convert/to_std_set.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> +# include <mln/util/ord.hh> @@ -64,7 +65,7 @@ namespace mln trace::entering("set::inter"); mln::metal::equal<mln_psite(Wl), mln_psite(Wr)>::check(); typedef mln_psite(Wl) P; - std::set + std::set<P, util::ord > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; diff --git a/milena/mln/set/sym_diff.hh b/milena/mln/set/sym_diff.hh index ba65e09..6c970a0 100644 --- a/milena/mln/set/sym_diff.hh +++ b/milena/mln/set/sym_diff.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// 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 @@ -37,6 +37,7 @@ # include <mln/convert/to_window.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> +# include <mln/util/ord.hh> @@ -72,7 +73,7 @@ namespace mln trace::entering("set::sym_diff"); mln::metal::equal<mln_dpoint(Wl), mln_dpoint(Wr)>::check(); typedef mln_dpoint(Wl) D; - std::set<D> + std::set<D, util::ord<D> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; @@ -91,7 +92,7 @@ namespace mln trace::entering("set::sym_diff"); mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); typedef mln_point(Wl) P; - std::set + std::set<P, util::ord > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; diff --git a/milena/mln/set/uni.hh b/milena/mln/set/uni.hh index a64a348..6bd6dd5 100644 --- a/milena/mln/set/uni.hh +++ b/milena/mln/set/uni.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 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 @@ -37,7 +37,7 @@ # include <mln/convert/to_window.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> - +# include <mln/util/ord.hh> namespace mln @@ -73,7 +73,7 @@ namespace mln trace::entering("set::uni"); mln::metal::equal<mln_dpoint(Wl), mln_dpoint(Wr)>::check(); typedef mln_dpoint(Wl) D; - std::set<D> + std::set<D, util::ord<D> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; @@ -92,7 +92,7 @@ namespace mln trace::entering("set::uni"); mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); typedef mln_point(Wl) P; - std::set + std::set<P, util::ord > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; -- 1.5.6.5

16 years, 3 months

2640: Add missing resize() method to util::array.

by Guillaume Lazzara

* mln/util/array.hh: add resize(). --- milena/ChangeLog | 6 ++++++ milena/mln/util/array.hh | 11 +++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 40d1f74..75d390b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing resize() method to util::array. + + * mln/util/array.hh: add resize(). + 2008-10-22 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix Registration. Add tests. diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index 65b9282..66b41a8 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -90,6 +90,9 @@ namespace mln /// Reserve memory for \p n elements. void reserve(unsigned n); + /// Resize this array to \p n elements. + void resize(unsigned n); + /// Add the element \p elt at the end of this array. array<T>& append(const T& elt); @@ -257,6 +260,14 @@ namespace mln template <typename T> inline + void + array<T>::resize(unsigned n) + { + v_.resize(n); + } + + template <typename T> + inline array<T>& array<T>::append(const T& elt) { -- 1.5.6.5

16 years, 3 months

2639: Extract text bboxes for Scribo.

by Guillaume Lazzara

* scribo/main.cc: Change usage message. * scribo/demat.hh: - Cleanup. - Remove too small components using level::transform. - Support text bboxes extraction. --- milena/sandbox/ChangeLog | 11 ++ milena/sandbox/scribo/demat.hh | 238 ++++++++++++++++++++++++++++++++++++--- milena/sandbox/scribo/main.cc | 2 +- 3 files changed, 231 insertions(+), 20 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 3727032..2ecca11 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,14 @@ +2008-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Extract text bboxes for Scribo. + + * scribo/main.cc: Change usage message. + + * scribo/demat.hh: + - Cleanup. + - Remove too small components using level::transform. + - Support text bboxes extraction. + 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Work on ICCVG04 classification method diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index 742143d..06f54e9 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -30,6 +30,7 @@ # include <mln/core/image/image2d.hh> +# include <mln/core/concept/function.hh> # include <mln/core/image/image_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/cast_image.hh> @@ -38,6 +39,7 @@ # include <mln/core/routine/clone.hh> # include <mln/core/routine/ops.hh> # include <mln/core/site_set/p_vaccess.hh> +# include <mln/core/site_set/p_set.hh> # include <mln/accu/bbox.hh> @@ -54,6 +56,8 @@ # include <mln/estim/nsites.hh> +# include <mln/fun/i2v/array.hh> + # include <mln/io/pbm/load.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/save.hh> @@ -70,6 +74,8 @@ # include <mln/pw/all.hh> +# include <mln/set/inter.hh> + # include <mln/util/array.hh> # include <mln/value/int_u16.hh> @@ -84,27 +90,33 @@ namespace scribo using namespace mln; using value::int_u16; + /// Functions related to the table removal + /// \{ + + + /// Extract the components bboxes. util::array<box2d> component_boxes(const image2d<bool>& filter) { - int_u16 nlabels; image2d<int_u16> lbl = labeling::blobs(filter, c4(), nlabels); return labeling::compute(accu::meta::bbox(), lbl, nlabels); } + + /// Remove bboxes from an image. void erase_boxes(image2d<bool>& ima, const util::array<box2d>& boxes, unsigned bbox_larger) { for (unsigned i = 1; i <= boxes.nelements(); ++i) - level::paste(pw::cst(false) - | boxes[i].to_larger(bbox_larger), - ima); + level::paste((pw::cst(false) + | boxes[i].to_larger(bbox_larger)), ima); } + /// Find table bboxes and remove them from the image. std::pair<util::array<box2d>, util::array<box2d> > extract_tables(image2d<bool>& in, unsigned h, unsigned w, unsigned n) @@ -116,28 +128,190 @@ namespace scribo // Lignes verticales win::rectangle2d vwin(h, w); image2d<bool> vfilter = morpho::opening(in, vwin); - io::pbm::save(vfilter, "./table-vfilter.pbm"); + //io::pbm::save(vfilter, "./table-vfilter.pbm"); boxes_t vboxes = component_boxes(vfilter); erase_boxes(in, vboxes, n); // Lignes horizontales win::rectangle2d hwin(w, h); image2d<bool> hfilter = morpho::opening(in, hwin); - io::pbm::save(hfilter, "./table-hfilter.pbm"); + //io::pbm::save(hfilter, "./table-hfilter.pbm"); boxes_t hboxes = component_boxes(hfilter); erase_boxes(in, hboxes, n); + //io::pbm::save(in, "./table-filtered.pbm"); + return std::make_pair(vboxes, hboxes); } + /// \} + /// End of functions related to the table removal. + + + /// Function related to text extraction + /// \{ + + int_u16 + anc(const fun::i2v::array<int_u16>& f, unsigned i) + { + while (f(i) != i) + i = f(i); + return i; + } + + void do_curri(fun::i2v::array<int_u16>& f, int_u16 i) + { + if (f(i) != i) + f(i) = anc(f, f(i)); + } + + void - extract_text(image2d<bool>& in) + remove_small_comps_i2v(image2d<int_u16>& ima, image2d<int_u16>& lbl, + util::array<box2d>& cboxes, int_u16& ncomps, + unsigned min_comp_size) { - typedef image2d<int_u16> I; + ncomps = cboxes.nelements() - 1; + unsigned current = 1; + fun::i2v::array<int_u16> comps; + comps.resize(cboxes.nelements()); + comps(0) = 0; + + // Construct the transform function. + for (int i = 1; i < ncomps;) + { + // On aimerait avoir une routine qui nous le fait toute seule et qui + // soit optimisee. + if (estim::nsites(cboxes[i]) < min_comp_size) + { + comps(current) = 0; + + /// DEBUG + level::paste(pw::cst(false) | cboxes[i], ima); + /// DEBUG + + cboxes[i] = cboxes[ncomps]; + comps(ncomps) = i; + current = ncomps--; + } + else + { + comps(current) = i; + current = ++i; + //draw::box(ima, cboxes[i], 150u); + } + } + + //Relabel + lbl = level::transform(lbl, comps); + cboxes.resize(ncomps + 1); + } + + + /// Merge bboxes according to their left box neighbor. + util::array< accu::bbox<point2d> > + group_bboxes(fun::i2v::array<int_u16>& left, image2d<int_u16>& lbl, + util::array<box2d>& cboxes, unsigned ncomp) + { + // Currify left lookup table and compute text area bboxes. + util::array< accu::bbox<point2d> > tboxes; + tboxes.resize(ncomp + 1); + for (unsigned i = 1; i <= ncomp; ++i) + { + do_curri(left, i); + tboxes[left(i)].take(cboxes[i]); + } + + //Update labels + level::transform(lbl, left); + + return tboxes; + } + + bool + has_valid_left_link(const fun::i2v::array<int_u16>& left, unsigned j) + { + return left(j) == j; + } + + + + bool + is_valid_comp_neigh(const point2d& p, const point2d& c, unsigned dmax) + { + return (p.col() - c.col()) < dmax; + } + + + + /// Update the lookup table \p left if a neighbor is found on the right of + /// the current bbox. + void update_link(fun::i2v::array<int_u16>& left_link, image2d<int_u16>& lbl, + const point2d& p, const point2d& c, + unsigned i, unsigned dmax) + { + if (lbl.domain().has(p) && lbl(p) != 0 + && is_valid_comp_neigh(p, c, dmax) + && has_valid_left_link(left_link, lbl(p))) + left_link(lbl(p)) = i; + else if (!has_valid_left_link(left_link, lbl(p)) && lbl(p) != 0) + left_link(lbl(p)) = 0; + } + + + + /// Map each character bbox to its left bbox neighbor if possible. + /// Iterate to the right but link boxes to the left. + fun::i2v::array<int_u16> + link_character_bboxes(image2d<int_u16>& lbl, + const util::array<box2d>& cboxes, + unsigned ncomp, + unsigned bbox_distance) + { + fun::i2v::array<int_u16> left_link; + left_link.resize(ncomp + 1); + + for (unsigned i = 0; i <= ncomp; ++i) + left_link(i) = i; + + for (unsigned i = 1; i <= ncomp; ++i) + { + unsigned midcol = (cboxes[i].pmax().col() - cboxes[i].pmin().col()) / 2; + unsigned dmax = midcol + bbox_distance; + /// Box center => Routine? + point2d c (cboxes[i].pmin().row() + ((cboxes[i].pmax().row() - cboxes[i].pmin().row()) / 2), + cboxes[i].pmin().col() + midcol); + /// First point on the right of c + point2d p(c.row(), c.col() + 1); + + // Lemmings avec condition sur la distance en plus => Faire une version speciale? + while (lbl.domain().has(p) && (lbl(p) == 0 || lbl(p) == i) + && is_valid_comp_neigh(p, c, dmax)) + ++p.col(); + + update_link(left_link, lbl, p, c, i, dmax); + } + + return left_link; + } + + + + void + extract_text(image2d<bool>& in, unsigned bbox_distance, unsigned min_comp_size) + { + typedef int_u16 V; + typedef image2d<V> I; typedef util::array<box2d> boxes_t; - boxes_t tboxes = component_boxes(in); + // Find character bboxes. + V nlabels; + image2d<V> lbl = labeling::blobs(in, c4(), nlabels); + boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); + + std::cout << "nlabels = " << nlabels << std::endl; + //DEBUG PURPOSE //FIXME: don't know how to clone and convert to image<int> properly // \{ I ima(in.domain()); @@ -146,15 +320,41 @@ namespace scribo | (in | (pw::value(in) == pw::cst(true))).domain(), ima); // \} - for (int i = 1; i < tboxes.nelements(); ++i) - if (estim::nsites(tboxes[i]) < 40) - level::paste(pw::cst(false) | tboxes[i], ima); - else - draw::box(ima, tboxes[i], 150u); + //Remove small components. + int_u16 ncomp; + remove_small_comps_i2v(ima, lbl, cboxes, ncomp, min_comp_size); + + std::cout << "ncomp = " << ncomp << std::endl; + + //Link character bboxes to their left neighboor if possible. + fun::i2v::array<int_u16> left = + link_character_bboxes(lbl, cboxes, ncomp, bbox_distance); + //Merge character bboxes according to their left neighbor. + util::array< accu::bbox<point2d> > tboxes = group_bboxes(left, lbl, cboxes, ncomp); + + /// DEBUG PURPOSE + /// \{ + io::pgm::save(lbl, "./textlbl.pgm"); io::pgm::save(ima, "./text.pgm"); + + for (unsigned i = 1; i <= ncomp; ++i) + if (tboxes[i].is_valid()) + draw::box(ima, tboxes[i].to_result(), 254u); + + for (unsigned i = 1; i <= ncomp; ++i) + if (tboxes[i].is_valid()) + draw::box(in, tboxes[i].to_result(), true); + + io::pgm::save(ima, "./bbtext.pgm"); + io::pbm::save(in, "./intext.pgm"); + /// \} + } + /// \} + /// End of functions related to text extraction + } // end of namespace scribo::internal @@ -168,17 +368,17 @@ namespace scribo //Useful debug variables unsigned h = atoi(argv[2]); unsigned w = atoi(argv[3]); - unsigned n = atoi(argv[4]); + unsigned bbox_larger = atoi(argv[4]); + unsigned bbox_distance = atoi(argv[5]); + unsigned min_comp_size = atoi(argv[6]); //Load image image2d<bool> in; io::pbm::load(in, argv[1]); - internal::extract_tables(in, h, w, n); - - io::pbm::save(in, "./table-filtered.pbm"); + internal::extract_tables(in, h, w, bbox_larger); - internal::extract_text(in); + internal::extract_text(in, bbox_distance, min_comp_size); } } // end of namespace scribo diff --git a/milena/sandbox/scribo/main.cc b/milena/sandbox/scribo/main.cc index d49fee8..52aad5a 100644 --- a/milena/sandbox/scribo/main.cc +++ b/milena/sandbox/scribo/main.cc @@ -35,7 +35,7 @@ int main(int argc, char*argv[]) if (argc < 2) { - std::cout << argv[0] << " <image.pgm> <h> <w> <bbox_larger>" << std::endl; + std::cout << argv[0] << " <image.pgm> <h> <w> <bbox_larger> <bbox_distance> <min_comp_size>" << std::endl; return 1; } -- 1.5.6.5

16 years, 3 months

cleanup-2008 2638: Fix Registration. Add tests.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix Registration. Add tests. Add tests: * tests/registration: New. * tests/registration/Makefile.am: New. * tests/registration/registration.cc: New. Fix Registration: * mln/core/image/lazy_image.hh: Fix lvalue. * mln/fun/x2p/closest_point.hh: Fix input type. * mln/registration/icp.hh: Fix center() * mln/registration/get_rtransf.hh, * mln/registration/internal/rms.hh: Fix point->vec convertions. mln/core/image/lazy_image.hh | 33 +++++++++++++++++++---- mln/fun/x2p/closest_point.hh | 8 ++--- mln/registration/get_rtransf.hh | 3 +- mln/registration/icp.hh | 7 ++-- mln/registration/internal/rms.hh | 9 ++++-- tests/registration/Makefile.am | 10 +++++++ tests/registration/registration.cc | 52 +++++++++++++++++++++++++++++++++++++ 7 files changed, 106 insertions(+), 16 deletions(-) Index: tests/registration/Makefile.am --- tests/registration/Makefile.am (revision 0) +++ tests/registration/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + registration + +registration_SOURCES = registration.cc + +TESTS = $(check_PROGRAMS) Index: tests/registration/registration.cc --- tests/registration/registration.cc (revision 0) +++ tests/registration/registration.cc (revision 0) @@ -0,0 +1,52 @@ +// 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 +// 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/registration/registration.cc + * + * \brief Test on mln::registration::registration.cc + */ + +#include <mln/io/pbm/all.hh> + +#include "registration.hh" +#include "multiscale.hh" +#include "icp.hh" + + +int main(int argc, char ** argv) +{ + using namespace mln; + + image2d< bool > img1; + image2d< bool > img2; + + //load images + io::pbm::load(img1, argv[1]); + io::pbm::load(img2, argv[2]); + + registration::registration(img1,img2); +} Index: mln/core/image/lazy_image.hh --- mln/core/image/lazy_image.hh (revision 2637) +++ mln/core/image/lazy_image.hh (working copy) @@ -102,7 +102,7 @@ typedef mln_result(F) rvalue; /// Return type of read-write access. - typedef mln_result(F)& lvalue; + typedef mln_result(F) lvalue; /// Skeleton. typedef lazy_image< tag::image_, F, B > skeleton; @@ -125,11 +125,18 @@ /// Test if a pixel value is accessible at \p p. bool has(const mln_psite(I)&) const; + /// Read-only access of pixel value at F::input \p x. + mln_result(F) operator()(const typename F::input& x) const; + + /// Read and "write if possible" access of pixel value at F::input \p x. + mln_result(F) operator()(const typename F::input& x); + /// Read-only access of pixel value at point site \p p. - mln_result(F) operator()(const mln_psite(I)& p) const; + rvalue operator()(const mln_psite(I)& p) const; /// Read and "write if possible" access of pixel value at point site \p p. lvalue operator()(const mln_psite(I)& p); + }; @@ -174,7 +181,7 @@ template <typename I, typename F, typename B> inline mln_result(F) - lazy_image<I,F,B>::operator()(const mln_psite(I)& p) const + lazy_image<I,F,B>::operator()(const typename F::input& p) const { mln_assertion(this->has(p)); if (this->data_->is_known(p)) @@ -187,8 +194,8 @@ template <typename I, typename F, typename B> inline - typename lazy_image<I,F,B>::lvalue - lazy_image<I,F,B>::operator()(const mln_psite(I)& p) + mln_result(F) + lazy_image<I,F,B>::operator()(const typename F::input& p) { mln_assertion(this->has(p)); if (this->data_->is_known(p)) @@ -200,6 +207,22 @@ template <typename I, typename F, typename B> inline + typename lazy_image<I,F,B>::rvalue + lazy_image<I,F,B>::operator()(const mln_psite(I)& p) const + { + return (*this).operator()(convert::to< typename F::input >(p)); + } + + template <typename I, typename F, typename B> + inline + typename lazy_image<I,F,B>::lvalue + lazy_image<I,F,B>::operator()(const mln_psite(I)& p) + { + return (*this).operator()(convert::to< typename F::input >(p)); + } + + template <typename I, typename F, typename B> + inline const box2d& lazy_image<I,F,B>::domain() const { Index: mln/fun/x2p/closest_point.hh --- mln/fun/x2p/closest_point.hh (revision 2637) +++ mln/fun/x2p/closest_point.hh (working copy) @@ -45,7 +45,7 @@ template <typename P> struct closest_point { - typedef const algebra::vec<P::dim, float>& input; + typedef algebra::vec<P::dim, float> input; typedef P result; closest_point(const p_array& X, const box& box) @@ -56,16 +56,16 @@ result //inline - operator () (const algebra::vec<P::dim, float>& Ck) const + operator () (const input& Ck) const { ++log_functor_call; algebra::vec<P::dim,float> Cki = Ck; - algebra::vec<P::dim,float> best_x = X[0]; + algebra::vec<P::dim,float> best_x = convert::to< algebra::vec<P::dim,float> >(X[0]); float best_d = norm::l2(Cki - best_x); for (unsigned j = 1; j < X.nsites(); ++j) { - algebra::vec<P::dim,float> Xj = X[j]; + algebra::vec<P::dim,float> Xj = convert::to< algebra::vec<P::dim,float> >(X[j]); float d = norm::l2(Cki - Xj); if (d < best_d) { Index: mln/morpho/closing_attribute.hh Index: mln/registration/icp.hh --- mln/registration/icp.hh (revision 2637) +++ mln/registration/icp.hh (working copy) @@ -121,13 +121,14 @@ // FIXME: Move elsewhere template <typename P> - P center(const p_array& a) + algebra::vec<P::dim,float> + center(const p_array& a) { algebra::vec<P::dim,float> c(literal::zero); for (unsigned i = 0; i < a.nsites(); ++i) c += convert::to< algebra::vec<P::dim,float> > (a[i]); - return algebra::to_point(c / a.nsites()); + return c / a.nsites(); } // FIXME: Make use of level::apply @@ -137,7 +138,7 @@ p_array& b) { for (unsigned i = 0; i < a.nsites(); i++) - b[i] = f(a[i]); + b[i] = f(convert::to< algebra::vec<P::dim,float> >(a[i])); } Index: mln/registration/get_rtransf.hh --- mln/registration/get_rtransf.hh (revision 2637) +++ mln/registration/get_rtransf.hh (working copy) @@ -61,7 +61,8 @@ //mu_xk = center map(Ck) algebra::vec<P::dim,float> mu_xk(literal::zero); for (unsigned i = 0; i < c.nsites(); ++i) - mu_xk += convert::to< algebra::vec<P::dim,float> >(map(ck[i])); + mu_xk += convert::to< algebra::vec<P::dim,float> >(map( + convert::to< algebra::vec<P::dim,float> >(ck[i]))); mu_xk /= c.nsites(); // qR Index: mln/registration/internal/rms.hh --- mln/registration/internal/rms.hh (revision 2637) +++ mln/registration/internal/rms.hh (working copy) @@ -58,9 +58,12 @@ float f = 0.f; for (unsigned i = 0; i < a.nsites(); ++i) { - algebra::vec<P::dim,float> a2f = q2(a[i]); - algebra::vec<P::dim,float> a1f = map(algebra::to_point(q1(a[i]))); - f += norm::l2(a1f - a2f); + algebra::vec<P::dim,float> a2f = convert::to< algebra::vec<P::dim,float> >(a[i]); + algebra::vec<P::dim,float> a1f = + convert::to< algebra::vec<P::dim,float> > \ + (map(q1(convert::to< algebra::vec<P::dim,float> >(a[i])))); + + f += norm::l2(a1f - q2(a2f)); } return f / a.nsites(); }

16 years, 3 months

2637: s/milena/Milena/.

by Roland Levillain

* mln/core/concept/gpoint.hh, * mln/core/concept/object.hh, * mln/core/concept/point_site.hh, * mln/core/image/fi_adaptor.hh, * mln/core/macros.hh, * mln/core/routine/ops.hh, * mln/io/fits/load.hh, * mln/io/pbm/load.hh, * mln/io/pbm/save.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh, * mln/io/pgm/load.hh, * mln/io/pgm/save.hh, * mln/io/pnm/save.hh, * mln/io/pnm/save_header.hh, * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * mln/make/all.hh: Do it. --- milena/mln/core/concept/gpoint.hh | 2 +- milena/mln/core/concept/object.hh | 8 ++++---- milena/mln/core/concept/point_site.hh | 2 +- milena/mln/core/image/fi_adaptor.hh | 2 +- milena/mln/core/macros.hh | 2 +- milena/mln/core/routine/ops.hh | 10 +++++----- milena/mln/io/fits/load.hh | 2 +- milena/mln/io/pbm/load.hh | 2 +- milena/mln/io/pbm/save.hh | 2 +- milena/mln/io/pfm/load.hh | 2 +- milena/mln/io/pfm/save.hh | 2 +- milena/mln/io/pgm/load.hh | 4 ++-- milena/mln/io/pgm/save.hh | 2 +- milena/mln/io/pnm/save.hh | 2 +- milena/mln/io/pnm/save_header.hh | 2 +- milena/mln/io/ppm/load.hh | 4 ++-- milena/mln/io/ppm/save.hh | 2 +- milena/mln/make/all.hh | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/milena/mln/core/concept/gpoint.hh b/milena/mln/core/concept/gpoint.hh index ecce05b..205b64b 100644 --- a/milena/mln/core/concept/gpoint.hh +++ b/milena/mln/core/concept/gpoint.hh @@ -157,7 +157,7 @@ namespace mln * \param[in] lhs A first grid point. * \param[in] rhs A second grid point. * - * \warning There is no type promotion in milena so the client + * \warning There is no type promotion in Milena so the client * has to make sure that both points are defined with the same * type of coordinates. * diff --git a/milena/mln/core/concept/object.hh b/milena/mln/core/concept/object.hh index b501959..135678b 100644 --- a/milena/mln/core/concept/object.hh +++ b/milena/mln/core/concept/object.hh @@ -30,7 +30,7 @@ /*! \file mln/core/concept/object.hh * - * \brief Definition of the top milena class mln::Object. + * \brief Definition of the top Milena class mln::Object. */ # include <cassert> @@ -54,12 +54,12 @@ * * \section intro_sec Introduction * - * This is the documentation of milena. + * This is the documentation of Milena. * * \section tools_subsec Tools required. * FIXME. * - * \section mln_sec Overview of milena. + * \section mln_sec Overview of Milena. * * <UL> * <LI> \ref mln @@ -164,7 +164,7 @@ namespace mln }; - /*! \brief Base class for almost every class defined in milena. + /*! \brief Base class for almost every class defined in Milena. * * The parameter \a E is the exact type. */ diff --git a/milena/mln/core/concept/point_site.hh b/milena/mln/core/concept/point_site.hh index 44a5fd2..5615ef8 100644 --- a/milena/mln/core/concept/point_site.hh +++ b/milena/mln/core/concept/point_site.hh @@ -151,7 +151,7 @@ namespace mln * \param[in] lhs A first point site. * \param[in] rhs A second point site. * - * \warning There is no type promotion in milena so the client + * \warning There is no type promotion in Milena so the client * has to make sure that both points are defined with the same * type of coordinates. * diff --git a/milena/mln/core/image/fi_adaptor.hh b/milena/mln/core/image/fi_adaptor.hh index 70c5a20..b58c7b4 100644 --- a/milena/mln/core/image/fi_adaptor.hh +++ b/milena/mln/core/image/fi_adaptor.hh @@ -123,7 +123,7 @@ namespace mln /*! \brief fi_adaptor class. * - * The parameter \c I is the type of image through milena will see + * The parameter \c I is the type of image through Milena will see * the Freeimage's class. This class aims to load images using * Freeimage library. */ diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index d075bdb..afbf50c 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -31,7 +31,7 @@ /*! \file mln/core/macros.hh * - * \brief Definition of the set of milena macros. + * \brief Definition of the set of Milena macros. */ diff --git a/milena/mln/core/routine/ops.hh b/milena/mln/core/routine/ops.hh index f732a49..4a0c317 100644 --- a/milena/mln/core/routine/ops.hh +++ b/milena/mln/core/routine/ops.hh @@ -215,7 +215,7 @@ namespace mln * It returns "not (lhs == rhs)". * * \warning There shall not be any other definition of this operator - * in milena when applying on a couple of mln::Object. + * in Milena when applying on a couple of mln::Object. */ template <typename O1, typename O2> mln_trait_op_neq(O1, O2) @@ -229,7 +229,7 @@ namespace mln * operator. It returns "rhs < lhs". * * \warning There shall not be any other definition of this operator - * in milena when applying on a couple of mln::Object. + * in Milena when applying on a couple of mln::Object. */ template <typename O1, typename O2> mln_trait_op_greater(O1, O2) @@ -240,11 +240,11 @@ namespace mln * operator. * * The "greater than or equal to" operator is here defined for - * every milena objects. It relies on the definition of the "less + * every Milena objects. It relies on the definition of the "less * than or equal to" operator. It returns "rhs <= lhs". * * \warning There shall not be any other definition of this operator - * in milena when applying on a couple of mln::Object. + * in Milena when applying on a couple of mln::Object. */ template <typename O1, typename O2> mln_trait_op_geq(O1, O2) @@ -255,7 +255,7 @@ namespace mln * operator. * * A default version of the "less than or equal to" operator is - * defined for every milena objects. It relies on the definition of + * defined for every Milena objects. It relies on the definition of * the "less than" operator. It returns "not (rhs < lhs)". * * \warning In the case of partial ordering between objects, this diff --git a/milena/mln/io/fits/load.hh b/milena/mln/io/fits/load.hh index 4d284ce..4d7e8e2 100644 --- a/milena/mln/io/fits/load.hh +++ b/milena/mln/io/fits/load.hh @@ -55,7 +55,7 @@ namespace mln namespace fits { - /*! Load a fits image in a milena image. + /*! Load a fits image in a Milena image. * * \param[out] ima A reference to the image2d<float> which will receive * data. diff --git a/milena/mln/io/pbm/load.hh b/milena/mln/io/pbm/load.hh index 7dd721a..3174b36 100644 --- a/milena/mln/io/pbm/load.hh +++ b/milena/mln/io/pbm/load.hh @@ -55,7 +55,7 @@ namespace mln { - /*! Load a pbm image in a milena image. + /*! Load a pbm image in a Milena image. * * \param[out] ima A reference to the image2d<bool> which will receive * data. diff --git a/milena/mln/io/pbm/save.hh b/milena/mln/io/pbm/save.hh index cfdb688..eeb0580 100644 --- a/milena/mln/io/pbm/save.hh +++ b/milena/mln/io/pbm/save.hh @@ -63,7 +63,7 @@ namespace mln namespace pbm { - /*! Save a milena image as a pbm image. + /*! Save a Milena image as a pbm image. * * \param[in] ima The image to save. * \param[in,out] filename the destination. diff --git a/milena/mln/io/pfm/load.hh b/milena/mln/io/pfm/load.hh index da75564..9ddaed2 100644 --- a/milena/mln/io/pfm/load.hh +++ b/milena/mln/io/pfm/load.hh @@ -53,7 +53,7 @@ namespace mln namespace pfm { - /*! Load a pfm image in a milena image. + /*! Load a pfm image in a Milena image. * * \param[out] ima A reference to the image2d<float> which will receive * data. diff --git a/milena/mln/io/pfm/save.hh b/milena/mln/io/pfm/save.hh index f5d45bd..7223b38 100644 --- a/milena/mln/io/pfm/save.hh +++ b/milena/mln/io/pfm/save.hh @@ -55,7 +55,7 @@ namespace mln namespace pfm { - /*! Save a milena image as a pfm image. + /*! Save a Milena image as a pfm image. * * \param[in] ima The image to save. * \param[in,out] filename the destination. diff --git a/milena/mln/io/pgm/load.hh b/milena/mln/io/pgm/load.hh index 815f687..cbe7e05 100644 --- a/milena/mln/io/pgm/load.hh +++ b/milena/mln/io/pgm/load.hh @@ -57,7 +57,7 @@ namespace mln namespace pgm { - /*! Load a pgm image in a milena image. + /*! Load a pgm image in a Milena image. * * \param[out] ima A reference to the image which will receive * data. @@ -68,7 +68,7 @@ namespace mln const std::string& filename); - /*! Load a pgm image in a milena image. To use this routine, you + /*! Load a pgm image in a Milena image. To use this routine, you * should specialize the template whith the value type of the * image loaded. (ex : load<value::int_u8>("...") ) * diff --git a/milena/mln/io/pgm/save.hh b/milena/mln/io/pgm/save.hh index b8ad598..d5d368b 100644 --- a/milena/mln/io/pgm/save.hh +++ b/milena/mln/io/pgm/save.hh @@ -63,7 +63,7 @@ namespace mln namespace pgm { - /*! Save a milena image as a pgm image. + /*! Save a Milena image as a pgm image. * * \param[in] ima The image to save. * \param[in,out] filename the destination. diff --git a/milena/mln/io/pnm/save.hh b/milena/mln/io/pnm/save.hh index f8ee360..eadd618 100644 --- a/milena/mln/io/pnm/save.hh +++ b/milena/mln/io/pnm/save.hh @@ -64,7 +64,7 @@ namespace mln namespace pnm { - /*! Save a milena image as a pnm image. + /*! Save a Milena image as a pnm image. * * \param[in] type The type of the image to save (can be PPM, * PGM, PBM). diff --git a/milena/mln/io/pnm/save_header.hh b/milena/mln/io/pnm/save_header.hh index 3a8c58e..a5bbde2 100644 --- a/milena/mln/io/pnm/save_header.hh +++ b/milena/mln/io/pnm/save_header.hh @@ -81,7 +81,7 @@ namespace mln abort(); } file << "P" << type << std::endl; - file << "# Generated by milena 1.0 http://olena.lrde.epita.fr" << std::endl; + file << "# Generated by Milena 1.0 http://olena.lrde.epita.fr" << std::endl; file << "# EPITA Research and Development Laboratory (LRDE)" << std::endl; // We have a two-line comment because xv is buggy for some // tiny binary images and their workaround is to have such a diff --git a/milena/mln/io/ppm/load.hh b/milena/mln/io/ppm/load.hh index 70def35..dc2ee4d 100644 --- a/milena/mln/io/ppm/load.hh +++ b/milena/mln/io/ppm/load.hh @@ -55,7 +55,7 @@ namespace mln namespace ppm { - /*! Load a ppm image in a milena image. + /*! Load a ppm image in a Milena image. * * \param[out] ima A reference to the image which will receive * data. @@ -65,7 +65,7 @@ namespace mln void load(Image& ima, const std::string& filename); - /*! Load a ppm image in a milena image. To use this routine, you + /*! Load a ppm image in a Milena image. To use this routine, you * should specialize the template whith the value type of the * image loaded. (ex : load<value::int_u8>("...") ) * diff --git a/milena/mln/io/ppm/save.hh b/milena/mln/io/ppm/save.hh index 47a19f5..c10f3ca 100644 --- a/milena/mln/io/ppm/save.hh +++ b/milena/mln/io/ppm/save.hh @@ -52,7 +52,7 @@ namespace mln namespace ppm { - /*! Save a milena image as a ppm image. + /*! Save a Milena image as a ppm image. * * \param[in] ima The image to save. * \param[in,out] filename the destination. diff --git a/milena/mln/make/all.hh b/milena/mln/make/all.hh index f7e6e40..1dbe10b 100644 --- a/milena/mln/make/all.hh +++ b/milena/mln/make/all.hh @@ -37,7 +37,7 @@ namespace mln { - /// Namespace of routines that help to make milena's objects. + /// Namespace of routines that help to make Milena's objects. namespace make {} } -- 1.6.0.1

16 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches