- Olena-patches

r2737: Add skeleton algorithm
by Jimmy Ma 30 Oct '08

30 Oct '08

From: Jimmy Ma <jimmy.ma(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2737: Add skeleton algorithm URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-30 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Add skeleton algorithm. * garrigues/ocr/skel.cc: New. --- skel.cc | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/skel.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/skel.cc (revision 0) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/skel.cc (revision 2737) @@ -0,0 +1,155 @@ +# include <mln/core/var.hh> + +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/site_set/p_queue_fast.hh> +# include <mln/core/site_set/p_priority.hh> + +# include <mln/io/pbm/load.hh> +# include <mln/io/pbm/save.hh> +# include <mln/value/int_u8.hh> + +# include <mln/level/fill.hh> + +# include <mln/debug/println.hh> + +# include "simple_point.hh" + + +namespace mln +{ + + template <typename D, typename I, typename N> + mln_ch_value(I, D) + distance(D, const I& input, const N& nbh) + { + const D M = mln_max(D); + mln_ch_value(I, D) output; + initialize(output, input); + + mln_ch_value(I, bool) deja_vu; + initialize(deja_vu, input); + level::fill(deja_vu, input); + + typedef mln_site(I) P; + p_queue_fast q; + + // Initialization. + { + level::fill(output, M); + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + if (input(p) == true) // p in object + { + output(p) = 0; + for_all(n) + if (input.domain().has(n) && input(n) == false) // n in background + { + q.push(p); + break; + } + } + } + + // Propagation. + { + P p; + mln_niter(N) n(nbh, p); + while (! q.is_empty()) + { + p = q.pop_front(); + for_all(n) + if (input.domain().has(n) && output(n) == M) + { + output(n) = output(p) + 1; + if (output(n) == M) + { + // Saturation so stop. + q.clear(); + break; + } + q.push(n); + deja_vu(n) = true; + } + } + } + + return output; + } + + image2d<bool> + skel(const image2d<bool>& input, unsigned nbh_i) + { + neighb2d nbh = int_to_neighb(nbh_i); + image2d<bool> output; + initialize(output, input); + + image2d<value::int_u16> dist_map = distance(value::int_u16(), input, nbh); + + typedef mln_site_(image2d<bool>) P; + p_priority<value::int_u16, p_queue_fast > q; + + // Initialization. + { + level::fill(output, input); + mln_piter_(image2d<bool>) p(output.domain()); + for_all(p) + if (output(p) && + is_simple_point2d(output, nbh_i, p) && // p is a not simple point of object + !is_curve_extremum(output, nbh_i, p)) + { + output(p) = false; // Remove p from object + q.push(dist_map(p), p); + } + } + + // Propagation. + { + P p; + mln_niter_(neighb2d) n(nbh, p); + while (! q.is_empty()) + { + p = q.pop_front(); + + for_all(n) + if (output.domain().has(n) && + output(n) && + is_simple_point2d(output, nbh_i, n) && // n is not simple + !is_curve_extremum(output, nbh_i, n)) + { + output(n) = false; // Remove p from object + q.push(dist_map(n), n); + } + } + } + + return output; + } + +} // mln + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm output.pbm" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) + usage(argv); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + image2d<bool> output = skel(input, 4); + io::pbm::save(output, argv[2]); +}

1 0

r2736: Add is_curve_extremum to detect curve extrema
by Matthieu Garrigues 30 Oct '08

30 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-30 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add is_curve_extremum to detect curve extrema. * garrigues/ocr/simple_point.hh: (is_curve_extremum) Tell if a point is a curve extremum. --- simple_point.hh | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh (revision 2735) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh (revision 2736) @@ -30,7 +30,7 @@ /*! \file simple_point.hh * - * \brief simple_point tell if a point is simple or not (Cf + * \brief is_simple_point tell if a point is simple or not (Cf * bertrand.07.chap). * */ @@ -57,10 +57,12 @@ * */ - bool simple_point(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); + bool is_simple_point(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); unsigned nb_connexity2d(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); + bool is_curve_extremum(const image2d<bool>& ima, unsigned nbh, const point2d& p); + # ifndef MLN_INCLUDE_ONLY static const unsigned char nb_connexity_c8[256] = @@ -129,15 +131,15 @@ return 0; } - unsigned nb_connexity2d(const image2d<bool>& ima, unsigned nbh, const point2d& p, bool complemented) + unsigned nb_connexity2d(const image2d<bool>& ima, unsigned nbh, const point2d& p, bool object) { unsigned res = 0; - mln_fwd_niter_(neighb2d) n(c8() , p); + mln_bkd_niter_(neighb2d) n(c8() , p); for_all(n) { res = (res << 1); - if (ima(n) == complemented) + if (ima(n) == object) res = res | 1; } @@ -150,12 +152,26 @@ } } - bool simple_point2d(const image2d<bool>& ima, unsigned nbh, const point2d& p) + bool is_curve_extremum(const image2d<bool>& ima, unsigned nbh, const point2d& p) + { + unsigned cpt = 0; + mln_bkd_niter_(neighb2d) n(c8() , p); + + for_all(n) + { + if (ima(n) == true) + cpt++; + } + + return cpt == 1; + } + + bool is_simple_point2d(const image2d<bool>& ima, unsigned nbh, const point2d& p) { mln_assertion(nbh == 4 || nbh == 8); - return nb_connexity2d(ima, nbh, p, true) == 1 && - nb_connexity2d(ima, complement_neighb(nbh), p, false) == 1; + return (nb_connexity2d(ima, nbh, p, true) == 1) && + (nb_connexity2d(ima, complement_neighb(nbh), p, false) == 1); } # endif // MLN_INCLUDE_ONLY

1 0

cleanup-2008 2735: INIM: Classif: Make palette.
by Ugo Jardonnet 30 Oct '08

30 Oct '08

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: Make palette. * classif/iccvg04.cc: Beautify. * classif/proj.hh: Add palette creation. * classif/v2.cc: Avoid useless implicit cast. * classif/Makefile: Change default streching. Makefile | 2 +- iccvg04.cc | 9 +++++---- proj.hh | 26 ++++++++++++++++++++++---- v2.cc | 5 ++++- 4 files changed, 32 insertions(+), 10 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2734) +++ classif/iccvg04.cc (working copy) @@ -96,7 +96,8 @@ sum[w] += histo(p3) * convert::to< algebra::vec<3, value::int_u8> >(p3); } - std::cerr << "p3 : " << p3 << " == " << convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; + std::cerr << "p3 : " << p3 << " == " << + convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; } for (int i = 1; i < nbasins + 1; ++i) @@ -118,10 +119,12 @@ //if w == 0, out(pi) = 0 ie is part of a border of the watershed out(pi) = convert::to<value::rgb8>(sum[w]); - std::cerr << "out(" << pi << ") = sum[" << w << "]; //" << sum[w] << " : rgb8(" << convert::to<value::rgb8>(sum[w]) << ")" << std::endl; + std::cerr << "out(" << pi << ") = sum[" << w << "]; //" + << sum[w] << " : rgb8(" << sum[w] << ")" << std::endl; } io::ppm::save(out, "out.ppm"); + save_class(histo, ws, sum, "palette.ppm"); } bool usage(int argc, char ** argv) @@ -161,6 +164,4 @@ //classify image classify_image(ima, histo, ws, nbasins, div_factor); - - save_class(histo_filtered, "histo.ppm"); } Index: classif/proj.hh --- classif/proj.hh (revision 2734) +++ classif/proj.hh (working copy) @@ -32,6 +32,8 @@ #include <mln/io/pgm/save.hh> #include <mln/level/paste.hh> #include <mln/accu/mean.hh> +#include <mln/accu/max.hh> +#include <mln/literal/white.hh> namespace mln { @@ -50,12 +52,28 @@ return output; } - template <typename T> + template <typename T, typename U, typename K> void - save_class(const image3d<T>& histo, const char * fn) + save_class(const image3d<T>& histo, const image3d& ws, + K mean, const char * fn) { - accu::mean<unsigned, unsigned long, value::int_u8> mean; - io::pgm::save(proj(histo, mean), fn); + + //accu::mean<unsigned, unsigned long, value::int_u8> mean_accu; + accu::max<value::int_u8> max_1;//FIXME: use majoritaire accu + image2d<value::int_u8> hproj = proj(histo, max_1); + + accu::max max_2;//FIXME: use majoritaire accu + image2d proj_class = proj(ws, max_2); + + image2d<value::rgb8> out(proj_class.domain()); + + level::fill(out, literal::white); + mln_piter(image2d<value::int_u8>) p(hproj.domain()); + for_all(p) + if (hproj(p) > 0) + out(p) = convert::to<value::rgb8>(mean[proj_class(p)]); + + io::ppm::save(out, fn); } } // end of namespace mln Index: classif/v2.cc --- classif/v2.cc (revision 2734) +++ classif/v2.cc (working copy) @@ -48,10 +48,13 @@ mln_piter(I) p(ima.domain()); for_all(p) { - algebra::vec<3, value::int_u8> v = make::vec(ima(p).red() / f, + //color at ima(p) + point3d v = point3d(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + //node the class of color with same density as v point3d pn = run.parent(v); + //out(p) = color pn out(p) = value::rgb8(pn[0] * f, pn[1] * f, pn[2] * f); } io::ppm::save(out, "tmp.ppm"); Index: classif/Makefile --- classif/Makefile (revision 2734) +++ classif/Makefile (working copy) @@ -7,7 +7,7 @@ ICCVG_DBG=iccvg_dbg IMG?=../../img/lena.ppm -DIV?=8 +DIV?=4 LAMBDA?=10

1 0

cleanup-2008 2734: Make shell a value.
by Alexandre Abraham 30 Oct '08

30 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Make shell a value. * abraham/mln/value/shell.hh: New mln::value::shell is now a value. * abraham/mln/core/image/thru.hh: change namespace of shell. core/image/thru.hh | 19 +++-- value/shell.hh | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 6 deletions(-) Index: abraham/mln/core/image/thru.hh --- abraham/mln/core/image/thru.hh (revision 2733) +++ abraham/mln/core/image/thru.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/core/internal/image_value_morpher.hh> # include <mln/trait/images.hh> # include <mln/value/set.hh> -# include <mln/core/image/shell.hh> +# include <mln/value/shell.hh> # include <mln/metal/if.hh> # include <mln/metal/equal.hh> @@ -89,8 +89,7 @@ - /*! \brief Class of image morpher which takes an image and a functor - * FIXME + /*! \brief Class of image morpher which takes allow to view an image throught a morpher */ template <typename F, typename I> struct thru : @@ -103,7 +102,7 @@ typedef mln_result(F) rvalue; /// Return type of read-write access. - typedef shell<F,I> lvalue; // FIXME : if I is const or F is Function_v2v, there is no shell + typedef mln::value::shell<F,I> lvalue; // FIXME : if I is const or F is Function_v2v, there is no shell /// Skeleton. typedef thru< tag::value_<mln_result(F)>, tag::image_ > skeleton; @@ -170,12 +169,20 @@ template <typename F, typename I> inline - shell<F, I> + value::shell<F, I> thru<F,I>::operator()(const mln_psite(I)& p) { - return shell<F, I>( this->data_->ima_, p ); + return mln::value::shell<F, I>( this->data_->ima_, p ); } + + // template <typename F, typename I> + // thru<F, I> thru(Function<F> &f, Image &i) + // { + // return thru<F, I> (f, i); + // } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 0) +++ abraham/mln/value/shell.hh (revision 0) @@ -0,0 +1,180 @@ +// 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_CORE_VALUE_SHELL_HH +# define MLN_CORE_VALUE_SHELL_HH + +# include <mln/core/concept/function.hh> +# include <mln/core/concept/image.hh> +# include <mln/value/internal/value_like.hh> + +namespace mln +{ + + namespace value + { + template <typename F, typename I> + struct shell; + } + + // FIXME : traits + + + namespace value + { + namespace impl + { + template <typename F, typename I, class C> + struct shell_; + + template <typename F, typename I> + struct shell_<F, I, Function_v2w2v<void> > + { + mln_value(I) set_ (I &ima, const mln_site(I) &s, const typename F::result &v); + }; + + template <typename F, typename I> + struct shell_<F, I, Function_v2w_w2v<void> > + { + mln_value(I) set_ (I &ima, const mln_site(I) &s, const typename F::result &v); + }; + } + + + template <typename F, typename I> + struct shell : public impl::shell_<F, I, typename F::category>, Value < shell<F, I> > // FIXME : should it be value_like ? + { + typedef typename F::result value; + + // Ctor + shell(Image &ima, const mln_site(I) &s); + + // Read + operator value (); + + // Write + value operator= (value); + + // Enc + typedef void enc; // FIXME + + // Equiv + typedef value equiv; + + // << + // std::ostream& operator<<(std::ostream& ostr); + + // >> + // std::istream& operator>>(std::istream& istr); + + + protected : + I &ima; + mln_site(I) s; + }; + } + +# ifndef MLN_INCLUDE_ONLY + + namespace value + { + + // Ctor + + template <typename F, typename I> + shell<F, I>::shell(Image &ima, const mln_site(I) &s) + : ima(exact(ima)), s(s) + { } + + + // Read for everyone + template <typename F, typename I> + shell<F, I>::operator value () + { + return F()(ima(s)); + } + + // Write for everyone + template <typename F, typename I> + typename F::result shell<F, I>::operator= (typename F::result v) + { + set_(ima, s, v); + return v; + } + + // template <typename F, typename I> + // std::ostream& shell<F, I>::operator<<(std::ostream& ostr) + // { + // ostr << ima(s); + // return ostr; + // } + + // template <typename F, typename I> + // std::istream& shell<F, I>::operator>>(std::istream& istr) + // { + // ima(s) >> istr; + // return istr; + // } + + namespace impl + { + template <typename F, typename I> + mln_value(I) shell_<F, I, Function_v2w2v<void> >::set_ (I &ima, const mln_site(I) &s, const typename F::result &v) + { + ima(s) = F().f_1(v); + return ima(s); + } + + template <typename F, typename I> + mln_value(I) shell_<F, I, Function_v2w_w2v<void> >::set_ (I &ima, const mln_site(I) &s, const typename F::result &v) + { + ima(s) = F().f_1(ima(s), v); + return ima(s); + } + + } + } + + template <typename F, typename I> + std::ostream& operator<<(std::ostream& ostr, value::shell<F, I> &s) + { + ostr << (typename value::shell<F, I>::value) s; + return ostr; + } + + template <typename F, typename I> + std::istream& operator>>(std::istream& istr, value::shell<F, I> &s) + { + (typename value::shell<F, I>::value) s >> istr; + return istr; + } + +# endif // MLN_INCLUDE_ONLY + +}; // end of namespace mln + +#endif // MLN_CORE_VALUE_SHELL_HH

