Olena-patches May 2011

olena-patches@lrde.epita.fr

9 participants
171 discussions

last-svn-commit-882-gf8dae9b Improve results.

by Guillaume Lazzara

* scribo/primitive/extract/lines_h_thick_and_thin.hh: Fix structural element length. * scribo/primitive/extract/non_text_hdoc.hh: Filter too small images. * scribo/text/paragraphs.hh: Make it compile. * scribo/toolchain/internal/content_in_hdoc_functor.hh: Denoise larger objects. Fix vseparator image and binary_image_wo_seps. * src/primitive/extract/lines_thick_and_thin.cc: Be less severe on parameters. --- scribo/ChangeLog | 16 +++++++ .../primitive/extract/lines_h_thick_and_thin.hh | 15 ++++++- scribo/scribo/primitive/extract/non_text_hdoc.hh | 4 ++ scribo/scribo/text/paragraphs.hh | 44 ++++++++++--------- .../toolchain/internal/content_in_hdoc_functor.hh | 15 ++++--- scribo/src/content_in_hdoc.cc | 2 +- .../src/primitive/extract/lines_thick_and_thin.cc | 2 +- 7 files changed, 67 insertions(+), 31 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5e29749..bfe43b2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,19 @@ +2011-05-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve results. + + * scribo/primitive/extract/lines_h_thick_and_thin.hh: Fix structural element length. + + * scribo/primitive/extract/non_text_hdoc.hh: Filter too small images. + + * scribo/text/paragraphs.hh: Make it compile. + + * scribo/toolchain/internal/content_in_hdoc_functor.hh: Denoise + larger objects. Fix vseparator image and binary_image_wo_seps. + + * src/primitive/extract/lines_thick_and_thin.cc: Be less severe on + parameters. + 2011-05-18 Julien Marquegnies <marquegnies(a)lrde.epita.fr> Improve paragraph grouping for historical documents. diff --git a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh index b9b44b4..511da9f 100644 --- a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh +++ b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh @@ -49,6 +49,7 @@ # include <mln/pw/all.hh> # include <mln/core/routine/duplicate.hh> # include <mln/win/rectangle2d.hh> +# include <mln/win/hline2d.hh> # include <mln/morpho/dilation.hh> # include <mln/data/convert.hh> @@ -63,6 +64,7 @@ # include <scribo/core/def/lbl_type.hh> # include <scribo/primitive/internal/rd.hh> +# include <scribo/debug/logger.hh> namespace scribo @@ -485,8 +487,15 @@ namespace scribo mln_concrete(I) mask = internal::detect_thick(tags); internal::add_thin(tags, mask); + + debug::logger().log_image(debug::AuxiliaryResults, + mask, "lines_h_thick_and_thin_mask"); + image2d<bool> output = internal::rd3_fast(mask, binary_image, - length, delta); + 2 * length, 2 * delta); + + debug::logger().log_image(debug::AuxiliaryResults, + output, "lines_h_thick_and_thin_output_before_filter"); // Remove invalid lines typedef scribo::def::lbl_type V; @@ -499,6 +508,10 @@ namespace scribo if (bbox(e).width() < filter_factor * length || bbox(e).width() / bbox(e).height() < 3) data::fill(((output | bbox(e)).rw() | (pw::value(lbl) == pw::cst(e))).rw(), false); + debug::logger().log_image(debug::Results, + output, "lines_h_thick_and_thin_output"); + + trace::exiting("scribo::primitive::extract::lines_h_thick_and_thin"); return output; } diff --git a/scribo/scribo/primitive/extract/non_text_hdoc.hh b/scribo/scribo/primitive/extract/non_text_hdoc.hh index 4924189..97e1f0e 100644 --- a/scribo/scribo/primitive/extract/non_text_hdoc.hh +++ b/scribo/scribo/primitive/extract/non_text_hdoc.hh @@ -47,6 +47,8 @@ # include <scribo/filter/objects_small.hh> # include <scribo/filter/objects_on_border.hh> +# include <scribo/filter/objects_v_thin.hh> +# include <scribo/filter/objects_h_thin.hh> //DEBUG #include <mln/util/timer.hh> @@ -111,6 +113,8 @@ namespace scribo elements = scribo::filter::components_small(elements, 200); elements = scribo::filter::components_on_border(elements); + elements = scribo::filter::objects_v_thin(elements, 100); + elements = scribo::filter::objects_h_thin(elements, 100); // Debug { diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 9a59e02..af01581 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -30,10 +30,10 @@ namespace scribo //------------------------------------- // Extracting root of links //------------------------------------- - template <typename T> + template <typename L> inline unsigned - find_root(util::array<T>& parent, unsigned x) + find_root(line_links<L>& parent, unsigned x) { unsigned tmp_x = x; @@ -50,10 +50,10 @@ namespace scribo return x; } - template <typename T> + template <typename L> inline void - set_root(util::array<T>& parent, unsigned x, const unsigned root) + set_root(line_links<L>& parent, unsigned x, const unsigned root) { while (parent(x) != x && parent(x) != root) { @@ -799,27 +799,29 @@ namespace scribo } } - // Only debug + // Post link processing + + const line_links<L> backup = output.duplicate(); + for (unsigned i = 0; i < output.nelements(); ++i) + { + const line_id_t current_neighbor = backup(i); + output(i) = scribo::internal::find_root(output, i); + const line_id_t root_index = output(i); + + for (unsigned j = 0; j < right.nelements(); ++j) + { + if (i != j && + current_neighbor != i && + right(j) == i) + scribo::internal::set_root(output, j, root_index); + } + } + + // Only debug // { // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); - // const util::array<value::int_u16> backup = output; - // for (unsigned i = 0; i < output.nelements(); ++i) - // { - // const value::int_u16 current_neighbor = backup(i); - // output(i) = internal::find_root(output, i); - // const value::int_u16 root_index = output(i); - - // for (unsigned j = 0; j < right.nelements(); ++j) - // { - // if (i != j && - // current_neighbor != i && - // right(j) == i) - // internal::set_root(output, j, root_index); - // } - // } - // mln::util::array<accu::shape::bbox<point2d> > nbbox(output.nelements()); // for_all_lines(l, lines) // if (lines(l).is_textline()) diff --git a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh index 92db8a7..e7d14ff 100644 --- a/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_hdoc_functor.hh @@ -182,14 +182,14 @@ namespace scribo mln_ch_value(I,bool) vseparators = preprocessing::rotate_90( primitive::extract::lines_h_thick_and_thin( - preprocessing::rotate_90(processed_image), 101, 3, 0.05, 0.80, 2), false), + preprocessing::rotate_90(processed_image), 101, 3, 0.2, 0.6, 1), false), hseparators = primitive::extract::lines_h_thick_and_thin( processed_image, 101, 3); doc.set_vline_separators(vseparators); doc.set_hline_separators(hseparators); - separators = vseparators; + separators = duplicate(vseparators); separators += hseparators; border::resize(processed_image, border::thickness); @@ -202,7 +202,6 @@ namespace scribo input_cleaned = primitive::remove::separators(processed_image, separators); - doc.set_binary_image_wo_seps(input_cleaned); on_progress(); } @@ -231,7 +230,7 @@ namespace scribo { on_new_progress_label("Denoise..."); - input_cleaned = preprocessing::denoise_fg(input_cleaned, c8(), 3); + input_cleaned = preprocessing::denoise_fg(input_cleaned, c8(), 10); // Debug # ifndef SCRIBO_NDEBUG @@ -242,13 +241,15 @@ namespace scribo on_progress(); } + doc.set_binary_image_wo_seps(input_cleaned); + /// Finding components. on_new_progress_label("Finding components..."); + // NOTE: Component features computation is disabled. V ncomponents; component_set<L> - components = scribo::primitive::extract::components(original_image, - input_cleaned, + components = scribo::primitive::extract::components(input_cleaned, c8(), ncomponents); @@ -269,7 +270,7 @@ namespace scribo on_new_progress_label("Filtering components"); - components = scribo::filter::components_small(components, 3); + components = scribo::filter::components_small(components, 10); on_progress(); diff --git a/scribo/src/content_in_hdoc.cc b/scribo/src/content_in_hdoc.cc index e0d2258..ed15693 100644 --- a/scribo/src/content_in_hdoc.cc +++ b/scribo/src/content_in_hdoc.cc @@ -200,7 +200,7 @@ int main(int argc, char* argv[]) // Saving results std::cout << "Saving results..." << std::endl; - scribo::io::xml::save(doc, "page.xml", scribo::io::xml::Page); +// scribo::io::xml::save(doc, "page.xml", scribo::io::xml::Page); std::cout << "End of process - " << t << std::endl; diff --git a/scribo/src/primitive/extract/lines_thick_and_thin.cc b/scribo/src/primitive/extract/lines_thick_and_thin.cc index f574b3d..fb78862 100644 --- a/scribo/src/primitive/extract/lines_thick_and_thin.cc +++ b/scribo/src/primitive/extract/lines_thick_and_thin.cc @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) input, length, delta); I vseparators = preprocessing::rotate_90( primitive::extract::lines_h_thick_and_thin( - preprocessing::rotate_90(input), length, delta, 0.05, 0.80, 2), false); + preprocessing::rotate_90(input), length, delta, 0.1, 0.80, 2), false); I separators = duplicate(vseparators); separators += hseparators; -- 1.5.6.5

