- Olena-patches

[PATCH] Replace exported global variables with static ones.
by Benoit Sigoure 29 Nov '07

29 Nov '07

This allows for separate compilation. * milena/mln/border/thickness.hh, * milena/mln/literal/black.hh, * milena/mln/literal/colors.hh, * milena/mln/literal/grays.hh, * milena/mln/literal/one.hh, * milena/mln/literal/origin.hh, * milena/mln/literal/white.hh, * milena/mln/literal/zero.hh, * milena/mln/tag/init.hh: Here. * milena/mln/trace/entering.hh: Add a missing `inline'. * milena/mln/trace/exiting.hh: Kill trailing whitespaces. Signed-off-by: Benoit Sigoure <tsuna(a)lrde.epita.fr> --- I pushed this change. Cheers, milena/ChangeLog | 16 ++++++++++++++++ milena/mln/border/thickness.hh | 3 ++- milena/mln/literal/black.hh | 10 ++-------- milena/mln/literal/colors.hh | 17 ++++++----------- milena/mln/literal/grays.hh | 10 ++-------- milena/mln/literal/one.hh | 5 ++--- milena/mln/literal/origin.hh | 10 ++-------- milena/mln/literal/white.hh | 9 ++------- milena/mln/literal/zero.hh | 5 ++--- milena/mln/tag/init.hh | 17 ++++++++++++----- milena/mln/trace/entering.hh | 3 ++- milena/mln/trace/exiting.hh | 2 +- 12 files changed, 51 insertions(+), 56 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 09c6932..f7896cc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2007-11-29 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Replace exported global variables with static ones. + This allows for separate compilation. + * milena/mln/border/thickness.hh, + * milena/mln/literal/black.hh, + * milena/mln/literal/colors.hh, + * milena/mln/literal/grays.hh, + * milena/mln/literal/one.hh, + * milena/mln/literal/origin.hh, + * milena/mln/literal/white.hh, + * milena/mln/literal/zero.hh, + * milena/mln/tag/init.hh: Here. + * milena/mln/trace/entering.hh: Add a missing `inline'. + * milena/mln/trace/exiting.hh: Kill trailing whitespaces. + 2007-11-28 Benoit Sigoure <tsuna(a)lrde.epita.fr> Add the missing inline keywords. diff --git a/milena/mln/border/thickness.hh b/milena/mln/border/thickness.hh index bcb3096..7f953f9 100644 --- a/milena/mln/border/thickness.hh +++ b/milena/mln/border/thickness.hh @@ -41,7 +41,8 @@ namespace mln namespace border { - unsigned thickness = 3; + // FIXME: Make this a proper global (issue #43). + static unsigned thickness = 3; } // end of namespace mln::border diff --git a/milena/mln/literal/black.hh b/milena/mln/literal/black.hh index b20dbb2..7307420 100644 --- a/milena/mln/literal/black.hh +++ b/milena/mln/literal/black.hh @@ -48,14 +48,8 @@ namespace mln /// Literal black. - extern const black_t& black; - - -# ifndef MLN_INCLUDE_ONLY - - const black_t& black = black_t(); - -# endif // ! MLN_INCLUDE_ONLY + // FIXME: Make this a proper global (issue #43). + static const black_t black = black_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/colors.hh b/milena/mln/literal/colors.hh index adca17f..a006dc1 100644 --- a/milena/mln/literal/colors.hh +++ b/milena/mln/literal/colors.hh @@ -58,21 +58,16 @@ namespace mln /// Literal red. - extern const red_t& red; + // FIXME: Make this a proper global (issue #43). + static const red_t red = red_t(); /// Literal green. - extern const green_t& green; + // FIXME: Make this a proper global (issue #43). + static const green_t green = green_t(); /// Literal blue. - extern const blue_t& blue; - -# ifndef MLN_INCLUDE_ONLY - - const red_t& red = red_t(); - const green_t& green = green_t(); - const blue_t& blue = blue_t(); - -# endif // ! MLN_INCLUDE_ONLY + // FIXME: Make this a proper global (issue #43). + static const blue_t blue = blue_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/grays.hh b/milena/mln/literal/grays.hh index 438de9e..b9a6ad6 100644 --- a/milena/mln/literal/grays.hh +++ b/milena/mln/literal/grays.hh @@ -47,14 +47,8 @@ namespace mln }; /// Literal medium_gray. - extern const medium_gray_t& medium_gray; - - -# ifndef MLN_INCLUDE_ONLY - - const medium_gray_t& medium_gray = medium_gray_t(); - -# endif // ! MLN_INCLUDE_ONLY + // FIXME: Make this a proper global (issue #43). + static const medium_gray_t medium_gray = medium_gray_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/one.hh b/milena/mln/literal/one.hh index 3b9d855..699819f 100644 --- a/milena/mln/literal/one.hh +++ b/milena/mln/literal/one.hh @@ -54,7 +54,8 @@ namespace mln /// Literal one. - extern const one_t& one; + // FIXME: Make this a proper global (issue #43). + static const one_t one = one_t(); # ifndef MLN_INCLUDE_ONLY @@ -67,8 +68,6 @@ namespace mln return 1; } - const one_t& one = one_t(); - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/literal/origin.hh b/milena/mln/literal/origin.hh index bceadf7..5f64726 100644 --- a/milena/mln/literal/origin.hh +++ b/milena/mln/literal/origin.hh @@ -48,14 +48,8 @@ namespace mln }; /// Literal origin. - extern const origin_t& origin; - -# ifndef MLN_INCLUDE_ONLY - - const origin_t& origin = origin_t(); - -# endif // ! MLN_INCLUDE_ONLY - + // FIXME: Make this a proper global (issue #43). + static const origin_t origin = origin_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/white.hh b/milena/mln/literal/white.hh index 8fc0336..c8c5bf8 100644 --- a/milena/mln/literal/white.hh +++ b/milena/mln/literal/white.hh @@ -48,15 +48,10 @@ namespace mln /// Literal white. - extern const white_t& white; + // FIXME: Make this a proper global (issue #43). + static const white_t white = white_t(); -# ifndef MLN_INCLUDE_ONLY - - const white_t& white = white_t(); - -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::literal } // end of namespace mln diff --git a/milena/mln/literal/zero.hh b/milena/mln/literal/zero.hh index 88edc7c..f35f8a3 100644 --- a/milena/mln/literal/zero.hh +++ b/milena/mln/literal/zero.hh @@ -56,7 +56,8 @@ namespace mln /// Literal zero. - extern const zero_t& zero; + // FIXME: Make this a proper global (issue #43). + static const zero_t zero = zero_t(); # ifndef MLN_INCLUDE_ONLY @@ -69,8 +70,6 @@ namespace mln return 0; } - const zero_t& zero = zero_t(); - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index 3a63d90..59a986d 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -40,11 +40,18 @@ namespace mln namespace tag { - struct image_t {} image; - struct domain_t {} domain; - struct bbox_t {} bbox; - struct border_t {} border; - struct function_t {} function; + struct image_t {}; + struct domain_t {}; + struct bbox_t {}; + struct border_t {}; + struct function_t {}; + + // FIXME: Make these proper globals (issue #43). + static const image_t image = image_t(); + static const domain_t domain = domain_t(); + static const bbox_t bbox = bbox_t(); + static const border_t border = border_t(); + static const function_t function = function_t(); } // end of namespace mln::tag diff --git a/milena/mln/trace/entering.hh b/milena/mln/trace/entering.hh index 9603ea0..e9d66ce 100644 --- a/milena/mln/trace/entering.hh +++ b/milena/mln/trace/entering.hh @@ -49,6 +49,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline void entering(const std::string& scope) { if (quiet) @@ -58,7 +59,7 @@ namespace mln std::cout << scope << " {" << std::endl; ++tab; } - + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::trace diff --git a/milena/mln/trace/exiting.hh b/milena/mln/trace/exiting.hh index d690dd1..b9595f5 100644 --- a/milena/mln/trace/exiting.hh +++ b/milena/mln/trace/exiting.hh @@ -59,7 +59,7 @@ namespace mln std::cout << " "; std::cout << "}" << std::endl; } - + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::trace -- 1.5.3.5.756.gc887a

1 0

[PATCH] Replace exported global variables with static ones.
by Benoit Sigoure 29 Nov '07

29 Nov '07

This allows for separate compilation. * milena/mln/border/thickness.hh, * milena/mln/literal/black.hh, * milena/mln/literal/colors.hh, * milena/mln/literal/grays.hh, * milena/mln/literal/one.hh, * milena/mln/literal/origin.hh, * milena/mln/literal/white.hh, * milena/mln/literal/zero.hh, * milena/mln/tag/init.hh: Here. * milena/mln/trace/entering.hh: Add a missing `inline'. * milena/mln/trace/exiting.hh: Kill trailing whitespaces. Signed-off-by: Benoit Sigoure <tsuna(a)lrde.epita.fr> --- This patch enables me to use separate compilation with my Markov field project. I guess there remains other similar cases in the code though. By the way, I think that Olena has too many small headers. Some headers define only one thing. I would group similar things together to reduce the number of I/O done by the compiler. My project uses only the most basic things in Olena (<mln/core/image2d.hh> <mln/value/rgb8.hh> <mln/border/duplicate.hh> <mln/core/dpoint2d.hh> <mln/io/pgm/save.hh> <mln/io/ppm/load.hh> <mln/level/stretch.hh> <mln/norm/l2.hh>) and each compilation brings in 371 Olena headers, on everage (!). milena/ChangeLog | 16 ++++++++++++++++ milena/mln/border/thickness.hh | 2 +- milena/mln/literal/black.hh | 9 +-------- milena/mln/literal/colors.hh | 14 +++----------- milena/mln/literal/grays.hh | 9 +-------- milena/mln/literal/one.hh | 4 +--- milena/mln/literal/origin.hh | 9 +-------- milena/mln/literal/white.hh | 8 +------- milena/mln/literal/zero.hh | 4 +--- milena/mln/tag/init.hh | 16 +++++++++++----- milena/mln/trace/entering.hh | 3 ++- milena/mln/trace/exiting.hh | 2 +- 12 files changed, 40 insertions(+), 56 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 09c6932..f7896cc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,19 @@ +2007-11-29 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Replace exported global variables with static ones. + This allows for separate compilation. + * milena/mln/border/thickness.hh, + * milena/mln/literal/black.hh, + * milena/mln/literal/colors.hh, + * milena/mln/literal/grays.hh, + * milena/mln/literal/one.hh, + * milena/mln/literal/origin.hh, + * milena/mln/literal/white.hh, + * milena/mln/literal/zero.hh, + * milena/mln/tag/init.hh: Here. + * milena/mln/trace/entering.hh: Add a missing `inline'. + * milena/mln/trace/exiting.hh: Kill trailing whitespaces. + 2007-11-28 Benoit Sigoure <tsuna(a)lrde.epita.fr> Add the missing inline keywords. diff --git a/milena/mln/border/thickness.hh b/milena/mln/border/thickness.hh index bcb3096..007c0e4 100644 --- a/milena/mln/border/thickness.hh +++ b/milena/mln/border/thickness.hh @@ -41,7 +41,7 @@ namespace mln namespace border { - unsigned thickness = 3; + static unsigned thickness = 3; } // end of namespace mln::border diff --git a/milena/mln/literal/black.hh b/milena/mln/literal/black.hh index b20dbb2..3f0813e 100644 --- a/milena/mln/literal/black.hh +++ b/milena/mln/literal/black.hh @@ -48,14 +48,7 @@ namespace mln /// Literal black. - extern const black_t& black; - - -# ifndef MLN_INCLUDE_ONLY - - const black_t& black = black_t(); - -# endif // ! MLN_INCLUDE_ONLY + static const black_t black = black_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/colors.hh b/milena/mln/literal/colors.hh index adca17f..ea6dc39 100644 --- a/milena/mln/literal/colors.hh +++ b/milena/mln/literal/colors.hh @@ -58,21 +58,13 @@ namespace mln /// Literal red. - extern const red_t& red; + static const red_t red = red_t(); /// Literal green. - extern const green_t& green; + static const green_t green = green_t(); /// Literal blue. - extern const blue_t& blue; - -# ifndef MLN_INCLUDE_ONLY - - const red_t& red = red_t(); - const green_t& green = green_t(); - const blue_t& blue = blue_t(); - -# endif // ! MLN_INCLUDE_ONLY + static const blue_t blue = blue_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/grays.hh b/milena/mln/literal/grays.hh index 438de9e..9f61bee 100644 --- a/milena/mln/literal/grays.hh +++ b/milena/mln/literal/grays.hh @@ -47,14 +47,7 @@ namespace mln }; /// Literal medium_gray. - extern const medium_gray_t& medium_gray; - - -# ifndef MLN_INCLUDE_ONLY - - const medium_gray_t& medium_gray = medium_gray_t(); - -# endif // ! MLN_INCLUDE_ONLY + static const medium_gray_t medium_gray = medium_gray_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/one.hh b/milena/mln/literal/one.hh index 3b9d855..3920c1b 100644 --- a/milena/mln/literal/one.hh +++ b/milena/mln/literal/one.hh @@ -54,7 +54,7 @@ namespace mln /// Literal one. - extern const one_t& one; + static const one_t one = one_t(); # ifndef MLN_INCLUDE_ONLY @@ -67,8 +67,6 @@ namespace mln return 1; } - const one_t& one = one_t(); - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/literal/origin.hh b/milena/mln/literal/origin.hh index bceadf7..46a9eb0 100644 --- a/milena/mln/literal/origin.hh +++ b/milena/mln/literal/origin.hh @@ -48,14 +48,7 @@ namespace mln }; /// Literal origin. - extern const origin_t& origin; - -# ifndef MLN_INCLUDE_ONLY - - const origin_t& origin = origin_t(); - -# endif // ! MLN_INCLUDE_ONLY - + static const origin_t origin = origin_t(); } // end of namespace mln::literal diff --git a/milena/mln/literal/white.hh b/milena/mln/literal/white.hh index 8fc0336..08740c6 100644 --- a/milena/mln/literal/white.hh +++ b/milena/mln/literal/white.hh @@ -48,15 +48,9 @@ namespace mln /// Literal white. - extern const white_t& white; + static const white_t white = white_t(); -# ifndef MLN_INCLUDE_ONLY - - const white_t& white = white_t(); - -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::literal } // end of namespace mln diff --git a/milena/mln/literal/zero.hh b/milena/mln/literal/zero.hh index 88edc7c..008c616 100644 --- a/milena/mln/literal/zero.hh +++ b/milena/mln/literal/zero.hh @@ -56,7 +56,7 @@ namespace mln /// Literal zero. - extern const zero_t& zero; + static const zero_t zero = zero_t(); # ifndef MLN_INCLUDE_ONLY @@ -69,8 +69,6 @@ namespace mln return 0; } - const zero_t& zero = zero_t(); - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index 3a63d90..125106c 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -40,11 +40,17 @@ namespace mln namespace tag { - struct image_t {} image; - struct domain_t {} domain; - struct bbox_t {} bbox; - struct border_t {} border; - struct function_t {} function; + struct image_t {}; + struct domain_t {}; + struct bbox_t {}; + struct border_t {}; + struct function_t {}; + + static const image_t image = image_t(); + static const domain_t domain = domain_t(); + static const bbox_t bbox = bbox_t(); + static const border_t border = border_t(); + static const function_t function = function_t(); } // end of namespace mln::tag diff --git a/milena/mln/trace/entering.hh b/milena/mln/trace/entering.hh index 9603ea0..e9d66ce 100644 --- a/milena/mln/trace/entering.hh +++ b/milena/mln/trace/entering.hh @@ -49,6 +49,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline void entering(const std::string& scope) { if (quiet) @@ -58,7 +59,7 @@ namespace mln std::cout << scope << " {" << std::endl; ++tab; } - + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::trace diff --git a/milena/mln/trace/exiting.hh b/milena/mln/trace/exiting.hh index d690dd1..b9595f5 100644 --- a/milena/mln/trace/exiting.hh +++ b/milena/mln/trace/exiting.hh @@ -59,7 +59,7 @@ namespace mln std::cout << " "; std::cout << "}" << std::endl; } - + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::trace -- 1.5.3.5.756.gc887a

2 1