1 0

2733: Update and add more debug.
by Guillaume Lazzara 30 Oct '08

30 Oct '08

* scribo/demat.hh, * scribo/photo.cc, * scribo/table.cc: Update usage and add more debug. --- milena/sandbox/ChangeLog | 9 +++++++++ milena/sandbox/scribo/demat.hh | 36 +++++++++++++++++------------------- milena/sandbox/scribo/photo.cc | 4 ++-- milena/sandbox/scribo/table.cc | 4 ++-- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 3d25b14..3c60bfa 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,12 @@ +2008-10-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update and add more debug. + + * scribo/demat.hh, + * scribo/photo.cc, + * scribo/table.cc: + Update usage and add more debug. + 2008-10-29 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * garrigues/ocr/compute_local_configurations.cc: New, A program to diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index 7f88bb8..ff332d3 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -28,6 +28,8 @@ #ifndef DEMAT_HH_ # define DEMAT_HH_ +# include <libgen.h> + # include <mln/core/image/image2d.hh> # include <mln/core/image/image1d.hh> @@ -269,14 +271,6 @@ namespace scribo level::paste((pw::cst(false) | boxes[i] | (pw::value(output) == pw::cst(true))), output); } - if (dim == 0) - { - io::pbm::save(output, "plop.pbm"); - image2d<rgb8> tmp(output.domain()); - level::fill(tmp, literal::black); - draw_component_boxes(tmp, boxes); - io::ppm::save(tmp, output_file("plop2.ppm")); - } } @@ -295,6 +289,8 @@ namespace scribo // Lignes verticales std::cout << "Removing vertical lines" << std::endl; win::vline2d vline(l); + io::pbm::save(in, "ero_in_before"); + trace::quiet = false; image2d<bool> vfilter = morpho::erosion(in, vline); #ifndef NOUT @@ -368,6 +364,8 @@ namespace scribo util::array<mln_result(accu_count_t)> nsitecomp = labeling::compute(accu_count_t(), lbl, nlabels); + std::cout << "nlabels with small comps = " << nlabels + << " == " << nsitecomp.nelements() << std::endl; V ncomp = 0; fun::i2v::array<V> f(nsitecomp.nelements()); f(0) = 0; @@ -379,7 +377,10 @@ namespace scribo f(i) = ++ncomp; } - level::apply(lbl, f); + std::cout << "f.size() =" << f.size() + << " - nsitecomp.nelements() =" << nsitecomp.nelements() + << std::endl; + lbl = level::transform(lbl, f); nlabels = ncomp; #ifndef NOUT @@ -401,7 +402,7 @@ namespace scribo tboxes[uncurri_left_link(left_link, i)].take(cboxes[i]); //Update labels - level::apply(lbl, left_link); + lbl = level::transform(lbl, left_link); #ifndef NOUT save_lbl_image(lbl, ncomp, "lbl-grouped-boxes.pgm"); @@ -522,18 +523,15 @@ namespace scribo trace::quiet = true; //Useful debug variables - unsigned narg = 3; - internal::input_file = argv[2]; - unsigned l; - if (treat_tables) - l = atoi(argv[narg++]); - unsigned bbox_distance = atoi(argv[narg++]); - unsigned min_comp_size = atoi(argv[narg++]); + internal::input_file = basename(argv[1]); + unsigned l = 101; + unsigned bbox_distance = 25; + unsigned min_comp_size = 5; //Load image image2d<bool> in; io::pbm::load(in, argv[1]); - logical::not_inplace(in); + in = logical::not_(in); image2d<rgb8> output = level::convert(rgb8(), in); @@ -549,7 +547,7 @@ namespace scribo internal::extract_text(in, output, bbox_distance, min_comp_size); internal::draw_component_boxes(output, tboxes); - io::ppm::save(output, argv[2]); + io::ppm::save(output, internal::output_file("out")); /// Use txt bboxes here with Tesseract /// for (i = 1; i < tboxes.nelements(); ++i) diff --git a/milena/sandbox/scribo/photo.cc b/milena/sandbox/scribo/photo.cc index 991cc0d..4e358ab 100644 --- a/milena/sandbox/scribo/photo.cc +++ b/milena/sandbox/scribo/photo.cc @@ -42,7 +42,7 @@ int main(int argc, char*argv[]) << std::endl << std::endl << "<in.pbm> B/W inverted input image." << std::endl << std::endl - << "<out.ppm> RGB8 output image." +/* << "<out.ppm> RGB8 output image." << std::endl << std::endl << "<bbox_distance> Maximum distance between character bounding boxes. Used for bbox grouping." << std::endl << std::endl @@ -50,7 +50,7 @@ int main(int argc, char*argv[]) << std::endl << " If a component have a site count lesser than this value, it is erased." << std::endl << std::endl - << std::endl + << std::endl*/ << "==========" << std::endl << std::endl << "HINT: compile with -DNOUT to avoid debug images." diff --git a/milena/sandbox/scribo/table.cc b/milena/sandbox/scribo/table.cc index 2837cb1..3c28540 100644 --- a/milena/sandbox/scribo/table.cc +++ b/milena/sandbox/scribo/table.cc @@ -42,7 +42,7 @@ int main(int argc, char*argv[]) << std::endl << std::endl << "<in.pbm> B/W inverted input image." << std::endl << std::endl - << "<out.ppm> RGB8 output image." +/* << "<out.ppm> RGB8 output image." << std::endl << std::endl << "<l> Line length" << std::endl << std::endl @@ -52,7 +52,7 @@ int main(int argc, char*argv[]) << std::endl << " If a component have a site count lesser than this value, it is erased." << std::endl << std::endl - << std::endl + << std::endl*/ << "==========" << std::endl << std::endl << "HINT: compile with -DNOUT to avoid debug images." -- 1.5.6.5

1 0

cleanup-2008 2732: Start cleaning weighted windows and linear operators.
by Thierry Geraud 30 Oct '08

30 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start cleaning weighted windows and linear operators. * mln/core/w_window.hh (trait): New * mln/make/w_window.hh: Fix. * tests/make/w_window.cc: New. * tests/make/Makefile.am: Update. * mln/trait/image_from_mesh.hh: Rename as... * mln/trait/image_from_grid.hh: ...this. (image_from_mesh, mln_image_from_mesh): Rename as... (image_from_grid, mln_image_from_grid): ...these. * mln/draw/label.hh, * mln/trait/ch_value.hh, * mln/display/color_pretty.hh, * mln/display/remove.hh, * mln/display/save.hh, * mln/display/show.hh: Update. * mln/border/resize.hh: Remove dead code. * mln/convert/from_to.hxx: Disambiguate doc. mln/border/resize.hh | 4 -- mln/convert/from_to.hxx | 2 - mln/core/w_window.hh | 18 +++++++++-- mln/display/color_pretty.hh | 14 ++++---- mln/display/remove.hh | 2 - mln/display/save.hh | 2 - mln/display/show.hh | 2 - mln/draw/label.hh | 6 +-- mln/make/w_window.hh | 17 ++++++++-- mln/trait/ch_value.hh | 6 +-- mln/trait/image_from_grid.hh | 14 ++++---- tests/make/Makefile.am | 4 +- tests/make/w_window.cc | 68 +++++++++++++++++++++++++++++++++++++++++++ 13 files changed, 123 insertions(+), 36 deletions(-) Index: tests/make/w_window.cc --- tests/make/w_window.cc (revision 0) +++ tests/make/w_window.cc (revision 0) @@ -0,0 +1,68 @@ +// 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 +// 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/make/w_window.cc + * + * \brief Tests on mln::make::w_window. + * + * \todo Remove std::cout. + */ + +#include <mln/core/alias/window2d.hh> +// #include <mln/core/w_window.hh> +#include <mln/core/alias/w_window2d_int.hh> + + +struct test : mln::Function_p2v<test> +{ + typedef int result; + int operator()(const mln::point2d& p) const + { + return p.row() + p.col(); + } +}; + + +int main() +{ + using namespace mln; + + bool vals[] = { 1, 1, 0, 0, 1, + 1, 1, 1, 1, 0, + 0, 1, 1, 1, 0, + 0, 1, 1, 1, 0, + 0, 1, 0, 0, 0 }; + window2d win; + convert::from_to(vals, win); + + w_window2d_int w_win = make::w_window(win, test()); + std::cout << w_win << std::endl; + + +// mln_assertion( count(ima, make::w_window(ima, c4(), c8())) +// == c4().size() + c8().size() ); +} Index: tests/make/Makefile.am --- tests/make/Makefile.am (revision 2731) +++ tests/make/Makefile.am (working copy) @@ -4,9 +4,11 @@ check_PROGRAMS = \ dual_neighb \ - mat + mat \ + w_window dual_neighb_SOURCES = dual_neighb.cc mat_SOURCES = mat.cc +w_window_SOURCES = w_window.cc TESTS = $(check_PROGRAMS) Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 2731) +++ mln/trait/ch_value.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/tag/skeleton.hh> -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # define mln_ch_value(I, V) typename mln::trait::ch_value< I, V >::ret @@ -159,7 +159,7 @@ { // FIXME: what about S::site having no grid? typedef mln_deduce(S, site, grid) grid; - typedef typename image_from_mesh< grid, V >::ret ret; + typedef typename image_from_grid< grid, V >::ret ret; }; template < template <class, class> class M, typename T, typename S, @@ -168,7 +168,7 @@ { // FIXME: what about S::site having no grid? typedef mln_deduce(S, site, grid) grid; - typedef typename image_from_mesh< grid, V >::ret ret; + typedef typename image_from_grid< grid, V >::ret ret; }; Index: mln/trait/image_from_grid.hh --- mln/trait/image_from_grid.hh (revision 2730) +++ mln/trait/image_from_grid.hh (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 @@ -28,7 +28,7 @@ #ifndef MLN_TRAIT_IMAGE_FROM_MESH_HH # define MLN_TRAIT_IMAGE_FROM_MESH_HH -/*! \file mln/trait/image_from_mesh.hh +/*! \file mln/trait/image_from_grid.hh * * \brief Definition of the "image from mesh" trait. */ @@ -36,7 +36,7 @@ # include <mln/core/grids.hh> -# define mln_image_from_mesh(I, V) typename mln::trait::image_from_mesh< I, V >::ret +# define mln_image_from_grid(G, V) typename mln::trait::image_from_grid< G, V >::ret @@ -53,22 +53,22 @@ namespace trait { - template <typename M, typename V> struct image_from_mesh; + template <typename M, typename V> struct image_from_grid; template <typename V> - struct image_from_mesh< grid::tick, V > + struct image_from_grid< grid::tick, V > { typedef image1d<V> ret; }; template <typename V> - struct image_from_mesh< grid::square, V > + struct image_from_grid< grid::square, V > { typedef image2d<V> ret; }; template <typename V> - struct image_from_mesh< grid::cube, V > + struct image_from_grid< grid::cube, V > { typedef image3d<V> ret; }; Index: mln/core/w_window.hh --- mln/core/w_window.hh (revision 2731) +++ mln/core/w_window.hh (working copy) @@ -50,10 +50,22 @@ namespace mln { - // Fwd decl. + // Forward declarations. + template <typename D, typename W> struct w_window; template <typename It, typename W> struct with_w_; + namespace trait + { + + template <typename D, typename W> + struct window_< mln::w_window<D,W> > : window_<W> + { + // Same traits as its corresponding window. + }; + + } // end of namespace mln::trait + /*! \brief Generic w_window class. * @@ -64,7 +76,7 @@ template <typename D, typename W> struct w_window : public Weighted_Window< w_window<D,W> > { - /// DPsite associated type. + /// Dpsite associated type. typedef D dpsite; /// Psite associated type. @@ -338,7 +350,7 @@ { ostr << '['; for (unsigned i = 0; i < w_win.win().size(); ++i) - ostr << w_win.vect()[i] << ':' << w_win.w(i) << ' '; + ostr << w_win.dp(i) << ':' << w_win.w(i) << ' '; return ostr << ']'; } Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2731) +++ mln/draw/label.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/pw/image.hh> # include <mln/pw/cst.hh> -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # include <mln/core/image/sub_image.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> @@ -64,14 +64,14 @@ * */ template <typename I> - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret label(Image& input, const value::rgb8& background); # ifndef MLN_INCLUDE_ONLY template <typename I> - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret label(Image& input, const value::rgb8& background) { typedef mln_value(I) V; Index: mln/border/resize.hh --- mln/border/resize.hh (revision 2731) +++ mln/border/resize.hh (working copy) @@ -93,10 +93,6 @@ mln_concrete(I) memo = clone(ima); ima.resize_(thickness); level::fill(ima, memo); - // level::paste(memo, ima); -// mln_piter(I) p(ima.domain()); -// for_all(p) -// ima(p) = memo(p); } // ext_domain: /any/ Index: mln/make/w_window.hh --- mln/make/w_window.hh (revision 2731) +++ mln/make/w_window.hh (working copy) @@ -47,7 +47,7 @@ /*! \brief Create a mln::w_window from a window and a weight * function. * - * \param[in] win The window. + * \param[in] win A simple window. * \param[in] wei A weight function. * * \return A weighted window. @@ -64,15 +64,24 @@ mln::w_window<mln_dpsite(W), mln_result(F)> w_window(const Window<W>& win_, const Function_p2v<F>& wei_) { + trace::entering("make::w_window"); + + mln_is_simple_window(W)::check(); + const W& win = exact(win_); const F& wei = exact(wei_); mln_precondition(! win.is_empty()); + typedef mln_dpsite(W) D; - typedef mln_psite(D) P; mln::w_window<D, mln_result(F)> w_win; - mln_qiter(W) q(win, P::origin); + + typedef mln_psite(D) P; + P O = literal::origin; + mln_qiter(W) q(win, O); for_all(q) - w_win.insert(wei(q), q - P::origin); + w_win.insert(wei(q), q - O); + + trace::exiting("make::w_window"); return w_win; } Index: mln/convert/from_to.hxx --- mln/convert/from_to.hxx (revision 2731) +++ mln/convert/from_to.hxx (working copy) @@ -133,7 +133,7 @@ void from_to(const Proxy& from, T& to); - // Gpoint -> delta + // Gpoint -> delta-point template <typename P> void from_to(const Gpoint& from, mln_delta(P)& to); Index: mln/display/color_pretty.hh --- mln/display/color_pretty.hh (revision 2731) +++ mln/display/color_pretty.hh (working copy) @@ -34,7 +34,7 @@ * with red value for undefined point site. */ -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> @@ -62,7 +62,7 @@ * */ template <typename I> - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty(const Image& input_); @@ -79,7 +79,7 @@ * */ template <typename I> - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty_rgb(const Image& input_, const p_set<mln_psite(I) >& s1_, const p_set<mln_psite(I) >& s2_, @@ -116,7 +116,7 @@ template <typename I> inline - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty(const Image& input_) { trace::entering("display::impl::color_pretty"); @@ -139,7 +139,7 @@ template <typename I> inline - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty_rgb(const Image& input_, const p_set<mln_psite(I) >& s1_, const p_set<mln_psite(I) >& s2_, @@ -185,7 +185,7 @@ template <typename I> inline - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty(const Image& input_) { trace::entering("display::color_pretty"); @@ -204,7 +204,7 @@ template <typename I> inline - typename trait::image_from_mesh < mln_mesh(I), value::rgb8 >::ret + typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty_rgb(const Image& input_, const p_set<mln_psite(I) >& s1_, const p_set<mln_psite(I) >& s2_, Index: mln/display/remove.hh --- mln/display/remove.hh (revision 2731) +++ mln/display/remove.hh (working copy) @@ -34,7 +34,7 @@ * */ -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/image2d.hh> # include <mln/display/save.hh> Index: mln/display/save.hh --- mln/display/save.hh (revision 2731) +++ mln/display/save.hh (working copy) @@ -34,7 +34,7 @@ * files. */ -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/image2d.hh> # include <mln/value/rgb8.hh> Index: mln/display/show.hh --- mln/display/show.hh (revision 2731) +++ mln/display/show.hh (working copy) @@ -34,7 +34,7 @@ * given viewer (default display). */ -# include <mln/trait/image_from_mesh.hh> +# include <mln/trait/image_from_grid.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image/image2d.hh> # include <mln/display/save.hh>

