September 2009 - Olena-patches

[Olena] #173: Complete the graph fusion example started with Géraud Béguin
by Olena 12 Nov '09

12 Nov '09

#173: Complete the graph fusion example started with Géraud Béguin ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Component: other | Version: 1.0 Keywords: IGR | ----------------------+----------------------------------------------------- See: * source:branches/cleanup-2008/milena/sandbox/beguin/irm.cc * source:branches/cleanup-2008/milena/sandbox/beguin/fusion_graph.hh -- Ticket URL: <https://trac.lrde.org/olena/ticket/173> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

4587: Clean up ChangeLogs.
by Roland Levillain 30 Sep '09

30 Sep '09

--- milena/ChangeLog | 44 ++++++++++++++++++++++---------------------- milena/sandbox/ChangeLog | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 324a6af..669d4f9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -285,45 +285,45 @@ 2009-09-25 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add test for dual input and fix p_transformed test. - * core/site_set/p_transformed.cc: Add inverse and typedefs. - * morpho/tree/Makefile.am, - * morpho/tree/dual_input_tree.cc, + * core/site_set/p_transformed.cc: Add inverse and typedefs. + * morpho/tree/Makefile.am, + * morpho/tree/dual_input_tree.cc, Add dual input tree tests. - * morpho/tree/filter/filter.cc: Minor changes. + * morpho/tree/filter/filter.cc: Minor changes. 2009-09-25 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add fast version of dual input max tree computation and fix. - * morpho/tree/all.hh: Update. - * morpho/tree/compute_parent_dual_input.hh: Remove. - * morpho/tree/data.hh: Fix constructors. - * morpho/tree/dual_input_tree.hh: Add dispatches for + * morpho/tree/all.hh: Update. + * morpho/tree/compute_parent_dual_input.hh: Remove. + * morpho/tree/data.hh: Fix constructors. + * morpho/tree/dual_input_tree.hh: Add dispatches for generic / low quantized algorithms. - * morpho/tree/impl/dual_hqueue.hh: New. - * morpho/tree/impl/dual_union_find.hh: New. - * morpho/tree/impl: New. + * morpho/tree/impl/dual_hqueue.hh: New. + * morpho/tree/impl/dual_union_find.hh: New. + * morpho/tree/impl: New. 2009-09-25 Edwin Carlinet <carlinet(a)lrde.epita.fr> Fix non generic stuff in translation function and fix transform morpher. - * core/image/imorph/tr_image.hh, - * core/site_set/p_transformed.hh, - * core/site_set/p_transformed_piter.hh: + * core/image/imorph/tr_image.hh, + * core/site_set/p_transformed.hh, + * core/site_set/p_transformed_piter.hh: Make them less strict with function return type. Allow functions having values that can be converted in the requested site. (ex: vector<1, u> -> point1d). - * fun/p2p/translation.hh: Add argument type definition. - * fun/x2x/translation.hh: Add inverse function. - * geom/translate.hh: Fix non generic stuff and bug. + * fun/p2p/translation.hh: Add argument type definition. + * fun/x2x/translation.hh: Add inverse function. + * geom/translate.hh: Fix non generic stuff and bug. 2009-09-25 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add hierarchical queues for Salembier's algorithm. - * core/site_set/p_queue_fast.hh: Add empty method. - * util/all.hh: Update. - * util/hqueues.hh: New. - * value/all.hh: Update. - * value/value_array.hh: New. Create an array indexed by + * core/site_set/p_queue_fast.hh: Add empty method. + * util/all.hh: Update. + * util/hqueues.hh: New. + * value/all.hh: Update. + * value/value_array.hh: New. Create an array indexed by a given type. (Similar to histo::array but the values are not limited to unsigned type). diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 53f1385..2f6ad31 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -44,7 +44,7 @@ Prepare kmean demo for theo. Work in progress. * green/mln/clustering/kmean1d.hh: New library file. - + * green/demo/clustering/kmean1d: New directory. * green/demo/clustering/kmean1d/Makefile.am: New makefile. * green/demo/clustering/kmean1d/kmean1d.cc: New demo. -- 1.6.3.1

1 0

[PATCH 22/22] Generic vertices-edges combinator in apps/graph-morpho/.
by Roland Levillain 30 Sep '09

30 Sep '09