milena r1568: Review the mln/io directory
by Matthieu Garrigues 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Review the mln/io directory. * mln/io/abort.hh, * mln/io/fits/load.hh, * mln/io/pbm/load.hh, * mln/io/pbm/save.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh, * mln/io/pgm/load.hh, * mln/io/pgm/save.hh, * mln/io/pnm/load.hh, * mln/io/pnm/load_header.hh, * mln/io/pnm/max_component.hh, * mln/io/pnm/save.hh, * mln/io/pnm/save_header.hh, * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * tests/io/ppm/ppm.cc: Add documentation, review the code, put MLN_INCLUDE_ONLY gards, add missing function declaration (outside MLN_INCLUDE_ONLY). --- mln/io/abort.hh | 8 +++++++- mln/io/fits/load.hh | 29 +++++++++++++++++++++++++++++ mln/io/pbm/load.hh | 28 ++++++++++++++++++++++++++++ mln/io/pbm/save.hh | 5 +++++ mln/io/pfm/load.hh | 32 ++++++++++++++++++++++++++++---- mln/io/pfm/save.hh | 8 ++++++-- mln/io/pgm/load.hh | 32 +++++++++++++++++++++++++++----- mln/io/pgm/save.hh | 5 +++++ mln/io/pnm/load.hh | 2 +- mln/io/pnm/load_header.hh | 3 +++ mln/io/pnm/max_component.hh | 4 +++- mln/io/pnm/save.hh | 1 - mln/io/pnm/save_header.hh | 12 +++--------- mln/io/ppm/load.hh | 31 ++++++++++++++++++++++++++----- mln/io/ppm/save.hh | 5 +++++ tests/io/ppm/ppm.cc | 6 ++++-- 16 files changed, 180 insertions(+), 31 deletions(-) Index: trunk/milena/tests/io/ppm/ppm.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm.cc (revision 1567) +++ trunk/milena/tests/io/ppm/ppm.cc (revision 1568) @@ -46,8 +46,10 @@ using namespace mln; using value::rgb8; - image2d<rgb8> lena = io::ppm::load("../../../img/lena.ppm"); + image2d<rgb8> lena = io::ppm::load<rgb8>("../../../img/lena.ppm"); io::ppm::save(lena, "out.ppm"); - image2d<rgb8> lena2 = io::ppm::load("out.ppm"); + + image2d<rgb8> lena2; + io::ppm::load(lena2, "out.ppm"); mln_assertion(lena2 == lena); } Index: trunk/milena/mln/io/pfm/save.hh =================================================================== --- trunk/milena/mln/io/pfm/save.hh (revision 1567) +++ trunk/milena/mln/io/pfm/save.hh (revision 1568) @@ -54,9 +54,15 @@ namespace pfm { + /*! Save a milena image as a pfm image. + * + * \param[in] ima The image to save. + * \param[in,out] filename the destination. + */ template <typename I> void save(const Image& ima, const std::string& filename); +# ifndef MLN_INCLUDE_ONLY namespace impl { @@ -94,8 +100,6 @@ } // end of namespace mln::io::impl -# ifndef MLN_INCLUDE_ONLY - template <typename I> void save(const Image& ima, const std::string& filename) { Index: trunk/milena/mln/io/pfm/load.hh =================================================================== --- trunk/milena/mln/io/pfm/load.hh (revision 1567) +++ trunk/milena/mln/io/pfm/load.hh (revision 1568) @@ -37,10 +37,6 @@ * */ -// # include <iostream> -// # include <fstream> -// # include <string> - # include <mln/core/image2d.hh> # include <mln/value/int_u8.hh> @@ -54,6 +50,25 @@ namespace pfm { + /*! Load a pfm image in a milena image. + * + * \param[out] ima A reference to the image2d<float> which will receive + * data. + * \param[in] filename The source. + */ + void load(image2d<float>& ima, + const std::string& filename); + + /*! Load a pfm image in a image2d<float>. + * + * \param[in] filename The image source. + * + * \return An image2d<float> which contains loaded data. + */ + image2d<float> load(const std::string& filename); + +# ifndef MLN_INCLUDE_ONLY + namespace internal { @@ -136,6 +151,15 @@ return ima; } + + void load(image2d<float>& ima, + const std::string& filename) + { + ima = load(filename); + } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::pfm } // end of namespace mln::io Index: trunk/milena/mln/io/pgm/save.hh =================================================================== --- trunk/milena/mln/io/pgm/save.hh (revision 1567) +++ trunk/milena/mln/io/pgm/save.hh (revision 1568) @@ -63,6 +63,11 @@ namespace pgm { + /*! Save a milena image as a pgm image. + * + * \param[in] ima The image to save. + * \param[in,out] filename the destination. + */ template <typename I> void save(const Image& ima, const std::string& filename); Index: trunk/milena/mln/io/pgm/load.hh =================================================================== --- trunk/milena/mln/io/pgm/load.hh (revision 1567) +++ trunk/milena/mln/io/pgm/load.hh (revision 1568) @@ -57,23 +57,45 @@ namespace pgm { + /*! Load a pgm image in a milena image. + * + * \param[out] ima A reference to the image which will receive + * data. + * \param[in] filename The source. + */ + template <typename I> + void load(Image& ima, + const std::string& filename); + + + /*! Load a pgm image in a milena image. To use this routine, you + * should specialize the template whith the value type of the + * image loaded. (ex : load<value::int_u8>("...") ) + * + * \param[in] filename The image source. + * + * \return An image2d which contains loaded data. + */ + template <typename V> + image2d<V> load(const std::string& filename); + +# ifndef MLN_INCLUDE_ONLY + template <typename V> image2d<V> load(const std::string& filename) { return io::pnm::load<V>(PGM, filename); } - image2d<value::int_u8> load(const std::string& filename) - { - return load<value::int_u8>(filename); - } - template <typename I> void load(Image& ima, const std::string& filename) { io::pnm::load(PGM, ima, filename); } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::pgm } // end of namespace mln::io Index: trunk/milena/mln/io/abort.hh =================================================================== --- trunk/milena/mln/io/abort.hh (revision 1567) +++ trunk/milena/mln/io/abort.hh (revision 1568) @@ -44,13 +44,19 @@ namespace internal { + /// The way to abort when an error occur in io processing. + void abort() + +# ifndef MLN_INCLUDE_ONLY void abort() { - std::cerr << " aborting." << std::endl; + std::cerr << "I/O error, aborting." << std::endl; exit(0); } +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::internal } // end of namespace mln::io Index: trunk/milena/mln/io/fits/load.hh =================================================================== --- trunk/milena/mln/io/fits/load.hh (revision 1567) +++ trunk/milena/mln/io/fits/load.hh (revision 1568) @@ -51,8 +51,29 @@ namespace io { + namespace fits { + + /*! Load a fits image in a milena image. + * + * \param[out] ima A reference to the image2d<float> which will receive + * data. + * \param[in] filename The source. + */ + void load(image2d<float>& ima, + const std::string& filename); + + /*! Load a fits image in a image2d<float>. + * + * \param[in] filename The image source. + * + * \return An image2d<float> which contains loaded data. + */ + image2d<float> load(const std::string& filename); + +# ifndef MLN_INCLUDE_ONLY + void fits_exit(int status) { if (status) @@ -104,6 +125,14 @@ return output; } + void load(image2d<float>& ima, + const std::string& filename) + { + ima = load(filename); + } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::fits } // end of namespace mln::io Index: trunk/milena/mln/io/pnm/save_header.hh =================================================================== --- trunk/milena/mln/io/pnm/save_header.hh (revision 1567) +++ trunk/milena/mln/io/pnm/save_header.hh (revision 1568) @@ -39,6 +39,8 @@ # include <iostream> # include <fstream> +# include <mln/io/pnm/max_component.hh> + # include <mln/value/rgb.hh> # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> @@ -57,21 +59,13 @@ template <typename V> void save_max_val(V&, std::ofstream& file) { - file << mln_max(V) << std::endl; + file << max_component(V()) << std::endl; } void save_max_val(bool&, std::ofstream& file) { } - template <unsigned int n> - void save_max_val(value::rgb<n>&, std::ofstream& file) - { - typedef typename value::int_u<n>::enc E; - - file << unsigned(mln_max(E)) << std::endl; - } - template <typename I> void save_header(const char type, const I& ima, const std::string& filename, Index: trunk/milena/mln/io/pnm/max_component.hh =================================================================== --- trunk/milena/mln/io/pnm/max_component.hh (revision 1567) +++ trunk/milena/mln/io/pnm/max_component.hh (revision 1568) @@ -44,8 +44,10 @@ namespace pnm { + /// Give the maximum value which can be stored as a component + /// value type V. template <typename V> - unsigned int max_component(); + unsigned int max_component(const V&); # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/io/pnm/load_header.hh =================================================================== --- trunk/milena/mln/io/pnm/load_header.hh (revision 1567) +++ trunk/milena/mln/io/pnm/load_header.hh (revision 1568) @@ -49,6 +49,7 @@ namespace pnm { +# ifndef MLN_INCLUDE_ONLY bool read_header(std::ifstream& istr, char& type, @@ -125,6 +126,8 @@ nrows, ncols, maxval); } +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::pnm } // end of namespace mln::io Index: trunk/milena/mln/io/pnm/save.hh =================================================================== --- trunk/milena/mln/io/pnm/save.hh (revision 1567) +++ trunk/milena/mln/io/pnm/save.hh (revision 1568) @@ -71,7 +71,6 @@ * \param[in] ima_ The image to save. * \param[in,out] filename the destination. */ - template <typename I> void save(const int type, const Image& ima_, const std::string& filename); Index: trunk/milena/mln/io/pnm/load.hh =================================================================== --- trunk/milena/mln/io/pnm/load.hh (revision 1567) +++ trunk/milena/mln/io/pnm/load.hh (revision 1568) @@ -179,7 +179,7 @@ } - /// a new function to load pnm files : + /// An other way to load pnm files : /// the destination is an argument to check if /// the type match the file to load. template <typename I> Index: trunk/milena/mln/io/ppm/save.hh =================================================================== --- trunk/milena/mln/io/ppm/save.hh (revision 1567) +++ trunk/milena/mln/io/ppm/save.hh (revision 1568) @@ -52,6 +52,11 @@ namespace ppm { + /*! Save a milena image as a ppm image. + * + * \param[in] ima The image to save. + * \param[in,out] filename the destination. + */ template <typename I> void save(const Image& ima, const std::string& filename); Index: trunk/milena/mln/io/ppm/load.hh =================================================================== --- trunk/milena/mln/io/ppm/load.hh (revision 1567) +++ trunk/milena/mln/io/ppm/load.hh (revision 1568) @@ -54,17 +54,36 @@ namespace ppm { + + /*! Load a ppm image in a milena image. + * + * \param[out] ima A reference to the image which will receive + * data. + * \param[in] filename The source. + */ + template <typename I> + void load(Image& ima, + const std::string& filename); + + /*! Load a ppm image in a milena image. To use this routine, you + * should specialize the template whith the value type of the + * image loaded. (ex : load<value::int_u8>("...") ) + * + * \param[in] filename The image source. + * + * \return An image2d which contains loaded data. + */ + template <typename V> + image2d<V> load(const std::string& filename); + +# ifndef MLN_INCLUDE_ONLY + template <typename V> image2d<V> load(const std::string& filename) { return io::pnm::load<V>(PPM, filename); } - image2d<value::rgb8> load(const std::string& filename) - { - return load<value::rgb8>(filename); - } - template <typename I> void load(Image& ima, const std::string& filename) @@ -72,6 +91,8 @@ io::pnm::load(PPM, ima, filename); } +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::ppm } // end of namespace mln::io Index: trunk/milena/mln/io/pbm/save.hh =================================================================== --- trunk/milena/mln/io/pbm/save.hh (revision 1567) +++ trunk/milena/mln/io/pbm/save.hh (revision 1568) @@ -63,6 +63,11 @@ namespace pbm { + /*! Save a milena image as a pbm image. + * + * \param[in] ima The image to save. + * \param[in,out] filename the destination. + */ template <typename I> void save(const Image& ima, const std::string& filename); Index: trunk/milena/mln/io/pbm/load.hh =================================================================== --- trunk/milena/mln/io/pbm/load.hh (revision 1567) +++ trunk/milena/mln/io/pbm/load.hh (revision 1568) @@ -54,6 +54,26 @@ namespace pbm { + + /*! Load a pbm image in a milena image. + * + * \param[out] ima A reference to the image2d<bool> which will receive + * data. + * \param[in] filename The source. + */ + void load(image2d<bool>& ima, + const std::string& filename); + + /*! Load a pbm image in a image2d<float>. + * + * \param[in] filename The image source. + * + * \return An image2d<float> which contains loaded data. + */ + image2d<bool> load(const std::string& filename); + +# ifndef MLN_INCLUDE_ONLY + namespace internal { @@ -128,6 +148,14 @@ } + void load(image2d<bool>& ima, + const std::string& filename) + { + ima = load(filename); + } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::pbm } // end of namespace mln::io

1 0

milena r1567: Add full test for border::get
by Guillaume Duhamel 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add full test for border::get. * tests/border/get_full.cc: New full test. --- get_full.cc | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) Index: trunk/milena/tests/border/get_full.cc =================================================================== --- trunk/milena/tests/border/get_full.cc (revision 0) +++ trunk/milena/tests/border/get_full.cc (revision 1567) @@ -0,0 +1,116 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/border/get_full.cc + * + * \brief Tests on mln::border::get. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/border/get.hh> +#include <mln/literal/origin.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> + + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + + + +int main() +{ + using namespace mln; + + box2d b(literal::origin, point2d(1,1)); + f_box2d_t f_b(b); + mln::fun::p2b::chess_t c_b; + + { + typedef image2d<int> I; + (std::cerr << "Tests border::get on int ... ").flush (); + I ima(3,3, 51); + + mln_assertion(border::get(ima) == 51); + sub_image<I, box2d> sub(ima, b); + mln_assertion(border::get(sub) == 0); + + image_if<I, f_box2d_t> imaif(ima, f_b); + mln_assertion(border::get(imaif) == 51); + mln_assertion(border::get( (ima | b) ) == 0); + mln_assertion(border::get( (ima | b) | f_b ) == 0); + std::cerr << "OK" << std::endl; + } + + + { + typedef image2d<value::int_u8> I; + (std::cerr << "Tests border::get on int_u8 ... ").flush (); + I ima(10, 10, 42); + mln_assertion(border::get(ima) == 42); + mln_assertion( ima.has(point2d(2,2)) == true ); + sub_image<I, box2d> sub(ima, b); + mln_assertion(border::get(sub) == 0); + + image_if<I, mln::fun::p2b::chess_t > imaif(ima, c_b); + mln_assertion(border::get(imaif) == 42); + mln_assertion(border::get( (ima | b) ) == 0); + mln_assertion(border::get( (ima | b) | c_b ) == 0); + std::cerr << "OK" << std::endl; + } + + { + typedef image2d<value::rgb8> I; + (std::cerr << "Tests border::get on rgb8 ... ").flush (); + I ima(10, 10, 36); + mln_assertion(border::get(ima) == 36); + mln_assertion( ima.has(point2d(2,2)) == true ); + sub_image<I, box2d> sub(ima, b); + mln_assertion(border::get(sub) == 0); + + image_if<I, mln::fun::p2b::chess_t > imaif(ima, c_b); + mln_assertion(border::get(imaif) == 36); + mln_assertion(border::get( (ima | b) ) == 0); + mln_assertion(border::get( (ima | b) | c_b ) == 0); + std::cerr << "OK" << std::endl; + } + +}

1 0