13 years, 7 months

last-svn-commit-883-g0d80a70 Correct a bug in the compononent outlining algorithm.

by Coddy Levi

* scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 6 ++++++ scribo/scribo/util/component_outline.hh | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bfe43b2..9fd4e5e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -14,6 +14,12 @@ * src/primitive/extract/lines_thick_and_thin.cc: Be less severe on parameters. +2011-05-20 Coddy Levi <levi(a)lrde.epita.fr> + + Correct a bug in the compononent outlining algorithm. + + * scribo/util/component_outline.hh: Here. + 2011-05-18 Julien Marquegnies <marquegnies(a)lrde.epita.fr> Improve paragraph grouping for historical documents. diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index 85ab4a7..ea2f61f 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -264,13 +264,16 @@ namespace scribo mln::point2d node = find_farthest(ima, begin, end, precision); if (node != begin) - { - split_rec(ima, begin, node, l, precision); + { + if (find_farthest(ima, begin, node, precision) != end) + split_rec(ima, begin, node, l, precision); - l.append(node); + l.append(node); + + if (find_farthest(ima, node, end, precision) != begin) + split_rec(ima, node, end, l, precision); + } - split_rec(ima, node, end, l, precision); - } } /// Init the spliting procedure on both side of the line. @@ -318,9 +321,11 @@ namespace scribo get_initials(const I& ima) { mln::point2d begin(mln::geom::min_row(ima), - mln::geom::min_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); mln::point2d end(mln::geom::max_row(ima), - mln::geom::max_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); while (ima(begin) == mln::literal::zero) begin[0]++; @@ -346,7 +351,7 @@ namespace scribo mln_precondition(ima.is_valid()); - mln::accu::shape::bbox<point2d> ab; + mln::accu::shape::bbox<mln::point2d> ab; mln_piter(I) p(ima.domain()); for_all(p) ab.take(p); -- 1.5.6.5

