Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: olena-2.0-596-g34062af Document extended and transformed_image morphers.

by Guillaume Lazzara

* doc/examples-outputs.mk, * doc/examples.mk, * doc/outputs.mk: Regen. * doc/examples.dox: Add link to new examples. * doc/outputs/extended_image.txt, * doc/outputs/transformed_image.txt, * doc/examples/extended_image.cc, * doc/examples/transformed_image.cc: New. * doc/programs-examples.mk: Add new example programs. * mln/core/image/dmorph/extended.hh, * mln/core/image/dmorph/transformed_image.hh: Write documentation and insert example code. * mln/fun/p2p/fold.hh, * mln/fun/p2p/mirror.hh, * mln/fun/p2p/translation.hh: Make references to transformed_image. --- milena/ChangeLog | 26 ++++++++++ milena/doc/examples-outputs.mk | 36 ++++++++++++++ milena/doc/examples.dox | 5 ++ milena/doc/examples.mk | 2 + milena/doc/examples/extended_image.cc | 51 ++++++++++++++++++++ milena/doc/examples/transformed_image.cc | 31 ++++++++++++ milena/doc/outputs.mk | 2 + ...-right-instantiation.txt => extended_image.txt} | 0 ...ght-instantiation.txt => transformed_image.txt} | 0 milena/doc/programs-examples.mk | 7 ++- milena/mln/core/image/dmorph/extended.hh | 41 ++++++++++++++-- milena/mln/core/image/dmorph/transformed_image.hh | 33 +++++++++++-- milena/mln/fun/p2p/fold.hh | 2 +- milena/mln/fun/p2p/mirror.hh | 2 +- milena/mln/fun/p2p/translation.hh | 8 +++- 15 files changed, 234 insertions(+), 12 deletions(-) create mode 100644 milena/doc/examples/extended_image.cc create mode 100644 milena/doc/examples/transformed_image.cc copy milena/doc/outputs/{accu-right-instantiation.txt => extended_image.txt} (100%) copy milena/doc/outputs/{accu-right-instantiation.txt => transformed_image.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9cca6a5..90c97df 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Document extended and transformed_image morphers. + + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk: Regen. + + * doc/examples.dox: Add link to new examples. + + * doc/outputs/extended_image.txt, + * doc/outputs/transformed_image.txt, + * doc/examples/extended_image.cc, + * doc/examples/transformed_image.cc: New. + + * doc/programs-examples.mk: Add new example programs. + + * mln/core/image/dmorph/extended.hh, + * mln/core/image/dmorph/transformed_image.hh: Write documentation + and insert example code. + + * mln/fun/p2p/fold.hh, + * mln/fun/p2p/mirror.hh, + * mln/fun/p2p/translation.hh: Make references to + transformed_image. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/site_set/box.hh: Add shrink() and to_smaller() members. 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 51bba63..1136c55 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -127,6 +127,24 @@ $(srcdir)/outputs/extend.txt: $(srcdir)/examples/extend.stamp fi +$(srcdir)/examples/extended_image.stamp: examples/extended_image.cc + @rm -f $@.tmp + @touch $@.tmp + $(MAKE) $(AM_MAKEFLAGS) extended_image$(EXEEXT) + ./extended_image$(EXEEXT) >$(srcdir)/outputs/extended_image.txt.tmp + mv $(srcdir)/outputs/extended_image.txt.tmp $(srcdir)/outputs/extended_image.txt + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/extended_image.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/extended_image.stamp + +$(srcdir)/outputs/extended_image.txt: $(srcdir)/examples/extended_image.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + $(srcdir)/examples/extension-ignore.stamp: examples/extension-ignore.cc @rm -f $@.tmp @touch $@.tmp @@ -703,6 +721,24 @@ $(srcdir)/outputs/predicate-1.txt: $(srcdir)/examples/predicate-1.stamp fi +$(srcdir)/examples/transformed_image.stamp: examples/transformed_image.cc + @rm -f $@.tmp + @touch $@.tmp + $(MAKE) $(AM_MAKEFLAGS) transformed_image$(EXEEXT) + ./transformed_image$(EXEEXT) >$(srcdir)/outputs/transformed_image.txt.tmp + mv $(srcdir)/outputs/transformed_image.txt.tmp $(srcdir)/outputs/transformed_image.txt + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/transformed_image.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/transformed_image.stamp + +$(srcdir)/outputs/transformed_image.txt: $(srcdir)/examples/transformed_image.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + $(srcdir)/examples/tuto2_first_image.stamp: examples/tuto2_first_image.cc @rm -f $@.tmp @touch $@.tmp diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index ab18c38..1acb132 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -8,7 +8,12 @@ \li \link demos/inter_pixel/inter_pixel.cc Inter-pixel processings \endlink +\section examplesmorpher Image Morphers +\li \link doc/examples/transformed_image.cc Image domain translation. \endlink +\li \link doc/examples/extended_image.cc Image domain extension/shrinking. \endlink + \section examplesgraph Graphs \li \link demos/graph/region_adjacency_graph.cc Region Adjacency Graph \endlink + */ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index c6542e4..12b9419 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -8,6 +8,7 @@ EXAMPLES = \ $(srcdir)/examples/dpoint-1.cc \ $(srcdir)/examples/estim-sites.cc \ $(srcdir)/examples/extend.cc \ + $(srcdir)/examples/extended_image.cc \ $(srcdir)/examples/extension-ignore.cc \ $(srcdir)/examples/fill-call-1.cc \ $(srcdir)/examples/fill-imageif-cfun.cc \ @@ -40,6 +41,7 @@ EXAMPLES = \ $(srcdir)/examples/paste.cc \ $(srcdir)/examples/point-1.cc \ $(srcdir)/examples/predicate-1.cc \ + $(srcdir)/examples/transformed_image.cc \ $(srcdir)/examples/trash/accu.cc \ $(srcdir)/examples/trash/box.cc \ $(srcdir)/examples/trash/cpp_issue.cc \ diff --git a/milena/doc/examples/extended_image.cc b/milena/doc/examples/extended_image.cc new file mode 100644 index 0000000..ed089f9 --- /dev/null +++ b/milena/doc/examples/extended_image.cc @@ -0,0 +1,51 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/extended.hh> +#include <mln/fun/p2p/translation.hh> + +int main() +{ + using namespace mln; + +//! [Input initialization] + /* + (-3,-3)--------. + | | + |(0,0)----. | + | | |---------> Effective domain + | .-----(3,3) + | |----> Image border (3 pixels, by default) + .----------(6,6) + */ + typedef mln::image2d<bool> I; + I ima(4, 4); +//! [Input initialization] + +//! [Shrink image domain] + mln::box2d b_shrink = ima.domain().to_smaller(1); + /* + (-3,-3)--------. + | | + |(1,1)----. | + | | |---------> Effective domain + | .-----(2,2) + | |----> Image border (4 pixels) + .----------(6,6) + */ + mln::extended ima_shrink = mln::extended_to(ima, b_shrink); +//! [Shrink image domain] + +//! [Extend image domain] + mln::box2d b_extend = ima.domain().to_larger(1); + /* + (-3,-3)--------. + | | + (-1,-1)---. | + | | |---------> Effective domain + | .-----(4,4) + | |----> Image border (2 pixels) + .----------(6,6) + */ + mln::extended ima_extend = mln::extended_to(ima, b_extend); +//! [Extend image domain] + +} diff --git a/milena/doc/examples/transformed_image.cc b/milena/doc/examples/transformed_image.cc new file mode 100644 index 0000000..f4302d3 --- /dev/null +++ b/milena/doc/examples/transformed_image.cc @@ -0,0 +1,31 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/dmorph/transformed_image.hh> +#include <mln/fun/p2p/translation.hh> + +int main() +{ + using namespace mln; + +//! [Translate image domain] + /* + (0,0)----. + | | + .-----(2,2) + */ + typedef mln::image2d<bool> I; + I ima(3, 3); + + // Translation delta-point of row+2 and col-1. + mln::dpoint2d translate_dp(+2, -1); + typedef mln::fun::p2p::translation_t<point2d> F; + F translate_fun(translate_dp); + + /* + (2,-1)---. + | | + .-----(4,1) + */ + mln::transformed_image<I,F> + ext_ima = mln::transform_domain(ima, translate_fun); +//! [Translate image domain] +} diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 383f95a..40fa6c3 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -8,6 +8,7 @@ OUTPUTS = \ $(srcdir)/outputs/dpoint-1.txt \ $(srcdir)/outputs/estim-sites.txt \ $(srcdir)/outputs/extend.txt \ + $(srcdir)/outputs/extended_image.txt \ $(srcdir)/outputs/extension-ignore.txt \ $(srcdir)/outputs/fill-call-1.txt \ $(srcdir)/outputs/fill-imageif-cfun.txt \ @@ -40,6 +41,7 @@ OUTPUTS = \ $(srcdir)/outputs/paste.txt \ $(srcdir)/outputs/point-1.txt \ $(srcdir)/outputs/predicate-1.txt \ + $(srcdir)/outputs/transformed_image.txt \ $(srcdir)/outputs/tuto2_first_image.txt \ $(srcdir)/outputs/tuto3_colorize.txt \ $(srcdir)/outputs/tuto3_first_routine.txt \ diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/extended_image.txt similarity index 100% copy from milena/doc/outputs/accu-right-instantiation.txt copy to milena/doc/outputs/extended_image.txt diff --git a/milena/doc/outputs/accu-right-instantiation.txt b/milena/doc/outputs/transformed_image.txt similarity index 100% copy from milena/doc/outputs/accu-right-instantiation.txt copy to milena/doc/outputs/transformed_image.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 6a81b02..42610c4 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -1,6 +1,7 @@ ## Program as examples, generating images & outputs. -*- Makefile-Automake -*- -## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## Copyright (C) 2010, 2013 EPITA Research and Development Laboratory +## (LRDE). ## ## This file is part of Olena. ## @@ -32,6 +33,7 @@ PROGRAMS_examples = \ dpoint-1 \ estim-sites \ extend \ + extended_image \ extension-ignore \ fill \ fill-call-1 \ @@ -64,6 +66,7 @@ PROGRAMS_examples = \ paste-call-1 \ point-1 \ predicate-1 \ + transformed_image \ win-create-1 \ win-create-2 @@ -96,6 +99,7 @@ domain_display_SOURCES = examples/domain-display.cc dpoint_1_SOURCES = examples/dpoint-1.cc estim_sites_SOURCES = examples/estim-sites.cc extend_SOURCES = examples/extend.cc +extended_image_SOURCES = examples/extended_image.cc extension_ignore_SOURCES = examples/extension-ignore.cc fill_SOURCES = examples/fill.cc fill_call_1_SOURCES = examples/fill-call-1.cc @@ -128,6 +132,7 @@ paste_SOURCES = examples/paste.cc paste_call_1_SOURCES = examples/paste-call-1.cc point_1_SOURCES = examples/point-1.cc predicate_1_SOURCES = examples/predicate-1.cc +transformed_image_SOURCES = examples/transformed_image.cc win_create_1_SOURCES = examples/win-create-1.cc win_create_2_SOURCES = examples/win-create-2.cc diff --git a/milena/mln/core/image/dmorph/extended.hh b/milena/mln/core/image/dmorph/extended.hh index 0864b10..00d7823 100644 --- a/milena/mln/core/image/dmorph/extended.hh +++ b/milena/mln/core/image/dmorph/extended.hh @@ -86,11 +86,28 @@ namespace mln } // end of namespace mln::trait + /*! \brief An image of which domain is extended/shrunk. - /// Makes an image become restricted by a point set. - /// - /// \ingroup modimagedomainmorpher - // + This morpher can be used to alter the current domain of an image + by extending or shrinking the existing domain. + + \warning Altering the domain may require that values are available + for every sites. While extending outside the original domain, this + routine relies on the image border. Therefore, be sure it is large + enough to handle the new domain. + + Input used in the following example: + \snippet extended_image.cc Input initialization + + Example on how to extend the domain: + \snippet extended_image.cc Extend image domain + + Example on how to shrink the domain: + \snippet extended_image.cc Extend image domain + + \sa extended_to mln::extend mln::extension_ima mln::extension_fun mln::extension_val + \ingroup modimagedomainmorpher + */ template <typename I> struct extended : public internal::image_domain_morpher< I, box<mln_site(I)>, @@ -126,10 +143,26 @@ namespace mln /// \endcond + /*! + \brief Creates an extended image. + + This routine is provided for convenience and can be considered as + a "factory" of mln::extended image. + + \relates mln::extended + */ template <typename I, typename B> extended<const I> extended_to(const Image& ima, const Box& b); + /*! + \brief Creates an extended image. + + This routine is provided for convenience and can be considered as + a "factory" of mln::extended images. + + \relates mln::extended + */ template <typename I, typename B> extended extended_to(Image& ima, const Box& b); diff --git a/milena/mln/core/image/dmorph/transformed_image.hh b/milena/mln/core/image/dmorph/transformed_image.hh index d2bee12..95ec6bc 100644 --- a/milena/mln/core/image/dmorph/transformed_image.hh +++ b/milena/mln/core/image/dmorph/transformed_image.hh @@ -89,11 +89,20 @@ namespace mln } // end of namespace mln::trait + /*! \brief An image of which domain is transformed by a function. - /// Image having its domain restricted by a site set. - /// - /// \ingroup modimagedomainmorpher - // + This morpher can be used to modify the image domain through a + function. + + This morpher expects the actual transformation for construction + but uses internally the inverted transformation. + + Example (\link transformed_image.cc \endlink): + \snippet transformed_image.cc Translate image domain + + \sa mln::transform_domain fun::p2p::translation_t fun::p2p::mirror fun::p2p::fold + \ingroup modimagedomainmorpher + */ template <typename I, typename F> struct transformed_image : public internal::image_domain_morpher< I, p_transformed< mln_domain(I), F>, @@ -134,10 +143,26 @@ namespace mln // Morpher creation. + /*! + \brief Creates a transformed image. + + This routine is provided for convenience and can be considered as + a "factory" of mln::transformed_image images. + + \relates transformed_image + */ template <typename I, typename F> transformed_image<const I, F> transform_domain(const Image& ima, const Function_v2v<F>& f); + /*! + \brief Creates a transformed image. + + This routine is provided for convenience and can be considered as + a "factory" of mln::transformed_image images. + + \relates transformed_image + */ template <typename I, typename F> transformed_image<I, F> transform_domain(Image& ima, const Function_v2v<F>& f); diff --git a/milena/mln/fun/p2p/fold.hh b/milena/mln/fun/p2p/fold.hh index 5f0e4f4..814c4d2 100644 --- a/milena/mln/fun/p2p/fold.hh +++ b/milena/mln/fun/p2p/fold.hh @@ -47,7 +47,7 @@ namespace mln /*! \brief Fold a domain into one direction. - \sa data::transform + \sa data::transform mln::transformed_image \ingroup funv2v */ template < typename P, diff --git a/milena/mln/fun/p2p/mirror.hh b/milena/mln/fun/p2p/mirror.hh index 7f307dc..2c6bfe9 100644 --- a/milena/mln/fun/p2p/mirror.hh +++ b/milena/mln/fun/p2p/mirror.hh @@ -63,7 +63,7 @@ namespace mln // p == (0, 1); \endcode - \sa data::transform + \sa data::transform mln::transformed_image \ingroup funv2v */ template <typename B> diff --git a/milena/mln/fun/p2p/translation.hh b/milena/mln/fun/p2p/translation.hh index c122cfd..69ef48b 100644 --- a/milena/mln/fun/p2p/translation.hh +++ b/milena/mln/fun/p2p/translation.hh @@ -49,7 +49,7 @@ namespace mln \brief Computes the translation of a given point w.r.t a translation vector. - \sa data::transform + \sa data::transform mln::transformed_image \ingroup funv2v */ template <typename P> @@ -68,6 +68,12 @@ namespace mln }; + /*! + \brief Creates a translation function. + + \relates mln::fun::p2p::translation_t + \ingroup funv2v + */ template <typename D> translation_t<mln_site(D)> translation(const Gdpoint<D>& dp); -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-595-gdaec0fb mln/core/site_set/box.hh: Add shrink() and to_smaller() members.

by Guillaume Lazzara

--- milena/ChangeLog | 4 +++ milena/mln/core/site_set/box.hh | 51 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a303bb5..9cca6a5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/site_set/box.hh: Add shrink() and to_smaller() members. + +2013-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a module related to literals. * doc/mln/literal/literal.dox: New. diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index aaaa8c3..3f0b71b 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -144,6 +144,15 @@ namespace mln /// Give a larger box. box to_larger(unsigned b) const; + /// Shrink the box with a border \p b. + void shrink(unsigned b); + + /// Shrink the box with a border \p b for dimension \p dim. + void shrink(unsigned dim, unsigned b); + + /// Give a smaller box. + box to_smaller(unsigned b) const; + /// Return the approximated central site of this box. P pcenter() const; @@ -359,6 +368,31 @@ namespace mln template <typename P> inline + void + box::shrink(unsigned b) + { + mln_precondition(is_valid()); + for (unsigned i = 0; i < P::dim; ++i) + { + pmin_[i] = static_cast<mln_coord(P)>(pmin_[i] + b); + pmax_[i] = static_cast<mln_coord(P)>(pmax_[i] - b); + } + mln_postcondition(is_valid()); + } + + template <typename P> + inline + void + box::shrink(unsigned dim, unsigned b) + { + mln_precondition(is_valid()); + pmin_[dim] = static_cast<mln_coord(P)>(pmin_[dim] + b); + pmax_[dim] = static_cast<mln_coord(P)>(pmax_[dim] - b); + mln_postcondition(is_valid()); + } + + template <typename P> + inline box larger_than(const box a, const box b) { @@ -392,6 +426,23 @@ namespace mln template <typename P> inline + box + box::to_smaller(unsigned b) const + { + mln_precondition(is_valid()); + box tmp(*this); + + for (unsigned i = 0; i < P::dim; ++i) + { + tmp.pmin_[i] = static_cast<mln_coord(P)>(tmp.pmin_[i] + b); + tmp.pmax_[i] = static_cast<mln_coord(P)>(tmp.pmax_[i] - b); + } + mln_postcondition(tmp.is_valid()); + return tmp; + } + + template <typename P> + inline P box::pcenter() const { -- 1.7.2.5

11 years, 8 months

*****SPAM***** Manager de Secteur

by olena-patches＠lrde.epita.fr

------------------ Début de Rapport SpamAssassin --------------------- Ce message est probablement du SPAM (message non sollicité envoyé en masse, publicité, escroquerie...). Cette notice a été ajoutée par le système d'analyse "SpamAssassin" sur votre serveur de courrier "goa.lrde.epita.fr", pour vous aider à identifier ce type de messages. Le système SpamAssassin ajoute un en-tête "X-Spam-Flag: YES" aux messages qu'il considère comme étant probablement du Spam. Vous pouvez si vous le souhaitez utiliser cette caractéristique pour régler un filtre dans votre logiciel de lecture de courrier, afin de détruire ou de classer à part ce type de message. Si ce robot a classifié incorrectement un message qui vous était destiné, ou pour toute question, veuillez contacter l'administrateur du système par e-mail à the administrator of that system . Voir http://spamassassin.apache.org/tag/ pour plus de détails (en anglais). Détails de l'analyse du message: (19.6 points, 5.0 requis) 1.7 URIBL_DBL_SPAM Contains an URL listed in the DBL blocklist [URIs: googlejob-france.com] 1.6 URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist [URIs: googlejob-france.com] 3.5 BAYES_99 BODY: L'algorithme Bayésien a évalué la probabilité de spam entre 99 et 100% [score: 1.0000] 0.0 TVD_RCVD_IP TVD_RCVD_IP 3.3 RCVD_IN_PBL RBL: Received via a relay in Spamhaus PBL [190.193.216.67 listed in zen.spamhaus.org] 0.4 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL 0.8 RCVD_IN_SORBS_WEB RBL: SORBS: Envoyé depuis un serveur web vulnérable [190.193.216.67 listed in dnsbl.sorbs.net] 1.4 RCVD_IN_BRBL_LASTEXT RBL: RCVD_IN_BRBL_LASTEXT [190.193.216.67 listed in bb.barracudacentral.org] 1.7 URIBL_BLACK Contains an URL listed in the URIBL blacklist [URIs: googlejob-france.com] 0.0 HTML_MESSAGE BODY: HTML inclus dans le message 0.7 MIME_HTML_ONLY BODY: Le message possède uniquement des parties MIME text/html 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS 3.6 HELO_DYNAMIC_IPADDR2 Relay HELO'd using suspicious hostname (IP addr 2) 0.0 TO_EQ_FM_HTML_ONLY To == From and HTML only -------------------- Fin de Rapport SpamAssassin --------------------- Le message original n'étant pas au format text brut, il est peut-être dangereux de l'ouvrir avec votre logiciel e-mail ; en particulier il pourrait contenir un virus, ou confirmer à l'expéditeur que votre adresse e-mail est active, et peut recevoir du spam. Si vous voulez lire ce message, et n'êtes pas certain de la sécurité de votre logiciel e-mail, il est plus prudent d'enregistrer ce message sur votre disque dur, et de l'afficher ensuite avec un éditeur de texte.

11 years, 8 months

olena: branch exp/docstrum created: olena-2.0-557-g02182c3

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/docstrum has been created at 02182c373567abd50fb2d0874a1259777190046a (commit) - Log ----------------------------------------------------------------- 02182c3 NEWS: Introduce new Docstrum algorithm. 26d93b1 Regen auto-generated files. 0e474f0 doc/doc.bib: Add reference to Docstrum algorithm related article. 2a63684 mln/math/pi.hh: Make pi more precise. aef996f Add Docstrum document layout analysis algorithm. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena: olena-2.0-557-g02182c3 NEWS: Introduce new Docstrum algorithm.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ NEWS | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 941546d..4836189 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-05-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * NEWS: Introduce new Docstrum algorithm. + +2013-05-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/doc.bib: Add reference to Docstrum algorithm related article. diff --git a/NEWS b/NEWS index 26ce3c0..f0aa3fa 100644 --- a/NEWS +++ b/NEWS @@ -33,7 +33,7 @@ * Add support for Tesseract 3.02. - * Add the layout analysis algorithm XY-Cut. + * Add new layout analysis algorithms: XY-Cut, Docstrum. * Olena 2.0 September 16, 2011 -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-556-g26d93b1 Regen auto-generated files.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Here. --- scribo/ChangeLog | 7 +++++++ scribo/headers.mk | 16 ++++++++++++++++ scribo/tests/unit_test/unit-tests.mk | 16 ++++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 878d729..9919680 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-05-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen auto-generated files. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Here. + 2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> Add Docstrum document layout analysis algorithm. diff --git a/scribo/headers.mk b/scribo/headers.mk index 3160b85..7f22248 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -165,6 +165,22 @@ scribo/io/xml/internal/save_image_to_xml.hh \ scribo/io/xml/internal/time_info.hh \ scribo/io/xml/load.hh \ scribo/io/xml/save.hh \ +scribo/layout/docstrum.hh \ +scribo/layout/internal/docstrum/all.hh \ +scribo/layout/internal/docstrum/bbox2d.hh \ +scribo/layout/internal/docstrum/between_closure.hh \ +scribo/layout/internal/docstrum/components_size.hh \ +scribo/layout/internal/docstrum/distances.hh \ +scribo/layout/internal/docstrum/extract_lines.hh \ +scribo/layout/internal/docstrum/extract_paragraphs.hh \ +scribo/layout/internal/docstrum/kd_hyperrect.hh \ +scribo/layout/internal/docstrum/kd_node.hh \ +scribo/layout/internal/docstrum/kd_tree.hh \ +scribo/layout/internal/docstrum/labeling.hh \ +scribo/layout/internal/docstrum/line.hh \ +scribo/layout/internal/docstrum/nearest_neighbors.hh \ +scribo/layout/internal/docstrum/paragraph.hh \ +scribo/layout/internal/docstrum/within_closure.hh \ scribo/layout/internal/hist_info.hh \ scribo/layout/internal/node.hh \ scribo/layout/xy_cut.hh \ diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 38946e1..2bfd64b 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -322,6 +322,22 @@ scribo_io_xml_internal_compute_text_colour \ scribo_io_xml_internal_print_box_coords \ scribo_io_xml_internal_print_image_coords \ scribo_io_xml_internal_time_info \ +scribo_layout_docstrum \ +scribo_layout_internal_docstrum_all \ +scribo_layout_internal_docstrum_bbox2d \ +scribo_layout_internal_docstrum_between_closure \ +scribo_layout_internal_docstrum_components_size \ +scribo_layout_internal_docstrum_distances \ +scribo_layout_internal_docstrum_extract_lines \ +scribo_layout_internal_docstrum_extract_paragraphs \ +scribo_layout_internal_docstrum_kd_hyperrect \ +scribo_layout_internal_docstrum_kd_node \ +scribo_layout_internal_docstrum_kd_tree \ +scribo_layout_internal_docstrum_labeling \ +scribo_layout_internal_docstrum_line \ +scribo_layout_internal_docstrum_nearest_neighbors \ +scribo_layout_internal_docstrum_paragraph \ +scribo_layout_internal_docstrum_within_closure \ scribo_layout_internal_hist_info \ scribo_layout_internal_node \ scribo_layout_xy_cut \ -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-555-g0e474f0 doc/doc.bib: Add reference to Docstrum algorithm related article.

by Guillaume Lazzara

--- ChangeLog | 5 +++++ doc/doc.bib | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..941546d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/doc.bib: Add reference to Docstrum algorithm related + article. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/doc/doc.bib b/doc/doc.bib index 2c04307..16aa4c2 100644 --- a/doc/doc.bib +++ b/doc/doc.bib @@ -73,4 +73,15 @@ pages={2373--2376}, year={2009}, organization={IEEE} +} + +@article{ogorman1993pami, + title={The document spectrum for page layout analysis}, + author={L. O'Gorman}, + journal={Pattern Analysis and Machine Intelligence, IEEE Transactions on}, + volume={15}, + number={11}, + pages={1162--1173}, + year={1993}, + publisher={IEEE} } \ No newline at end of file -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-554-g2a63684 mln/math/pi.hh: Make pi more precise.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/math/pi.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..1537e4d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-05-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/math/pi.hh: Make pi more precise. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/math/pi.hh b/milena/mln/math/pi.hh index b056bc6..2396fbb 100644 --- a/milena/mln/math/pi.hh +++ b/milena/mln/math/pi.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Copyright (C) 2009, 2010, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -43,7 +43,7 @@ namespace mln # ifndef MLN_WO_GLOBAL_VARS - const double pi = 3.1415926535897932385; + const double pi = 3.141592653589793238462; # endif // ! MLN_WO_GLOBAL_VARS -- 1.7.2.5

11 years, 8 months

olena: olena-2.0-553-gaef996f Add Docstrum document layout analysis algorithm.

by Guillaume Lazzara

* scribo/layout/docstrum.hh, * scribo/layout/internal/docstrum/all.hh, * scribo/layout/internal/docstrum/bbox2d.hh, * scribo/layout/internal/docstrum/between_closure.hh, * scribo/layout/internal/docstrum/components_size.hh, * scribo/layout/internal/docstrum/distances.hh, * scribo/layout/internal/docstrum/extract_lines.hh, * scribo/layout/internal/docstrum/extract_paragraphs.hh, * scribo/layout/internal/docstrum/kd_hyperrect.hh, * scribo/layout/internal/docstrum/kd_node.hh, * scribo/layout/internal/docstrum/kd_tree.hh, * scribo/layout/internal/docstrum/labeling.hh, * scribo/layout/internal/docstrum/line.hh, * scribo/layout/internal/docstrum/nearest_neighbors.hh, * scribo/layout/internal/docstrum/paragraph.hh, * scribo/layout/internal/docstrum/within_closure.hh, * tests/layout/docstrum-line.pgm, * tests/layout/docstrum-paragraph.pgm, * tests/layout/docstrum.cc: New. * tests/layout/Makefile.am: New target and extra dist files. --- scribo/ChangeLog | 26 ++ scribo/scribo/layout/docstrum.hh | 256 +++++++++++ scribo/scribo/layout/internal/docstrum/all.hh | 43 ++ scribo/scribo/layout/internal/docstrum/bbox2d.hh | 161 +++++++ .../layout/internal/docstrum/between_closure.hh | 353 +++++++++++++++ .../layout/internal/docstrum/components_size.hh | 181 ++++++++ .../scribo/layout/internal/docstrum/distances.hh | 167 +++++++ .../layout/internal/docstrum/extract_lines.hh | 128 ++++++ .../layout/internal/docstrum/extract_paragraphs.hh | 116 +++++ .../layout/internal/docstrum/kd_hyperrect.hh | 210 +++++++++ scribo/scribo/layout/internal/docstrum/kd_node.hh | 182 ++++++++ scribo/scribo/layout/internal/docstrum/kd_tree.hh | 472 ++++++++++++++++++++ scribo/scribo/layout/internal/docstrum/labeling.hh | 347 ++++++++++++++ scribo/scribo/layout/internal/docstrum/line.hh | 229 ++++++++++ .../layout/internal/docstrum/nearest_neighbors.hh | 265 +++++++++++ .../scribo/layout/internal/docstrum/paragraph.hh | 126 ++++++ .../layout/internal/docstrum/within_closure.hh | 175 ++++++++ scribo/tests/layout/Makefile.am | 11 +- scribo/tests/layout/docstrum-line.pgm | Bin 0 -> 3118 bytes scribo/tests/layout/docstrum-paragraph.pgm | Bin 0 -> 3118 bytes scribo/tests/layout/docstrum.cc | 64 +++ 21 files changed, 3509 insertions(+), 3 deletions(-) create mode 100644 scribo/scribo/layout/docstrum.hh create mode 100644 scribo/scribo/layout/internal/docstrum/all.hh create mode 100644 scribo/scribo/layout/internal/docstrum/bbox2d.hh create mode 100644 scribo/scribo/layout/internal/docstrum/between_closure.hh create mode 100644 scribo/scribo/layout/internal/docstrum/components_size.hh create mode 100644 scribo/scribo/layout/internal/docstrum/distances.hh create mode 100644 scribo/scribo/layout/internal/docstrum/extract_lines.hh create mode 100644 scribo/scribo/layout/internal/docstrum/extract_paragraphs.hh create mode 100644 scribo/scribo/layout/internal/docstrum/kd_hyperrect.hh create mode 100644 scribo/scribo/layout/internal/docstrum/kd_node.hh create mode 100644 scribo/scribo/layout/internal/docstrum/kd_tree.hh create mode 100644 scribo/scribo/layout/internal/docstrum/labeling.hh create mode 100644 scribo/scribo/layout/internal/docstrum/line.hh create mode 100644 scribo/scribo/layout/internal/docstrum/nearest_neighbors.hh create mode 100644 scribo/scribo/layout/internal/docstrum/paragraph.hh create mode 100644 scribo/scribo/layout/internal/docstrum/within_closure.hh create mode 100644 scribo/tests/layout/docstrum-line.pgm create mode 100644 scribo/tests/layout/docstrum-paragraph.pgm create mode 100644 scribo/tests/layout/docstrum.cc diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 90de65c..878d729 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,29 @@ +2013-05-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add Docstrum document layout analysis algorithm. + + * scribo/layout/docstrum.hh, + * scribo/layout/internal/docstrum/all.hh, + * scribo/layout/internal/docstrum/bbox2d.hh, + * scribo/layout/internal/docstrum/between_closure.hh, + * scribo/layout/internal/docstrum/components_size.hh, + * scribo/layout/internal/docstrum/distances.hh, + * scribo/layout/internal/docstrum/extract_lines.hh, + * scribo/layout/internal/docstrum/extract_paragraphs.hh, + * scribo/layout/internal/docstrum/kd_hyperrect.hh, + * scribo/layout/internal/docstrum/kd_node.hh, + * scribo/layout/internal/docstrum/kd_tree.hh, + * scribo/layout/internal/docstrum/labeling.hh, + * scribo/layout/internal/docstrum/line.hh, + * scribo/layout/internal/docstrum/nearest_neighbors.hh, + * scribo/layout/internal/docstrum/paragraph.hh, + * scribo/layout/internal/docstrum/within_closure.hh, + * tests/layout/docstrum-line.pgm, + * tests/layout/docstrum-paragraph.pgm, + * tests/layout/docstrum.cc: New. + + * tests/layout/Makefile.am: New target and extra dist files. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. diff --git a/scribo/scribo/layout/docstrum.hh b/scribo/scribo/layout/docstrum.hh new file mode 100644 index 0000000..8291861 --- /dev/null +++ b/scribo/scribo/layout/docstrum.hh @@ -0,0 +1,256 @@ +// Copyright (C) 2013 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 Docstrum layout analysis algorithm. + +#ifndef SCRIBO_LAYOUT_DOCSTRUM_HH +# define SCRIBO_LAYOUT_DOCSTRUM_HH + +#include <iostream> + +#include <mln/io/pbm/load.hh> +#include <mln/io/ppm/save.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/int_u8.hh> +#include <mln/util/timer.hh> +#include <mln/data/convert.hh> +#include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/core/image/image2d.hh> + + +#include <scribo/layout/internal/docstrum/all.hh> + +using namespace mln; + +namespace scribo +{ + + namespace layout + { + + using namespace mln; + + /*! + \brief Extraction type for Docstrum algorithm. + + Defines how the components should be grouped in Docstrum + algorithm. + + \sa scribo::docstrum + */ + enum docstrum_extraction_type + { + Line, ///< Group by lines + Paragraph ///< Group by paragraphs. + }; + + + /*! + \brief Docstrum layout analysis algorithm. + + \param[in] ima A binary 2D document image. + + \param[in] extraction_type how the components should be grouped + in results. + + \return An image of Paragraph or lines bounding boxes (w.r.t to + \p extraction_type). Small elements are set to 1 and large ones + to 2. + + This algorithm has been implemented w.r.t. the description in + paper \cite ogorman1993pami. + + \ingroup grpalgolayout + */ + template <typename I> + mln_ch_value(I,value::int_u8) + docstrum(const Image& ima, docstrum_extraction_type extraction_type); + + +# ifndef MLN_INCLUDE_ONLY + + using namespace scribo::layout::internal::docstrum; + + template <typename I> + mln_ch_value(I,value::int_u8) + docstrum(const Image& ima_, docstrum_extraction_type extraction_type) + { + mln_trace("scribo::layout::docstrum"); + + const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); + mln_precondition(extraction_type == Line + || extraction_type == Paragraph); + mlc_equal(mln_trait_image_kind(I), + mln::trait::image::kind::binary)::check(); + + //------------------------- + // Component labeling + //------------------------- + + std::vector<bbox2d> bbox_list; + image2d<unsigned> labeled_img(ima.domain()); + data::fill(labeled_img, 0); + unsigned nlabels = 0; + + component_labeling(ima, nlabels, bbox_list, labeled_img, 3); + + //------------------------- + // Separation in two groups + //------------------------- + + std::vector<bbox2d> small_comp; + std::vector<bbox2d> big_comp; + small_comp.reserve(nlabels / 2); + big_comp.reserve(nlabels / 2); + + compute_comp_size(bbox_list, small_comp, big_comp, 3.0f); + bbox_list.clear(); + + //------------------------- + // Extract lines from small components + //------------------------- + + std::vector<line> small_lines; + int small_within_distance = 0; + int small_between_distance = 0; + extract_lines(small_comp, small_lines, small_within_distance, + small_between_distance, math::pi / 6, math::pi / 6, 5); + + //------------------------- + // Extract lines from big components + //------------------------- + + std::vector<line> big_lines; + int big_within_distance = 0; + int big_between_distance = 0; + extract_lines(big_comp, big_lines, big_within_distance, + big_between_distance, math::pi / 6, math::pi / 6, 5); + + //------------------------- + // Extract paragraphs if requested + //------------------------- + + std::vector<paragraph> small_paragraphs; + std::vector<paragraph> big_paragraphs; + + if (extraction_type == Paragraph) + { + //------------------------- + // Extract paragraphs from small components + //------------------------- + + extract_paragraphs(small_lines, small_paragraphs, 1.5f * + small_within_distance, 1.3f * + small_between_distance, math::pi / 6); + + //------------------------- + // Extract paragraphs from big components + //------------------------- + + extract_paragraphs(big_lines, big_paragraphs, 1.5f * + big_within_distance, 2.0f * + small_between_distance, math::pi / 6); + } + + + //------------------------- + // Saving + //------------------------- + + mln_ch_value(I,value::int_u8) output(ima.domain()); + data::fill(output, literal::zero); + + if (extraction_type == Line) + { + { + const unsigned small_nlines = small_lines.size(); + + for (unsigned i = 0; i < small_nlines; ++i) + { + const bbox2d& b = small_lines[i].bbox(); + box2d box(b.pmin(), b.pmax()); + + draw::box(output, box, 1u); + } + } + + { + const unsigned big_nlines = big_lines.size(); + + for (unsigned i = 0; i < big_nlines; ++i) + { + const bbox2d& b = big_lines[i].bbox(); + box2d box(b.pmin(), b.pmax()); + + draw::box(output, box, 2u); + } + } + } + else if (extraction_type == Paragraph) + { + { + const unsigned small_nparas = small_paragraphs.size(); + + for (unsigned i = 0; i < small_nparas; ++i) + { + const bbox2d& b = small_paragraphs[i].bbox(); + box2d box(b.pmin(), b.pmax()); + + draw::box(output, box, 1u); + } + } + + { + const unsigned big_nparas = big_paragraphs.size(); + + for (unsigned i = 0; i < big_nparas; ++i) + { + const bbox2d& b = big_paragraphs[i].bbox(); + box2d box(b.pmin(), b.pmax()); + + draw::box(output, box, 2u); + } + } + } + else + { + mln_trace_warning("Invalid extraction type!"); + abort(); + } + + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_DOCSTRUM_HH diff --git a/scribo/scribo/layout/internal/docstrum/all.hh b/scribo/scribo/layout/internal/docstrum/all.hh new file mode 100644 index 0000000..0c83d1b --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/all.hh @@ -0,0 +1,43 @@ +// Copyright (C) 2013 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 Internal utilities related to Docstrum layout analysis +/// algorithm. + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_ALL_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_ALL_HH + +# include <scribo/layout/internal/docstrum/bbox2d.hh> +# include <scribo/layout/internal/docstrum/labeling.hh> +# include <scribo/layout/internal/docstrum/components_size.hh> +# include <scribo/layout/internal/docstrum/distances.hh> +# include <scribo/layout/internal/docstrum/line.hh> +# include <scribo/layout/internal/docstrum/paragraph.hh> +# include <scribo/layout/internal/docstrum/extract_lines.hh> +# include <scribo/layout/internal/docstrum/extract_paragraphs.hh> + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_ALL_HH diff --git a/scribo/scribo/layout/internal/docstrum/bbox2d.hh b/scribo/scribo/layout/internal/docstrum/bbox2d.hh new file mode 100644 index 0000000..13efc07 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/bbox2d.hh @@ -0,0 +1,161 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BBOX2D_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BBOX2D_HH + +# include <mln/core/alias/point2d.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + class bbox2d + { + public: + bbox2d(); + + bbox2d(const unsigned n, + const point2d& pmin, + const point2d& pmax); + + point2d& pmin(); + + const point2d& pmin() const; + + point2d& pmax(); + + const point2d& pmax() const; + + point2d pcenter() const; + + unsigned bbox_number() const; + + void set_bbox_number(const unsigned id); + + private: + unsigned n_; + point2d pmin_; + point2d pmax_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + //--------------------------- + // Bounding box 2D + //--------------------------- + + inline + bbox2d::bbox2d() + : n_(0), pmin_(point2d(0, 0)), pmax_(point2d(0, 0)) + { + } + + inline + bbox2d::bbox2d(const unsigned n, + const point2d& pmin, + const point2d& pmax) + : n_(n), pmin_(pmin), pmax_(pmax) + { + } + + inline + point2d& + bbox2d::pmin() + { + return pmin_; + } + + inline + const point2d& + bbox2d::pmin() const + { + return pmin_; + } + + inline + point2d& + bbox2d::pmax() + { + return pmax_; + } + + inline + const point2d& + bbox2d::pmax() const + { + return pmax_; + } + + inline + point2d + bbox2d::pcenter() const + { + point2d p(pmin_.row() + (pmax_.row() - pmin_.row()) / 2, + pmin_.col() + (pmax_.col() - pmin_.col()) / 2); + + return p; + } + + inline + unsigned + bbox2d::bbox_number() const + { + return n_; + } + + inline + void + bbox2d::set_bbox_number(const unsigned id) + { + n_ = id; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BBOX2D_HH diff --git a/scribo/scribo/layout/internal/docstrum/between_closure.hh b/scribo/scribo/layout/internal/docstrum/between_closure.hh new file mode 100644 index 0000000..d466734 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/between_closure.hh @@ -0,0 +1,353 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BETWEEN_CLOSURE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BETWEEN_CLOSURE_HH + +# include <vector> + +# include <scribo/layout/internal/docstrum/line.hh> +# include <scribo/layout/internal/docstrum/paragraph.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + float + compute_lines_angle(const line& l1, const line& l2); + + + void + project_point(const line& destination, + const point2d& p, + point2d& projection); + + + float + compute_parallel_distance(const line& origin, + const line& destination, + point2d& p_center); + + float + point_to_line_distance(const float slope, + const float y_intercept, + const point2d& p_center); + + + void + between_closure(const std::vector<line>& lines, + std::vector<paragraph>& paragraphs, + const std::vector< std::vector<unsigned> >& clusters, + const float within_distance, + const float between_distance, + const float theta); + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Compute angle between two lines + //------------------------- + + inline + float compute_lines_angle(const line& l1, + const line& l2) + { + const point2d& l1_begin = l1.line_begin(); + const point2d& l1_end = l1.line_end(); + const point2d& l2_begin = l2.line_begin(); + const point2d& l2_end = l2.line_end(); + + const float delta_y_l1 = l1_end.row() - l1_begin.row(); + const float delta_x_l1 = l1_end.col() - l1_begin.col(); + const float delta_y_l2 = l2_end.row() - l2_begin.row(); + const float delta_x_l2 = l2_end.col() - l2_begin.col(); + + return (atan(delta_y_l2 / delta_x_l2) - atan(delta_y_l1 / delta_x_l1)); + } + + //------------------------- + // Projection of a point + //------------------------- + + inline + void project_point(const line& destination, + const point2d& p, + point2d& projection) + { + const point2d& destination_begin = destination.line_begin(); + const point2d& destination_end = destination.line_end(); + + const int delta_x = destination_end.col() - destination_begin.col(); + const int delta_y = destination_end.row() - destination_begin.row(); + const float length = (delta_x * delta_x) + (delta_y * delta_y); + float r = (destination_begin.row() - p.row()) * (-delta_y) - + (destination_begin.col() - p.col()) * (delta_x); + r /= length; + + projection.row() = destination_begin.row() + r * delta_y; + projection.col() = destination_begin.col() + r * delta_x; + } + + //------------------------- + // Compute parallel distance + //------------------------- + + inline + float compute_parallel_distance(const line& origin, + const line& destination, + point2d& p_center) + { + mln_trace("scribo::layout::internal::docstrum::compute_parallel_distance"); + + const point2d& origin_begin = origin.line_begin(); + const point2d& origin_end = origin.line_end(); + const point2d& destination_begin = destination.line_begin(); + const point2d& destination_end = destination.line_end(); + point2d projection_begin; + point2d projection_end; + + project_point(destination, origin_begin, projection_begin); + project_point(destination, origin_end, projection_end); + + point2d overlap_begin; + point2d overlap_end; + float overlap_length = 0.0f; + // float parallel_distance_left = 0; + // float parallel_distance_right = 0; + + if (projection_begin.col() > destination_end.col() || + projection_end.col() < destination_begin.col()) + return -1.0f; + + if (projection_begin.col() < destination_begin.col()) + overlap_begin = destination_begin; + else + overlap_begin = projection_begin; + + if (projection_end.col() < destination_end.col()) + overlap_end = projection_end; + else + overlap_end = destination_end; + + p_center = point2d(overlap_begin.row() + (overlap_end.row() - + overlap_begin.row()) / 2, + overlap_begin.col() + (overlap_end.col() - + overlap_begin.col()) / 2); + + // const int delta_x_left = destination_begin.col() - projection_begin.col(); + // const int delta_y_left = destination_begin.row() - projection_begin.row(); + // const int delta_x_right = destination_end.col() - projection_end.col(); + // const int delta_y_right = destination_end.row() - projection_end.row(); + + // parallel_distance_left = sqrt(delta_x_left * delta_x_left + + // delta_y_left * delta_y_left); + // parallel_distance_right = sqrt(delta_x_right * delta_x_right + + // delta_y_right * delta_y_right); + + const int over_delta_x = overlap_end.col() - overlap_begin.col(); + const int over_delta_y = overlap_end.row() - overlap_begin.row(); + + overlap_length = sqrt(over_delta_y * over_delta_y + over_delta_x + * over_delta_x); + + return overlap_length; + + // return std::min(parallel_distance_left, parallel_distance_right); + } + + //------------------------- + // Point to line distance + //------------------------- + + inline + float point_to_line_distance(const float slope, + const float y_intercept, + const point2d& p_center) + { + return (std::fabs(-slope * p_center.col() + + p_center.row() - y_intercept) / + sqrt(slope * slope + 1)); + } + + //------------------------- + // Between closure + //------------------------- + + inline + void between_closure(const std::vector<line>& lines, + std::vector<paragraph>& paragraphs, + const std::vector< std::vector<unsigned> >& clusters, + const float within_distance, + const float between_distance, + const float theta) + { + mln_trace("scribo::layout::internal::docstrum::between_closure"); + + // FIXME: why taking this value ? + (void) within_distance; + + const unsigned nelements = lines.size(); + std::set<unsigned> already_seen; + unsigned paragraph_count = 0; + + for (unsigned i = 0; i < nelements; ++i) + { + const line& l = lines[i]; + const unsigned id = l.id(); + + if (already_seen.find(id) == already_seen.end()) + { + const std::vector<unsigned>& neighbors = clusters[i]; + + std::vector<unsigned>::const_iterator it_begin = neighbors.begin(); + std::vector<unsigned>::const_iterator it_end = neighbors.end(); + + std::vector<const line*> propagation; + std::vector<const line*> next_propagation; + + // Initialize a new paragraph with the current line + paragraph p(&l, paragraph_count); + ++paragraph_count; + already_seen.insert(id); + + // Firstly, we try to link the current line with its closest + // neighbors + for (; it_begin != it_end; ++it_begin) + { + // We first retrieve the corresponding line + const line& ln = lines[(*it_begin)]; + const unsigned id_ln = ln.id(); + + if (already_seen.find(id_ln) == already_seen.end()) + { + // Compute the angle between the two lines + const float angle = compute_lines_angle(l, ln); + + if (angle > -theta && angle < theta) + { + point2d p_center; + const float p_distance = compute_parallel_distance(l, ln, p_center); + + if (p_distance >= 0) + { + const float distance_to_line = + point_to_line_distance(l.slope(), l.y_intercept(), p_center); + + if (distance_to_line <= between_distance) + { + p.add_line(&ln); + already_seen.insert(id_ln); + propagation.push_back(&lines[id_ln]); + } + } + } + } + } + + // Then, we propagate the linking to our neighbors + while (! propagation.empty()) + { + next_propagation.clear(); + const unsigned prop_nelements = propagation.size(); + + for (unsigned j = 0; j < prop_nelements; ++j) + { + const std::vector<unsigned>& neighbors = + clusters[propagation[j]->id()]; + const line& ln1 = lines[propagation[j]->id()]; + + std::vector<unsigned>::const_iterator it_begin = neighbors.begin(); + std::vector<unsigned>::const_iterator it_end = neighbors.end(); + + // Firstly, we try to link the current line with its closest + // neighbors + for (; it_begin != it_end; ++it_begin) + { + // We first retrieve the corresponding line + const line& ln = lines[(*it_begin)]; + const unsigned id_ln = ln.id(); + + if (already_seen.find(id_ln) == already_seen.end()) + { + // Compute the angle between the two lines + const float angle = compute_lines_angle(ln1, ln); + + if (angle > -theta && angle < theta) + { + point2d p_center; + const float p_distance = compute_parallel_distance(ln1, ln, p_center); + + if (p_distance >= 0) + { + const float distance_to_line = point_to_line_distance(ln1.slope(), + ln1.y_intercept(), p_center); + + if (distance_to_line <= between_distance) + { + p.add_line(&ln); + already_seen.insert(id_ln); + next_propagation.push_back(&lines[id_ln]); + } + } + } + } + } + } + + propagation.clear(); + propagation = next_propagation; + } + + paragraphs.push_back(p); + } + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_BETWEEN_CLOSURE_HH diff --git a/scribo/scribo/layout/internal/docstrum/components_size.hh b/scribo/scribo/layout/internal/docstrum/components_size.hh new file mode 100644 index 0000000..02a8fea --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/components_size.hh @@ -0,0 +1,181 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_COMPONENT_SIZE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_COMPONENT_SIZE_HH + +# include <vector> + +# include <mln/core/image/image2d.hh> + +# include <scribo/layout/internal/docstrum/bbox2d.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + void + compute_comp_size(const std::vector<bbox2d>& bbox_list, + std::vector<bbox2d>& small_comp, + std::vector<bbox2d>& big_comp, + const float max_size_factor); + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Compute components size + //------------------------- + + inline + void + compute_comp_size(const std::vector<bbox2d>& bbox_list, + std::vector<bbox2d>& small_comp, + std::vector<bbox2d>& big_comp, + const float max_size_factor) + { + mln_trace("scribo::layout::internal::docstrum::compute_comp_size"); + + std::vector<bbox2d>::const_iterator it_begin = bbox_list.begin(); + std::vector<bbox2d>::const_iterator it_end = bbox_list.end(); + std::map<int, int> size_hist; + std::vector<int> smoothed_size_hist; + std::vector<int> sizes; + sizes.reserve(bbox_list.size()); + int max_value = 0; + int comp_size = 0; + int window = 1; + + // Compute the histogram and find the dominant characters size + for (; it_begin != it_end; ++it_begin) + { + const bbox2d& box = (*it_begin); + const unsigned height = box.pmax().row() - box.pmin().row(); + const unsigned width = box.pmax().col() - box.pmin().col(); + const int size = round(sqrt(width * height)); + + ++size_hist[size]; + + if (size > max_value) + max_value = size; + + sizes.push_back(size); + } + + const int nelements = max_value + 1; + smoothed_size_hist.resize(nelements); + + const int factor = 2 * window + 1; + max_value = 0; + + // Smoothed distribution + for (int i = 0; i < nelements; ++i) + { + int count = 0; + + for (int j = i - window; j <= i + window; ++j) + { + if (j < 0 || j >= nelements) + continue; + + if (size_hist.find(j) != size_hist.end()) + count += size_hist[j]; + } + + smoothed_size_hist[i] = count / factor; + + if (smoothed_size_hist[i] > max_value) + { + comp_size = i; + max_value = smoothed_size_hist[i]; + } + } + + // std::map<unsigned, unsigned> size_hist; + // unsigned max_value = 0; + // unsigned comp_size = 0; + // std::vector<unsigned> sizes; + // sizes.reserve(bbox_list.size()); + + // // Compute the histogram and find the dominant characters size + + // for (; it_begin != it_end; ++it_begin) + // { + // const bbox2d& box = (*it_begin); + // const unsigned height = box.pmax().row() - box.pmin().row(); + // const unsigned width = box.pmax().col() - box.pmin().col(); + // const unsigned size = sqrt(width * height); + // const unsigned hist_value = ++size_hist[size]; + + // sizes.push_back(size); + + // if (hist_value > max_value) + // { + // comp_size = size; + // max_value = hist_value; + // } + // } + + // Separate components into two classes + it_begin = bbox_list.begin(); + std::vector<int>::iterator it_size_begin = sizes.begin(); + const float dominant_size = comp_size * max_size_factor; + + for (; it_begin != it_end; ++it_begin, ++it_size_begin) + { + const bbox2d& box = (*it_begin); + const float size = (*it_size_begin); + + if (size < dominant_size) + small_comp.push_back(box); + else + big_comp.push_back(box); + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_COMPONENT_SIZE_HH diff --git a/scribo/scribo/layout/internal/docstrum/distances.hh b/scribo/scribo/layout/internal/docstrum/distances.hh new file mode 100644 index 0000000..f548712 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/distances.hh @@ -0,0 +1,167 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_DISTANCES_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_DISTANCES_HH + +# include <vector> + +# include <mln/core/image/image2d.hh> + +# include <scribo/layout/internal/docstrum/nearest_neighbors.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + int + within_line_distance(const std::vector<nearestn>& clusters, + const float theta_h); + + + int + between_line_distance(const std::vector<nearestn>& clusters, + const float theta_v); + + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Within-line distance + //------------------------- + + inline + int + within_line_distance(const std::vector<nearestn>& clusters, + const float theta_h) + { + mln_trace("scribo::layout::internal::docstrum::within_line_distance"); + + std::vector<nearestn>::const_iterator it_begin = clusters.begin(); + std::vector<nearestn>::const_iterator it_end = clusters.end(); + std::map<int, int> distance_hist; + int max_value = 0; + int mean_distance = 0; + + for (; it_begin != it_end; ++it_begin) + { + const std::vector<nnpoint>& neighbors = + (*it_begin).nearest_points(); + const unsigned nelements = (*it_begin).ninserted(); + + for (unsigned i = 0; i < nelements; ++i) + { + const nnpoint& nnp = neighbors[i]; + const float angle_h = nnp.angle_h; + + if (angle_h > -theta_h && angle_h < theta_h) + { + const int distance = nnp.distance; + const int value = ++distance_hist[distance]; + + if (value > max_value) + { + max_value = value; + mean_distance = distance; + } + } + } + } + + return mean_distance; + } + + + + //------------------------- + // Between-line distance + //------------------------- + + inline + int + between_line_distance(const std::vector<nearestn>& clusters, + const float theta_v) + { + mln_trace("scribo::layout::internal::docstrum::between_line_distance"); + + std::vector<nearestn>::const_iterator it_begin = clusters.begin(); + std::vector<nearestn>::const_iterator it_end = clusters.end(); + std::map<int, int> distance_hist; + int max_value = 0; + int mean_distance = 0; + + for (; it_begin != it_end; ++it_begin) + { + const std::vector<nnpoint>& neighbors = (*it_begin).nearest_points(); + const unsigned nelements = (*it_begin).ninserted(); + + for (unsigned i = 0; i < nelements; ++i) + { + const nnpoint& nnp = neighbors[i]; + const float angle_v = nnp.angle_v; + + if (angle_v > -theta_v && angle_v < theta_v) + { + const int distance = nnp.distance; + const int value = ++distance_hist[distance]; + + if (value > max_value) + { + max_value = value; + mean_distance = distance; + } + } + } + } + + return mean_distance; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_DISTANCES_HH diff --git a/scribo/scribo/layout/internal/docstrum/extract_lines.hh b/scribo/scribo/layout/internal/docstrum/extract_lines.hh new file mode 100644 index 0000000..18ceb00 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/extract_lines.hh @@ -0,0 +1,128 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_LINES_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_LINES_HH + +# include <scribo/layout/internal/docstrum/bbox2d.hh> +# include <scribo/layout/internal/docstrum/line.hh> +# include <scribo/layout/internal/docstrum/kd_tree.hh> +# include <scribo/layout/internal/docstrum/nearest_neighbors.hh> +# include <scribo/layout/internal/docstrum/within_closure.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + void extract_lines(std::vector<bbox2d>& comp, + std::vector<line>& lines, + int& within_distance, + int& between_distance, + const float theta_h, + const float theta_v, + const int k); + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Extract lines + //------------------------- + + inline + void + extract_lines(std::vector<bbox2d>& comp, + std::vector<line>& lines, + int& within_distance, + int& between_distance, + const float theta_h, + const float theta_v, + const int k) + { + mln_trace("scribo::layout::internal::docstrum::extract_lines"); + + // Build a KD tree for the nearest neighbors search + const unsigned nelements = comp.size(); + kd_tree kd(nelements); + + for (unsigned i = 0; i < nelements; ++i) + { + // Reset the bbox id of each element of small_comp for indexing + comp[i].set_bbox_number(i); + + // Insert the bbox in the KD-tree + const bbox2d* b = &(comp[i]); + kd.insert(b); + } + + // Compute the K nearest neighbors + std::vector<nearestn> knn; + knn.reserve(nelements); + + for (unsigned i = 0; i < nelements; ++i) + { + const bbox2d* b = &(comp[i]); + const point2d b_center = b->pcenter(); + nearestn n(k, b); + + kd.find_nnearest(b, n); + n.compute_angles(b_center); + n.root_distances(); + knn.push_back(n); + } + + // Compute within line and between line mean distances + within_distance = within_line_distance(knn, theta_h); + between_distance = between_line_distance(knn, theta_v); + + // Transitive closure on within-line nearest neighbor pairings + within_closure(lines, knn, within_distance, 3, theta_h); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_LINES_HH diff --git a/scribo/scribo/layout/internal/docstrum/extract_paragraphs.hh b/scribo/scribo/layout/internal/docstrum/extract_paragraphs.hh new file mode 100644 index 0000000..0c523fd --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/extract_paragraphs.hh @@ -0,0 +1,116 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_PARAGRAPHS_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_PARAGRAPHS_HH + +# include <scribo/layout/internal/docstrum/line.hh> +# include <scribo/layout/internal/docstrum/paragraph.hh> +# include <scribo/layout/internal/docstrum/kd_tree.hh> +# include <scribo/layout/internal/docstrum/between_closure.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + void + extract_paragraphs(const std::vector<line>& lines, + std::vector<paragraph>& paragraphs, + const float within_distance, + const float between_distance, + const float theta); + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Extract paragraphs + //------------------------- + + inline + void extract_paragraphs(const std::vector<line>& lines, + std::vector<paragraph>& paragraphs, + const float within_distance, + const float between_distance, + const float theta) + { + mln_trace("scribo::layout::internal::docstrum::extract_paragraphs"); + + // Build a KD tree for nearest line neighbor search + const unsigned nelements = lines.size(); + kd_tree kd(nelements); + + for (unsigned i = 0; i < nelements; ++i) + { + // Insert the bbox in the KD-tree + const bbox2d* b = &(lines[i].bbox()); + kd.insert(b); + } + + // Compute the nearest neighbors for each line + std::vector< std::vector<unsigned> > knn; + knn.reserve(nelements); + + for (unsigned i = 0; i < nelements; ++i) + { + std::vector<unsigned> neighbors; + const line& l = lines[i]; + + kd.find_nnearest_within_range(neighbors, 3.0f * between_distance, + &l.bbox(), l.slope(), l.y_intercept()); + + knn.push_back(neighbors); + } + + // Transitive closure on between-line nearest neighbors pairings + // using parallel and perpendicular distances + between_closure(lines, paragraphs, knn, within_distance, + between_distance, theta); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_EXTRACT_PARAGRAPHS_HH diff --git a/scribo/scribo/layout/internal/docstrum/kd_hyperrect.hh b/scribo/scribo/layout/internal/docstrum/kd_hyperrect.hh new file mode 100644 index 0000000..4cdefb8 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/kd_hyperrect.hh @@ -0,0 +1,210 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_HYPERRECT_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_HYPERRECT_HH + +# include <scribo/layout/internal/docstrum/bbox2d.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + + class kd_hyperrect + { + public: + kd_hyperrect(); + + int min_coord(const int dim) const; + int max_coord(const int dim) const; + void set_min_coord(const int dim, const int value); + void set_max_coord(const int dim, const int value); + + void init(const bbox2d* bbox); + + void extend(const bbox2d* bbox); + + int distance(const bbox2d* bbox); + + int vertical_distance(const bbox2d* bbox); + + private: + int min_[2]; + int max_[2]; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + + //--------------------------- + // KD hyperrectangle + //--------------------------- + + inline + kd_hyperrect::kd_hyperrect() + { + } + + inline + int + kd_hyperrect::min_coord(const int dim) const + { + return min_[dim]; + } + + inline + int + kd_hyperrect::max_coord(const int dim) const + { + return max_[dim]; + } + + inline + void + kd_hyperrect::set_min_coord(const int dim, const int value) + { + min_[dim] = value; + } + + inline + void + kd_hyperrect::set_max_coord(const int dim, const int value) + { + max_[dim] = value; + } + + inline + void + kd_hyperrect::init(const bbox2d* bbox) + { + const point2d& center = bbox->pcenter(); + min_[0] = max_[0] = center.col(); + min_[1] = max_[1] = center.row(); + } + + inline + void + kd_hyperrect::extend(const bbox2d* bbox) + { + const point2d& center = bbox->pcenter(); + const int x = center.col(); + const int y = center.row(); + + if (x < min_[0]) + min_[0] = x; + if (y < min_[1]) + min_[1] = y; + + if (x > max_[0]) + max_[0] = x; + if (y > max_[1]) + max_[1] = y; + } + + inline + int + kd_hyperrect::distance(const bbox2d* bbox) + { + int distance = 0; + const point2d& center = bbox->pcenter(); + const int x = center.col(); + const int y = center.row(); + + if (x < min_[0]) + { + const int tmp = min_[0] - x; + distance += (tmp * tmp); + } + else if (x > max_[0]) + { + const int tmp = max_[0] - x; + distance += (tmp * tmp); + } + + if (y < min_[1]) + { + const int tmp = min_[1] - y; + distance += (tmp * tmp); + } + else if (y > max_[1]) + { + const int tmp = max_[1] - y; + distance += (tmp * tmp); + } + + return distance; + } + + inline + int + kd_hyperrect::vertical_distance(const bbox2d* bbox) + { + int distance = 0; + const point2d& center = bbox->pcenter(); + const int y = center.row(); + + if (y < min_[1]) + { + const int tmp = min_[1] - y; + distance += (tmp * tmp); + } + else if (y > max_[1]) + { + const int tmp = max_[1] - y; + distance += (tmp * tmp); + } + + return distance; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_HYPERRECT_HH diff --git a/scribo/scribo/layout/internal/docstrum/kd_node.hh b/scribo/scribo/layout/internal/docstrum/kd_node.hh new file mode 100644 index 0000000..9826128 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/kd_node.hh @@ -0,0 +1,182 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_NODE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_NODE_HH + +#include <iostream> + +# include <scribo/layout/internal/docstrum/bbox2d.hh> + + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + class kd_node + { + public: + kd_node(const bbox2d* bbox, const int father, const int dim); + + bool is_leaf() const; + + int dim() const; + const bbox2d* bbox() const; + int father() const; + int left_son() const; + int right_son() const; + int coord(const int dim) const; + + int x() const; + int y() const; + + void set_left_son(const int son_index); + void set_right_son(const int son_index); + + private: + int dim_; + const bbox2d* bbox_; + int father_; + int left_son_; + int right_son_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + //--------------------------- + // KD node + //--------------------------- + + inline + kd_node::kd_node(const bbox2d* bbox, const int father, const int dim) + : dim_(dim), bbox_(bbox), father_(father), left_son_(-1), right_son_(-1) + { + } + + inline + bool + kd_node::is_leaf() const + { + return (left_son_ == -1 && right_son_ == -1); + } + + inline + int + kd_node::dim() const + { + return dim_; + } + + inline + const bbox2d* + kd_node::bbox() const + { + return bbox_; + } + + inline + int + kd_node::father() const + { + return father_; + } + + inline + int + kd_node::left_son() const + { + return left_son_; + } + + inline + int + kd_node::right_son() const + { + return right_son_; + } + + inline + int + kd_node::coord(const int dim) const + { + if (not dim) + return bbox_->pcenter().col(); + else + return bbox_->pcenter().row(); + } + + inline + int kd_node::x() const + { + return bbox_->pcenter().col(); + } + + inline + int + kd_node::y() const + { + return bbox_->pcenter().row(); + } + + inline + void + kd_node::set_left_son(const int son_index) + { + left_son_ = son_index; + } + + inline + void + kd_node::set_right_son(const int son_index) + { + right_son_ = son_index; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_NODE_HH diff --git a/scribo/scribo/layout/internal/docstrum/kd_tree.hh b/scribo/scribo/layout/internal/docstrum/kd_tree.hh new file mode 100644 index 0000000..74b247a --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/kd_tree.hh @@ -0,0 +1,472 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_TREE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_TREE_HH + +#include <vector> +#include <climits> +#include <cmath> + +# include <scribo/layout/internal/docstrum/kd_node.hh> +# include <scribo/layout/internal/docstrum/kd_hyperrect.hh> +# include <scribo/layout/internal/docstrum/bbox2d.hh> +# include <scribo/layout/internal/docstrum/nearest_neighbors.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + class kd_tree + { + public: + static const int nb_dims = 2; + + kd_tree(const int nb_nodes); + + int find_parent(const bbox2d* bbox, + int* const dim) const; + + void insert(const bbox2d* bbox); + + void build_kd_tree(const std::vector<const bbox2d*>& points); + + int euclidean_distance(const bbox2d* bbox1, + const bbox2d* bbox2); + + float point_to_line_distance(const float slope, + const float y_intercept, + const bbox2d* bbox); + + void nn(const bbox2d* bbox, + const int node_index, + nearestn& n); + + void nn_within_range(const bbox2d* bbox, + const int node_index, + const float max_distance, + std::vector<unsigned>& neighbors_id, + const float slope, + const float y_intercept); + + void find_nnearest(const bbox2d* bbox, + nearestn& n); + + void find_nnearest_within_range(std::vector<unsigned>& neighbors_id, + const float max_distance, + const bbox2d* bbox, + const float slope, + const float y_intercept); + + bool empty(); + + int size(); + + private: + bool root_inserted_; + int nodes_inserted_; + kd_hyperrect hyperrect_; + std::vector<kd_node> nodes_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + //--------------------------- + // KD tree + //--------------------------- + + inline + kd_tree::kd_tree(const int nb_nodes) + : root_inserted_(false), nodes_inserted_(0) + { + nodes_.reserve(nb_nodes); + } + + inline + int + kd_tree::find_parent(const bbox2d* bbox, + int* const dim) const + { + int node_index = 0; + int father_index = 0; + const point2d& center = bbox->pcenter(); + int coord_value = 0; + + while (node_index != -1 && not nodes_[node_index].is_leaf()) + { + (not *dim) ? coord_value = center.col() : coord_value = center.row(); + + const kd_node& current_node = nodes_[node_index]; + father_index = node_index; + + int node_coord_value = current_node.coord(*dim); + + if (coord_value <= node_coord_value) + node_index = current_node.left_son(); + else + node_index = current_node.right_son(); + + *dim = (*dim + 1) % 2; + } + + if (node_index == -1) + { + node_index = father_index; + *dim = (*dim + 1) % 2; + } + + return node_index; + } + + inline + void + kd_tree::insert(const bbox2d* bbox) + { + if (not root_inserted_) + { + kd_node node(bbox, 0, 0); + root_inserted_ = true; + hyperrect_.init(bbox); + nodes_.push_back(node); + } + else + { + int dim = 0; + const int node_index = find_parent(bbox, &dim); + kd_node node(bbox, node_index, (dim + 1) % 2); + + const point2d& center = bbox->pcenter(); + int coord_value = 0; + + (not dim) ? coord_value = center.col() : coord_value = center.row(); + + if (coord_value <= nodes_[node_index].coord(dim)) + nodes_[node_index].set_left_son(nodes_.size()); + else + nodes_[node_index].set_right_son(nodes_.size()); + + hyperrect_.extend(bbox); + nodes_.push_back(node); + } + + ++nodes_inserted_; + } + + inline + void + kd_tree::build_kd_tree(const std::vector<const bbox2d*>& points) + { + const int nb_points = points.size(); + + for (int i = 0; i < nb_points; ++i) + insert(points[i]); + } + + inline + int + kd_tree::euclidean_distance(const bbox2d* bbox1, + const bbox2d* bbox2) + { + const point2d& center1 = bbox1->pcenter(); + const point2d& center2 = bbox2->pcenter(); + const int dx = center1.col() - center2.col(); + const int dy = center1.row() - center2.row(); + + return (dx * dx + dy * dy); + } + + inline + float + kd_tree::point_to_line_distance(const float slope, + const float y_intercept, + const bbox2d* bbox) + { + const point2d& center = bbox->pcenter(); + + return (std::fabs(-slope * center.col() + + center.row() - y_intercept) / + sqrt(slope * slope + 1)); + } + + inline + void + kd_tree::nn(const bbox2d* bbox, + const int node_index, + nearestn& n) + { + if (node_index == -1) + return; + + const kd_node& node = nodes_[node_index]; + const bbox2d* b = node.bbox(); + + if (node.is_leaf()) + { + const int d = euclidean_distance(bbox, b); + + if (d < n.get_highest_distance() && bbox != b) + n.add_point(nnpoint(b, d)); + + return; + } + + int nearer_sub_tree = -1; + int further_sub_tree = -1; + bool nearer_h = false; // hyperrect.min + bool further_h = false; // + const int dim = node.dim(); + int coord_value = 0; + + (not dim) ? coord_value = bbox->pcenter().col() : + coord_value = bbox->pcenter().row(); + + if (coord_value <= node.coord(dim)) + { + nearer_sub_tree = node.left_son(); + further_sub_tree = node.right_son(); + nearer_h = true; // hyperrect.max + } + else + { + nearer_sub_tree = node.right_son(); + further_sub_tree = node.left_son(); + further_h = true; // hyperrect.max + } + + if (nearer_sub_tree > 0) + { + if (nearer_h) + { + const int tmp = hyperrect_.max_coord(dim); + hyperrect_.set_max_coord(dim, node.coord(dim)); + nn(bbox, nearer_sub_tree, n); + hyperrect_.set_max_coord(dim, tmp); + } + else + { + const int tmp = hyperrect_.min_coord(dim); + hyperrect_.set_min_coord(dim, node.coord(dim)); + nn(bbox, nearer_sub_tree, n); + hyperrect_.set_min_coord(dim, tmp); + } + } + + const int d = euclidean_distance(bbox, b); + + if (d < n.get_highest_distance() && bbox != b) + n.add_point(nnpoint(b, d)); + + if (further_sub_tree > 0) + { + if (further_h) + { + const int tmp = hyperrect_.max_coord(dim); + hyperrect_.set_max_coord(dim, node.coord(dim)); + + if (hyperrect_.distance(bbox) < n.get_highest_distance()) + nn(bbox, further_sub_tree, n); + + hyperrect_.set_max_coord(dim, tmp); + } + else + { + const int tmp = hyperrect_.min_coord(dim); + hyperrect_.set_min_coord(dim, node.coord(dim)); + + if (hyperrect_.distance(bbox) < n.get_highest_distance()) + nn(bbox, further_sub_tree, n); + + hyperrect_.set_min_coord(dim, tmp); + } + } + } + + inline + void + kd_tree::nn_within_range(const bbox2d* bbox, + const int node_index, + const float max_distance, + std::vector<unsigned>& neighbors_id, + const float slope, + const float y_intercept) + { + if (node_index == -1) + return; + + const kd_node& node = nodes_[node_index]; + const bbox2d* b = node.bbox(); + + if (node.is_leaf()) + { + const float d = point_to_line_distance(slope, y_intercept, b); + + if (d < max_distance && bbox != b) + neighbors_id.push_back(b->bbox_number()); + + return; + } + + int nearer_sub_tree = -1; + int further_sub_tree = -1; + bool nearer_h = false; // hyperrect.min + bool further_h = false; // + const int dim = node.dim(); + int coord_value = 0; + + (not dim) ? coord_value = bbox->pcenter().col() : + coord_value = bbox->pcenter().row(); + + if (coord_value <= node.coord(dim)) + { + nearer_sub_tree = node.left_son(); + further_sub_tree = node.right_son(); + nearer_h = true; // hyperrect.max + } + else + { + nearer_sub_tree = node.right_son(); + further_sub_tree = node.left_son(); + further_h = true; // hyperrect.max + } + + if (nearer_sub_tree > 0) + { + if (nearer_h) + { + const int tmp = hyperrect_.max_coord(dim); + hyperrect_.set_max_coord(dim, node.coord(dim)); + nn_within_range(bbox, nearer_sub_tree, max_distance, + neighbors_id, slope, y_intercept); + hyperrect_.set_max_coord(dim, tmp); + } + else + { + const int tmp = hyperrect_.min_coord(dim); + hyperrect_.set_min_coord(dim, node.coord(dim)); + nn_within_range(bbox, nearer_sub_tree, max_distance, + neighbors_id, slope, y_intercept); + hyperrect_.set_min_coord(dim, tmp); + } + } + + const float d = point_to_line_distance(slope, y_intercept, b); + + if (d < max_distance && bbox != b) + neighbors_id.push_back(b->bbox_number()); + + if (further_sub_tree > 0) + { + if (further_h) + { + const int tmp = hyperrect_.max_coord(dim); + hyperrect_.set_max_coord(dim, node.coord(dim)); + + if (hyperrect_.vertical_distance(bbox) < max_distance * max_distance) + nn_within_range(bbox, further_sub_tree, max_distance, + neighbors_id, slope, y_intercept); + + hyperrect_.set_max_coord(dim, tmp); + } + else + { + const int tmp = hyperrect_.min_coord(dim); + hyperrect_.set_min_coord(dim, node.coord(dim)); + + if (hyperrect_.vertical_distance(bbox) < max_distance * max_distance) + nn_within_range(bbox, further_sub_tree, max_distance, + neighbors_id, slope, y_intercept); + + hyperrect_.set_min_coord(dim, tmp); + } + } + } + + inline + void + kd_tree::find_nnearest(const bbox2d* bbox, + nearestn& n) + { + if (not root_inserted_) + return; + + nn(bbox, 0, n); + } + + inline + void + kd_tree::find_nnearest_within_range(std::vector<unsigned>& neighbors_id, + const float max_distance, + const bbox2d* bbox, + const float slope, + const float y_intercept) + { + if (not root_inserted_) + return; + + nn_within_range(bbox, 0, max_distance, neighbors_id, slope, y_intercept); + } + + inline + bool + kd_tree::empty() + { + return nodes_inserted_ == 0; + } + + inline + int + kd_tree::size() + { + return nodes_inserted_; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_KD_TREE_HH diff --git a/scribo/scribo/layout/internal/docstrum/labeling.hh b/scribo/scribo/layout/internal/docstrum/labeling.hh new file mode 100644 index 0000000..c0269da --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/labeling.hh @@ -0,0 +1,347 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LABELING_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LABELING_HH + +# include <vector> + +# include <mln/core/image/image2d.hh> + +# include <scribo/layout/internal/docstrum/bbox2d.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + struct labeling_position + { + labeling_position(const int x_, const int y_); + + int x; + int y; + }; + + + void + propagate(const labeling_position& position, + std::vector< labeling_position >& next_position_list, + const image2d<bool>& input, image2d<unsigned>& labeled_image, + const unsigned nb_labels, bbox2d& bbox); + + + void + component_labeling(const image2d<bool>& input, + unsigned& nb_labels, + std::vector<bbox2d>& bbox_list, + image2d<unsigned>& labeled_image, + const unsigned min_size); + +# ifndef MLN_INCLUDE_ONLY + + //--------------------------- + // Labeling position + //--------------------------- + + labeling_position::labeling_position(const int x_, const int y_) + : x(x_), + y(y_) + { + } + + //--------------------------- + // Propagate labeling + //--------------------------- + + inline + void propagate(const labeling_position& position, + std::vector< labeling_position >& next_position_list, + const image2d<bool>& input, image2d<unsigned>& labeled_image, + const unsigned nb_labels, bbox2d& bbox) + { + mln_trace("scribo::layout::internal::docstrum::component_labeling"); + + mln_assertion(input.is_valid()); + mln_assertion(labeled_image.is_valid()); + + int x = position.x; + int y = position.y; + int nx; + int ny; + int ncols = input.ncols(); + int nrows = input.nrows(); + + bool increment_xlr = false; + bool increment_ylr = false; + bool decrement_xul = false; + bool decrement_yul = false; + + point2d& pmin = bbox.pmin(); + point2d& pmax = bbox.pmax(); + const int xul = pmin.col(); + const int yul = pmin.row(); + const int xlr = pmax.col(); + const int ylr = pmax.row(); + + { + nx = x + 1; + + if (nx < ncols) + { + unsigned& pixel = labeled_image.at_(y, nx); + if (input.at_(y, nx) && !pixel) + { + if (xlr < nx) + increment_xlr = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, y)); + } + } + } + + { + nx = x + 1; + ny = y + 1; + + if (nx < ncols && ny < nrows) + { + unsigned& pixel = labeled_image.at_(ny, nx); + if (input.at_(ny, nx) && !pixel) + { + if (xlr < nx) + increment_xlr = true; + if (ylr < ny) + increment_ylr = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, ny)); + } + } + } + + { + ny = y + 1; + + if (ny < nrows) + { + unsigned& pixel = labeled_image.at_(ny, x); + if (input.at_(ny, x) && !pixel) + { + if (ylr < ny) + increment_ylr = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(x, ny)); + } + } + } + + { + nx = x - 1; + ny = y + 1; + + if (nx >= 0 && ny < nrows) + { + unsigned& pixel = labeled_image.at_(ny, nx); + if (input.at_(ny, nx) && !pixel) + { + if (xul > nx) + decrement_xul = true; + if (ylr < ny) + increment_ylr = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, ny)); + } + } + } + + { + nx = x - 1; + + if (nx >= 0) + { + unsigned& pixel = labeled_image.at_(y, nx); + if (input.at_(y, nx) && !pixel) + { + if (xul > nx) + decrement_xul = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, y)); + } + } + } + + { + nx = x - 1; + ny = y - 1; + + if (nx >= 0 && ny >= 0) + { + unsigned& pixel = labeled_image.at_(ny, nx); + if (input.at_(ny, nx) && !pixel) + { + if (xul > nx) + decrement_xul = true; + if (yul > ny) + decrement_yul = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, ny)); + } + } + } + + { + ny = y - 1; + + if (ny >= 0) + { + unsigned& pixel = labeled_image.at_(ny, x); + if (input.at_(ny, x) && !pixel) + { + if (yul > ny) + decrement_yul = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(x, ny)); + } + } + } + + { + nx = x + 1; + ny = y - 1; + + if (nx < ncols && ny >= 0) + { + unsigned& pixel = labeled_image.at_(ny, nx); + if (input.at_(ny, nx) && !pixel) + { + if (xlr < nx) + increment_xlr = true; + if (yul > ny) + decrement_yul = true; + pixel = nb_labels; + next_position_list.push_back(labeling_position(nx, ny)); + } + } + } + + if (increment_xlr) + ++pmax.col(); + if (increment_ylr) + ++pmax.row(); + if (decrement_xul) + --pmin.col(); + if (decrement_yul) + --pmin.row(); + } + + //--------------------------- + // Component labeling + //--------------------------- + + inline + void component_labeling(const image2d<bool>& input, + unsigned& nb_labels, + std::vector<bbox2d>& bbox_list, + image2d<unsigned>& labeled_image, + const unsigned min_size) + { + mln_trace("scribo::layout::internal::docstrum::component_labeling"); + + mln_assertion(input.is_valid()); + mln_assertion(labeled_image.is_valid()); + + std::vector<labeling_position> position_list; + std::vector<labeling_position> next_position_list; + unsigned nrows = input.nrows(); + unsigned ncols = input.ncols(); + + next_position_list.reserve(8); + + for (unsigned i = 0; i < nrows; ++i) + { + for (unsigned j = 0; j < ncols; ++j) + { + if (input.at_(i, j) && !labeled_image.at_(i, j)) + { + ++nb_labels; + position_list.clear(); + position_list.push_back(labeling_position(j, i)); + + labeled_image.at_(i, j) = nb_labels; + + point2d p(i, j); + bbox2d bbox(nb_labels, p, p); + + while (!position_list.empty()) + { + unsigned nb_positions = position_list.size(); + next_position_list.clear(); + + for (unsigned k = 0; k < nb_positions; ++k) + { + const labeling_position& position = position_list[k]; + + propagate(position, next_position_list, input, + labeled_image, nb_labels, bbox); + } + + position_list.clear(); + position_list = next_position_list; + } + + const unsigned height = bbox.pmax().row() - bbox.pmin().row(); + const unsigned width = bbox.pmax().col() - bbox.pmin().col(); + + if (height > min_size || width > min_size) + bbox_list.push_back(bbox); + } + } + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LABELING_HH diff --git a/scribo/scribo/layout/internal/docstrum/line.hh b/scribo/scribo/layout/internal/docstrum/line.hh new file mode 100644 index 0000000..23a9e10 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/line.hh @@ -0,0 +1,229 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LINE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LINE_HH + +# include <queue> + +# include <mln/core/image/image2d.hh> + +# include <scribo/layout/internal/docstrum/bbox2d.hh> +# include <scribo/layout/internal/docstrum/nearest_neighbors.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + class line + { + public: + line(const nnpoint* p, const unsigned id); + + void add_component(const nnpoint* p); + + void linear_regression(); + + const bbox2d& bbox() const; + + float slope() const; + + float y_intercept() const; + + const point2d& line_begin() const; + + const point2d& line_end() const; + + unsigned id() const; + + private: + std::vector<const nnpoint*> comp_; + float slope_; + float y_intercept_; + point2d line_begin_; + point2d line_end_; + bbox2d bbox_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Line + //------------------------- + + inline + line::line(const nnpoint* p, + const unsigned id) + { + bbox_.pmin() = p->bbox->pmin(); + bbox_.pmax() = p->bbox->pmax(); + bbox_.set_bbox_number(id); + + comp_.push_back(p); + slope_ = 0.0f; + y_intercept_ = 0.0f; + } + + inline + void + line::add_component(const nnpoint* p) + { + comp_.push_back(p); + + const point2d& pmin = p->bbox->pmin(); + const point2d& pmax = p->bbox->pmax(); + point2d& bbox_pmin = bbox_.pmin(); + point2d& bbox_pmax = bbox_.pmax(); + + if (bbox_pmin.col() > pmin.col()) + bbox_pmin.col() = pmin.col(); + + if (bbox_pmin.row() > pmin.row()) + bbox_pmin.row() = pmin.row(); + + if (bbox_pmax.col() < pmax.col()) + bbox_pmax.col() = pmax.col(); + + if (bbox_pmax.row() < pmax.row()) + bbox_pmax.row() = pmax.row(); + } + + inline + void + line::linear_regression() + { + const int nelements = comp_.size(); + + if (nelements == 1) + { + const bbox2d* b = comp_[0]->bbox; + slope_ = 0.0f; + y_intercept_ = b->pmin().row() + 0.5f * (b->pmax().row() - b->pmin().row()); + line_begin_ = point2d(y_intercept_, bbox_.pmin().col()); + line_end_ = point2d(y_intercept_, bbox_.pmax().col()); + + return; + } + + int sum_x = 0; + int sum_y = 0; + int sum_xy = 0; + int sum_x_square = 0; + + std::vector<const nnpoint*>::iterator it_begin = comp_.begin(); + std::vector<const nnpoint*>::iterator it_end = comp_.end(); + + for (; it_begin != it_end; ++it_begin) + { + const point2d center = (*it_begin)->bbox->pcenter(); + const int x = center.col(); + const int y = center.row(); + + sum_x += x; + sum_y += y; + sum_xy += x * y; + sum_x_square += x * x; + } + + slope_ = (float) (nelements * sum_xy - sum_x * sum_y) / + (nelements * sum_x_square - sum_x * sum_x); + y_intercept_ = ((float) sum_y / nelements) - + slope_ * ((float) sum_x / nelements); + + const int y_begin = slope_ * bbox_.pmin().col() + y_intercept_; + const int y_end = slope_ * bbox_.pmax().col() + y_intercept_; + line_begin_ = point2d(y_begin, bbox_.pmin().col()); + line_end_ = point2d(y_end, bbox_.pmax().col()); + } + + inline + const bbox2d& + line::bbox() const + { + return bbox_; + } + + inline + float + line::slope() const + { + return slope_; + } + + inline + float + line::y_intercept() const + { + return y_intercept_; + } + + inline + const point2d& + line::line_begin() const + { + return line_begin_; + } + + inline + const point2d& + line::line_end() const + { + return line_end_; + } + + inline + unsigned + line::id() const + { + return bbox_.bbox_number(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_LINE_HH diff --git a/scribo/scribo/layout/internal/docstrum/nearest_neighbors.hh b/scribo/scribo/layout/internal/docstrum/nearest_neighbors.hh new file mode 100644 index 0000000..0846540 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/nearest_neighbors.hh @@ -0,0 +1,265 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_NEAREST_NEIGHBORS_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_NEAREST_NEIGHBORS_HH + +# include <vector> +# include <climits> + +# include <mln/core/image/image2d.hh> +# include <mln/math/pi.hh> + +# include <scribo/layout/internal/docstrum/bbox2d.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + struct nnpoint + { + nnpoint(); + nnpoint(const bbox2d* b, const unsigned d); + + void compute_angle(const point2d& origin); + + void root_distance(); + + bool operator< (const nnpoint& p) const; + + unsigned id() const; + + const bbox2d* bbox; + int distance; + float angle_h; + float angle_v; + }; + + + class nearestn + { + public: + nearestn(); + nearestn(const int n, const bbox2d* bbox); + + void add_point(const nnpoint& p); + void compute_angles(const point2d& origin); + + void root_distances(); + int get_highest_distance() const; + + const std::vector<nnpoint>& nearest_points() const; + + int ninserted() const; + + const nnpoint* nnp() const; + + private: + std::vector<nnpoint> neighbors_; + int inserted_; + int n_; + int highest_distance_; + nnpoint nnpoint_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + //--------------------------- + // Nearest neighbor point + //--------------------------- + + inline + nnpoint::nnpoint() + : bbox(0), distance(0), angle_h(0.0f), angle_v(0.0f) + { + } + + inline + nnpoint::nnpoint(const bbox2d* b, const unsigned d) + : bbox(b), distance(d), angle_h(0.0f), angle_v(0.0f) + { + } + + inline + void + nnpoint::compute_angle(const point2d& origin) + { + const point2d center = bbox->pcenter(); + const float delta_x = center.col() - origin.col(); + const float delta_y = center.row() - origin.row(); + + if (delta_x == 0 && delta_y > 0) + angle_h = math::pi / 2; + else if (delta_x == 0 && delta_y < 0) + angle_h = -math::pi / 2; + else + { + angle_h = atan(delta_y / delta_x); + if (angle_h > 0) + angle_v = angle_h - math::pi / 2; + else + angle_v = angle_h + math::pi / 2; + } + } + + inline + void + nnpoint::root_distance() + { + distance = sqrt(distance); + } + + inline + bool + nnpoint::operator< (const nnpoint& p) const + { + return (distance < p.distance); + } + + inline + unsigned + nnpoint::id() const + { + return bbox->bbox_number(); + } + + + //--------------------------- + // Nearest neighbors + //--------------------------- + + + inline + nearestn::nearestn() + : inserted_(0), n_(0), highest_distance_(INT_MAX) + { + } + + inline + nearestn::nearestn(const int n, + const bbox2d* bbox) + : inserted_(0), n_(n), highest_distance_(INT_MAX) + { + for (int i = 0; i < n_; ++i) + neighbors_.push_back(nnpoint()); + + nnpoint_ = nnpoint(bbox, 0); + } + + inline + void + nearestn::add_point(const nnpoint& p) + { + int i = 0; + + while (i < n_ && i < inserted_ && neighbors_[i] < p) + ++i; + + if (i < n_) + { + for (int j = inserted_; j > i; --j) + neighbors_[j] = neighbors_[j - 1]; + + neighbors_[i] = p; + + if (inserted_ < n_) + ++inserted_; + + if (inserted_ >= n_) + highest_distance_ = neighbors_[n_ - 1].distance; + } + } + + inline + void + nearestn::compute_angles(const point2d& origin) + { + for (int i = 0; i < inserted_; ++i) + neighbors_[i].compute_angle(origin); + } + + inline + void + nearestn::root_distances() + { + for (int i = 0; i < inserted_; ++i) + neighbors_[i].root_distance(); + } + + inline + int + nearestn::get_highest_distance() const + { + return highest_distance_; + } + + inline + const std::vector<nnpoint>& + nearestn::nearest_points() const + { + return neighbors_; + } + + inline + int + nearestn::ninserted() const + { + return inserted_; + } + + inline + const nnpoint* + nearestn::nnp() const + { + return &nnpoint_; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_NEAREST_NEIGHBORS_HH diff --git a/scribo/scribo/layout/internal/docstrum/paragraph.hh b/scribo/scribo/layout/internal/docstrum/paragraph.hh new file mode 100644 index 0000000..66cdbf1 --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/paragraph.hh @@ -0,0 +1,126 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_PARAGRAPH_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_PARAGRAPH_HH + +# include <scribo/layout/internal/docstrum/line.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + class paragraph + { + public: + paragraph(const line* l, + const unsigned id); + + void add_line(const line* l); + + const bbox2d& bbox() const; + + private: + std::vector<const line*> lines_; + bbox2d bbox_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Paragraph + //------------------------- + + inline + paragraph::paragraph(const line* l, + const unsigned id) + { + const bbox2d& box = l->bbox(); + + bbox_.pmin() = box.pmin(); + bbox_.pmax() = box.pmax(); + bbox_.set_bbox_number(id); + + lines_.push_back(l); + } + + inline + void + paragraph::add_line(const line* l) + { + lines_.push_back(l); + + const point2d& pmin = l->bbox().pmin(); + const point2d& pmax = l->bbox().pmax(); + point2d& bbox_pmin = bbox_.pmin(); + point2d& bbox_pmax = bbox_.pmax(); + + if (bbox_pmin.col() > pmin.col()) + bbox_pmin.col() = pmin.col(); + + if (bbox_pmin.row() > pmin.row()) + bbox_pmin.row() = pmin.row(); + + if (bbox_pmax.col() < pmax.col()) + bbox_pmax.col() = pmax.col(); + + if (bbox_pmax.row() < pmax.row()) + bbox_pmax.row() = pmax.row(); + } + + inline + const bbox2d& + paragraph::bbox() const + { + return bbox_; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_PARAGRAPH_HH diff --git a/scribo/scribo/layout/internal/docstrum/within_closure.hh b/scribo/scribo/layout/internal/docstrum/within_closure.hh new file mode 100644 index 0000000..dc1630d --- /dev/null +++ b/scribo/scribo/layout/internal/docstrum/within_closure.hh @@ -0,0 +1,175 @@ +// Copyright (C) 2013 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 +/// + +#ifndef SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_WITHIN_CLOSURE_HH +# define SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_WITHIN_CLOSURE_HH + +# include <vector> + +# include <scribo/layout/internal/docstrum/line.hh> +# include <scribo/layout/internal/docstrum/distances.hh> + + +namespace scribo +{ + + namespace layout + { + + namespace internal + { + + namespace docstrum + { + + using namespace mln; + + + void + within_closure(std::vector<line>& lines, + const std::vector<nearestn>& clusters, + const int within_distance, + const int distance_factor, + const float theta_h); + +# ifndef MLN_INCLUDE_ONLY + + //------------------------- + // Within closure + //------------------------- + + inline + void + within_closure(std::vector<line>& lines, + const std::vector<nearestn>& clusters, + const int within_distance, + const int distance_factor, + const float theta_h) + { + mln_trace("scribo::layout::internal::docstrum::within_closure"); + + const int max_within_distance = distance_factor * within_distance; + + std::vector<nearestn>::const_iterator it_begin = clusters.begin(); + std::vector<nearestn>::const_iterator it_end = clusters.end(); + std::set<unsigned> already_seen; + unsigned line_count = 0; + + for (; it_begin != it_end; ++it_begin) + { + const nnpoint* n = (*it_begin).nnp(); + const unsigned id = n->id(); + + if (already_seen.find(id) == already_seen.end()) + { + const std::vector<nnpoint>& neighbors = (*it_begin).nearest_points(); + const unsigned nelements = (*it_begin).ninserted(); + + std::vector<const nearestn*> propagation; + std::vector<const nearestn*> next_propagation; + + // Initialize a new line with the current component + line l(n, line_count); + ++line_count; + + // Firstly, we try link the current component n with its closest + // neighbors + for (unsigned i = 0; i < nelements; ++i) + { + const nnpoint& nnp = neighbors[i]; + const float angle_h = nnp.angle_h; + const int distance = nnp.distance; + const unsigned id = nnp.id(); + + if (distance <= max_within_distance && + angle_h > -theta_h && angle_h < theta_h) + { + if (already_seen.find(id) == already_seen.end()) + { + l.add_component(&nnp); + already_seen.insert(id); + propagation.push_back(&clusters[id]); + } + } + } + + // Then, we propagate the linking to our neighbors + while (! propagation.empty()) + { + next_propagation.clear(); + const unsigned nelements = propagation.size(); + + for (unsigned i = 0; i < nelements; ++i) + { + const std::vector<nnpoint>& neighbors = propagation[i]->nearest_points(); + const unsigned nelements = (*it_begin).ninserted(); + + for (unsigned i = 0; i < nelements; ++i) + { + const nnpoint& nnp = neighbors[i]; + const float angle_h = nnp.angle_h; + const int distance = nnp.distance; + const unsigned id = nnp.id(); + + if (distance <= max_within_distance && + angle_h > -theta_h && angle_h < theta_h) + { + if (already_seen.find(id) == already_seen.end()) + { + l.add_component(&nnp); + already_seen.insert(id); + next_propagation.push_back(&clusters[id]); + } + } + } + } + + propagation.clear(); + propagation = next_propagation; + } + + // Compute linear regression of the centroids of the line's + // components + l.linear_regression(); + + lines.push_back(l); + } + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace scribo::layout::internal::docstrum + + } // end of namespace scribo::layout::internal + + } // end of namespace scribo::layout + +} // end of namespace scribo + +#endif // ! SCRIBO_LAYOUT_INTERNAL_DOCSTRUM_WITHIN_CLOSURE_HH diff --git a/scribo/tests/layout/Makefile.am b/scribo/tests/layout/Makefile.am index 09990b1..d59ef17 100644 --- a/scribo/tests/layout/Makefile.am +++ b/scribo/tests/layout/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2013 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -17,6 +16,12 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = xy_cut +check_PROGRAMS = \ + docstrum \ + xy_cut + +EXTRA_DIST = \ + docstrum-line.pgm \ + docstrum-paragraph.pgm TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/layout/docstrum-line.pgm b/scribo/tests/layout/docstrum-line.pgm new file mode 100644 index 0000000..7cf1195 Binary files /dev/null and b/scribo/tests/layout/docstrum-line.pgm differ diff --git a/scribo/tests/layout/docstrum-paragraph.pgm b/scribo/tests/layout/docstrum-paragraph.pgm new file mode 100644 index 0000000..924f3d7 Binary files /dev/null and b/scribo/tests/layout/docstrum-paragraph.pgm differ diff --git a/scribo/tests/layout/docstrum.cc b/scribo/tests/layout/docstrum.cc new file mode 100644 index 0000000..0979e3d --- /dev/null +++ b/scribo/tests/layout/docstrum.cc @@ -0,0 +1,64 @@ +// Copyright (C) 2013 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 + +#include <mln/core/image/image2d.hh> +#include <scribo/layout/docstrum.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/load.hh> +#include <mln/data/compare.hh> + + +#include "tests/data.hh" + +using namespace mln; + +int main() +{ + + image2d<bool> input; + io::pbm::load(input, SCRIBO_IMG_DIR "/text_to_group.pbm"); + + // Line mode + { + image2d<value::int_u8> + output = scribo::layout::docstrum(input, scribo::layout::Line); + image2d<value::int_u8> ref; + io::pgm::load(ref, SCRIBO_TESTS_DIR "/layout/docstrum-line.pgm"); + mln_assertion(output == ref); + } + + // Paragraph mode + { + image2d<value::int_u8> + output = scribo::layout::docstrum(input, scribo::layout::Paragraph); + image2d<value::int_u8> ref; + io::pgm::load(ref, SCRIBO_TESTS_DIR "/layout/docstrum-paragraph.pgm"); + mln_assertion(output == ref); + } + + return 0; +} -- 1.7.2.5

11 years, 8 months

olena: branch exp/tmms updated: olena-2.0-559-gde661b4

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/tmms has been updated discards 25e43ce368c741c9acdcad419df48f68745d5f8f (commit) discards 77d1b6cc11ddb2a746a88546b521d4757bae1841 (commit) discards 81841d97f0bcbac17a67ec49b10b6b3a8fc1c21f (commit) via de661b458b671199b82f64ce9228c57152a63960 (commit) via 974060e24e404cf077c707e2f88a3c706b5e358b (commit) via edf9cfd311f1b57fe55dd0db0b6a49ab77de7469 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (25e43ce368c741c9acdcad419df48f68745d5f8f) \ N -- N -- N (de661b458b671199b82f64ce9228c57152a63960) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- de661b4 NEWS: Notify that binarization::tmms and binarization::tmms_histeresis have been added. 974060e Update autogenerated .mk files. edf9cfd Add binarization::tmms and binarization::tmms_hysteresis. ----------------------------------------------------------------------- Summary of changes: milena/tests/binarization/Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches