Olena-patches July 2004

olena-patches@lrde.epita.fr

5 participants
9 discussions

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/md5_morpho_attribute_closing_opening_light_hh5: Remove file. * tests/md5_morpho_attribute_closing_opening_light_hh4: Likewise. * tests/md5_morpho_attribute_closing_opening_light_hh3: Likewise. * tests/md5_morpho_attribute_closing_opening_light_hh2: Likewise. * tests/md5_morpho_attribute_closing_opening_light_hh1: Likewise. * tests/md5_morpho_attribute_closing_opening_light_hh0: Likewise. Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/40_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,57 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x2a, 0x39, 0xf5, 0xfc, 0x95, 0xa0, 0x18, 0xc1, 0xac, 0xa, 0x5, 0xbf, 0xc4, 0xc2, 0xfd, 0xf8}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast::height_closing(im1, oln::neighb_c4(), 5); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/41_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,57 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x8a, 0x6f, 0x2a, 0xaa, 0x83, 0x5f, 0x92, 0xc, 0x10, 0x1f, 0x56, 0x6, 0xcc, 0xb8, 0x42, 0xd4}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast::height_opening(im1, oln::neighb_c4(), 5); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/42_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,58 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x1a, 0xe0, 0x60, 0x8a, 0xd8, 0x2d, 0xbc, 0x11, 0x29, 0x0, 0xd0, 0x44, 0x53, 0xf9, 0xff, 0xec}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast:: -integral_opening(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/43_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,58 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x39, 0x6e, 0x2, 0xfa, 0xec, 0x98, 0xa5, 0x3c, 0x10, 0x16, 0x82, 0xfd, 0x54, 0x48, 0x7d, 0xd3}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast:: -integral_closing(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/44_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,57 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x62, 0x60, 0xf, 0xd3, 0xdf, 0xd2, 0xaf, 0x5d, 0x71, 0xf3, 0xeb, 0xe9, 0x31, 0x34, 0x53, 0x75}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast::card_opening(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/45_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0 Fri, 16 Jul 2004 12:19:11 +0200 palma_g () @@ -1,57 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> -#include <iostream> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0xf, 0x6c, 0xa1, 0x5a, 0x98, 0x33, 0xeb, 0xbe, 0xb, 0x60, 0x7, 0xb3, 0xca, 0x5d, 0x44, 0xe}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena256.pgm"))); - im1 = oln::morpho::fast::card_closing(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - return 0; - } -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 3 months

News.

by Niels van Vliet

"Shouldn't such a massive change be reflected in NEWS? Are you working on the documentation and test suite too?" (Copyright Akim) This is true for shaplets AND for deconvolution. Reply "ok" once it is done. Thanks. -- Niels

20 years, 3 months

oln 10.208: Fix documentation.

by Roland Levillain

Index: olena/ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/level/threshold.hh: Fix argument description in ctor documentation. * oln/level/cc.hh: Typos in documentation. Index: olena/oln/level/cc.hh --- olena/oln/level/cc.hh Fri, 02 Apr 2004 16:00:03 +0200 van-vl_n (oln/e/20_cc.hh 1.11.1.16 640) +++ olena/oln/level/cc.hh Tue, 27 Jul 2004 17:19:32 +0200 levill_r (oln/e/20_cc.hh 1.11.1.16 640) @@ -58,8 +58,8 @@ ** \pre the input must be a binary image. ** ** \arg input Image of markers. - ** \arg se Neighbourhood. - ** \arg nb_label Returns the number of label (optional). + ** \arg se Neighborhood. + ** \arg nb_label Returns the number of labels (optional). ** ** \return An image of type \a DestType. ** Index: olena/oln/level/threshold.hh --- olena/oln/level/threshold.hh Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/f/15_threshold. 1.14 640) +++ olena/oln/level/threshold.hh Tue, 27 Jul 2004 17:09:07 +0200 levill_r (oln/f/15_threshold. 1.14 640) @@ -65,11 +65,11 @@ class threshold : public std::unary_function<const Input&, Output> { public: - /*! \arg Threshold any value heigher or equal to this value will - ** return \a min. - ** \arg min Value returned if the input is smaller than threshold. - ** \arg max Value returned if the input is greater or equal to the - ** threshold. + /*! \arg threshold Any value greater or equal to this value will + ** return \a max. + ** \arg min Value returned if the input is lower than the threshold. + ** \arg max Value returned if the input is greater than or equal to + ** the threshold. */ threshold(const Input& threshold, const Output& min = ntg_min_val(Output),

20 years, 5 months

oln 10.206: Fix doc.

by Roland Levillain

Index: olena/ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/morpho/watershed.hh: Fix doc. Index: olena/oln/morpho/watershed.hh --- olena/oln/morpho/watershed.hh Mon, 12 Apr 2004 01:09:38 +0200 van-vl_n (oln/48_watershed. 1.15 640) +++ olena/oln/morpho/watershed.hh Tue, 13 Jul 2004 15:07:02 +0200 levill_r (oln/48_watershed. 1.15 640) @@ -58,7 +58,7 @@ ** \param N Exact type of the neighborhood. ** ** \arg im_i Image of levels. - ** \arg Ng Neighborhood to consider. + ** \arg Ng Connectivity of the basins. ** ** \pre DestValue should be large enough. ** @@ -136,7 +136,7 @@ ** \param N Exact type of the neighborhood. ** ** \arg input Image of levels. - ** \arg Ng Neighborhood to consider. + ** \arg Ng Connectivity of the basins. ** ** \pre DestValue should be large enough. ** @@ -215,7 +215,7 @@ ** ** \arg D Input image. ** \arg M Image of labels. - ** \arg Ng Neighborhood to consider. + ** \arg Ng Connectivity of the basins. ** ** \todo FIXME: Not instantiated in swilena (see ** tools/swilena/generate_morpho_instantiations.py)

20 years, 5 months

oln 10.205: Fix doc.

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/convol/fast_convolution.hh: Add macro to compile doc without libfft. * oln/makefile.src: Add qsort reference. * oln/morpho/attribute_closing_opening.hh: Correct doc. Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Fri, 09 Jul 2004 17:34:56 +0200 palma_g (oln/q/49_attribute_ 1.25 640) +++ olena/oln/morpho/attribute_closing_opening.hh Fri, 09 Jul 2004 19:18:38 +0200 palma_g (oln/q/49_attribute_ 1.26 640) @@ -270,7 +270,7 @@ xxx_opening_decl(integral) /*! - ** \brief Perform an integral closing. + ** \brief Perform a volume closing. ** ** \code ** #include <oln/basics2d.hh> @@ -283,7 +283,7 @@ ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); ** oln::morpho::env::OtherImageEnv<im_type> env(im1); - ** im1 = oln::morpho::fast::integral_closing(im1, oln::neighb_c4(), 200, env); + ** im1 = oln::morpho::fast::volume_closing(im1, oln::neighb_c4(), 200, env); ** oln::save(im1, IMG_OUT "oln_morpho_fast_volume_closing.ppm"); ** return 0; ** } @@ -291,15 +291,15 @@ ** \image html lena128_pgm.png ** \image latex lena128_pgm.png ** => - ** \image html oln_morpho_fast_integral_closing.png - ** \image latex oln_morpho_fast_integral_closing.png + ** \image html oln_morpho_fast_volume_closing.png + ** \image latex oln_morpho_fast_volume_closing.png ** */ xxx_closing_im_env_decl(volume) /*! - ** \brief Perform an integral opening. + ** \brief Perform a volume opening. ** ** \code ** #include <oln/basics2d.hh> @@ -311,16 +311,17 @@ ** typedef oln::image2d<ntg::int_u8> im_type; ** ** im_type im1(oln::load(IMG_IN "lena128.pgm")); - ** im1 = oln::morpho::fast::integral_opening(im1, oln::neighb_c4(), 200); - ** oln::save(im1, IMG_OUT "oln_morpho_fast_integral_opening.ppm"); + ** oln::morpho::env::OtherImageEnv<im_type> env(im1); + ** im1 = oln::morpho::fast::volume_opening(im1, oln::neighb_c4(), 200, env); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_volume_opening.ppm"); ** return 0; ** } ** \endcode ** \image html lena128_pgm.png ** \image latex lena128_pgm.png ** => - ** \image html oln_morpho_fast_integral_opening.png - ** \image latex oln_morpho_fast_integral_opening.png + ** \image html oln_morpho_fast_volume_opening.png + ** \image latex oln_morpho_fast_volume_opening.png ** */ xxx_opening_im_env_decl(volume) Index: olena/oln/makefile.src --- olena/oln/makefile.src Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/4_makefile.s 1.5 644) +++ olena/oln/makefile.src Tue, 13 Jul 2004 11:44:08 +0200 palma_g (oln/r/4_makefile.s 1.6 644) @@ -227,6 +227,7 @@ utils/md5.hxx \ utils/buffer.hh \ utils/buffer.hxx \ + utils/qsort.hh \ utils/histogram.hh \ utils/se_stat.hh \ utils/se_stat.hxx \ Index: olena/oln/convol/fast_convolution.hh --- olena/oln/convol/fast_convolution.hh Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/12_fast_convo 1.3 600) +++ olena/oln/convol/fast_convolution.hh Fri, 09 Jul 2004 18:44:18 +0200 palma_g (oln/r/12_fast_convo 1.4 600) @@ -126,6 +126,7 @@ convolve(const abstract::image& input, const abstract::image< J >& k) { +# ifdef HAVE_LIBfft mlc::eq<I::dim, J::dim>::ensure(); mlc::eq<I::dim, 2>::ensure(); @@ -188,6 +189,9 @@ output[input_iter] = piece_output[input_iter]; return output; +# else + assert(0); +# endif // !HAVE_LIBfft } /*! -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 5 months

oln 10.204: Correct tests

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/utils/qsort.hh: Correct comparison operators. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Correct test. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Likewise. * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Remove file. * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise. * oln/morpho/attributes.hh: Make code use ntg macros. * oln/morpho/attribute_union_find.hh: Add a static if for sort choice. * oln/morpho/attribute_closing_opening.hh: Add prototypes. * oln/morpho/attribute_closing_opening_map.hh: Likewise. * oln/utils/histogram.hh: Correct prototypes. Index: olena/oln/utils/histogram.hh --- olena/oln/utils/histogram.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/10_histogram. 1.6.1.14.1.15 640) +++ olena/oln/utils/histogram.hh Fri, 09 Jul 2004 17:11:15 +0200 palma_g (oln/10_histogram. 1.6.1.14.1.15 640) @@ -673,14 +673,11 @@ */ template<class I> void - distrib_sort(const oln::abstract::image& im, + distrib_sort(const oln::abstract::non_vectorial_image& im, std::vector<oln_point_type(I)> &v) { typedef oln_value_type(I) val; - typedef typename ntg_is_a(val, ntg::non_vectorial)::ensure_type - ensure_type; - // check the size precondition(v.size() == im.npoints()); @@ -716,14 +713,11 @@ */ template<class I> void - distrib_sort_inv(const oln::abstract::image& im, + distrib_sort_inv(const oln::abstract::non_vectorial_image& im, std::vector<oln_point_type(I)> &v) { typedef oln_value_type(I) val; - typedef typename ntg_is_a(val, ntg::non_vectorial)::ensure_type - ensure_type; - precondition(v.size() == im.npoints()); utils::histogram<val> histo(im); @@ -750,19 +744,23 @@ { template <class I> void - operator ()(const oln::abstract::image& im, + operator ()(const oln::abstract::non_vectorial_image& im, std::vector<oln_point_type(I)> &v) { distrib_sort_inv(im, v); } }; + /*! Select statically the good distrib_sort. + ** + ** Specialisation. + */ template <> struct select_distrib_sort<true> { template <class I> void - operator ()(const oln::abstract::image& im, + operator ()(const oln::abstract::non_vectorial_image& im, std::vector<oln_point_type(I)> &v) { distrib_sort(im, v); Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/q/49_attribute_ 1.24 640) +++ olena/oln/morpho/attribute_closing_opening.hh Wed, 07 Jul 2004 14:54:47 +0200 palma_g (oln/q/49_attribute_ 1.24 640) @@ -138,6 +138,29 @@ return tarjan::internal::attr_closing_<I, N, attr::T##_type >(input, Ng, lambda); \ } + // same as previous, but for attribute based on image types with environment +# define xxx_opening_im_env_decl(T) \ + template<class I, class N> \ + oln_concrete_type(I) \ + T##_opening(const abstract::non_vectorial_image& input, \ + const abstract::neighborhood<N>& Ng, \ + const attr_lambda_type(attr::T##_type) &lambda, \ + const attr_env_type(attr::T##_type) &env) \ + { \ + return tarjan::internal::attr_opening_<I, N, attr::T##_type >(input, Ng, lambda, env); \ + } + +# define xxx_closing_im_env_decl(T) \ + template<class I, class N> \ + oln_concrete_type(I) \ + T##_closing(const abstract::non_vectorial_image& input, \ + const abstract::neighborhood<N>& Ng, \ + const attr_lambda_type(attr::T##_type) &lambda, \ + const attr_env_type(attr::T##_type) &env) \ + { \ + return tarjan::internal::attr_closing_<I, N, attr::T##_type >(input, Ng, lambda, env); \ + } + /*! ** \brief Perform a cardinal closing. ** @@ -247,6 +270,62 @@ xxx_opening_decl(integral) /*! + ** \brief Perform an integral closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena128.pgm")); + ** oln::morpho::env::OtherImageEnv<im_type> env(im1); + ** im1 = oln::morpho::fast::integral_closing(im1, oln::neighb_c4(), 200, env); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_volume_closing.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena128_pgm.png + ** \image latex lena128_pgm.png + ** => + ** \image html oln_morpho_fast_integral_closing.png + ** \image latex oln_morpho_fast_integral_closing.png + ** + */ + xxx_closing_im_env_decl(volume) + + + /*! + ** \brief Perform an integral opening. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena128.pgm")); + ** im1 = oln::morpho::fast::integral_opening(im1, oln::neighb_c4(), 200); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_integral_opening.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena128_pgm.png + ** \image latex lena128_pgm.png + ** => + ** \image html oln_morpho_fast_integral_opening.png + ** \image latex oln_morpho_fast_integral_opening.png + ** + */ + xxx_opening_im_env_decl(volume) + + /*! ** \brief Perform a height closing. ** ** \code Index: olena/oln/morpho/attribute_union_find.hh --- olena/oln/morpho/attribute_union_find.hh Sun, 23 May 2004 12:21:34 +0200 palma_g (oln/q/50_attribute_ 1.19 640) +++ olena/oln/morpho/attribute_union_find.hh Fri, 09 Jul 2004 17:21:04 +0200 palma_g (oln/q/50_attribute_ 1.19 640) @@ -92,11 +92,10 @@ std::vector<point_type> I;//(/*input_.npoints()*/); + // FIXME: make both version avialble: qsort and dsort // oln::utils::select_distrib_sort<closing>()(input_, I); - if (closing) - oln::utils::qsort_inv(input_, I); - else - oln::utils::qsort(input_, I); + oln::utils::select_q_sort<closing>()(input_, I); + level::fill(aux_data_, ntg_sup_val(lambda_type)); aux_data_.border_adapt_assign(Ng.delta(), ntg_sup_val(lambda_type)); Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/45_attributes 1.13.1.4 644) +++ olena/oln/morpho/attributes.hh Fri, 09 Jul 2004 15:57:43 +0200 palma_g (oln/j/45_attributes 1.13.1.4 644) @@ -386,9 +386,10 @@ volume_type(const abstract::image<J> &, const oln_point_type(J) &p, const env_type &e) : + // reflevel_(e.getImage()[p]), reflevel_(e.getImage()[p]), - area_(1), - value_(1) + area_(ntg_unit_val(value_type)), + value_(ntg_unit_val(value_type)) { } Index: olena/oln/morpho/attribute_closing_opening_map.hh --- olena/oln/morpho/attribute_closing_opening_map.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/49_attribute_ 1.12 600) +++ olena/oln/morpho/attribute_closing_opening_map.hh Wed, 07 Jul 2004 16:05:19 +0200 palma_g (oln/j/49_attribute_ 1.12 600) @@ -231,6 +231,19 @@ attr_env_type(attr::T##_type)()); \ } + // same but attribute take care of the image type +# define xxx_opening_im_env_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_opening(const abstract::non_vectorial_image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(attr::T##_type)& lambda, \ + const attr_env_type(attr::T##_type) &env) \ + { \ + return tarjan_map<attr::T##_type, I, N>(false, input, ng, lambda, \ + env); \ + } + //return input; // return tarjan_map<T##_type, I, N>(false, input, ng, lambda, // attr_env_type(T##_type<>)()); @@ -257,6 +270,18 @@ attr_env_type(attr::T##_type)());\ } +# define xxx_closing_im_env_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_closing(const abstract::non_vectorial_image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(attr::T##_type)& lambda, \ + const attr_env_type(attr::T##_type) &env) \ + { \ + return tarjan_map<attr::T##_type, I, N>(true, input, ng, lambda, \ + env); \ + } + /*! ** \brief Perform a cardinal closing. ** @@ -364,6 +389,62 @@ xxx_opening_map_decl(integral) /*! + ** \brief Perform an integral closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening_map.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena128.pgm")); + ** oln::morpho::env::OtherImageEnv<im_type> env(im1); + ** im1 = oln::morpho::slow::volume_closing(im1, oln::neighb_c4(), + ** 200, env); + ** oln::save(im1, IMG_OUT "oln_morpho_slow_integral_closing.ppm"); + ** } + ** \endcode + ** \image html lena128_pgm.png + ** \image latex lena128_pgm.png + ** => + ** \image html oln_morpho_slow_integral_closing.png + ** \image latex oln_morpho_slow_integral_closing.png + ** + */ + xxx_closing_im_env_map_decl(volume) + + /*! + ** \brief Perform an integral opening. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening_map.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena128.pgm")); + ** oln::morpho::env::OtherImageEnv<im_type> env(im1); + ** im1 = oln::morpho::slow::volume_opening(im1, oln::neighb_c4(), + ** 200, env); + ** oln::save(im1, IMG_OUT "oln_morpho_slow_integral_opening.ppm"); + ** } + ** \endcode + ** \image html lena128_pgm.png + ** \image latex lena128_pgm.png + ** => + ** \image html oln_morpho_slow_integral_opening.png + ** \image latex oln_morpho_slow_integral_opening.png + ** + */ + xxx_opening_im_env_map_decl(volume) + + /*! ** \brief Perform a height closing. ** ** \code Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/m/0_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3 Fri, 09 Jul 2004 17:15:03 +0200 palma_g (oln/m/0_md5_morpho 1.2 644) @@ -32,26 +32,43 @@ #include "check.hh" #include <oln/basics2d.hh> #include <oln/morpho/attribute_closing_opening.hh> +#include <oln/morpho/attribute_closing_opening_map.hh> #include <oln/level/compare.hh> #include <ntg/all.hh> int main() { -oln::utils::key::value_type data_key[16] = {0x9d, 0xa, 0x87, 0x3b, 0x92, 0xde, 0x8a, 0xb0, 0x84, 0xf8, 0xe6, 0x5e, 0x6c, 0xdf, 0x5e, 0x76}; + oln::utils::key::value_type data_key[16] = {0x9d, 0xa, 0x87, 0x3b, 0x92, + 0xde, 0x8a, 0xb0, 0x84, 0xf8, + 0xe6, 0x5e, 0x6c, 0xdf, 0x5e, + 0x76}; oln::utils::key key(data_key); + bool res(false); + typedef oln::image2d<ntg::int_u8> im_type; + + im_type im(oln::load(rdata("lena128.pgm"))); + im_type im1; + im_type im2; + oln::morpho::env::OtherImageEnv<im_type> env(im); + + im1 = oln::morpho::fast::volume_opening(im, oln::neighb_c4(), 200, env); + im2 = oln::morpho::slow::volume_opening(im, oln::neighb_c4(), 200, env); - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena128.pgm"))); - im1 = oln::morpho::fast:: -integral_opening(im1, oln::neighb_c4(), 200); if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; + std::cout << "fast: OK" << std::endl; + else + { + std::cout << "fast: FAIL" << std::endl; + res = true; + } + if (oln::utils::md5(im2) == key) + std::cout << "slow: OK" << std::endl; else { - std::cout << "FAIL" << std::endl; - return true; + std::cout << "slow: FAIL" << std::endl; + res = true; } - return 0; + + return res; } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/m/1_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2 Fri, 09 Jul 2004 17:15:06 +0200 palma_g (oln/m/1_md5_morpho 1.2 644) @@ -32,26 +32,43 @@ #include "check.hh" #include <oln/basics2d.hh> #include <oln/morpho/attribute_closing_opening.hh> +#include <oln/morpho/attribute_closing_opening_map.hh> #include <oln/level/compare.hh> #include <ntg/all.hh> int main() { -oln::utils::key::value_type data_key[16] = {0xf6, 0x87, 0xb9, 0xf, 0xde, 0x31, 0x62, 0xfd, 0xd7, 0xb, 0xa4, 0x19, 0x26, 0x3, 0x7, 0xa4}; + oln::utils::key::value_type data_key[16] = {0xf6, 0x87, 0xb9, 0xf, 0xde, + 0x31, 0x62, 0xfd, 0xd7, 0xb, + 0xa4, 0x19, 0x26, 0x3, 0x7, + 0xa4}; oln::utils::key key(data_key); + bool res(false); + typedef oln::image2d<ntg::int_u8> im_type; + + im_type im(oln::load(rdata("lena128.pgm"))); + im_type im1; + im_type im2; + oln::morpho::env::OtherImageEnv<im_type> env(im); + + im1 = oln::morpho::fast::volume_closing(im, oln::neighb_c4(), 200, env); + im2 = oln::morpho::slow::volume_closing(im, oln::neighb_c4(), 200, env); - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena128.pgm"))); - im1 = oln::morpho::fast:: -integral_closing(im1, oln::neighb_c4(), 200); if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; + std::cout << "fast: OK" << std::endl; + else + { + std::cout << "fast: FAIL" << std::endl; + res = true; + } + if (oln::utils::md5(im2) == key) + std::cout << "slow: OK" << std::endl; else { - std::cout << "FAIL" << std::endl; - return true; + std::cout << "slow: FAIL" << std::endl; + res = true; } - return 0; + + return res; } Index: olena/oln/utils/qsort.hh --- olena/oln/utils/qsort.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/r/9_qsort.hh 1.2 644) +++ olena/oln/utils/qsort.hh Fri, 09 Jul 2004 17:19:02 +0200 palma_g (oln/r/9_qsort.hh 1.2 644) @@ -65,10 +65,17 @@ ** \arg i The first point. ** \arg j The second point. ** \return im[i] < im[j] + ** \warning In the case where im_[j] = im_[i] the comparison + ** is done on the point type components (for compatibility + ** purpose with distributed sort). */ bool operator()(const point_type &i, const point_type &j) { - return im_[j] < im_[i]; + if (im_[i] == im_[j]) + for (unsigned t(0); t < point_type::dim; ++t) + if (i.nth(t) != j.nth(t)) + return i.nth(t) < j.nth(t); + return im_[j] > im_[i]; } protected: @@ -101,10 +108,17 @@ ** \arg i The first point. ** \arg j The second point. ** \return im[i] > im[j] + ** \warning In the case where im_[j] = im_[i] the comparison + ** is done on the point type components (for compatibility + ** purpose with distributed sort). */ bool operator()(const point_type &i, const point_type &j) { - return im_[i] < im_[j]; + if (im_[i] == im_[j]) + for (unsigned t(0); t < point_type::dim; ++t) + if (i.nth(t) != j.nth(t)) + return i.nth(t) < j.nth(t); + return im_[i] > im_[j]; } protected: @@ -156,6 +170,38 @@ std::sort(v.begin(), v.end(), c); } + + /*! Select statically the good qsort. + ** + ** \param reverse If the sort should be reverted or not. + */ + template <bool reverse> + struct select_q_sort + { + template <class I> + void + operator ()(const oln::abstract::non_vectorial_image& im, + std::vector<oln_point_type(I)> &v) + { + qsort_inv(im, v); + } + }; + + /*! Select statically the good qsort. + ** + ** Specialisation. + */ + template <> + struct select_q_sort<true> + { + template <class I> + void + operator ()(const oln::abstract::non_vectorial_image& im, + std::vector<oln_point_type(I)> &v) + { + qsort(im, v); + } + }; } // !utils } // !oln Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/28_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3 Fri, 09 Jul 2004 17:34:27 +0200 palma_g () @@ -1,56 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening_map.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0x9d, 0xa, 0x87, 0x3b, 0x92, 0xde, 0x8a, 0xb0, 0x84, 0xf8, 0xe6, 0x5e, 0x6c, 0xdf, 0x5e, 0x76}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena128.pgm"))); - im1 = oln::morpho::slow:: -integral_opening(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - } Index: olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2 --- olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/l/29_md5_morpho 1.2 644) +++ olena/tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2 Fri, 09 Jul 2004 17:34:27 +0200 palma_g () @@ -1,56 +0,0 @@ -// -*- c++ -*- -// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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. - -#include "data.hh" -#include <oln/utils/md5.hh> - -#include "check.hh" -#include <oln/basics2d.hh> -#include <oln/morpho/attribute_closing_opening_map.hh> -#include <oln/level/compare.hh> -#include <ntg/all.hh> - -int main() -{ -oln::utils::key::value_type data_key[16] = {0xf6, 0x87, 0xb9, 0xf, 0xde, 0x31, 0x62, 0xfd, 0xd7, 0xb, 0xa4, 0x19, 0x26, 0x3, 0x7, 0xa4}; - -oln::utils::key key(data_key); - - typedef oln::image2d<ntg:: -int_u8> im_type; - im_type im1(oln::load(rdata("lena128.pgm"))); - im1 = oln::morpho::slow:: -integral_closing(im1, oln::neighb_c4(), 200); - if (oln::utils::md5(im1) == key) - std::cout << "OK" << std::endl; -else - { - std::cout << "FAIL" << std::endl; - return true; - } - } -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 5 months

oln/prototypes 1: initial commit.

by Simon Odou

"prototypes" is a new project which will be used to play with small pieces of code. The prototype grow up and if it's a good boy, it becomes a real branch of Olena. And one day, of course, it may be merged inside Olena with honors. The "prop_heredity" is a new prototype coming directly from theo's. See the NEWS file to know more about. svn co https://svn.lrde.epita.fr/svn/oln Index: prototypes/ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * prop_heredity: New prototype for olena. Index: prototypes/prop_heredity/ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * configure.ac: New. * bootstrap.sh: New. * src: New. * src/image.hh: New. * src/iter.hh: New. * src/props.hh: New. * src/any.hh: New. * src/dim.hh: New. * src/point.hh: New. * src/size.hh: New. * src/main.cc: New. * src/mlc.hh: New. * src/Makefile.am: New. * src/morpher.hh: New. * src/dim2d.hh: New. * ChangeLog: New. * Makefile.am: New. * NEWS: New. Index: prop_heredity/NEWS --- prop_heredity/NEWS (revision 0) +++ prop_heredity/NEWS (revision 0) @@ -0,0 +1,15 @@ +prop_heredity 1 July 9, 2004 + + * Initial public release. + + * Theo made a new hierarchy based on property heredity. + - Easier to understand. + - Easier to extend (i.e. for morphers). + + * Theo changed the any_with_diamond model which is very time + consuming. The idea is to have the choice : + - memory policy: it's the same than the actual implementation + in Olena. + - speed policy: in this way, you keep for each class an attribute + setting the base class address. So you lose an attribute but you + win 30% of execution time. Index: prop_heredity/configure.ac --- prop_heredity/configure.ac (revision 0) +++ prop_heredity/configure.ac (revision 0) @@ -0,0 +1,14 @@ +AC_INIT([oln_proto__prop_heredity], 0, [olena(a)lrde.epita.fr], + [oln_proto__prop_heredity]) +AM_INIT_AUTOMAKE([1.7 no-define foreign dist-bzip2]) + +# Ugly. +CXXFLAGS="$CXXFLAGS -finline-limit-1500 -Wall -pedantic" + +AC_PROG_CC +AC_PROG_CXX + +AC_CONFIG_FILES([Makefile + src/Makefile]) + +AC_OUTPUT Index: prop_heredity/bootstrap.sh --- prop_heredity/bootstrap.sh (revision 0) +++ prop_heredity/bootstrap.sh (revision 0) @@ -0,0 +1,4 @@ +#! /bin/sh + +autoreconf -fvi +echo "Reconfiguration done." Property changes on: prop_heredity/bootstrap.sh ___________________________________________________________________ Name: svn:executable + * Property changes on: prop_heredity/src ___________________________________________________________________ Name: svn:ignore + *~ .#* *.swp proto Makefile.in .deps Makefile Index: prop_heredity/src/image.hh --- prop_heredity/src/image.hh (revision 0) +++ prop_heredity/src/image.hh (revision 0) @@ -0,0 +1,202 @@ +#ifndef PROTO_IMAGE_HH +# define PROTO_IMAGE_HH + +# include "dim2d.hh" +# include "size.hh" +# include "point.hh" +# include "mlc.hh" + + +namespace abstract { + + template <typename E> + struct image : public virtual mlc::any__best_speed<E> + { + Image_size_type(E) size() const { + return this->exact().size_impl(); + } + + const Value_type(E) operator[](const Point_type(E)& p) const { + return this->exact().opsqbr_impl(p); + } + Value_type(E)& operator[](const Point_type(E)& p) { + return this->exact().opsqbr_impl(p); + } + + bool hold(const Point_type(E)& p) const { + return this->exact().hold_impl(p); + } + + protected: + typedef mlc::any__best_speed<E> super; + //image(E *const this_) : super(this) {} + image() { std::cout << "hop!" << std::endl; } + + virtual ~image() {} + }; + + + // discriminant is dimension + + template <typename E> + struct image2d : public virtual image<E> + { + coord_t nrows() const { return this->size().nrows(); } + coord_t ncols() const { return this->size().ncols(); } + const Value_type(E) operator()(coord_t row, coord_t col) const { + return this->operator[](Point_type(E)(row, col)); + } + Value_type(E)& operator()(coord_t row, coord_t col) { + return this->operator[](Point_type(E)(row, col)); + } + }; + + + // discriminant is value type tag + + template <typename E> + struct label_image : public virtual image<E> + {}; + + template <typename E> + struct binary_image : public label_image<E> + {}; + + template <typename E> + struct scalar_image : public virtual image<E> + {}; + + template <typename E> + struct vector_image : public virtual image<E> + {}; + + + // a class with TWO properties: + + template <typename E> + struct scalar_image2d : public virtual image<E> + {}; + + + namespace internal { + + + // FIXME: switch over data storage (linear or not) + + + // switch over dimension + + template <typename Dim, typename E> + struct dim_switch; + + template <typename E> + struct dim_switch <dim2d, E> : public image2d<E> + {}; + + // switch over value type tag + + template <unsigned Tag, typename E> + struct value_tag_switch : public image<E> + {}; + + template <typename E> + struct value_tag_switch<label_tag, E> : public label_image<E> + {}; + + template <typename E> + struct value_tag_switch<binary_tag, E> : public binary_image<E> + {}; + + template <typename E> + struct value_tag_switch<scalar_tag, E> : public scalar_image<E> + {}; + + template <typename E> + struct value_tag_switch<vector_tag, E> : public vector_image<E> + {}; + + + } // end of namespace internal + + + + + // entry point of image hierarchy + + template <typename E> + struct image_entry : public virtual internal::dim_switch< Dim_type(E), E>, + public virtual internal::value_tag_switch< props<Value_type(E)>::tag_value, E > + { + protected: + image_entry() : + internal::dim_switch< Dim_type(E), E>(), + internal::value_tag_switch< props<Value_type(E)>::tag_value, E >() + { + mlc::set_this((E*)this); + } + }; + + + +} // end of namespace abstract + + + +// image2d +template <typename T> +struct image2d; + +template <typename T> +struct props < image2d<T> > : public default_props<dim2d> +{ + typedef T value_type; +}; + +template <typename T> +struct image2d : public abstract::image_entry< image2d<T> > +{ + typedef abstract::image_entry< image2d<T> > super; + image2d() {} + + image2d(coord_t nrows_, coord_t ncols_) : + size_(nrows_, ncols_) + { + array_ = new T*[nrows_]; + buffer_ = new T[nrows_ * ncols_]; + T* buf = buffer_; + for (int row = 0; row < nrows_; ++row) + { + array_[row] = buf; + buf += ncols_; + } + } + + image2d_size size_impl() const { + return size_; + } + + const T opsqbr_impl(const point2d& p) const { + assert(this->hold(p)); + return array_[p.row()][p.col()]; + } + T& opsqbr_impl(const point2d& p) { + assert(this->hold(p)); + return array_[p.row()][p.col()]; + } + + bool hold_impl(const point2d& p) const { + return + p.row() >= 0 && p.row() < size_.nrows() + && p.col() >= 0 && p.col() < size_.ncols(); + } + +protected: + image2d_size size_; + T* buffer_; + T** array_; +}; + + + + +#endif // ndef PROTO_IMAGE_HH Index: prop_heredity/src/iter.hh --- prop_heredity/src/iter.hh (revision 0) +++ prop_heredity/src/iter.hh (revision 0) @@ -0,0 +1,77 @@ +#ifndef PROTO_ITER_HH +# define PROTO_ITER_HH + +# include "dim2d.hh" + +# define for_all(P) for(p.begin(); ! p.end(); ++p) + + +namespace abstract { + + template <typename E> + struct iter : public mlc::any__best_memory<E> + { + operator Point_type(E)() const { + return p_; + } + void begin() { + this->exact().begin_impl(); + } + bool end() const { + return this->exact().end_impl(); + } + void operator++() { + return this->exact().inc_impl(); + } + protected: + iter() {} + Point_type(E) p_; + }; + +} // end of namespace abstract + + + +// iter2d + + +struct iter2d; + +template <> +struct props <iter2d> : public default_props<dim2d> +{ + typedef dim2d dim_type; +}; + +struct iter2d : public abstract::iter< iter2d > +{ + iter2d() {} + + iter2d(const image2d_size& size) : + size(size) + {} + void begin_impl() { + p_.row() = p_.col() = 0; + } + bool end() const { + return p_.row() == size.nrows(); + } + + // IDEA: T::op= calls ::assign_impl(T,Trhs) and T::op=(Trhs) is renammed assign + + void inc_impl() { + ++p_.col(); + if (p_.col() == size.ncols()) + { + p_.col() = 0; + ++p_.row(); + } + } +protected: + image2d_size size; +}; + + + + +#endif // ndef PROTO_ITER_HH Index: prop_heredity/src/props.hh --- prop_heredity/src/props.hh (revision 0) +++ prop_heredity/src/props.hh (revision 0) @@ -0,0 +1,37 @@ +#ifndef PROTO_PROPS_HH +# define PROTO_PROPS_HH + + +template <typename E> +struct props; + + +# define Dim_type(E) typename props<E>::dim_type +# define Point_type(E) typename props<E>::point_type +# define Image_size_type(E) typename props<E>::image_size_type +# define Iter_type(E) typename props<E>::iter_type +# define Value_type(E) typename props<E>::value_type + + +template <class Dim> +struct default_props +{ + typedef Dim dim_type; + typedef Point_type(Dim) point_type; + typedef Image_size_type(Dim) image_size_type; + typedef Iter_type(Dim) iter_type; +}; + + +template <class Image> +struct default_props__Image +{ + typedef Dim_type(Image) dim_type; + typedef Point_type(Image) point_type; + typedef Image_size_type(Image) image_size_type; + typedef Iter_type(Image) iter_type; + typedef Value_type(Image) value_type; +}; + + +#endif // ndef PROTO_PROPS_HH Index: prop_heredity/src/any.hh --- prop_heredity/src/any.hh (revision 0) +++ prop_heredity/src/any.hh (revision 0) @@ -0,0 +1,115 @@ +#ifndef PROTO_ANY_HH +# define PROTO_ANY_HH + + +# include <assert.h> + +// abrev +#define any_mem(E) any <E, dispatch_policy::best_memory> + + +// exact stuff + +template <typename T> struct exact_type; + +# define Exact_type(T) typename exact_type<T>::ret + +// 'any' classes + +namespace mlc +{ + + struct dispatch_policy + { + struct best_speed; + struct best_memory; + struct compromise; + }; + + + // any + + template <typename E, + typename Dispatch_Policy = dispatch_policy::best_memory> + struct any; + + + // "best speed" version of 'any' + + template <typename E> + struct any <E, + dispatch_policy::best_speed> + { + E& exact() { + assert(this_ != 0); + return *this_; + } + const E& exact() const { + assert(this_ != 0); + return *this_; + } + E* this_; + protected: + any() : this_(0) {} + virtual ~any() {} + }; + + template <typename E> + struct any__best_speed : public any<E, dispatch_policy::best_speed> + {}; + + template <typename E> + inline void + set_this(E* this_) + { + this_->this_ = this_; + } + + template <typename E> + inline void + set_this(any<E, dispatch_policy::best_memory>* this_) + {} + + // "best memory" version of 'any' + + template <typename E> + struct any <E, + dispatch_policy::best_memory> + { + E& exact() { + return *(E*)((char*)this - exact_offset); + } + const E& exact() const { + return *(const E*)((const char*)this - exact_offset); + } + + static const int exact_offset; + static const E exact_obj; + static const any_mem(E)& ref_exact_obj; + + protected: + virtual ~any() {} + }; + + template <typename E> + struct any__best_memory : public any<E, dispatch_policy::best_memory> + {}; + + template <typename E> const E any_mem(E)::exact_obj = E(); + template <typename E> const any_mem(E)& any_mem(E)::ref_exact_obj = any_mem(E)::exact_obj; + template <typename E> const int any_mem(E)::exact_offset = + (const char*)(&any_mem(E)::ref_exact_obj) + - (const char*)(&any_mem(E)::exact_obj); + + + // "compromise" version of 'any' + + template <typename E> + struct any <E, + dispatch_policy::compromise>; // FIXME: not yet impled + + +} // end of namespace mlc + + +#endif // ndef PROTO_ANY_HH Index: prop_heredity/src/dim.hh --- prop_heredity/src/dim.hh (revision 0) +++ prop_heredity/src/dim.hh (revision 0) @@ -0,0 +1,20 @@ +#ifndef PROTO_DIM_HH +# define PROTO_DIM_HH + +# include "any.hh" +# include "props.hh" + + +namespace abstract { + + template <typename E> + struct dim : public mlc::any__best_memory<E> + { + protected: + dim() {} + }; + +} // end of namespace abstract + + +#endif // ndef PROTO_DIM_HH Index: prop_heredity/src/point.hh --- prop_heredity/src/point.hh (revision 0) +++ prop_heredity/src/point.hh (revision 0) @@ -0,0 +1,68 @@ +#ifndef PROTO_POINT_HH +# define PROTO_POINT_HH + +# include "dim2d.hh" + + +typedef int coord_t; + +//Define_exact_type_2(abstract, point); + +namespace abstract { + + template <typename E> + struct point : public mlc::any__best_memory<E> + { + bool operator==(const point& rhs) const { + return this->exact().opeq_impl(rhs.exact()); + } + protected: + point() {} + }; + +} // end of namespace abstract + + + +// point2d + + +struct point2d; + +template <> +struct props <point2d> +{ + typedef dim2d dim_type; +}; + +struct point2d : public abstract::point< point2d > +{ + point2d() : + row_(0), + col_(0) + {} + point2d(coord_t row_, coord_t col_) : + row_(row_), + col_(col_) + {} + bool opeq_impl(const point2d& rhs) const { + return row_ == rhs.row_ && col_ == rhs.col_; + } + const coord_t row() const { return row_; } + const coord_t col() const { return col_; } + coord_t& row() { return row_; } + coord_t& col() { return col_; } + + // FIXME: + point2d operator+(const point2d& rhs) const { + point2d tmp(row_ + rhs.row_, col_ + rhs.col_); + return tmp; + } +protected: + coord_t row_, col_; +}; + + + + +#endif // ndef PROTO_POINT_HH Index: prop_heredity/src/main.cc --- prop_heredity/src/main.cc (revision 0) +++ prop_heredity/src/main.cc (revision 0) @@ -0,0 +1,63 @@ +#include <iostream> + +#include "mlc.hh" +#include "image.hh" +#include "iter.hh" +#include "morpher.hh" + + + +template <typename I> +std::ostream& operator<<(std::ostream& ostr, + const abstract::image& input) +{ + Iter_type(I) p(input.size()); + for_all(p) + ostr << input[p] << ' '; + return ostr; +} + + +// IDEA: split overloaded versions and a single facade that forces args downcast +// rationale: the client should *not* have to downcast args + + +template <typename I> +void foo_overloaded(abstract::binary_image& input) +{ + Iter_type(I) p(input.size()); + for_all(p) + std::cout << input[p] << '*'; + std::cout << std::endl; +} + + +template <typename I> +void foo_overloaded(abstract::image2d& input) +{ + Value_type(I) i = 0; + + for (int row = 0; row < input.nrows(); ++row) + for (int col = 0; col < input.ncols(); ++col) + input(row, col) = i++; +} + + +template <typename I> +void foo(abstract::image& input) +{ + foo_overloaded(input.exact()); +} + + + +int main() +{ + image2d<unsigned> ima(4, 4); + foo(ima); + std::cout << ima << std::endl; + + image_piece< image2d<unsigned> > pima = piece(ima, point2d(1,1), image2d_size(2,2)); + foo(pima); + std::cout << ima << std::endl; +} Index: prop_heredity/src/size.hh --- prop_heredity/src/size.hh (revision 0) +++ prop_heredity/src/size.hh (revision 0) @@ -0,0 +1,57 @@ +#ifndef PROTO_SIZE_HH +# define PROTO_SIZE_HH + +# include "any.hh" +# include "props.hh" +# include "dim2d.hh" + + +typedef int coord_t; + +namespace abstract { + + template <typename E> + struct image_size : public mlc::any__best_memory<E> + { + bool operator==(const image_size& rhs) const { + return this->exact().opeq_impl(rhs.exact()); + } + protected: + image_size() {} + }; + +} // end of namespace abstract + + + +// image2d_size + + +struct image2d_size; + +template <> +struct props <image2d_size> : public default_props<dim2d> +{ +}; + +struct image2d_size : public abstract::image_size< image2d_size > +{ + image2d_size() {} + + image2d_size(coord_t nrows_, coord_t ncols_) : + nrows_(nrows_), + ncols_(ncols_) + {} + bool opeq_impl(const image2d_size& rhs) const { + return nrows_ == rhs.nrows_ && ncols_ == rhs.ncols_; + } + const coord_t nrows() const { return nrows_; } + const coord_t ncols() const { return ncols_; } + coord_t& nrows() { return nrows_; } + coord_t& ncols() { return ncols_; } +protected: + coord_t nrows_, ncols_; +}; + + +#endif // ndef PROTO_SIZE_HH Index: prop_heredity/src/mlc.hh --- prop_heredity/src/mlc.hh (revision 0) +++ prop_heredity/src/mlc.hh (revision 0) @@ -0,0 +1,28 @@ +#ifndef PROTO_MLC_HH +# define PROTO_MLC_HH + +# include <vector> +# include "props.hh" + + +enum { scalar_tag, binary_tag, vector_tag, label_tag }; + +struct label_type +{ + int i; + label_type() : i(0) {} + label_type(int i) : i(i) {} + operator int() const { return i; } + void operator=(int i) { this->i = i; } +}; + + +template <> struct props <unsigned> { enum { tag_value = scalar_tag }; }; +template <> struct props <bool> { enum { tag_value = binary_tag }; }; +template <> struct props <label_type> { enum { tag_value = label_tag }; }; +template <typename T> struct props < std::vector<T> > { enum { tag_value = vector_tag }; }; + +# define Tag_value(T) props<T>::tag_value + + +#endif // ndef PROTO_MLC_HH Index: prop_heredity/src/Makefile.am --- prop_heredity/src/Makefile.am (revision 0) +++ prop_heredity/src/Makefile.am (revision 0) @@ -0,0 +1,13 @@ +bin_PROGRAMS = proto +proto_SOURCES = \ +any.hh \ +dim.hh \ +dim2d.hh \ +image.hh \ +iter.hh \ +main.cc \ +mlc.hh \ +morpher.hh \ +point.hh \ +props.hh \ +size.hh Index: prop_heredity/src/morpher.hh --- prop_heredity/src/morpher.hh (revision 0) +++ prop_heredity/src/morpher.hh (revision 0) @@ -0,0 +1,63 @@ +#ifndef PROTO_MORPHER_HH +# define PROTO_MORPHER_HH + +# include "image.hh" + + +template <typename I> struct image_piece; + + +template <typename I> +struct props < image_piece > : public default_props__Image +{ +}; + + +template <typename I> +struct image_piece : public abstract::image_entry< image_piece > +{ + typedef image_piece E; + + image_piece(abstract::image& ref_, + Point_type(I) point_, + Image_size_type(I) size_) : + ref_(ref_.exact()), + point_(point_), + size_(size_) + {} + + Image_size_type(E) size_impl() const { + return size_; + } + + const Value_type(E) opsqbr_impl(const Point_type(E)& p) const { +// assert(this->hold(p)); + return ref_[point_ + p]; + } + Value_type(E)& opsqbr_impl(const Point_type(E)& p) { +// assert(this->hold(p)); + return ref_[point_ + p]; + } + + bool hold_impl(const Point_type(E)& p) const { + return true; // FIXME + } + + I& ref_; + Point_type(E) point_; + Image_size_type(E) size_; +}; + + +template <typename I> +image_piece piece(abstract::image& ref_, + Point_type(I) point_, + Image_size_type(I) size_) +{ + image_piece tmp(ref_, point_, size_); + return tmp; +} + + + +#endif // ndef PROTO_MORPHER_HH Index: prop_heredity/src/dim2d.hh --- prop_heredity/src/dim2d.hh (revision 0) +++ prop_heredity/src/dim2d.hh (revision 0) @@ -0,0 +1,32 @@ +#ifndef PROTO_DIM2D_HH +# define PROTO_DIM2D_HH + +# include "dim.hh" + + +// fwd decls: +struct dim2d; +struct point2d; +struct iter2d; +struct image2d_size; +// FIXME: to be continued + + + +template <> +struct props <dim2d> { + enum { dim_value = 2 }; + typedef dim2d dim_type; + + typedef point2d point_type; + typedef image2d_size image_size_type; + typedef iter2d iter_type; + // FIXME: to be continued +}; + +struct dim2d : public abstract::dim< dim2d > +{ +}; + + +#endif // ndef PROTO_DIM2D_HH Index: prop_heredity/Makefile.am --- prop_heredity/Makefile.am (revision 0) +++ prop_heredity/Makefile.am (revision 0) @@ -0,0 +1 @@ +SUBDIRS = src -- Simon Odou simon(a)lrde.epita.fr

20 years, 5 months

oln 10.203: Fix readme generation

by Giovanni Palma

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * dev/build.texi: Use @item in doc. Index: doc/dev/build.texi --- doc/dev/build.texi Wed, 12 May 2004 11:18:13 +0200 reda (oln/p/42_build.texi 1.14 640) +++ doc/dev/build.texi Fri, 09 Jul 2004 15:33:01 +0200 palma_g (oln/p/42_build.texi 1.14 640) @@ -259,7 +259,7 @@ Olena has been tested on the following configurations : @multitable @columnfractions .33 .66 -@headitem System @tab Compiler +@item System @tab Compiler @item Linux @tab g++ 3.0, 3.1, 3.2 and 3.3 @item Linux @tab icc (Intel's C++ Compiler) v7 @item MacOS X @tab g++ 3.1 @@ -288,7 +288,7 @@ @command{make check}. The tests have been run on a Bi-Xeon 2.4Ghz machine. @multitable @columnfractions .5 .5 -@headitem Compiler @tab Time +@item Compiler @tab Time @item g++-3.0 @tab 23m20s @item g++-3.2 @tab 20m03s @item icc-7 @tab 12m52s @@ -298,7 +298,7 @@ just show the runtime benchmarks for the @file{extrkiller} test: @multitable @columnfractions .25 .5 .25 -@headitem Compiler @tab Options @tab Time +@item Compiler @tab Options @tab Time @item g++-3.0 @tab @option{-O3 -finline-limit-1500} @tab 2m08s @item g++-3.2 @tab @option{-O3 -finline-limit-1500} @tab 1m50s @item icc-7 @tab @option{-O3} @tab 5m41s -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 5 months

oln 10.201: Fix flags.

by Giovanni Palma

Index: tools/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * utilities/convert/Makefile.am: Correct flags. Index: tools/utilities/convert/Makefile.am --- tools/utilities/convert/Makefile.am Mon, 28 Jun 2004 15:53:02 +0200 thivol_d (oln/v/10_Makefile.a 1.2 600) +++ tools/utilities/convert/Makefile.am Tue, 29 Jun 2004 10:46:02 +0200 palma_g (oln/v/10_Makefile.a 1.2 600) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -lz +AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) $(ZLIB_LDFLAGS) INCLUDES = -I$(srcdir)/../../lib LDADD = ../../lib/libolntools.a bin_PROGRAMS = color_space -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches July 2004