October 2008 - Olena-patches

2624: Supplement complex-based image.
by Roland Levillain 22 Oct '08

22 Oct '08

* mln/core/image/complex_image.hh (mln::complex_image<D, G, V>::dim): New constant. (mln::complex_image<D, G, V>::geom): New typedef. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/image/complex_image.hh | 6 +++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ce1170..16ddcbb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,14 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Supplement complex-based image. + + * mln/core/image/complex_image.hh + (mln::complex_image<D, G, V>::dim): New constant. + (mln::complex_image<D, G, V>::geom): New typedef. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_geom, mln_geom_): New macros. 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 94ba949..32c83cb 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -116,7 +116,7 @@ namespace mln /// Values attached to each face of the complex. /// /// \arg p D The dimension of the complex. - /// \arg p G The geometry of the complex. + /// \arg p G The geometry type of the complex. /// \arg p V The value type of the image. template <unsigned D, typename G, typename V> class complex_image @@ -124,6 +124,10 @@ namespace mln complex_image<D, G, V> > { public: + /// The dimension of the complex. + static const unsigned dim = D; + /// The geometry type of the complex. + typedef G geom; /// Value associated type. typedef V value; -- 1.6.0.1

1 0

2623: mln/core/macros.hh (mln_geom, mln_geom_): New macros.
by Roland Levillain 22 Oct '08

22 Oct '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/macros.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index faaf934..5ce1170 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,10 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_geom, mln_geom_): New macros. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add accessors to implementations class of complex iterators. * mln/topo/internal/complex_set_iterator_base.hh diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 2b800e0..d075bdb 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -186,6 +186,12 @@ // g +/// Shortcuts to access the geometry type associated to T. +/// \{ +# define mln_geom(T) typename T::geom +# define mln_geom_(T) T::geom +/// \} + /// Shortcuts to access the grid type associated to T. /// \{ # define mln_grid(T) typename T::grid -- 1.6.0.1

1 0

2622: Add accessors to implementations class of complex iterators.
by Roland Levillain 22 Oct '08

22 Oct '08

* mln/topo/internal/complex_set_iterator_base.hh (internal::complex_set_iterator_base<F, E>::face): Rename typedef as... (internal::complex_set_iterator_base<F, E>::face_type): ...this. Adjust. (internal::complex_set_iterator_base<F, E>::face): New iterator. (internal::complex_set_iterator_base<F, E>): Remove irrelevant static assertion. * mln/topo/internal/complex_relative_iterator_base.hh (internal::complex_relative_iterator_base<F, E>::face) (internal::forward_complex_relative_iterator_base<F, E>::face) (internal::backward_complex_relative_iterator_base<F, E>::face): Rename typedefs as... (internal::complex_relative_iterator_base<F, E>::face_type) (internal::forward_complex_relative_iterator_base<F, E>::face_type) (internal::backward_complex_relative_iterator_base<F, E>::face_type): ...these. Adjust. (internal::complex_relative_iterator_base<F, E>::face): New accessor. (internal::complex_relative_iterator_base<F, E>): Remove irrelevant static assertion. --- milena/ChangeLog | 52 ++++++++++++++++++++ .../internal/complex_relative_iterator_base.hh | 38 +++++++++------ .../mln/topo/internal/complex_set_iterator_base.hh | 30 +++++++----- 3 files changed, 93 insertions(+), 27 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 37cd5d2..faaf934 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,57 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + s/milena/Milena/. + + * 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. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add accessors to implementations class of complex iterators. + + * mln/topo/internal/complex_set_iterator_base.hh + (internal::complex_set_iterator_base<F, E>::face): + Rename typedef as... + (internal::complex_set_iterator_base<F, E>::face_type): + ...this. + Adjust. + (internal::complex_set_iterator_base<F, E>::face): New iterator. + (internal::complex_set_iterator_base<F, E>): Remove irrelevant + static assertion. + * mln/topo/internal/complex_relative_iterator_base.hh + (internal::complex_relative_iterator_base<F, E>::face) + (internal::forward_complex_relative_iterator_base<F, E>::face) + (internal::backward_complex_relative_iterator_base<F, E>::face): + Rename typedefs as... + (internal::complex_relative_iterator_base<F, E>::face_type) + (internal::forward_complex_relative_iterator_base<F, E>::face_type) + (internal::backward_complex_relative_iterator_base<F, E>::face_type): + ...these. + Adjust. + (internal::complex_relative_iterator_base<F, E>::face): + New accessor. + (internal::complex_relative_iterator_base<F, E>): + Remove irrelevant static assertion. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Use alias mln::bin_2complex_image3df. * mln/io/off/load.hh, diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 7275989..16b913b 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -58,7 +58,7 @@ # include <mln/topo/complex.hh> /* FIXME: Introduce a common factoring class for this class and for - complex_relative_iterator_base? */ + complex_set_iterator_base? */ /* FIXME: By moving iterator `i_' into internal::complex_relative_iterator_base, we'll be able to factor @@ -91,7 +91,7 @@ namespace mln public: /// The type of the iterated faces. - typedef F face; + typedef F face_type; /// Construction. /// \{ @@ -111,24 +111,28 @@ namespace mln void next_(); /// \} - /// Conversion. - /// \{ + /// \brief Conversion. + /// /// Return a reference to the corresponding face handle. - operator const face&() const; + /// \{ + /// Explicit conversion (accessor). + const face_type& face() const; + /// Implicit conversion (conversion operator). + operator const face_type&() const; /// \} protected: /// A pointer to the center face around which this iterator /// moves. - const face* c_; + const face_type* c_; // The type of the set of vicinity sites (adjacent face handles). - typedef std::vector<face> adj_faces_t; + typedef std::vector<face_type> adj_faces_t; /// The set of faces adjacent to the reference face. adj_faces_t adj_faces_; /// The face handle this iterator is pointing to. - face f_; + face_type f_; }; @@ -160,7 +164,7 @@ namespace mln typedef complex_relative_iterator_base<F, E> super_; public: - typedef F face; + typedef F face_type; public: /// Construction. @@ -210,7 +214,7 @@ namespace mln typedef complex_relative_iterator_base<F, E> super_; public: - typedef F face; + typedef F face_type; public: /// Construction. @@ -255,8 +259,6 @@ namespace mln complex_relative_iterator_base<F, E>::complex_relative_iterator_base() : c_(0) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; m = 0; @@ -269,8 +271,6 @@ namespace mln inline complex_relative_iterator_base<F, E>::complex_relative_iterator_base(const Fref& f_ref) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; m = 0; @@ -309,7 +309,15 @@ namespace mln template <typename F, typename E> inline - complex_relative_iterator_base<F, E>::operator const face&() const + const F& + complex_relative_iterator_base<F, E>::face() const + { + return f_; + } + + template <typename F, typename E> + inline + complex_relative_iterator_base<F, E>::operator const face_type&() const { return f_; } diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index fd09b19..6a7588d 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -62,7 +62,7 @@ namespace mln public: /// The type of the iterated faces. - typedef F face; + typedef F face_type; // FIXME: Maybe we could just get the dimension D of the face's // complex, an define complex_type as mln::complex<D>? typedef typename F::complex_type complex_type; @@ -87,15 +87,19 @@ namespace mln void invalidate(); /// \} - /// Conversion. - /// \{ + /// \brief Conversion. + /// /// Return a reference to the corresponding face handle. - operator const face&() const; + /// \{ + /// Explicit conversion (accessor). + const face_type& face() const; + /// Implicit conversion (conversion operator). + operator const face_type&() const; /// \} protected: /// The face handle this iterator is pointing to. - face f_; + face_type f_; }; @@ -113,9 +117,6 @@ namespace mln inline complex_set_iterator_base<F, E>::complex_set_iterator_base() { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); - invalidate(); } @@ -123,9 +124,6 @@ namespace mln inline complex_set_iterator_base<F, E>::complex_set_iterator_base(complex_type& c) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); - f_.set_cplx(c); // Invalidate f_. invalidate(); @@ -159,7 +157,15 @@ namespace mln template <typename F, typename E> inline - complex_set_iterator_base<F, E>::operator const face&() const + const F& + complex_set_iterator_base<F, E>::face() const + { + return f_; + } + + template <typename F, typename E> + inline + complex_set_iterator_base<F, E>::operator const face_type&() const { return f_; } -- 1.6.0.1

