- Olena-patches

[PATCH 01/19] Rename graph morphology application complex1d to samples-complex1d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/complex1d.cc: Rename as... * apps/graph-morpho/samples-complex1d.cc: ...this. * apps/graph-morpho/Makefile.am (noinst_PROGRAMS): Adjust. --- milena/ChangeLog | 8 ++++++++ milena/apps/graph-morpho/Makefile.am | 6 +++--- .../{complex1d.cc => samples-complex1d.cc} | 0 3 files changed, 11 insertions(+), 3 deletions(-) rename milena/apps/graph-morpho/{complex1d.cc => samples-complex1d.cc} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7e852dc..715b86b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2009-09-16 Roland Levillain <roland(a)lrde.epita.fr> + + Rename graph morphology application complex1d to samples-complex1d. + + * apps/graph-morpho/complex1d.cc: Rename as... + * apps/graph-morpho/samples-complex1d.cc: ...this. + * apps/graph-morpho/Makefile.am (noinst_PROGRAMS): Adjust. + 2009-09-21 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small changes. diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index f3440c4..b1668b2 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -20,9 +20,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -noinst_PROGRAMS = complex1d -complex1d_SOURCES = complex1d.cc io.hh morpho.hh +noinst_PROGRAMS = samples-complex1d +samples_complex1d_SOURCES = samples-complex1d.cc io.hh morpho.hh -TESTS = complex1d +TESTS = samples-complex1d EXTRA_DIST = x.pbm y.pbm z.pbm diff --git a/milena/apps/graph-morpho/complex1d.cc b/milena/apps/graph-morpho/samples-complex1d.cc similarity index 100% rename from milena/apps/graph-morpho/complex1d.cc rename to milena/apps/graph-morpho/samples-complex1d.cc -- 1.6.4.2

1 0

4494: Filter results in QA Scripts.
by Guillaume Lazzara 21 Sep '09

21 Sep '09

* build-aux/mln_check_all_hh_inclusions, * build-aux/mln_check_missing_all_hh_headers: Filter non relevant results. --- ChangeLog | 8 ++++++++ build-aux/mln_check_all_hh_inclusions | 12 ++++++++++-- build-aux/mln_check_missing_all_hh_headers | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7fa700..2946671 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-09-21 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Filter results in QA Scripts. + + * build-aux/mln_check_all_hh_inclusions, + * build-aux/mln_check_missing_all_hh_headers: Filter non relevant + results. + 2009-09-10 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/apps/data.hh. diff --git a/build-aux/mln_check_all_hh_inclusions b/build-aux/mln_check_all_hh_inclusions index 23b781c..e48992d 100755 --- a/build-aux/mln_check_all_hh_inclusions +++ b/build-aux/mln_check_all_hh_inclusions @@ -34,7 +34,14 @@ check() abs_dir=`abs_filepath $1` mln_based_dir=`mln_based_path $1` -# Checking local all.hh + + # Omitting internal directories. + # They are not supposed to contain all.hh files. + if [ -z "`echo $abs_dir | grep -v internal`" ]; then + return + fi + + # Checking local all.hh if ! [ -e "$abs_dir/all.hh" ]; then echo "WARNING: no all.hh header in $mln_based_dir" >&2 return @@ -81,7 +88,8 @@ fi while [ $# -ne 0 ]; do - if [ "`basename $1`" != "all.hh" ]; then + if [ "`basename $1`" != "all.hh" ] && [ "`basename $1`" != "essential.hh" ]; then + check $1 "$report" fi shift diff --git a/build-aux/mln_check_missing_all_hh_headers b/build-aux/mln_check_missing_all_hh_headers index 4062076..338189b 100755 --- a/build-aux/mln_check_missing_all_hh_headers +++ b/build-aux/mln_check_missing_all_hh_headers @@ -32,7 +32,7 @@ check() local abs_path=`abs_filepath $1/all.hh` # Checking local all.hh - for dir in `find "$abs_path" -type d`; do + for dir in `find "$abs_path" -type d | grep -v internal`; do if ! [ -e "$dir/all.hh" ]; then path=`mln_based_path $dir/all.hh` if [ -z "$2" ]; then -- 1.5.6.5

1 0

4493: Small changes.
by Guillaume Lazzara 21 Sep '09

21 Sep '09

* mln/geom/translate.hh: Add a missing header. * mln/linear/gaussian.hh: Fix compilation warnings. * mln/io/plot/save.hh, * mln/value/hsl.hh: Add fixmes according to Yann's comments. --- milena/ChangeLog | 11 +++++++++++ milena/mln/geom/translate.hh | 2 ++ milena/mln/io/plot/save.hh | 6 ++++-- milena/mln/linear/gaussian.hh | 16 ++++++++-------- milena/mln/value/hsl.hh | 2 ++ 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba5ebd3..7e852dc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-09-21 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Small changes. + + * mln/geom/translate.hh: Add a missing header. + + * mln/linear/gaussian.hh: Fix compilation warnings. + + * mln/io/plot/save.hh, + * mln/value/hsl.hh: Add fixmes according to Yann's comments. + 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * mln/linear/gaussian.hh: Make linear::gaussian more generic. diff --git a/milena/mln/geom/translate.hh b/milena/mln/geom/translate.hh index 334edc8..ea3c65f 100644 --- a/milena/mln/geom/translate.hh +++ b/milena/mln/geom/translate.hh @@ -44,6 +44,8 @@ # include <mln/literal/zero.hh> +# include <mln/geom/bbox.hh> + namespace mln { diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index 3541b55..1a01267 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -66,9 +66,11 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> + + // FIXME: Make it generic. + template <typename T> inline - void save(const image1d& ima, const std::string& filename) + void save(const image1d<T>& ima, const std::string& filename) { trace::entering("mln::io::plot::save"); diff --git a/milena/mln/linear/gaussian.hh b/milena/mln/linear/gaussian.hh index 50cb8bb..9c64fe2 100644 --- a/milena/mln/linear/gaussian.hh +++ b/milena/mln/linear/gaussian.hh @@ -398,7 +398,7 @@ namespace mln if (dir == 0) { // Apply on rows. - for (unsigned j = geom::min_col(img); j <= geom::max_col(img); ++j) + for (def::coord j = geom::min_col(img); j <= geom::max_col(img); ++j) recursivefilter_<mln_value(I)>(img, coef, point2d(static_cast<def::coord>(geom::min_row(img) - img.border()), static_cast<def::coord>(j)), @@ -412,7 +412,7 @@ namespace mln if (dir == 1) { // Apply on columns. - for (unsigned i = geom::min_row(img); i <= geom::max_row(img); ++i) + for (def::coord i = geom::min_row(img); i <= geom::max_row(img); ++i) recursivefilter_<mln_value(I)>(img, coef, point2d(static_cast<def::coord>(i), static_cast<def::coord>(geom::min_col(img) - img.border())), @@ -436,8 +436,8 @@ namespace mln if (dir == 0) { // Apply on slices. - for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) - for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) + for (def::coord j = geom::min_row(img); j <= geom::max_row(img); ++j) + for (def::coord k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(-img.border()), static_cast<def::coord>(j), @@ -455,8 +455,8 @@ namespace mln if (dir == 1) { // Apply on rows. - for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) - for (unsigned k = geom::min_col(img); k <= geom::max_col(img); ++k) + for (def::coord i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (def::coord k = geom::min_col(img); k <= geom::max_col(img); ++k) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(-img.border()), @@ -473,8 +473,8 @@ namespace mln if (dir == 2) { // Apply on columns. - for (unsigned i = geom::min_sli(img); i <= geom::max_sli(img); ++i) - for (unsigned j = geom::min_row(img); j <= geom::max_row(img); ++j) + for (def::coord i = geom::min_sli(img); i <= geom::max_sli(img); ++i) + for (def::coord j = geom::min_row(img); j <= geom::max_row(img); ++j) recursivefilter_<mln_value(I)>(img, coef, point3d(static_cast<def::coord>(i), static_cast<def::coord>(j), diff --git a/milena/mln/value/hsl.hh b/milena/mln/value/hsl.hh index f27bcbb..0901904 100644 --- a/milena/mln/value/hsl.hh +++ b/milena/mln/value/hsl.hh @@ -199,6 +199,8 @@ namespace mln L lum_; }; + + // FIXME: Use float01_8/float01_16 ? typedef hsl_<float, float, float> hsl_f; typedef hsl_<double, double, double> hsl_d; -- 1.5.6.5