milena r1566: Rename run_pset
by nivaul_s＠lrde.epita.fr 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Simon Nivault <simon.nivault(a)lrde.epita.fr> Rename run_pset. * mln/core/internal/run_pset.hh: Rename as... * mln/core/p_runs.hh: ...this. * tests/run_pset.cc: Rename as... * tests/p_runs.cc: ...this. Remove two sources entry. * tests/Makefile.am: Fix. --- mln/core/p_runs.hh | 455 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 2 tests/p_runs.cc | 80 +++++++++ 3 files changed, 535 insertions(+), 2 deletions(-) Index: trunk/milena/tests/run_pset.cc (deleted) =================================================================== Index: trunk/milena/tests/p_runs.cc =================================================================== --- trunk/milena/tests/p_runs.cc (revision 0) +++ trunk/milena/tests/p_runs.cc (revision 1566) @@ -0,0 +1,80 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/p_runs.cc + * + * \brief Test on mln::internal::p_runs_ and related tools. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/p_runs.hh> + + +template <typename Pset> +void parc(const Pset& pset) +{ + mln_fwd_piter(Pset) it_(pset); + for_all(it_) + std::cout << it_ << std::endl; + + mln_bkd_piter(Pset) rit_(pset); + for_all(rit_) + std::cout << rit_ << std::endl; +} + + +int main() +{ + using namespace mln; + + point2d p, q, r; + p = make::point2d(2, 4); + q = make::point2d(18, 42); + r = make::point2d(50, 76); + + // Psite declaration + internal::run_psite<point2d> site(p, 5, 0); + internal::run_psite<point2d> site2(r, 40, 0); + + // Pset test + p_runs_<point2d> ps; + + ps.insert(p_run<point2d>(p, 7)); + mln_assertion(ps.npoints() == 7); + + ps.insert(p_run<point2d>(q, 42)); + mln_assertion(ps.npoints() == 49); + + mln_assertion(ps.has(site)); + mln_assertion(!ps.has(site2)); + + ps.insert(p_run<point2d>(r, 14)); + mln_assertion(!ps.has(site2)); + + ps.insert(p_run<point2d>(make::point2d(17,40), 6)); + // parc(ps); +} Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1565) +++ trunk/milena/tests/Makefile.am (revision 1566) @@ -173,8 +173,6 @@ convert_to_tiles_SOURCES = convert_to_tiles.cc convert_to_p_array_SOURCES = convert_to_p_array.cc -debug_println_SOURCES = debug_println.cc -debug_println_with_border_SOURCES = debug_println_with_border.cc decorated_image_SOURCES = decorated_image.cc dpoint1d_SOURCES = dpoint1d.cc dpoint2d_SOURCES = dpoint2d.cc Index: trunk/milena/mln/core/internal/run_pset.hh (deleted) =================================================================== Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 0) +++ trunk/milena/mln/core/p_runs.hh (revision 1566) @@ -0,0 +1,455 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_P_RUNS_HH +# define MLN_CORE_P_RUNS_HH + +/*! \file mln/core/p_runs.hh + * + * \brief Definition of mln::internal::p_runs_ class and its iterators + * (for internal use only). + */ + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/run_psite.hh> +# include <mln/core/p_run.hh> +# include <mln/accu/bbox.hh> +# include <mln/util/lazy_set.hh> + +# include <utility> + + + +namespace mln +{ + + // Forward declaration + template <typename P> struct p_runs_fwd_piter_; + template <typename P> struct p_runs_bkd_piter_; + + + /*! \brief p_runs_ class represent a point set used in run_image_ class. + * + * Parameter \c P is the type of the image point. + */ + template <typename P> + class p_runs_ : public internal::point_set_base_< internal::run_psite, p_runs_ > + { + public: + + typedef util::lazy_set_<p_run > container; + typedef p_runs_fwd_piter_ fwd_piter; + typedef p_runs_bkd_piter_ bkd_piter; + + + p_runs_(); + + /// Test is \p p belongs to this point set. + bool has(const internal::run_psite& p) const; + + /// Give the exact bounding box. + const box_& bbox() const; + + /// Give the number of points. + typename std::size_t npoints() const; + + /// Insert a range, start at point \p p wit len \p len. + void insert(const p_run& pr); + + /// Return the len of the range starting at point \p p. + unsigned range_len_(const P& p) const; + + /// Return the container of the pset (internal use only). + const container& con() const; + + protected: + + /// Number of points. + typename std::size_t npoints_; + + /// Points container + container con_; + + /// Exact bounding box. + accu::bbox fb_; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + p_runs_::p_runs_() : + npoints_(0) + { + } + + template <typename P> + bool + p_runs_::has(const internal::run_psite& p) const + { + for (unsigned i = 0; i < con_.nelements(); ++i) + { + if (con_[i].first() == p.range_start_() && con_[i].length() > p.index_()) + return true; + } + return false; + } + + template <typename P> + const box_& + p_runs_::bbox() const + { + return fb_.to_result(); + } + + template <typename P> + typename std::size_t + p_runs_::npoints() const + { + return npoints_; + } + + template <typename P> + void + p_runs_::insert(const p_run& pr) + { + typename std::vector<p_run >::const_iterator iter = con_.vect().begin(); + while (iter != con_.vect().end() && iter->first() < pr.first()) + ++iter; + + if (iter != con_.vect().begin()) + { + typename std::vector<p_run >::const_iterator prec = iter; + --prec; + bool equal = true; + for (int i = P::dim - 2; i >= 0; --i) + if (!(equal = equal && (prec->first()[i] == pr.first()[i]))) + break; + if (equal) + mln_assertion(prec->first()[P::dim - 1] + (signed)prec->length() + < pr.first()[P::dim - 1]); + } + + if (iter != con_.vect().end()) + { + bool equal = true; + for (int i = P::dim - 2; i >= 0; --i) + if (!(equal = equal && ((*iter).first()[i] == pr.first()[i]))) + break; + if (equal) + mln_assertion(pr.first()[P::dim - 1] + (signed)pr.length() + < iter->first()[P::dim - 1]); + } + con_.insert(pr); + + // update box + fb_.take(pr.bbox().pmin()); + fb_.take(pr.bbox().pmax()); + // update size + npoints_ += pr.npoints(); + } + + template <typename P> + unsigned + p_runs_::range_len_(const P& p) const + { + unsigned i; + for (i = 0; i < con_.size(); ++i) + { + if (con_[i].first == p) + return con_[i].second; + } + mln_assertion(i < con.size()); + + //Hack + return (con_[i].second); + } + + template <typename P> + const typename p_runs_::container& + p_runs_::con() const + { + return con_; + } + +# endif // ! MLN_INCLUDE_ONLY + + /*! \brief Factorization class for p_runs_iterator_. + * + * Parameter \c P is the type of the point used in the point set. + * Parameter \c E is the exact type of the iterator + */ + template <typename P, typename E> + class p_runs_piter_ : public internal::point_iterator_base_< internal::run_psite, E > + { + public: + typedef typename p_runs_::std_container std_container; + + /// Convertion into a point-site. + operator internal::run_psite () const; + + /// Convertion into a point. + operator P () const; + + /// Reference to the corresponding point. + const P& to_point() const; + + /// Access to the current point coordinates. + mln_coord(P) operator[](unsigned i) const; + + protected: + + /// Current point. + P p_; + + /// Current site. + internal::run_psite site_; + + /// Point set container. + const std_container& con_; + + p_runs_piter_(const p_runs_& pset); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, typename E> + p_runs_piter_<P, E>::p_runs_piter_(const p_runs_& pset) : + con_(pset.con()) + { + } + + template <typename P, typename E> + p_runs_piter_<P, E>::operator internal::run_psite () const + { + return site_; + } + + template <typename P, typename E> + p_runs_piter_<P, E>::operator P () const + { + return p_; + } + + template <typename P, typename E> + const P& + p_runs_piter_<P, E>::to_point() const + { + mln_precondition(exact(this)->is_valid()); + return p_; + } + + template <typename P, typename E> + mln_coord(P) + p_runs_piter_<P, E>::operator[] (unsigned i) const + { + mln_precondition(exact(this)->is_valid()); + return p_[i]; + } + +# endif // ! MLN_INCLUDE_ONLY + + + /*! \brief Forward iterator on p_runs_ point set. + * + * Parameter \c P is the type of the point used in the point set. + */ + template <typename P> + class p_runs_fwd_piter_ : public p_runs_piter_<P, p_runs_fwd_piter_ > + { + typedef p_runs_piter_<P, p_runs_fwd_piter_ > super; + public: + + p_runs_fwd_piter_(const p_runs_& pset); + + /// Test the iterator validity. + bool is_valid() const; + + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + + protected: + typename super::std_container::const_iterator it_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + p_runs_fwd_piter_::p_runs_fwd_piter_(const p_runs_& pset) : + super(pset) + { + it_ = this->con_.end(); + this->site_.pset_pos_() = this->con_.size(); + } + + template <typename P> + bool + p_runs_fwd_piter_::is_valid() const + { + return it_ != this->con_.end(); + } + + template <typename P> + void + p_runs_fwd_piter_::invalidate() + { + it_ = this->con_.end(); + this->site_.pset_pos_() = this->con_.size(); + } + + template <typename P> + void + p_runs_fwd_piter_::start() + { + it_ = this->con_.begin(); + this->site_.range_start_() = it_->first; + this->site_.index_() = 0; + this->site_.pset_pos_() = 0; + this->p_ = it_->first; + } + + template <typename P> + void + p_runs_fwd_piter_::next_() + { + mln_precondition(this->is_valid()); + ++(this->site_.index_()); + + if (this->site_.index_() >= it_->second) + { + ++it_; + ++this->site_.pset_pos_(); + this->site_.range_start_() = it_->first; + this->site_.index_() = 0; + } + this->p_ = this->site_.range_start_(); + this->p_[0] += this->site_.index_(); + } + +# endif // ! MLN_INCLUDE_ONLY + + + /*! \brief Backward iterator on p_runs_ point set. + * + * Parameter \c P is the type of the point used in the point set. + */ + template <typename P> + class p_runs_bkd_piter_ : public p_runs_piter_<P, p_runs_bkd_piter_ > + { + typedef p_runs_piter_<P, p_runs_bkd_piter_ > super; + public: + + p_runs_bkd_piter_(const p_runs_& pset); + + /// Test the iterator validity. + bool is_valid() const; + + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + + protected: + typename super::std_container::const_reverse_iterator it_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + p_runs_bkd_piter_::p_runs_bkd_piter_(const p_runs_& pset) : + super(pset) + { + it_ = this->con_.rend(); + this->site_.pset_pos_() = this->con_.size(); + } + + template <typename P> + bool + p_runs_bkd_piter_::is_valid() const + { + return it_ != this->con_.rend(); + } + + template <typename P> + void + p_runs_bkd_piter_::invalidate() + { + it_ = this->con_.rend(); + this->site_.pset_pos_() = this->con_.size(); + } + + template <typename P> + void + p_runs_bkd_piter_::start() + { + it_ = this->con_.rbegin(); + this->site_.range_start_() = it_->first; + this->site_.index_() = it_->second - 1; + this->site_.pset_pos_() = this->con_.size() - 1; + this->p_ = this->site_.range_start_(); + this->p_[0] += this->site_.index_(); + } + + template <typename P> + void + p_runs_bkd_piter_::next_() + { + mln_precondition(this->is_valid()); + --(this->site_.index_()); + + if (this->site_.index_() + 1 == 0) + { + ++it_; + --this->site_.pset_pos_(); + this->site_.range_start_() = it_->first; + this->site_.index_() = this->it_->second - 1; + } + this->p_ = this->site_.range_start_(); + this->p_[0] += this->site_.index_(); + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_P_RUNS_HH

1 0

milena r1565: Add full tests for border
by Guillaume Duhamel 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add full tests for border. * tests/border/adjust_full.cc, * tests/border/duplicate_full.cc, * tests/border/fill_full.cc, * tests/border/mirror_full.cc: New full tests. * tests/border/duplicate.cc: Fix Doxygen comment. --- adjust_full.cc | 64 ++++++++ duplicate.cc | 2 duplicate_full.cc | 171 +++++++++++++++++++++++ fill_full.cc | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ mirror_full.cc | 173 +++++++++++++++++++++++ 5 files changed, 807 insertions(+), 1 deletion(-) Index: trunk/milena/tests/border/mirror_full.cc =================================================================== --- trunk/milena/tests/border/mirror_full.cc (revision 0) +++ trunk/milena/tests/border/mirror_full.cc (revision 1565) @@ -0,0 +1,173 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/border/duplicate_full.cc + * + * \brief Tests on mln::border::duplicate. + */ + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/border/mirror.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_s8.hh> + +using namespace mln; + +int +main (void) +{ + + { + (std::cerr << "Test border::mirror on int with border = 3 ... ").flush (); + + typedef int T; + int border = 3; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::mirror (ima); + + T vs[110] = + { + 1, 1, 1, 11, 12, 13, 14, 15, 5, 5, 5, + 1, 1, 1, 6, 7, 8, 9, 10, 5, 5, 5, + 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 3, 2, 1, 1, 2, 3, 4, 5, 5, 4, 3, + 8, 7, 6, 6, 7, 8, 9, 10, 10, 9, 8, + 13, 12, 11, 11, 12, 13, 14, 15, 15, 14, 13, + 18, 17, 16, 16, 17, 18, 19, 20, 20, 19, 18, + 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20, + 16, 16, 16, 11, 12, 13, 14, 15, 20, 20, 20, + 16, 16, 16, 6, 7, 8, 9, 10, 20, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << "Test border::mirror on int_s8 with border = 2 ... ").flush (); + + typedef value::int_s8 T; + int border = 2; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::mirror (ima); + + T vs[72] = + { + 1, 1, 6, 7, 8, 9, 10, 5, 5, + 1, 1, 1, 2, 3, 4, 5, 5, 5, + 2, 1, 1, 2, 3, 4, 5, 5, 4, + 7, 6, 6, 7, 8, 9, 10, 10, 9, + 12, 11, 11, 12, 13, 14, 15, 15, 14, + 17, 16, 16, 17, 18, 19, 20, 20, 19, + 16, 16, 16, 17, 18, 19, 20, 20, 20, + 16, 16, 11, 12, 13, 14, 15, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << "Test border::mirror on int_u8 with border = 1 ... ").flush (); + + typedef value::int_u8 T; + int border = 1; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::mirror (ima); + + T vs[49] = + { + 1, 1, 2, 3, 4, 5, 5, + 1, 1, 2, 3, 4, 5, 5, + 6, 6, 7, 8, 9, 10, 10, + 11, 11, 12, 13, 14, 15, 15, + 16, 16, 17, 18, 19, 20, 20, + 16, 16, 17, 18, 19, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << "Test border::mirror on int with border = 0 ... ").flush (); + + int border = 0; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<int> ima(row, col, border); + debug::iota (ima); + border::mirror (ima); + + int vs[20] = + { + 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + + std::cerr << "OK" << std::endl; + } + +} Index: trunk/milena/tests/border/adjust_full.cc =================================================================== --- trunk/milena/tests/border/adjust_full.cc (revision 0) +++ trunk/milena/tests/border/adjust_full.cc (revision 1565) @@ -0,0 +1,64 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/border/adjust_full.cc + * + * \brief Tests on mln::border::adjust. + */ + +#include <mln/core/image2d.hh> +#include <mln/border/get.hh> +#include <mln/border/adjust.hh> + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + + I ima(3, 3, 2); + border::adjust(ima, 3); + mln_assertion(border::get(ima) == 3); + + border::adjust(ima, 5); + mln_assertion(border::get(ima) == 5); + + border::adjust(ima, 1); + mln_assertion(border::get(ima) == 5); + + border::adjust(ima, 4); + mln_assertion(border::get(ima) == 5); + + border::adjust(ima, 42); + mln_assertion(border::get(ima) == 42); + + border::adjust(ima, 51); + mln_assertion(border::get(ima) == 51); + + border::adjust(ima, 2); + mln_assertion(border::get(ima) == 51); +} Index: trunk/milena/tests/border/duplicate_full.cc =================================================================== --- trunk/milena/tests/border/duplicate_full.cc (revision 0) +++ trunk/milena/tests/border/duplicate_full.cc (revision 1565) @@ -0,0 +1,171 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/border/duplicate_full.cc + * + * \brief Tests on mln::border::duplicate. + */ + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/border/duplicate.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_s8.hh> + + +using namespace mln; + +int +main (void) +{ + { + (std::cerr << "Test border::mirror on int with border = 3 ... ").flush (); + + typedef int T; + int border = 3; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::duplicate (ima); + + T vs[110] = + { + 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, + 6, 6, 6, 6, 7, 8, 9, 10, 10, 10, 10, + 11, 11, 11, 11, 12, 13, 14, 15, 15, 15, 15, + 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20, + 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20, + 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20, + 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << "Test border::mirror on int_u8 with border = 2 ... ").flush (); + + typedef value::int_u8 T; + int border = 2; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::duplicate (ima); + + T vs[72] = + { + 1, 1, 1, 2, 3, 4, 5, 5, 5, + 1, 1, 1, 2, 3, 4, 5, 5, 5, + 1, 1, 1, 2, 3, 4, 5, 5, 5, + 6, 6, 6, 7, 8, 9, 10, 10, 10, + 11, 11, 11, 12, 13, 14, 15, 15, 15, + 16, 16, 16, 17, 18, 19, 20, 20, 20, + 16, 16, 16, 17, 18, 19, 20, 20, 20, + 16, 16, 16, 17, 18, 19, 20, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << "Test border::mirror on int_s8 with border = 1 ... ").flush (); + + typedef value::int_s8 T; + int border = 1; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::duplicate (ima); + + T vs[49] = + { + 1, 1, 2, 3, 4, 5, 5, + 1, 1, 2, 3, 4, 5, 5, + 6, 6, 7, 8, 9, 10, 10, + 11, 11, 12, 13, 14, 15, 15, + 16, 16, 17, 18, 19, 20, 20, + 16, 16, 17, 18, 19, 20, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + std::cerr << "OK" << std::endl; + } + + + { + (std::cerr << "Test border::mirror on int with border = 0 ... ").flush (); + + typedef int T; + int border = 0; + int row = 4; + int col = 5; + + int r = row + 2 * border; + int c = col + 2 * border; + + image2d<T> ima(row, col, border); + debug::iota (ima); + border::duplicate (ima); + + T vs[20] = + { + 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20 + }; + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == vs[i]); + std::cerr << "OK" << std::endl; + } + + +} Index: trunk/milena/tests/border/fill_full.cc =================================================================== --- trunk/milena/tests/border/fill_full.cc (revision 0) +++ trunk/milena/tests/border/fill_full.cc (revision 1565) @@ -0,0 +1,398 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/border_fill/test_border_fill_image2d_1.cc + * + * \brief Tests on mln::border::fill. + */ + +#include <mln/border/fill.hh> +#include <mln/level/fill.hh> +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/rgb16.hh> +#include <mln/value/float01_8.hh> +#include <mln/value/float01_16.hh> +#include <mln/debug/println_with_border.hh> + +using namespace mln; + + +template <typename T> +int +check1d(unsigned row, unsigned border, T& value, T& v) +{ + image1d<T> ima(row, border); + level::fill (ima, v); + border::fill (ima, value); + + unsigned i = 0; + for(i = 0; i < border; ++i) + mln_assertion (ima[i] == value); + unsigned bo = border + row; + for(; i < bo; ++i) + mln_assertion (ima[i] == v); + bo += border; + for(; i < bo; ++i) + mln_assertion (ima[i] == value); +} + +template <typename T> +int +check2d(unsigned row, unsigned col, unsigned border, T& value, T& v) +{ + image2d<T> ima(row, col, border); + level::fill (ima, v); + border::fill (ima, value); + + unsigned c = col + 2 * border; + unsigned r = row + 2 * border; + unsigned bo = c * border + border; + unsigned i = 0; + unsigned u = col + border; + unsigned ww = r * c; + + for(i = 0; i < bo; ++i) + mln_assertion (ima[i] == value); + bo += c * row; + for(; i < bo; ++i) + { + unsigned cur = i % c; + if (cur < border || cur >= u) + mln_assertion (ima[i] == value); + else + mln_assertion (ima[i] == v); + } + for(; i < ww; ++i) + mln_assertion (ima[i] == value); +} + +template <typename T> +int +check3d(unsigned sli, unsigned row, unsigned col, unsigned border, T& value, T& v) +{ + image3d<T> ima(sli, row, col, border); + level::fill (ima, v); + border::fill (ima, value); + + unsigned c = col + 2 * border; + unsigned r = row + 2 * border; + unsigned bo = c * border + border; + unsigned i = 0; + unsigned u = col + border; + unsigned ww = r * c; + + for(i = 0; i < bo; ++i) + mln_assertion (ima[i] == value); + bo += c * row; + for(; i < bo; ++i) + { + unsigned cur = i % c; + if (cur < border || cur >= u) + mln_assertion (ima[i] == value); + else + mln_assertion (ima[i] == v); + } + for(; i < ww; ++i) + mln_assertion (ima[i] == value); +} + + +int +main (void) +{ + int limits = 10; + + { + std::cerr << "Tests border::fill on int:" << std::endl; + + typedef int T; + T value = (T) -1; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on unsigned:" << std::endl; + + typedef unsigned T; + T value = (T) -1; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on int_u8 ... " << std::endl; + + typedef value::int_u8 T; + T value = 255; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on int_u16 ... " << std::endl; + + typedef value::int_u16 T; + T value = 65535; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on int_s8 ... " << std::endl; + + typedef value::int_s8 T; + T value = 127; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on int_s16 ... " << std::endl; + + typedef value::int_s16 T; + T value = 32767; + T v = 42; + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on rgb8 ... " << std::endl; + + typedef value::rgb8 T; + T value = T(255, 255, 255); + T v = T(42, 0, 0); + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on rgb16:" << std::endl; + + typedef value::rgb16 T; + T value = T(65535, 65535, 65535); + T v = T(42, 0, 0); + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + + { + std::cerr << "Tests border::fill on float01_8:" << std::endl; + + typedef value::float01_8 T; + T value = T(0.9999); + T v = T(0.111); + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + { + std::cerr << "Tests border::fill on float01_16:" << std::endl; + + typedef value::float01_16 T; + T value = T(0.9999); + T v = T(0.111); + + (std::cerr << "in 1d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + check1d(i, j, value, v); + + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 2d ... ").flush (); + + for (int i = 1; i < limits; ++i) + for (int j = 1; j < limits; ++j) + for (int k = 1; k < limits; ++k) + check2d(i, j, k, value, v); + + std::cerr << "OK" << std::endl; + } + + +} Index: trunk/milena/tests/border/duplicate.cc =================================================================== --- trunk/milena/tests/border/duplicate.cc (revision 1564) +++ trunk/milena/tests/border/duplicate.cc (revision 1565) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_duplicate/test_border_duplicate_image2d_1.cc +/*! \file tests/border/duplicate.cc * * \brief Tests on mln::border::duplicate. */

1 0

milena 7dafdf9: Fix various typos
by Benoit Sigoure 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln Git branch: master (HEAD: 9f19321) ChangeLog: 2007-11-28 Benoit Sigoure <tsuna(a)lrde.epita.fr> Fix various typos. * milena/doc/tutorial/slides.tex: Here. --- milena/ChangeLog | 5 ++++ milena/doc/tutorial/slides.tex | 45 ++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e9416c1..d33a10c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2007-11-28 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Fix various typos. + * milena/doc/tutorial/slides.tex: Here. + 2007-11-28 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add run-based utilities. diff --git a/milena/doc/tutorial/slides.tex b/milena/doc/tutorial/slides.tex index 4a7cee8..68eddc4 100644 --- a/milena/doc/tutorial/slides.tex +++ b/milena/doc/tutorial/slides.tex @@ -243,7 +243,7 @@ in head/foot}% \item Many libraries exist that can fulfill one's needs. \item If you're happy with your favorite tool, we cannot force you to change for \mln... - \item Though, you might have a look at \mln and being seduced! + \item Though, you might have a look at \mln and be seduced! \end{itemize} \end{block} @@ -253,7 +253,7 @@ in head/foot}% \begin{block}{No!} \begin{itemize} \item \mln is rather different than available libraries. - \item A lot of convenient data structures that \emph{really} helps + \item A lot of convenient data structures that \emph{really} help you in developing IP solutions. \end{itemize} \end{block} @@ -310,7 +310,8 @@ $\forall p \in \mathcal{D}(f), \;\; f(p) = \mathit{h}(f(p))$ \smallskip \begin{lstlisting}[basicstyle={\tiny\sffamily}] template <typename I, typename H> -void transform_inplace(Image& f_, const Function_v2v<H>& h_) +void transform_inplace(Image& f_, + const Function_v2v<H>& h_) { I& f = exact(f); const H& h = exact(h_); @@ -389,7 +390,7 @@ struct transform_inplace \begin{itemize} \item Generic... \item Efficient so that one can process large images. - \item Quite as easy to use as a C or Java library. + \item Almost as easy to use as a C or Java library. \item Many tools to help writing readable algorithms in a concise way. \end{itemize} @@ -552,7 +553,7 @@ tegucigalpa% ls mln \texttt{arith} & arithmetical operators \\ \texttt{border} & routines about virtual border & \texttt{canvas} & canvases \\ -\texttt{convert} & conversions routines & +\texttt{convert} & conversion routines & \texttt{core} & the library core \\ \texttt{debug} & debugging tools & \texttt{display} & display tools \\ @@ -605,7 +606,7 @@ tegucigalpa% ls mln not on implementation details about how to do it \smallskip % - \item you do not have found yet a library to easily process your + \item you have not yet found a library to easily process your particular types of data \end{itemize} @@ -824,9 +825,9 @@ note that \code{p.row() = 7} looks more natural than \code{set\_row(\&p, 7)}. \begin{frame}[fragile] \frametitle{Modifying the State of an Object (2/2)} - accessing and modifying through method calls allow some control: + accessing and modifying through method calls allow for some control: \begin{itemize} - \item one cannot do everything with an object + \item one cannot do anything with an object \item especially putting it in an invalid state \end{itemize} @@ -888,7 +889,7 @@ will hopefully produce an error at run-time! \begin{itemize} \item no need to take the address (with \&) of an object \item no pointer arithmetics - \item no $->$ in use + \item no $->$ to access members \end{itemize} \item it \emph{always} designates the same object \begin{itemize} @@ -995,7 +996,7 @@ so it really performs \code{p.row\_ = 5} accessible from the user \begin{itemize} \item thanks to the keyword \kw{private} - \item writing \code{p.row\_} outside this class is not allowed (do + \item writing \code{p.row\_} outside this class is not allowed (does not compile) \end{itemize} \smallskip @@ -1003,7 +1004,7 @@ so it really performs \code{p.row\_ = 5} \item the method \code{row()} is accessible (keyword \kw{public}) \begin{itemize} \item in the method body we have some room to add code - \item a simple access to data can performs some clever stuff that + \item a simple access to data can perform some clever stuff that you do not really have to know (neither want to)! \end{itemize} \end{itemize} @@ -1121,7 +1122,7 @@ int main() { \end{lstlisting} \begin{itemize} -\item the variable \code{r} represents an object which type is +\item the variable \code{r} represents an object whose type precisely \code{rabbit} \begin{center} we say that it is the \emph{exact} type behind this variable @@ -1165,7 +1166,7 @@ int main() { \item In that case \begin{itemize} \item at compile-time: there are many possible types of objects represented - \item at run-time: there is one object represented so just type. + \item at run-time: there is one object represented so just one type. \end{itemize} \end{itemize} @@ -1184,7 +1185,7 @@ int main() { About ``classical'' object-orientation: \begin{itemize} - \item abstractions (like \code{animal}) leads to poor + \item abstractions (like \code{animal}) lead to poor performance at run-time when involved in intensive scientific code. % \item it is due to the fact that the exact type is lost\\ @@ -1340,7 +1341,7 @@ In the following: \begin{frame}[fragile] \frametitle{A rationale for Genericity} -Suppose that you want a routine that computes twice the input: +Suppose that you want a routine that computes twice its input: \begin{lstlisting} int twice(int i) { return 2 * i; } \end{lstlisting} @@ -1434,7 +1435,7 @@ In \lstinline@template <typename T> T twice(T t)@ one of the procedure argument ``\code{(T t)}'' % \item the nature of \code{t} is \code{T}, the nature of \code{T} is - \code{typename} (so designates a type) + \code{typename} (so it designates a type) % \item the \cpp keyword introducing a generic piece of code is \kw{template} @@ -1476,7 +1477,7 @@ Once this program is compiled \item \code{int twice(int t) { return 2 * t; }} and \item \code{float twice(float t) { return 2 * t; }} \end{itemize} -\item so it is not so different than with overloading +\item so it is not so different than overloading \end{itemize} except that: @@ -1762,7 +1763,7 @@ P operator+(const P& p, const D& dp) } \end{lstlisting} -How can we ensure that the delta-point type \code{D} really correspond +How can we ensure that the delta-point type \code{D} really corresponds to \code{P}? {\scriptsize (we really do not want \code{P} and \code{D} resp. being \code{point3d} and \code{dpoint2d}!)} @@ -1803,7 +1804,7 @@ I operator+(const I& ima1, const I& ima2) { } \end{lstlisting} -What is the problem? (Hint: read both signatures in natural language) +What is the problem? (Hint: read both signatures out loud) \end{frame} @@ -1829,7 +1830,7 @@ Image operator+(const Image& ima1, const Image& ima2) { \end{lstlisting} which is clearly not ambiguous (but slow at run-time...) -where \code{Dpoint} and \code{Image} are abstract class. +where \code{Dpoint} and \code{Image} are abstract classes. \end{frame} @@ -2140,11 +2141,11 @@ This routine: \scriptsize{it works for any delta-point type} \smallskip % -\item is fast +\item is fast, \scriptsize{you cannot get more efficient code} \smallskip % -\item is user-friendly +\item is user-friendly, \scriptsize{just write ``\code{dp1 + dp2}'' to add a couple of delta-points} \end{itemize} -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "Jesus saves, but only Buddha /EPITA\ Promo 2008.CSI/ACU/YAKA makes incremental backups"

1 0

milena r1563: Add run-based utilities
by nivaul_s＠lrde.epita.fr 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add run-based utilities. * mln/core/internal/run_pset.hh: Point set based on many runs. * mln/core/p_array_piter.hh: Add FIXME. * mln/core/p_run.hh: New, Point set based on a run. * mln/core/p_run_piter.hh: New. * mln/util/lazy_set.hh: New, lazy vector of sorted elements. * tests/run_pset.cc: Update. --- mln/core/internal/run_pset.hh | 58 +++++-- mln/core/p_array_piter.hh | 2 mln/core/p_run.hh | 226 +++++++++++++++++++++++++++++ mln/core/p_run_piter.hh | 266 ++++++++++++++++++++++++++++++++++ mln/util/lazy_set.hh | 320 ++++++++++++++++++++++++++++++++++++++++++ tests/run_pset.cc | 7 6 files changed, 858 insertions(+), 21 deletions(-) Index: trunk/milena/tests/run_pset.cc =================================================================== --- trunk/milena/tests/run_pset.cc (revision 1562) +++ trunk/milena/tests/run_pset.cc (revision 1563) @@ -63,17 +63,18 @@ // Pset test internal::run_pset_<point2d> ps; - ps.insert(p, 7); + ps.insert(p_run<point2d>(p, 7)); mln_assertion(ps.npoints() == 7); - ps.insert(q, 42); + ps.insert(p_run<point2d>(q, 42)); mln_assertion(ps.npoints() == 49); mln_assertion(ps.has(site)); mln_assertion(!ps.has(site2)); - ps.insert(r, 14); + ps.insert(p_run<point2d>(r, 14)); mln_assertion(!ps.has(site2)); + ps.insert(p_run<point2d>(make::point2d(17,40), 6)); // parc(ps); } Index: trunk/milena/mln/core/internal/run_pset.hh =================================================================== --- trunk/milena/mln/core/internal/run_pset.hh (revision 1562) +++ trunk/milena/mln/core/internal/run_pset.hh (revision 1563) @@ -37,9 +37,10 @@ # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/point_iterator_base.hh> # include <mln/core/internal/run_psite.hh> +# include <mln/core/p_run.hh> # include <mln/accu/bbox.hh> +# include <mln/util/lazy_set.hh> -# include <vector> # include <utility> @@ -63,7 +64,7 @@ { public: - typedef std::vector<std::pair<P, unsigned> > std_container; + typedef util::lazy_set_<p_run > container; typedef run_fwd_piter_ fwd_piter; typedef run_bkd_piter_ bkd_piter; @@ -80,13 +81,13 @@ typename std::size_t npoints() const; /// Insert a range, start at point \p p wit len \p len. - void insert(const P& p, unsigned len); + void insert(const p_run& pr); /// Return the len of the range starting at point \p p. unsigned range_len_(const P& p) const; /// Return the container of the pset (internal use only). - const std_container& con() const; + const container& con() const; protected: @@ -94,7 +95,7 @@ typename std::size_t npoints_; /// Points container - std_container con_; + container con_; /// Exact bounding box. accu::bbox fb_; @@ -112,9 +113,9 @@ bool run_pset_::has(const run_psite& p) const { - for (unsigned i = 0; i < con_.size(); ++i) + for (unsigned i = 0; i < con_.nelements(); ++i) { - if (con_[i].first == p.range_start_() && con_[i].second > p.index_()) + if (con_[i].first() == p.range_start_() && con_[i].length() > p.index_()) return true; } return false; @@ -136,19 +137,42 @@ template <typename P> void - run_pset_::insert(const P& p, unsigned len) + run_pset_::insert(const p_run& pr) { - P run_pend; - typename std_container::value_type elt (p, len); - con_.push_back(elt); + typename std::vector<p_run >::const_iterator iter = con_.vect().begin(); + while (iter != con_.vect().end() && iter->first() < pr.first()) + ++iter; + + if (iter != con_.vect().begin()) + { + typename std::vector<p_run >::const_iterator prec = iter; + --prec; + bool equal = true; + for (int i = P::dim - 2; i >= 0; --i) + if (!(equal = equal && (prec->first()[i] == pr.first()[i]))) + break; + if (equal) + mln_assertion(prec->first()[P::dim - 1] + (signed)prec->length() + < pr.first()[P::dim - 1]); + } + + if (iter != con_.vect().end()) + { + bool equal = true; + for (int i = P::dim - 2; i >= 0; --i) + if (!(equal = equal && ((*iter).first()[i] == pr.first()[i]))) + break; + if (equal) + mln_assertion(pr.first()[P::dim - 1] + (signed)pr.length() + < iter->first()[P::dim - 1]); + } + con_.insert(pr); // update box - fb_.take(p); - run_pend = p; - run_pend[0] += len - 1; - fb_.take(run_pend); + fb_.take(pr.bbox().pmin()); + fb_.take(pr.bbox().pmax()); // update size - npoints_ += len; + npoints_ += pr.npoints(); } template <typename P> @@ -168,7 +192,7 @@ } template <typename P> - const typename run_pset_::std_container& + const typename run_pset_::container& run_pset_::con() const { return con_; Index: trunk/milena/mln/core/p_run.hh =================================================================== --- trunk/milena/mln/core/p_run.hh (revision 0) +++ trunk/milena/mln/core/p_run.hh (revision 1563) @@ -0,0 +1,226 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_P_RUN_HH +# define MLN_CORE_P_RUN_HH + +/*! \file mln/core/p_run.hh + * + * \brief Definition of a point set class based on std::set. + */ + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/set_of.hh> +# include <mln/accu/bbox.hh> + + +namespace mln +{ + + // Fwd decls. + template <typename P> struct p_run_fwd_piter_; + template <typename P> struct p_run_bkd_piter_; + + /*! \brief Point set class in run. + * + * This is a mathematical set of points (not a multi-set). The + * parameter \p P shall be a Point type. + * + * \todo Test if \p P being a Point_Site is ok. + */ + template <typename P> + class p_run : public internal::point_set_base_< P, p_run > + { + public: + + /// Forward Point_Iterator associated type. + typedef p_run_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef p_run_bkd_piter_ bkd_piter; + + /// Constructor without argument. + p_run(); + + /// Constructor. + p_run(const P& start, std::size_t len); + + /// Set the starting point. + void set_run(const P& start, std::size_t len); + + /// Test is \p p belongs to this point set. + bool has(const P& p) const; + + /// Give the number of points. + std::size_t npoints() const; + + /// Give the length of the run. + std::size_t length() const; + + /// Return the \p i-th point. + P operator[](unsigned i) const; + + /// Return the first point. + const P& first() const; + + /// Give the exact bounding box. + const box_<mln_point(P)>& bbox() const; + + /// Set a relation order to p_run. + bool operator<(const p_run& rhs) const; + + protected: + + accu::bbox bb_; + // FIXME: Add invariant bb_.is_valid() <=> npoints() != 0 + + /// The first point of the run. + P p_; + + /// The length of the run. + std::size_t len_; + + /// For internal use. + bool is_valid_; + }; + + template <typename P> + std::ostream& operator<<(std::ostream& out, const p_run& pr) + { + out << "Run: (" << pr.first() << ", " << pr.length() << ")"; + return out; + } + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + p_run::p_run() + { + is_valid_ = false; + } + + template <typename P> + p_run::p_run(const P& start, std::size_t len) + : p_(start), + len_(len) + { + mln_precondition(len != 0); + P p = start; + bb_.init(); + bb_.take(p); + p[P::dim - 1] += len - 1; + bb_.take(p); + is_valid_ = true; + } + + template <typename P> + void + p_run::set_run(const P& start, std::size_t len) + { + mln_precondition(len != 0); + p_ = start; + len_ = len; + P p = start; + bb_.init(); + bb_.take(p); + p[P::dim - 1] += len - 1; + bb_.take(p); + is_valid_ = true; + } + + template <typename P> + bool + p_run::has(const P& p) const + { + mln_precondition(is_valid_); + bool res = true; + for (int i = P::dim - 2; i >= 0; --i) + if (!(res = (res && p[i] == p_[i]))) + return false; + return (p[P::dim - 1] >= p_[P::dim - 1] + && p[P::dim - 1] < p_[P::dim - 1] + (signed)len_); + } + + template <typename P> + std::size_t + p_run::npoints() const + { + mln_precondition(is_valid_); + return len_; + } + + template <typename P> + std::size_t + p_run::length() const + { + mln_precondition(is_valid_); + return len_; + } + + template <typename P> + P + p_run::operator[](unsigned i) const + { + mln_precondition(is_valid_); + mln_precondition(i < npoints()); + P p = p_; + p[P::dim - 1] += i; + return p; + } + + template <typename P> + const P& + p_run::first() const + { + return p_; + } + + template <typename P> + const box_<mln_point(P)>& + p_run::bbox() const + { + mln_precondition(is_valid_); + mln_precondition(npoints() != 0); + return bb_.to_result(); + } + + template <typename P> + bool + p_run::operator<(const p_run& rhs) const + { + return (this->p_ < rhs.p_) + || (this->p_ == rhs.p_ && this->len_ < rhs.len_); + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +# include <mln/core/p_run_piter.hh> + +#endif // ! MLN_CORE_P_RUN_HH Index: trunk/milena/mln/core/p_run_piter.hh =================================================================== --- trunk/milena/mln/core/p_run_piter.hh (revision 0) +++ trunk/milena/mln/core/p_run_piter.hh (revision 1563) @@ -0,0 +1,266 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_P_RUN_PITER_HH +# define MLN_CORE_P_RUN_PITER_HH + +/*! \file mln/core/p_run_piter.hh + * + * \brief Definition of point iterators on mln::p_run. + */ + +# include <mln/core/p_run.hh> + + +namespace mln +{ + + /*! \brief Forward iterator on points of a p_run. + * + */ + template <typename P> + struct p_run_fwd_piter_ : public internal::point_iterator_base_< P, p_run_fwd_piter_ > + { + typedef p_run_fwd_piter_ self_; + typedef internal::point_iterator_base_< P, self_ > super_; + public: + + // Make definitions from super class available. + enum { dim = super_::dim }; + + /// Coordinate associated type. + p_run_fwd_piter_(const p_run& pr); + + /// Reference of the corresponding point. + const P& to_point() const; + + /// Read-only access to the \p i-th coordinate. + mln_coord(P) operator[](unsigned i) const; + + /// Test if the iterator is valid. + bool is_valid() const; + + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + + /// Convert the iterator into a point. + operator P() const; + + protected: + const p_run& run_; + bool is_valid_; + P p_; + }; + + + + /*! \brief Backward iterator on points of a p_run. + * + */ + template <typename P> + struct p_run_bkd_piter_ : public internal::point_iterator_base_< P, p_run_bkd_piter_ > + { + typedef p_run_bkd_piter_ self_; + typedef internal::point_iterator_base_< P, self_ > super_; + public: + + // Make definitions from super class available. + enum { dim = super_::dim }; + + /// Coordinate associated type. + p_run_bkd_piter_(const p_run& pr); + + /// Reference of the corresponding point. + const P& to_point() const; + + /// Read-only access to the \p i-th coordinate. + mln_coord(P) operator[](unsigned i) const; + + /// Test if the iterator is valid. + bool is_valid() const; + + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + + /// Convert the iterator into a point. + operator P() const; + + protected: + const p_run& run_; + bool is_valid_; + P p_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // p_run_fwd_piter_ + + template <typename P> + p_run_fwd_piter_::p_run_fwd_piter_(const p_run& pr) + : run_(pr) + { + invalidate(); + } + + template <typename P> + const P& + p_run_fwd_piter_::to_point() const + { + mln_precondition(is_valid()); + return p_; + } + + template <typename P> + mln_coord(P) + p_run_fwd_piter_::operator[](unsigned i) const + { + mln_precondition(i < dim); + mln_precondition(is_valid()); + return p_[i]; + } + + template <typename P> + bool + p_run_fwd_piter_::is_valid() const + { + return is_valid_; + } + + template <typename P> + void + p_run_fwd_piter_::invalidate() + { + is_valid_ = false; + } + + template <typename P> + void + p_run_fwd_piter_::start() + { + p_ = run_.first(); + is_valid_ = true; + } + + template <typename P> + void + p_run_fwd_piter_::next_() + { + p_[dim - 1]++; + is_valid_ = p_[dim - 1] - run_.first()[dim - 1] < (signed)run_.length(); + } + + template <typename P> + p_run_fwd_piter_::operator P() const + { + mln_precondition(is_valid()); + return p_; + } + + + // p_run_bkd_piter_ + + template <typename P> + p_run_bkd_piter_::p_run_bkd_piter_(const p_run& pr) + : run_(pr) + { + invalidate(); + } + + template <typename P> + const P& + p_run_bkd_piter_::to_point() const + { + mln_precondition(is_valid()); + return p_; + } + + template <typename P> + mln_coord(P) + p_run_bkd_piter_::operator[](unsigned i) const + { + mln_precondition(i < dim); + mln_precondition(is_valid()); + return p_[i]; + } + + template <typename P> + bool + p_run_bkd_piter_::is_valid() const + { + return is_valid; + } + + template <typename P> + void + p_run_bkd_piter_::invalidate() + { + is_valid_ = false; + } + + template <typename P> + void + p_run_bkd_piter_::start() + { + p_ = run_[run_.length() - 1]; + is_valid_ = true; +} + + template <typename P> + void + p_run_bkd_piter_::next_() + { + p_[dim - 1]++; + is_valid_ = p_[dim - 1] - run_.first()[dim - 1] >= 0; + } + + template <typename P> + p_run_bkd_piter_::operator P() const + { + mln_precondition(is_valid()); + return p_; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_P_RUN_PITER_HH Index: trunk/milena/mln/core/p_array_piter.hh =================================================================== --- trunk/milena/mln/core/p_array_piter.hh (revision 1562) +++ trunk/milena/mln/core/p_array_piter.hh (revision 1563) @@ -79,7 +79,7 @@ protected: const std::vector& vect_; - unsigned i_; + unsigned i_; // FIXME: Why it's unsigned in fwd iterator and signed in the bkd one ? P p_; }; Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 0) +++ trunk/milena/mln/util/lazy_set.hh (revision 1563) @@ -0,0 +1,320 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_UTIL_LAZY_SET_HH +# define MLN_UTIL_LAZY_SET_HH + +/*! \file mln/core/internal/lazy_set.hh + * + * \brief Definition of mln::lazy_set_ for internal use only. + */ + +# include <vector> +# include <set> +# include <iterator> +# include <algorithm> + +# include <mln/core/internal/force_exact.hh> + + +namespace mln +{ + + namespace util + { + + /*! \brief An "efficient" mathematical set class. + * + * \internal + * + * This set class is designed to store a mathematical set and to + * present it to the user as a linear array (std::vector). + * + * Elements are stored by copy. Implementation is lazy. + * + * \invariant \a v_.size() == s_.size() + * + * The parameter \c E is the element type, which shall not be + * const-qualified. + * + * \todo Add a remove method. + */ + template <typename E> + class lazy_set_ + { + public: + + /// Type of the stored value. + typedef E value; + + /*! \brief Insert an element \p elt into the set. + * + * \param[in] elt The element to be inserted. + * + * If \p elt is already in the set, this method is a no-op. + * + * \return The set itself after insertion. + */ + lazy_set_<E>& insert(const E& elt); + + + /*! \brief Remove an element \p elt into the set. + * + * \param[in] elt The element to be inserted. + * + * If \p elt is already in the set, this method is a no-op. + * + * \return The set itself after suppression. + */ + lazy_set_<E>& remove(const E& elt); + + + /*! \brief Return the i-th element of the set. + * + * \param[in] i Index of the element to retrieve. + * + * \pre i < nelements() + * + * The element is returned by reference and is constant. + */ + const E& element(unsigned i) const; + + /*! \brief Return the i-th element of the set. + * + * \param[in] i Index of the element to retrieve. + * + * \pre i < nelements() + * + * The element is returned by reference and is constant. + */ + const E& operator[](unsigned i) const; + + /*! \brief Return the number of elements of the set. + */ + unsigned nelements() const; + + + /*! \brief Test if the object \p elt belongs to the set. + * + * \param[in] elt A possible element of the set. + * + * \return True is \p elt is in the set. + */ + bool has(const E& elt) const; + + + /*! \brief Test if the set is empty. + */ + bool is_empty() const; + + + /*! \brief Make the set empty. + * + * All elements contained in the set are destroyed so the set is + * emptied. + * + * \post is_empty() == true + */ + void clear(); + + + /*! \brief Give access to the set elements. + * + * The complexity of this method is O(1). + * + * \return An array (std::vector) of elements. + */ + const std::vector<E>& vect() const; + + /// Constructor without arguments. + lazy_set_(); + + private: + + /*! \brief Array of elements. + * + * This structure is only updated (if required) when elements + * are accessed. + */ + mutable std::vector<E> v_; + + /*! \brief Set of elements. + * + * This structure is always up-to-date w.r.t. the set contents. + */ + std::set<E> s_; + + + /*! \brief Update \a v_ from \a s_. + * + * FIXME: explain. + */ + void update_() const; + + /// Tell if \a v_ needs to be updated. + mutable bool needs_update_; + }; + + + /*! \brief Print a set \p s into the output stream \p + * ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] s A set. + * + * \return The modified output stream \p ostr. + * + * \relates mln::internal::lazy_set_ + */ + // FIXME : ambiguous with point_set operator << + // template <typename E> + // std::ostream& operator<<(std::ostream& ostr, const lazy_set_<E>& s); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename E> + lazy_set_<E>::lazy_set_() + { + needs_update_ = false; + } + + template <typename E> + lazy_set_<E>& + lazy_set_<E>::insert(const E& elt) + { + s_.insert(elt); + if (needs_update_ == false) + needs_update_ = true; + return internal::force_exact< lazy_set_<E> >(*this); + } + + template <typename E> + lazy_set_<E>& + lazy_set_<E>::remove(const E& elt) + { + // FIXME : doesn't compile + std::remove(s_.begin(), s_.end(), elt); + if (needs_update_ == false) + needs_update_ = true; + return internal::force_exact< lazy_set_<E> >(*this); + } + + template <typename E> + const E& + lazy_set_<E>::element(unsigned i) const + { + assert(i < v_.size()); + if (needs_update_) + update_(); + return v_[i]; + } + + template <typename E> + const E& + lazy_set_<E>::operator[](unsigned i) const + { + return this->element(i); + } + + template <typename E> + unsigned + lazy_set_<E>::nelements() const + { + if (needs_update_) + update_(); + return v_.size(); + } + + template <typename E> + bool + lazy_set_<E>::has(const E& elt) const + { + return s_.find(elt) != s_.end(); + } + + template <typename E> + bool + lazy_set_<E>::is_empty() const + { + return nelements() == 0; + } + + template <typename E> + void + lazy_set_<E>::clear() + { + v_.clear(); + s_.clear(); + needs_update_ = false; + mln_postcondition(is_empty()); + } + + template <typename E> + const std::vector<E>& + lazy_set_<E>::vect() const + { + if (needs_update_) + update_(); + return v_; + } + + template <typename E> + void + lazy_set_<E>::update_() const + { + mln_precondition(needs_update_); + v_.clear(); + std::copy(s_.begin(), s_.end(), std::back_inserter(v_)); + // no s_.clear() here: + // - we want to keep information up-to-date in s_ + // - we want to save some execution time + needs_update_ = false; + } + + // FIXME : ambiguous with point_set operator << + // template <typename E> + // std::ostream& operator<<(std::ostream& ostr, + // const lazy_set_<E>& s) + // { + // ostr << '['; + // const unsigned n = s.nelements(); + // for (unsigned i = 0; i < n; ++i) + // ostr << s.element(i) + // << (i == s.nelements() - 1 ? ']' : ','); + // return ostr; + // } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::util + +} // end of namespace mln + + +#endif // ! MLN_UTIL_LAZY_SET_HH

1 0

milena r1561: Review debug directory
by Matthieu Garrigues 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Review debug directory. * mln/debug/iota.hh: Resolve a fixme due to a resolved bug (in operator %) * mln/debug/iota.spe.hh: likewise * tests/Makefile.am: Move debug tests... * tests/debug/Makefile.am: ...here * tests/debug_iota.cc: Rename as... * tests/debug/iota.cc: ...this. * tests/debug_println.cc: Rename as... * tests/debug/println.cc: ...this. * tests/debug_println_with_border.cc: Rename as... * tests/debug/println_with_border.cc: ...this. --- mln/debug/iota.hh | 4 - mln/debug/iota.spe.hh | 4 - tests/Makefile.am | 1 tests/debug/Makefile.am | 11 +++++ tests/debug/iota.cc | 57 +++++++++++++++++++++++++++ tests/debug/println.cc | 46 ++++++++++++++++++++++ tests/debug/println_with_border.cc | 76 +++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+), 6 deletions(-) Index: trunk/milena/tests/debug_println_with_border.cc (deleted) =================================================================== Index: trunk/milena/tests/debug_iota.cc (deleted) =================================================================== Index: trunk/milena/tests/debug_println.cc (deleted) =================================================================== Index: trunk/milena/tests/debug/iota.cc =================================================================== --- trunk/milena/tests/debug/iota.cc (revision 0) +++ trunk/milena/tests/debug/iota.cc (revision 1561) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/debug_iota.cc + * + * \brief Tests on mln::debug::iota. + */ + +#include <mln/core/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/debug/iota.hh> +#include <mln/level/compare.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + { + int vs[4][4] = { {1, 2, 3, 4}, + {5, 6, 7, 8}, + {9, 10,11,12}, + {13,14,15,16} }; + + image2d<int> ref = make::image2d(vs); + image2d<int> ima(4, 4); + + debug::iota(ima); + mln_assertion(ima == ref); + } +} Index: trunk/milena/tests/debug/println_with_border.cc =================================================================== --- trunk/milena/tests/debug/println_with_border.cc (revision 0) +++ trunk/milena/tests/debug/println_with_border.cc (revision 1561) @@ -0,0 +1,76 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/debug_println_with_border.cc + * + * \brief Test on mln::debug::println_with_border. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/image1d.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> +#include <mln/debug/println_with_border.hh> + + +using namespace mln; + + +int main() +{ + border::thickness = 3; + + { + image2d<bool> msk(3, 3); + msk.at(0, 0) = true; + msk.at(1, 0) = true; + msk.at(2, 0) = true; + + msk.at(0, 1) = true; + msk.at(1, 1) = false; + msk.at(2, 1) = true; + + msk.at(0, 2) = true; + msk.at(1, 2) = true; + msk.at(2, 2) = true; + + debug::println(msk); + debug::println_with_border(msk); + } + + { + image1d<bool> msk(3); + msk.at(0) = false; + msk.at(1) = true; + msk.at(2) = false; + + debug::println(msk); + debug::println_with_border(msk); + + } + +} Index: trunk/milena/tests/debug/Makefile.am =================================================================== --- trunk/milena/tests/debug/Makefile.am (revision 1560) +++ trunk/milena/tests/debug/Makefile.am (revision 1561) @@ -1,3 +1,14 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + println \ + println_with_border \ + iota + +println_SOURCES = println.cc +println_with_border_SOURCES = println_with_border.cc +iota_SOURCES = iota.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/debug/println.cc =================================================================== --- trunk/milena/tests/debug/println.cc (revision 0) +++ trunk/milena/tests/debug/println.cc (revision 1561) @@ -0,0 +1,46 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/debug_println.cc + * + * \brief Test on mln::debug::println. + */ + +#include <mln/core/image2d.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> + + +using namespace mln; + + +int main() +{ + image2d<bool> msk(3, 3); + msk.at(1, 1) = true; + debug::println(msk); +} Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1560) +++ trunk/milena/tests/Makefile.am (revision 1561) @@ -9,6 +9,7 @@ canvas \ core \ display \ + debug \ draw \ fun \ histo \ Index: trunk/milena/mln/debug/iota.spe.hh =================================================================== --- trunk/milena/mln/debug/iota.spe.hh (revision 1560) +++ trunk/milena/mln/debug/iota.spe.hh (revision 1561) @@ -54,9 +54,7 @@ unsigned i = 0; mln_pixter(I) p(input); for_all(p) - // FIXME : remove the convertion when the bug will be - // resolved. - p.val() = ++i % int(mln_max(mln_value(I))); + p.val() = ++i % mln_max(mln_value(I)); } } // end of namespace mln::debug::impl Index: trunk/milena/mln/debug/iota.hh =================================================================== --- trunk/milena/mln/debug/iota.hh (revision 1560) +++ trunk/milena/mln/debug/iota.hh (revision 1561) @@ -66,9 +66,7 @@ unsigned i = 0; mln_piter(I) p(input.domain()); for_all(p) - // FIXME : remove the convertion when the bug will be - // resolved. - input(p) = ++i % int(mln_max(mln_value(I))); + input(p) = ++i % mln_max(mln_value(I)); } } // end of namespace mln::debug::impl

1 0

milena r1560: make save pgm work on graylevels. document pnm::save
by Matthieu Garrigues 28 Nov '07

28 Nov '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-28 Matthieu Garrigues <garrigues(a)lrde.epita.fr> make save pgm work on graylevels. document pnm::save. * mln/io/pgm/save.hh: Disable type checking in pgm::save to allow to save graylevel images. * mln/io/pnm/save.hh: Documentation. * mln/io/pnm/save_header.hh: graylevel compatibility. --- pgm/save.hh | 10 ++++++---- pnm/save.hh | 9 ++++++++- pnm/save_header.hh | 3 +-- 3 files changed, 15 insertions(+), 7 deletions(-) Index: trunk/milena/mln/io/pgm/save.hh =================================================================== --- trunk/milena/mln/io/pgm/save.hh (revision 1559) +++ trunk/milena/mln/io/pgm/save.hh (revision 1560) @@ -72,10 +72,12 @@ template <typename I> void save(const Image& ima, const std::string& filename) { - mln::metal::or_< - mln::metal::templated_by<mln_value(I), value::int_u >, - mln::metal::templated_by<mln_value(I), value::int_u_sat > - >::check(); + // FIXME : this is to restrictive. Check if I is compatible with PGM. + // mln::metal::or_< + // mln::metal::templated_by<mln_value(I), value::int_u >, + // mln::metal::templated_by<mln_value(I), value::int_u_sat > + // >::check(); + io::pnm::save(PGM, exact(ima), filename); } Index: trunk/milena/mln/io/pnm/save_header.hh =================================================================== --- trunk/milena/mln/io/pnm/save_header.hh (revision 1559) +++ trunk/milena/mln/io/pnm/save_header.hh (revision 1560) @@ -57,8 +57,7 @@ template <typename V> void save_max_val(V&, std::ofstream& file) { - if (mln_max(V) > 1) - file << unsigned(mln_max(V)) << std::endl; + file << mln_max(V) << std::endl; } void save_max_val(bool&, std::ofstream& file) Index: trunk/milena/mln/io/pnm/save.hh =================================================================== --- trunk/milena/mln/io/pnm/save.hh (revision 1559) +++ trunk/milena/mln/io/pnm/save.hh (revision 1560) @@ -64,7 +64,14 @@ namespace pnm { - // FIXME: Doc. + /*! Save a milena image as a pnm image. + * + * \param[in] type The type of the image to save (can be PPM, + * PGM, PBM). + * \param[in] ima_ The image to save. + * \param[in,out] filename the destination. + */ + template <typename I> void save(const int type, const Image& ima_, const std::string& filename);

1 0