1 0

milena r2731: Add gaussian_1st_derivative and gaussian_2nd_derivative
by Florian Lesaint 30 Oct '08

30 Oct '08

From: Florian Lesaint <florian.lesaint(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: milena r2731: Add gaussian_1st_derivative and gaussian_2nd_derivative URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-30 Florian Lesaint <florian.lesaint(a)lrde.epita.fr> Add gaussian_1st_derivative and gaussian_2nd_derivative. * mln/extension/adjust_fill.hh: Add a adjust_fill version which takes a delta. * mln/level/stretch.hh: Fix code. * mln/level/transform.hh: Revert work done by Nicolas Ballas to make gaussian work. * mln/linear/gaussian.hh: Add gaussian_1st_derivative and gaussian_2nd_derivative. * tests/linear/gaussian.cc: Fix test. --- extension/adjust_fill.hh | 27 ++++++ level/stretch.hh | 4 level/transform.hh | 11 -- linear/gaussian.hh | 199 +++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 202 insertions(+), 39 deletions(-) Index: branches/cleanup-2008/milena/tests/linear/gaussian.cc =================================================================== Index: branches/cleanup-2008/milena/mln/level/transform.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/transform.hh (revision 2730) +++ branches/cleanup-2008/milena/mln/level/transform.hh (revision 2731) @@ -146,26 +146,23 @@ } // end of namespace mln::level::impl::generic + } // end of namespace mln::level::impl // Facade. - namespace internal - { template <typename I, typename F, typename O> inline - void transform_(const Image& input, const Function_v2v<F>& f, + void transform(const Image& input, const Function_v2v<F>& f, Image<O>& output) { trace::entering("level::transform"); mln_precondition(exact(output).domain() >= exact(input).domain()); - transform_dispatch_(exact(input), exact(f), exact(output)); + impl::internal::transform_dispatch_(exact(input), exact(f), exact(output)); trace::exiting("level::transform"); } - } - } // end of namespace mln::level::impl template <typename I, typename F> @@ -178,7 +175,7 @@ mln_precondition(exact(input).has_data()); mln_ch_value(I, mln_result(F)) output; initialize(output, input); - impl::internal::transform_(input, f, output); + transform(input, f, output); trace::exiting("level::transform"); return output; Index: branches/cleanup-2008/milena/mln/level/stretch.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/stretch.hh (revision 2730) +++ branches/cleanup-2008/milena/mln/level/stretch.hh (revision 2731) @@ -70,8 +70,6 @@ { trace::entering("level::impl::stretch"); - initialize(output, input); - mln_value(I) min_, max_; estim::min_max(input, min_, max_); if (max_ != min_) @@ -97,6 +95,8 @@ { trace::entering("level::stretch"); + initialize(output, input); + mln_precondition(exact(output).domain() == exact(input).domain()); impl::stretch(mln_value(O)(), input, output); Index: branches/cleanup-2008/milena/mln/linear/gaussian.hh =================================================================== --- branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2730) +++ branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2731) @@ -32,6 +32,9 @@ /*! \file mln/linear/gaussian.hh * * \brief Gaussian filter. + * + * \todo Add a clean reference David Deriche + * Recursively implementing the gaussian and its derivatives (1993) */ # include <mln/core/concept/image.hh> @@ -40,6 +43,9 @@ # include <mln/geom/ncols.hh> # include <mln/geom/nrows.hh> +# include <mln/extension/adjust_fill.hh> +# include <mln/level/stretch.hh> + # include <mln/algebra/vec.hh> # include <vector> @@ -64,6 +70,13 @@ namespace impl { + typedef float norm_fun(float, float, + float, float, + float, float, + float, float, + float, float, + int&); + struct recursivefilter_coef_ { @@ -74,9 +87,8 @@ float b0, float b1, float c0, float c1, float w0, float w1, - float s); + float s, norm_fun norm); std::vector<float> n, d, nm, dm; - float sumA, sumC; }; inline @@ -84,7 +96,7 @@ float b0, float b1, float c0, float c1, float w0, float w1, - float s) + float s, norm_fun norm) { n.reserve(5); d.reserve(5); @@ -101,20 +113,13 @@ float cos0 = cos(w0); float cos1 = cos(w1); - sumA = - (2.0 * a1 * exp( b0 ) * cos0 * cos0 - a0 * sin0 * exp( 2.0 * b0 ) - + a0 * sin0 - 2.0 * a1 * exp( b0 )) / - (( 2.0 * cos0 * exp( b0 ) - exp( 2.0 * b0 ) - 1 ) * sin0); - - sumC = - (2.0 * c1 * exp( b1 ) * cos1 * cos1 - c0 * sin1 * exp( 2.0 * b1 ) - + c0 * sin1 - 2.0 * c1 * exp( b1 )) - / (( 2.0 * cos1 * exp( b1 ) - exp( 2.0 * b1 ) - 1 ) * sin1); - - a0 /= (sumA + sumC); - a1 /= (sumA + sumC); - c0 /= (sumA + sumC); - c1 /= (sumA + sumC); + int sign = 1; + float n_ = norm(a0, a1, b0, b1, c0, c1, cos0, sin0, cos1, sin1, sign); + + a0 /= n_; + a1 /= n_; + c0 /= n_; + c1 /= n_; n[3] = exp( -b1 - 2*b0 ) * (c1 * sin1 - cos1 * c0) + @@ -130,7 +135,8 @@ n[0] = a0 + c0; - d[4] = exp(-2 * b0 - 2 * b1); + d[4] = + exp(-2 * b0 - 2 * b1); d[3] = -2 * cos0 * exp(-b0 - 2*b1) - 2 * cos1 * exp(-b1 - 2*b0); @@ -143,10 +149,10 @@ for (unsigned i = 1; i <= 3; ++i) { dm[i] = d[i]; - nm[i] = n[i] - d[i] * n[0]; + nm[i] = sign * (n[i] - d[i] * n[0]); } dm[4] = d[4]; - nm[4] = -d[4] * n[0]; + nm[4] = sign * (-d[4] * n[0]); } @@ -251,10 +257,101 @@ } + inline + float gaussian_norm_coef_(float a0, float a1, + float b0, float b1, + float c0, float c1, + float cos0, float sin0, + float cos1, float sin1, + int& sign) + { + float expb0 = exp(b0); + float exp2b0 = exp(2.0 * b0); + + float scale0 = 1 + exp2b0 - 2 * cos0 * expb0; + float scaleA = 2 * a1 * sin0 * expb0 - a0 * (1 - exp2b0); + + float expb1 = exp(b1); + float exp2b1 = exp(2.0 * b1); + + float scale1 = 1 + exp2b1 - 2 * cos1 * expb1; + float scaleC = 2 * c1 * sin1 * expb1 - c0 * (1 - exp2b1); + + float sumA = scaleA / scale0; + float sumC = scaleC / scale1; + + sign = 1; + + return (sumA + sumC); + } + + inline + float gaussian_1st_deriv_coef_norm_(float a0, float a1, + float b0, float b1, + float c0, float c1, + float cos0, float sin0, + float cos1, float sin1, + int& sign) + { + float expb0 = exp(b0); + float exp2b0 = exp(2.0 * b0); + + float scale0 = 1 + exp2b0 - 2 * cos0 * expb0; + scale0 *= scale0; + float scaleA = - 2 * a1 * sin0 * expb0 * (1 - exp2b0) + + 2 * a0 * expb0 * (2 * expb0 - cos0 * (1 + exp2b0)); + + float expb1 = exp(b1); + float exp2b1 = exp(2.0 * b1); + + float scale1 = 1 + exp2b1 - 2 * cos1 * expb1; + scale1 *= scale1; + float scaleC = - 2 * c1 * sin1 * expb1 * (1 - exp2b1) + + 2 * c0 * expb1 * (2 * expb1 - cos1 * (1 + exp2b1)); + + float sumA = scaleA / scale0; + float sumC = scaleC / scale1; + + sign = -1; + + return (sumA + sumC); + } + + inline + float gaussian_2nd_deriv_coef_norm_(float a0, float a1, + float b0, float b1, + float c0, float c1, + float cos0, float sin0, + float cos1, float sin1, + int& sign) + { + float expb0 = exp(b0); + float exp2b0 = exp(2.0 * b0); + + float scale0 = 1 + exp2b0 - 2 * cos0 * expb0; + + float scaleA = a1 * sin0 * expb0 * (1 + expb0 * (2 * cos0 * (1 + exp2b0) + exp2b0 - 6)) + + a0 * expb0 * (2 * expb0 * (2 - cos0 * cos0) * (1 - exp2b0) - cos0 * (1 - exp2b0 * exp2b0)); + + float expb1 = exp(b1); + float exp2b1 = exp(2.0 * b1); + + float scale1 = 1 + exp2b1 - 2 * cos1 * expb1; + + float scaleC = c1 * sin1 * expb1 * (1 + expb1 * (2 * cos1 * (1 + exp2b1) + exp2b1 - 6)) + + c0 * expb1 * (2 * expb1 * (2 - cos1 * cos1) * (1 - exp2b1) - cos1 * (1 - exp2b1 * exp2b1)); + + float sumA = scaleA / scale0; + float sumC = scaleC / scale1; + sign = 1; + + return (sumA + sumC); + } + template <class I, class F> inline void - gaussian_(Image& img_, const F& coef) + generic_filter_(Image& img_, const F& coef) { I& img = exact(img_); @@ -273,14 +370,13 @@ point2d(i, geom::ncols(img) - 1 + img.border()), geom::ncols(img) + 2 * img.border(), dpoint2d(0, 1)); - } template <class I, class F, class O> inline void - gaussian_common_(trait::value::nature::scalar, + generic_filter_common_(trait::value::nature::scalar, const Image& in, const F& coef, float sigma, @@ -288,22 +384,24 @@ { mln_ch_value(O, float) work_img(exact(in).domain()); level::paste(in, work_img); + extension::adjust_fill(work_img, 4, 0); // On tiny sigma, Derich algorithm doesn't work. // It is the same thing that to convolve with a Dirac. if (sigma > 0.006) - gaussian_(work_img, coef); + generic_filter_(work_img, coef); /* Convert the result image to the user-requested datatype. FIXME: We are making an unnecessary copy in case the user expects a ntg::float_s image. */ - level::paste(work_img, out); + level::stretch(work_img, out); + //level::paste(work_img, out); } template <class I, class F, class O> inline void - gaussian_common_(trait::value::nature::vectorial, + generic_filter_common_(trait::value::nature::vectorial, const Image& in, const F& coef, float sigma, @@ -314,8 +412,10 @@ // FIXME : paste does not work (rgb8 -> vec3f). level::paste(in, out); + // On tiny sigma, Derich algorithm doesn't work. + // It is the same thing that to convolve with a Dirac. if (sigma > 0.006) - gaussian_(out, coef); + generic_filter_(out, coef); } } // end of namespace mln::linear::impl @@ -330,20 +430,59 @@ mln_precondition(exact(input).has_data()); mln_concrete(I) output; - initialize(output, input); impl::recursivefilter_coef_ coef(1.68f, 3.735f, 1.783f, 1.723f, -0.6803f, -0.2598f, 0.6318f, 1.997f, - sigma); - impl::gaussian_common_(mln_trait_value_nature(mln_value(I))(), + sigma, impl::gaussian_norm_coef_); + impl::generic_filter_common_(mln_trait_value_nature(mln_value(I))(), input, coef, sigma, output); return output; } + template <class I> + inline + mln_concrete(I) + gaussian_1st_derivative(const Image& input, float sigma) + { + mln_precondition(exact(input).has_data()); + + mln_concrete(I) output; + + impl::recursivefilter_coef_ + coef(-0.6472f, -4.531f, + 1.527f, 1.516f, + 0.6494f, 0.9557f, + 0.6719f, 2.072f, + sigma, impl::gaussian_1st_deriv_coef_norm_); + impl::generic_filter_common_(mln_trait_value_nature(mln_value(I))(), + input, coef, sigma, output); + return output; + } + + template <class I> + inline + mln_concrete(I) + gaussian_2nd_derivative(const Image& input, float sigma) + { + mln_precondition(exact(input).has_data()); + + mln_concrete(I) output; + + impl::recursivefilter_coef_ + coef(-1.331f, 3.661f, + 1.24f, 1.314f, + 0.3225f, -1.738f, + 0.748f, 2.166f, + sigma, impl::gaussian_2nd_deriv_coef_norm_); + impl::generic_filter_common_(mln_trait_value_nature(mln_value(I))(), + input, coef, sigma, output); + return output; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::linear Index: branches/cleanup-2008/milena/mln/extension/adjust_fill.hh =================================================================== --- branches/cleanup-2008/milena/mln/extension/adjust_fill.hh (revision 2730) +++ branches/cleanup-2008/milena/mln/extension/adjust_fill.hh (revision 2731) @@ -71,12 +71,28 @@ const Neighborhood<N>& nbh, const mln_value(I)& val); + template <typename I> + void adjust_fill(const Image& ima, + unsigned delta, + const mln_value(I)& val); # ifndef MLN_INCLUDE_ONLY namespace impl { + template <typename I, typename V> + void do_adjust_fill(const I& ima, + unsigned delta, + const V& val) + { + mln_precondition(exact(ima).has_data()); + // mln_precondition(exact(win_like).is_valid()); + + border::adjust(ima, delta); + extension::fill(ima, val); + } + template <typename I, typename W, typename V> void do_adjust_fill(const I& ima, const W& win_like, @@ -124,6 +140,17 @@ trace::exiting("extension::adjust_fill"); } + template <typename I> + void adjust_fill(const Image& ima, + unsigned delta, + const mln_value(I)& val) + { + trace::entering("extension::adjust_fill"); + impl::do_adjust_fill(ima, delta, val); + trace::exiting("extension::adjust_fill"); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::extension