1 0

r4492: Fix index value bug
by Fabien Freling 17 Sep '09

17 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-09-17 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix index value bug. * fabien/mln/core/image/cache.hh: Fix index value bug. * fabien/tests/core/image/tiled2d.cc: Minor update. --- mln/core/image/cache.hh | 2 +- tests/core/image/tiled2d.cc | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) Index: trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4491) +++ trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4492) @@ -43,7 +43,7 @@ mln_piter_(tiled2d<rgb8>) p(tiled_ima.domain()); for_all(p) - if (p.row() % 256 == 0) + if (p.row() % 16 == 0) { //std::cout << tiled_ima(p); tiled_ima(p) = literal::green; @@ -51,9 +51,5 @@ //mln_assertion(tiled_ima(p) == ima(p)); } - /*for_all(p) - if (p.col() % 16 == 0) - tiled_ima(p) = literal::purple;*/ - return 0; } Index: trunk/milena/sandbox/fabien/mln/core/image/cache.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 4491) +++ trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 4492) @@ -171,7 +171,7 @@ else // We must find which page to discard. { unsigned min = this->order_[0]; - unsigned new_index = 0; + new_index = 0; for (unsigned i = 1; i < this->pages_.nelements(); ++i) { if (this->order_[i] < min)

1 0

r4491: Implement basic LRU cache algorithm
by Fabien Freling 16 Sep '09

16 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-09-16 Fabien Freling <fabien.freling(a)lrde.epita.fr> Implement basic LRU cache algorithm. * fabien/mln/core/image/cache.hh: Implement basic LRU cache algorithm. * fabien/tests/core/image/tiled2d.cc: Minor update. --- mln/core/image/cache.hh | 67 +++++++++++++++++++++++++++++++++++--------- tests/core/image/tiled2d.cc | 2 - 2 files changed, 55 insertions(+), 14 deletions(-) Index: trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4490) +++ trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4491) @@ -43,7 +43,7 @@ mln_piter_(tiled2d<rgb8>) p(tiled_ima.domain()); for_all(p) - if (p.row() % 7 == 0) + if (p.row() % 256 == 0) { //std::cout << tiled_ima(p); tiled_ima(p) = literal::green; Index: trunk/milena/sandbox/fabien/mln/core/image/cache.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 4490) +++ trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 4491) @@ -49,10 +49,13 @@ void set_number_pages(unsigned number_pages); V read(mln_psite(D) p); void write(const mln_psite(D)& p, const V& value); + unsigned insert_new_page(const mln_psite(D)& p); protected: util::array<page<D, V>* > pages_; + util::array<unsigned> order_; + unsigned count_; unsigned number_pages_; // Image info. @@ -70,7 +73,8 @@ inline cache<D, V>::cache(D domain, std::streampos pos, unsigned ncols, std::fstream* f) { - this->number_pages_ = 1; + this->number_pages_ = 5; // Default value. + this->count_ = 1; this->domain_ = domain; this->pos_ = pos; @@ -85,6 +89,7 @@ for (unsigned i = 0; i < this->pages_.nelements(); ++i) delete this->pages_[i]; this->pages_.clear(); + this->order_.clear(); } template <typename D, typename V> @@ -92,6 +97,10 @@ void cache<D, V>::set_number_pages(unsigned number_pages) { + if (number_pages == 0) + { + // FIXME: We must not allow that. + } if (number_pages < this->number_pages_) { // FIXME: Prune pages array. @@ -110,15 +119,9 @@ return this->pages_[i]->read(p); } - // If we have not found a valid page, we just add one. - // FIXME: We should test that we have room for a new page. - page<D, V>* new_page = new page<D, V>(this->domain_, - p, - this->pos_, - this->ncols_, - this->f_); - this->pages_.append(new_page); - return new_page->read(p); + // In case we have not found a valid page, we insert a new one. + unsigned new_page_index = insert_new_page(p); + return this->pages_[new_page_index]->read(p); } template <typename D, typename V> @@ -136,19 +139,57 @@ } } + // In case we have not found a valid page, we insert a new one. if (!found) { - // If we have not found a valid page, we just add one. - // FIXME: We should test that we have room for a new page. + unsigned new_page_index = insert_new_page(p); + this->pages_[new_page_index]->write(p, value); + } + } + + // Basic LRU cache algorithm implementation. + template <typename D, typename V> + inline + unsigned + cache<D, V>::insert_new_page(const mln_psite(D)& p) + { page<D, V>* new_page = new page<D, V>(this->domain_, p, this->pos_, this->ncols_, this->f_); + + unsigned new_index; + + // If there is still room for a new page. + if (this->pages_.nelements() < this->number_pages_) + { this->pages_.append(new_page); - new_page->write(p, value); + this->order_.append(this->count_++); + new_index = this->pages_.nelements() - 1; + } + else // We must find which page to discard. + { + unsigned min = this->order_[0]; + unsigned new_index = 0; + for (unsigned i = 1; i < this->pages_.nelements(); ++i) + { + if (this->order_[i] < min) + { + min = this->order_[i]; + new_index = i; } } + delete this->pages_[new_index]; + this->pages_[new_index] = new_page; + for (unsigned i = 0; i < this->order_.nelements(); ++i) + this->order_[i] -= min; + this->count_ -= min; + this->order_[new_index] = this->count_++; + } + + return new_index; + } # endif // ! MLN_INCLUDE_ONLY

1 0

r4490: Add experimental cache support in 2D tiled image
by Fabien Freling 16 Sep '09

16 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-09-16 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add experimental cache support in 2D tiled image. * fabien/mln/core/image/cache.hh: Implement cache management. * fabien/mln/core/image/page.hh: Implement page management. * fabien/mln/core/image/tiled2d.hh: Add cache management. * fabien/tests/core/image/Makefile: Minor update. * fabien/tests/core/image/tiled2d.cc: Minor update. --- mln/core/image/cache.hh | 159 ++++++++++++++++++++++++++++++++++++++++++++ mln/core/image/page.hh | 155 ++++++++++++++++++++++++++++++++++++++++++ mln/core/image/tiled2d.hh | 37 ++++++---- tests/core/image/Makefile | 2 tests/core/image/tiled2d.cc | 7 + 5 files changed, 345 insertions(+), 15 deletions(-) Index: trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4489) +++ trunk/milena/sandbox/fabien/tests/core/image/tiled2d.cc (revision 4490) @@ -43,10 +43,13 @@ mln_piter_(tiled2d<rgb8>) p(tiled_ima.domain()); for_all(p) - if (p.col() % 16 == 0) + if (p.row() % 7 == 0) + { + //std::cout << tiled_ima(p); tiled_ima(p) = literal::green; - //std::cout << tiled_ima(p) << std::endl; + //std::cout << " -> " << tiled_ima(p) << std::endl; //mln_assertion(tiled_ima(p) == ima(p)); + } /*for_all(p) if (p.col() % 16 == 0) Index: trunk/milena/sandbox/fabien/tests/core/image/Makefile =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/Makefile (revision 4489) +++ trunk/milena/sandbox/fabien/tests/core/image/Makefile (revision 4490) @@ -3,5 +3,7 @@ LIBS = `Magick++-config --cppflags --cxxflags --ldflags --libs` INC = -I../../../ -I../../../../../ +all: tiled2d + tiled2d: tiled2d.cc ${CXX} ${CXXFLAGS} ${INC} $^ -o tiled2d Index: trunk/milena/sandbox/fabien/mln/core/image/cache.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 0) +++ trunk/milena/sandbox/fabien/mln/core/image/cache.hh (revision 4490) @@ -0,0 +1,159 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_CORE_IMAGE_CACHE_HH +# define MLN_CORE_IMAGE_CACHE_HH + +/// \file +/// Definition of the basic mln::cache class. + +#include <mln/util/array.hh> + +#include <mln/core/image/page.hh> + + +namespace mln +{ + + template <typename D, typename V> + class cache + { + public: + + // Constructor + cache(D domain, std::streampos pos, unsigned ncols, std::fstream* f); + ~cache(); + + void set_number_pages(unsigned number_pages); + V read(mln_psite(D) p); + void write(const mln_psite(D)& p, const V& value); + + protected: + + util::array<page<D, V>* > pages_; + unsigned number_pages_; + + // Image info. + D domain_; + std::streampos pos_; + unsigned ncols_; + std::fstream* f_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename D, typename V> + inline + cache<D, V>::cache(D domain, std::streampos pos, unsigned ncols, std::fstream* f) + { + this->number_pages_ = 1; + + this->domain_ = domain; + this->pos_ = pos; + this->ncols_ = ncols; + this->f_ = f; + } + + template <typename D, typename V> + inline + cache<D, V>::~cache() + { + for (unsigned i = 0; i < this->pages_.nelements(); ++i) + delete this->pages_[i]; + this->pages_.clear(); + } + + template <typename D, typename V> + inline + void + cache<D, V>::set_number_pages(unsigned number_pages) + { + if (number_pages < this->number_pages_) + { + // FIXME: Prune pages array. + } + this->number_pages_ = number_pages; + } + + template <typename D, typename V> + inline + V + cache<D, V>::read(mln_psite(D) p) + { + for (unsigned i = 0; i < this->pages_.nelements(); ++i) + { + if (this->pages_[i]->has(p)) + return this->pages_[i]->read(p); + } + + // If we have not found a valid page, we just add one. + // FIXME: We should test that we have room for a new page. + page<D, V>* new_page = new page<D, V>(this->domain_, + p, + this->pos_, + this->ncols_, + this->f_); + this->pages_.append(new_page); + return new_page->read(p); + } + + template <typename D, typename V> + inline + void + cache<D, V>::write(const mln_psite(D)& p, const V& value) + { + bool found = false; + for (unsigned i = 0; !found && i < this->pages_.nelements(); ++i) + { + if (this->pages_[i]->has(p)) + { + this->pages_[i]->write(p, value); + found = true; + } + } + + if (!found) + { + // If we have not found a valid page, we just add one. + // FIXME: We should test that we have room for a new page. + page<D, V>* new_page = new page<D, V>(this->domain_, + p, + this->pos_, + this->ncols_, + this->f_); + this->pages_.append(new_page); + new_page->write(p, value); + } + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_IMAGE_CACHE_HH Index: trunk/milena/sandbox/fabien/mln/core/image/tiled2d.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/tiled2d.hh (revision 4489) +++ trunk/milena/sandbox/fabien/mln/core/image/tiled2d.hh (revision 4490) @@ -39,6 +39,8 @@ # include <mln/fun/i2v/all_to.hh> # include <mln/value/proxy.hh> +# include <mln/core/image/cache.hh> + namespace mln @@ -63,6 +65,7 @@ std::string file_; bool loaded_; T value_; + cache<box2d, T>* cache_; box2d b_; // theoretical box unsigned bdr_; @@ -323,8 +326,11 @@ data< tiled2d<T> >::deallocate_() { if (this->loaded_) + { + delete this->cache_; this->f_->close(); } + } template <typename T> inline @@ -428,13 +434,18 @@ { this_->data_->f_ = new std::fstream(this->data_->file_.c_str()); this_->data_->loaded_ = true; + this_->data_->cache_ = new cache<box2d, T>(this_->data_->b_, + this_->data_->pos_, + this_->ncols(), + this_->data_->f_); } - std::streampos offset = this_->data_->pos_; + /*std::streampos offset = this_->data_->pos_; offset += (this_->ncols() * p.row() + p.col()) * sizeof(T); this_->data_->f_->seekg(offset); this_->data_->f_->get((char*)(&this_->data_->value_), sizeof(T) + 1); // FIXME: I don't know why // I have to add +1. - return this_->data_->value_; + return this_->data_->value_;*/ + return this_->data_->cache_->read(p); } template <typename T> @@ -442,15 +453,17 @@ void tiled2d<T>::write_(const point2d& p, const T& value) { - if (!this->data_->loaded_) + mln::tiled2d<T>* this_ = const_cast<mln::tiled2d<T>* >(this); // Trust me, I have to do this(_). + if (!this_->data_->loaded_) { - this->data_->f_ = new std::fstream(this->data_->file_.c_str()); - this->data_->loaded_ = true; + this_->data_->f_ = new std::fstream(this->data_->file_.c_str()); + this_->data_->loaded_ = true; + this_->data_->cache_ = new cache<box2d, T>(this_->data_->b_, + this_->data_->pos_, + this_->ncols(), + this_->data_->f_); } - std::streampos offset = this->data_->pos_; - offset += (this->ncols() * p.row() + p.col()) * sizeof(T); - this->data_->f_->seekp(offset); - this->data_->f_->write((char*)(&value), sizeof(T)); + this_->data_->cache_->write(p, value); } @@ -462,8 +475,7 @@ tiled2d<T>::at_(unsigned row, unsigned col) const { mln_precondition(this->has(point2d(row, col))); - //FIXME: use the cache Luke. - return this->data_->value_; + return this->data_->cache_(point2d(row, col)); } template <typename T> @@ -472,8 +484,7 @@ tiled2d<T>::at_(unsigned row, unsigned col) { mln_precondition(this->has(point2d(row, col))); - //FIXME: use the cache Luke. - return this->data_->value_; + return this->data_->cache_(point2d(row, col)); } template <typename T> Index: trunk/milena/sandbox/fabien/mln/core/image/page.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/page.hh (revision 0) +++ trunk/milena/sandbox/fabien/mln/core/image/page.hh (revision 4490) @@ -0,0 +1,155 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_CORE_IMAGE_PAGE_HH +# define MLN_CORE_IMAGE_PAGE_HH + +/// \file +/// Definition of the basic mln::page class. + +# include <fstream> + +# include <mln/util/array.hh> + + +namespace mln +{ + + template <typename D, typename V> + class page + { + public: + + // Constructor & destructor. + page(D domain, mln_psite(D) p, std::streampos pos, unsigned ncols, std::fstream* f); + ~page(); + + bool has(mln_psite(D) p); + V read(mln_psite(D) p); + void write(const mln_psite(D)& p, const V& value); + void flush(); + + // Debug. + void print_buffer(); + + protected: + + D domain_; + D range_; + V* buffer_; + std::fstream* f_; + std::streampos offset_; + unsigned buffer_size_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename D, typename V> + inline + page<D, V>::page(D domain, mln_psite(D) p, std::streampos pos, unsigned ncols, std::fstream* f) + { + // Defining layout for a line. + this->range_.pmin() = p; + this->range_.pmin().col() = domain.pmin().col(); + this->range_.pmax() = p; + this->range_.pmax().col() = domain.pmax().col(); + + this->buffer_ = new V[ncols]; + + this->domain_ = domain; + this->f_ = f; + this->buffer_size_ = ncols; + + this->offset_ = pos; + this->offset_ += (ncols * p.row()) * sizeof(V); + f->seekg(this->offset_); + f->get((char*)(buffer_), buffer_size_ * sizeof(V)); + } + + template <typename D, typename V> + inline + page<D, V>::~page() + { + this->flush(); + delete this->buffer_; + } + + template <typename D, typename V> + inline + bool + page<D, V>::has(mln_psite(D) p) + { + return p.col() >= this->range_.pmin().col() && + p.col() <= this->range_.pmax().col() && + p.row() >= this->range_.pmin().row() && + p.row() <= this->range_.pmax().row(); + } + + template <typename D, typename V> + inline + V + page<D, V>::read(mln_psite(D) p) + { + return buffer_[p.col() - this->range_.pmin().col()]; + } + + template <typename D, typename V> + inline + void + page<D, V>::write(const mln_psite(D)& p, const V& value) + { + buffer_[p.col() - this->range_.pmin().col()] = value; + } + + template <typename D, typename V> + inline + void + page<D, V>::flush() + { + this->f_->seekg(this->offset_); + this->f_->write((char*)(buffer_), buffer_size_ * sizeof(V)); + } + + + // Debug. + + template <typename D, typename V> + inline + void + page<D, V>::print_buffer() + { + for (unsigned i = 0; i < this->buffer_size_; ++i) + std::cout << "buffer[" <buffer_[i] << std::endl; + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_IMAGE_PAGE_HH

1 0

4489: Small fixes in Scribo.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. * estim/object_groups_v_thickness.hh, * primitive/extract/lines_h_thick_and_single.hh, * primitive/extract/lines_v_thick_and_single.hh: Add missing headers. * src/text_in_photo.cc: Fix an undeclared variable. --- scribo/ChangeLog | 13 +++++++++++++ scribo/headers.mk | 16 ++++++++++++++++ .../primitive/extract/lines_h_thick_and_single.hh | 1 - .../primitive/extract/lines_v_thick_and_single.hh | 1 - scribo/src/text_in_photo.cc | 3 ++- scribo/tests/unit_test/unit-tests.mk | 16 ++++++++++++++++ 6 files changed, 47 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 82d8a53..47627e0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Small fixes in Scribo. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + + * estim/object_groups_v_thickness.hh, + * primitive/extract/lines_h_thick_and_single.hh, + * primitive/extract/lines_v_thick_and_single.hh: Add missing headers. + + * src/text_in_photo.cc: Fix an undeclared variable. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new primitive extraction routines. * primitive/extract/lines_h_thick_and_single.hh, diff --git a/scribo/headers.mk b/scribo/headers.mk index 8ca14cf..15d9b2a 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -2,6 +2,7 @@ scribodir = $(includedir)/scribo nobase_scribo_HEADERS = \ ./all.hh \ +./binarization/sauvola.hh \ ./binarization/simple.hh \ ./core/all.hh \ ./core/central_sites.hh \ @@ -11,6 +12,7 @@ nobase_scribo_HEADERS = \ ./core/object_image.hh \ ./core/object_links.hh \ ./debug/all.hh \ +./debug/decision_image.hh \ ./debug/save_bboxes_image.hh \ ./debug/save_label_image.hh \ ./debug/save_linked_bboxes_image.hh \ @@ -20,9 +22,20 @@ nobase_scribo_HEADERS = \ ./draw/all.hh \ ./draw/bounding_box_links.hh \ ./draw/bounding_boxes.hh \ +./estim/object_groups_v_thickness.hh \ ./filter/all.hh \ +./filter/common/object_groups_photo.hh \ +./filter/common/object_links_photo.hh \ +./filter/common/objects_photo.hh \ ./filter/object_groups_small.hh \ +./filter/object_groups_v_thickness.hh \ +./filter/object_links_bbox_h_ratio.hh \ +./filter/object_links_bbox_overlap.hh \ +./filter/object_links_bbox_ratio.hh \ +./filter/object_links_bbox_w_ratio.hh \ +./filter/object_links_bottom_aligned.hh \ ./filter/object_links_non_aligned.hh \ +./filter/object_links_non_aligned_simple.hh \ ./filter/object_links_non_h_aligned.hh \ ./filter/object_links_non_v_aligned.hh \ ./filter/objects_large.hh \ @@ -35,6 +48,7 @@ nobase_scribo_HEADERS = \ ./make/influence_zone_graph.hh \ ./make/text.hh \ ./preprocessing/all.hh \ +./preprocessing/split_bg_fg.hh \ ./preprocessing/unskew.hh \ ./primitive/all.hh \ ./primitive/extract/all.hh \ @@ -45,12 +59,14 @@ nobase_scribo_HEADERS = \ ./primitive/extract/lines_h_pattern.hh \ ./primitive/extract/lines_h_single.hh \ ./primitive/extract/lines_h_thick.hh \ +./primitive/extract/lines_h_thick_and_single.hh \ ./primitive/extract/lines_pattern.hh \ ./primitive/extract/lines_thick.hh \ ./primitive/extract/lines_v_discontinued.hh \ ./primitive/extract/lines_v_pattern.hh \ ./primitive/extract/lines_v_single.hh \ ./primitive/extract/lines_v_thick.hh \ +./primitive/extract/lines_v_thick_and_single.hh \ ./primitive/extract/objects.hh \ ./primitive/group/all.hh \ ./primitive/group/apply.hh \ diff --git a/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/primitive/extract/lines_h_thick_and_single.hh index a4803aa..969acf5 100644 --- a/scribo/primitive/extract/lines_h_thick_and_single.hh +++ b/scribo/primitive/extract/lines_h_thick_and_single.hh @@ -103,7 +103,6 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); (void) nlines; } diff --git a/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/primitive/extract/lines_v_thick_and_single.hh index 8c9048c..7ddd25f 100644 --- a/scribo/primitive/extract/lines_v_thick_and_single.hh +++ b/scribo/primitive/extract/lines_v_thick_and_single.hh @@ -102,7 +102,6 @@ namespace scribo mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_precondition(exact(win).is_valid()); (void) nlines; } diff --git a/scribo/src/text_in_photo.cc b/scribo/src/text_in_photo.cc index 152e9b2..5426dce 100644 --- a/scribo/src/text_in_photo.cc +++ b/scribo/src/text_in_photo.cc @@ -202,7 +202,8 @@ highlighted."); #ifndef NOUT - image2d<value::rgb8> + image2d<value::rgb8> decision_image; + if (argc == 4) decision_image = scribo::debug::decision_image(input, groups, filtered_groups); #endif diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 51a7da1..6b44ef9 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -21,8 +21,13 @@ scribo_debug_usage \ scribo_draw_all \ scribo_draw_bounding_box_links \ scribo_draw_bounding_boxes \ +scribo_estim_object_groups_v_thickness \ scribo_filter_all \ +scribo_filter_common_object_groups_photo \ +scribo_filter_common_object_links_photo \ +scribo_filter_common_objects_photo \ scribo_filter_object_groups_small \ +scribo_filter_object_groups_v_thickness \ scribo_filter_object_links_bbox_h_ratio \ scribo_filter_object_links_bbox_overlap \ scribo_filter_object_links_bbox_ratio \ @@ -42,6 +47,7 @@ scribo_make_debug_filename \ scribo_make_influence_zone_graph \ scribo_make_text \ scribo_preprocessing_all \ +scribo_preprocessing_split_bg_fg \ scribo_preprocessing_unskew \ scribo_primitive_all \ scribo_primitive_extract_all \ @@ -52,12 +58,14 @@ scribo_primitive_extract_lines_h_discontinued \ scribo_primitive_extract_lines_h_pattern \ scribo_primitive_extract_lines_h_single \ scribo_primitive_extract_lines_h_thick \ +scribo_primitive_extract_lines_h_thick_and_single \ scribo_primitive_extract_lines_pattern \ scribo_primitive_extract_lines_thick \ scribo_primitive_extract_lines_v_discontinued \ scribo_primitive_extract_lines_v_pattern \ scribo_primitive_extract_lines_v_single \ scribo_primitive_extract_lines_v_thick \ +scribo_primitive_extract_lines_v_thick_and_single \ scribo_primitive_extract_objects \ scribo_primitive_group_all \ scribo_primitive_group_apply \ @@ -123,8 +131,13 @@ scribo_debug_usage_SOURCES = scribo_debug_usage.cc scribo_draw_all_SOURCES = scribo_draw_all.cc scribo_draw_bounding_box_links_SOURCES = scribo_draw_bounding_box_links.cc scribo_draw_bounding_boxes_SOURCES = scribo_draw_bounding_boxes.cc +scribo_estim_object_groups_v_thickness_SOURCES = scribo_estim_object_groups_v_thickness.cc scribo_filter_all_SOURCES = scribo_filter_all.cc +scribo_filter_common_object_groups_photo_SOURCES = scribo_filter_common_object_groups_photo.cc +scribo_filter_common_object_links_photo_SOURCES = scribo_filter_common_object_links_photo.cc +scribo_filter_common_objects_photo_SOURCES = scribo_filter_common_objects_photo.cc scribo_filter_object_groups_small_SOURCES = scribo_filter_object_groups_small.cc +scribo_filter_object_groups_v_thickness_SOURCES = scribo_filter_object_groups_v_thickness.cc scribo_filter_object_links_bbox_h_ratio_SOURCES = scribo_filter_object_links_bbox_h_ratio.cc scribo_filter_object_links_bbox_overlap_SOURCES = scribo_filter_object_links_bbox_overlap.cc scribo_filter_object_links_bbox_ratio_SOURCES = scribo_filter_object_links_bbox_ratio.cc @@ -144,6 +157,7 @@ scribo_make_debug_filename_SOURCES = scribo_make_debug_filename.cc scribo_make_influence_zone_graph_SOURCES = scribo_make_influence_zone_graph.cc scribo_make_text_SOURCES = scribo_make_text.cc scribo_preprocessing_all_SOURCES = scribo_preprocessing_all.cc +scribo_preprocessing_split_bg_fg_SOURCES = scribo_preprocessing_split_bg_fg.cc scribo_preprocessing_unskew_SOURCES = scribo_preprocessing_unskew.cc scribo_primitive_all_SOURCES = scribo_primitive_all.cc scribo_primitive_extract_all_SOURCES = scribo_primitive_extract_all.cc @@ -154,12 +168,14 @@ scribo_primitive_extract_lines_h_discontinued_SOURCES = scribo_primitive_extract scribo_primitive_extract_lines_h_pattern_SOURCES = scribo_primitive_extract_lines_h_pattern.cc scribo_primitive_extract_lines_h_single_SOURCES = scribo_primitive_extract_lines_h_single.cc scribo_primitive_extract_lines_h_thick_SOURCES = scribo_primitive_extract_lines_h_thick.cc +scribo_primitive_extract_lines_h_thick_and_single_SOURCES = scribo_primitive_extract_lines_h_thick_and_single.cc scribo_primitive_extract_lines_pattern_SOURCES = scribo_primitive_extract_lines_pattern.cc scribo_primitive_extract_lines_thick_SOURCES = scribo_primitive_extract_lines_thick.cc scribo_primitive_extract_lines_v_discontinued_SOURCES = scribo_primitive_extract_lines_v_discontinued.cc scribo_primitive_extract_lines_v_pattern_SOURCES = scribo_primitive_extract_lines_v_pattern.cc scribo_primitive_extract_lines_v_single_SOURCES = scribo_primitive_extract_lines_v_single.cc scribo_primitive_extract_lines_v_thick_SOURCES = scribo_primitive_extract_lines_v_thick.cc +scribo_primitive_extract_lines_v_thick_and_single_SOURCES = scribo_primitive_extract_lines_v_thick_and_single.cc scribo_primitive_extract_objects_SOURCES = scribo_primitive_extract_objects.cc scribo_primitive_group_all_SOURCES = scribo_primitive_group_all.cc scribo_primitive_group_apply_SOURCES = scribo_primitive_group_apply.cc -- 1.5.6.5

