September 2009 - Olena-patches

[PATCH 18/19] New application: apps/graph-morpho/samples-image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/samples-image2d.cc: New. * apps/graph-morpho/Makefile.am (noinst_PROGRAMS): Add samples-image2d. (samples_image2d_SOURCES): New. (TESTS): Add samples-image2d. --- milena/ChangeLog | 10 +++ milena/apps/graph-morpho/Makefile.am | 5 +- milena/apps/graph-morpho/samples-image2d.cc | 94 +++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 milena/apps/graph-morpho/samples-image2d.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 84d0dc2..64302c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + New application: apps/graph-morpho/samples-image2d. + + * apps/graph-morpho/samples-image2d.cc: New. + * apps/graph-morpho/Makefile.am + (noinst_PROGRAMS): Add samples-image2d. + (samples_image2d_SOURCES): New. + (TESTS): Add samples-image2d. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have dilations and erosions delegate to the right implementations. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index d87d61b..3c2ee26 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -22,11 +22,12 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = io.hh morpho.hh make_complex2d.hh -noinst_PROGRAMS = samples-complex1d asf-complex1d +noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d samples_complex1d_SOURCES = samples-complex1d.cc +samples_image2d_SOURCES = samples-image2d.cc asf_complex1d_SOURCES = asf-complex1d.cc -TESTS = samples-complex1d asf-complex1d +TESTS = samples-complex1d asf-complex1d samples-image2d # Graph images stored in 2D PBM files. EXTRA_DIST = x.pbm y.pbm z.pbm diff --git a/milena/apps/graph-morpho/samples-image2d.cc b/milena/apps/graph-morpho/samples-image2d.cc new file mode 100644 index 0000000..455a147 --- /dev/null +++ b/milena/apps/graph-morpho/samples-image2d.cc @@ -0,0 +1,94 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 +/// \brief Morphological operators in graph space implemented on +/// mln::image2d-based cubical complexes. + +#include <mln/io/pbm/load.hh> + +#include <mln/debug/println.hh> + +#include "apps/graph-morpho/morpho.hh" + +#include "apps/graph-morpho/io.hh" +#include "apps/data.hh" + + +int main() +{ + using namespace mln; + + // Remove borders so as to avoid side effects. + border::thickness = 0; + + /* Binary graph-based image with vertices aligned on a discrete 2D grid. + + Of course, it would have been better, simpler and faster to use a + cubical 1-complex here, but they are not yet available (as of + 2009-09-10). */ + typedef mln::bin_1complex_image2d ima_t; + + // ------------------------ // + // Dilations and erosions. // + // ------------------------ // + + /* Create an image corresponding to the graph X of the ISMM 2009 + paper from Jean Cousty et al. */ + image2d<bool> x = io::pbm::load(MLN_APPS_DIR "/graph-morpho/x.pbm"); + debug::println("x:", x); + + debug::println("dilation_e2v(x):", dilation_e2v(x)) ; + debug::println("erosion_v2e(x):", erosion_v2e(x)); + + debug::println("erosion_e2v(x):", erosion_e2v(x)); + debug::println("dilation_v2e(x):", dilation_v2e(x)); + + debug::println("dilation_graph(x):", dilation_graph(x)); + debug::println("erosion_graph(x):", erosion_graph(x)); + + debug::println("alpha3(x):", alpha3(x)); + debug::println("beta3(x):", beta3(x)); + + // --------- // + // Filters. // + // --------- // + + // Create an image corresponding to the graph Y. + image2d<bool> y = io::pbm::load(MLN_APPS_DIR "/graph-morpho/y.pbm"); + debug::println("y:", y); + + debug::println("opening_graph(y):", opening_graph(y)); + debug::println("half_opening_graph(y):", half_opening_graph(y)); + debug::println("beta3(alpha3(y)):", beta3(alpha3(y))); + + // Create an image corresponding to the graph Z. + image2d<bool> z = io::pbm::load(MLN_APPS_DIR "/graph-morpho/z.pbm"); + debug::println("z:", z); + + debug::println("closing_graph(z):", closing_graph(z)); + debug::println("half_closing_graph(z):", half_closing_graph(z)); + debug::println("alpha3(beta3(z)):", alpha3(beta3(z))); +} -- 1.6.4.2