1 0

2730: Remove duplicate nrows() and ncols from mln::box.
by Guillaume Lazzara 30 Oct '08

30 Oct '08

* mln/core/site_set/box.hh: here. --- milena/ChangeLog | 6 ++++++ milena/mln/core/site_set/box.hh | 24 ------------------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5fa5495..f555458 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove duplicate nrows() and ncols from mln::box. + + * mln/core/site_set/box.hh: here. + 2008-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> Add new colors. diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 019d6ad..7e8a29f 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -147,12 +147,6 @@ namespace mln /// FIXME: Do we want a routine as well like geom::bbox()? P center() const; - /// Return the column count of this box. - unsigned ncols() const; - - /// Return the row count of this box. - unsigned nrows() const; - /// Test that the box owns valid data, i.e., is initialized and /// with pmin being 'less-than' pmax. bool is_valid() const; @@ -384,24 +378,6 @@ namespace mln template <typename P> inline - unsigned - box::ncols() const - { - mln_precondition(is_valid()); - return pmax().col() - pmin().col(); - } - - template <typename P> - inline - unsigned - box::nrows() const - { - mln_precondition(is_valid()); - return pmax().row() - pmin().row(); - } - - template <typename P> - inline std::size_t box::memory_size() const { -- 1.5.6.5

