Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-974-gc204ba8 scribo/toolchain/internal/toolchain_functor.hh: Add a missing inline.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ .../scribo/toolchain/internal/toolchain_functor.hh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7010044..014a825 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/toolchain/internal/toolchain_functor.hh: Add a missing + inline. + 2011-03-29 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/toolchain/internal/toolchain_functor.hh: Fix a warning diff --git a/scribo/scribo/toolchain/internal/toolchain_functor.hh b/scribo/scribo/toolchain/internal/toolchain_functor.hh index 197a84b..fbf1702 100644 --- a/scribo/scribo/toolchain/internal/toolchain_functor.hh +++ b/scribo/scribo/toolchain/internal/toolchain_functor.hh @@ -71,6 +71,7 @@ namespace scribo { } + inline Toolchain_Functor::~Toolchain_Functor() { } -- 1.7.2.5

13 years, 4 months

last-svn-commit-970-g63a1ff7 scribo/toolchain/internal/toolchain_functor.hh: Fix a warning with GCC 4.5.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 +++++ .../scribo/toolchain/internal/toolchain_functor.hh | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d667e43..7010044 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-03-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/toolchain/internal/toolchain_functor.hh: Fix a warning + with GCC 4.5. + 2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/estim/font_boldness.cc: Make the test deterministic. diff --git a/scribo/scribo/toolchain/internal/toolchain_functor.hh b/scribo/scribo/toolchain/internal/toolchain_functor.hh index 5621c7c..197a84b 100644 --- a/scribo/scribo/toolchain/internal/toolchain_functor.hh +++ b/scribo/scribo/toolchain/internal/toolchain_functor.hh @@ -44,6 +44,7 @@ namespace scribo public: Toolchain_Functor(); + virtual ~Toolchain_Functor(); virtual int nsteps() const = 0; @@ -70,6 +71,9 @@ namespace scribo { } + Toolchain_Functor::~Toolchain_Functor() + { + } //========== // Triggers -- 1.7.2.5

13 years, 4 months

last-svn-commit-971-g6f7885a mln/core/image/vertex_image.hh: Fix invalid construction.

by Raphael Boissel

--- milena/ChangeLog | 4 ++++ milena/mln/core/image/vertex_image.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2902026..5c629c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/vertex_image.hh: Fix invalid construction. + 2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> Add comments. diff --git a/milena/mln/core/image/vertex_image.hh b/milena/mln/core/image/vertex_image.hh index 9ad31a7..d50f826 100644 --- a/milena/mln/core/image/vertex_image.hh +++ b/milena/mln/core/image/vertex_image.hh @@ -215,7 +215,7 @@ namespace mln operator | (const fun::i2v::array<V>& vertex_values, const p_vertices<G, fun::i2v::array<P> >& pv) { - vertex_image<P,V,G> tmp(vertex_values, pv); + vertex_image<P,V,G> tmp(pv, vertex_values); return tmp; } -- 1.7.2.5

13 years, 4 months

branch unstable/scribo updated: last-svn-commit-973-g9bb74f4

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 9bb74f4d6d55d208fa0f31ec6a0df03b451a3b5e (commit) via f925bd94c1c6ecba0e70b7636e4edbc673dbc40e (commit) via 6f7885a26734f43117a62384f650c430d925a4fd (commit) via 63a1ff7470f73fec8396a40f0c3131e0f86f800d (commit) via f6b3eedf8372f99ee3bafff823c2c38ce9583b93 (commit) via 1eb0e9ab700d03106edcf7cc12314ea63dd7c6be (commit) via 13db8ed45606d72f93dc43df86e2b4fa8ca43a69 (commit) from b072c6336956c5ab43f4b46f3d20959b3110c529 (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 ----------------------------------------------------------------- 9bb74f4 Fix doc generation. f925bd9 AUTHORS: Update. 6f7885a mln/core/image/vertex_image.hh: Fix invalid construction. 63a1ff7 scribo/toolchain/internal/toolchain_functor.hh: Fix a warning with GCC 4.5. f6b3eed tests/estim/font_boldness.cc: Make the test deterministic. 1eb0e9a Add comments. 13db8ed tests/border/mirror.cc: Revamp test. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 6 ++- ChangeLog | 4 + milena/ChangeLog | 31 ++++++++ milena/doc/Doxyfile.in | 10 +-- milena/doc/ref-guide.tex | 8 ++- milena/doc/technical.tex | 8 ++- milena/doc/tutorial.tex | 40 +++++----- milena/mln/accu/take.hh | 2 + milena/mln/border/mirror.hh | 10 ++- milena/mln/core/concept/object.hh | 7 +- milena/mln/core/image/vertex_image.hh | 2 +- milena/tests/border/mirror.cc | 74 ++++++++------------ scribo/ChangeLog | 9 +++ .../scribo/toolchain/internal/toolchain_functor.hh | 4 + scribo/tests/estim/font_boldness.cc | 6 +- 15 files changed, 135 insertions(+), 86 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 4 months

last-svn-commit-973-g9bb74f4 Fix doc generation.

by Guillaume Lazzara

* doc/Doxyfile.in: Enable source code parsing and listing. Fix include directories. * doc/ref-guide.tex, * doc/technical.tex: Use .sty files as input files instead of packages. * doc/tutorial.tex: Use .sty files as input files instead of packages. Fix references. * mln/core/concept/object.hh: Fix copyright. --- milena/ChangeLog | 16 ++++++++++++++ milena/doc/Doxyfile.in | 10 +++----- milena/doc/ref-guide.tex | 8 ++++-- milena/doc/technical.tex | 8 ++++-- milena/doc/tutorial.tex | 40 ++++++++++++++++++------------------ milena/mln/core/concept/object.hh | 7 +++-- 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5c629c1..cb63be3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix doc generation. + + * doc/Doxyfile.in: Enable source code parsing and listing. Fix + include directories. + + * doc/ref-guide.tex, + * doc/technical.tex: Use .sty files as input files instead of + packages. + + * doc/tutorial.tex: Use .sty files as input files instead of + packages. Fix references. + + * mln/core/concept/object.hh: Fix copyright. + +2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/image/vertex_image.hh: Fix invalid construction. 2011-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 5b20a7c..843280a 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -36,7 +36,6 @@ STRIP_FROM_INC_PATH = SHORT_NAMES = YES JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 8 @@ -101,8 +100,8 @@ EXCLUDE = @top_srcdir@/milena/sandbox \ @top_srcdir@/milena/trash \ @top_srcdir@/milena/mln/core/concept/proxy.hxx \ @top_srcdir@/milena/doc/examples/trash \ - @top_srcdir@/milena/doc/user-refman - @top_srcdir@/milena/doc/devel-refman + @top_srcdir@/milena/doc/user-refman \ + @top_srcdir@/milena/doc/devel-refman \ @top_srcdir@/milena/tests/unit_test EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh @@ -115,8 +114,7 @@ EXAMPLE_PATTERNS = *.cc \ *.cc.raw \ *.txt EXAMPLE_RECURSIVE = NO -IMAGE_PATH = @top_srcdir@/milena/doc/devel/figures \ - @top_srcdir@/milena/doc/img \ +IMAGE_PATH = @top_srcdir@/milena/doc/img \ @top_srcdir@/milena/doc/figures INPUT_FILTER = FILTER_PATTERNS = @@ -126,7 +124,7 @@ INPUT_ENCODING = ISO-8859-1 #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES diff --git a/milena/doc/ref-guide.tex b/milena/doc/ref-guide.tex index cdd5791..3328947 100644 --- a/milena/doc/ref-guide.tex +++ b/milena/doc/ref-guide.tex @@ -1,4 +1,5 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +%% Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +%% (LRDE) %% %% This file is part of Olena. %% @@ -33,8 +34,9 @@ \usepackage{hyperref} \usepackage{pgf} \usepackage{hyperref} -\usepackage{doxyfuns} -\usepackage{milena} + +\input{doxyfuns.sty} +\input{milena.sty} \title{Olena -- Quick Reference Guide} \author{LRDE} diff --git a/milena/doc/technical.tex b/milena/doc/technical.tex index 4afc908..b74b7b5 100644 --- a/milena/doc/technical.tex +++ b/milena/doc/technical.tex @@ -1,4 +1,5 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +%% Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +%% (LRDE) %% %% This file is part of Olena. %% @@ -33,8 +34,9 @@ \usepackage{hyperref} \usepackage{pgf} \usepackage{hyperref} -\usepackage{doxyfuns} -\usepackage{milena} + +\input{doxyfuns.sty} +\input{milena.sty} \title{Milena -- Technical documentation} \author{LRDE} diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex index 5a61461..8fee888 100644 --- a/milena/doc/tutorial.tex +++ b/milena/doc/tutorial.tex @@ -1,5 +1,5 @@ -%% Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -%% (LRDE) +%% Copyright (C) 2008, 2009, 2011 EPITA Research and Development +%% Laboratory (LRDE) %% %% This file is part of Olena. %% @@ -32,8 +32,6 @@ \usepackage{color} \usepackage{hyperref} \usepackage{pgf} -\usepackage{doxyfuns} -\usepackage{milena} % FIXME: Consider using the package FiXme from Didier Verna instead. %\newcommand{\tofix}[1]{{\color{red}(FIXME: #1)}} @@ -45,10 +43,12 @@ \date{} \makeindex - +\input{doxyfuns.sty} +\input{milena.sty} \begin{document} + % Doxygen use only - Generate the left menu. %Write foreword below. \begin{htmlonly} @@ -233,11 +233,11 @@ $ cd trunk \end{verbatim} You are now ready to configure the directory and install Milena as described -in section \ref{tuto2}. +in section \doxyref{tuto2}. We invite you to take a look at the description of the directory structure -(section \ref{tuto1dirstruct}). +(section \doxyref{tuto1dirstruct}). If you encounter any issues in the installation process or if you have any -question, do not forget to join the mailing lists (section \ref{tuto1mailinglists}) +question, do not forget to join the mailing lists (section \doxyref{tuto1mailinglists}) and/or use the other documentations resources (section ref{tuto1documentation}). @@ -275,13 +275,13 @@ $ cd olena You are now ready to configure the directory and install Milena as described -in section \ref{tuto2}. +in section \doxyref{tuto2}. We invite you to take a look at the description of the directory structure -(section \ref{tuto1dirstruct}). +(section \doxyref{tuto1dirstruct}). If you encounter any issues in the installation process or if you have any question, do not forget to join the mailing lists (section -\ref{tuto1mailinglists}) and/or use the other documentations resources -(section \ref{tuto1documentation})). +\doxyref{tuto1mailinglists}) and/or use the other documentations resources +(section \doxyref{tuto1documentation})). @@ -467,7 +467,7 @@ for new contributors. Did you find what you wanted? Do you miss something? \item Please report bugs and defects in the API. Mailing lists are the best - way for reporting that (section \ref{tuto1mailinglists}). + way for reporting that (section \doxyref{tuto1mailinglists}). \item Developers, if you write cool open source programs or algorithms with Milena, send them to us. We may ship your code with Olena and/or add it to @@ -477,7 +477,7 @@ for new contributors. share your materials, you can send it to us through our mailing-lists. \item We are also interested in partnership or commercial use of Milena. - If you are interested, contact us directly (\ref{tuto1contacts}). + If you are interested, contact us directly (\doxyref{tuto1contacts}). \end{itemize} @@ -486,7 +486,7 @@ for new contributors. \doxysection{tuto1projectstatus}{Project status} If you want to stay tuned to Milena's development, the best way is probably -the mailing-lists (section \ref{tuto1mailinglists}). +the mailing-lists (section \doxyref{tuto1mailinglists}). There are other ways to get to know what is the status of the project. @@ -604,7 +604,7 @@ your system, generating the doc and compiling the test suite and the examples. \doxysection{tuto2bootstrap}{Bootstrap (SVN Sources)} If you got the sources from a package/tarball, you can skip this section. Go -to section \ref{tuto2configure}. +to section \doxyref{tuto2configure}. If you downloaded the sources from the SVN repository, you must launch a script before configuring the build directory. @@ -704,10 +704,10 @@ $ make install When the installation is finished, you are done. Milena is installed on your system. But maybe you would like to build the examples? This is described -in section \ref{tuto2optionalcomp}. +in section \doxyref{tuto2optionalcomp}. A description of the installation content is also available in section -\ref{tuto2installcontent}. +\doxyref{tuto2installcontent}. @@ -894,7 +894,7 @@ The important point to remember is that a generic function should not return \doxycode[3]{tuto3_first_routine} Like any Milena's routine, note that we use \code{trace}. This debugging tool -will be detailed in section \ref{tuto3debughints}. +will be detailed in section \doxyref{tuto3debughints}. \doxycode[4]{tuto3_first_routine} @@ -1187,7 +1187,7 @@ sites in an image, consequently they do not store any values. Site sets can used as standalone containers. -A list of available site sets is available in section \ref{siteset}. +A list of available site sets is available in section \doxyref{siteset}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % MOVE PARTS OF THE NEXT CHAPTERS RIGHT HERE. % diff --git a/milena/mln/core/concept/object.hh b/milena/mln/core/concept/object.hh index 03408db..4d58fbf 100644 --- a/milena/mln/core/concept/object.hh +++ b/milena/mln/core/concept/object.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -107,7 +107,8 @@ <LI> \ref mln::win \section copyright Copyright and License. - Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development (LRDE) + Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and + Development (LRDE) This documentation is part of Olena. -- 1.7.2.5

13 years, 4 months

last-svn-commit-972-gf925bd9 AUTHORS: Update.

by Guillaume Lazzara

--- AUTHORS | 6 +++++- ChangeLog | 4 ++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index 554bf89..73aed4a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -65,6 +65,8 @@ Interns. * Arthur Crépin-Leblond - SCRIBO structured outputs (XML, HTML, PDF). +* Raphaël Boissel + - Graph implementation of a DIA toolchain in SCRIBO. ========================= Students from Class 2012. @@ -74,6 +76,8 @@ Students from Class 2012. - Prototype of the upcoming functions system. * Julien Marquegnies julien.marquegnies(a)lrde.epita.fr + - Fast implementation of the Hough transform. + - Many improvements in SCRIBO layout analysis. ========================= Students from Class 2011. @@ -102,7 +106,7 @@ Students from Class 2009. - Data routines. * Matthieu Garrigues - - Value types and i/o. + - Value types and i/o. - Draft of the FLLT. * Ugo Jardonnet diff --git a/ChangeLog b/ChangeLog index d6dfc6d..0f69cb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-08 Guillaume Lazzara <z(a)lrde.epita.fr> + + * AUTHORS: Update. + 2011-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Remove references to deprecated Makefiles. -- 1.7.2.5

13 years, 4 months

branch raphael deleted: last-svn-commit-895-g485817c

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 raphael has been deleted was 485817ced01f1d00df8a080a1a87c3caacc0cc90 ----------------------------------------------------------------------- 485817ced01f1d00df8a080a1a87c3caacc0cc90 Clean everything and create the function influence_and_graph in milena. influance_and_graph saves 400 ms during the creation of the graph. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 4 months

branch sandbox/raphael created: last-svn-commit-895-g485817c

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 sandbox/raphael has been created at 485817ced01f1d00df8a080a1a87c3caacc0cc90 (commit) - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 4 months

last-svn-commit-889-gf4a851e Correct some problems with lines detection and improve paragraphs detection. Add remote debug for clean.hh

by Raphael Boissel

--- .../code/my/debug/remote/document_remote.hh | 146 ++++++++++++++++++++ scribo/sandbox/raphael/code/my/debug/remote/lib.hh | 34 +++++ scribo/sandbox/raphael/code/my/document/clean.hh | 139 +++++++++++++++++-- .../sandbox/raphael/code/my/document/document.hh | 140 ++++++++++++++++++- .../sandbox/raphael/code/my/document/separator.hh | 45 ++++++- scribo/sandbox/raphael/code/my/runtime/lib.hh | 6 + scribo/sandbox/raphael/code/test.cc | 37 +++++- 7 files changed, 523 insertions(+), 24 deletions(-) create mode 100644 scribo/sandbox/raphael/code/my/debug/remote/document_remote.hh create mode 100644 scribo/sandbox/raphael/code/my/debug/remote/lib.hh diff --git a/scribo/sandbox/raphael/code/my/debug/remote/document_remote.hh b/scribo/sandbox/raphael/code/my/debug/remote/document_remote.hh new file mode 100644 index 0000000..24b0889 --- /dev/null +++ b/scribo/sandbox/raphael/code/my/debug/remote/document_remote.hh @@ -0,0 +1,146 @@ +#ifndef MLN_DEBUG_DOCUMENT_REMOTE +#define MLN_DEBUG_DOCUMENT_REMOTE +#include <my/document/document.hh> +using namespace mln; +namespace mymln +{ + namespace document + { + namespace debug + { + template<typename Label, typename Float, typename Data> + class remote + { + typedef document< Label, Float, Data > doc; + public: + remote() + { + program_node = mln::util::array<string>(0); + program_argument = mln::util::array<string>(0); + program_argument2 = mln::util::array<string>(0); + program_instruction = mln::util::array<string>(0); + doc_b_pp_fun = map<string, bool(*)(const doc&, const point2d&, const point2d&) >(); + doc_b_p_fun = map<string, bool(*)(const doc&, const point2d&) >(); + } + void load(const char* file) + { + + fstream filestream(file, fstream::in | fstream::out); + std::string Buffer = ""; + bool flag = !getline(filestream, Buffer).eof(); + int L = 0; + bool remain = flag; + bool fun_mask_set = false; + + while(remain) + { + if(!flag){remain = false;} + int N = 0; + std::string Node = ""; + std::string Instr = ""; + std::string Arg = ""; + std::string Arg2 = ""; + while( N < Buffer.length() && (Buffer[N] == ' ' || Buffer[N] == '\t') && Buffer[N] != ';'){N++;} // trim + while(N < Buffer.length() && Buffer[N] != ' ' && Buffer[N] != '\t' && Buffer[N] != ';' && Buffer[N] != ':'){Instr += Buffer[N]; N++;} + if(Buffer[N] != ':') + {std::cout << "#REMOTE DEBUG SCRIPT ERROR : THE NODE HAS NOT BEEN SPECIFIED" << std::endl; return;} + while( N < Buffer.length() && (Buffer[N] == ' ' || Buffer[N] == '\t') && Buffer[N] != ';'){N++;} // trim + while(N < Buffer.length() && Buffer[N] != ' ' && Buffer[N] != '\t' && Buffer[N] != ';'){Instr += Buffer[N]; N++;} + while(N < Buffer.length() && (Buffer[N] == ' ' || Buffer[N] == '\t') && Buffer[N] != ';'){N++;} // trim + while(N < Buffer.length() && Buffer[N] != ' ' && Buffer[N] != '\t' && Buffer[N] != ';'){Arg += Buffer[N]; N++;} + while(N < Buffer.length() && (Buffer[N] == ' ' || Buffer[N] == '\t') && Buffer[N] != ';'){N++;} // trim + while(N < Buffer.length() && Buffer[N] != ' ' && Buffer[N] != '\t' && Buffer[N] != ';'){Arg2 += Buffer[N]; N++;} + if(Instr.length() != 1 || (Instr[0] != 'v' && Instr[0] != 'q')) + { + if(Instr.length() != 2 || (Instr[0] != 'v' && Instr[0] != 'q') || (Instr[1] != 'v' && Instr[1] != 'q')) + { + if(fun_mask_set) + { + std::cout << "#REMOTE DEBUG SCRIPT ERROR : INVALID NODE" << std::endl; return; + } + else + { + fun_mask_set = true; + fun_mask = Node; + } + } + } + program_node.append(Node); + program_instruction.append(Instr); + program_argument.append(Arg); + program_argument2.append(Arg2); + + } + + filestream.close(); + + } + inline void filter(doc& d) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = + (!fun_mask.compare("all_letters"))?d.fun_mask_all_letters() + :(!fun_mask.compare("letters"))?d.fun_mask_letters() + :(!fun_mask.compare("alone_letters"))?d.fun_mask_letters() + :(!fun_mask.compare("start_end_lines"))?d.fun_mask_start_end_lines() + :(!fun_mask.compare("start_lines"))?d.fun_mask_start_lines() + :(!fun_mask.compare("end_lines"))?d.fun_mask_start_lines() + :(!fun_mask.compare("all"))?d.fun_mask_all() + :d.fun_mask_all(); // DEFAULT VALUE + + + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + bool _VTRUE = true; + for(int N = 0; N < program_instruction.size(); N++) + { + if(!program_node[N].compare("v")) + { _VTRUE = _VTRUE && doc_b_p_fun[program_instruction[N]](d, q); } + } + if(!_VTRUE){continue;} + for_all(q) + { + bool _TRUE = true; + for(int N = 0; N < program_instruction.size(); N++) + { + if(!program_node[N].compare("vq")) + { _TRUE = _TRUE && doc_b_pp_fun[program_instruction[N]](d, v, q); } + else if(!program_node[N].compare("qv")) + { _TRUE = _TRUE && doc_b_pp_fun[program_instruction[N]](d, (point2d)q, v); } + else if(!program_node[N].compare("q")) + { _TRUE = _TRUE && doc_b_p_fun[program_instruction[N]](d, (point2d)q); } + } + + if(_TRUE) + {d.debug_draw_line_green_buffer(q,v);} + else + {d.debug_draw_line_red_buffer(q,v);} + } + } + } + inline void add_function_pp(string name, bool(*ptr)(const doc&, const point2d&, const point2d&) ) + { + doc_b_pp_fun[name] = ptr; + } + inline void add_function_p(string name, bool(*ptr)(const doc&, const point2d&) ) + { + doc_b_p_fun[name] = ptr; + } + private: + map<string, bool(*)(const doc&, const point2d&, const point2d&) > doc_b_pp_fun; + map<string, bool(*)(const doc&, const point2d&) > doc_b_p_fun; + mln::util::array<std::string> program_node; + mln::util::array<std::string> program_instruction; + mln::util::array<std::string> program_argument; + mln::util::array<std::string> program_argument2; + std::string fun_mask; + }; + } + } +} +#endif \ No newline at end of file diff --git a/scribo/sandbox/raphael/code/my/debug/remote/lib.hh b/scribo/sandbox/raphael/code/my/debug/remote/lib.hh new file mode 100644 index 0000000..97db857 --- /dev/null +++ b/scribo/sandbox/raphael/code/my/debug/remote/lib.hh @@ -0,0 +1,34 @@ +#ifndef MLN_DEBUG_DOCUMENT_REMOTE_LIB +#define MLN_DEBUG_DOCUMENT_REMOTE_LIB +#include <my/debug/remote/document_remote.hh> +using namespace mln; +namespace mymln +{ + namespace document + { + namespace debug + { + + template<typename L, typename F, typename D> + bool allign_V(const document<L,F,D>& doc, const point2d& A,const point2d& B){return doc.allign_V(A,B);} + template<typename L, typename F, typename D> + bool allign_V_line(const document<L,F,D>& doc, const point2d& A,const point2d& B){return doc.allign_V_line(A,B);} + template<typename L, typename F, typename D> + bool allign_V_line_strict(const document<L,F,D>& doc, const point2d& A,const point2d& B){return doc.allign_V_line_strict(A,B);} + template<typename L, typename F, typename D> + bool allign_V_large(const document<L,F,D>& doc, const point2d& A,const point2d& B){return doc.allign_V_large(A,B);} + + + template<typename L, typename F, typename D> + void load(const remote<L,F,D>& rem) + { + typedef document< L, F, D > doc; + rem.add_function_pp("allign_V_large", &(allign_V_large)); + rem.add_function_pp("allign_V_line_strict", &(allign_V_line_strict)); + rem.add_function_pp("allign_V_line", &(allign_V_line)); + rem.add_function_pp("allign_V", &(allign_V)); + } + } + } +} +#endif \ No newline at end of file diff --git a/scribo/sandbox/raphael/code/my/document/clean.hh b/scribo/sandbox/raphael/code/my/document/clean.hh index 9304dcc..cfff068 100644 --- a/scribo/sandbox/raphael/code/my/document/clean.hh +++ b/scribo/sandbox/raphael/code/my/document/clean.hh @@ -196,7 +196,20 @@ namespace mymln doc.add_to_line_link(v, q); doc.add_letter_coerce(q); } + else if( + doc.is_start_end_line(v) && + doc.allign_base_line(v, q) && + doc.allign_small_item(v,q) && + !doc.contain_alone_letter(v) && + doc.allign_proximity_large_left(v,q) && + doc.letter_ratio_YX(q) >= 1 + ) + { + doc.debug_draw_line_green_buffer(v,q); + doc.add_to_line_link(v,q); + } } + } } mask = doc.fun_mask_alone_letters(); @@ -380,9 +393,12 @@ namespace mymln { for_all(q) { - if(doc.same_line(q,v)){continue;} + + if(doc.same_line(q,v)){ continue;} + if(doc.contain_alone_letter(q)) { + if(doc.allign_V(q,v) && doc.allign_proximity_strict(q, v) && doc.allign_size_height(q, v)) { doc.add_to_line_link(v, q); @@ -391,7 +407,8 @@ namespace mymln } else if(doc.contain_line(q)) - { + { + if(doc.allign_V(q,v) && doc.allign_size_height_line_strict(q, v) && doc.allign_proximity_strict(q,v)) { doc.add_to_line_link(v, q); @@ -399,12 +416,13 @@ namespace mymln } else if(doc.allign_size_height_line(q,v)) { + if(doc.allign_proximity_line(q,v) && doc.allign_V_line_strict(q, v)) { doc.add_to_line_link(v, q); doc.debug_draw_line_green_buffer(v,q); } - else if(doc.line_influence_reciprocal(q, v) && doc.allign_V_line_strict(q, v)) + else if(doc.line_influence_reciprocal(q, v) && doc.allign_V_line_strict(q, v) && doc.allign_size_height_line(q,v)) { doc.add_to_line_link(v, q); doc.debug_draw_line_red_buffer(v,q); @@ -419,15 +437,22 @@ namespace mymln doc.allign_proximity_line(v,q) ) { - doc.debug_draw_line_orange_buffer(v,q); doc.debug_draw_box_red_buffer(v); doc.debug_draw_box_green_buffer(q); doc.add_to_line_link(v, q); } + + else if(doc.allign_V(q,v) && doc.allign_proximity_strict(q,v)) + { + doc.debug_draw_line_orange_buffer(q,v); + doc.add_to_line_link(v, q); + } } + } + } } } @@ -491,7 +516,7 @@ namespace mymln { if( doc.allign_H_large(q,v) && - doc.allign_size_height_line(q, v) && + doc.allign_size_height_line_medium(q, v) && doc.allign_proximity_V_line(v,q) && doc.allign_size_width_line(q, v) ) @@ -506,7 +531,7 @@ namespace mymln doc.add_to_paragraph(q); doc.add_to_paragraph_link(v, q); } - + doc.debug_draw_line_red_buffer(v,q); } } } @@ -518,7 +543,7 @@ namespace mymln if( doc.get_beginning_of_line(q) == doc[q] && doc.allign_H_large(q,v) && - doc.allign_size_height_line(q, v) && + doc.allign_size_height_line_medium(q, v) && doc.allign_size_width_line(q, v) && doc.allign_proximity_V_line(v,q) && doc.allign_bottom_line(q,v) @@ -546,7 +571,11 @@ namespace mymln } doc.add_to_paragraph(q); doc.add_to_paragraph_link(v, q); + + } + + doc.debug_draw_line_green_buffer(v,q); } } @@ -829,9 +858,10 @@ namespace mymln { doc.add_noise(KillMe[Killer]); doc.kill(KillMe[Killer]); + doc.invalidate_line_link(KillMe[Killer]); Killer++; } - + doc.propage_line_link(); } @@ -1000,7 +1030,7 @@ namespace mymln doc.return_next_line(doc.get_line_ID(v)) == doc.return_next_line(doc.get_line_ID(q)) && doc.return_previous_line(doc.get_line_ID(v)) == doc.return_previous_line(doc.get_line_ID(q)) && doc.allign_V_line(v, q) && - doc.allign_size_height_line(v, q) && + doc.allign_size_height_line_medium(v, q) && !doc.killed(doc[q]) ) { @@ -1175,15 +1205,20 @@ namespace mymln { for_all(q) { - if(doc.contain_line(q)) + if(doc.contain_line(q) && doc.same_line(q,v)) { - doc.debug_draw_line_orange_buffer(q,v); + if( + doc.letter_included_center(v,q) && doc.allign_small_item(v,q)) + { + doc.debug_draw_line_orange_buffer(v,q); + doc.merge(q,v); + } + } } } } doc.propage_line_link(); - doc.propage_paragraph_link(); } @@ -1219,6 +1254,11 @@ namespace mymln doc.debug_draw_line_green_buffer(q,v); doc.add_to_paragraph_link(v, q); } + else if(doc.allign_paragraph_center_strict(q,v)) + { + doc.debug_draw_line_orange_buffer(q,v); + doc.add_to_paragraph_link(v, q); + } } else { @@ -1234,9 +1274,78 @@ namespace mymln } - - - + + template<typename L, typename F, typename D> + void clean_paragraphs_first_line(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_all_letters(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + if(doc.contain_paragraph(v) && doc.get_paragraph_length(v) > 1 && doc.contain_start_paragraph(v)) + { + for_all(q) + { + if( + doc.same_paragraph(q,v) && + !doc.same_line(q,v) && + doc.allign_left(v,q) && + doc.allign_V_line(v,q) + ) + { + doc.debug_draw_line_green_buffer(q,v); + doc.debug_draw_box_green_buffer(q); + doc.add_to_line_link(v,q); + } + } + } + } + doc.propage_line_link(); + } + + + template<typename L, typename F, typename D> + void clean_paragraphs_couple(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_all_letters(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + if(doc.contain_paragraph(v) && doc.get_paragraph_length(v) == 1) + { + for_all(q) + { + if( + doc.contain_paragraph(q) && + doc.get_paragraph_length(q) == 1 && + !doc.same_paragraph(q,v) && + doc.allign_proximity_paragraph_up_medium(q,v) && + doc.compatible_paragraph_middle_width(q,v) && + !doc.decal_left_paragraph(q, v) && + doc.allign_top_paragraph(q,v) && + doc.allign_size_height_paragraph_line(q,v) && + (doc.contain_start_line(q) || doc.contain_start_line(v)) && // THESE TWO LINES CONATIN MAYBE SOME ERROR + doc.allign_H_paragraph(q,v) // FIX THE PROBLEM BEFORE TO START IT + ) + { + doc.debug_draw_line_green_buffer(q,v); + doc.add_to_paragraph_link(q,v); + } + } + } + } + doc.propage_paragraph_link(); + } template<typename L, typename F, typename D> diff --git a/scribo/sandbox/raphael/code/my/document/document.hh b/scribo/sandbox/raphael/code/my/document/document.hh index 219d245..c7fc0c1 100644 --- a/scribo/sandbox/raphael/code/my/document/document.hh +++ b/scribo/sandbox/raphael/code/my/document/document.hh @@ -52,6 +52,7 @@ namespace mymln all_letters_mask = fun::i2v::array<bool>(Areas + 1); Hseparator_mask = fun::i2v::array<bool>(Areas + 1); Vseparator_mask = fun::i2v::array<bool>(Areas + 1); + image_mask = fun::i2v::array<bool>(Areas + 1); noise_mask = fun::i2v::array<bool>(Areas + 1); temp_letter = fun::i2v::array<bool>(Areas + 1); alone_letters_mask = fun::i2v::array<bool>(Areas + 1); @@ -312,6 +313,8 @@ namespace mymln inline void add_to_line_link(const point2d& A, const point2d& B) { add_to_line_link(img_influ(A), img_influ(B)); } + inline void invalidate_line_link(const point2d& A) + { invalidate_line_link(img_influ(A)); } inline bool same_line(const point2d& A, const point2d& B) { return same_line(img_influ(A), img_influ(B)); } inline bool same_line(const Label A, const Label B) @@ -362,6 +365,9 @@ namespace mymln inline void jump_to_line(const point2d& point) { jump_to_line(img_influ(point)); } + inline bool contain_start_paragraph(const point2d& point) + { return contain_start_paragraph(img_influ(point)); } + inline bool contain_start_line(const point2d& point) { return contain_start_line(img_influ(point)); } @@ -388,7 +394,8 @@ namespace mymln inline void add_to_line_link(const Label A, const Label B) {lines_union.add_link(A, B);} - + inline void invalidate_line_link(const Label A) + {lines_union.invalidate_link(A);} inline void jump_to_line(const Label lbl) { if(lines_union[lbl] != 0) @@ -451,6 +458,9 @@ namespace mymln inline bool contain_start_line(const Label lbl) { return start_lines_mask(lbl);} + inline bool contain_start_paragraph(const Label lbl) + { return paragraphs_first_line[paragraphs_union[lbl]] == lines_union[lbl];} + inline bool contain_end_line(const Label lbl) { return start_lines_mask(lbl);} @@ -487,6 +497,7 @@ namespace mymln } void inline add(Label lbl, int link) { + image_mask(lbl) = false; all_mask(lbl) = true; if (link == 0){add_noise(lbl);} else if (link > 30){ add_separator(lbl);} @@ -521,6 +532,21 @@ namespace mymln {add_letter(img_influ(point)); } void inline add_letter_coerce(const point2d& point) {add_letter_coerce(img_influ(point)); } + + + void add_image(const Label lbl) + { + image_mask(lbl) = true; + separators_mask(lbl) = false; + containers_mask(lbl) = false; + Vseparator_mask(lbl) = false; + Hseparator_mask(lbl) = false; + alone_letters_mask(lbl) = false; + noise_mask(lbl) = false; + all_letters_mask(lbl) = false; + temp_letter = false; + } + void add_alone_letter(const point2d& point) {add_alone_letter(img_influ(point));} void add_alone_letter(const Label lbl) @@ -572,6 +598,41 @@ namespace mymln else add_noise(lbl); } + inline bool is_big_element_V(const point2d& point) + {return is_big_element_V(img_influ(point));} + inline bool is_big_element_V(const Label lbl) + { + return _bboxgp[lbl].len(0) > img_influ.domain().len(0) / 13; + } + inline bool is_big_element_H(const point2d& point) + {return is_big_element_H(img_influ(point));} + inline bool is_big_element_H(const Label lbl) + { + return _bboxgp[lbl].len(1) > img_influ.domain().len(1) / 13; + } + + + + + + inline bool is_very_big_element_V(const point2d& point) + {return is_very_big_element_V(img_influ(point));} + inline bool is_very_big_element_V(const Label lbl) + { + return _bboxgp[lbl].len(0) > img_influ.domain().len(0) / 6; + } + inline bool is_very_big_element_H(const point2d& point) + {return is_very_big_element_H(img_influ(point));} + inline bool is_very_big_element_H(const Label lbl) + { + return _bboxgp[lbl].len(1) > img_influ.domain().len(1) / 6; + } + + + + + + void inline add_container(const point2d& point) {add_container(img_influ(point)); } void add_container(const Label lbl) @@ -736,6 +797,7 @@ namespace mymln return allignV < label_size_(0, Left) && (_bboxgp[Left].pcenter()[0]) > (_bboxgp[Right].pcenter()[0]); } + inline bool allign_paragraph_center(const point2d& Left, const point2d& Right) {return allign_paragraph_center(img_influ(Left), img_influ(Right));} inline bool allign_paragraph_center(const Label Left, const Label Right) @@ -744,7 +806,14 @@ namespace mymln if(Diff < 0){Diff = -Diff;} return Diff < paragraphs_bbox[paragraphs_union[Left]].len(1)/ 30 && Diff < paragraphs_bbox[paragraphs_union[Right]].len(1) / 30; } - + inline bool allign_paragraph_center_strict(const point2d& Left, const point2d& Right) + {return allign_paragraph_center_strict(img_influ(Left), img_influ(Right));} + inline bool allign_paragraph_center_strict(const Label Left, const Label Right) + { + short int Diff = paragraphs_bbox[paragraphs_union[Left]].pcenter()[1] - paragraphs_bbox[paragraphs_union[Right]].pcenter()[1]; + if(Diff < 0){Diff = -Diff;} + return Diff < paragraphs_bbox[paragraphs_union[Left]].len(1)/ 60 && Diff < paragraphs_bbox[paragraphs_union[Right]].len(1) / 60; + } inline bool allign_line_center(const point2d& Left, const point2d& Right) {return allign_line_center(img_influ(Left), img_influ(Right));} @@ -1028,10 +1097,13 @@ namespace mymln { HA = HB; } return (DisA) < HA; } + + + inline bool allign_proximity_paragraph_up_medium( const point2d& Left, const point2d& Right) - {return allign_proximity_paragraph_up(img_influ(Left), img_influ(Right));} + {return allign_proximity_paragraph_up_medium(img_influ(Left), img_influ(Right));} inline bool allign_proximity_paragraph_up_medium( const Label Left, const Label Right) { @@ -1097,6 +1169,19 @@ namespace mymln + inline bool allign_size_height_line_medium( const point2d& Left, const point2d& Right) + { + return allign_size_height_line_medium(img_influ(Left), img_influ(Right)); + } + + inline bool allign_size_height_line_medium( const Label Left, const Label Right) + { + short int SizeL = lines_bbox[lines_union[Left]].len(0); + short int SizeR = lines_bbox[lines_union[Right]].len(0); + return SizeR > (SizeL / 1.8f) && SizeR < (SizeL * 1.8f); + } + + inline bool allign_size_height_line( const point2d& Left, const point2d& Right) { return allign_size_height_line(img_influ(Left), img_influ(Right)); @@ -1288,6 +1373,35 @@ namespace mymln } + + + inline bool allign_proximity_left( const point2d& Left, const point2d& Right) + {return allign_proximity_left(img_influ(Left), img_influ(Right));} + + inline bool allign_proximity_left( const Label Left, const Label Right) + { + box2d LB = _bboxgp[Left]; + box2d RB = _bboxgp[Right]; + + int DisA = LB.pmax()[1] - RB.pmin()[1]; + int DisB = RB.pmax()[1] - LB.pmin()[1]; + if(DisA < 0){DisA = -DisA;} + if(DisB < 0){DisB = -DisB;} + if(DisA > DisB) + { DisA = DisB; } + + unsigned int HA = LB.len(0); + unsigned int VA = LB.len(1); + + + if(VA > HA) + { HA = VA; } + return (DisA) * 3 < HA * 2; + } + + + + inline bool allign_proximity_large_left( const point2d& Left, const point2d& Right) {return allign_proximity_large_left(img_influ(Left), img_influ(Right));} @@ -1538,7 +1652,10 @@ namespace mymln allignV < lines_bbox[lines_union[Left]].len(0) && lines_bbox[lines_union[Left]].pcenter()[0] < lines_bbox[lines_union[Right]].pcenter()[0]; } - + inline bool is_start_end_line(const point2d& point) + {return is_start_end_line(img_influ(point));} + inline bool is_start_end_line(const Label lbl) + {return start_end_lines_mask(lbl);} inline bool allign_bottom(const point2d& Left, const point2d& Right) {return allign_bottom(img_influ(Left), img_influ(Right));} inline bool allign_bottom(const Label Left, const Label Right) @@ -2033,6 +2150,8 @@ namespace mymln { mymln::debug::save_label_image(img, implicit_separators_union , file);} vertex_image<point2d,bool> fun_mask_separators() { return fun_mask_(separators_mask); } + vertex_image<point2d,bool> fun_mask_V_separators() + { return fun_mask_(Vseparator_mask); } vertex_image<point2d,bool> fun_mask_containers() { return fun_mask_(containers_mask); } vertex_image<point2d,bool> fun_mask_alone_letters() @@ -2047,6 +2166,8 @@ namespace mymln { return fun_mask_(all_mask); } + vertex_image<point2d,bool> fun_mask_image() + { return fun_mask_(image_mask); } vertex_image<point2d,bool> fun_mask_letters() { return fun_mask_(letters_mask); } vertex_image<point2d,bool> fun_mask_start_lines() @@ -2195,6 +2316,15 @@ namespace mymln _bboxgp[Par1].has(_bboxgp[Par2].pmax()) ; } + inline bool letter_included_center(point2d Par1, point2d Par2) + { return letter_included_center(img_influ(Par1), img_influ(Par2)); } + inline bool letter_included_center(Label Par1, Label Par2) + { + return + _bboxgp[Par1].has(_bboxgp[Par2].pcenter()); + } + + inline bool paragraph_included_influence(point2d Par1, point2d Par2) { return paragraph_included_influence(img_influ(Par1), img_influ(Par2)); } inline bool paragraph_included_influence(Label Par1, Label Par2) @@ -3258,7 +3388,7 @@ namespace mymln fun::i2v::array<bool> noise_mask; fun::i2v::array<bool> kill_mask; fun::i2v::array<bool> all_mask; - + fun::i2v::array<bool> image_mask; mln::util::array<std::string> tag_lbl; mln::util::array<bool> Btag_lbl; diff --git a/scribo/sandbox/raphael/code/my/document/separator.hh b/scribo/sandbox/raphael/code/my/document/separator.hh index 9c39f20..aa5ace9 100644 --- a/scribo/sandbox/raphael/code/my/document/separator.hh +++ b/scribo/sandbox/raphael/code/my/document/separator.hh @@ -10,7 +10,37 @@ namespace mymln { namespace separators { - //TODO: CHANGER contain_Hseparator en VSeparator Le H c etait pour le test + + + template<typename L, typename F, typename D> + void separators_find_wrong(mymln::document::document<L,F,D>& doc) + { + + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_V_separators(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + mymln::util::union_find<L> sep_union(doc.size()); + for_all(v) + { + if(doc.contain_letter(v)) + { + for_all(q) + { + if(doc.is_big_element_V(q)){continue;} + if(doc.allign_proximity_strict(q,v) && doc.allign_V(q,v) && doc.allign_size(q,v)) + {doc.debug_draw_line_red_buffer(q,v); doc.add_letter_coerce(q);} + else if(doc.allign_V(q,v) && doc.allign_size(q,v) && doc.allign_proximity_left(v,q)) + {doc.debug_draw_line_red_buffer(q,v); doc.add_letter_coerce(q);} + } + } + } + + } + template<typename L, typename F, typename D> void separators_rebuild(mymln::document::document<L,F,D>& doc) { @@ -27,8 +57,11 @@ namespace mymln if(!doc[v]){continue;} if(doc.contain_Vseparator(doc[v]) && !sep_union[doc[v]]) { + sep_union[doc[v]] = sep_union.new_set(); sep_union.add_self_link(doc[v]); + if(doc.is_very_big_element_V(v)) + { continue; } } for_all(q) { @@ -256,6 +289,11 @@ namespace mymln count[doc[q]]++; } } + else if(doc.allign_proximity_strict(q,v) && doc.allign_left(v,q) && doc.allign_V(q,v) && doc.same_line(q, v)) + { + count[doc[q]]++; + doc.debug_draw_line_orange_buffer(v, q); + } } } @@ -308,6 +346,11 @@ namespace mymln doc.debug_draw_line_green_buffer(v, q); } } + else if(doc.allign_proximity_strict(q,v) && doc.allign_right(v,q) && doc.allign_V(q,v) && doc.same_line(q, v)) + { + count[doc[q]]++; + doc.debug_draw_line_orange_buffer(v, q); + } } } diff --git a/scribo/sandbox/raphael/code/my/runtime/lib.hh b/scribo/sandbox/raphael/code/my/runtime/lib.hh index b3100f9..f60a995 100644 --- a/scribo/sandbox/raphael/code/my/runtime/lib.hh +++ b/scribo/sandbox/raphael/code/my/runtime/lib.hh @@ -17,6 +17,7 @@ namespace mymln run.add_function("separators.make_clean_left", &(mymln::document::separators::separators_find_allign)); run.add_function("separators.rebuild", &(mymln::document::separators::separators_rebuild)); run.add_function("separators.merge", &(mymln::document::separators::separators_merge)); + run.add_function("separators.find_wrong", &(mymln::document::separators::separators_find_wrong)); } @@ -60,6 +61,11 @@ namespace mymln run.add_function("clean.finalize_paragraph", &(mymln::document::clean_finalize_paragraph)); run.add_function("clean.center_paragraphs", &(mymln::document::clean_center_paragraphs)); + + + run.add_function("clean.paragraphs_couple", &(mymln::document::clean_paragraphs_couple)); + + run.add_function("clean.paragraphs_first_line", &(mymln::document::clean_paragraphs_first_line)); } template<typename L, typename F, typename D> diff --git a/scribo/sandbox/raphael/code/test.cc b/scribo/sandbox/raphael/code/test.cc index 6f33db5..3eab190 100644 --- a/scribo/sandbox/raphael/code/test.cc +++ b/scribo/sandbox/raphael/code/test.cc @@ -1,4 +1,4 @@ - +#define NREMOTE #include <vector> #include <mln/io/pbm/all.hh> #include <mln/io/ppm/all.hh> @@ -51,6 +51,10 @@ #include <my/data/page.hh> #include <my/preprocessing/preprocessing.hh> +#ifndef NREMOTE +#include <my/debug/remote/document_remote.hh> +#include <my/debug/remote/lib.hh> +#endif using namespace mln; using namespace std; @@ -252,11 +256,23 @@ void Process(std::string File, std::string Dir, mymln::runtime::runtime< value:: } - - +#ifndef NREMOTE +// THIS IS USED TO CREATE A FILTER WITHOUT RECOMPILING +mymln::document::debug::remote< value::int_u<16> ,float,short> rem; +template<typename L, typename F, typename D> + void clean_remote(mymln::document::document<L,F,D>& doc) + { + rem.filter(doc); + } +#endif + + int main( int argc, char** argv) { mymln::runtime::runtime< value::int_u<16> ,float,short> run; + #ifndef NREMOTE + rem = mymln::document::debug::remote< value::int_u<16> ,float,short>(); + #endif mymln::runtime::load_clean(run); mymln::runtime::load_debug(run); mymln::runtime::load_cooking(run); @@ -269,6 +285,7 @@ int main( int argc, char** argv) { bool dir = false; bool prog = false; + bool remote = false; std::string Dir = ""; std::string Prog = ""; for(int N = 1 ; N < argc; N++) @@ -287,12 +304,26 @@ int main( int argc, char** argv) prog = false; } + #ifndef NREMOTE + else if(remote) + { + Prog = argv[N]; + rem.load(Prog.c_str()); + remote = false; + run.add_function("@remote", clean_remote); + mymln::document::debug::load(rem); + } + #endif else { if(!strcmp(argv[N], "-D")) { dir = true;} else if(!strcmp(argv[N], "-P")) { prog = true; } + #ifndef NREMOTE + else if(!strcmp(argv[N], "--Remote")) + { remote = true; } + #endif else { Process(argv[N], Dir, run); } } -- 1.7.2.5

13 years, 4 months

last-svn-commit-890-ga709ecb Fix bug with finalize function. Add functions to recognize pictures.

by Raphael Boissel

--- scribo/sandbox/raphael/code/my/document/clean.hh | 98 ++++++++++++++++++-- .../sandbox/raphael/code/my/document/document.hh | 95 ++++++++++++++++++- scribo/sandbox/raphael/code/my/document/image.hh | 81 ++++++++++++++++ scribo/sandbox/raphael/code/my/document/outline.hh | 52 ++++++++++ scribo/sandbox/raphael/code/my/runtime/lib.hh | 8 ++- scribo/sandbox/raphael/code/test.cc | 2 - 6 files changed, 319 insertions(+), 17 deletions(-) diff --git a/scribo/sandbox/raphael/code/my/document/clean.hh b/scribo/sandbox/raphael/code/my/document/clean.hh index cfff068..cf61a1c 100644 --- a/scribo/sandbox/raphael/code/my/document/clean.hh +++ b/scribo/sandbox/raphael/code/my/document/clean.hh @@ -144,7 +144,7 @@ namespace mymln if((!doc.contain_line(q))) { // draw::line(out, q,v, mln::literal::blue); - if(doc.allign_V(q,v) && doc.allign_size(q, v) && doc.allign_proximity_large(q, v) ) + if(doc.allign_V(q,v) && doc.allign_size_medium(q, v) && doc.allign_proximity_large(q, v) ) { doc.add_to_line_link(v, q); All_Alone = false; @@ -152,7 +152,7 @@ namespace mymln } else { - if(doc.allign_V(q,v) && doc.allign_size(q, v) && doc.allign_proximity_large(q, v)) + if(doc.allign_V(q,v) && doc.allign_size_medium(q, v) && doc.allign_proximity_large(q, v)) { doc.add_to_line_link(q, v); All_Alone = false; @@ -303,6 +303,53 @@ namespace mymln doc.propage_line_link(); doc.recook_lines(); } + + + + + + template<typename L, typename F, typename D> + void clean_apostrophe_items(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_start_end_lines(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + if(doc.contain_line(v) ) + { + for_all(q) + { + if( + doc.get_line_length(q) == 1 && + doc.line_reciprocal(q,v) && + doc.allign_top(v,q) && + doc.letter_ratio_YX(q) > 1 && + !doc.allign_H_tube(v,q) && + doc.allign_proximity_strict_left(v,q) && + doc.allign_small_item_large(v,q) + + ) + { + doc.debug_draw_line_green_buffer(q,v); + doc.add_to_line_link(v,q); + } + } + } + } + doc.propage_line_link(); + doc.recook_lines(); + } + + + + + + template<typename L, typename F, typename D> void clean_line_link_item(mymln::document::document<L,F,D>& doc) @@ -474,7 +521,7 @@ namespace mymln L End = 0; for_all(q) { - if(doc.allign_V(q,v) && doc.allign_size(q, v) && doc.allign_proximity(q,v)) + if(doc.allign_V(q,v) && doc.allign_size_medium(q, v) && doc.allign_proximity(q,v)) { if(doc[q] == doc.get_beginning_of_line(q)) {Start = doc[q]; } @@ -485,7 +532,7 @@ namespace mymln } if(Start && End){doc.add_to_line_link(Start, doc[v]);} } - doc.propage_paragraph_link(); + doc.propage_line_link(); } @@ -1167,10 +1214,14 @@ namespace mymln doc.return_previous_line(doc[q]) == doc.return_previous_line(doc[v]) ) { - if(doc.get_line_length(q) < 4 || doc.get_line_length(v) < 4 ) - doc.debug_draw_line_green_buffer(q,v); - doc.add_to_line_link(v, q); - doc.add_to_paragraph_link(v, q); + //if(doc.get_line_length(q) < 4 || doc.get_line_length(v) < 4 ) + + if(doc.get_paragraph_length(v) < 3 || doc.get_line_length(q) < 3) + { + doc.debug_draw_line_green_buffer(q,v); + doc.add_to_line_link(v, q); + doc.add_to_paragraph_link(v, q); + } } } } @@ -1396,10 +1447,37 @@ namespace mymln doc.propage_paragraph_link(); } + template<typename L, typename F, typename D> + void clean_ellipsis(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_start_end_lines(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + for_all(q) + { + if( + doc.get_line_length(q) == 3 && + doc.allign_base_line_line_strict(v, q) && + doc.allign_smaller_line_strict(v,q) && + doc.allign_proximity_large_left(v,q) + ) + { + doc.debug_draw_line_green_buffer(q,v); + doc.add_to_line_link(v,q); + } + } + } + doc.propage_line_link(); + } - - + } diff --git a/scribo/sandbox/raphael/code/my/document/document.hh b/scribo/sandbox/raphael/code/my/document/document.hh index c7fc0c1..1d50e5c 100644 --- a/scribo/sandbox/raphael/code/my/document/document.hh +++ b/scribo/sandbox/raphael/code/my/document/document.hh @@ -58,6 +58,7 @@ namespace mymln alone_letters_mask = fun::i2v::array<bool>(Areas + 1); implicit_separators_left_mask = fun::i2v::array<bool>(Areas + 1); implicit_separators_right_mask = fun::i2v::array<bool>(Areas + 1); + anomaly_mask = fun::i2v::array<bool>(Areas + 1); kill_mask = fun::i2v::array<bool>(Areas + 1); all_mask = fun::i2v::array<bool>(Areas + 1); CImpSep = 1; @@ -509,6 +510,7 @@ namespace mymln /* SET UP SPECIAL MASK TO FALSE */ implicit_separators_left_mask(lbl) = false; implicit_separators_right_mask(lbl) = false; + anomaly_mask(lbl) = false; kill_mask(lbl) = false; temp_letter(lbl) = false; } @@ -547,6 +549,25 @@ namespace mymln temp_letter = false; } + + + void add_anomaly(const point2d& point) + {add_anomaly(img_influ(point));} + void add_anomaly(const Label lbl) + {anomaly_mask(lbl) = true;} + + + void remove_anomaly(const point2d& point) + {remove_anomaly(img_influ(point));} + void remove_anomaly(const Label lbl) + {anomaly_mask(lbl) = false;} + + + bool contain_anomaly(const point2d& point) + {return contain_anomaly(img_influ(point));} + void contain_anomaly(const Label lbl) + {return anomaly_mask(lbl);} + void add_alone_letter(const point2d& point) {add_alone_letter(img_influ(point));} void add_alone_letter(const Label lbl) @@ -1399,7 +1420,26 @@ namespace mymln return (DisA) * 3 < HA * 2; } - + inline bool allign_proximity_strict_left( const point2d& Left, const point2d& Right) + {return allign_proximity_strict_left(img_influ(Left), img_influ(Right));} + + inline bool allign_proximity_strict_left( const Label Left, const Label Right) + { + box2d LB = _bboxgp[Left]; + box2d RB = _bboxgp[Right]; + + int DisA = LB.pmax()[1] - RB.pmin()[1]; + int DisB = RB.pmax()[1] - LB.pmin()[1]; + if(DisA < 0){DisA = -DisA;} + if(DisB < 0){DisB = -DisB;} + if(DisA > DisB) + { DisA = DisB; } + unsigned int HA = LB.len(0); + unsigned int VA = LB.len(1); + if(VA > HA) + { HA = VA; } + return (DisA) * 2 < HA; + } inline bool allign_proximity_large_left( const point2d& Left, const point2d& Right) @@ -1499,6 +1539,23 @@ namespace mymln } + inline bool allign_size_medium( const point2d& Left, const point2d& Right) + {return allign_size_medium(img_influ(Left), img_influ(Right));} + + inline bool allign_size_medium( const Label Left, const Label Right) + { + short int SizeL0 = label_size_(0, Left); + short int SizeR0 = label_size_(0, Right); + short int SizeL1 = label_size_(1, Left); + short int SizeR1 = label_size_(1, Right); + short int Swap = 0; + if(SizeL0 < SizeL1) + { SizeL0 = SizeL1; } + if(SizeR0 < SizeR1){SizeR0 = SizeR1;} + return SizeR0 > (SizeL0 / 3) && SizeR0 < (SizeL0 * 3); + } + + inline bool allign_size_height_max( const point2d& Left, const point2d& Right) {return allign_size_height_max(img_influ(Left), img_influ(Right));} @@ -1567,7 +1624,14 @@ namespace mymln lines_bbox[lines_union[Left]].len(0) < (_bboxgp[Right].len(0) * 12) && lines_bbox[lines_union[Left]].len(0) > (_bboxgp[Right].len(0) * 2); } - + inline bool allign_small_item_large( const point2d& Left, const point2d& Right) + {return allign_small_item_large(img_influ(Left), img_influ(Right));} + inline bool allign_small_item_large( Label Left, Label Right) + { + return + lines_bbox[lines_union[Left]].len(0) < (_bboxgp[Right].len(0) * 12) && + lines_bbox[lines_union[Left]].len(0)*2 > (_bboxgp[Right].len(0) * 3); + } inline bool allign_small_item_line( const point2d& Left, const point2d& Right) {return allign_small_item(img_influ(Left), img_influ(Right));} inline bool allign_small_item_line( Label Left, Label Right) @@ -1594,7 +1658,12 @@ namespace mymln { return lines_bbox[lines_union[Left]].len(0) > (lines_bbox[lines_union[Right]].len(0) * 2); } - + inline bool allign_smaller_line_strict( const point2d& Left, const point2d& Right) + {return allign_smaller_line_strict(img_influ(Left), img_influ(Right));} + inline bool allign_smaller_line_strict( Label Left, Label Right) + { + return lines_bbox[lines_union[Left]].len(0) > (lines_bbox[lines_union[Right]].len(0) * 3); + } inline bool allign_smaller_line_letter( const point2d& Left, const point2d& Right) {return allign_smaller_line_letter(img_influ(Left), img_influ(Right));} inline bool allign_smaller_line_letter( Label Left, Label Right) @@ -2170,6 +2239,8 @@ namespace mymln { return fun_mask_(image_mask); } vertex_image<point2d,bool> fun_mask_letters() { return fun_mask_(letters_mask); } + vertex_image<point2d,bool> fun_mask_anomalies() + { return fun_mask_(anomaly_mask); } vertex_image<point2d,bool> fun_mask_start_lines() { return fun_mask_(start_lines_mask); } vertex_image<point2d,bool> fun_mask_end_lines() @@ -2353,6 +2424,18 @@ namespace mymln paragraphs_bbox[paragraphs_union[Par1]].has(paragraphs_bbox[paragraphs_union[Par2]].pmax()) ; } + inline bool line_reciprocal(const point2d& L1, const point2d& L2) + {return line_reciprocal(img_influ(L1), img_influ(L2));} + + inline bool line_reciprocal(Label L1, Label L2) + { + return + lines_bbox[lines_union[L1]].has(lines_bbox[lines_union[L2]].pmin()) || + lines_bbox[lines_union[L1]].has(lines_bbox[lines_union[L2]].pmax()) || + lines_bbox[lines_union[L2]].has(lines_bbox[lines_union[L1]].pmin()) || + lines_bbox[lines_union[L2]].has(lines_bbox[lines_union[L1]].pmax()) ; + } + inline bool line_influence_reciprocal(const point2d& L1, const point2d& L2) {return line_influence_reciprocal(img_influ(L1), img_influ(L2));} @@ -2541,9 +2624,12 @@ namespace mymln } inline bool contain_implicit_separator(const point2d& point) { return contain_implicit_separator(img_influ(point)); } - + inline bool contain_noise(const point2d& point) + { return contain_noise(img_influ(point)); } inline bool contain_implicit_separator(const Label lbl) {return implicit_separators_union[lbl] != 0; } + inline bool contain_noise(const Label lbl) + {return noise_mask(lbl); } inline void merge_separators(const point2d& A, const point2d& B) { @@ -3389,6 +3475,7 @@ namespace mymln fun::i2v::array<bool> kill_mask; fun::i2v::array<bool> all_mask; fun::i2v::array<bool> image_mask; + fun::i2v::array<bool> anomaly_mask; mln::util::array<std::string> tag_lbl; mln::util::array<bool> Btag_lbl; diff --git a/scribo/sandbox/raphael/code/my/document/image.hh b/scribo/sandbox/raphael/code/my/document/image.hh index e69de29..158be87 100644 --- a/scribo/sandbox/raphael/code/my/document/image.hh +++ b/scribo/sandbox/raphael/code/my/document/image.hh @@ -0,0 +1,81 @@ +#ifndef INC_IMAGE_DOC +#define INC_IMAGE_DOC +#include<my/document/document.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> +#include <mln/core/image/vertex_image.hh> +using namespace mln; + +namespace mymln +{ + namespace document + { + template<typename L, typename F, typename D> + void image_bad_paragraph(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_all_letters(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + if( + doc.contain_paragraph(v) && + doc.get_paragraph_length(v) == 1 && + doc.get_line_length(v) < 4 + + ) + { + for_all(q) + { + if + ( + doc.contain_noise(q) + + + ) + { + doc.debug_draw_line_green_buffer(q,v); + doc.debug_draw_box_green_buffer(v); + } + } + } + } + doc.propage_line_link(); + } + + template<typename L, typename F, typename D> + void image_anomalies_paragraph(mymln::document::document<L,F,D>& doc) + { + typedef vertex_image<point2d,bool> v_ima_g; + typedef p_vertices<mln::util::graph, fun::i2v::array<mln::point2d> > g_vertices_p; + v_ima_g mask = doc.fun_mask_all_letters(); + mln_piter_(v_ima_g) v(mask.domain()); + typedef graph_elt_neighborhood_if<mln::util::graph, g_vertices_p, v_ima_g> nbh_t; + nbh_t nbh(mask); + mln_niter_(nbh_t) q(nbh, v); + for_all(v) + { + if( + doc.contain_paragraph(v) && + doc.get_paragraph_length(v) < 3 && + doc.get_line_length(v) < 4 + ) + { + for_all(q) + { + if(doc.contain_noise(q)) + { + doc.debug_draw_line_green_buffer(q,v); + doc.debug_draw_box_green_buffer(v); + } + } + } + } + doc.propage_line_link(); + } + } +} +#endif \ No newline at end of file diff --git a/scribo/sandbox/raphael/code/my/document/outline.hh b/scribo/sandbox/raphael/code/my/document/outline.hh index cff52e3..e6244d4 100644 --- a/scribo/sandbox/raphael/code/my/document/outline.hh +++ b/scribo/sandbox/raphael/code/my/document/outline.hh @@ -59,7 +59,59 @@ namespace mymln return out; } + template <typename I, typename N> + image2d<bool> threshold(const Image<I>& iz_, const Neighborhood<N>& nbh_) + { + const I& iz = exact(iz_); + const N& nbh = exact(nbh_); + + + image2d<bool> out(iz.domain()); + + mln_pixter(const I) p(iz); + mln_nixter(const I, N) n(p, nbh); + + for_all(p) + { + unsigned int count = 0; + int variate = 0; + for_all(n) + { + variate += n.val(); + count++; + } + variate /= count; + variate -= p.val(); + if(variate > 10) + { + out.element(p.offset()) = true; + } + } + + + for_all(p) + { + unsigned int count = 0; + int variate = 0; + if(out.element(p.offset())) + { + for_all(n) + { + if(out.element(n.offset())) + count++; + } + if(count == 0) + { + out.element(p.offset()) = false; + } + } + } + + + + return out; + } template <typename I, typename N> image2d<value::int_u8> luminance(const Image<I>& iz_) { diff --git a/scribo/sandbox/raphael/code/my/runtime/lib.hh b/scribo/sandbox/raphael/code/my/runtime/lib.hh index f60a995..951c571 100644 --- a/scribo/sandbox/raphael/code/my/runtime/lib.hh +++ b/scribo/sandbox/raphael/code/my/runtime/lib.hh @@ -1,6 +1,6 @@ #ifndef INC_RUNTIME_LIB #define INC_RUNTIME_LIB - +#include<my/document/image.hh> using namespace mln; using namespace std; namespace mymln @@ -66,6 +66,12 @@ namespace mymln run.add_function("clean.paragraphs_couple", &(mymln::document::clean_paragraphs_couple)); run.add_function("clean.paragraphs_first_line", &(mymln::document::clean_paragraphs_first_line)); + run.add_function("clean.ellipsis", &(mymln::document::clean_ellipsis)); + run.add_function("clean.apostrophe_items", &(mymln::document::clean_apostrophe_items)); + + + run.add_function("image.bad_paragraph", &(mymln::document::image_bad_paragraph)); + run.add_function("image.anomalies_paragraph", &(mymln::document::image_anomalies_paragraph)); } template<typename L, typename F, typename D> diff --git a/scribo/sandbox/raphael/code/test.cc b/scribo/sandbox/raphael/code/test.cc index 3eab190..99d6600 100644 --- a/scribo/sandbox/raphael/code/test.cc +++ b/scribo/sandbox/raphael/code/test.cc @@ -44,7 +44,6 @@ #include <my/document/separator.hh> #include <my/document/clean.hh> #include <my/document/recognition.hh> - #include <my/runtime/runtime.hh> #include <my/runtime/lib.hh> @@ -72,7 +71,6 @@ void Process(std::string File, std::string Dir, mymln::runtime::runtime< value:: /* CREATE GRAPH */ typedef value::int_u<16> uint16; image2d<bool> ima; - mln::util::timer timer; timer.start(); io::pbm::load(ima, Dir + "/" + File); -- 1.7.2.5

13 years, 4 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