- Olena-patches

4261: Improve lrde-upload.sh script.
by Guillaume Lazzara 08 Jul '09

08 Jul '09

* lrde-upload.sh: - Prune old tarballs. - Append the current date to the tarball name. --- ChangeLog | 8 ++++++++ lrde-upload.sh | 21 +++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f42f1d..756268e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Improve lrde-upload.sh script. + + * lrde-upload.sh: + - Prune old tarballs. + - Append the current date to the tarball name. + +2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * lrde-upload.sh: New script to upload tarballs after a successful compilation. diff --git a/lrde-upload.sh b/lrde-upload.sh index 82f9749..b6730f3 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -7,11 +7,13 @@ set -e set -x -DEST=/lrde/dload/olena/snapshot/ +DEST=/lrde/dload/olena/snapshots/ DEST_DOC=$DEST/doc/milena/ # Retrieve the package version -VERSION=`autoconf --trace='AC_INIT' | cut -d ':' -f 5` +VERSION=`autoconf --trace='AC_INIT:$2'` +CURRENT_DATE=`date +'%d_%m_%y'` +REV=$VERSION-$CURRENT_DATE # Always do "cp then mv" when uploading the file, so that someone # cannot start a download why the destination file is incomplete. @@ -19,15 +21,18 @@ VERSION=`autoconf --trace='AC_INIT' | cut -d ':' -f 5` # Upload the tarball mkdir -p $DEST +# Delete tarballs older than 2 days.. +find $DEST -maxdepth 1 -type f -mtime +2 -exec rm -f {} \; + # tar.gz -cp -f olena-$VERSION.tar.gz $DEST/olena-$rev.tar.gz.tmp -mv -f $DEST/olena-$rev.tar.gz.tmp $DEST/olena-$rev.tar.gz -chmod -R a+r $DEST/olena-$rev.tar.gz +cp -f olena-$VERSION.tar.gz $DEST/olena-$REV.tar.gz.tmp +mv -f $DEST/olena-$REV.tar.gz.tmp $DEST/olena-$REV.tar.gz +chmod -R a+r $DEST/olena-$REV.tar.gz # tar.bz2 -cp -f olena-$VERSION.tar.bz2 $DEST/olena-$rev.tar.bz2.tmp -mv -f $DEST/olena-$rev.tar.bz2.tmp $DEST/olena-$rev.tar.bz2 -chmod -R a+r $DEST/olena-$rev.tar.bz2 +cp -f olena-$VERSION.tar.bz2 $DEST/olena-$REV.tar.bz2.tmp +mv -f $DEST/olena-$REV.tar.bz2.tmp $DEST/olena-$REV.tar.bz2 +chmod -R a+r $DEST/olena-$REV.tar.bz2 # Upload a copy of the reference manual and other documentation. -- 1.5.6.5

1 0

4260: lrde-upload.sh: New script to upload tarballs after a successful compilation.
by Guillaume Lazzara 08 Jul '09

08 Jul '09

--- ChangeLog | 5 +++++ lrde-upload.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) create mode 100755 lrde-upload.sh diff --git a/ChangeLog b/ChangeLog index 347871d..3f42f1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * lrde-upload.sh: New script to upload tarballs after a successful + compilation. + 2009-07-08 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix AUTHORS and layout README. diff --git a/lrde-upload.sh b/lrde-upload.sh new file mode 100755 index 0000000..82f9749 --- /dev/null +++ b/lrde-upload.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +# This file is run by the LRDE autobuilder after a successful compilation. +# It is not meant to be distributed with Olena. + +set -e +set -x + + +DEST=/lrde/dload/olena/snapshot/ +DEST_DOC=$DEST/doc/milena/ + +# Retrieve the package version +VERSION=`autoconf --trace='AC_INIT' | cut -d ':' -f 5` + +# Always do "cp then mv" when uploading the file, so that someone +# cannot start a download why the destination file is incomplete. + +# Upload the tarball +mkdir -p $DEST + +# tar.gz +cp -f olena-$VERSION.tar.gz $DEST/olena-$rev.tar.gz.tmp +mv -f $DEST/olena-$rev.tar.gz.tmp $DEST/olena-$rev.tar.gz +chmod -R a+r $DEST/olena-$rev.tar.gz + +# tar.bz2 +cp -f olena-$VERSION.tar.bz2 $DEST/olena-$rev.tar.bz2.tmp +mv -f $DEST/olena-$rev.tar.bz2.tmp $DEST/olena-$rev.tar.bz2 +chmod -R a+r $DEST/olena-$rev.tar.bz2 + + +# Upload a copy of the reference manual and other documentation. +mkdir -p $DEST_DOC + +rm -rf $DEST_DOC/user_doc.tmp +rm -rf $DEST_DOC/white_paper_html.tmp + +cp -pR milena/doc/user/html $DEST_DOC/user_doc.tmp +cp -pR milena/doc/white_paper/white_paper_html $DEST_DOC/white_paper_html.tmp + +cp milena/doc/ref_guide/ref_guide.pdf $DEST_DOC/ +cp milena/doc/tutorial/tutorial.pdf $DEST_DOC/ +cp milena/doc/user/latex/refman.pdf $DEST_DOC/user_doc.pdf +cp milena/doc/white_paper/white_paper.pdf $DEST_DOC/ +chmod -R a+rX $DEST_DOC/ + +mv -f $DEST_DOC/user_doc $DEST_DOC/user_doc.old || true +mv -f $DEST_DOC/white_paper_html $DEST_DOC/white_paper_html.old || true + +mv -f $DEST_DOC/user_doc.tmp $DEST_DOC/user_doc +mv -f $DEST_DOC/white_paper_html.tmp $DEST_DOC/white_paper_html + +rm -rf $DEST_DOC/user_doc.old +rm -rf $DEST_DOC/white_paper_html.old -- 1.5.6.5