1 0

r2729: A program to compute the number of connected component in a local configuration
by Matthieu Garrigues 29 Oct '08

29 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-29 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * garrigues/ocr/compute_local_configurations.cc: New, A program to compute the number of connected component in a local configuration. --- compute_local_configurations.cc | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/compute_local_configurations.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/compute_local_configurations.cc (revision 0) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/compute_local_configurations.cc (revision 2729) @@ -0,0 +1,77 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> +#include <iomanip> + +int main() +{ + using namespace mln; + using namespace mln::value; + + typedef image2d<bool> I; + image2d<bool> ima(3,3); + point2d p(1,1); + + std::cout << "----- Object in C8 ------" << std::endl; + + for (unsigned i = 0; i < 256; i++) + { + level::fill(ima, false); + int_u8 tmp = i; + + mln_niter_(neighb2d) n(c8() , p); + for_all(n) + { + if (tmp % 2) + ima(n) = true; + tmp = tmp >> 1; + } + + + unsigned x; + labeling::blobs(ima, c8(), x); + +// std::cout << "----- conf no " << i << "------" << std::endl; +// debug::println(ima); +// std::cout << "----- " << x << " cc------" << std::endl; +// std::cout << "-----------" << std::endl; + + std::cout << std::setw(2) << x << ", "; + if (! ((i + 1) % 4)) std::cout << " "; + if (! ((i + 1) % 16)) std::cout << std::endl; + if (! ((i + 1) % 64)) std::cout << std::endl; + } + + std::cout << "----- Object in C4 ------" << std::endl; + + for (unsigned i = 0; i < 256; i++) + { + level::fill(ima, false); + int_u8 tmp = i; + + mln_niter_(neighb2d) n(c8() , p); + for_all(n) + { + if (tmp % 2) + ima(n) = true; + tmp = tmp >> 1; + } + + + unsigned x; + labeling::blobs(ima, c4(), x); + +// std::cout << "----- conf no " << i << "------" << std::endl; +// debug::println(ima); +// std::cout << "----- " << x << " cc------" << std::endl; +// std::cout << "-----------" << std::endl; + + std::cout << std::setw(2) << x << ", "; + if (! ((i + 1) % 4)) std::cout << " "; + if (! ((i + 1) % 16)) std::cout << std::endl; + if (! ((i + 1) % 64)) std::cout << std::endl; + } +}

1 0

r2728: Add simple point computation to ocr preprocessing
by Matthieu Garrigues 29 Oct '08

29 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-29 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add simple point computation to ocr preprocessing. * garrigues/ocr/simple_point.hh: New ,Tell if a point is simple or not. A point of an object is simple if in its c8 neiborhood, there is exactly one connected component of the object, and only one connected component of the background Examples : ( | == object, - = background) - - | | P | Here P is simple in the c4 and c8 case. | | | - | - | P | Here P is never simple. | | | * garrigues/ocr/simple_point.cc: New. A simple test that shows all the simple points of a binary image. --- simple_point.cc | 39 +++++++++++++ simple_point.hh | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 204 insertions(+) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh (revision 0) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.hh (revision 2728) @@ -0,0 +1,165 @@ +// 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_SIMPLE_POINT_HH +# define MLN_SIMPLE_POINT_HH + +/*! \file simple_point.hh + * + * \brief simple_point tell if a point is simple or not (Cf + * bertrand.07.chap). + * + */ + +#include <mln/core/alias/point2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +namespace mln +{ + +/*! Tell if a point is simple or not. A point of an object is simple + * if in its c8 neiborhood, there is exactly one connected component of the + * object, and only one connected component of the background + * Examples : ( | == object, - = background) + * + * - - | + * | P | Here p is simple in the c4 and c8 case. + * | | | + * + * - | - + * | P | Here p is never simple. + * | | | + * + */ + + bool simple_point(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); + + unsigned nb_connexity2d(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); + +# ifndef MLN_INCLUDE_ONLY + + static const unsigned char nb_connexity_c8[256] = + { + 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, + 1, 2, 1, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, + 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, + 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, + 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 3, 3, 2, 2, + 1, 2, 1, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, + 2, 3, 3, 3, 3, 4, 3, 3, 2, 2, 2, 2, 3, 3, 2, 2, + 2, 3, 2, 2, 2, 3, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, + 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, + 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + }; + + static const unsigned char nb_connexity_c4[256] = + { + 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, + 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, + 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, + 2, 3, 3, 3, 2, 3, 2, 2, 3, 3, 4, 3, 3, 3, 3, 2, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, + 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, + 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 2, 3, 3, 3, 3, 4, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, + 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, + 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, + 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 + }; + + neighb2d int_to_neighb(unsigned i) + { + if (i == 8) + return c8(); + if (i == 4) + return c4(); + mln_assertion(0); + return c4(); + } + + unsigned complement_neighb(unsigned i) + { + if (i == 8) + return 4; + if (i == 4) + return 8; + mln_assertion(0); + return 0; + } + + unsigned nb_connexity2d(const image2d<bool>& ima, unsigned nbh, const point2d& p, bool complemented) + { + unsigned res = 0; + + mln_fwd_niter_(neighb2d) n(c8() , p); + for_all(n) + { + res = (res << 1); + if (ima(n) == complemented) + res = res | 1; + } + + if (nbh == 8) + return nb_connexity_c8[res]; + else + { + mln_assertion(nbh == 4); + return nb_connexity_c4[res]; + } + } + + bool simple_point2d(const image2d<bool>& ima, unsigned nbh, const point2d& p) + { + mln_assertion(nbh == 4 || nbh == 8); + + return nb_connexity2d(ima, nbh, p, true) == 1 && + nb_connexity2d(ima, complement_neighb(nbh), p, false) == 1; + } + +# endif // MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_SIMPLE_POINT_HH Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.cc (revision 0) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/simple_point.cc (revision 2728) @@ -0,0 +1,39 @@ +# include <mln/core/image/image2d.hh> +# include <mln/io/pbm/load.hh> +# include <mln/io/pbm/save.hh> +# include <mln/level/fill.hh> + +# include "simple_point.hh" + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm output.pbm" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) + usage(argv); + + typedef image2d<bool> I; + I input; + io::pbm::load(input, argv[1]); + + I output; + initialize(output, input); + level::fill(output, false); + + mln_piter_(I) p(input.domain()); + for_all(p) + if (input(p) && simple_point2d(input, 8, p)) + output(p) = true; + + io::pbm::save(output, argv[2]); +}

1 0