1 0

2621: Use alias mln::bin_2complex_image3df.
by Roland Levillain 22 Oct '08

22 Oct '08

* mln/io/off/load.hh, * tests/io/off/load_bin.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/io/off/load.hh | 13 +++---------- milena/tests/io/off/load_bin.cc | 4 +--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3c2e65d..37cd5d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Use alias mln::bin_2complex_image3df. + + * mln/io/off/load.hh, + * tests/io/off/load_bin.cc: + Here. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Provide an alias for binary 2-complex-based 3-dimensional images. * mln/core/alias/bin_2complex_image3df.hh: New. diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index ff8d106..1a00f3d 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -40,12 +40,7 @@ # include <string> -# include <mln/core/image/complex_image.hh> -# include <mln/geom/complex_geometry.hh> -# include <mln/core/alias/point3df.hh> - -// // FIXME: Really needed? -// # include <mln/topo/n_faces_set.hh> +# include <mln/core/alias/bin_2complex_image3df.hh> namespace mln @@ -64,8 +59,7 @@ namespace mln The image is said boolean since data only represent the existence of vertices and faces. */ - void load(complex_image<2, geom::complex_geometry<2,point3df>, bool>& ima, - const std::string& filename); + void load(bin_2complex_image3df& ima, const std::string& filename); namespace internal { @@ -77,8 +71,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - void load(complex_image<2 ,geom::complex_geometry<2,point3df>, bool>& ima, - const std::string& filename) + void load(bin_2complex_image3df& ima, const std::string& filename) { const std::string me = "mln::io::load::off"; diff --git a/milena/tests/io/off/load_bin.cc b/milena/tests/io/off/load_bin.cc index e171704..341c874 100644 --- a/milena/tests/io/off/load_bin.cc +++ b/milena/tests/io/off/load_bin.cc @@ -42,9 +42,7 @@ int main() { using namespace mln; - /* FIXME: Create an alias in milena/mln/core/alias/ for this - particular image type? */ - typedef mln::complex_image<2, geom::complex_geometry<2,point3df>, bool> ima_t; + typedef bin_2complex_image3df ima_t; ima_t ima; io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); -- 1.6.0.1

1 0

2620: Provide an alias for binary 2-complex-based 3-dimensional images.
by Roland Levillain 22 Oct '08

22 Oct '08

* mln/core/alias/bin_2complex_image3df.hh: New. --- milena/ChangeLog | 6 +++ milena/mln/core/alias/bin_2complex_image3df.hh | 51 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/alias/bin_2complex_image3df.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index aedb0ae..3c2e65d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Provide an alias for binary 2-complex-based 3-dimensional images. + + * mln/core/alias/bin_2complex_image3df.hh: New. + 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove debug in chamfer. diff --git a/milena/mln/core/alias/bin_2complex_image3df.hh b/milena/mln/core/alias/bin_2complex_image3df.hh new file mode 100644 index 0000000..c429752 --- /dev/null +++ b/milena/mln/core/alias/bin_2complex_image3df.hh @@ -0,0 +1,51 @@ +// Copyright (C) 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. + +#ifndef MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +# define MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH + +/// \file mln/core/alias/bin_2complex_image3df.hh +/// \brief Definition of the mln::bin_2complex_image3df alias. + +# include <mln/core/image/complex_image.hh> +# include <mln/geom/complex_geometry.hh> +# include <mln/core/alias/point3df.hh> + + +namespace mln +{ + + /// \brief Type alias for a binary image based on a 2-complex, where + /// 0-faces are located at floating-point 3-dimensional points. + typedef + mln::complex_image<2, mln::geom::complex_geometry<2,point3df>, bool> + bin_2complex_image3df; + +} // end of namespace mln + + +#endif // ! MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH -- 1.6.0.1