1 0

4488: Add new primitive extraction routines.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* primitive/extract/lines_h_thick_and_single.hh, * primitive/extract/lines_v_thick_and_single.hh: New. --- scribo/ChangeLog | 7 + .../primitive/extract/lines_h_thick_and_single.hh | 149 ++++++++++++++++++++ .../primitive/extract/lines_v_thick_and_single.hh | 147 +++++++++++++++++++ 3 files changed, 303 insertions(+), 0 deletions(-) create mode 100644 scribo/primitive/extract/lines_h_thick_and_single.hh create mode 100644 scribo/primitive/extract/lines_v_thick_and_single.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 51f38a0..82d8a53 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new primitive extraction routines. + + * primitive/extract/lines_h_thick_and_single.hh, + * primitive/extract/lines_v_thick_and_single.hh: New. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * preprocessing/split_bg_fg.hh: Add a new algorithm to split background and foreground. diff --git a/scribo/primitive/extract/lines_h_thick_and_single.hh b/scribo/primitive/extract/lines_h_thick_and_single.hh new file mode 100644 index 0000000..a4803aa --- /dev/null +++ b/scribo/primitive/extract/lines_h_thick_and_single.hh @@ -0,0 +1,149 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_PRIMITIVE_EXTRACT_LINES_H_THICK_AND_SINGLE_HH +# define SCRIBO_PRIMITIVE_EXTRACT_LINES_H_THICK_AND_SINGLE_HH + +/// \file +/// +/// Extract horizontal thick lines in a binary image. + + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/concept/neighborhood.hh> + +# include <mln/morpho/opening/structural.hh> + +# include <scribo/core/object_image.hh> +# include <scribo/core/macros.hh> +# include <scribo/primitive/extract/objects.hh> + +# include <scribo/primitive/extract/lines_h_thick.hh> +# include <scribo/primitive/extract/lines_h_single.hh> + + +namespace scribo +{ + + namespace primitive + { + + namespace extract + { + + + using namespace mln; + + /// Extract horizontal thick lines in a binary image. + /*! + * Only non discontinued lines are correctly extracted with this routine. + * Only lines matching the given criterions are kept in the result. + * + * \param[in] input_ A binary image. + * \param[in] nbh_ The neighborhood used for labeling image + * components. + * \param[in,out] nlines Type used for labeling. + * \param[in] line_length The minimum line length. + * \param[in] w_h_ratio The minimum ratio width/height object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which lines are labeled. + */ + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_h_thick_and_single(const Image& input_, + const Neighborhood<N>& nbh_, + V& nlines, + unsigned min_line_length, + float h_w_ratio); + + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + + template <typename I, typename N, typename V> + void + lines_h_thick_and_single_tests(const Image& input, + const Neighborhood<N>& nbh, + V& nlines, + unsigned min_line_length, + float h_w_ratio) + { + mlc_equal(mln_value(I),bool)::check(); + mlc_bool(mln_site_(I)::dim == 2)::check(); + mlc_is_a(V, mln::value::Symbolic)::check(); + + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); + mln_precondition(exact(win).is_valid()); + + (void) nlines; + } + + } // end of namespace scribo::primitive::internal + + + + template <typename I, typename N, typename V> + inline + object_image(mln_ch_value(I,V)) + lines_h_thick_and_single(const Image& input, + const Neighborhood<N>& nbh, + V& nlines, + unsigned min_line_length, + float h_w_ratio) + { + trace::entering("scribo::primitive::lines_h_thick_and_single"); + + internal::lines_h_thick_and_single_tests(input, nbh, + nlines, + min_line_length, + h_w_ratio); + + object_image(mln_ch_value(I,V)) + output = lines_h_thick(input, nbh, nlines, min_line_length); + + output = lines_h_single(output, min_line_length, h_w_ratio); + + trace::exiting("scribo::primitive::lines_h_thick_and_single"); + return output; + } + + +# endif // !MLN_INCLUDE_ONLY + + } // end of namespace scribo::primitive::extract + + } // end of namespace scribo::primitive + +} // end of namespace scribo + +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_LINES_H_THICK_AND_SINGLE_HH diff --git a/scribo/primitive/extract/lines_v_thick_and_single.hh b/scribo/primitive/extract/lines_v_thick_and_single.hh new file mode 100644 index 0000000..8c9048c --- /dev/null +++ b/scribo/primitive/extract/lines_v_thick_and_single.hh @@ -0,0 +1,147 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_PRIMITIVE_EXTRACT_LINES_V_THICK_AND_SINGLE_HH +# define SCRIBO_PRIMITIVE_EXTRACT_LINES_V_THICK_AND_SINGLE_HH + +/// \file +/// +/// Extract vertical thick lines in a binary image. + + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/window.hh> +# include <mln/core/concept/neighborhood.hh> + +# include <mln/morpho/opening/structural.hh> + +# include <scribo/core/object_image.hh> +# include <scribo/core/macros.hh> +# include <scribo/primitive/extract/objects.hh> + +# include <scribo/primitive/extract/lines_v_thick.hh> +# include <scribo/primitive/extract/lines_v_single.hh> + +namespace scribo +{ + + namespace primitive + { + + namespace extract + { + + + using namespace mln; + + /// Extract vertical thick lines in a binary image. + /*! + * Only non discontinued lines are correctly extracted with this routine. + * Only lines matching the given criterions are kept in the result. + * + * \param[in] input_ A binary image. + * \param[in] nbh_ The neighborhood used for labeling image + * components. + * \param[in,out] nlines Type used for labeling. + * \param[in] line_length The minimum line length. + * \param[in] h_w_ratio The minimum ratio height/width object + * bounding boxes to consider an + * object as a single line. + * + * \return An image in which lines are labeled. + */ + template <typename I, typename N, typename V> + object_image(mln_ch_value(I,V)) + lines_v_thick_and_single(const Image& input_, + const Neighborhood<N>& nbh_, + V& nlines, + unsigned min_line_length, + float h_w_ratio); + + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + + template <typename I, typename N, typename V> + void + lines_v_thick_and_single_tests(const Image& input, + const Neighborhood<N>& nbh, + V& nlines, + unsigned min_line_length, + float h_w_ratio) + { + mlc_equal(mln_value(I),bool)::check(); + mlc_bool(mln_site_(I)::dim == 2)::check(); + mlc_is_a(V, mln::value::Symbolic)::check(); + + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); + mln_precondition(exact(win).is_valid()); + + (void) nlines; + } + + } // end of namespace scribo::primitive::internal + + + + template <typename I, typename N, typename V> + inline + object_image(mln_ch_value(I,V)) + lines_v_thick_and_single(const Image& input, + const Neighborhood<N>& nbh, + V& nlines, + unsigned min_line_length, + float h_w_ratio) + { + trace::entering("scribo::primitive::lines_v_thick_and_single"); + + internal::lines_v_thick_and_single_tests(input, nbh, + nlines, + min_line_length, h_w_ratio); + + object_image(mln_ch_value(I,V)) + output = lines_v_thick(input, nbh, nlines, min_line_length); + + output = lines_v_single(output, min_line_length, h_w_ratio); + + trace::exiting("scribo::primitive::lines_v_thick_and_single"); + return output; + } + + +# endif // !MLN_INCLUDE_ONLY + + } // end of namespace scribo::primitive::extract + + } // end of namespace scribo::primitive + +} // end of namespace scribo + +#endif // ! SCRIBO_PRIMITIVE_EXTRACT_LINES_V_THICK_AND_SINGLE_HH -- 1.5.6.5