1 0

[PATCH 17/19] Have dilations and erosions delegate to the right implementations.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (dilation_e2v(const mln::Image&)) (erosion_v2e(const mln::Image&)) (erosion_e2v(const mln::Image&)) (dilation_v2e(const mln::Image&)): Here. --- milena/ChangeLog | 11 ++++ milena/apps/graph-morpho/morpho.hh | 105 +++++++---------------------------- 2 files changed, 32 insertions(+), 84 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 116f75a..84d0dc2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have dilations and erosions delegate to the right implementations. + + * apps/graph-morpho/morpho.hh + (dilation_e2v(const mln::Image&)) + (erosion_v2e(const mln::Image&)) + (erosion_e2v(const mln::Image&)) + (dilation_v2e(const mln::Image&)): + Here. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on mln::image2d<T>. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 8457c55..d0c1a1d 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -53,6 +53,10 @@ // and might be changed. # include "apps/graph-morpho/cplx2d.hh" +// FIXME: Instead of providing several implementation, move specific +// parts (neighborhoods, etc.) to a graph_traits class, and write +// generic version of combine, dilation_e2v, erosion_v2e, etc. + /*----------------------------. | Vertices-edges combinator. | @@ -400,119 +404,52 @@ namespace impl } + +// ------------------------------------------ // +// Facades of (core) dilations and erosions. // +// ------------------------------------------ // + /// Dilation from edges to vertices (\f$\delta^\bullet\f$). template <typename I> inline mln_concrete(I) -dilation_e2v(const mln::Image& input_) +dilation_e2v(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on vertices. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(input.domain(), 0); - // Vertex-to-edges neighborhood. - typedef mln::complex_higher_neighborhood<I::dim, mln_geom(I)> v2e_t; - const v2e_t v2e; - mln_niter(v2e_t) e(v2e, v); - for_all(v) - { - output(v) = false; - for_all(e) - if (input(e)) - { - output(v) = true; - break; - } - } - return output; + return impl::dilation_e2v(mln::exact(input)); } /// Erosion from vertices to edges (\f$\epsilon^\times\f$). template <typename I> inline mln_concrete(I) -erosion_v2e(const mln::Image& input_) +erosion_v2e(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on edges. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(input.domain(), 1); - // Edge-to-vertices neighborhood. - typedef mln::complex_lower_neighborhood<I::dim, mln_geom(I)> e2v_t; - const e2v_t e2v; - mln_niter(e2v_t) v(e2v, e); - for_all(e) - { - output(e) = true; - for_all(v) - if (!input(v)) - { - output(e) = false; - break; - } - } - return output; + return impl::erosion_v2e(mln::exact(input)); } /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$). template <typename I> inline mln_concrete(I) -erosion_e2v(const mln::Image& input_) +erosion_e2v(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on vertices. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(input.domain(), 0); - // Vertex-to-edges neighborhood. - typedef mln::complex_higher_neighborhood<I::dim, mln_geom(I)> v2e_t; - const v2e_t v2e; - mln_niter(v2e_t) e(v2e, v); - for_all(v) - { - output(v) = true; - for_all(e) - if (!input(e)) - { - output(v) = false; - break; - } - } - return output; + return impl::erosion_e2v(mln::exact(input)); } /// Dilation from vertices to edges (\f$\delta^\times\f$). template <typename I> inline mln_concrete(I) -dilation_v2e(const mln::Image& input_) +dilation_v2e(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on edges. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(input.domain(), 1); - // Edge-to-vertices neighborhood. - typedef mln::complex_lower_neighborhood<I::dim, mln_geom(I)> e2v_t; - const e2v_t e2v; - mln_niter(e2v_t) v(e2v, e); - for_all(e) - { - output(e) = false; - for_all(v) - if (input(v)) - { - output(e) = true; - break; - } - } - return output; + return impl::dilation_v2e(mln::exact(input)); } +// ------------------------------ // +// Other dilations and erosions. // +// ------------------------------ // + /// Vertex dilation (\f$delta\f$). template <typename I> inline -- 1.6.4.2

1 0