1 0

4259: Fix AUTHORS and layout README.
by Thierry Geraud 08 Jul '09

08 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix AUTHORS and layout README. * AUTHORS: Fix missing emails. Fix missing interns. Fix people with empty tasks. Sort student entries w.r.t. decreasing year. * README (mail): Fix address. (bibliography): Split into image v. language. Sort w.r.t. decreasing year. AUTHORS | 310 +++++++++++++++++++++++++++++++++------------------------------- README | 92 ++++++++---------- 2 files changed, 203 insertions(+), 199 deletions(-) Index: AUTHORS --- AUTHORS (revision 4258) +++ AUTHORS (working copy) @@ -1,45 +1,28 @@ This package was written by and with the assistance of -=========== -LRDE Staff. -=========== -* J�r�me Darbon - - Image morphology and Olena morpho. - -* Akim Demaille - - Configuration system. - - Maintenance of code's clearness. - -* R�da Dehak - - Management of the project. - - Color conversions. - - Cleanup the sources. - -* Alexandre Duret-Lutz - - Maintenance of the source tree for several years. - - Type system. - - Test system. - - First documentation system. - - Numerous hours spent on Olena to make it better. +================== +Active LRDE Staff. +================== * Fabien Freling fabien.freling(a)lrde.epita.fr - Work on Melimage with IGR. - Library improvements. -* Thierry G�raud thierry.geraud(a)lrde.epita.fr +* Thierry G�raud theo(a)lrde.epita.fr - Management of the project in the first place. - Type system. - Revamp of Metalic (Olena pre-1.0). - SCOOP, SCOOP 2, Static (Olena proto-1.0, Olena pre-1.0). - Extended (Olena pre-1.0). + - Olena 1.0 core. - Numerous hours spent thinking about Olena. -* Guillaume Lazzara +* Guillaume Lazzara z(a)lrde.epita.fr - Work on Scribo - Library improvements. -* Roland Levillain roland.levillain(a)lrde.epita.fr +* Roland Levillain roland(a)lrde.epita.fr - Project manager. - Theoritical mentor. - Renovation of Swilena (Olena 0.10a). @@ -48,126 +31,92 @@ - SCOOP 2 and Static (Olena pre-1.0). -========================= -Students from Class 2000. -========================= - -* Yoann Fabre - - Type system. +================================ +Past contributors of LRDE Staff. +================================ +* J�r�me Darbon jerome(a)lrde.epita.fr + - Image morphology and Olena morpho. -========================= -Students from Class 2001. -========================= - -* Vincent Berruchon - -* Renaud Fran�ois - - Bibliographical research. +* R�da Dehak reda(a)lrde.epita.fr + - Management of the project. + - Color conversions. + - Cleanup the sources. -* Anthony Pinagot - - Olena I/O. - - Statistical operators. - - FFT algorithm. +* Akim Demaille akim(a)lrde.epita.fr + - Configuration system. + - Maintenance of code's clearness. -* Micha�l Strauss - - Image morphology. - - Watershed algorithms. - - Olena I/O. +* Alexandre Duret-Lutz adl(a)lrde.epita.fr + - Maintenance of the source tree for several years. + - Type system. + - Test system. + - First documentation system. + - Numerous hours spent on Olena to make it better. ========================= -Students from Class 2002. +Students from Class 2011. ========================= -* Jean Chalard - - Colors. - - Vectors and matrices implementation. - - Olena iterators implementation. - - Wavelets. - -* R�mi Coupet - - Olena morpho. - - Data types (pre-0.6). - - Olena core. - - Bibliographical research. - -* Ludovic Perrine - - Fuzzy types. - -* Pierre-Yves Strub - - Olena morpho. - - Source tree and configuration system. - - Type system. +* Fr�d�ric Bour + - Prototype of the upcoming functions system. +* Edwin Carlinet + - Accumulators. + - Morphological connected filters. ========================= -Students from Class 2003. +Students from Class 2010. ========================= -* Ignacy Gawedzki - - Color system. - -* Jean-S�bastien Mouret - - Image I/O. - - Source tree and configuration system. - - Fast morphological operators. +* Etienne Folio + - Color type traits. -* Qu�c Peyrot - - Watershed algorithm. - -* Rapha�l Poss - - Source tree and configuration system. - - Documentation. - -* Yann R�gis-Gianas - - Type system. +========================= +Students from Class 2009. +========================= -* Emmanuel Turquin - - Implementation of transforms. - - Integre. +* Alexandre Abraham + - R/w functions. +* Nicolas Ballas + - Image properties. + - Data routines. + +* Matthieu Garrigues + - Value types and i/o. + - Draft of the FLLT. + +* Ugo Jardonnet + - Geometrical transforms. + - ICP registration algorithm. ========================= -Students from Class 2004. +Students from Class 2008. ========================= -* Sylvain Berlemont - - Combinatorial maps. - - Cleanup the sources. - -* Nicolas Burrus - - Integre. - - Olena I/O. - - Source tree. - -* David Lesage - - Type system. - - New paradigm. - - Cleanup the sources. +* Tristan Croiset + - Dynamic (Dyn) (Olena proto-1.0) -* Astrid Wang - - New documentation system. - - Static arrays implementation. +* Quentin Hocquet + - SCOOL +* Thomas Moulard + - SCOOL ========================= -Students from Class 2005. +Students from Class 2007. ========================= -* Giovanni Palma - - Color conversion. - - Attribute opening and closing algorithms. - - New documentation system. - - Document the code. - - Cleanup the sources. - -* Niels Van Vliet - - Color conversion. - - Attribute opening and closing algorithms. - - Contributions to document the code. - - Histograms. +* Christophe Berger + - Connected filters (Olena proto-1.0, Olena pre-1.0). + - SCOOP 2 (Olena proto-1.0). +* Nicolas Widynski + - Connected filters (Olena proto-1.0). + - Inpainting (Olena proto-1.0). + - Segmentation (watershed transform, watersnake, snakes) (Olena proto-1.0) ========================= Students from Class 2006. @@ -192,76 +141,141 @@ - SCOOP 2 (Olena proto-1.0). - Dynamic (Dyn) (Olena proto-1.0). - ========================= -Students from Class 2007. +Students from Class 2005. ========================= -* Christophe Berger - - Connected filters (Olena proto-1.0, Olena pre-1.0). - - SCOOP 2 (Olena proto-1.0). - -* Nicolas Widynski - - Connected filters (Olena proto-1.0). - - Inpainting (Olena proto-1.0). - - Segmentation (watershed transform, watersnake, snakes) (Olena proto-1.0) +* Giovanni Palma + - Color conversion. + - Attribute opening and closing algorithms. + - New documentation system. + - Document the code. + - Cleanup the sources. +* Niels Van Vliet + - Color conversion. + - Attribute opening and closing algorithms. + - Contributions to document the code. + - Histograms. ========================= -Students from Class 2008. +Students from Class 2004. ========================= -* Tristan Croiset - - Dynamic (Dyn) (Olena proto-1.0) +* Sylvain Berlemont + - Combinatorial maps. + - Cleanup the sources. -* Quentin Hocquet - - SCOOL +* Nicolas Burrus + - Integre. + - Olena I/O. + - Source tree. -* Thomas Moulard - - SCOOL +* David Lesage + - Type system. + - New paradigm. + - Cleanup the sources. +* Astrid Wang + - New documentation system. + - Static arrays implementation. ========================= -Students from Class 2009. +Students from Class 2003. ========================= -* Alexandre Abraham alexandre.abraham(a)lrde.epita.fr +* Ignacy Gawedzki + - Color system. + +* Jean-S�bastien Mouret + - Image I/O. + - Source tree and configuration system. + - Fast morphological operators. -* Nicolas Ballas nicolas.ballas(a)lrde.epita.fr +* Qu�c Peyrot + - Watershed algorithm. -* Matthieu Garrigues matthieu.garrigues(a)lrde.epita.fr +* Rapha�l Poss + - Source tree and configuration system. + - Documentation. -* Ugo Jardonnet ugo.jardonnet(a)lrde.epita.fr +* Yann R�gis-Gianas + - Type system. +* Emmanuel Turquin + - Implementation of transforms. + - Integre. ========================= -Students from Class 2010. +Students from Class 2002. ========================= -* Etienne Folio etienne.folio(a)lrde.epita.fr +* Jean Chalard + - Colors. + - Vectors and matrices implementation. + - Olena iterators implementation. + - Wavelets. +* R�mi Coupet + - Olena morpho. + - Data types (pre-0.6). + - Olena core. + - Bibliographical research. + +* Ludovic Perrine + - Fuzzy types. + +* Pierre-Yves Strub + - Olena morpho. + - Source tree and configuration system. + - Type system. ========================= -Students from Class 2011. +Students from Class 2001. ========================= -* Frederic Bour frederic.bour(a)lrde.epita.fr +* Vincent Berruchon + +* Renaud Fran�ois + - Bibliographical research. + +* Anthony Pinagot + - Olena I/O. + - Statistical operators. + - FFT algorithm. + +* Micha�l Strauss + - Image morphology. + - Watershed algorithms. + - Olena I/O. -* Edwin Carlinet edwin.carlinet(a)lrde.epita.fr +========================= +Students from Class 2000. +========================= + +* Yoann Fabre + - Type system. =================== Other Contributors. =================== +* Guillaume Duhamel + - Low-level routines. + +* Simon Nivault + - Lemming object. + - Many cleanups. + * Dimitri Papadopoulos-Orfanos - - Type system + - Type system. * Heru Xue - Color system. -Local Variables: -mode: outline -ispell-local-dictionary: "american" -End: +.. Local Variables: +.. mode: rst +.. ispell-local-dictionary: "american" +.. End: Index: README --- README (revision 4258) +++ README (working copy) @@ -230,9 +230,9 @@ * Olena - LRDE - | Laboratoire de Recherche et D�veloppement de l'EPITA + | Laboratoire de Recherche et D�veloppement de l'EPITA (LRDE) | 14-16 rue Voltaire - | 94276 Le Kremlin-Bic�tre CEDEX + | F-94276 Le Kremlin-Bic�tre CEDEX | France @@ -241,37 +241,24 @@ ============ Further information about Olena can be found into the following related -papers: +papers. - * `Vers une r�utilisabilit� totale des algorithmes de traitement - d'images`. Thierry G�raud, Yoann Fabre, Dimitri - Papadopoulos-Orfanos, and Jean-Fran�ois Mangin. In the - Proceedings of the 17th Symposium GRETSI on Signal and Image - Processing, vol. 2, pages 331-334, Vannes, France, - September 1999. In French (available in English as Technical - Report 9902: `Towards a Total Reusability of Image Processing - Algorithms'). +About Image Processing Programming: - * `Obtaining Genericity for Image Processing and Pattern - Recognition Algorithms`. Thierry G�raud, Yoann Fabre, Alexandre - Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-Fran�ois - Mangin. In the Proceedings of the 15th International Conference - on Pattern Recognition (ICPR'2000), IEEE Computer Society, - vol. 4, pages 816-819, Barcelona, Spain, September 2000. + * `Milena: Write Generic Morphological Algorithms Once, Run on Many + Kinds of Images`. Roland Levillain, Thierry G�raud, Laurent + Najman. In the proceedings of the 9th International Symposium on + Mathematical Morphology (ISMM) http://www.cs.rug.nl/~ISMM09/ + Groningen, The Netherlands August 24 - 27, 2009. - * `Olena: a Component-Based Platform for Image Processing, mixing - Generic, Generative and OO Programming`. Alexandre Duret-Lutz. - In the Proceedings of the 2nd International Symposium on - Generative and Component-Based Software Engineering (GCSE 2000), - Young Researchers Workshop (published in "Net.ObjectDays2000"; - ISBN 3-89683-932-2), pages 653-659, Erfurt, Germany, October - 2000. + * `Generic Algorithmic Blocks Dedicated to Image Processing`, + J�r�me Darbon, Thierry G�raud, Patrick Bellot. In the proceedings + of ECOOP PHD Oslo, Norway, June 2004. - * `Generic Design Patterns in C++`. Alexandre Duret-Lutz, Thierry - G�raud, and Akim Demaille. In the Proceedings of the 6th USENIX - Conference on Object-Oriented Technologies and Systems - (COOTS'2001), pages 189-202, San Antonio, Texas, USA, - January-February 2001. + * `Generic Implementation of Morphological Image Operators`, J�r�me + Darbon, Thierry G�raud, and Alexandre Duret-Lutz, submitted to + International Symposium On Mathematical Morphology VI (ISMM + 2002), April 3-5, 2002, Sydney, Australia. * `Applying Generic Programming to Image Processing`, Thierry G�raud, Yoann Fabre, and Alexandre Duret-Lutz. In the @@ -280,24 +267,14 @@ Applications, ACTA Press, pages 577-581, Innsbruck, Austria, February 2001. - * `Generic Implementation of Morphological Image Operators`, J�r�me - Darbon, Thierry G�raud, and Alexandre Duret-Lutz, submitted to - International Symposium On Mathematical Morphology VI (ISMM - 2002), April 3-5, 2002, Sydney, Australia. - - * `Static C++ Object-Oriented Programming (SCOOP)`, Nicolas Burrus, - Alexandre Duret-Lutz, Thierry G�raud, David Lesage, and Rapha�l - Poss. In the Proceedings of the Workshop on Multiple Paradigm - with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. - - * `Generic Algorithmic Blocks Dedicated to Image Processing`, - J�r�me Darbon, Thierry G�raud, Patrick Bellot. In the proceedings - of ECOOP PHD Oslo, Norway June 2004. + * `Obtaining Genericity for Image Processing and Pattern + Recognition Algorithms`. Thierry G�raud, Yoann Fabre, Alexandre + Duret-Lutz, Dimitri Papadopoulos-Orfanos, and Jean-Fran�ois + Mangin. In the Proceedings of the 15th International Conference + on Pattern Recognition (ICPR'2000), IEEE Computer Society, + vol. 4, pages 816-819, Barcelona, Spain, September 2000. - * `Fast Color Image Segmentation Based on Levellings in Feature - Space`, Thierry G�raud, Giovanni Palma, Niels Van Vliet. In the - proceedings of the International Conference on Computer Vision - and Graphics (ICCVG) Warsaw, Poland, September 2004. +About Generic Programming Paradigm: * `Semantics-Driven Genericity: A Sequel to the Static C++ Object-Oriented Programming Paradigm (SCOOP 2)`. Thierry G�raud, @@ -307,11 +284,24 @@ http://homepages.fh-regensburg.de/~mpool/mpool08/welcome.html Paphos, Cyprus July 7, 2008. - * `Milena: Write Generic Morphological Algorithms Once, Run on Many - Kinds of Images`. Roland Levillain, Thierry G�raud, Laurent - Najman. In the proceedings of the 9th International Symposium on - Mathematical Morphology (ISMM) http://www.cs.rug.nl/~ISMM09/ - Groningen, The Netherlands August 24 - 27, 2009. + * `Static C++ Object-Oriented Programming (SCOOP)`, Nicolas Burrus, + Alexandre Duret-Lutz, Thierry G�raud, David Lesage, and Rapha�l + Poss. In the Proceedings of the Workshop on Multiple Paradigm + with OO Languages (MPOOL'03) Anaheim, CA, October 2003. + + * `Generic Design Patterns in C++`. Alexandre Duret-Lutz, Thierry + G�raud, and Akim Demaille. In the Proceedings of the 6th USENIX + Conference on Object-Oriented Technologies and Systems + (COOTS'2001), pages 189-202, San Antonio, Texas, USA, + January-February 2001. + + * `Olena: a Component-Based Platform for Image Processing, mixing + Generic, Generative and OO Programming`. Alexandre Duret-Lutz. + In the Proceedings of the 2nd International Symposium on + Generative and Component-Based Software Engineering (GCSE 2000), + Young Researchers Workshop (published in "Net.ObjectDays2000"; + ISBN 3-89683-932-2), pages 653-659, Erfurt, Germany, October + 2000. You can download these papers and related materials from

1 0

4258: Bug fix.
by Thierry Geraud 08 Jul '09

08 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/scribo Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Bug fix. * filter/thick_objects.hh: Fix. thick_objects.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: filter/thick_objects.hh --- filter/thick_objects.hh (revision 4257) +++ filter/thick_objects.hh (working copy) @@ -166,7 +166,7 @@ { trace::entering("scribo::filter::thick_objects"); - mln_precondition(text.is_valid()); + mln_precondition(objects.is_valid()); typedef internal::thick_object_filter<L> func_t; func_t is_not_too_thick(objects, max_thickness);

1 0

4257: Fix last issues with ICC.
by Guillaume Lazzara 08 Jul '09

08 Jul '09

* mln/labeling/colorize.hh: make it deterministic whatever the compiler used. * mln/make/mat.hh: remove invalid overloads. * tests/labeling/colorize.cc: fix reference image. * tests/make/mat.cc: remove deprecated tests. --- milena/ChangeLog | 13 +++++++ milena/mln/labeling/colorize.hh | 17 +++++++-- milena/mln/make/mat.hh | 68 ++++--------------------------------- milena/tests/labeling/colorize.cc | 19 +++++++--- milena/tests/make/mat.cc | 36 ++++++++----------- 5 files changed, 62 insertions(+), 91 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index de00c9d..f279706 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,16 @@ +2009-07-08 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Fix last issues with ICC. + + * mln/labeling/colorize.hh: make it deterministic whatever the + compiler used. + + * mln/make/mat.hh: remove invalid overloads. + + * tests/labeling/colorize.cc: fix reference image. + + * tests/make/mat.cc: remove deprecated tests. + 2009-07-08 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor fixes in labeling/compute_image.hh. diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index 06a3b8e..26a78df 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -110,16 +110,27 @@ namespace mln return colorize_::min_value + last % colorize_::max_value; } + + // No random color generator is available for the value type V. template <typename V> V random_color(const V&); + template <unsigned n> mln::value::rgb<n> random_color(const mln::value::rgb<n>&) { - return mln::value::rgb<n>(random_number(), - random_number(), - random_number()); + // Make sure the numbers are generated in the same order + // whatever the compiler used. + // For instance, ICC does not compute function arguments in + // the same order as GCC does. + unsigned + red = random_number(), + green = random_number(), + blue = random_number(); + return mln::value::rgb<n>(red, + green, + blue); } } diff --git a/milena/mln/make/mat.hh b/milena/mln/make/mat.hh index ec2fbdf..ed72f60 100644 --- a/milena/mln/make/mat.hh +++ b/milena/mln/make/mat.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,10 +27,10 @@ #ifndef MLN_MAKE_MAT_HH # define MLN_MAKE_MAT_HH -/*! \file - * - * \brief Routine to construct an mln::algebra::mat. - */ +/// \file +/// +/// \brief Routine to construct an mln::algebra::mat. + # include <mln/algebra/mat.hh> # include <mln/metal/math/sqrt.hh> @@ -51,34 +52,10 @@ namespace mln algebra::mat<n,m,T> mat(const T (&tab)[n*m]); - /*! \brief Create an mln::algebra::mat<n,m,T>. - * - * \param[in] tab Array of values. - * - * \pre The array dimension has to be n * m. - */ - template <typename T, unsigned n, unsigned m> - algebra::mat<n,m,T> mat(const T (&tab)[n][m]); - - - /*! \brief Create an mln::algebra::mat<n,n,T>. - * - * \param[in] tab C-array of values. - * - * \pre The array dimension N has to be square (N = n * n). - */ - template <typename T, unsigned N> - algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> - mat(const T (&tab)[N]); - - - template <unsigned n, unsigned m, typename T> - algebra::mat<n,m,T> mat(algebra::vec<n,T> v); - - # ifndef MLN_INCLUDE_ONLY + template <unsigned n, unsigned m, typename T> inline algebra::mat<n,m,T> mat(const T (&tab)[n*m]) @@ -89,37 +66,6 @@ namespace mln return tmp; } - template <typename T, unsigned n, unsigned m> - algebra::mat<n,m,T> mat(const T (&tab)[n][m]) - { - algebra::mat<n,m,T> tmp; - for (unsigned i = 0; i < n; ++i) - for (unsigned j = 0; j < m; ++j) - tmp(i, j) = tab[i][j]; - return tmp; - } - - template <typename T, unsigned N> - inline - algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> - mat(const T (&tab)[N]) - { - enum { n = mlc_sqrt_int(N) }; - mlc_bool(N == n * n)::check(); - algebra::mat<n,n,T> tmp; - for (unsigned i = 0; i < N; ++i) - tmp(i / n, i % n) = tab[i]; - return tmp; - } - - template <unsigned n, typename T> - algebra::mat<n,1,T> mat(algebra::vec<n,T> v) - { - algebra::mat<n,1,T> tmp; - for (unsigned i = 0; i < n; i++) - tmp(i,0) = v[i]; - return tmp; - } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/labeling/colorize.cc b/milena/tests/labeling/colorize.cc index c0bba3c..9c4d352 100644 --- a/milena/tests/labeling/colorize.cc +++ b/milena/tests/labeling/colorize.cc @@ -23,11 +23,18 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -# include <mln/make/image.hh> -# include <mln/value/rgb8.hh> -# include <mln/value/int_u8.hh> -# include <mln/labeling/colorize.hh> -# include <mln/data/compare.hh> + +/// \file +/// +/// Test of labeling::colorize. + + +#include <mln/make/image.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/int_u8.hh> +#include <mln/labeling/colorize.hh> +#include <mln/data/compare.hh> + int main() { @@ -37,7 +44,7 @@ int main() { 0, 0 } }; typedef value::rgb8 rgb_t; - value::rgb8 ref_data[][2] = { { rgb_t(231,46,171), rgb_t(231,46,171) }, + value::rgb8 ref_data[][2] = { { rgb_t(171,46,231), rgb_t(171,46,231) }, { rgb_t(0,0,0), rgb_t(0,0,0) } }; image2d<value::int_u8> ima = make::image(values); diff --git a/milena/tests/make/mat.cc b/milena/tests/make/mat.cc index b9db750..48d7c55 100644 --- a/milena/tests/make/mat.cc +++ b/milena/tests/make/mat.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -23,32 +24,25 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/algebra/mat.hh> + +/// \file +/// +/// \brief Test of make::mat. +#include <mln/algebra/mat.hh> + int main() { using namespace mln; - { - int vals[] = { 1, 0, - 0, 1 }; - algebra::mat<2,2,int> m = make::mat(vals); - } - - { - int vals[] = { 1, 2, 3, - 4, 5, 6 }; - algebra::mat<2,3,int> m = make::mat<2,3>(vals); - std::cout << m << std::endl; - } - - { - int vals[][3] = { { 1, 2, 3 }, - { 4, 5, 6 } }; - algebra::mat<2,3,int> m = make::mat(vals); - std::cout << m << std::endl; - } + int vals[] = { 1, 2, 3, + 4, 5, 6 }; + + algebra::mat<2,3,int> m = make::mat<2,3>(vals); + for (int i = 0; i < 2; ++i) + for (int j = 0; j < 3; ++j) + mln_assertion(m(i, j) == vals[i + j + (i * 2)]); } -- 1.5.6.5

1 0

milena r4256: Minor fixes in labeling/compute_image.hh
by Edwin Carlinet 08 Jul '09

08 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-07-08 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor fixes in labeling/compute_image.hh. * labeling/compute_image.hh: Minor fixes. --- compute_image.hh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Index: trunk/milena/mln/labeling/compute_image.hh =================================================================== --- trunk/milena/mln/labeling/compute_image.hh (revision 4255) +++ trunk/milena/mln/labeling/compute_image.hh (revision 4256) @@ -99,7 +99,7 @@ /// template <typename A, typename I, typename L> inline - mln_ch_value(L, mln_accu_result(A, mln_value(I))) + mln_ch_value(L, mln_meta_accu_result(A, mln_value(I))) compute_image(const Meta_Accumulator<A>& accu, const Image& input, const Image<L>& labels, @@ -176,7 +176,7 @@ template <typename A, typename I, typename L> inline - mln_ch_value(L, mln_accu_result(A, mln_value(I))) + mln_ch_value(L, mln_meta_accu_result(A, mln_value(I))) compute_image(const Meta_Accumulator<A>& accu, const Image& input, const Image<L>& labels, @@ -184,10 +184,12 @@ { trace::entering("labeling::compute_image"); - util::array<mln_accu_result(A, mln_value(I))> res = + typedef mln_meta_accu_result(A, mln_value(I)) T; + + util::array<T> res = compute(accu, input, labels, nlabels); - mln_ch_value(L, mln_accu_result(A, mln_value(I))) output = + mln_ch_value(L, T) output = labeling::internal::compute_image(res, labels, nlabels); trace::exiting("labeling::compute_image");

1 0

4255: About nothing.
by Thierry Geraud 07 Jul '09

07 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> About nothing. * mln/make/vertex_image.hh: Simplify a line. vertex_image.hh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: mln/make/vertex_image.hh --- mln/make/vertex_image.hh (revision 4254) +++ mln/make/vertex_image.hh (working copy) @@ -80,8 +80,7 @@ mln_precondition(exact(g).is_valid()); p_vertices<G> pv(g); - mln::vertex_image<void,mln_result(FV),G> - ima(pv, mln::convert::to<fun::i2v::array<mln_result(FV)> >(fv)); + mln::vertex_image<void,mln_result(FV),G> ima(pv, fv); trace::exiting("make::vertex_image"); return ima;

1 0

4254: Start cleaning up line segmentation code.
by Thierry Geraud 07 Jul '09

07 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start cleaning up line segmentation code. * modules/icdar/lines.cc: New. * modules/icdar/input_to_words.cc: Rename as... * modules/icdar/words.cc: ...this. lines.cc | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) Property changes on: modules/icdar/words.cc ___________________________________________________________________ Added: svn:mergeinfo Index: modules/icdar/lines.cc --- modules/icdar/lines.cc (revision 0) +++ modules/icdar/lines.cc (revision 0) @@ -0,0 +1,221 @@ +// 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. + + +// For local::superimpose_save. +#include <string> +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/label.hh> +#include <mln/data/convert.hh> +#include <mln/data/fill.hh> +#include <mln/pw/all.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/literal/colors.hh> +#include <mln/io/ppm/save.hh> + +// For local::accu_compute_on_weighted_sets. +#include <mln/util/array.hh> + +// For main. +#include <mln/io/pbm/load.hh> +#include <mln/world/binary_2d/subsample.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/data/fill.hh> +#define MLN_FLOAT double +#include <sandbox/theo/exec/gaussian_directional_2d.hh> +#include <mln/data/saturate.hh> + +#include <mln/win/rectangle2d.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/morpho/watershed/flooding.hh> + +#include <mln/algebra/vec.hh> +#include <mln/accu/stat/var.hh> +#include <mln/make/region_adjacency_graph.hh> +#include <mln/make/vertex_image.hh> +#include <mln/make/edge_image.hh> + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm output.ppm" << std::endl + << " HSC @ ICDAR'2009" << std::endl + << " input.pbm: input 2D binary image (text is black; background is white)" << std::endl + << " output.ppm: result of line segmentation." << std::endl; + std::abort(); +} + + + +namespace local +{ + + using namespace mln; + + + // Superpose the watershed line (red) over an input image. + void superimpose_save(const image2d<value::int_u8>& input, + const image2d<value::label<12> >& ws, + const std::string& filename) + { + image2d<value::rgb8> output = data::convert(value::rgb8(), input); + data::fill((output | (pw::value(ws) == pw::cst(0))).rw(), + literal::red); + io::ppm::save(output, filename); + } + + + template <typename A, typename L, typename I> + util::array<A> + accu_compute_on_weighted_sets(A, + const L& label, + mln_value(L) nlabels, + const I& w) + { + util::array<A> arr(nlabels.next()); + mln_piter(L) p(label.domain()); + for_all(p) + arr[label(p)].take_n_times(w(p), p.to_site()); + return arr; + } + + + struct bloup : Function_vv2v<bloup> + { + typedef float result; + + template <typename Var, typename V> + float dist(const Var& var, const V& v) const + { + mln_precondition(var.is_valid()); + V v_ = v - var.mean(); + return v_.t() * var.variance()._1() * v_; + } + + template <typename Var> + float operator()(const Var& var1, const Var& var2) const + { + return std::min(dist(var1, var2.mean()), dist(var2, var1.mean())); + } + }; + + +} // local + + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + + if (argc != 3) + usage(argv); + + + // Parameters. + + const unsigned + height = 5, + width = 25; + + const float + h_sigma = 31, + v_sigma = 1.3; + + // end of Parameters. + + + trace::entering("main"); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + // Sub-sample. + image2d<value::int_u8> small = world::binary_2d::subsample(input, 4); +// io::pgm::save(small, "temp_small.pgm"); + + + + // Fuzzifying. + + image2d<double> temp(small.domain()); + data::fill(temp, small); + + temp = linear::gaussian_directional_2d(temp, 1, h_sigma, 255); + temp = linear::gaussian_directional_2d(temp, 0, v_sigma, 255); + + image2d<int_u8> fuzzy = data::saturate(value::int_u8(), temp); +// io::pgm::save(fuzzy, "temp_fuzzy.pgm"); + + // Closing. + image2d<int_u8> clo = morpho::closing::structural(fuzzy, win::rectangle2d(height, width)); + + // Watershed transform. + typedef value::label<12> L; + L n_basins; + image2d<L> ws = morpho::watershed::flooding(clo, c4(), n_basins); + + std::cout << "n basins = " << n_basins << std::endl; + + local::superimpose_save(small, ws, "temp_small_ws.ppm"); + local::superimpose_save(fuzzy, ws, "temp_fuzzy_ws.ppm"); + + + typedef accu::stat::var< algebra::vec<2,float> > A; + util::array<A> arr; + arr = local::accu_compute_on_weighted_sets(A(), + ws, + n_basins, + (pw::cst(255) - pw::value(small)) | small.domain()); + + for (unsigned l = 1; l <= n_basins; ++l) + std::cout << l << ' ' << arr[l].n_items() << ' ' << arr[l].mean() << std::endl; + + typedef util::graph G; + G gr = make::region_adjacency_graph(ws, c8(), n_basins); + + vertex_image<void,A,G> v_ima = make::vertex_image(gr, arr); + + edge_image<void,float,G> e_ima = make::edge_image(v_ima, + local::bloup()); + + { + typedef edge_image<void,float,G> I; + mln_piter_(I) e(e_ima.domain()); + for_all(e) + { + std::cout << e.element().v1() << '-' << e.element().v2() << " : " << e_ima(e) << std::endl; + } + } + + trace::exiting("main"); +}

1 0

4253: modules/icdar/input_to_words.cc: Cleanup code for ICDAR.
by Guillaume Lazzara 07 Jul '09

07 Jul '09

--- milena/sandbox/ChangeLog | 4 + milena/sandbox/modules/icdar/input_to_words.cc | 225 ++++++++++++++++++++++++ 2 files changed, 229 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/modules/icdar/input_to_words.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index cf48639..6e960f6 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,7 @@ +2009-07-07 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * modules/icdar/input_to_words.cc: Cleanup code for ICDAR. + 2009-07-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> New directories for icdar code release. diff --git a/milena/sandbox/modules/icdar/input_to_words.cc b/milena/sandbox/modules/icdar/input_to_words.cc new file mode 100644 index 0000000..55ef385 --- /dev/null +++ b/milena/sandbox/modules/icdar/input_to_words.cc @@ -0,0 +1,225 @@ +// 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. + + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/imorph/tr_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/concept/function.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/var.hh> + +#include <mln/fun/v2b/threshold.hh> +#include <mln/data/transform.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/labeling/wrap.hh> +#include <mln/labeling/colorize.hh> +#include <mln/morpho/watershed/superpose.hh> +#include <mln/logical/not.hh> +#include <mln/world/binary_2d/subsample.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/elementary/dilation.hh> +#include <mln/morpho/closing/area.hh> +#include <mln/morpho/closing/structural.hh> + +#include <mln/transform/distance_front.hh> + +#include <mln/make/w_window2d_int.hh> + +#include <mln/io/pbm/all.hh> +#include <mln/io/pgm/all.hh> +#include <mln/io/ppm/all.hh> + +#include <mln/value/int_u8.hh> + + + +namespace mln +{ + + + // Forward declaration. + template <typename P> struct to_larger; + + + template <typename P> + struct to_smaller + : Function_v2v < to_smaller > + { + typedef P result; + typedef to_larger invert; + + P operator()(const P& p) const + { + P tmp(p); + + for (unsigned i = 0; i < P::dim; ++i) + tmp[i] /= 2; + + return tmp; + } + + + invert inv() const + { + return to_larger(); + } + }; + + + template <typename P> + struct to_larger + : Function_v2v < to_larger > + { + typedef P result; + typedef to_smaller invert; + + P operator()(const P& p) const + { + P tmp(p); + + for (unsigned i = 0; i < P::dim; ++i) + tmp[i] *= 2; + + return tmp; + } + + + invert inv() const + { + return to_smaller(); + } + + }; + + +} + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + typedef value::int_u8 L; + typedef image2d<bool> I; + + + // Parameters. + + // Related to the first structural closing. + const unsigned + height = 5, + width = 11; + + // Related to the distance map computation. + const unsigned + l_area = 500; + + // end of Parameters. + + + + I input; + io::pbm::load(input, argv[1]); + + + /// Reduction and invertion. + image2d<L> + small_gl = world::binary_2d::subsample(input, 2); + I small = data::transform(small_gl, fun::v2b::threshold<L>(191)); + logical::not_inplace(small); + +#ifdef LOG + io::pbm::save(small, "small.pbm"); +#endif // ! LOG + + + /// Structural closing. + I clo = morpho::closing::structural(small, + win::rectangle2d(height, + width)); + +#ifdef LOG + io::pbm::save(clo, "tmp_clo.pbm"); +#endif // ! LOG + + + /// Distance map computation. + int ww[] = { 00, 11, 0, 11, 0, + 11, 7, 5, 7, 11, + 00, 5, 0, 5, 0, + 11, 7, 5, 7, 11, + 00, 11, 0, 11, 0 }; + + typedef value::int_u<12> int_u12; + image2d<int_u12> + dmap = transform::distance_front(clo, + c4(), make::w_window2d_int(ww), + mln_max(int_u12)), + dmap_ = morpho::closing::area(dmap, c4(), l_area); + + +#ifdef LOG + io::pgm::save(labeling::wrap(dmap), "tmp_dmap.pgm"); + io::pgm::save(labeling::wrap(dmap_), "tmp_dmap_.pgm"); +#endif // ! LOG + + /// Watershed. + L n_words; + image2d<L> ws_ = morpho::watershed::flooding(dmap_, + c4(), + n_words); + + /// Remove non-significant regional minima. + image2d<L> ws = morpho::elementary::dilation(ws_, + c4()); + +#ifdef LOG + io::pgm::save(labeling::wrap(ws), "tmp_ws.pgm"); + io::pgm::save(labeling::wrap(ws_), "tmp_ws_.pgm"); + + /// Adjust the domain of the watershed image. + mln_VAR(ws_large_, transposed_image(input.domain(), ws_, + to_larger<point2d>())); + io::ppm::save(morpho::watershed::superpose(input, ws_large_), + "tmp_ws_on_input.ppm"); +#endif // ! LOG + + + /// Adjust the domain of the watershed image. + mln_VAR(ws_large, transposed_image(input.domain(), ws, + to_larger<point2d>())); + + image2d<L> output(input.domain()); + data::fill(output, literal::zero); + + data::paste(ws_large | (pw::value(input) == pw::cst(false)), output); + + io::pgm::save(output, "ws_large.pgm"); + io::ppm::save(labeling::colorize(output, n_words), "ws_large.ppm"); + +} + -- 1.5.6.5

1 0

r4252: Fix small typo error
by Fabien Freling 07 Jul '09

07 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk ChangeLog: 2009-07-07 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix small typo error. * NEWS: Fix small typo error. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/NEWS =================================================================== --- trunk/NEWS (revision 4251) +++ trunk/NEWS (revision 4252) @@ -1,7 +1,7 @@ * Olena 1.0 * The core C++ library, renamed to Milena, has been rewritten - from scratch and feature numerous additions over the past + from scratch and features numerous additions over the past releases. * Milena uses a simplified version of the SCOOP 2 paradigm

1 0