* apps/graph-morpho/morpho.hh (combine(const bin_1complex_image2d&, const bin_1complex_image2d&)) (combine(const mln::image2d<T>&, const mln::image2d<T>&)): Remove. (combine(const mln::Image&, const mln::Image&)): Reimplement using graph traits. --- milena/ChangeLog | 11 ++++++ milena/apps/graph-morpho/morpho.hh | 67 +++++------------------------------- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 93d5143..324a6af 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Generic vertices-edges combinator in apps/graph-morpho/. + + * apps/graph-morpho/morpho.hh + (combine(const bin_1complex_image2d&, const bin_1complex_image2d&)) + (combine(const mln::image2d<T>&, const mln::image2d<T>&)): + Remove. + (combine(const mln::Image&, const mln::Image&)): + Reimplement using graph traits. + +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Avoid a warning about unused variables in mln::border::fill. * mln/border/fill.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index e1f10f5..5aaecae 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -172,63 +172,6 @@ namespace trait | 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; - } - - // ------------------------------------------------------------- // - // 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::world::inter_pixel::dim2::is_pixel(), - output); - mln::data::paste(edges | mln::world::inter_pixel::dim2::is_edge(), - output); - return output; - } -} - -// -------- // -// Facade. // -// -------- // - /// Combine the vertices and the edges of two images to create a new /// graph image (``operator'' \f$\ovee\f$). template <typename I> @@ -236,7 +179,15 @@ inline mln_concrete(I) combine(const mln::Image& vertices, const mln::Image& edges) { - return impl::combine(mln::exact(vertices), mln::exact(edges)); + typedef trait::graph T; + + mln_precondition(vertices.domain() == edges.domain()); + mln_concrete(I) output; + mln::initialize(output, exact(vertices)); + mln::data::fill(output, false); + mln::data::paste(vertices | T::is_vertex(), output); + mln::data::paste(edges | T::is_edge(), output); + return output; } -- 1.6.3.1

1 0

[PATCH 21/22] Avoid a warning about unused variables in mln::border::fill.
by Roland Levillain 30 Sep '09

30 Sep '09

