- Olena-patches

last-svn-commit-663-gd6086ba Improve dispatch in arith::revert routine.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/arith/revert.hh, * mln/arith/revert.spe.hh: Add a standard dispatch. --- milena/ChangeLog | 7 +++++ milena/mln/arith/revert.hh | 56 ++++++++++++++++++++++++++++++++++++--- milena/mln/arith/revert.spe.hh | 28 ++++++++----------- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b72dafb..fcb0afe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. + + * mln/arith/revert.hh, + * mln/arith/revert.spe.hh: Add a standard dispatch. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate declarations. diff --git a/milena/mln/arith/revert.hh b/milena/mln/arith/revert.hh index 60f46af..2ac3710 100644 --- a/milena/mln/arith/revert.hh +++ b/milena/mln/arith/revert.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,8 @@ // FIXME: Rely instead on mln/fun/v2v/revert.hh. -// FIXME: Revert on int value 0 does not give 0 (since min != - max; idem for float etc.) +// FIXME: Revert on int value 0 does not give 0 (since min != - max; +// idem for float etc.) namespace mln @@ -88,10 +90,17 @@ namespace mln template <typename I, typename O> inline - void revert_(const I& input, O& output) + void revert(const Image& input_, Image<O>& output_) { trace::entering("arith::impl::generic::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); + typedef mln_value(I) V; mln_piter(I) p(input.domain()); for_all(p) @@ -105,6 +114,43 @@ namespace mln } // end of namespace mln::arith::impl + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::any, const I& input, O& output) + { + impl::generic::revert(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::fastest, const I& input, O& output) + { + impl::revert_fastest(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(const Image& input, Image<O>& output) + { + revert_dispatch(mln_trait_image_speed(I)(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::arith::internal + + + // Facades. template <typename I> @@ -117,7 +163,7 @@ namespace mln mln_concrete(I) output; initialize(output, input); - impl::revert_(mln_trait_image_speed(I)(), exact(input), output); + internal::revert_dispatch(exact(input), exact(output)); trace::exiting("arith::revert"); return output; @@ -131,7 +177,7 @@ namespace mln mln_precondition(exact(input).is_valid()); - impl::revert_(mln_trait_image_speed(I)(), exact(input), exact(input)); + internal::revert_dispatch(exact(input), exact(input)); trace::exiting("arith::revert_inplace"); } diff --git a/milena/mln/arith/revert.spe.hh b/milena/mln/arith/revert.spe.hh index 6fef77c..2df8bc0 100644 --- a/milena/mln/arith/revert.spe.hh +++ b/milena/mln/arith/revert.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,24 +50,19 @@ namespace mln namespace impl { - namespace generic - { - template <typename I, typename O> - void revert_(const I& input, O& output); - } - + // FIXME: This is a fast implementation not a fastest one! template <typename I, typename O> inline - void revert_(trait::image::speed::any, const I& input, O& output) + void revert_fastest(const Image& input_, Image<O>& output_) { - generic::revert_(input, output); - } + trace::entering("arith::impl::revert_fastest"); - template <typename I, typename O> - inline - void revert_(trait::image::speed::fastest, const I& input, O& output) - { - trace::entering("arith::impl::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); typedef mln_value(I) V; mln_pixter(const I) ip(input); @@ -74,7 +70,7 @@ namespace mln for_all_2(ip, op) op.val() = mln_min(V) + (mln_max(V) - ip.val()); - trace::entering("arith::impl::revert_"); + trace::entering("arith::impl::revert_fastest"); } } // end of namespace mln::arith::impl -- 1.5.6.5

1 0