1 0

r2619: Work on ICCVG04 classification method
by Ugo Jardonnet 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Work on ICCVG04 classification method * iccvg04.cc: Add a general display function for 3d images. iccvg04.cc | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2618) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2619) @@ -11,6 +11,8 @@ #include <mln/arith/revert.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/core/alias/neighb3d.hh> +#include <mln/util/array.hh> +#include <mln/labeling/compute.hh> // FIXME: !? #include <mln/geom/all.hh> @@ -19,6 +21,10 @@ #include <mln/io/pgm/save.hh> +#include <sys/stat.h> +#include <sstream> + + using namespace mln; unsigned max = 0; @@ -52,6 +58,33 @@ } template <typename I> +void display(const I& ima, const char * dir) +{ + mkdir(dir, 0777); + chdir(dir); + + 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) + { + for (int c = 0; c < geom::ncols(ima); ++c) + { + out(point2d(r, c)) = ima(point3d(s, r, c)); + } + } + + std::ostringstream is; + is << "out_" << s << ".ppm"; + + io::pgm::save(out, is.str()); + } + + 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)); @@ -133,6 +166,24 @@ 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) +{ + image2d<value::rgb8> out(ima.domain()); + + typedef mln::accu::mean<mln_value(J)> accu_t; + + accu_t acu; + + util::array<mln_result(accu_t)> tmp = labeling::compute(acu, histo, ws, nbasins); + + /*mln_piter(I) p(ima.domain()); + + for_all(p) + { + }*/ +} + int main(int argc, char **argv) { image2d<value::rgb8> ima; @@ -140,14 +191,16 @@ //make histo image3d<unsigned> histo = fill_histo(ima); - image3d<value::int_u8> nhisto = normalizeu8(histo); + //display(nhisto, "histo"); + //revert histo image3d<value::int_u8> rhisto = arith::revert(nhisto); + //display(rhisto, "rhisto"); //compute closing_area of histo - image3d<unsigned> histo_closure(histo.domain()); + image3d<value::int_u8> histo_closure(histo.domain()); morpho::closing_area(rhisto, c6(), 420, histo_closure); //display_proj_revert(histo_closure, "chisto.ppm"); @@ -156,7 +209,9 @@ value::int_u16 nbasins; image3d<value::int_u16> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + display(ws, "ws"); display_proj_revert(ws, "whisto.ppm"); //gplot(ws); + //donne_tout(ima, histo_closure, ws, nbasins); }

1 0

r2618: Work on INIM classification
by Ugo Jardonnet 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Work on INIM classification * classif/Makefile: Change flags. * classif/iccvg04.cc: Implement classification method of ICCVG04. * classif/scoolNBR.ppm: Remove. Makefile | 1 iccvg04.cc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 14 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/scoolNBR.ppm (deleted) =================================================================== Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2617) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2618) @@ -6,10 +6,14 @@ #include <mln/value/all.hh> #include <mln/level/fill.hh> +#include <mln/morpho/closing_volume.hh> #include <mln/morpho/closing_area.hh> #include <mln/arith/revert.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> + +// FIXME: !? +#include <mln/geom/all.hh> #include <mln/io/ppm/load.hh> @@ -23,14 +27,14 @@ mln::image3d<unsigned> fill_histo(const I& ima) { - image3d< unsigned > histo(256,256,256); + image3d< unsigned > histo(128,128,128); level::fill(histo, 0); unsigned i = 0; mln_piter(I) p(ima.domain()); for_all(p) { - point3d p3(ima(p).red(),ima(p).green(), ima(p).blue()); + point3d p3(ima(p).red()/2,ima(p).green()/2, ima(p).blue()/2); histo(p3)++; } return histo; @@ -48,29 +52,85 @@ } template <typename I> -void display_proj(const I& histo) +void display_proj_revert(const I& histo, const char * s) { - image2d< unsigned long long > proj_histo(256,256); + 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 < 256; i++) + 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(256, 256); + 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,"./chiche.pgm"); + 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; } int main(int argc, char **argv) @@ -78,14 +138,25 @@ image2d<value::rgb8> ima; ima = io::ppm::load<value::rgb8>(argv[1]); + //make histo image3d<unsigned> histo = fill_histo(ima); - histo = arith::revert(histo); - image3d<value::int_u8> histo_closed(histo.domain()); + image3d<value::int_u8> nhisto = normalizeu8(histo); + + //revert histo + image3d<value::int_u8> rhisto = arith::revert(nhisto); + //compute closing_area of histo + + image3d<unsigned> histo_closure(histo.domain()); + morpho::closing_area(rhisto, c6(), 420, histo_closure); + + //display_proj_revert(histo_closure, "chisto.ppm"); - morpho::closing_area(histo, c4(), 510, histo_closed); + //watershed over histo_closure + value::int_u16 nbasins; + image3d<value::int_u16> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); - //display_proj(arith::revert(histo)); + display_proj_revert(ws, "whisto.ppm"); + //gplot(ws); - //display_proj(histo); } Index: branches/cleanup-2008/milena/sandbox/classif/Makefile =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2617) +++ branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2618) @@ -1,2 +1,2 @@ all: - g++ *.cc -I../../ -O3 \ No newline at end of file + g++ *.cc -I../../ -O1 -DNDEBUG \ No newline at end of file

1 0