* mln/border/fill.hh (fill_dispatch(category::primary, speed::any, I&, const mln_value(I)&)): Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/border/fill.hh | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 92cb281..93d5143 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Avoid a warning about unused variables in mln::border::fill. + + * mln/border/fill.hh + (fill_dispatch(category::primary, speed::any, I&, const mln_value(I)&)): + Here. + +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Generic core dilations and erosions on graphs. * apps/graph-morpho/morpho.hh diff --git a/milena/mln/border/fill.hh b/milena/mln/border/fill.hh index 856b491..6bc690e 100644 --- a/milena/mln/border/fill.hh +++ b/milena/mln/border/fill.hh @@ -166,7 +166,7 @@ namespace mln inline void fill_dispatch(mln::trait::image::category::primary, mln::trait::image::speed::any, - I& ima, const mln_value(I)& v) + I& /* ima */, const mln_value(I)& /* v */) { // No border so no-op. } -- 1.6.3.1

1 0

[PATCH 20/22] Generic core dilations and erosions on graphs.
by Roland Levillain 30 Sep '09

30 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&)) (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>&)): Remove. (dilation_e2v(const mln::Image&)) (erosion_v2e(const mln::Image&)) (erosion_e2v(const mln::Image&)) (dilation_v2e(const mln::Image&)): Reimplement using Milena's dilation and erosion as well as graph traits. --- milena/ChangeLog | 21 +++ milena/apps/graph-morpho/morpho.hh | 238 ++++++++---------------------------- 2 files changed, 71 insertions(+), 188 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa66a38..92cb281 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,26 @@ 2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Generic core dilations and erosions on graphs. + + * 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&)) + (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>&)): + Remove. + (dilation_e2v(const mln::Image&)) + (erosion_v2e(const mln::Image&)) + (erosion_e2v(const mln::Image&)) + (dilation_v2e(const mln::Image&)): + Reimplement using Milena's dilation and erosion as well as graph + traits. + +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add graph traits to apps/graph-morpho. * apps/graph-morpho/morpho.hh (trait::graph): diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 0caf0da..e1f10f5 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -61,10 +61,6 @@ # include <mln/topo/is_n_face.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. - /*---------------. | Graph traits. | @@ -248,191 +244,21 @@ combine(const mln::Image& vertices, const mln::Image& edges) | Dilations and erosions. | `-------------------------*/ -namespace impl -{ - // ------------------------------------------ // - // Implementations on (general) 2-complexes. // - // ------------------------------------------ // - - /* 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::topo::is_n_face<0> is_0_face; - typedef mln_geom_(mln::bin_1complex_image2d) geom_t; - typedef mln::complex_higher_window<1, geom_t> v2e_t; - const v2e_t v2e; - mln::bin_1complex_image2d output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::dilation(mln::extend(input | is_0_face, - input), - v2e), - output); - return output; - } - - /// 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::topo::is_n_face<1> is_1_face; - typedef mln_geom_(mln::bin_1complex_image2d) geom_t; - typedef mln::complex_lower_window<1, geom_t> e2v_t; - const e2v_t e2v; - mln::bin_1complex_image2d output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::erosion(mln::extend(input | is_1_face, - input), - e2v), - output); - return output; - } - - /// 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::topo::is_n_face<0> is_0_face; - typedef mln_geom_(mln::bin_1complex_image2d) geom_t; - typedef mln::complex_higher_window<1, geom_t> v2e_t; - const v2e_t v2e; - mln::bin_1complex_image2d output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::erosion(mln::extend(input | is_0_face, - input), - v2e), - output); - return output; - } - - /// 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::topo::is_n_face<1> is_1_face; - typedef mln_geom_(mln::bin_1complex_image2d) geom_t; - typedef mln::complex_lower_window<1, geom_t> e2v_t; - const e2v_t e2v; - mln::bin_1complex_image2d output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::dilation(mln::extend(input | is_1_face, - input), - e2v), - output); - return output; - } - - // ------------------------------------------------------------- // - // Implementations on (mln::image2d-based) cubical 2-complexes. // - // ------------------------------------------------------------- // - - /// 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) - { - using mln::world::inter_pixel::dim2::is_pixel; - using mln::world::inter_pixel::v2e; - - mln::image2d<T> output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::dilation(mln::extend(input | is_pixel(), - input), - v2e().win()), - 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) - { - using mln::world::inter_pixel::dim2::is_edge; - using mln::world::inter_pixel::e2v; - - mln::image2d<T> output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::erosion(mln::extend(input | is_edge(), - input), - e2v().win()), - 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) - { - using mln::world::inter_pixel::dim2::is_pixel; - using mln::world::inter_pixel::v2e; - - mln::image2d<T> output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::erosion(mln::extend(input | is_pixel(), - input), - v2e().win()), - output); - return output; - } +// ----------------------------- // +// Core dilations and erosions. // +// ----------------------------- // - /// 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) - { - using mln::world::inter_pixel::dim2::is_edge; - using mln::world::inter_pixel::e2v; +/* Note: When writing - mln::image2d<T> output(input.domain()); - mln::data::fill(output, false); - mln::data::paste(mln::morpho::dilation(mln::extend(input | is_edge(), - input), - e2v().win()), - output); - return output; - } + dilation(ima | vertices); -} + `vertices' is 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. */ -// ------------------------------------------ // -// Facades of (core) dilations and erosions. // -// ------------------------------------------ // /// Dilation from edges to vertices (\f$\delta^\bullet\f$). template <typename I> @@ -440,7 +266,16 @@ inline mln_concrete(I) dilation_e2v(const mln::Image& input) { - return impl::dilation_e2v(mln::exact(input)); + typedef trait::graph T; + + mln_concrete(I) output; + mln::initialize(output, mln::exact(input)); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::dilation(mln::extend(input | T::is_vertex(), + input), + T::v2e()), + output); + return output; } /// Erosion from vertices to edges (\f$\epsilon^\times\f$). @@ -449,7 +284,16 @@ inline mln_concrete(I) erosion_v2e(const mln::Image& input) { - return impl::erosion_v2e(mln::exact(input)); + typedef trait::graph T; + + mln_concrete(I) output; + mln::initialize(output, mln::exact(input)); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::erosion(mln::extend(input | T::is_edge(), + input), + T::e2v()), + output); + return output; } /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$). @@ -458,7 +302,16 @@ inline mln_concrete(I) erosion_e2v(const mln::Image& input) { - return impl::erosion_e2v(mln::exact(input)); + typedef trait::graph T; + + mln_concrete(I) output; + mln::initialize(output, mln::exact(input)); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::erosion(mln::extend(input | T::is_vertex(), + input), + T::v2e()), + output); + return output; } /// Dilation from vertices to edges (\f$\delta^\times\f$). @@ -467,7 +320,16 @@ inline mln_concrete(I) dilation_v2e(const mln::Image& input) { - return impl::dilation_v2e(mln::exact(input)); + typedef trait::graph T; + + mln_concrete(I) output; + mln::initialize(output, mln::exact(input)); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::dilation(mln::extend(input | T::is_edge(), + input), + T::e2v()), + output); + return output; } -- 1.6.3.1