last-svn-commit-662-g9aa2ede Improve dispatch in arith::revert routine.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* mln/arith/revert.hh, * mln/arith/revert.spe.hh: Add a standard dispatch. --- milena/ChangeLog | 7 +++++ milena/mln/arith/revert.hh | 56 ++++++++++++++++++++++++++++++++++++--- milena/mln/arith/revert.spe.hh | 28 ++++++++----------- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b72dafb..fcb0afe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. + + * mln/arith/revert.hh, + * mln/arith/revert.spe.hh: Add a standard dispatch. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate declarations. diff --git a/milena/mln/arith/revert.hh b/milena/mln/arith/revert.hh index 60f46af..2ac3710 100644 --- a/milena/mln/arith/revert.hh +++ b/milena/mln/arith/revert.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +41,8 @@ // FIXME: Rely instead on mln/fun/v2v/revert.hh. -// FIXME: Revert on int value 0 does not give 0 (since min != - max; idem for float etc.) +// FIXME: Revert on int value 0 does not give 0 (since min != - max; +// idem for float etc.) namespace mln @@ -88,10 +90,17 @@ namespace mln template <typename I, typename O> inline - void revert_(const I& input, O& output) + void revert(const Image& input_, Image<O>& output_) { trace::entering("arith::impl::generic::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); + typedef mln_value(I) V; mln_piter(I) p(input.domain()); for_all(p) @@ -105,6 +114,43 @@ namespace mln } // end of namespace mln::arith::impl + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::any, const I& input, O& output) + { + impl::generic::revert(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(trait::image::speed::fastest, const I& input, O& output) + { + impl::revert_fastest(input, output); + } + + template <typename I, typename O> + inline + void + revert_dispatch(const Image& input, Image<O>& output) + { + revert_dispatch(mln_trait_image_speed(I)(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::arith::internal + + + // Facades. template <typename I> @@ -117,7 +163,7 @@ namespace mln mln_concrete(I) output; initialize(output, input); - impl::revert_(mln_trait_image_speed(I)(), exact(input), output); + internal::revert_dispatch(exact(input), exact(output)); trace::exiting("arith::revert"); return output; @@ -131,7 +177,7 @@ namespace mln mln_precondition(exact(input).is_valid()); - impl::revert_(mln_trait_image_speed(I)(), exact(input), exact(input)); + internal::revert_dispatch(exact(input), exact(input)); trace::exiting("arith::revert_inplace"); } diff --git a/milena/mln/arith/revert.spe.hh b/milena/mln/arith/revert.spe.hh index 6fef77c..2df8bc0 100644 --- a/milena/mln/arith/revert.spe.hh +++ b/milena/mln/arith/revert.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,24 +50,19 @@ namespace mln namespace impl { - namespace generic - { - template <typename I, typename O> - void revert_(const I& input, O& output); - } - + // FIXME: This is a fast implementation not a fastest one! template <typename I, typename O> inline - void revert_(trait::image::speed::any, const I& input, O& output) + void revert_fastest(const Image& input_, Image<O>& output_) { - generic::revert_(input, output); - } + trace::entering("arith::impl::revert_fastest"); - template <typename I, typename O> - inline - void revert_(trait::image::speed::fastest, const I& input, O& output) - { - trace::entering("arith::impl::revert_"); + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + mln_precondition(input.domain() == output.domain()); typedef mln_value(I) V; mln_pixter(const I) ip(input); @@ -74,7 +70,7 @@ namespace mln for_all_2(ip, op) op.val() = mln_min(V) + (mln_max(V) - ip.val()); - trace::entering("arith::impl::revert_"); + trace::entering("arith::impl::revert_fastest"); } } // end of namespace mln::arith::impl -- 1.5.6.5

1 0

last-svn-commit-662-g33bbebf mln/data/paste_without_localization.hh: Remove duplicate declarations.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/data/paste_without_localization.hh | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ec2995..b72dafb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate + declarations. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox. diff --git a/milena/mln/data/paste_without_localization.hh b/milena/mln/data/paste_without_localization.hh index 0ee824c..667e7f1 100644 --- a/milena/mln/data/paste_without_localization.hh +++ b/milena/mln/data/paste_without_localization.hh @@ -329,19 +329,6 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_dispatch( - mln::trait::image::value_storage::any, - mln::trait::image::value_storage::any, - const Image& input, - Image<J>& output) - { - impl::generic::paste_without_localization(input, output); - } - - - - template <typename I, typename J> - inline void paste_without_localization_dispatch(const Image& input, Image<J>& output) { -- 1.5.6.5

1 0

last-svn-commit-661-g0ad1284 mln/data/paste_without_localization.hh: Remove duplicate declarations.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/data/paste_without_localization.hh | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ec2995..b72dafb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/data/paste_without_localization.hh: Remove duplicate + declarations. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox. diff --git a/milena/mln/data/paste_without_localization.hh b/milena/mln/data/paste_without_localization.hh index 0ee824c..667e7f1 100644 --- a/milena/mln/data/paste_without_localization.hh +++ b/milena/mln/data/paste_without_localization.hh @@ -329,19 +329,6 @@ namespace mln template <typename I, typename J> inline - void paste_without_localization_dispatch( - mln::trait::image::value_storage::any, - mln::trait::image::value_storage::any, - const Image& input, - Image<J>& output) - { - impl::generic::paste_without_localization(input, output); - } - - - - template <typename I, typename J> - inline void paste_without_localization_dispatch(const Image& input, Image<J>& output) { -- 1.5.6.5

1 0

last-svn-commit-661-gaa2b96f mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ .../green => milena}/mln/accu/stat/histo3d_rgb.hh | 0 2 files changed, 5 insertions(+), 0 deletions(-) copy {scribo/sandbox/green => milena}/mln/accu/stat/histo3d_rgb.hh (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 66d79f3..6ec2995 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from + Yann's sandbox. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. diff --git a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh b/milena/mln/accu/stat/histo3d_rgb.hh similarity index 100% copy from scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh copy to milena/mln/accu/stat/histo3d_rgb.hh -- 1.5.6.5

1 0

last-svn-commit-660-g5d58ddc mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from Yann's sandbox.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ .../green => milena}/mln/accu/stat/histo3d_rgb.hh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) copy {scribo/sandbox/green => milena}/mln/accu/stat/histo3d_rgb.hh (99%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 66d79f3..6ec2995 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from + Yann's sandbox. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. diff --git a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh b/milena/mln/accu/stat/histo3d_rgb.hh similarity index 99% copy from scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh copy to milena/mln/accu/stat/histo3d_rgb.hh index cdfea4d..24f6b46 100644 --- a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh +++ b/milena/mln/accu/stat/histo3d_rgb.hh @@ -180,6 +180,7 @@ namespace mln histo3d_rgb(); /// \} + /// Manipulators. /// \{ /// \brief Initialize the histogram with zero value. -- 1.5.6.5

1 0

last-svn-commit-660-g9056104 scribo/primitive/group/from_double_link_any.hh: New.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 + ...from_double_link.hh => from_double_link_any.hh} | 60 +++++++++++--------- 2 files changed, 37 insertions(+), 27 deletions(-) copy scribo/scribo/primitive/group/{from_double_link.hh => from_double_link_any.hh} (67%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d04b792..69998c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/group/from_double_link_any.hh: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New. diff --git a/scribo/scribo/primitive/group/from_double_link.hh b/scribo/scribo/primitive/group/from_double_link_any.hh similarity index 67% copy from scribo/scribo/primitive/group/from_double_link.hh copy to scribo/scribo/primitive/group/from_double_link_any.hh index 3af395d..b3bd82a 100644 --- a/scribo/scribo/primitive/group/from_double_link.hh +++ b/scribo/scribo/primitive/group/from_double_link_any.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH -# define SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH +#ifndef SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH +# define SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH /// \file @@ -46,7 +45,6 @@ # include <scribo/core/object_groups.hh> # include <scribo/core/component_set.hh> # include <scribo/primitive/internal/find_root.hh> -# include <scribo/primitive/internal/is_link_valid.hh> namespace scribo @@ -59,10 +57,8 @@ namespace scribo { /*! Group components from left and right links information and - validate These links. A link must exist in both ways to be - validated. + validate These links. - \param[in] components A component set. \param[in] left_link The left neighbor of each line of text. \param[in] right_link The right neighbor of each line of text. @@ -70,8 +66,8 @@ namespace scribo */ template <typename L> object_groups<L> - from_double_link(const object_links<L>& left_link, - const object_links<L>& right_link); + from_double_link_any(const object_links<L>& left_link, + const object_links<L>& right_link); @@ -81,34 +77,44 @@ namespace scribo template <typename L> inline object_groups<L> - from_double_link(const object_links<L>& left_link, - const object_links<L>& right_link) + from_double_link_any(const object_links<L>& left_link, + const object_links<L>& right_link) { - trace::entering("scribo::primitive::group::from_double_link"); - - mln_precondition(left_link.nelements() == right_link.nelements()); - + trace::entering("scribo::primitive::group::from_double_link_any"); object_groups<L> parent(left_link); parent.init(); + for_all_comps(i, left_link.components()) { - mln::util::couple<bool, unsigned> - nbh = internal::is_link_valid(left_link, right_link, i); - if (nbh.first()) + unsigned + pi = internal::find_root(parent, i), + pli = internal::find_root(parent, left_link(i)); + + if (pi != pli) + { + if (pli < pi) + parent(pli) = pi; + else + parent(pi) = pli; + } + + pi = internal::find_root(parent, i); + unsigned pri = internal::find_root(parent, right_link(i)); + + if (pi != pri) { - unsigned par = internal::find_root(parent, nbh.second()); - if (par < i) - parent(par) = i; + if (pri < pi) + parent(pri) = pi; else - parent(i) = par; + parent(pi) = pri; } } - for (unsigned i = parent.nelements() - 1; i < parent.nelements(); --i) - parent(i) = parent(parent(i)); + for_all_groups(g, parent) + internal::find_root(parent, g); - trace::exiting("scribo::primitive::group::from_double_link"); + trace::exiting("scribo::primitive::group::from_double_link_any"); return parent; } @@ -122,4 +128,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH +#endif // ! SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH -- 1.5.6.5

1 0

last-svn-commit-659-gffb11d3 scribo/primitive/group/from_double_link_any.hh: New.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 + ...from_double_link.hh => from_double_link_any.hh} | 60 +++++++++++--------- 2 files changed, 37 insertions(+), 27 deletions(-) copy scribo/scribo/primitive/group/{from_double_link.hh => from_double_link_any.hh} (67%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 58ff670..a7f2dc7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/group/from_double_link_any.hh: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New. diff --git a/scribo/scribo/primitive/group/from_double_link.hh b/scribo/scribo/primitive/group/from_double_link_any.hh similarity index 67% copy from scribo/scribo/primitive/group/from_double_link.hh copy to scribo/scribo/primitive/group/from_double_link_any.hh index 3af395d..b3bd82a 100644 --- a/scribo/scribo/primitive/group/from_double_link.hh +++ b/scribo/scribo/primitive/group/from_double_link_any.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH -# define SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH +#ifndef SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH +# define SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH /// \file @@ -46,7 +45,6 @@ # include <scribo/core/object_groups.hh> # include <scribo/core/component_set.hh> # include <scribo/primitive/internal/find_root.hh> -# include <scribo/primitive/internal/is_link_valid.hh> namespace scribo @@ -59,10 +57,8 @@ namespace scribo { /*! Group components from left and right links information and - validate These links. A link must exist in both ways to be - validated. + validate These links. - \param[in] components A component set. \param[in] left_link The left neighbor of each line of text. \param[in] right_link The right neighbor of each line of text. @@ -70,8 +66,8 @@ namespace scribo */ template <typename L> object_groups<L> - from_double_link(const object_links<L>& left_link, - const object_links<L>& right_link); + from_double_link_any(const object_links<L>& left_link, + const object_links<L>& right_link); @@ -81,34 +77,44 @@ namespace scribo template <typename L> inline object_groups<L> - from_double_link(const object_links<L>& left_link, - const object_links<L>& right_link) + from_double_link_any(const object_links<L>& left_link, + const object_links<L>& right_link) { - trace::entering("scribo::primitive::group::from_double_link"); - - mln_precondition(left_link.nelements() == right_link.nelements()); - + trace::entering("scribo::primitive::group::from_double_link_any"); object_groups<L> parent(left_link); parent.init(); + for_all_comps(i, left_link.components()) { - mln::util::couple<bool, unsigned> - nbh = internal::is_link_valid(left_link, right_link, i); - if (nbh.first()) + unsigned + pi = internal::find_root(parent, i), + pli = internal::find_root(parent, left_link(i)); + + if (pi != pli) + { + if (pli < pi) + parent(pli) = pi; + else + parent(pi) = pli; + } + + pi = internal::find_root(parent, i); + unsigned pri = internal::find_root(parent, right_link(i)); + + if (pi != pri) { - unsigned par = internal::find_root(parent, nbh.second()); - if (par < i) - parent(par) = i; + if (pri < pi) + parent(pri) = pi; else - parent(i) = par; + parent(pi) = pri; } } - for (unsigned i = parent.nelements() - 1; i < parent.nelements(); --i) - parent(i) = parent(parent(i)); + for_all_groups(g, parent) + internal::find_root(parent, g); - trace::exiting("scribo::primitive::group::from_double_link"); + trace::exiting("scribo::primitive::group::from_double_link_any"); return parent; } @@ -122,4 +128,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_HH +#endif // ! SCRIBO_PRIMITIVE_GROUP_FROM_DOUBLE_LINK_ANY_HH -- 1.5.6.5

1 0

last-svn-commit-659-g7ae09a2 scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 5 + ...> with_single_right_link_dmax_ratio_aligned.hh} | 165 +++++++++++++------- 2 files changed, 114 insertions(+), 56 deletions(-) copy scribo/scribo/primitive/link/{with_single_right_link_dmax_ratio.hh => with_single_right_link_dmax_ratio_aligned.hh} (52%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8895733..d04b792 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: + New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve text_in_picture_neg. * scribo/toolchain/text_in_picture.hh: Remove useless argument. diff --git a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh similarity index 52% copy from scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh copy to scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh index 03e2840..feba5f2 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh @@ -24,8 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH -# define SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH +#ifndef SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH +# define SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH /// \file /// @@ -44,11 +44,13 @@ # include <scribo/core/component_set.hh> # include <scribo/core/object_links.hh> +# include <scribo/primitive/link/internal/dmax_default.hh> # include <scribo/primitive/link/internal/find_link.hh> # include <scribo/primitive/link/internal/link_single_dmax_ratio_base.hh> # include <scribo/primitive/link/compute.hh> -# include <scribo/primitive/link/internal/dmax_default.hh> + +# include <scribo/filter/internal/component_aligned.hh> namespace scribo @@ -63,40 +65,38 @@ namespace scribo /*! \brief Link objects with their right neighbor if exists. \param[in] components A component set. + \param[in] dmax_ratio Size ratio defining the maximum lookup + distance. \param[in] anchor Starting point for the neighbor lookup. - \param[in] dmax_f DMax functor defining the maximum lookup - distance. \return Object links data. - Look for a neighbor until a maximum distance is reached. The - maximum distance is defined thanks to a functor \p dmax_f. - */ - template <typename L, typename F> - inline - object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - const DMax_Functor<F>& dmax_f, - anchor::Type anchor); + Look for a neighbor until a maximum distance defined by : + dmax = w / 2 + dmax_ratio * max(h, w) - /// \overload - /// \p dmax_f is set to internal::dmax_default. + where w is the bounding box width and h the bounding box height. + + */ template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio, - anchor::Type anchor); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle, + anchor::Type anchor); /// \overload /// anchor is set to MassCenter. template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle); /// \overload @@ -105,7 +105,8 @@ namespace scribo template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components); @@ -118,20 +119,33 @@ namespace scribo // Functor template <typename L, typename F> - class single_right_dmax_ratio_functor + class single_right_dmax_ratio_aligned_functor : public link_single_dmax_ratio_base<L, F, - single_right_dmax_ratio_functor<L,F> > + single_right_dmax_ratio_aligned_functor<L,F> > { - typedef single_right_dmax_ratio_functor<L, F> self_t; + typedef single_right_dmax_ratio_aligned_functor<L,F> self_t; typedef link_single_dmax_ratio_base<L, F, self_t> super_; public: typedef mln_site(L) P; - single_right_dmax_ratio_functor(const component_set<L>& components, - const DMax_Functor<F>& dmax_f) - : super_(components, anchor::Horizontal, exact(dmax_f)) + single_right_dmax_ratio_aligned_functor( + const component_set<L>& components, + const DMax_Functor<F>& dmax_f, + float min_angle, + float max_angle, + anchor::Type anchor_) + : super_(components, exact(dmax_f), anchor::Horizontal), + anchor(anchor_) { + std::cout << "min_angle = " << min_angle + << " - max_angle = " << max_angle + << std::endl; + std::cout << "min_angle_rad = " << min_alpha_rad + << " - max_angle_rad = " << max_alpha_rad + << std::endl; + min_alpha_rad = (min_angle / 180.0f) * math::pi; + max_alpha_rad = (max_angle / 180.0f) * math::pi; } void compute_next_site_(P& p) @@ -139,6 +153,49 @@ namespace scribo ++p.col(); } + + inline + bool + valid_link_(unsigned current_object, + const P& start_point, + const P& p) + { + bool super_b = super_::valid_link_(current_object, + start_point, p); + + // Distance between the two components. + float dist = math::abs(p[this->direction_] - start_point[this->direction_]); + + + unsigned ldist = this->components_(current_object).bbox().width() / 2; + + + // Components are really close, so the angle is more permissive. + if (dist < (ldist + ldist * 0.2)) + { + return super_b + && + filter::internal::component_aligned_rad(this->components_, + current_object, + this->labeled_image_(p), + anchor, + max_alpha_rad); + } + + + // Components are really far, so the angle is less permissive. + return super_b + && filter::internal::component_aligned_rad(this->components_, + current_object, + this->labeled_image_(p), + anchor, + min_alpha_rad); + } + + float min_alpha_rad; + float max_alpha_rad; + anchor::Type anchor; + }; } // end of namespace scribo::primitive::link::internal @@ -151,56 +208,52 @@ namespace scribo template <typename L, typename F> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - const DMax_Functor<F>& dmax_f, - anchor::Type anchor) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + const DMax_Functor<F>& dmax_f, + float min_angle, float max_angle, + anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio"); + trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); mln_precondition(components.is_valid()); - internal::single_right_dmax_ratio_functor<L, F> - functor(components, dmax_f); + internal::single_right_dmax_ratio_aligned_functor<L,F> + functor(components, dmax_f, min_angle, max_angle, anchor); object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio"); + trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); return output; } - template <typename L> - inline - object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio, - anchor::Type anchor) - { - return - with_single_right_link_dmax_ratio(components, - internal::dmax_default(dmax_ratio), - anchor); - } - template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle) { - return with_single_right_link_dmax_ratio(components, - dmax_ratio, - anchor::MassCenter); + return + with_single_right_link_dmax_ratio_aligned(components, + internal::dmax_default(dmax_ratio), + min_angle, + max_angle, + anchor::MassCenter); } template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components) { - return with_single_right_link_dmax_ratio(components, 3); + return + with_single_right_link_dmax_ratio_aligned(components, 3, 3, 10); } @@ -212,4 +265,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH +#endif // ! SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH -- 1.5.6.5

1 0

last-svn-commit-658-g0fb69c9 scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 5 + ...> with_single_right_link_dmax_ratio_aligned.hh} | 165 +++++++++++++------- 2 files changed, 114 insertions(+), 56 deletions(-) copy scribo/scribo/primitive/link/{with_single_right_link_dmax_ratio.hh => with_single_right_link_dmax_ratio_aligned.hh} (52%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 94d5955..58ff670 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: + New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve text_in_picture_neg. * scribo/toolchain/text_in_picture.hh: Remove useless argument. diff --git a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh similarity index 52% copy from scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh copy to scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh index 03e2840..feba5f2 100644 --- a/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio.hh +++ b/scribo/scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh @@ -24,8 +24,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH -# define SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH +#ifndef SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH +# define SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH /// \file /// @@ -44,11 +44,13 @@ # include <scribo/core/component_set.hh> # include <scribo/core/object_links.hh> +# include <scribo/primitive/link/internal/dmax_default.hh> # include <scribo/primitive/link/internal/find_link.hh> # include <scribo/primitive/link/internal/link_single_dmax_ratio_base.hh> # include <scribo/primitive/link/compute.hh> -# include <scribo/primitive/link/internal/dmax_default.hh> + +# include <scribo/filter/internal/component_aligned.hh> namespace scribo @@ -63,40 +65,38 @@ namespace scribo /*! \brief Link objects with their right neighbor if exists. \param[in] components A component set. + \param[in] dmax_ratio Size ratio defining the maximum lookup + distance. \param[in] anchor Starting point for the neighbor lookup. - \param[in] dmax_f DMax functor defining the maximum lookup - distance. \return Object links data. - Look for a neighbor until a maximum distance is reached. The - maximum distance is defined thanks to a functor \p dmax_f. - */ - template <typename L, typename F> - inline - object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - const DMax_Functor<F>& dmax_f, - anchor::Type anchor); + Look for a neighbor until a maximum distance defined by : + dmax = w / 2 + dmax_ratio * max(h, w) - /// \overload - /// \p dmax_f is set to internal::dmax_default. + where w is the bounding box width and h the bounding box height. + + */ template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio, - anchor::Type anchor); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle, + anchor::Type anchor); /// \overload /// anchor is set to MassCenter. template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle); /// \overload @@ -105,7 +105,8 @@ namespace scribo template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components); + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components); @@ -118,20 +119,33 @@ namespace scribo // Functor template <typename L, typename F> - class single_right_dmax_ratio_functor + class single_right_dmax_ratio_aligned_functor : public link_single_dmax_ratio_base<L, F, - single_right_dmax_ratio_functor<L,F> > + single_right_dmax_ratio_aligned_functor<L,F> > { - typedef single_right_dmax_ratio_functor<L, F> self_t; + typedef single_right_dmax_ratio_aligned_functor<L,F> self_t; typedef link_single_dmax_ratio_base<L, F, self_t> super_; public: typedef mln_site(L) P; - single_right_dmax_ratio_functor(const component_set<L>& components, - const DMax_Functor<F>& dmax_f) - : super_(components, anchor::Horizontal, exact(dmax_f)) + single_right_dmax_ratio_aligned_functor( + const component_set<L>& components, + const DMax_Functor<F>& dmax_f, + float min_angle, + float max_angle, + anchor::Type anchor_) + : super_(components, exact(dmax_f), anchor::Horizontal), + anchor(anchor_) { + std::cout << "min_angle = " << min_angle + << " - max_angle = " << max_angle + << std::endl; + std::cout << "min_angle_rad = " << min_alpha_rad + << " - max_angle_rad = " << max_alpha_rad + << std::endl; + min_alpha_rad = (min_angle / 180.0f) * math::pi; + max_alpha_rad = (max_angle / 180.0f) * math::pi; } void compute_next_site_(P& p) @@ -139,6 +153,49 @@ namespace scribo ++p.col(); } + + inline + bool + valid_link_(unsigned current_object, + const P& start_point, + const P& p) + { + bool super_b = super_::valid_link_(current_object, + start_point, p); + + // Distance between the two components. + float dist = math::abs(p[this->direction_] - start_point[this->direction_]); + + + unsigned ldist = this->components_(current_object).bbox().width() / 2; + + + // Components are really close, so the angle is more permissive. + if (dist < (ldist + ldist * 0.2)) + { + return super_b + && + filter::internal::component_aligned_rad(this->components_, + current_object, + this->labeled_image_(p), + anchor, + max_alpha_rad); + } + + + // Components are really far, so the angle is less permissive. + return super_b + && filter::internal::component_aligned_rad(this->components_, + current_object, + this->labeled_image_(p), + anchor, + min_alpha_rad); + } + + float min_alpha_rad; + float max_alpha_rad; + anchor::Type anchor; + }; } // end of namespace scribo::primitive::link::internal @@ -151,56 +208,52 @@ namespace scribo template <typename L, typename F> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - const DMax_Functor<F>& dmax_f, - anchor::Type anchor) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + const DMax_Functor<F>& dmax_f, + float min_angle, float max_angle, + anchor::Type anchor) { - trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio"); + trace::entering("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); mln_precondition(components.is_valid()); - internal::single_right_dmax_ratio_functor<L, F> - functor(components, dmax_f); + internal::single_right_dmax_ratio_aligned_functor<L,F> + functor(components, dmax_f, min_angle, max_angle, anchor); object_links<L> output = compute(functor, anchor); - trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio"); + trace::exiting("scribo::primitive::link::with_single_right_link_dmax_ratio_aligned"); return output; } - template <typename L> - inline - object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio, - anchor::Type anchor) - { - return - with_single_right_link_dmax_ratio(components, - internal::dmax_default(dmax_ratio), - anchor); - } - template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components, - float dmax_ratio) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components, + float dmax_ratio, + float min_angle, float max_angle) { - return with_single_right_link_dmax_ratio(components, - dmax_ratio, - anchor::MassCenter); + return + with_single_right_link_dmax_ratio_aligned(components, + internal::dmax_default(dmax_ratio), + min_angle, + max_angle, + anchor::MassCenter); } template <typename L> inline object_links<L> - with_single_right_link_dmax_ratio(const component_set<L>& components) + with_single_right_link_dmax_ratio_aligned( + const component_set<L>& components) { - return with_single_right_link_dmax_ratio(components, 3); + return + with_single_right_link_dmax_ratio_aligned(components, 3, 3, 10); } @@ -212,4 +265,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_HH +#endif // ! SCRIBO_PRIMITIVE_LINK_WITH_SINGLE_RIGHT_LINK_DMAX_RATIO_ALIGNED_HH -- 1.5.6.5

1 0