1 0

4487: preprocessing/split_bg_fg.hh: Add a new algorithm to split background and foreground.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

--- scribo/ChangeLog | 5 + scribo/preprocessing/split_bg_fg.hh | 337 +++++++++++++++++++++++++++++++++++ 2 files changed, 342 insertions(+), 0 deletions(-) create mode 100644 scribo/preprocessing/split_bg_fg.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 39c0b92..51f38a0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * preprocessing/split_bg_fg.hh: Add a new algorithm to split + background and foreground. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve Scribo's demo. * demo/src/mainwindow.cc, diff --git a/scribo/preprocessing/split_bg_fg.hh b/scribo/preprocessing/split_bg_fg.hh new file mode 100644 index 0000000..7e05d0d --- /dev/null +++ b/scribo/preprocessing/split_bg_fg.hh @@ -0,0 +1,337 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + + +#ifndef SCRIBO_PREPROCESSING_SPLIT_BG_FG_HH +# define SCRIBO_PREPROCESSING_SPLIT_BG_FG_HH + +/// \file +/// +/// Split the background and the foreground. + +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/core/routine/duplicate.hh> + +# include <mln/core/image/dmorph/image_if.hh> +# include <mln/pw/all.hh> + +# include <mln/data/fill.hh> +# include <mln/data/transform.hh> + +# include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> + +# include <mln/io/ppm/load.hh> +# include <mln/io/ppm/save.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/pbm/save.hh> + +# include <mln/math/diff_abs.hh> +# include <mln/math/min.hh> + +# include <mln/morpho/closing/area.hh> +# include <mln/morpho/opening/area.hh> +# include <mln/morpho/elementary/dilation.hh> + +# include <mln/labeling/blobs.hh> +# include <mln/labeling/colorize.hh> +# include <mln/labeling/compute.hh> +# include <mln/accu/stat/mean.hh> + + + + +namespace scribo +{ + + namespace preprocessing + { + + using namespace mln; + + + /*! \brief Split the background and the foreground. + + \param[in] input A color image. + \param[in] lambda Lambda used for morphological closing/opening. + \param[in] delta Max distance between values in closing and + opening image. + + \return A couple of color images. The first is the background + and the second is the foreground. + */ + template <typename I> + util::couple<mln_concrete(I), mln_concrete(I)> + split_bg_fg(const Image& input_, unsigned lambda, unsigned delta); + + + +# ifndef MLN_INCLUDE_ONLY + + + + // Internal routines. + + namespace internal + { + + using value::rgb8; + + + template <unsigned n> + void + split(const image2d< value::rgb<n> >& input, + // out: + image2d< value::int_u<n> >& r, + image2d< value::int_u<n> >& g, + image2d< value::int_u<n> >& b) + { + trace::entering("scribo::preprocessing::internal::split"); + initialize(r, input); + initialize(g, input); + initialize(b, input); + + // Generic version: + + // mln_piter(box2d) p(input.domain()); + // for_all(p) + // { + // r(p) = input(p).red(); + // g(p) = input(p).green(); + // b(p) = input(p).blue(); + // } + + typedef image2d< value::rgb<n> > I; + typedef image2d< value::int_u<n> > O; + + mln_pixter(const I) p_i(input); + mln_pixter(O) p_r(r); + mln_pixter(O) p_g(g); + mln_pixter(O) p_b(b); + for (p_i.start(), p_r.start(), p_g.start(), p_b.start(); + p_i.is_valid(); + p_i.next(), p_r.next(), p_g.next(), p_b.next()) + { + const value::rgb<n>& c = p_i.val(); + p_r.val() = c.red(); + p_g.val() = c.green(); + p_b.val() = c.blue(); + } + + trace::exiting("scribo::preprocessing::internal::split"); + } + + + template <unsigned n> + image2d< value::rgb<n> > + merge(const image2d< value::int_u<n> >& r, + const image2d< value::int_u<n> >& g, + const image2d< value::int_u<n> >& b) + { + trace::entering("scribo::preprocessing::internal::merge"); + image2d< value::rgb<n> > output(r.domain()); + + // mln_piter(box2d) p(output.domain()); + // for_all(p) + // { + // value::rgb<n>& c = output(p); + // c.red() = r(p); + // c.green() = g(p); + // c.blue() = b(p); + // } + + typedef image2d< value::int_u<n> > I; + mln_pixter(const I) p_r(r); + mln_pixter(const I) p_g(g); + mln_pixter(const I) p_b(b); + typedef image2d< value::rgb<n> > O; + mln_pixter(O) p_o(output); + + for (p_o.start(), p_r.start(), p_g.start(), p_b.start(); + p_o.is_valid(); + p_o.next(), p_r.next(), p_g.next(), p_b.next()) + { + value::rgb<n>& c = p_o.val(); + c.red() = p_r.val(); + c.green() = p_g.val(); + c.blue() = p_b.val(); + } + + trace::exiting("scribo::preprocessing::internal::merge"); + return output; + } + + + + image2d< value::rgb8 > + diff_abs(const image2d< value::rgb8 >& input1, + const image2d< value::rgb8 >& input2) + { + image2d< value::rgb8 > output(input1.domain()); + mln_piter_(box2d) p(input1.domain()); + for_all(p) + { + value::rgb8& c = output(p); + c.red() = math::diff_abs(input1(p).red(), input2(p).red()); + c.green() = math::diff_abs(input1(p).green(), input2(p).green()); + c.blue() = math::diff_abs(input1(p).blue(), input2(p).blue()); + } + return output; + } + + + image2d< value::rgb8 > + inverted_diff_abs(const image2d< value::rgb8 >& input1, + const image2d< value::rgb8 >& input2) + { + image2d< value::rgb8 > output(input1.domain()); + mln_piter_(box2d) p(input1.domain()); + for_all(p) + { + value::rgb8& c = output(p); +// c.red() = 255 - math::diff_abs(input1(p).red(), input2(p).red()); +// c.green() = 255 - math::diff_abs(input1(p).green(), input2(p).green()); +// c.blue() = 255 - math::diff_abs(input1(p).blue(), input2(p).blue()); + + c.red() = 255 - math::min(2 * math::diff_abs(input1(p).red(), input2(p).red()), 255); + c.green() = 255 - math::min(2 * math::diff_abs(input1(p).green(), input2(p).green()), 255); + c.blue() = 255 - math::min(2 * math::diff_abs(input1(p).blue(), input2(p).blue()), 255); + } + return output; + } + + + + unsigned dist(const rgb8& c1, const rgb8& c2) + { + unsigned d = 0; + d += std::abs(c1.red() - c2.red()); + d += std::abs(c1.green() - c2.green()); + d += std::abs(c1.blue() - c2.blue()); + return d; + } + + + image2d<rgb8> + background_analyze(const image2d<rgb8>& input, + unsigned lambda, unsigned delta) + { + trace::entering("scribo::preprocessing::internal::background_analyze"); + + image2d<value::int_u8> r, g, b; + split(input, r, g, b); + image2d<rgb8> closed, opened; + closed = merge(morpho::closing::area(r, c4(), lambda), + morpho::closing::area(g, c4(), lambda), + morpho::closing::area(b, c4(), lambda)); + opened = merge(morpho::opening::area(r, c4(), lambda), + morpho::opening::area(g, c4(), lambda), + morpho::opening::area(b, c4(), lambda)); + + image2d<bool> mask(input.domain()); + mln_piter_(box2d) p(input.domain()); + for_all(p) + mask(p) = (dist(closed(p), opened(p)) >= delta); + + image2d<rgb8> output = duplicate(input); + data::fill((output | pw::value(mask)).rw(), rgb8(255,255,0)); + +// { +// io::ppm::save(output, "temp_output.ppm"); +// io::pbm::save(mask, "temp_mask.pbm"); +// } + + unsigned nblobs; + image2d<unsigned> lab, con; + lab = labeling::blobs(mask, c4(), nblobs); + +// { +// io::ppm::save(labeling::colorize(rgb8(), +// lab, +// nblobs), +// "temp_blobs.ppm"); +// } + + con = morpho::elementary::dilation(lab, c8()); + data::fill((con | (pw::value(lab) != pw::cst(0u))).rw(), + 0u); + +// { +// io::ppm::save(labeling::colorize(rgb8(), +// con, +// nblobs), +// "temp_con.ppm"); +// } + + typedef accu::stat::mean< rgb8, algebra::vec<3,float>, rgb8 > A; + util::array<rgb8> m = labeling::compute(A(), input, con, nblobs); + + data::fill((output | pw::value(mask)).rw(), + data::transform(lab, m)); + + trace::exiting("scribo::preprocessing::internal::toggle"); + return output; + } + + + } // end of namespace scribo::internal + + + + + // Facade + + template <typename I> + util::couple<mln_concrete(I), mln_concrete(I)> + split_bg_fg(const Image& input_, unsigned lambda, unsigned delta) + { + trace::entering("scribo::preprocessing::split_bg_fg"); + + using namespace mln; + + const I& input = exact(input_); + + mln_precondition(input.is_valid()); + mln_precondition(lambda >= 1); + mln_precondition(delta >= 1); + + image2d<value::rgb8> + bg = internal::background_analyze(input, lambda, delta); + image2d<value::rgb8> fg = internal::inverted_diff_abs(input, bg); + + trace::exiting("scribo::preprocessing::split_bg_fg"); + return make::couple(bg, fg); + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace scribo::preprocessing + +} // end of namespace scribo + +#endif // ! SCRIBO_PREPROCESSING_SPLIT_BG_FG_HH -- 1.5.6.5

1 0

4486: Improve Scribo's demo.
by Guillaume Lazzara 16 Sep '09

16 Sep '09

* demo/src/mainwindow.cc, * demo/src/mainwindow.hh: Add "text in doc" demo and improve progress dialog output. --- scribo/ChangeLog | 8 ++++ scribo/demo/src/mainwindow.cc | 92 ++++++++++++++++++++++++++++------------ scribo/demo/src/mainwindow.hh | 10 ++++- 3 files changed, 81 insertions(+), 29 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7f504e6..39c0b92 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve Scribo's demo. + + * demo/src/mainwindow.cc, + * demo/src/mainwindow.hh: Add "text in doc" demo and improve + progress dialog output. + +2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * debug/decision_image.hh: Fix an invalid precondition. 2009-09-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/demo/src/mainwindow.cc b/scribo/demo/src/mainwindow.cc index 1bfaec9..f808d8b 100644 --- a/scribo/demo/src/mainwindow.cc +++ b/scribo/demo/src/mainwindow.cc @@ -34,7 +34,8 @@ const char * modes[][4] = { - { "Text in pictures", "pics", "../src/text_in_photo", "image-x-generic.png" }, + { "Text in pictures", "pics", "../src/text_in_photo_ppm", "image-x-generic.png" }, + { "Text in docs", "doc", "../src/text_in_doc", "edit-find.png" }, { (const char *)(1), 0, 0, 0}, // Separator { "Handwritten text lines", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_lines", "text-x-generic.png" }, { "Handwritten text words", "hsc", "../../milena/sandbox/icdar/2009/hsc/input_to_words", "text-x-generic.png" }, @@ -59,6 +60,7 @@ const char * modes[][4] = { // const char *args_list[][3] = { { 0, 0, 0 }, // Text in Pictures + { 0, 0, 0 }, // Text in Docs { (const char *)(1), 0, 0}, // Separator { "/dev/null", 0, 0 }, // Handwritten text lines { "/dev/null", 0, 0 }, // Handwritten text words @@ -97,13 +99,11 @@ namespace scribo pdialog_.setLabelText(tr("Please wait while computing...")); pdialog_.setWindowModality(Qt::WindowModal); + exec_.setReadChannel(QProcess::StandardOutput); + qDebug() << "Cache located in " << QDir::tempPath(); connect(&pdialog_, SIGNAL(canceled()), this, SLOT(compute_canceled())); - connect(&exec_, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(exec_finished(int, QProcess::ExitStatus))); - connect(&exec_, SIGNAL(error(QProcess::ProcessError)), - this, SLOT(exec_error(QProcess::ProcessError))); connect(&context_, SIGNAL(triggered(QAction *)), this, SLOT(context_changed(QAction *))); @@ -118,6 +118,8 @@ namespace scribo this, SLOT(move_horizontal_sliders(int))); connect(&timer_, SIGNAL(timeout()), this, SLOT(timer_timeout())); + connect_compute_process(); + context_.setExclusive(true); // No status bar. @@ -163,6 +165,7 @@ namespace scribo action->setCheckable(true); action->setData(i); action->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0 + i)); + action->setEnabled(QFile::exists(modes[i][2])); if (modes[i][3] != 0) action->setIcon(QIcon(QString(":/icons/") + modes[i][3])); @@ -203,7 +206,8 @@ namespace scribo void MainWindow::on_runBtn_clicked() { - if (useCache->isChecked() && cached_result_[mode_].contains(filepath->text())) + if (useCache->isChecked() + && cached_result_[mode_].contains(filepath->text())) { last_output_ = cached_result_[mode_][filepath->text()]; exec_finished(0, QProcess::NormalExit); @@ -216,30 +220,20 @@ namespace scribo QString input = filepath->text(); - // Loading ppm file - if (current_mode() == "pics") - { - QFileInfo f(input); - QDir dir = f.absoluteDir(); - dir.cd("../pics_pbm"); - - QFileInfo pbm_file(dir.path() + "/" + f.completeBaseName() + ".pbm"); - if (pbm_file.exists()) - input = pbm_file.absoluteFilePath(); - } - args << input; for (unsigned i = 0; args_list[mode_][i]; ++i) args << args_list[mode_][i]; // if (!is_in_ocr_mode()) // { - QTemporaryFile f; - f.open(); - args << f.fileName(); - last_output_ = f.fileName(); + QTemporaryFile f; + f.open(); + args << f.fileName(); + last_output_ = f.fileName(); // } +// reset_progress_dialog(); + exec_.start(exec_prefix_ + modes[mode_][2], args); } @@ -300,7 +294,8 @@ namespace scribo QFileInfo finfo(name); if (item != mainResultItem_ && current_mode() != "hsc" && current_mode() != "pproc" - && (current_mode() != "pics" || finfo.suffix() == "pbm")) + && (current_mode() != "pics" || finfo.suffix() == "pbm") + && ! is_in_doc_mode()) { QImage image(pixmap.toImage()); image.invertPixels(); @@ -338,7 +333,7 @@ namespace scribo cached_result_[mode_][filepath->text()] = last_output_; setEnabled(true); - if (is_in_ocr_mode()) + if (is_in_ocr_mode() || is_in_doc_mode()) { QFile f(last_output_); f.open(QIODevice::ReadOnly); @@ -379,10 +374,12 @@ namespace scribo void MainWindow::wait_for_result() { + reset_progress_dialog(); + pdialog_.show(); setEnabled(false); - if (!is_in_ocr_mode()) + if (!is_in_ocr_mode() && !is_in_ocr_mode()) update_status_message(""); } @@ -409,7 +406,6 @@ namespace scribo void MainWindow::exec_error(QProcess::ProcessError error) { - pdialog_.reset(); if (error == QProcess::FailedToStart) exec_error(tr("This program does not exist: ") + exec_prefix_ + modes[mode_][2]); @@ -423,23 +419,37 @@ namespace scribo { mode_ = action->data().toInt(); filepath->clear(); - tabWidget->setTabEnabled(1, is_in_ocr_mode()); + tabWidget->setTabEnabled(1, is_in_ocr_mode() || is_in_doc_mode()); } void MainWindow::compute_canceled() { setEnabled(true); + + exec_.disconnect(); exec_.kill(); + connect_compute_process(); + update_status_message("Computation canceled."); } - bool MainWindow::is_in_ocr_mode() + bool MainWindow::is_in_ocr_mode() const { return current_mode() == "ocr"; } + bool MainWindow::is_in_pics_mode() const + { + return current_mode() == "pics"; + } + + bool MainWindow::is_in_doc_mode() const + { + return current_mode() == "doc"; + } + void MainWindow::resize_pixmaps(const QRectF& rect) { @@ -528,6 +538,32 @@ namespace scribo } } + + void MainWindow::update_process_status() + { + if (is_in_pics_mode() || is_in_doc_mode()) + pdialog_.setLabelText(tr(exec_.readAllStandardOutput())); + } + + + void MainWindow::reset_progress_dialog() + { + pdialog_.reset(); + pdialog_.setLabelText(tr("Please wait while computing...")); + } + + + void MainWindow::connect_compute_process() + { + connect(&exec_, SIGNAL(finished(int, QProcess::ExitStatus)), + this, SLOT(exec_finished(int, QProcess::ExitStatus))); + connect(&exec_, SIGNAL(error(QProcess::ProcessError)), + this, SLOT(exec_error(QProcess::ProcessError))); + connect(&exec_, SIGNAL(readyReadStandardOutput()), + this, SLOT(update_process_status())); + } + + } // end of namespace scribo::demo } // end of namespace scribo diff --git a/scribo/demo/src/mainwindow.hh b/scribo/demo/src/mainwindow.hh index 3641658..90ed991 100644 --- a/scribo/demo/src/mainwindow.hh +++ b/scribo/demo/src/mainwindow.hh @@ -76,6 +76,8 @@ namespace scribo void move_horizontal_sliders(int value); void timer_timeout(); + void update_process_status(); + private: // Members void setup_scene(); void update_pixmap(QGraphicsView* view, const QString& name = QString()); @@ -88,7 +90,9 @@ namespace scribo void prepare_for_run(const QString& filename); - bool is_in_ocr_mode(); + bool is_in_ocr_mode() const; + bool is_in_pics_mode() const; + bool is_in_doc_mode() const; QGraphicsItem *& view_to_item(QGraphicsView *view); @@ -99,6 +103,10 @@ namespace scribo void update_auto_demo_dir(); + void reset_progress_dialog(); + + void connect_compute_process(); + private: // Attributes QGraphicsItem *mainRefItem_; QGraphicsItem *mainResultItem_; -- 1.5.6.5

1 0