13 years, 7 months

last-svn-commit-883-gebfb6d5 2011-05-20 Coddy Levi <levi@lrde.epita.fr>

by Coddy Levi

Correct a bug in the compononent outlining algorithm. * scribo/util/component_outline.hh: Here. --- scribo/ChangeLog | 6 ++++++ scribo/scribo/util/component_outline.hh | 21 +++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bfe43b2..9fd4e5e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -14,6 +14,12 @@ * src/primitive/extract/lines_thick_and_thin.cc: Be less severe on parameters. +2011-05-20 Coddy Levi <levi(a)lrde.epita.fr> + + Correct a bug in the compononent outlining algorithm. + + * scribo/util/component_outline.hh: Here. + 2011-05-18 Julien Marquegnies <marquegnies(a)lrde.epita.fr> Improve paragraph grouping for historical documents. diff --git a/scribo/scribo/util/component_outline.hh b/scribo/scribo/util/component_outline.hh index 85ab4a7..ea2f61f 100644 --- a/scribo/scribo/util/component_outline.hh +++ b/scribo/scribo/util/component_outline.hh @@ -264,13 +264,16 @@ namespace scribo mln::point2d node = find_farthest(ima, begin, end, precision); if (node != begin) - { - split_rec(ima, begin, node, l, precision); + { + if (find_farthest(ima, begin, node, precision) != end) + split_rec(ima, begin, node, l, precision); - l.append(node); + l.append(node); + + if (find_farthest(ima, node, end, precision) != begin) + split_rec(ima, node, end, l, precision); + } - split_rec(ima, node, end, l, precision); - } } /// Init the spliting procedure on both side of the line. @@ -318,9 +321,11 @@ namespace scribo get_initials(const I& ima) { mln::point2d begin(mln::geom::min_row(ima), - mln::geom::min_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); mln::point2d end(mln::geom::max_row(ima), - mln::geom::max_col(ima)); + mln::geom::max_col(ima) + - ima.ncols() / 2); while (ima(begin) == mln::literal::zero) begin[0]++; @@ -346,7 +351,7 @@ namespace scribo mln_precondition(ima.is_valid()); - mln::accu::shape::bbox<point2d> ab; + mln::accu::shape::bbox<mln::point2d> ab; mln_piter(I) p(ima.domain()); for_all(p) ab.take(p); -- 1.5.6.5

13 years, 7 months

branch icdar/hdlac2011 updated: last-svn-commit-881-g973e5ac

by lazzara＠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 icdar/hdlac2011 has been updated via 973e5ac6bd3ecea14c6df71aa03a2dd78811b9ea (commit) from 853ed71516fef6f26d0ba5cd80b35a74f6c53269 (commit) 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 ----------------------------------------------------------------- 973e5ac Improve paragraph grouping for historical documents. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 + scribo/scribo/core/line_info.hh | 18 ++- scribo/scribo/text/merging.hh | 16 +- scribo/scribo/text/paragraphs.hh | 388 ++++++++++++++++++++++++++++++++++---- 4 files changed, 378 insertions(+), 52 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 7 months

branch unstable/scribo updated: last-svn-commit-874-g3368692

by lazzara＠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 unstable/scribo has been updated via 3368692f6ecf9e857f8443caa3f8d60da470a1f9 (commit) from 3e4992613401cb2f4332d159cd29b1655074f997 (commit) 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 ----------------------------------------------------------------- 3368692 doc/research.tex: New file describing tests and conclusions. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 + scribo/doc/research.tex | 230 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 0 deletions(-) create mode 100644 scribo/doc/research.tex hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 7 months