milena r2617: Remove debug in chamfer
by Matthieu Garrigues 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove debug in chamfer. * mln/geom/chamfer.hh: Remove debug. (sorry). --- chamfer.hh | 1 - 1 file changed, 1 deletion(-) Index: branches/cleanup-2008/milena/mln/geom/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2616) +++ branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2617) @@ -100,7 +100,6 @@ // Was : // level::fill((output | (input | pw::cst(true)).domain()).rw(), 0); // level::fill((output | (input | pw::cst(false)).domain()).rw(), max); - debug::println(output); } inline bool handles(const P& p) const { return input(p) == false; }

1 0

milena r2616: Fix chamfer
by Matthieu Garrigues 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix chamfer. * mln/canvas/chamfer.hh: use image2d.domain.has method instead of image2d.has. * mln/geom/chamfer.hh: Fix output initialisation. --- canvas/chamfer.hh | 4 ++-- geom/chamfer.hh | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) Index: branches/cleanup-2008/milena/mln/geom/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2615) +++ branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2616) @@ -69,6 +69,7 @@ struct chamfer_t { typedef I_ I; + typedef mln_ch_value(I, unsigned) O; typedef W_ W; typedef mln_site(I_) P; @@ -77,14 +78,30 @@ const I& input; const W& win; - mln_ch_value(I_, unsigned) output; + O output; bool status; unsigned max; + void fill_output() + { + mln_piter(O) p(output.domain()); + for_all(p) + { + if (input(p) == true) + output(p) = 0; + else + output(p) = max; + } + } + inline void init() { initialize(output, exact(input)); - level::fill((output | (input | pw::cst(true)).domain()).rw(), 0); - level::fill((output | (input | pw::cst(false)).domain()).rw(), max); } + fill_output(); + // Was : + // level::fill((output | (input | pw::cst(true)).domain()).rw(), 0); + // level::fill((output | (input | pw::cst(false)).domain()).rw(), max); + debug::println(output); + } inline bool handles(const P& p) const { return input(p) == false; } Index: branches/cleanup-2008/milena/mln/canvas/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/canvas/chamfer.hh (revision 2615) +++ branches/cleanup-2008/milena/mln/canvas/chamfer.hh (revision 2616) @@ -86,7 +86,7 @@ mln_qiter(W) q(f.win, p); for_all(p) if (f.handles (p)) - for_all(q) if (f.input.has(q)) + for_all(q) if (f.input.domain().has(q)) if (f.output(q) != f.max && f.output(q) + q.w() < f.output(p)) f.output(p) = f.output(q) + q.w(); @@ -100,7 +100,7 @@ mln_qiter(W) q(w_win_b, p); for_all(p) if (f.handles (p)) - for_all(q) if (f.input.has(q)) + for_all(q) if (f.input.domain().has(q)) if (f.output(q) != f.max && f.output(q) + q.w() < f.output(p)) f.output(p) = f.output(q) + q.w();

1 0

milena r2615: Add diagonal2d, backdiagonal2d browsing. Make erosion fastest on diagonal windows
by Matthieu Garrigues 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add diagonal2d browsings. * mln/canvas/browsing/backdiagonal2d.hh: New. * mln/canvas/browsing/diagonal2d.hh: New. * tests/canvas/browsing/backdiagonal2d.cc: New. * tests/canvas/browsing/diagonal2d.cc: New. Use it in erosion. * mln/morpho/erosion.spe.hh: Add diagonal versions of erosion: (erosion_diagonal) New, (erosion_diagonal_fastest) New, (erosion_backdiagonal) New, (erosion_backdiagonal_fastest) New. * tests/morpho/erosion.cc: Some tests on erosion with win::diag2d and win::backdiag2d. --- mln/canvas/browsing/backdiagonal2d.hh | 174 +++++++++++ mln/canvas/browsing/diagonal2d.hh | 172 +++++++++++ mln/morpho/erosion.spe.hh | 482 +++++++++++++++++++++++++++++++- tests/canvas/browsing/backdiagonal2d.cc | 97 ++++++ tests/canvas/browsing/diagonal2d.cc | 97 ++++++ tests/morpho/erosion.cc | 88 +++++ 6 files changed, 1103 insertions(+), 7 deletions(-) Index: branches/cleanup-2008/milena/tests/morpho/erosion.cc =================================================================== --- branches/cleanup-2008/milena/tests/morpho/erosion.cc (revision 2614) +++ branches/cleanup-2008/milena/tests/morpho/erosion.cc (revision 2615) @@ -31,8 +31,7 @@ */ #include <mln/core/image/image2d.hh> -#include <mln/win/rectangle2d.hh> -#include <mln/win/octagon2d.hh> +#include <mln/win/all.hh> #include <mln/debug/iota.hh> @@ -51,9 +50,9 @@ using namespace mln; using value::int_u8; - unsigned - l_oct = 11, L_oct = 6 * l_oct + 1, - l_rec = 29, L_rec = 2 * l_rec + 1; +// unsigned +// l_oct = 11, L_oct = 6 * l_oct + 1, +// l_rec = 29, L_rec = 2 * l_rec + 1; // l_ // oct rec err @@ -75,7 +74,9 @@ win::rectangle2d rec(21, 21); win::hline2d hline(31); win::vline2d vline(31); - win::octagon2d oct(19); + win::diag2d diag2d(31); + win::backdiag2d backdiag2d(31); + win::octagon2d oct(6 * 3 + 1); image2d<int_u8> out; image2d<int_u8> ref; // trace::quiet = false; @@ -194,6 +195,81 @@ std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; } + + //Diag2d + std::cout << "-------------------------- Diag2d: "<< std::endl; + { + t.start(); + ref = morpho::impl::generic::erosion_on_function(lena, diag2d); + std::cout << "generic on diag2d: " << t << std::endl; + } + + { + t.start(); + out = morpho::erosion(lena, diag2d); + std::cout << "dispach on diag2d : " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + + + { + t.start(); + out = morpho::impl::erosion_arbitrary_2d_fastest(lena, diag2d); + std::cout << "erosion_arbitrary_2d_fastest on diag2d: " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + + + { + t.start(); + out = morpho::impl::erosion_arbitrary_2d(lena, diag2d); + std::cout << "erosion_arbitrary_2d on diag2d: " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + + //Backdiag2d + std::cout << "-------------------------- Backdiag2d: "<< std::endl; + { + t.start(); + ref = morpho::impl::generic::erosion_on_function(lena, backdiag2d); + std::cout << "generic on backdiag2d: " << t << std::endl; + } + + { + t.start(); + out = morpho::erosion(lena, backdiag2d); + std::cout << "dispach on backdiag2d : " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + + + { + t.start(); + out = morpho::impl::erosion_arbitrary_2d_fastest(lena, backdiag2d); + std::cout << "erosion_arbitrary_2d_fastest on backdiag2d: " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + + + { + t.start(); + out = morpho::impl::erosion_arbitrary_2d(lena, backdiag2d); + std::cout << "erosion_arbitrary_2d on backdiag2d: " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + std::cout << "-------------------------- Octagon: " << std::endl; // Octagon Index: branches/cleanup-2008/milena/tests/canvas/browsing/diagonal2d.cc =================================================================== --- branches/cleanup-2008/milena/tests/canvas/browsing/diagonal2d.cc (revision 0) +++ branches/cleanup-2008/milena/tests/canvas/browsing/diagonal2d.cc (revision 2615) @@ -0,0 +1,97 @@ +// 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. + +/*! \file tests/canvas/browsing/diagonal2d.cc + * + * \brief Tests on mln::canvas::browsing::diagonal2d. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/canvas/browsing/diagonal2d.hh> +#include <mln/fun/p2v/iota.hh> +#include <mln/debug/println.hh> + +template <typename I_, typename F> +struct assign_browsing_functor +{ + typedef I_ I; + enum { dim = I::site::dim }; + + typedef assign_browsing_functor<I, F> self; + typedef mln_deduce(I, psite, delta) dpsite; + typedef void (assign_browsing_functor<I,F>::*move_fun)(); + + I input; + F f; + + assign_browsing_functor(I& input, F f = F()) + : input(input), + f(f) + { + } + + mln_psite(I) p; + + void init() { std::cout << "init" << std::endl; } + void final() { std::cout << "final" << std::endl; } + + void next_() + { + input(p) = f(p); + } + void next() { std::cout << "next : " < + void my_test(Image& ima_, + const Function_p2v<F>& f_, + const Browsing& browse_) + { + I& ima = exact(ima_); + const F& f = exact(f_); + const B& browse = exact(browse_); + + assign_browsing_functor<I, F> fun(ima, f); + browse(fun); + } + +} + + +int main() +{ + using namespace mln; + image2d<unsigned> ima2(10, 10); + + std::cout << ima2.bbox() << std::endl; + my_test(ima2, fun::p2v::iota, canvas::browsing::diagonal2d); + debug::println(ima2); +} Index: branches/cleanup-2008/milena/tests/canvas/browsing/backdiagonal2d.cc =================================================================== --- branches/cleanup-2008/milena/tests/canvas/browsing/backdiagonal2d.cc (revision 0) +++ branches/cleanup-2008/milena/tests/canvas/browsing/backdiagonal2d.cc (revision 2615) @@ -0,0 +1,97 @@ +// 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. + +/*! \file tests/canvas/browsing/backdiagonal2d.cc + * + * \brief Tests on mln::canvas::browsing::backdiagonal2d. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/canvas/browsing/backdiagonal2d.hh> +#include <mln/fun/p2v/iota.hh> +#include <mln/debug/println.hh> + +template <typename I_, typename F> +struct assign_browsing_functor +{ + typedef I_ I; + enum { dim = I::site::dim }; + + typedef assign_browsing_functor<I, F> self; + typedef mln_deduce(I, psite, delta) dpsite; + typedef void (assign_browsing_functor<I,F>::*move_fun)(); + + I input; + F f; + + assign_browsing_functor(I& input, F f = F()) + : input(input), + f(f) + { + } + + mln_psite(I) p; + + void init() { std::cout << "init" << std::endl; } + void final() { std::cout << "final" << std::endl; } + + void next_() + { + input(p) = f(p); + } + void next() { std::cout << "next : " < + void my_test(Image& ima_, + const Function_p2v<F>& f_, + const Browsing& browse_) + { + I& ima = exact(ima_); + const F& f = exact(f_); + const B& browse = exact(browse_); + + assign_browsing_functor<I, F> fun(ima, f); + browse(fun); + } + +} + + +int main() +{ + using namespace mln; + image2d<unsigned> ima2(10, 10); + + std::cout << ima2.bbox() << std::endl; + my_test(ima2, fun::p2v::iota, canvas::browsing::backdiagonal2d); + debug::println(ima2); +} Index: branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2614) +++ branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2615) @@ -47,6 +47,8 @@ # include <mln/canvas/browsing/snake_fwd.hh> # include <mln/canvas/browsing/snake_generic.hh> # include <mln/canvas/browsing/directional.hh> +# include <mln/canvas/browsing/diagonal2d.hh> +# include <mln/canvas/browsing/backdiagonal2d.hh> /*! \file mln/morpho/erosion.spe.hh @@ -783,6 +785,7 @@ }; + template <typename I, typename W> inline mln_concrete(I) @@ -799,6 +802,337 @@ return f.output; } + + // Diagonal2d non fastest. + template <typename I_, typename W> + struct erosion_diagonal2d_functor + { + typedef I_ I; + typedef mln_deduce(I, psite, delta) dpsite; + + const I& input; + const W& win; + mln_concrete(I) output; + accu::min_h<mln_value(I)> min; + + mln_psite(I) p; + enum { dim = I::site::dim }; + unsigned dir; + + window2d win_left, win_right; + + mln_qiter(window2d) q_l, q_r; + + erosion_diagonal2d_functor(const I& input, const W& win) + : input(input), + win(win), + min(), + dir(dir), + win_left(win::shift(win, dpsite(1, -1)) - win), + win_right(win - win::shift(win, dpsite(1, -1))), + q_l(win_left, p), + q_r(win_right, p) + { + } + + void init() + { + // FIXME: border::adjust(input, win.delta()); + extension::fill(input, mln_max(mln_value(I))); + initialize(output, input); + } + + void next() + { + for_all(q_l) + min.untake(input(q_l)); + for_all(q_r) + min.take(input(q_r)); + output(p) = min; + } + + + void init_diag() + { + min.init(); + p = p - dpsite(-1, 1); + mln_qiter(W) q(win, p); + for_all(q) + min.take(input(q)); + p = p + dpsite(-1, 1); + } + + void final() + { + } + + }; + + // Backdiagonal2d non fastest. + template <typename I, typename W> + inline + mln_concrete(I) + erosion_diagonal2d(const Image& input, const Window<W>& win) + { + trace::entering("morpho::impl:erosion_diagonal2d"); + + typedef erosion_diagonal2d_functor<I, W> F; + F f(exact(input), exact(win)); + canvas::browsing::diagonal2d(f); + + trace::exiting("morpho::impl:erosion_diagonal2d"); + + return f.output; + } + + + + template <typename I_, typename W> + struct erosion_backdiagonal2d_functor + { + typedef I_ I; + typedef mln_deduce(I, psite, delta) dpsite; + + const I& input; + const W& win; + mln_concrete(I) output; + accu::min_h<mln_value(I)> min; + + mln_psite(I) p; + enum { dim = I::site::dim }; + unsigned dir; + + window2d win_left, win_right; + + mln_qiter(window2d) q_l, q_r; + + erosion_backdiagonal2d_functor(const I& input, const W& win) + : input(input), + win(win), + min(), + dir(dir), + win_left(win::shift(win, dpsite(-1, -1)) - win), + win_right(win - win::shift(win, dpsite(-1, -1))), + q_l(win_left, p), + q_r(win_right, p) + { + } + + void init() + { + // FIXME: border::adjust(input, win.delta()); + extension::fill(input, mln_max(mln_value(I))); + initialize(output, input); + } + + void next() + { + for_all(q_l) + min.untake(input(q_l)); + for_all(q_r) + min.take(input(q_r)); + output(p) = min; + } + + + void init_diag() + { + min.init(); + p = p - dpsite(1, 1); + mln_qiter(W) q(win, p); + for_all(q) + min.take(input(q)); + p = p + dpsite(1, 1); + } + + void final() + { + } + + }; + + template <typename I, typename W> + inline + mln_concrete(I) + erosion_backdiagonal2d(const Image& input, const Window<W>& win) + { + trace::entering("morpho::impl:erosion_backdiagonal2d"); + + typedef erosion_backdiagonal2d_functor<I, W> F; + F f(exact(input), exact(win)); + canvas::browsing::backdiagonal2d(f); + + trace::exiting("morpho::impl:erosion_backdiagonal2d"); + + return f.output; + } + + + + // Diagonal2d fastest. + template <typename I_, typename W> + struct erosion_diagonal2d_fastest_functor + { + typedef I_ I; + typedef mln_deduce(I, psite, delta) dpsite; + + const I& input; + const W& win; + mln_concrete(I) output; + accu::min_h<mln_value(I)> min; + + mln_psite(I) p; + enum { dim = I::site::dim }; + unsigned dir; + + window2d win_left, win_right; + + mln_qixter(const I, window2d) q_l, q_r; + + erosion_diagonal2d_fastest_functor(const I& input, const W& win) + : input(input), + win(win), + min(), + dir(dir), + win_left(win::shift(win, dpsite(1, -1)) - win), + win_right(win - win::shift(win, dpsite(1, -1))), + q_l(input, win_left, p), + q_r(input, win_right, p) + { + } + + void init() + { + // FIXME: border::adjust(input, win.delta()); + extension::fill(input, mln_max(mln_value(I))); + initialize(output, input); + } + + void next() + { + for_all(q_l) + min.untake(q_l.val()); + for_all(q_r) + min.take(q_r.val()); + output(p) = min; + } + + + void init_diag() + { + min.init(); + p = p - dpsite(-1, 1); + mln_qixter(const I, W) q(input, win, p); + for_all(q) + min.take(q.val()); + p = p + dpsite(-1, 1); + } + + void final() + { + } + + }; + + template <typename I, typename W> + inline + mln_concrete(I) + erosion_diagonal2d_fastest(const Image& input, const Window<W>& win) + { + trace::entering("morpho::impl:erosion_diagonal2d_fastest"); + + typedef erosion_diagonal2d_fastest_functor<I, W> F; + F f(exact(input), exact(win)); + canvas::browsing::diagonal2d(f); + + trace::exiting("morpho::impl:erosion_diagonal2d_fastest"); + + return f.output; + } + + + + // Backdiagonal2d fastest. + template <typename I_, typename W> + struct erosion_backdiagonal2d_fastest_functor + { + typedef I_ I; + typedef mln_deduce(I, psite, delta) dpsite; + + const I& input; + const W& win; + mln_concrete(I) output; + accu::min_h<mln_value(I)> min; + + mln_psite(I) p; + enum { dim = I::site::dim }; + unsigned dir; + + window2d win_left, win_right; + + mln_qixter(const I, window2d) q_l, q_r; + + erosion_backdiagonal2d_fastest_functor(const I& input, const W& win) + : input(input), + win(win), + min(), + dir(dir), + win_left(win::shift(win, dpsite(-1, -1)) - win), + win_right(win - win::shift(win, dpsite(-1, -1))), + q_l(input, win_left, p), + q_r(input, win_right, p) + { + } + + void init() + { + // FIXME: border::adjust(input, win.delta()); + extension::fill(input, mln_max(mln_value(I))); + initialize(output, input); + } + + void next() + { + for_all(q_l) + min.untake(q_l.val()); + for_all(q_r) + min.take(q_r.val()); + output(p) = min; + } + + + void init_diag() + { + min.init(); + p = p - dpsite(1, 1); + mln_qixter(const I, W) q(input, win, p); + for_all(q) + min.take(q.val()); + p = p + dpsite(1, 1); + } + + void final() + { + } + + }; + + template <typename I, typename W> + inline + mln_concrete(I) + erosion_backdiagonal2d_fastest(const Image& input, const Window<W>& win) + { + trace::entering("morpho::impl:erosion_backdiagonal2d_fastest"); + + typedef erosion_backdiagonal2d_fastest_functor<I, W> F; + F f(exact(input), exact(win)); + canvas::browsing::backdiagonal2d(f); + + trace::exiting("morpho::impl:erosion_backdiagonal2d_fastest"); + + return f.output; + } + } // end of namespace mln::morpho::impl @@ -868,7 +1202,7 @@ template <typename I, typename W> bool - erosion_chooses_arbitrary(const I& input, const W& win) + erosion_chooses_arbitrary(const I&, const W& win) { return win.size() >= 10 // size is not too small @@ -942,6 +1276,64 @@ trace::exiting("morpho::erosion_dispatch_for_directional"); } + + // dispatch for diagonal2d w.r.t. speed + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_diagonal2d(trait::image::speed::fastest, + const I& input, const W& win) + { + return impl::erosion_diagonal2d_fastest(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_diagonal2d(trait::image::speed::any, + const I& input, const W& win) + { + return impl::erosion_diagonal2d(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_diagonal2d(const I& input, const W& win) + { + trace::entering("morpho::erosion_dispatch_for_diagonal2d"); + return erosion_dispatch_for_diagonal2d(mln_trait_image_speed(I)(), + input, win); + trace::exiting("morpho::erosion_dispatch_for_diagonal2d"); + } + + + // dispatch for backdiagonal2d w.r.t. speed + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_backdiagonal2d(trait::image::speed::fastest, + const I& input, const W& win) + { + return impl::erosion_backdiagonal2d_fastest(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_backdiagonal2d(trait::image::speed::any, + const I& input, const W& win) + { + return impl::erosion_backdiagonal2d(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_backdiagonal2d(const I& input, const W& win) + { + trace::entering("morpho::erosion_dispatch_for_backdiagonal2d"); + return erosion_dispatch_for_backdiagonal2d(mln_trait_image_speed(I)(), + input, win); + trace::exiting("morpho::erosion_dispatch_for_backdiagonal2d"); + } + // dispatch w.r.t. win template <typename I, typename W> @@ -1068,6 +1460,94 @@ /// \} + /// Handling win::diag2d. + /// \{ + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::true_, + const I& input, const win::diag2d& win) + { + return erosion_dispatch_for_diagonal2d(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::false_, + const I& input, const win::diag2d& win) + { + return erosion_dispatch_for_generic(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const win::diag2d& win) + { + if (win.size() == 1) + return clone(input); + else if (win.size() == 3) + return erosion_dispatch_for_generic(input, win); + else + { + typedef mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic) test_not_logic; + typedef mlc_is_a(mln_pset(I), Box) test_box; + typedef mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low) test_lowq; + typedef mlc_and(test_not_logic, test_box) temp; + typedef mlc_and(temp, test_lowq) tests; + return erosion_dispatch_wrt_win(typename tests::eval (), + input, win); + } + } + + /// \} + + + /// Handling win::backdiag2d. + /// \{ + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::true_, + const I& input, const win::backdiag2d& win) + { + return erosion_dispatch_for_backdiagonal2d(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::false_, + const I& input, const win::backdiag2d& win) + { + return erosion_dispatch_for_generic(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const win::backdiag2d& win) + { + if (win.size() == 1) + return clone(input); + else if (win.size() == 3) + return erosion_dispatch_for_generic(input, win); + else + { + typedef mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic) test_not_logic; + typedef mlc_is_a(mln_pset(I), Box) test_box; + typedef mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low) test_lowq; + typedef mlc_and(test_not_logic, test_box) temp; + typedef mlc_and(temp, test_lowq) tests; + return erosion_dispatch_wrt_win(typename tests::eval (), + input, win); + } + } + + /// \} + + // The dispatch entry point. template <typename I, typename W> Index: branches/cleanup-2008/milena/mln/canvas/browsing/diagonal2d.hh =================================================================== --- branches/cleanup-2008/milena/mln/canvas/browsing/diagonal2d.hh (revision 0) +++ branches/cleanup-2008/milena/mln/canvas/browsing/diagonal2d.hh (revision 2615) @@ -0,0 +1,172 @@ +// 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_CANVAS_BROWSING_DIAGONAL2D_HH +# define MLN_CANVAS_BROWSING_DIAGONAL2D_HH + +/*! \file mln/canvas/browsing/diagonal2d.hh + * + * \brief Diagonal2d browsing of an image. + */ + +# include <mln/core/concept/browsing.hh> +# include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace canvas + { + + namespace browsing + { + + /*! + * \brief Browsing in a certain direction. + * + * This canvas browse all the point of an image 'input' of type + * 'I' and of dimension 'dim' in the direction 'dir'. + * + * The functor should provide (In addition to 'input', 'I', + * 'dim' and 'dir') three methods : + * + * - init() : Will be called at the beginning. + * - next() : Will be called at each point 'p' (also provided by + * the fonctor). + * - final(): Will be called at the end. + * + * F shall features : \n + * { \n + * --- as types: \n + * I; \n + * --- as attributes: \n + * dim; \n + * dir; // and test dir < dim \n + * input; \n + * p; \n + * --- as methods: \n + * void init(); \n + * void next(); \n + * void final(); \n + * } \n + * + * Example : \n + * + * | 1 3 6 + * | 2 5 8 + * | 4 7 9 + * L------> + * + */ + struct diagonal2d_t : public Browsing< diagonal2d_t > + { + template <typename F> + void operator()(F& f) const; + } + + diagonal2d; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + inline + void + diagonal2d_t::operator()(F& f) const + { + trace::entering("canvas::browsing::diagonal2d"); + + typedef typename F::I I; + typedef mln_deduce(I, psite, delta) dpsite; + typedef mln_psite(I) psite; + + // Directions + dpsite dp_first(1, 0); + dpsite dp_second(0, 1); + dpsite dp_diag(-1, 1); + + mln_deduce(I, psite, delta) diag; + + psite + pmin = f.input.domain().pmin(), + pmax = f.input.domain().pmax(); + + f.p = pmin; + + trace::entering("canvas::browsing::diagonal2d::init"); + f.init(); + trace::exiting("canvas::browsing::diagonal2d::init"); + + + while (f.input.domain().has(f.p)) + { + psite start_diag = f.p; + // Browse one diag. + f.init_diag(); + while (f.input.domain().has(f.p)) + { + f.next(); + f.p = f.p + dp_diag; + } + + // Goto next diag start. + f.p = start_diag + dp_first; + } + f.p = f.p - dp_first; + + f.p = f.p + dp_second; + while (f.input.domain().has(f.p)) + { + psite start_diag = f.p; + + // Browse one diag. + f.init_diag(); + while (f.input.domain().has(f.p)) + { + f.next(); + f.p = f.p + dp_diag; + } + f.p = f.p - dp_diag; + + // Goto next diag start. + f.p = start_diag + dp_second; + } + + trace::entering("canvas::browsing::diagonal2d::final"); + f.final(); + trace::exiting("canvas::browsing::diagonal2d::final"); + trace::exiting("canvas::browsing::diagonal2d"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::canvas::browsing + + } // end of namespace mln::canvas + +} // end of namespace mln + +#endif // ! MLN_CANVAS_BROWSING_DIAGONAL2D_HH Index: branches/cleanup-2008/milena/mln/canvas/browsing/backdiagonal2d.hh =================================================================== --- branches/cleanup-2008/milena/mln/canvas/browsing/backdiagonal2d.hh (revision 0) +++ branches/cleanup-2008/milena/mln/canvas/browsing/backdiagonal2d.hh (revision 2615) @@ -0,0 +1,174 @@ +// 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_CANVAS_BROWSING_BACKDIAGONAL2D_HH +# define MLN_CANVAS_BROWSING_BACKDIAGONAL2D_HH + +/*! \file mln/canvas/browsing/backdiagonal2d.hh + * + * \brief Backdiagonal2d browsing of an image. + */ + +# include <mln/core/concept/browsing.hh> +# include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace canvas + { + + namespace browsing + { + + /*! + * \brief Browsing in a certain direction. + * + * This canvas browse all the point of an image 'input' of type + * 'I' and of dimension 'dim' in the direction 'dir'. + * + * The functor should provide (In addition to 'input', 'I', + * 'dim' and 'dir') three methods : + * + * - init() : Will be called at the beginning. + * - next() : Will be called at each point 'p' (also provided by + * the fonctor). + * - final(): Will be called at the end. + * + * F shall features : \n + * { \n + * --- as types: \n + * I; \n + * --- as attributes: \n + * dim; \n + * dir; // and test dir < dim \n + * input; \n + * p; \n + * --- as methods: \n + * void init(); \n + * void next(); \n + * void final(); \n + * } \n + * + * Example : \n + * + * -------> + * | 4 7 9 + * | 2 5 8 + * | 1 3 6 + * + */ + struct backdiagonal2d_t : public Browsing< backdiagonal2d_t > + { + template <typename F> + void operator()(F& f) const; + } + + backdiagonal2d; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + inline + void + backdiagonal2d_t::operator()(F& f) const + { + trace::entering("canvas::browsing::backdiagonal2d"); + + typedef typename F::I I; + typedef mln_deduce(I, psite, delta) dpsite; + typedef mln_psite(I) psite; + + // Directions + dpsite dp_first(-1, 0); + dpsite dp_second(0, 1); + dpsite dp_diag(1, 1); + + mln_deduce(I, psite, delta) diag; + + psite + pmin = f.input.domain().pmin(), + pmax = f.input.domain().pmax(); + + // Start at the bottom left corner. + f.p[0] = pmax[0]; + f.p[1] = pmin[1]; + + trace::entering("canvas::browsing::backdiagonal2d::init"); + f.init(); + trace::exiting("canvas::browsing::backdiagonal2d::init"); + + + while (f.input.domain().has(f.p)) + { + psite start_diag = f.p; + // Browse one diag. + f.init_diag(); + while (f.input.domain().has(f.p)) + { + f.next(); + f.p = f.p + dp_diag; + } + + // Goto next diag start. + f.p = start_diag + dp_first; + } + f.p = f.p - dp_first; + + f.p = f.p + dp_second; + while (f.input.domain().has(f.p)) + { + psite start_diag = f.p; + + // Browse one diag. + f.init_diag(); + while (f.input.domain().has(f.p)) + { + f.next(); + f.p = f.p + dp_diag; + } + f.p = f.p - dp_diag; + + // Goto next diag start. + f.p = start_diag + dp_second; + } + + trace::entering("canvas::browsing::backdiagonal2d::final"); + f.final(); + trace::exiting("canvas::browsing::backdiagonal2d::final"); + trace::exiting("canvas::browsing::backdiagonal2d"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::canvas::browsing + + } // end of namespace mln::canvas + +} // end of namespace mln + +#endif // ! MLN_CANVAS_BROWSING_BACKDIAGONAL2D_HH

1 0