1 0

[PATCH 19/22] Add graph traits to apps/graph-morpho.
by Roland Levillain 30 Sep '09

30 Sep '09

* apps/graph-morpho/morpho.hh (trait::graph): New (empty) traits class. (trait::graph< mln::image2d<T> >) (trait::graph< mln::complex_image<1, G, V> >): New traits class specializations. --- milena/ChangeLog | 10 ++++ milena/apps/graph-morpho/morpho.hh | 106 ++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4e01d44..aa66a38 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add graph traits to apps/graph-morpho. + + * apps/graph-morpho/morpho.hh (trait::graph): + New (empty) traits class. + (trait::graph< mln::image2d<T> >) + (trait::graph< mln::complex_image<1, G, V> >): + New traits class specializations. + +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Introduce mln::world::inter_pixel::dbl_window2d. * mln/world/inter_pixel/neighb2d.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index c18c89f..0caf0da 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -66,6 +66,112 @@ // generic version of combine, dilation_e2v, erosion_v2e, etc. +/*---------------. +| Graph traits. | +`---------------*/ + +namespace trait +{ + /// Graph traits. + template <typename I> + struct graph + { + /* Empty by default. + + Specializations must provide these static member functions: + + static F1 is_vertex() + static F2 is_edge() + static W1 v2e() + static W2 e2v() + + where F1, F2, W1 and W2 are types depending on I. + */ + }; + + // ----------------------------------------------------------- // + // Graph traits for (mln::image2d-based) cubical 2-complexes. // + // ----------------------------------------------------------- // + + /// Graph traits for mln::image2d. + template <typename T> + struct graph< mln::image2d<T> > + { + // Return a functor saying whether a psite is a vertex or not. + static + const mln::world::inter_pixel::dim2::is_pixel& is_vertex() + { + static mln::world::inter_pixel::dim2::is_pixel is_vertex_fun; + return is_vertex_fun; + } + + // Return a functor saying whether a psite is a vertex or not. + static + const mln::world::inter_pixel::dim2::is_edge& is_edge() + { + static mln::world::inter_pixel::dim2::is_edge is_edge_fun; + return is_edge_fun; + } + + // Return a window containing the edges adjacent to a vertex. + static + const mln::window2d& v2e() + { + return mln::world::inter_pixel::v2e().win(); + } + + // Return a window containing the vertices adjacent to an edge. + static + const mln::world::inter_pixel::dbl_window2d& e2v() + { + return mln::world::inter_pixel::e2v().win(); + } + }; + + // ---------------------------------------- // + // Graph traits for (general) 1-complexes. // + // ---------------------------------------- // + + /// Graph traits for 1-complexes images. + template <typename G, typename V> + struct graph< mln::complex_image<1, G, V> > + { + // Return a functor saying whether a psite is a vertex or not. + static + const mln::topo::is_n_face<0>& is_vertex() + { + static mln::topo::is_n_face<0> is_vertex_fun; + return is_vertex_fun; + } + + // Return a functor saying whether a psite is a vertex or not. + static + const mln::topo::is_n_face<1>& is_edge() + { + static mln::topo::is_n_face<1> is_edge_fun; + return is_edge_fun; + } + + // Return a window containing the edges adjacent to a vertex. + static + const mln::complex_higher_window<1, G>& v2e() + { + static mln::complex_higher_window<1, G> v2e_win; + return v2e_win; + } + + // Return a window containing the vertices adjacent to an edge. + static + const mln::complex_lower_window<1, G>& e2v() + { + static mln::complex_lower_window<1, G> e2v_win; + return e2v_win; + } + }; + +} // end of namespace trait + + /*----------------------------. | Vertices-edges combinator. | `----------------------------*/ -- 1.6.3.1

1 0

[PATCH 18/22] Introduce mln::world::inter_pixel::dbl_window2d.
by Roland Levillain 30 Sep '09

30 Sep '09

* mln/world/inter_pixel/neighb2d.hh (mln::world::inter_pixel::dbl_window2d): New typedef. Use to shorten the definition of... (mln::world::inter_pixel::dbl_neighb2d): ...this typedef. --- milena/ChangeLog | 10 ++++++++++ milena/mln/world/inter_pixel/neighb2d.hh | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 80ad48c..4e01d44 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + + Introduce mln::world::inter_pixel::dbl_window2d. + + * mln/world/inter_pixel/neighb2d.hh + (mln::world::inter_pixel::dbl_window2d): New typedef. + Use to shorten the definition of... + (mln::world::inter_pixel::dbl_neighb2d): + ...this typedef. + 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> Use Milena's dilation/erosion in graph morpho on bin_1complex_image2d. diff --git a/milena/mln/world/inter_pixel/neighb2d.hh b/milena/mln/world/inter_pixel/neighb2d.hh index d262c3e..66897ef 100644 --- a/milena/mln/world/inter_pixel/neighb2d.hh +++ b/milena/mln/world/inter_pixel/neighb2d.hh @@ -43,8 +43,11 @@ namespace mln namespace inter_pixel { - /// Double neighborhood used for inter-pixel images. - typedef neighb< win::multiple<window2d, dim2::is_row_odd> > dbl_neighb2d; + /// Double window. + typedef win::multiple<window2d, dim2::is_row_odd> dbl_window2d; + + /// Double neighborhood, used for inter-pixel images. + typedef neighb< dbl_window2d > dbl_neighb2d; /// Vertex (pixel) to neighboring vertices (pixels). -- 1.6.3.1

1 0

[PATCH 17/22] Use Milena's dilation/erosion in graph morpho on bin_1complex_image2d.
by Roland Levillain 30 Sep '09

30 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&)): Here. --- milena/ChangeLog | 11 ++++ milena/apps/graph-morpho/morpho.hh | 104 ++++++++++++----------------------- 2 files changed, 47 insertions(+), 68 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 28adc2e..80ad48c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + + Use Milena's dilation/erosion in graph morpho 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&)): + Here. + 2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> Fix a precondition in apps/graph-morpho/io.hh. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index bd883a0..c18c89f 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -41,6 +41,8 @@ # include <mln/core/image/dmorph/image_if.hh> +# include <mln/core/image/dmorph/extension_ima.hh> + # include <mln/core/routine/extend.hh> # include <mln/core/routine/duplicate.hh> @@ -57,6 +59,8 @@ # include <mln/morpho/dilation.hh> # include <mln/morpho/erosion.hh> +# include <mln/topo/is_n_face.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. @@ -167,25 +171,16 @@ namespace impl mln::bin_1complex_image2d dilation_e2v(const mln::bin_1complex_image2d& input) { - mln::bin_1complex_image2d output; - mln::initialize(output, input); + mln::topo::is_n_face<0> is_0_face; 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; + typedef mln::complex_higher_window<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; - } - } + mln::bin_1complex_image2d output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::dilation(mln::extend(input | is_0_face, + input), + v2e), + output); return output; } @@ -195,25 +190,16 @@ namespace impl mln::bin_1complex_image2d erosion_v2e(const mln::bin_1complex_image2d& input) { - mln::bin_1complex_image2d output; - mln::initialize(output, input); + mln::topo::is_n_face<1> is_1_face; 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; + typedef mln::complex_lower_window<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; - } - } + mln::bin_1complex_image2d output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::erosion(mln::extend(input | is_1_face, + input), + e2v), + output); return output; } @@ -223,25 +209,16 @@ namespace impl mln::bin_1complex_image2d erosion_e2v(const mln::bin_1complex_image2d& input) { - mln::bin_1complex_image2d output; - mln::initialize(output, input); + mln::topo::is_n_face<0> is_0_face; 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; + typedef mln::complex_higher_window<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; - } - } + mln::bin_1complex_image2d output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::erosion(mln::extend(input | is_0_face, + input), + v2e), + output); return output; } @@ -251,25 +228,16 @@ namespace impl mln::bin_1complex_image2d dilation_v2e(const mln::bin_1complex_image2d& input) { - mln::bin_1complex_image2d output; - mln::initialize(output, input); + mln::topo::is_n_face<1> is_1_face; 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; + typedef mln::complex_lower_window<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; - } - } + mln::bin_1complex_image2d output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(mln::morpho::dilation(mln::extend(input | is_1_face, + input), + e2v), + output); return output; } -- 1.6.3.1

1 0

[PATCH 16/22] Fix a precondition in apps/graph-morpho/io.hh.
by Roland Levillain 30 Sep '09

30 Sep '09

* apps/graph-morpho/io.hh (println): Here. --- milena/ChangeLog | 6 ++++++ milena/apps/graph-morpho/io.hh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f15185c..28adc2e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2009-09-30 Roland Levillain <roland(a)lrde.epita.fr> + + Fix a precondition in apps/graph-morpho/io.hh. + + * apps/graph-morpho/io.hh (println): Here. + 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> Small improvements in mln::util::tracked_ptr. diff --git a/milena/apps/graph-morpho/io.hh b/milena/apps/graph-morpho/io.hh index f2dfa9a..cdc54bb 100644 --- a/milena/apps/graph-morpho/io.hh +++ b/milena/apps/graph-morpho/io.hh @@ -162,7 +162,7 @@ println(const std::string& message, const mln::bin_1complex_image2d& ima, // These are admittedly loose preconditions, but we cannot check // much anyway. - mln_precondition(ima.nsites() == support.nsites()); + mln_precondition(ima.domain().nfaces_of_dim(0) == support.nsites()); image2d<bool> vertices(support); image2d<bool> h_edges(box2d(support.pmin(), support.pmax() - dpoint2d(0, 1))); -- 1.6.3.1

1 0

[PATCH 15/22] Small improvements in mln::util::tracked_ptr.
by Roland Levillain 30 Sep '09

30 Sep '09

* mln/util/tracked_ptr.hh (mln::util::tracked_ptr<T>::tracked_ptr(T*)) (mln::util::tracked_ptr<T>::operator=(T*)) (mln::util::tracked_ptr<T>::run_() const): Remove useless typedefs. (mln::util::tracked_ptr<T>::operator=(const tracked_ptr<T>&)) (mln::util::tracked_ptr<T>::operator=(T*)) (mln::util::operator<<(std::ostream& ostr, const tracked_ptr<T>&)): Check invariants in more places. --- milena/ChangeLog | 14 ++++++++++++++ milena/mln/util/tracked_ptr.hh | 12 +++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fd80747..f15185c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Small improvements in mln::util::tracked_ptr. + + * mln/util/tracked_ptr.hh + (mln::util::tracked_ptr<T>::tracked_ptr(T*)) + (mln::util::tracked_ptr<T>::operator=(T*)) + (mln::util::tracked_ptr<T>::run_() const): + Remove useless typedefs. + (mln::util::tracked_ptr<T>::operator=(const tracked_ptr<T>&)) + (mln::util::tracked_ptr<T>::operator=(T*)) + (mln::util::operator<<(std::ostream& ostr, const tracked_ptr<T>&)): + Check invariants in more places. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Add a dummy operator< to mln::util::multi_site. * mln/util/multi_site.hh diff --git a/milena/mln/util/tracked_ptr.hh b/milena/mln/util/tracked_ptr.hh index e25106a..24b9b62 100644 --- a/milena/mln/util/tracked_ptr.hh +++ b/milena/mln/util/tracked_ptr.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -148,8 +149,6 @@ namespace mln tracked_ptr<T>::tracked_ptr(T* ptr) : ptr_(ptr) { - typedef std::set<tracked_ptr<T>*> holders_t; - if (ptr == 0) holders_ = 0; else @@ -187,6 +186,7 @@ namespace mln // If ptr == 0, holders_ == 0 so we cannot insert anything in it. if (holders_ != 0) holders_->insert(this); + mln_invariant(run_()); return *this; } @@ -194,8 +194,6 @@ namespace mln inline tracked_ptr<T>& tracked_ptr<T>::operator=(T* ptr) { - typedef std::set<tracked_ptr<T>*> holders_t; - mln_invariant(run_()); if (ptr == ptr_) // no-op @@ -209,6 +207,7 @@ namespace mln holders_ = new holders_t; holders_->insert(this); } + mln_invariant(run_()); return *this; } @@ -223,8 +222,6 @@ namespace mln inline bool tracked_ptr<T>::run_() const { - typedef std::set<tracked_ptr<T>*> holders_t; - mln_invariant((ptr_ && holders_) || (! ptr_ && ! holders_)); if (ptr_ == 0) return true; @@ -264,6 +261,7 @@ namespace mln { typedef std::set<tracked_ptr<T>*> holders_t; + mln_invariant(tp.run_()); ostr << "tracked_ptr @ " << (&tp) << " { ptr = " << tp.ptr_ << " / holders = "; -- 1.6.3.1

1 0