last-svn-commit-874-g3368692 doc/research.tex: New file describing tests and conclusions.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 + scribo/doc/research.tex | 230 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 0 deletions(-) create mode 100644 scribo/doc/research.tex diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0412e63..fd8acad 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-05-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/research.tex: New file describing tests and conclusions. + 2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr> Add a new tool. diff --git a/scribo/doc/research.tex b/scribo/doc/research.tex new file mode 100644 index 0000000..86ab68c --- /dev/null +++ b/scribo/doc/research.tex @@ -0,0 +1,230 @@ +%% Copyright (C) 2011 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/>. + +\documentclass[a4]{book} + +%\usepackage{hevea} + +\usepackage{html} +\usepackage{hyperref} +\usepackage{graphicx} +\usepackage{makeidx} +\usepackage{xcolor} +\usepackage{color} + +\title{SCRIBO\\ + \large{Research report} } +\author{LRDE} +\date{} +\makeindex + + +\begin{document} + +\maketitle + + + +%=========================================== +%=========================================== +%=========================================== +\chapter{Preprocessing} + + + +%******************************************* +%******************************************* +\section{Show-through removal} + + +%******************************************* +%******************************************* +\section{Color to grayscale conversion} + +2 formulas tested : +\begin{itemize} +\item $R + G + V$ +\item $0.299 * R + 0.587 * G + 0.114 * B$ +\end{itemize} + + +%******************************************* +%******************************************* +\section{Binarization} + + + +%........................................... +\subsection{Sauvola} +\par{Sauvola} + +\cite{Sauvola} + +Best published method for documents. + +Parameters set up according to \cite{Badekas}. + +\par{Sauvola Multi-scale} + +Implemented with integral images. \cite{Faisal.integral_images} + +\par{Sauvola 3-channels} + + + +%******************************************* +%******************************************* +\section{Background/Foreground identification} + + + +%******************************************* +%******************************************* +\section{Unskew} + + + +%******************************************* +%******************************************* +\section{Denoising} + + + +%******************************************* +%******************************************* +\section{Delimitors} + +%........................................... +\subsection{Lines} + +%........................................... +\subsection{Tab-stops and whitespaces} + +File concerned : scribo/primitive/extract/separators\_non\_visible.hh + +First attempt to retrieve tab-stops/whitespaces delimitors. In order +to limit false positive, the components are dilated horizontaly prior +the algorithm. + +False positive were still too numerous in the core paragraphes. + + +File concerned : scribo/primitive/extract/alignments.hh + +In order to avoid too much false positive, the text is grouped once +(almost by word). To limit connections between paragraphs, the rules +used to connect components is as follows : lookup for the closest left +neighbor until a maximum distance compute with the formula (w / 2.0f) ++ (dmax_factor_ * h), where w and h are respectively the width and the +height of the component. dmax_factor_ is a user defined parameter set +to 1. Functor primitive::link::internal::dmax_default is used and +implement that rule.. + +We tried to find tabstops and whitespaces without grouping first but +there were too much false positive inside paragraphs. Grouping may be +a problem some times since if two paragraphs are too close to +eachother, they may already connect... + + +%=========================================== +%=========================================== +%=========================================== +\chapter{Text extraction} + +%******************************************* +%******************************************* +\section{lines} + +%........................................... +\subsection{Component labeling} + +%........................................... +\subsection{Component grouping} + +%........................................... +\subsection{Line reconstruction} + + + +%******************************************* +%******************************************* +\section{paragraphs/text blocks} + + +%=========================================== +%=========================================== +%=========================================== +\chapter{Non-text object extraction} + +%******************************************* +%******************************************* +\section{Background learning} + + +%=========================================== +%=========================================== +%=========================================== +\chapter{Text recognition (OCR)} + +%******************************************* +%******************************************* +\section{Tesseract Integration} + + +%******************************************* +%******************************************* +\section{Text cleanup} + + +%=========================================== +%=========================================== +%=========================================== +\chapter{Data structures} + +%******************************************* +%******************************************* +\section{Component\_set} +\subsection{Component\_info} + +%******************************************* +%******************************************* +\section{object\_links} + +%******************************************* +%******************************************* +\section{object\_groups} + + + +%******************************************* +%******************************************* +\section{line\_set} + +%........................................... +\subsection{line\_info} + + + + +%******************************************* +%******************************************* +\section{paragraph\_set} + +%........................................... +\subsection{paragraph\_info} + +\end{document} + -- 1.5.6.5

13 years, 7 months

branch origin/julien_temp_paragraphs deleted: last-svn-commit-842-g4ef87a3

by git＠lrde.epita.fr

13 years, 7 months

branch julien_temp_paragraphs updated: last-svn-commit-842-g4ef87a3

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 julien_temp_paragraphs has been updated via 4ef87a32cc19fbb7e5bd622bd9bd79cdd58c3cb9 (commit) from 3c34377d73d008a4b76275f4498094d20ead4907 (commit) 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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: scribo/scribo/core/line_info.hh | 18 +- scribo/scribo/core/stats.hh | 16 +- scribo/scribo/text/merging.hh | 16 +- scribo/scribo/text/paragraphs.hh | 462 ++++++++++++++++++++++++++++++------- 4 files changed, 402 insertions(+), 110 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 7 months

branch origin/julien_temp_paragraphs created: last-svn-commit-842-g4ef87a3

by git＠lrde.epita.fr

13 years, 7 months

last-svn-commit-881-g973e5ac Improve paragraph grouping for historical documents.