[PATCH 16/19] Add implementations of dilations/erosions on mln::image2d<T>.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (impl::dilation_e2v(const mln::image2d<T>&)) (impl::erosion_v2e(const mln::image2d<T>&)) (impl::erosion_e2v(const mln::image2d<T>&)) (impl::dilation_v2e(const mln::image2d<T>&)): New functions. --- milena/ChangeLog | 11 ++++++ milena/apps/graph-morpho/morpho.hh | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b623361..116f75a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on mln::image2d<T>. + + * apps/graph-morpho/morpho.hh + (impl::dilation_e2v(const mln::image2d<T>&)) + (impl::erosion_v2e(const mln::image2d<T>&)) + (impl::erosion_e2v(const mln::image2d<T>&)) + (impl::dilation_v2e(const mln::image2d<T>&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a ``tolerant'' image_if morpher. * apps/graph-morpho/image_if_large.hh: New. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 277bd36..8457c55 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -47,6 +47,8 @@ # include <mln/data/paste.hh> +# include "apps/graph-morpho/image_if_large.hh" + // FIXME: Careful, cplx2d.hh is a symlink to a file in Théo's sandbox, // and might be changed. # include "apps/graph-morpho/cplx2d.hh" @@ -327,6 +329,75 @@ namespace impl return output; } + // ------------------------------------------------------------- // + // Implementations on (mln::image2d-based) cubical 2-complexes. // + // ------------------------------------------------------------- // + + /* Note the operator `||' in the following routines: we have to use + our own ``tolerant'' version of mln::image_if (namely + mln::image_if_large) for these dilations and erosions to + work. */ + + /// Dilation from edges to vertices (\f$\delta^\bullet\f$) on + /// an mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + dilation_e2v(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(dilation(input || mln::cplx2d::is_pixel, + mln::cplx2d::p2e()), + output); + return output; + } + + /// Erosion from vertices to edges (\f$\epsilon^\times\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + erosion_v2e(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(erosion(input || mln::cplx2d::is_edge, + mln::cplx2d::e2p()), + output); + return output; + } + + /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + erosion_e2v(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(erosion(input || mln::cplx2d::is_pixel, + mln::cplx2d::p2e()), + output); + return output; + } + + /// Dilation from vertices to edges (\f$\delta^\times\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + dilation_v2e(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(dilation(input || mln::cplx2d::is_edge, + mln::cplx2d::e2p()), + output); + return output; + } + } /// Dilation from edges to vertices (\f$\delta^\bullet\f$). -- 1.6.4.2

1 0

[PATCH 15/19] Introduce a ``tolerant'' image_if morpher.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/image_if_large.hh: New. --- milena/ChangeLog | 6 + milena/apps/graph-morpho/image_if_large.hh | 307 ++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 0 deletions(-) create mode 100644 milena/apps/graph-morpho/image_if_large.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 1707c7b..b623361 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a ``tolerant'' image_if morpher. + + * apps/graph-morpho/image_if_large.hh: New. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood-aware and graph-friendly dilation & erosion. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/image_if_large.hh b/milena/apps/graph-morpho/image_if_large.hh new file mode 100644 index 0000000..37c2d63 --- /dev/null +++ b/milena/apps/graph-morpho/image_if_large.hh @@ -0,0 +1,307 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH +# define APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH + +/// \file +/// +/// \brief Definition of a image which domain is restricted by a +/// function 'site -> Boolean', but where routine has() returns true +/// for sites of the underlying (morphed) image even if they are not +/// validating the predicate. + +// FIXME: This file is a workaround for the lack of ``tolerant'' +// image_if, but there must be a better way. + +# include <mln/core/internal/image_domain_morpher.hh> +# include <mln/core/site_set/p_if.hh> +# include <mln/pw/all.hh> + + +namespace mln +{ + + // Forward declaration. + template <typename I, typename F> struct image_if_large; + + + namespace internal + { + + /// Data structure for \c mln::image_if_large<I,F>. + template <typename I, typename F> + struct data< image_if_large<I,F> > + { + data(I& ima, const F& f); + + I ima_; + p_if<mln_domain(I), F> domain_; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename I, typename F> + struct image_< image_if_large<I,F> > + : default_image_morpher< I, + mln_value(I), + image_if_large<I,F> > + { + typedef trait::image::category::domain_morpher category; + + // No extension of domain. + typedef trait::image::ext_domain::none ext_domain; + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; + + typedef trait::image::vw_io::none vw_io; + typedef trait::image::vw_set::none vw_set; + typedef trait::image::value_alignment::not_aligned value_alignment; + typedef trait::image::value_storage::disrupted value_storage; + }; + + } // end of namespace mln::trait + + + + /// Image which domain is restricted by a function 'site -> + /// Boolean', but where routine has() returns true for sites of the + /// underlying (morphed) image even if they are not validating the + /// predicate. + /// + /// \ingroup modimagedomainmorpher + // + template <typename I, typename F> + struct image_if_large + : public mln::internal::image_domain_morpher< I, + p_if<mln_domain(I), F>, + image_if_large<I, F> > + { + typedef image_if_large<I, F> self; + typedef mln_psite(self) psite; + + /// Skeleton. + typedef image_if_large< tag::image_, tag::function_<F> > skeleton; + + /// Constructor without argument. + image_if_large(); + + /// Constructor from an image \p ima and a predicate \p f. + image_if_large(I& ima, const F& f); + + void init_(I& ima, const F& f); + + /// \brief Redefined psite membership method, returning true for + /// sites of the underlying (morphed) image even if they are not + /// validating the predicate. + /// + /// This is the only difference with mln::image_if. + bool has(const psite& p) const; + + /// Give the definition domain. + const p_if<mln_domain(I), F>& domain() const; + + /// Const promotion via conversion. + operator image_if_large<const I, F>() const; + }; + + + // Image || Function_v2b. + + /// ima || f creates an image_if_large with the image ima and the function + /// f. + // + template <typename I, typename F> + image_if_large<I,F> + operator || (Image& ima, const Function_v2b<F>& f); + + /// ima || f creates an image_if_large with the image ima and the function + /// f. + // + template <typename I, typename F> + image_if_large<const I,F> + operator || (const Image& ima, const Function_v2b<F>& f); + + + + template <typename I, typename A> + image_if_large< const I, fun::C<bool(*)(A)> > + operator || (const Image& ima, bool (*f)(A) ); + + template <typename I, typename A> + image_if_large< I, fun::C<bool(*)(A)> > + operator || (Image& ima, bool (*f)(A) ); + +// // Construction helpers. + +// template <typename I, typename A> +// image_if_large< const I, fun::C<bool(*)(A)> > +// make_image_if_large(const Image& ima, bool (*f)(A) ); + +// template <typename I, typename A> +// image_if_large< I, fun::C<bool(*)(A)> > +// make_image_if_large(Image& ima, bool (*f)(A) ); + + + +# ifndef MLN_INCLUDE_ONLY + + // init_. + + template <typename I, typename F> + void init_(tag::function_t, F& f, const image_if_large<I,F>& model) + { + f = model.domain().predicate(); + } + + template <typename I, typename F, typename J> + void init_(tag::image_t, image_if_large<I,F>& target, const J& model) + { + I ima; + init_(tag::image, ima, exact(model)); + F f; + init_(tag::function, f, exact(model)); + target.init_(ima, f); + } + + // internal::data< image_if_large<I,F> > + + namespace internal + { + + template <typename I, typename F> + inline + data< image_if_large<I,F> >::data(I& ima, const F& f) + : ima_(ima), + domain_(ima.domain() | f) + { + } + + } + + + // image_if_large<I,F> + + template <typename I, typename F> + inline + image_if_large<I,F>::image_if_large() + { + } + + template <typename I, typename F> + inline + image_if_large<I,F>::image_if_large(I& ima, const F& f) + { + init_(ima, f); + } + + template <typename I, typename F> + inline + void + image_if_large<I,F>::init_(I& ima, const F& f) + { + mln_precondition(! this->is_valid()); + this->data_ = new internal::data< image_if_large<I,F> >(ima, f); + } + + template <typename I, typename F> + inline + bool + image_if_large<I,F>::has(const typename image_if_large<I,F>::psite& p) const + { + mln_precondition(exact(this)->is_valid()); + // This method is more tolerant than mln::image_if's one (which + // returns this->domain().has(p)). + return this->data_->ima_.has(p); + } + + + template <typename I, typename F> + inline + const p_if<mln_domain(I), F>& + image_if_large<I,F>::domain() const + { + mln_precondition(this->is_valid()); + return this->data_->domain_; + } + + template <typename I, typename F> + inline + image_if_large<I,F>::operator image_if_large<const I,F>() const + { + mln_precondition(this->is_valid()); + image_if_large<const I,F> tmp(this->data_->ima_, + this->data_->domain_.predicate()); + return tmp; + } + + + // Operators. + + template <typename I, typename F> + inline + image_if_large<I,F> + operator || (Image& ima, const Function_v2b<F>& f) + { + image_if_large<I,F> tmp(exact(ima), exact(f)); + return tmp; + } + + template <typename I, typename F> + inline + image_if_large<const I, F> + operator || (const Image& ima, const Function_v2b<F>& f) + { + image_if_large<const I, F> tmp(exact(ima), exact(f)); + return tmp; + } + + + template <typename I, typename A> + image_if_large< const I, fun::C<bool(*)(A)> > + operator || (const Image& ima, bool (*f)(A) ) + { + return exact(ima) || convert::to_fun(f); + } + + template <typename I, typename A> + image_if_large< I, fun::C<bool(*)(A)> > + operator || (Image& ima, bool (*f)(A) ) + { + return exact(ima) || convert::to_fun(f); + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH -- 1.6.4.2

1 0

[PATCH 14/19] Add neighborhood-aware and graph-friendly dilation & erosion.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (dilation(const mln::Image&, const mln::Neighborhood<N>&)) (erosion(const mln::Image&, const mln::Neighborhood<N>&)): New functions. --- milena/ChangeLog | 9 +++++ milena/apps/graph-morpho/morpho.hh | 66 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d2f72bc..1707c7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood-aware and graph-friendly dilation & erosion. + + * apps/graph-morpho/morpho.hh + (dilation(const mln::Image&, const mln::Neighborhood<N>&)) + (erosion(const mln::Image&, const mln::Neighborhood<N>&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on bin_1complex_image2d. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index e043d95..277bd36 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -126,6 +126,72 @@ combine(const mln::Image& vertices, const mln::Image& edges) | Dilations and erosions. | `-------------------------*/ +/// A neighborhood-aware and graph-friendly version of the binary dilation. +template <typename I, typename N> +mln_concrete(I) +dilation(const mln::Image& input_, const mln::Neighborhood<N>& nbh_) +{ + using namespace mln; + + typedef mln_concrete(I) O; + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + O output; + initialize(output, input); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + /* There is a slight difference with Milena's classical binary + dilation here: instead of initializing OUTPUT with INPUT, we + fill it with default (here, false) values. */ + output(p) = false; + for_all(n) if (input.has(n)) + if (input(n) == true) + { + output(p) = true; + break; + } + } + return output; +} + + +/// A neighborhood-aware and graph-friendly version of the binary erosion. +template <typename I, typename N> +mln_concrete(I) +erosion(const mln::Image& input_, const mln::Neighborhood<N>& nbh_) +{ + using namespace mln; + + typedef mln_concrete(I) O; + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + O output; + initialize(output, input); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + /* There is a slight difference with Milena's classical erosion + here: instead of initializing OUTPUT with INPUT, we fill it + with default (here, true) values. */ + output(p) = true; + for_all(n) if (input.has(n)) + if (input(n) == false) + { + output(p) = false; + break; + } + } + return output; +} + + namespace impl { // ------------------------------------------ // -- 1.6.4.2

1 0

[PATCH 13/19] Add implementations of dilations/erosions on bin_1complex_image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (impl::dilation_e2v(const mln::bin_1complex_image2d&)) (impl::erosion_v2e(const mln::bin_1complex_image2d&)) (impl::erosion_e2v(const mln::bin_1complex_image2d&)) (impl::dilation_v2e(const mln::bin_1complex_image2d&)): New functions. --- milena/ChangeLog | 11 +++ milena/apps/graph-morpho/morpho.hh | 144 +++++++++++++++++++++++++++++++++--- 2 files changed, 143 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba395d1..d2f72bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on bin_1complex_image2d. + + * apps/graph-morpho/morpho.hh + (impl::dilation_e2v(const mln::bin_1complex_image2d&)) + (impl::erosion_v2e(const mln::bin_1complex_image2d&)) + (impl::erosion_e2v(const mln::bin_1complex_image2d&)) + (impl::dilation_v2e(const mln::bin_1complex_image2d&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have combine delegate to impl::combine. * apps/graph-morpho/morpho.hh (combine): Here. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 718323c..e043d95 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -126,22 +126,142 @@ combine(const mln::Image& vertices, const mln::Image& edges) | Dilations and erosions. | `-------------------------*/ -/* FIXME: By constraining the domain of the input and passing the - neighborhood, one should be able to use a truly generic dilation - (resp. erosion), or even use Milena's standard morpho::dilation - (resp. morpho::erosion). +namespace impl +{ + // ------------------------------------------ // + // Implementations on (general) 2-complexes. // + // ------------------------------------------ // - It'd be convenient to write something like this: + /* FIXME: By constraining the domain of the input and passing the + neighborhood, one should be able to use a truly generic dilation + (resp. erosion), or even use Milena's standard morpho::dilation + (resp. morpho::erosion). + + It'd be convenient to write something like this: + + dilation(ima | vertices); + + We can /actually/ write this, but `vertices' has to be a predicate + on sites (p2b function), which is not efficient, since both + vertices and edges will be browsed. + + It would be very nice if `vertices' could be an actual site set, + so that `ima | vertices' creates a morpher smart enough to + browse /only/ vertices. */ + + /// Dilation from edges to vertices (\f$\delta^\bullet\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + dilation_e2v(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on vertices. + mln::p_n_faces_fwd_piter<1, geom_t> v(input.domain(), 0); + // Vertex-to-edges neighborhood. + typedef mln::complex_higher_neighborhood<1, geom_t> v2e_t; + const v2e_t v2e; + mln_niter_(v2e_t) e(v2e, v); + for_all(v) + { + output(v) = false; + for_all(e) + if (input(e)) + { + output(v) = true; + break; + } + } + return output; + } - dilation(ima | vertices); + /// Erosion from vertices to edges (\f$\epsilon^\times\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + erosion_v2e(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on edges. + mln::p_n_faces_fwd_piter<1, geom_t> e(input.domain(), 1); + // Edge-to-vertices neighborhood. + typedef mln::complex_lower_neighborhood<1, geom_t> e2v_t; + const e2v_t e2v; + mln_niter_(e2v_t) v(e2v, e); + for_all(e) + { + output(e) = true; + for_all(v) + if (!input(v)) + { + output(e) = false; + break; + } + } + return output; + } - We can /actually/ write this, but `vertices' has to be a predicate - on sites (p2b function), which is not efficient, since both - vertices and edges will be browsed. + /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + erosion_e2v(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on vertices. + mln::p_n_faces_fwd_piter<1, geom_t> v(input.domain(), 0); + // Vertex-to-edges neighborhood. + typedef mln::complex_higher_neighborhood<1, geom_t> v2e_t; + const v2e_t v2e; + mln_niter_(v2e_t) e(v2e, v); + for_all(v) + { + output(v) = true; + for_all(e) + if (!input(e)) + { + output(v) = false; + break; + } + } + return output; + } - It would be very nice if `vertices' could be an actual site set, - so that `ima | vertices' creates a morpher smart enough to - browse /only/ vertices. */ + /// Dilation from vertices to edges (\f$\delta^\times\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + dilation_v2e(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on edges. + mln::p_n_faces_fwd_piter<1, geom_t> e(input.domain(), 1); + // Edge-to-vertices neighborhood. + typedef mln::complex_lower_neighborhood<1, geom_t> e2v_t; + const e2v_t e2v; + mln_niter_(e2v_t) v(e2v, e); + for_all(e) + { + output(e) = false; + for_all(v) + if (input(v)) + { + output(e) = true; + break; + } + } + return output; + } + +} /// Dilation from edges to vertices (\f$\delta^\bullet\f$). template <typename I> -- 1.6.4.2

1 0

[PATCH 12/19] Have combine delegate to impl::combine.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (combine): Here. --- milena/ChangeLog | 6 ++++++ milena/apps/graph-morpho/morpho.hh | 20 ++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b1c3939..ba395d1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have combine delegate to impl::combine. + + * apps/graph-morpho/morpho.hh (combine): Here. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add impl::combine for mln::image2d<T>. * apps/graph-morpho/cplx2d.hh: New symlink to... diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 70d19b1..718323c 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -107,26 +107,18 @@ namespace impl } } +// -------- // +// Facade. // +// -------- // + /// Combine the vertices and the edges of two images to create a new /// graph image (``operator'' \f$\ovee\f$). template <typename I> inline mln_concrete(I) -combine(const mln::Image& vertices_, const mln::Image& edges_) +combine(const mln::Image& vertices, const mln::Image& edges) { - const I vertices = mln::exact(vertices_); - const I edges = mln::exact(edges_); - mln_precondition(vertices.domain() == edges.domain()); - - mln_concrete(I) output; - mln::initialize(output, vertices); - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(output.domain(), 0); - for_all(v) - output(v) = vertices(v); - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(output.domain(), 1); - for_all(e) - output(e) = edges(e); - return output; + return impl::combine(mln::exact(vertices), mln::exact(edges)); } -- 1.6.4.2

1 0

[PATCH 11/19] Add impl::combine for mln::image2d<T>.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/cplx2d.hh: New symlink to... * sandbox/theo/esiee/laurent/ismm09/cplx2d.hh: ...this file. * apps/graph-morpho/morpho.hh (combine(const mln::image2d<T>&, const mln::image2d<T>&)): New function. --- milena/ChangeLog | 10 ++++++++++ milena/apps/graph-morpho/cplx2d.hh | 1 + milena/apps/graph-morpho/morpho.hh | 29 +++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) create mode 120000 milena/apps/graph-morpho/cplx2d.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 667b4bc..b1c3939 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add impl::combine for mln::image2d<T>. + + * apps/graph-morpho/cplx2d.hh: New symlink to... + * sandbox/theo/esiee/laurent/ismm09/cplx2d.hh: ...this file. + * apps/graph-morpho/morpho.hh + (combine(const mln::image2d<T>&, const mln::image2d<T>&)): + New function. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add impl::combine for mln::bin_1complex_image2d. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/cplx2d.hh b/milena/apps/graph-morpho/cplx2d.hh new file mode 120000 index 0000000..c08d52c --- /dev/null +++ b/milena/apps/graph-morpho/cplx2d.hh @@ -0,0 +1 @@ +../../sandbox/theo/esiee/laurent/ismm09/cplx2d.hh \ No newline at end of file diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index f23fc59..70d19b1 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -37,6 +37,7 @@ Groningen, The Netherlands. */ # include <mln/core/alias/complex_image.hh> +# include <mln/core/image/image2d.hh> # include <mln/core/routine/duplicate.hh> @@ -44,6 +45,12 @@ # include <mln/core/image/complex_neighborhoods.hh> # include <mln/core/image/complex_neighborhood_piter.hh> +# include <mln/data/paste.hh> + +// FIXME: Careful, cplx2d.hh is a symlink to a file in Théo's sandbox, +// and might be changed. +# include "apps/graph-morpho/cplx2d.hh" + /*----------------------------. | Vertices-edges combinator. | @@ -76,6 +83,28 @@ namespace impl output(e) = edges(e); return output; } + + // ------------------------------------------------------------- // + // Implementations on (mln::image2d-based) cubical 2-complexes. // + // ------------------------------------------------------------- // + + /// Combine the vertices and the edges of two + /// mln::image2d<T> images to create a new graph image + /// (``operator'' \f$\ovee\f$) + template <typename T> + inline + mln::image2d<T> + combine(const mln::image2d<T>& vertices, + const mln::image2d<T>& edges) + { + mln_precondition(vertices.domain() == edges.domain()); + mln::image2d<T> output; + mln::initialize(output, vertices); + mln::data::fill(output, false); + mln::data::paste(vertices | mln::cplx2d::is_pixel, output); + mln::data::paste(edges | mln::cplx2d::is_edge, output); + return output; + } } /// Combine the vertices and the edges of two images to create a new -- 1.6.4.2

1 0

[PATCH 10/19] Add impl::combine for mln::bin_1complex_image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (combine(const bin_1complex_image2d&, const bin_1complex_image2d&)): New function. --- milena/ChangeLog | 8 ++++++++ milena/apps/graph-morpho/morpho.hh | 31 ++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 68b7d0c..667b4bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add impl::combine for mln::bin_1complex_image2d. + + * apps/graph-morpho/morpho.hh + (combine(const bin_1complex_image2d&, const bin_1complex_image2d&)): + New function. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Deconstruction of image2d-based complex images. * apps/graph-morpho/make_complex2d.hh (unmake_complex2d): diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index ee21814..f23fc59 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -36,7 +36,7 @@ International Symposium on Mathematical Morphology (ISMM), 2009, Groningen, The Netherlands. */ -# include <mln/core/concept/image.hh> +# include <mln/core/alias/complex_image.hh> # include <mln/core/routine/duplicate.hh> @@ -49,6 +49,35 @@ | Vertices-edges combinator. | `----------------------------*/ +namespace impl +{ + // ------------------------------------------ // + // Implementations on (general) 2-complexes. // + // ------------------------------------------ // + + /// Combine the vertices and the edges of two + /// mln::bin_1complex_image2d images to create a new graph image + /// (``operator'' \f$\ovee\f$) + inline + mln::bin_1complex_image2d + combine(const mln::bin_1complex_image2d& vertices, + const mln::bin_1complex_image2d& edges) + { + mln_precondition(vertices.domain() == edges.domain()); + + mln::bin_1complex_image2d output; + mln::initialize(output, vertices); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + mln::p_n_faces_fwd_piter<1, geom_t> v(output.domain(), 0); + for_all(v) + output(v) = vertices(v); + mln::p_n_faces_fwd_piter<1, geom_t> e(output.domain(), 1); + for_all(e) + output(e) = edges(e); + return output; + } +} + /// Combine the vertices and the edges of two images to create a new /// graph image (``operator'' \f$\ovee\f$). template <typename I> -- 1.6.4.2

1 0

[PATCH 09/19] Deconstruction of image2d-based complex images.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/make_complex2d.hh (unmake_complex2d): New function. --- milena/ChangeLog | 7 ++++ milena/apps/graph-morpho/make_complex2d.hh | 42 +++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 23e901b..68b7d0c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Deconstruction of image2d-based complex images. + + * apps/graph-morpho/make_complex2d.hh (unmake_complex2d): + New function. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Reify the construction of image2d-based complex images. * apps/graph-morpho/make_complex2d.hh: New file. diff --git a/milena/apps/graph-morpho/make_complex2d.hh b/milena/apps/graph-morpho/make_complex2d.hh index 1859ab0..a79c798 100644 --- a/milena/apps/graph-morpho/make_complex2d.hh +++ b/milena/apps/graph-morpho/make_complex2d.hh @@ -37,7 +37,9 @@ The values set on "edge" sites and "square" sites are a conjunction of the values on the face of the adjacent faces of - immediate lower dimension. */ + immediate lower dimension. + + The converse operation is unmake_complex2d. */ template <typename I> inline mln_concrete(I) @@ -88,4 +90,42 @@ make_complex2d(const mln::Image& input_) return output; } + +/** \brief Create an image of pixels from a binary 2D image + representing a cubical 2-complex by dividing the resolution of the + image \a input image by two. + + Basically, this is the converse of make_complex2d. */ +template <typename I> +inline +mln_concrete(I) +unmake_complex2d(const mln::Image& input_) +{ + using namespace mln; + + const I& input = exact(input_); + // The input image must have an odd number of rows and columns. + mln_precondition(input.nrows() % 2 == 1); + mln_precondition(input.ncols() % 2 == 1); + + // Create a (morpher) image of the pixels of INPUT. + typedef image_if< const I, cplx2d::predicate_t > J; + J input_pixels = input | cplx2d::is_pixel; + + /* FIXME: The construction of OUTPUT is obvioulsy not generic, since + it expects I's domain to provide the interface of an mln::box2d. + There should be a static precondition on I at the beginning of + this function. */ + typedef mln_concrete(I) O; + // FIXME: This won't work if INPUT's domain does not start at (0,0). + O output(input.nrows() / 2 + 1, input.ncols() / 2 + 1); + + mln_piter(J) p_in(input_pixels.domain()); + mln_piter(O) p_out(output.domain()); + for_all_2(p_in, p_out) + output(p_out) = input(p_in); + return output; +} + + #endif // ! APPS_GRAPH_MORPHO_MAKE_COMPLEX2D_HH -- 1.6.4.2

1 0