by Julien Marquegnies

* scribo/core/line_info.hh, * scribo/text/merging.hh, * scribo/text/paragraphs.hh: Here. --- scribo/ChangeLog | 8 + scribo/scribo/core/line_info.hh | 18 ++- scribo/scribo/text/merging.hh | 16 +- scribo/scribo/text/paragraphs.hh | 388 ++++++++++++++++++++++++++++++++++---- 4 files changed, 378 insertions(+), 52 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a28bdf7..5e29749 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2011-05-18 Julien Marquegnies <marquegnies(a)lrde.epita.fr> + + Improve paragraph grouping for historical documents. + + * scribo/core/line_info.hh, + * scribo/text/merging.hh, + * scribo/text/paragraphs.hh: Here. + 2011-05-17 Guillaume Lazzara <z(a)lrde.epita.fr> Fix use of skeleton_constrained. diff --git a/scribo/scribo/core/line_info.hh b/scribo/scribo/core/line_info.hh index e91e1c3..9017174 100644 --- a/scribo/scribo/core/line_info.hh +++ b/scribo/scribo/core/line_info.hh @@ -1000,21 +1000,22 @@ namespace scribo const int dy = bb1.pmax().row() - bb2.pmax().row(); // The two characters must be distinct - if (space < 0) - return false; + // if (space < 0) + // return false; if (// Approximately the same width - ((std::max(w1, w2) / std::min(w1, w2)) > 1.1f || + ((std::max(w1, w2) / std::min(w1, w2)) > 1.3 || // One character must not be smaller than the space between // the two characters (w1 < space || w2 < space)) // If the two characters have a different width they must also // have a different height - && not (std::max(h1, h2) / std::min(h1, h2) <= 1.5f)) + && not (std::max(h1, h2) / std::min(h1, h2) <= 1.7f)) return false; // Approximately aligned on baseline - if (std::abs(dy) > 10) + if (std::abs(dy) > 10 && + not (std::max(h1, h2) / std::min(h1, h2) <= 1.7f)) return false; return true; @@ -1049,6 +1050,10 @@ namespace scribo float min_base = 0.0f; const unsigned clusters_b_nelements = clusters_b.nelements(); + if (clusters_b_nelements >= 3) + return data_->baseline_clusters_.mean(); + + for (unsigned i = 0; i < clusters_b_nelements; ++i) { const unsigned clusters_b_i_nelements = clusters_b[i].nelements(); @@ -1086,6 +1091,9 @@ namespace scribo float max_mean = 0.0f; const unsigned clusters_m_nelements = clusters_m.nelements(); + if (clusters_m_nelements >= 3) + return data_->meanline_clusters_.mean(); + for (unsigned i = 0; i < clusters_m_nelements; ++i) { const unsigned clusters_m_i_nelements = clusters_m[i].nelements(); diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index f691188..2763882 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -461,8 +461,8 @@ namespace scribo if (l_cur_height < l_ted_x_height && l_cur_height > 0.05f * l_ted_x_height && float(l_cur_width) / float(l_cur.card()) < l_ted.char_width() - && dx < l_ted_cw - && l_cur_pmin.row() < l_ted_pmax.row()) + && dx < 2 * l_ted_cw + && l_cur_pmin.row() < l_ted.baseline()) { l_cur.update_type(line::Punctuation); return true; @@ -741,11 +741,12 @@ namespace scribo // vertically aligned // Obviously no separators between the two lines if ((l_info.card() <= 5 || - (std::abs(l_info.baseline() - mc_info.baseline()) < 5 - && std::abs(l_info.meanline() - mc_info.meanline()) < 5)) - && dx < l_ted_cw && dy < 0 - && not (l_info.holder().components().has_separators() - && between_separators(l_info, mc_info))) + (std::abs(l_info.baseline() - mc_info.baseline()) + < 5 && std::abs(l_info.meanline() - + mc_info.meanline()) < 5)) + && dx < l_ted_cw && dy < 0 + && not (l_info.holder().components().has_separators() + && between_separators(l_info, mc_info))) l = do_union(lines, l, mc, parent); // } @@ -1047,7 +1048,6 @@ namespace scribo // ts = t.stop(); // std::cout << "time " << ts << std::endl; - lines.force_stats_update(); return lines; diff --git a/scribo/scribo/text/paragraphs.hh b/scribo/scribo/text/paragraphs.hh index 6c9285b..9a59e02 100644 --- a/scribo/scribo/text/paragraphs.hh +++ b/scribo/scribo/text/paragraphs.hh @@ -30,30 +30,140 @@ namespace scribo //------------------------------------- // Extracting root of links //------------------------------------- - template <typename T> - inline - unsigned - find_root(util::array<T>& parent, unsigned x) - { - unsigned tmp_x = x; + template <typename T> + inline + unsigned + find_root(util::array<T>& parent, unsigned x) + { + unsigned tmp_x = x; - while (parent(tmp_x) != tmp_x) - tmp_x = parent(tmp_x); + while (parent(tmp_x) != tmp_x) + tmp_x = parent(tmp_x); - while (parent(x) != x) - { - const unsigned tmp = parent(x); - x = parent(x); - parent(tmp) = tmp_x; - } + while (parent(x) != x) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = tmp_x; + } + + return x; + } - return x; + template <typename T> + inline + void + set_root(util::array<T>& parent, unsigned x, const unsigned root) + { + while (parent(x) != x && parent(x) != root) + { + const unsigned tmp = parent(x); + x = parent(x); + parent(tmp) = root; } + + parent(x) = root; + } + } namespace filter { + template <typename L> + inline + bool + between_horizontal_separator(const scribo::line_info<L>& l1, + const scribo::line_info<L>& l2) + { + // No separators found in image. + mln_precondition(l1.holder().components().has_separators()); + + const box2d& l1_bbox = l1.bbox(); + const box2d& l2_bbox = l2.bbox(); + + unsigned + row1 = l1_bbox.pcenter().row(), + row2 = l2_bbox.pcenter().row(); + const mln_ch_value(L, bool)& + separators = l1.holder().components().separators(); + + unsigned row; + unsigned col_ptr; + unsigned left_col_ptr; + unsigned right_col_ptr; + unsigned end; + + if (row1 < row2) + { + row1 = l1_bbox.pmax().row(); + row2 = l2_bbox.pmin().row(); + + const unsigned quarter = + ((l1_bbox.pcenter().col() - l1_bbox.pmin().col()) >> 2); + + row = l1_bbox.pcenter().row(); + col_ptr = l1_bbox.pcenter().col(); + left_col_ptr = l1_bbox.pmin().col() + quarter; + right_col_ptr = l1_bbox.pmax().col() - quarter; + end = row2; + } + else + { + row2 = l2_bbox.pmax().row(); + row1 = l1_bbox.pmin().row(); + + const unsigned quarter = + ((l2_bbox.pcenter().col() - l2_bbox.pmin().col()) >> 2); + + row = l2_bbox.pcenter().row(); + col_ptr = l2_bbox.pcenter().col(); + left_col_ptr = l2_bbox.pmin().col() + quarter; + right_col_ptr = l2_bbox.pmax().col() - quarter; + end = row1; + } + + // If sep_ptr is true, then a separator is reached. + while (row < end) + { + ++row; + if (separators.at_(row, col_ptr) + || separators.at_(row, left_col_ptr) + || separators.at_(row, right_col_ptr)) + return true; + } + + return false; + } + + + template <typename L> + bool may_have_another_left_link(const line_links<L>& right, + const line_id_t& index, + const line_id_t& current_line, + const line_set<L>& lines) + { + const line_info<L>& l = lines(current_line); + const point2d& pmin = l.bbox().pmin(); + const unsigned x1 = l.x_height(); + + for_all_links(i, right) + if (i != index && right(i) == index) + { + const line_info<L>& l_info = lines(i); + const unsigned x2 = l_info.x_height(); + + const float delta_max = 0.5f * std::min(x1, x2); + + if (l_info.bbox().pmin().col() < pmin.col() + && std::abs(l.baseline() - l_info.baseline()) < delta_max + ) + return true; + } + + return false; + } + //--------------------------------------------------------------------- // This method aims to cut the links between lines that do not fit the // different criteria @@ -62,7 +172,7 @@ namespace scribo template <typename L> inline void paragraph_links(const line_links<L>& left, - const line_links<L>& right, + line_links<L>& right, line_links<L>& output, const line_set<L>& lines) { @@ -83,9 +193,27 @@ namespace scribo { // Neighbors - const line_id_t left_nbh = output(l); - const line_id_t right_nbh = right(l); - const line_id_t lol_nbh = output(left_nbh); + line_id_t left_nbh = output(l); + line_id_t right_nbh = right(l); + line_id_t lol_nbh = output(left_nbh); + + const line_info<L>& left_line = lines(left_nbh); + const line_info<L>& current_line = lines(l); + const line_info<L>& right_line = lines(right_nbh); + + if (right_line.holder().components().has_separators() && + between_horizontal_separator(right_line, current_line)) + { + output(right_nbh) = right_nbh; + right_nbh = l; + } + if (current_line.holder().components().has_separators() && + between_horizontal_separator(current_line, left_line)) + { + output(l) = l; + left_nbh = l; + lol_nbh = l; + } // Line features const float x_height = lines(l).x_height(); @@ -112,6 +240,7 @@ namespace scribo // Maximal x variation to consider two lines vertically aligned const int delta_alignment = cline_cw; + // Checks the baseline distances of the two neighbors { // Current line baseline @@ -151,7 +280,7 @@ namespace scribo // and its right neighbor if (right_distance > 1.4f * ror_distance && std::max(ror_x_height, right_x_height) < - 1.2f * std::min(ror_x_height, right_x_height) + 1.4f * std::min(ror_x_height, right_x_height) && output(right_nbh) == l) { output(right_nbh) = right_nbh; @@ -184,7 +313,7 @@ namespace scribo // Condition to cut the link between the current line and // its right neighbor - if ((max_x_height > min_x_height * 1.2f) && + if ((max_x_height > min_x_height * 1.4f) && !(max_char_width <= 1.2f * min_char_width)) { if (output(right_nbh) == l) @@ -220,7 +349,7 @@ namespace scribo // and its left neighbor if (left_distance > 1.4f * lol_distance && std::max(lol_x_height, left_x_height) < - 1.2f * std::min(lol_x_height, left_x_height)) + 1.4f * std::min(lol_x_height, left_x_height)) { output(l) = l; continue; @@ -252,7 +381,7 @@ namespace scribo // Condition to cut the link between the current line and // its left neighbor - if ((max_x_height > min_x_height * 1.2f) && + if ((max_x_height > min_x_height * 1.4f) && !(max_char_width <= 1.2f * min_char_width)) { output(l) = l; @@ -264,18 +393,18 @@ namespace scribo continue; } // The current line has at least one left and one right neighbor - else // if (delta_baseline_max >= delta_baseline_min) + else // if (delta_baseline_max >= 1.1 * delta_baseline_min) { // Distance between the left and the current line - const float left_distance = - lines(left_nbh).meanline() - lines(l).baseline(); + const float + left_distance = left_line_bbox.pcenter().row() - current_line_bbox.pcenter().row(); // Distance between the right and the current line - const float right_distance = - lines(l).meanline() - lines(right_nbh).baseline(); + const float + right_distance = current_line_bbox.pcenter().row() - right_line_bbox.pcenter().row();; // If the left line is too far compared to the right one // we cut the link with it - if (left_distance > 1.2f * right_distance + if (left_distance > 1.5f * right_distance && std::max(x_height, left_x_height) > 1.2f * std::min(x_height, left_x_height)) { output(l) = l; @@ -283,8 +412,8 @@ namespace scribo } // If the right line is too far compared to the left one // we cut the link with it - else if (right_distance > 1.2f * left_distance - && std::max(x_height, right_x_height) > 1.2f * std::min(x_height, right_x_height) + else if (right_distance > 1.5f * left_distance + && std::max(x_height, right_x_height) >= 1.2f * std::min(x_height, right_x_height) && output(right_nbh) == l) { output(right_nbh) = right_nbh; @@ -303,7 +432,7 @@ namespace scribo const float min_x_height = std::min(x_height, left_x_height); const float max_x_height = std::max(x_height, left_x_height); - if ((max_x_height > min_x_height * 1.2f) && + if ((max_x_height > min_x_height * 1.4f) && !(cw_max <= 1.2f * cw_min)) { output(l) = l; @@ -316,7 +445,7 @@ namespace scribo const float cw_max = std::max(rline_cw, cline_cw); const float cw_min = std::min(rline_cw, cline_cw); - if ((max_x_height > min_x_height * 1.2f) + if ((max_x_height > min_x_height * 1.4f) && !(cw_max <= 1.2f * cw_min) && output(right_nbh) == l) { @@ -332,7 +461,7 @@ namespace scribo const float min_x_height = std::min(x_height, right_x_height); const float max_x_height = std::max(x_height, right_x_height); - if ((max_x_height > min_x_height * 1.2f) + if ((max_x_height > min_x_height * 1.4f) && !(cw_max <= 1.2f * cw_min) && output(right_nbh) == l) { @@ -346,7 +475,7 @@ namespace scribo const float cw_max = std::max(lline_cw, cline_cw); const float cw_min = std::min(lline_cw, cline_cw); - if ((max_x_height > min_x_height * 1.2f) + if ((max_x_height > min_x_height * 1.4f) && !(cw_max <= 1.2f * cw_min)) { output(l) = l; @@ -445,8 +574,11 @@ namespace scribo { const int dx_lrc = std::abs(lline_col_max - cline_col_max); const int l_char_width = lines(l).char_width(); + const int dx_indent = std::abs(std::max(lline_col_min, + rline_col_min) - cline_col_min); if (dx_lrc > l_char_width && + dx_indent < 4 * delta_alignment && cline_col_max < lline_col_max && cline_col_min < lline_col_min && (lline_col_min > lolline_col_min || lol_is_left)) @@ -457,6 +589,172 @@ namespace scribo } } +//----------------------------------------------------------------------------- +// ___________________________ +// |___________________________| +// ________________________ +// |________________________| +// ___________________________ +// |___________________________| +// ___________________________ +// |___________________________| +// +// Simple case : paragraphs are justified on the left. We try to find any +// indentation like above. +// +//----------------------------------------------------------------------------- + + { + // Check if the current line neighbors are aligned + bool left_right_aligned = false; + bool left_lol_aligned = false; + const int dx_lr = std::abs(lline_col_min - rline_col_min); + const int dx_llol = std::abs(lline_col_min - lolline_col_min); + + if (dx_lr < delta_alignment) + left_right_aligned = true; + + if (dx_llol < delta_alignment) + left_lol_aligned = true; + + if (left_right_aligned && left_lol_aligned) + { + const int left_right_col_min = std::min(lline_col_min, rline_col_min); + const int dx_lrc = std::abs(left_right_col_min - cline_col_min); + const float l_char_width = 1.5f * lines(l).char_width(); + + if (dx_lrc > l_char_width && + !may_have_another_left_link(right, right_nbh, l, lines) && + dx_lrc < 10.0f * l_char_width && + cline_col_min > rline_col_min && + cline_col_min > lline_col_min) + { + const line_id_t out_right_nbh = output(right_nbh); + + if (out_right_nbh != l) + right(l) = l; + else + output(right_nbh) = right_nbh; + continue; + } + } + } + +//----------------------------------------------------------------------------- +// ___________________________ +// |___________________________| +// ___________________________ +// |___________________________| +// ________________________ +// |________________________| +// ___________________________ +// |___________________________| +// +// Simple case : paragraphs are justified on the left. We try to find any +// indentation like above. +// +//----------------------------------------------------------------------------- + + { + const line_id_t ror_nbh = right(right_nbh); + const box2d& ror_line_bbox = lines(ror_nbh).bbox(); + const int rorline_col_min = ror_line_bbox.pmin().col(); + + bool right_ror_min_aligned = false; + bool left_right_aligned = false; + const int dx_lr = std::abs(lline_col_min - rline_col_min); + const int dx_rror_min = std::abs(rline_col_min - rorline_col_min); + + if (dx_rror_min < delta_alignment) + right_ror_min_aligned = true; + + if (dx_lr < delta_alignment) + left_right_aligned = true; + + if (right_ror_min_aligned && left_right_aligned && + ror_nbh != right_nbh) + { + const int left_right_col_min = std::min(lline_col_min, rline_col_min); + const int dx_lrc = std::abs(left_right_col_min - cline_col_min); + const float l_char_width = 1.5f * lines(l).char_width(); + + if (dx_lrc > l_char_width && + !may_have_another_left_link(right, right_nbh, l, lines) && + dx_lrc < 10.0f * l_char_width && + cline_col_min > rline_col_min && + cline_col_min > lline_col_min) + { + const line_id_t out_right_nbh = output(right_nbh); + + if (out_right_nbh != l) + right(l) = l; + else + output(right_nbh) = right_nbh; + continue; + } + } + } + +//----------------------------------------------------------------------------- +// ___________________________ +// |___________________________| +// ___________ +// |___________| +// ________________________ +// |________________________| +// ___________________________ +// |___________________________| +// +// Simple case : paragraphs are justified on the left. We try to find any +// indentation like above. +// +//----------------------------------------------------------------------------- + + { + const line_id_t ror_nbh = right(right_nbh); + const box2d& ror_line_bbox = lines(ror_nbh).bbox(); + const int rorline_col_min = ror_line_bbox.pmin().col(); + + bool left_ror_aligned = false; + const int dx_lror = std::abs(lline_col_min - rorline_col_min); + + if (dx_lror < delta_alignment) + left_ror_aligned = true; + + if (left_ror_aligned) + { + const int left_ror_col_min = std::min(lline_col_min, rorline_col_min); + const int dx_lrorc = std::abs(left_ror_col_min - cline_col_min); + const float l_char_width = 1.5f * lines(l).char_width(); + const int dx_lrorr = std::abs(left_ror_col_min - rline_col_min); + const int dx_crmax = std::abs(rline_col_max - cline_col_max); + + if (dx_lrorc > l_char_width && + dx_lrorr > 5 * l_char_width && + dx_lrorr > dx_lrorc && + dx_crmax > 5 * l_char_width && + !may_have_another_left_link(right, right_nbh, l, lines) && + dx_lrorc < 10.0f * l_char_width && + cline_col_min > rorline_col_min && + cline_col_min > lline_col_min) + { + right(right_nbh) = right_nbh; + continue; + } + } + } + + +// Strange case + { + if (rline_col_min > current_line_bbox.pcenter().col() + && !may_have_another_left_link(right, right_nbh, l, lines) + && cline_col_max < rline_col_max + && output(right_nbh) == l) + { + output(right_nbh) = right_nbh; + } + } //----------------------------------------------------------------------------- // ___________________________ @@ -490,7 +788,7 @@ namespace scribo const float l_char_width = 1.5f * lines(l).char_width(); if (dx_rrorc > l_char_width && - dx_rrorc < 3.0f * l_char_width && + dx_rrorc < 10.0f * l_char_width && cline_col_min > rline_col_min && cline_col_max >= rline_col_max) { @@ -501,14 +799,26 @@ namespace scribo } } - // Only debug // { // image2d<value::rgb8> debug = data::convert(value::rgb8(), input); - // for (unsigned i = 0; i < output.nelements(); ++i) - // output(i) = scribo::make::internal::find_root(output, i); + // const util::array<value::int_u16> backup = output; + // for (unsigned i = 0; i < output.nelements(); ++i) + // { + // const value::int_u16 current_neighbor = backup(i); + // output(i) = internal::find_root(output, i); + // const value::int_u16 root_index = output(i); + + // for (unsigned j = 0; j < right.nelements(); ++j) + // { + // if (i != j && + // current_neighbor != i && + // right(j) == i) + // internal::set_root(output, j, root_index); + // } + // } // mln::util::array<accu::shape::bbox<point2d> > nbbox(output.nelements()); // for_all_lines(l, lines) -- 1.5.6.5

13 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2011