March 2004 - Olena-patches

olena 10.118: iter morpher
by Simon Odou 29 Mar '04

29 Mar '04

Index: olena/ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * oln/morpher/iter_morpher.hh: To have a specific default iterator. Index: olena/oln/morpher/iter_morpher.hh --- olena/oln/morpher/iter_morpher.hh Mon, 29 Mar 2004 09:31:08 +0200 odou_s () +++ olena/oln/morpher/iter_morpher.hh Mon, 29 Mar 2004 06:15:32 +0200 odou_s (oln/m/41_iter_morph 644) @@ -0,0 +1,196 @@ +// 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. + +#ifndef ITER_MORPHER_HH +# define ITER_MORPHER_HH + +# include <oln/morpher/generic_morpher.hh> + +namespace oln { + + namespace morpher { + + template <class SrcType, class IterType, class Exact = mlc::final> + struct iter_morpher; + + } // end of namespace morpher + + /// Inherits identification's informations about the iter morpher. + template <class SrcType, class IterType, class Exact> + struct image_id< morpher::iter_morpher<SrcType, IterType, Exact> > : public image_id<SrcType> + {}; + + /// Inherits identification's informations about the const iter morpher. + template <class SrcType, class IterType, class Exact> + struct image_id< morpher::iter_morpher<const SrcType, IterType, Exact> > : public image_id<SrcType> + {}; + + /// Traits for iter morpher. + template <class SrcType, class IterType> + struct image_traits < morpher::iter_morpher<SrcType, IterType> > : + public image_traits<abstract::image_with_impl<oln_impl_type(SrcType), + morpher::iter_morpher<SrcType, IterType> > > + { + typedef IterType iter_type; + }; + + /// Traits for const iter morpher. + template <class SrcType, class IterType> + struct image_traits < morpher::iter_morpher<const SrcType, IterType> > : + public image_traits<abstract::image_with_impl<oln_impl_type(SrcType), + morpher::iter_morpher<const SrcType, IterType> > > + { + typedef IterType iter_type; + }; + + namespace morpher { + + template <class SrcType, class IterType, class Exact> + struct iter_morpher + : public abstract::generic_morpher< SrcType, SrcType, iter_morpher<SrcType, IterType, Exact> > + { + /// The type of the object instantiated. iter morpher can be derived. + typedef typename image_id< iter_morpher<SrcType, IterType, Exact> >::exact_type exact_type; + typedef iter_morpher<SrcType, IterType, Exact> self_type; + typedef IterType iter_type; + typedef abstract::generic_morpher< SrcType, SrcType, iter_morpher<SrcType, IterType, Exact> > super_type; + + /// Construct the iter morpher with an image \a ima. + iter_morpher(const SrcType &ima) + : super_type(ima) + {} + + /// Construct the iter morpher with another iter morpher. + iter_morpher(const self_type& r) + : super_type(r.get_ima()) + {} + + /*! + ** \brief Empty constructor. + ** + ** Needed by mlc_hierarchy::any_with_diamond. + */ + iter_morpher() {} + + /*! Perform a shallow copy from the decorated image of \a rhs + ** to the current decorated image. The points will be shared + ** by the two images. + */ + self_type& + assign(self_type& rhs) + { + oln_iter_type(SrcType) it(rhs); + + for_all(it) + this->at(it) = rhs[it]; + return this->exact(); + } + + /// Useful to debug. + static std::string name() + { + return "iter_morpher<" + super_type::name() + ">"; + } + + }; + + /// The specialized version for `const' declared images. + template <class SrcType, class IterType, class Exact> + struct iter_morpher<const SrcType, IterType, Exact> + : public abstract::generic_morpher< SrcType, SrcType, iter_morpher<const SrcType, IterType, Exact> > + { + /// The type of the object instantiated. iter morpher can be derived. + typedef typename image_id< iter_morpher<SrcType, IterType, Exact> >::exact_type exact_type; + typedef iter_morpher<const SrcType, IterType, Exact> self_type; + typedef IterType iter_type; + typedef abstract::generic_morpher<SrcType, SrcType, iter_morpher<const SrcType, IterType, Exact> > super_type; + + /// Construct the iter morpher with an image \a ima. + iter_morpher(const SrcType &ima) + : super_type(ima) + {} + + /// Construct the iter morpher with another iter morpher. + iter_morpher(const iter_morpher<const SrcType, IterType>& r) + : super_type(r.get_ima()) {} + + /*! + ** \brief Empty constructor. + ** + ** Needed by mlc_hierarchy::any_with_diamond. + */ + iter_morpher() + {} + + /// Useful to debug. + static std::string name() + { + return "iter_morpher<" + super_type::name() + ">"; + } + + }; + + /*! + ** \brief Instantiate a temporary read-only iter morpher. + ** + ** The image will be viewed according to its iterator type. + ** For example, the foo function will print the size of the picture + ** (the bkd_iter_type is used transparently). + ** + ** \code + ** #include <oln/morpher/iter_morpher.hh> + ** #include <oln/basics2d.hh> + ** #include <ntg/all.hh> + ** template <class E> + ** void foo(const oln::abstract::image<E>& img) + ** { + ** oln_iter_type(oln::abstract::image<E>) it(img); + ** for_all(it) + ** { + ** std::cout << it.row() << " " << it.col() << std::endl; + ** break; + ** } + ** } + ** int main() + ** { + ** const oln::image2d<ntg::rgb_8> imc = oln::load(IMG_IN "lena.ppm"); + ** assert(imc.has_impl()); + ** foo(oln::morpher::iter_morph<oln_bkd_iter_type_(oln::image2d<ntg::rgb_8>)>(imc)); + ** } + ** \endcode + */ + template <class IterType, class I> + const iter_morpher<I, IterType> iter_morph(I &ima) + { + return iter_morpher<I, IterType>(ima); + } + + } // End of namespace morpher. + +} // End of namespace oln. + +#endif // !ITER_MORPHER -- Simon Odou simon(a)lrde.epita.fr

2 1

olena 10.117: piece morpher
by Simon Odou 29 Mar '04

29 Mar '04

Index: olena/ChangeLog from Simon Odou <simon(a)lrde.epita.fr> * oln/morpher/piece_morpher.hh: To use a piece of image like a real one. * oln/core/abstract/image_with_impl.hh: * oln/core/point2d.hh: Able to construct a point2d from a point1d. * oln/core/point2d.hxx: Likewise. * oln/core/point3d.hh: Able to construct a point3d from a point2d. * oln/core/point3d.hxx: Likewise. * oln/core/abstract/image_with_dim.hh: Fix a bug. * oln/core/abstract/image_with_impl.hh: Fix (same). Index: olena/oln/core/point2d.hh --- olena/oln/core/point2d.hh Fri, 12 Mar 2004 20:17:58 +0100 thivol_d (oln/c/30_point2d.hh 1.13 600) +++ olena/oln/core/point2d.hh Mon, 29 Mar 2004 05:38:52 +0200 odou_s (oln/c/30_point2d.hh 1.13 600) @@ -75,6 +75,10 @@ point2d(coord row, coord col); + /// The coordinates of the point2d are set to \a p and \a col. + + point2d(const point1d& p, coord col); + /// Return Give the value of the point2d row coordinate. coord Index: olena/oln/core/point2d.hxx --- olena/oln/core/point2d.hxx Mon, 19 Jan 2004 18:35:23 +0100 astrid (oln/c/29_point2d.hx 1.6 640) +++ olena/oln/core/point2d.hxx Mon, 29 Mar 2004 05:39:17 +0200 odou_s (oln/c/29_point2d.hx 1.6 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 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 @@ -48,6 +48,13 @@ nth(1) = col; } + inline + point2d::point2d(const point1d& p, coord row) + { + nth(0) = row; + nth(1) = p.col(); + } + inline coord point2d::row() const { Index: olena/oln/core/point3d.hh --- olena/oln/core/point3d.hh Fri, 12 Mar 2004 20:17:58 +0100 thivol_d (oln/c/28_point3d.hh 1.15 600) +++ olena/oln/core/point3d.hh Mon, 29 Mar 2004 05:40:21 +0200 odou_s (oln/c/28_point3d.hh 1.15 600) @@ -80,6 +80,10 @@ point3d(coord slice, coord row, coord col); + /// The coordinates of the point3d are set to \a p, and \a slice. + + point3d(const point2d& p, coord slice); + /// Return the value of the point3d slice coordinate. coord Index: olena/oln/core/point3d.hxx --- olena/oln/core/point3d.hxx Mon, 28 Jul 2003 14:14:03 +0200 david (oln/c/27_point3d.hx 1.5 640) +++ olena/oln/core/point3d.hxx Mon, 29 Mar 2004 05:39:24 +0200 odou_s (oln/c/27_point3d.hx 1.5 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 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 @@ -51,6 +51,14 @@ nth(2) = col; } + inline + point3d::point3d(const point2d& p, coord slice) + { + nth(0) = slice; + nth(1) = p.row(); + nth(2) = p.col(); + } + inline coord point3d::slice() const { Index: olena/oln/core/abstract/image_with_dim.hh --- olena/oln/core/abstract/image_with_dim.hh Sun, 14 Mar 2004 19:03:34 +0100 van-vl_n (oln/t/26_image_with 1.21 600) +++ olena/oln/core/abstract/image_with_dim.hh Mon, 29 Mar 2004 00:47:04 +0200 odou_s (oln/t/26_image_with 1.21 600) @@ -325,7 +325,7 @@ coord nrows() const { - return this->size().nrows(); + return this->exact().size().nrows(); } @@ -334,7 +334,7 @@ coord ncols() const { - return this->size().ncols(); + return this->exact().size().ncols(); } /*! \brief Return the value stored at \a row, \a col Index: olena/oln/core/abstract/image_with_impl.hh --- olena/oln/core/abstract/image_with_impl.hh Fri, 26 Mar 2004 12:53:24 +0100 thivol_d (oln/t/27_image_with 1.14.1.10 640) +++ olena/oln/core/abstract/image_with_impl.hh Mon, 29 Mar 2004 00:51:00 +0200 odou_s (oln/t/27_image_with 1.14.1.10 640) @@ -145,6 +145,17 @@ return impl_; } + /*! + ** \brief Get the size of the image. + ** \return The size. + */ + const size_type& + size() const + { + assertion(has_impl()); + return this->exact().impl()->size(); + } + /// Return the core data of the image. impl_type* Index: olena/oln/morpher/piece_morpher.hh --- olena/oln/morpher/piece_morpher.hh Mon, 29 Mar 2004 09:25:14 +0200 odou_s () +++ olena/oln/morpher/piece_morpher.hh Mon, 29 Mar 2004 09:15:56 +0200 odou_s (oln/m/40_piece_morp 644) @@ -0,0 +1,314 @@ +// 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. + +#ifndef PIECE_MORPHER_HH +# define PIECE_MORPHER_HH + +# include <oln/morpher/generic_morpher.hh> + +namespace oln { + + namespace morpher { + + template <class I, class Exact = mlc::final> + struct piece_morpher; + + } // end of namespace morpher + + /// Inherits identification's informations about the piece morpher. + template <class I, class Exact> + struct image_id< morpher::piece_morpher<I, Exact> > : public image_id + {}; + + /// Inherits identification's informations about the const piece morpher. + template <class I, class Exact> + struct image_id< morpher::piece_morpher<const I, Exact> > : public image_id + {}; + + /// Traits for piece morpher. + template <class I> + struct image_traits < morpher::piece_morpher > : + public image_traits<abstract::image_with_impl<oln_impl_type(I), + morpher::piece_morpher > > + {}; + + /// Traits for const piece morpher. + template <class I> + struct image_traits < morpher::piece_morpher<const I> > : + public image_traits<abstract::image_with_impl<oln_impl_type(I), + morpher::piece_morpher<const I> > > + {}; + + + namespace morpher { + + /// Abstract piece morpher class used for code factorization. + template <class SrcType, class Exact> + class super_piece_morpher : public abstract::generic_morpher<SrcType, SrcType, Exact> + { + public: + + typedef abstract::generic_morpher<SrcType, SrcType, Exact> super_type; + typedef oln_dpoint_type(SrcType) dpoint_type; + typedef oln_size_type(SrcType) size_type; + + protected: + + /*! + ** \brief Default constructor. + ** \arg ima will be the image. + ** \arg p The reference point. + ** \arg s The size of the piece of image. + ** + ** One can not use this constructor to instantiate this class + ** since it is protected. + */ + super_piece_morpher(const SrcType &ima, const dpoint_type& p, + const size_type& s) + : super_type(ima), size_(s), p_(p) + {} + + const size_type size_; ///< The size of the piece of picture. + const dpoint_type p_; ///< The reference point of the piece of picture. + + /*! + ** \brief Empty constructor. + ** + ** Needed by mlc_hierarchy::any_with_diamond. + */ + super_piece_morpher() : size_(size_) {} + + public: + + /// Return the size (different from the original picture). + const size_type size() const + { + return size_; + } + + /// Return the reference point. + const dpoint_type ref_point() const + { + return p_; + } + + /// Useful to debug. + static std::string name() + { + return "super_piece_morpher<" + super_type::name() + ">"; + } + + }; + + /*! + ** \brief The default piece morpher class. + ** + ** Using this class, a piece of picture is a picture. + ** + ** \see oln::morpher::abstract::generic_morpher + ** \see oln::morpher::piece_morph + */ + template <class SrcType, class Exact> + struct piece_morpher + : public super_piece_morpher<SrcType, piece_morpher<SrcType, Exact> > + { + /// The type of the object instantiated. piece morpher can be derived. + typedef typename image_id<piece_morpher<SrcType, Exact> >::exact_type exact_type; + typedef piece_morpher<SrcType, Exact> self_type; + typedef super_piece_morpher<SrcType, piece_morpher<SrcType, Exact> > super_type; + + typedef oln_point_type(SrcType) point_type; + typedef oln_dpoint_type(SrcType) dpoint_type; + typedef oln_size_type(SrcType) size_type; + typedef oln_value_type(SrcType) value_type; + + /// Construct the piece morpher with an image \a ima. + piece_morpher(const SrcType &ima, const dpoint_type p, + const size_type s) + : super_type(ima, p, s) + {} + + /// Construct the piece morpher with another piece morpher. + piece_morpher(const self_type& r) + : super_type(r.get_ima(), r.ref_point(), r.size()) + {} + + /*! + ** \brief Empty constructor. + ** + ** Needed by mlc_hierarchy::any_with_diamond. + */ + piece_morpher() + {} + + /*! + ** \brief Return the stored value at the point. + ** \arg p The point. + ** \return The stored value. + */ + value_type& at(const point_type& p) + { + return const_cast<value_type &>(this->ima_)[p + p_]; + } + + /*! + ** \brief Return the stored value at the point. + ** \arg p The point. + ** \return The stored value. + */ + const value_type at(const point_type& p) const + { + return this->ima_[p + p_]; + } + + /*! Perform a shallow copy from the decorated image of \a rhs + ** to the current decorated image. The points will be shared + ** by the two images. + */ + self_type& + assign(self_type& rhs) + { + oln_iter_type(SrcType) it(rhs); + + for_all(it) + this->at(it) = rhs[it]; + return this->exact(); + } + + /*! + ** \brief This operator= assigns rhs to the current image. + */ + self_type& + operator=(SrcType& rhs) + { + return this->exact().assign(rhs); + } + + /// Useful to debug. + static std::string name() + { + return "piece_morpher<" + super_type::name() + ">"; + } + + }; + + /// The specialized version for `const' declared images. + template <class SrcType, class Exact> + struct piece_morpher<const SrcType, Exact> + : public super_piece_morpher< SrcType, piece_morpher<const SrcType, Exact> > + { + /// The type of the object instantiated. piece morpher can be derived. + typedef typename image_id<piece_morpher<SrcType, Exact> >::exact_type exact_type; + typedef piece_morpher<const SrcType, Exact> self_type; + typedef super_piece_morpher<SrcType, piece_morpher<const SrcType, Exact> > super_type; + + typedef oln_point_type(SrcType) point_type; + typedef oln_dpoint_type(SrcType) dpoint_type; + typedef oln_size_type(SrcType) size_type; + typedef oln_value_type(SrcType) value_type; + + /*! + ** \brief Construct a piece morpher. + ** \arg ima The image. + ** \arg p The reference point. + ** \arg s The size. + */ + piece_morpher(const SrcType &ima, const dpoint_type p, + const size_type s) + : super_type(ima, p, s) + {} + + /// Construct a piece morpher from another one. + piece_morpher(const self_type& r) + : super_type(r.get_ima(), r.ref_point(), r.size()) + {} + + /*! + ** \brief Empty constructor. + ** + ** Needed by mlc_hierarchy::any_with_diamond. + */ + piece_morpher() {} + + /*! + ** \brief Return the stored value at the point. + ** \arg p The point. + ** \return The stored value. + */ + const value_type at(const point_type &p) const + { + return this->ima_[p + p_]; + } + + /// Useful to debug. + static std::string name() + { + return "piece_morpher<" + super_type::name() + ">"; + } + + }; + + + /*! + ** \brief Instantiate a temporary read-only piece morpher. + ** \arg ima The image. + ** \arg p The reference's point. + ** \arg s The size of the window. + ** + ** A piece of the image will be viewed. + ** + ** \code + ** #include <oln/morpher/piece_morpher.hh> + ** #include <oln/basics2d.hh> + ** #include <ntg/all.hh> + ** int main() + ** { + ** oln::image2d<ntg::rgb_8> imc = oln::load(IMG_IN "lena.ppm"); + ** oln::save(oln::morpher::piece_morph(imc, + ** oln::dpoint2d(246, 244), + ** oln::image2d_size(30, 60, imc.border())), + ** IMG_OUT "oln_morpher_piece_morpher.pgm"); + ** } + ** \endcode + ** \image html lena_ppm.png + ** \image latex lena_ppm.png + ** => + ** \image html oln_morpher_piece_morpher.png + ** \image latex oln_morpher_piece_morpher.png + */ + template <class I, class PointType, class SizeType> + const piece_morpher piece_morph(I &ima, const PointType p, const SizeType s) + { + return piece_morpher(ima, p, s); + } + + + } // end namespace morpher + +} // end namespace oln + +#endif // !PIECE_MORPHER -- Simon Odou simon(a)lrde.epita.fr

1 1

oln 10.116: Fix returned value.
by Niels Van Vliet 29 Mar '04

29 Mar '04

Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/topo/inter-pixel/inter-pixel.hh: Change the return type of operator[] from const & to const. * olena/oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher implementation. * olena/oln/morpher/color_morpher.hh: Add file. Color morpher implementation. Index: olena/oln/topo/inter-pixel/inter-pixel.hh --- olena/oln/topo/inter-pixel/inter-pixel.hh Mon, 15 Mar 2004 15:32:27 +0100 van-vl_n (oln/r/34_inter-pixe 1.15 600) +++ olena/oln/topo/inter-pixel/inter-pixel.hh Sun, 28 Mar 2004 18:07:10 +0200 van-vl_n (oln/r/34_inter-pixe 1.15 600) @@ -106,7 +106,7 @@ } /// \todo FIXME: add doc. - const node_type& + const node_type operator[](const point_type & p) const { return data_[p];

1 0

oln 10.114: (Try to) fix make check.
by Niels Van Vliet 27 Mar '04

27 Mar '04

I uncommented some lines in attributes.hh. Why were they commented? olena/tests/convol does not pass make check (due to errors in the gaussian). Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/utils/histogram.hh: Change the return type of `at' method to const value_type. * olena/oln/morpho/attributes.hh: Uncomment some lines. * olena/oln/convol/nagao.hh: Correct comments. * olena/oln/convol/nagao.hxx: Likewise. * olena/oln/utils/se_stat.hh: Likewise. * olena/oln/utils/se_stat.hxx: Likewise. Index: olena/oln/utils/histogram.hh --- olena/oln/utils/histogram.hh Fri, 19 Mar 2004 11:53:50 +0100 van-vl_n (oln/10_histogram. 1.6.1.14.1.11 640) +++ olena/oln/utils/histogram.hh Sat, 27 Mar 2004 15:51:26 +0100 van-vl_n (oln/10_histogram. 1.6.1.14.1.11 640) @@ -122,7 +122,7 @@ this->exact().clear_impl(); } /// Read the number of occurrence of \a v. - const cpt_type& + const cpt_type operator[](const value_type &v)const { return this->exact().at(v); @@ -256,7 +256,7 @@ } /// operator[] should be called. - const cpt_type& + const cpt_type at(const T &v)const { return img_[v2p_(v)]; @@ -404,7 +404,7 @@ min_(ntg_min_val(value_type)), max_(ntg_max_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { adjust(i); @@ -503,7 +503,7 @@ upper_type(input, v2p), min_(ntg_min_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { return img_[v2p_(i)]; @@ -594,7 +594,7 @@ upper_type(input, v2p),max_(ntg_max_val(value_type)) {} /// operator[] should be called. - const cpt_type& + const cpt_type at(const value_type& i) const { return img_[v2p_(i)]; Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Thu, 25 Mar 2004 15:00:37 +0100 palma_g (oln/j/45_attributes 1.10 644) +++ olena/oln/morpho/attributes.hh Sat, 27 Mar 2004 15:51:59 +0100 van-vl_n (oln/j/45_attributes 1.10 644) @@ -1213,11 +1213,11 @@ ** ** \arg p Point to consider in the image. */ - dist_type(//const im_type&, + dist_type(const im_type&, const point_type &p, - const env_type &) //: - // value_(ntg_zero_val(value_type)), - //center_(p) + const env_type &): + value_(ntg_zero_val(value_type)), + center_(p) { }; Index: olena/oln/convol/nagao.hh --- olena/oln/convol/nagao.hh Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/22_nagao.hh 1.1 600) +++ olena/oln/convol/nagao.hh Sat, 27 Mar 2004 15:48:41 +0100 van-vl_n (oln/m/22_nagao.hh 1.1 600) @@ -127,7 +127,7 @@ /*! A Nagao filter generalized. ** - ** Each point in the input correspond to the mean of the + ** Each point in the input corresponds to the mean of the ** window in which has the smallest variance. ** ** \paran in Input image. Index: olena/oln/utils/se_stat.hh --- olena/oln/utils/se_stat.hh Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/23_se_stat.hh 1.1 644) +++ olena/oln/utils/se_stat.hh Sat, 27 Mar 2004 15:50:13 +0100 van-vl_n (oln/m/23_se_stat.hh 1.1 644) @@ -96,16 +96,16 @@ ** \param Sum type used to compute the sum and the average. ** \param Var type used to compute the variance. ** - ** \note There is two parameters because for vectorial types the sum + ** \note There are two parameters because for vectorial types the sum ** is usually a vector, and the variance a non vectorial type. */ template <typename Sum = ntg::float_s, typename Var = ntg::float_s> class se_stat { public: - /// type of used to sum the value (usually floating point values) + /// type of used to sum values (usually floating point values) typedef Sum sum_type; - /// type of used for the variance (usually floating point values) + /// type of the variance (usually floating point values) typedef Var variance_type; /*! Build a se stat. @@ -121,7 +121,7 @@ compute(im, p, s); } - /// Computes the mean and the variance. + /// Compute the mean and the variance. template <class I, class S> se_stat & compute(const oln::abstract::image &im, Index: olena/oln/utils/se_stat.hxx --- olena/oln/utils/se_stat.hxx Fri, 26 Mar 2004 20:56:28 +0100 van-vl_n (oln/m/24_se_stat.hx 1.1 644) +++ olena/oln/utils/se_stat.hxx Sat, 27 Mar 2004 15:50:23 +0100 van-vl_n (oln/m/24_se_stat.hx 1.1 644) @@ -32,7 +32,7 @@ namespace oln { namespace utils { - /// Computes the mean and the variance. + /// Compute the mean and the variance. template <typename Sum, typename Var> template <class I, class S> inline se_stat<Sum, Var> &

1 0

oln 10.112: Many corrections
by Damien Thivolle 26 Mar '04

26 Mar '04

Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/oln/core/abstract/image.hh: Correct macros. * olena/oln/core/abstract/image_with_impl.hh: Change the return type of `at' method to const value_type. * olena/oln/morpher/generic_morpher.hh: Correct comments. Change parameter names. Fix coding style. +2004-03-25 Damien Thivolle <damien(a)lrde.epita.fr> + + * olena/oln/core/abstract/image.hh: Change the return type of + `operator[]' method to const value_type. + Add macros for retrieving types associated to an image. * olena/oln/morpher/generic_morpher.hh: generic_morpher implementation. 2004-03-25 Giovanni Palma <giovanni(a)lrde.epita.fr> Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Thu, 25 Mar 2004 20:12:45 +0100 thivol_d (oln/t/25_image.hh 1.28 600) +++ olena/oln/core/abstract/image.hh Fri, 26 Mar 2004 12:06:45 +0100 thivol_d (oln/t/25_image.hh 1.28 600) @@ -344,9 +344,9 @@ typename mute<ImgType>::ret # define oln_exact_type(ImgType) \ -mlc_exact_type(ImgType)::exact_type +mlc_exact_type(ImgType) # define oln_exact_type_(ImgType) \ -mlc_exact_type_(ImgType)::exact_type +mlc_exact_type_(ImgType) # define oln_iter_type(Iterable) \ mlc_exact_type(Iterable)::iter_type Index: olena/oln/core/abstract/image_with_impl.hh --- olena/oln/core/abstract/image_with_impl.hh Thu, 11 Mar 2004 17:12:19 +0100 thivol_d (oln/t/27_image_with 1.14.1.9 600) +++ olena/oln/core/abstract/image_with_impl.hh Fri, 26 Mar 2004 12:00:57 +0100 thivol_d (oln/t/27_image_with 1.14.1.9 600) @@ -196,7 +196,7 @@ ** \see image::operator[]() */ - const value_type& + const value_type at(const point_type& p) const { return impl_->at(p); Index: olena/oln/morpher/generic_morpher.hh --- olena/oln/morpher/generic_morpher.hh Thu, 25 Mar 2004 20:12:45 +0100 thivol_d (oln/m/18_generic_mo 1.1 600) +++ olena/oln/morpher/generic_morpher.hh Fri, 26 Mar 2004 12:51:44 +0100 thivol_d (oln/m/18_generic_mo 1.1 600) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2003, 2004 EPITA Research and Development Laboratory +// 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 @@ -32,76 +32,66 @@ # include <string> - # include <oln/basics1d.hh> # include <oln/basics2d.hh> # include <oln/basics3d.hh> -# include <ntg/all.hh> namespace oln { - /*! \namespace morpher - ** - ** Contain all the morpher relative declarations and functions. - */ + /// Contain all the morpher relative declarations and functions. namespace morpher { - /*! \namespace abstract - ** - ** generic_morpher implementation. - */ + ///Implementation of oln::abstract::generic_morpher. namespace abstract { - /*! \class gm_inherit + /*! Traits for conditionnal inheritance used by the \a generic_morpher + ** + ** It changes the exact type of the image in the input (the exact + ** type becomes the concrete morpher). ** - ** Perform a conditionnal inheritance for the \a generic_morpher - ** class regarding its template parameters. + ** \see oln::morpher::generic_morpher */ template <class T, class Exact> struct gm_inherit; - /*! \class gm_inherit<oln::image1d<T>, Exact > - ** - ** Return \a image1d with an \a exact_type of \a Exact. - */ + /// Return \a image1d with an \a exact_type of \a Exact. template <class T, class Exact> struct gm_inherit<oln::image1d<T>, Exact > { typedef oln::image1d<T, Exact> ret; }; - /*! \class gm_inherit<oln::image1d<T>, Exact > - ** - ** Return \a image2d with an \a exact_type of \a Exact. - */ + /// Return \a image2d with an \a exact_type of \a Exact. template <class T, class Exact> struct gm_inherit<oln::image2d<T>, Exact > { typedef oln::image2d<T, Exact> ret; }; - /*! \class gm_inherit<oln::image1d<T>, Exact > - ** - ** Return \a image3d with an \a exact_type of \a Exact. - */ + /// Return \a image3d with an \a exact_type of \a Exact. template <class T, class Exact> struct gm_inherit<oln::image3d<T>, Exact > { typedef oln::image3d<T, Exact> ret; }; - /*! \class generic_morpher + /*! The Abstract morpher class. + ** + ** Define a default implementation for all the + ** dispatched methods of the image hierarchy. + ** + ** \param DestType Output type of the morpher. + ** + ** \param SrcType Input type decorated. ** - ** An abstract class from whom derive all other - ** concrete morphers. Define a default implementation - ** for all the dispatched methods of the image hierarchy. + ** \param Exact Exact type */ - template <class Inherit, class Deco, class Exact> + template <class DestType, class SrcType, class Exact> class generic_morpher : public gm_inherit< - Inherit, + DestType, Exact>::ret { protected: @@ -109,109 +99,132 @@ /*! \brief Construct an instance of generic_morpher by assigning ** \a Ima to Ima_. */ - generic_morpher(const Deco &Ima) : super_type(), Ima_(Ima) {} + generic_morpher(const SrcType &Ima) : super_type(), ima_(Ima) {} - /// Default Constructor. - generic_morpher(): Ima(Deco()) {} + /// Empty Constructor. + generic_morpher(): ima_(SrcType()) {} /// The decorated image. - const Deco &Ima_; + const SrcType &ima_; public: /// Type of the decorated image. - typedef Deco deco_type; - typedef oln_point_type(Deco) point_type; - typedef oln_dpoint_type(Deco) dpoint_type; - typedef oln_iter_type(Deco) iter_type; - typedef oln_fwd_iter_type(Deco) fwd_iter_type; - typedef oln_bkd_iter_type(Deco) bkd_iter_type; - typedef oln_value_type(Deco) value_type; - typedef oln_size_type(Deco) size_type; + typedef SrcType deco_type; + typedef oln_point_type(SrcType) point_type; + typedef oln_dpoint_type(SrcType) dpoint_type; + typedef oln_iter_type(SrcType) iter_type; + typedef oln_fwd_iter_type(SrcType) fwd_iter_type; + typedef oln_bkd_iter_type(SrcType) bkd_iter_type; + typedef oln_value_type(SrcType) value_type; + typedef oln_size_type(SrcType) size_type; /// Underlying implementation of the decorated image. - typedef oln_impl_type(Deco) impl_type; + typedef oln_impl_type(SrcType) impl_type; /// Exact type of the decorated image. - typedef oln_exact_type(Deco) image_type; + typedef SrcType image_type; - typedef typename gm_inherit<Inherit, Exact>::ret super_type; + typedef typename gm_inherit<DestType, Exact>::ret super_type; /// Return the decorated image. - const Deco& + const SrcType& get_ima() const { - return this->Ima_; + return ima_; } - /// Return the value stored at \a p in the decorated image. + /*! Default implementation of at. + ** + ** Return the value stored at \a p in the decorated image. + */ const value_type at(const point_type& p) const { - return this->Ima_.exact().at(p); + return to_exact(ima_).at(p); } - /// Return a reference to the value stored at \a p in the decorated image. + /*! Defaults implementation of at. + ** + ** Return a reference to the value stored at \a p in the decorated image. + */ value_type& at(const point_type& p) { - return this->Ima_.exact().at(p); + return to_exact(ima_).at(p); } - /// Return a pointer to the value container of the decorated image. + /// Default implementation of impl. const impl_type* impl() const { - return this->Ima_.exact().impl(); + return to_exact(ima_).impl(); } - /// Return a pointer to the value container of the decorated image. + /// Default implementation of impl. impl_type* impl() { - return this->Ima_.exact().impl(); + return to_exact(ima_).impl(); } - /// Return a copy of the decorated image. + /*! Default implementation of clone_. + ** + ** Return a copy of the decorated image. + */ image_type clone_() const { - return this->Ima_.exact().clone_(); + return to_exact(ima_).clone_(); } - /// Return the size of the decorated image. + /*! Default implementation of npoints_. + ** + ** Return the size of the decorated image. + */ size_t npoints_() { - return this->Ima_.exact().npoints_(); + return to_exact(ima_).npoints_(); } - /// Assign \a rhs to the decorated image. + /*! Default implementation of assign. + ** + ** Assign \a rhs to the decorated image. + */ image_type& assign(deco_type& rhs) { - return this->Ima_.exact().assign(rhs); + return to_exact(ima_).assign(rhs); } - /// Assign the decorated image to \a r + /*! Default implementation of operator=. + ** + ** Assign the decorated image to \a r. + */ deco_type& operator=(const oln::io::internal::anything& r) { - return r.assign(this->Ima_); + return r.assign(ima_); } - /*! \brief Set the border width of the decorated image to + /*! Default implementation of border_set_width. + ** + ** Set the border width of the decorated image to ** \a min_border. */ void border_set_width(oln::coord min_border, bool copy_border = false) const { - return this->Ima_.exact().border_set_width(min_border, copy_border); + return to_exact(ima_).border_set_width(min_border, copy_border); } - static std::string name() - { return "generic_morpher<" + super_type::name() + ">"; } + static std::string + name() + { + return "generic_morpher<" + super_type::name() + ">"; + } }; -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

3 3

oln 10.111: Adding generic_morpher
by Damien Thivolle 26 Mar '04

26 Mar '04

Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * olena/oln/core/abstract/image.hh: Add macros. * olena/oln/morpher/generic_morpher.hh: generic_morpher implementation. Index: olena/oln/core/abstract/image.hh --- olena/oln/core/abstract/image.hh Mon, 15 Mar 2004 19:40:09 +0100 odou_s (oln/t/25_image.hh 1.27 640) +++ olena/oln/core/abstract/image.hh Thu, 25 Mar 2004 20:08:16 +0100 thivol_d (oln/t/25_image.hh 1.27 640) @@ -125,7 +125,7 @@ ** at \a p in the current image. */ - const value_type& + const value_type operator[](const abstract::point<point_type>& p) const { return this->exact().at(p.exact()); @@ -343,11 +343,36 @@ # define oln_concrete_type(ImgType) \ typename mute<ImgType>::ret +# define oln_exact_type(ImgType) \ +mlc_exact_type(ImgType)::exact_type +# define oln_exact_type_(ImgType) \ +mlc_exact_type_(ImgType)::exact_type + # define oln_iter_type(Iterable) \ mlc_exact_type(Iterable)::iter_type # define oln_iter_type_(Iterable) \ mlc_exact_type_(Iterable)::iter_type +# define oln_fwd_iter_type(Fwd_Iterable) \ +mlc_exact_type(Fwd_Iterable)::fwd_iter_type +# define oln_fwd_iter_type_(Fwd_Iterable) \ +mlc_exact_type_(Fwd_Iterable) + +# define oln_bkd_iter_type(Bkd_Iterable) \ +mlc_exact_type(Bkd_Iterable)::bkd_iter_type +# define oln_bkd_iter_type_(Bkd_Iterable) \ +mlc_exact_type_(Bkd_Iterable)::bkd_iter_type + +# define oln_size_type(ImgType) \ +mlc_exact_type(ImgType)::size_type +# define oln_size_type_(ImgType) \ +mlc_exact_type_(ImgType)::size_type + +# define oln_impl_type(ImgType) \ +mlc_exact_type(ImgType)::impl_type +# define oln_impl_type_(ImgType) \ +mlc_exact_type_(ImgType)::impl_type + # define oln_point_type(Pointable) \ mlc_exact_type(Pointable)::point_type # define oln_point_type_(Pointable) \ Index: olena/oln/morpher/generic_morpher.hh --- olena/oln/morpher/generic_morpher.hh Thu, 25 Mar 2004 20:12:11 +0100 thivol_d () +++ olena/oln/morpher/generic_morpher.hh Thu, 25 Mar 2004 20:09:08 +0100 thivol_d (oln/m/18_generic_mo 644) @@ -0,0 +1,226 @@ +// Copyright (C) 2001, 2003, 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. + + + +#ifndef GENERIC_MORPHER_HH +# define GENERIC_MORPHER_HH + +# include <string> + + +# include <oln/basics1d.hh> +# include <oln/basics2d.hh> +# include <oln/basics3d.hh> +# include <ntg/all.hh> + +namespace oln { + + /*! \namespace morpher + ** + ** Contain all the morpher relative declarations and functions. + */ + + namespace morpher { + + /*! \namespace abstract + ** + ** generic_morpher implementation. + */ + + namespace abstract { + + /*! \class gm_inherit + ** + ** Perform a conditionnal inheritance for the \a generic_morpher + ** class regarding its template parameters. + */ + template <class T, class Exact> + struct gm_inherit; + + /*! \class gm_inherit<oln::image1d<T>, Exact > + ** + ** Return \a image1d with an \a exact_type of \a Exact. + */ + template <class T, class Exact> + struct gm_inherit<oln::image1d<T>, Exact > + { + typedef oln::image1d<T, Exact> ret; + }; + + /*! \class gm_inherit<oln::image1d<T>, Exact > + ** + ** Return \a image2d with an \a exact_type of \a Exact. + */ + template <class T, class Exact> + struct gm_inherit<oln::image2d<T>, Exact > + { + typedef oln::image2d<T, Exact> ret; + }; + + /*! \class gm_inherit<oln::image1d<T>, Exact > + ** + ** Return \a image3d with an \a exact_type of \a Exact. + */ + template <class T, class Exact> + struct gm_inherit<oln::image3d<T>, Exact > + { + typedef oln::image3d<T, Exact> ret; + }; + + /*! \class generic_morpher + ** + ** An abstract class from whom derive all other + ** concrete morphers. Define a default implementation + ** for all the dispatched methods of the image hierarchy. + */ + + template <class Inherit, class Deco, class Exact> + class generic_morpher : public gm_inherit< + Inherit, + Exact>::ret + { + protected: + + /*! \brief Construct an instance of generic_morpher by assigning + ** \a Ima to Ima_. + */ + generic_morpher(const Deco &Ima) : super_type(), Ima_(Ima) {} + + /// Default Constructor. + generic_morpher(): Ima(Deco()) {} + + /// The decorated image. + const Deco &Ima_; + + public: + + /// Type of the decorated image. + typedef Deco deco_type; + typedef oln_point_type(Deco) point_type; + typedef oln_dpoint_type(Deco) dpoint_type; + typedef oln_iter_type(Deco) iter_type; + typedef oln_fwd_iter_type(Deco) fwd_iter_type; + typedef oln_bkd_iter_type(Deco) bkd_iter_type; + typedef oln_value_type(Deco) value_type; + typedef oln_size_type(Deco) size_type; + + /// Underlying implementation of the decorated image. + typedef oln_impl_type(Deco) impl_type; + + /// Exact type of the decorated image. + typedef oln_exact_type(Deco) image_type; + + typedef typename gm_inherit<Inherit, Exact>::ret super_type; + + /// Return the decorated image. + const Deco& + get_ima() const + { + return this->Ima_; + } + + /// Return the value stored at \a p in the decorated image. + const value_type + at(const point_type& p) const + { + return this->Ima_.exact().at(p); + } + + /// Return a reference to the value stored at \a p in the decorated image. + value_type& + at(const point_type& p) + { + return this->Ima_.exact().at(p); + } + + /// Return a pointer to the value container of the decorated image. + const impl_type* + impl() const + { + return this->Ima_.exact().impl(); + } + + /// Return a pointer to the value container of the decorated image. + impl_type* + impl() + { + return this->Ima_.exact().impl(); + } + + /// Return a copy of the decorated image. + image_type + clone_() const + { + return this->Ima_.exact().clone_(); + } + + /// Return the size of the decorated image. + size_t + npoints_() + { + return this->Ima_.exact().npoints_(); + } + + /// Assign \a rhs to the decorated image. + image_type& + assign(deco_type& rhs) + { + return this->Ima_.exact().assign(rhs); + } + + /// Assign the decorated image to \a r + deco_type& + operator=(const oln::io::internal::anything& r) + { + return r.assign(this->Ima_); + } + + /*! \brief Set the border width of the decorated image to + ** \a min_border. + */ + void + border_set_width(oln::coord min_border, + bool copy_border = false) const + { + return this->Ima_.exact().border_set_width(min_border, copy_border); + } + + static std::string name() + { return "generic_morpher<" + super_type::name() + ">"; } + + + }; + + } // end of namespace abstract + + } // end of namespace morpher + +} // end of namespace oln + + +#endif // !GENERIC_MORPHER_HH -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

4 5

oln 10.110: Adding oln::morpho::attr namespace.
by Giovanni Palma 25 Mar '04

25 Mar '04

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ref/doxygen.config.in: Remove deprecated entries. Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/morpho/dilation.hh: Correct comments. * oln/morpho/attribute_closing_opening.hh: Correct namespaces. * oln/morpho/attribute_closing_opening_map.hh: Likewise. * tests/morpho/tests/attribute: Likewise. * oln/morpho/attributes.hh: Add attr namespace. * oln/morpho/environments.hh: Add file. Index: olena/oln/morpho/dilation.hh --- olena/oln/morpho/dilation.hh Thu, 18 Mar 2004 18:24:14 +0100 van-vl_n (oln/b/5_dilation.h 1.19 640) +++ olena/oln/morpho/dilation.hh Wed, 24 Mar 2004 16:06:41 +0100 palma_g (oln/b/5_dilation.h 1.19 640) @@ -41,11 +41,11 @@ ** \brief Processing dilation. ** ** Compute the morphological dilation of input using se - ** as structural element. + ** as structural element.\n ** ** On grey-scale images, each point is replaced by the maximum value ** of its neighbors, as indicated by se. On binary images, - ** a logical or is performed between neighbors. + ** a logical or is performed between neighbors.\n ** ** The morpho::fast version of this function use a different ** algorithm: This algorithm is described in @@ -53,12 +53,12 @@ ** M. Van Droogenbroeck and H. Talbot. ** "Fast computation of morphological operations with arbitrary ** structuring elements". Pattern Recognition Letters, - ** 17(14):1451-1460, 1996. + ** 17(14):1451-1460, 1996.\n ** ** An histogram of the value of the neighborhood indicated by ** se is updated while iterating over all point of the ** image. Doing so is more efficient when the - ** structural element is large. + ** structural element is large.\n ** ** \param I Exact type of the input image. ** \param E Exact type of the neighborhood. Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Mon, 15 Mar 2004 17:40:54 +0100 van-vl_n (oln/q/49_attribute_ 1.22 640) +++ olena/oln/morpho/attribute_closing_opening.hh Wed, 24 Mar 2004 11:41:41 +0100 palma_g (oln/q/49_attribute_ 1.22 640) @@ -101,9 +101,9 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type<unsigned>) &lambda) \ + const attr_lambda_type(attr::T##_type<unsigned>) &lambda) \ { \ - return tarjan::internal::attr_opening_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ + return tarjan::internal::attr_opening_<I, N, attr::T##_type<unsigned> >(input, Ng, lambda); \ } # define xxx_closing_decl(T) \ @@ -111,9 +111,9 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type<unsigned>) &lambda) \ + const attr_lambda_type(attr::T##_type<unsigned>) &lambda) \ { \ - return tarjan::internal::attr_closing_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ + return tarjan::internal::attr_closing_<I, N, attr::T##_type<unsigned> >(input, Ng, lambda); \ } @@ -123,9 +123,9 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type) &lambda) \ + const attr_lambda_type(attr::T##_type) &lambda) \ { \ - return tarjan::internal::attr_opening_<I, N, T##_type >(input, Ng, lambda); \ + return tarjan::internal::attr_opening_<I, N, attr::T##_type >(input, Ng, lambda); \ } # define xxx_closing_im_decl(T) \ @@ -133,9 +133,9 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type) &lambda) \ + const attr_lambda_type(attr::T##_type) &lambda) \ { \ - return tarjan::internal::attr_closing_<I, N, T##_type >(input, Ng, lambda); \ + return tarjan::internal::attr_closing_<I, N, attr::T##_type >(input, Ng, lambda); \ } /*! Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Mon, 15 Mar 2004 17:40:54 +0100 van-vl_n (oln/j/45_attributes 1.9 644) +++ olena/oln/morpho/attributes.hh Wed, 24 Mar 2004 19:01:19 +0100 palma_g (oln/j/45_attributes 1.9 644) @@ -27,17 +27,19 @@ #ifndef OLN_MORPHO_ATTRIBUTES_HH # define OLN_MORPHO_ATTRIBUTES_HH +# include <oln/basics.hh> # include <mlc/type.hh> # include <vector> +# include <oln/morpho/environments.hh> // attribute dedicated macros -# define attr_lambda_type(T) typename oln::morpho::attr_traits<T>::lambda_type -# define attr_env_type(T) typename oln::morpho::attr_traits<T>::env_type -# define attr_value_type(T) typename oln::morpho::attr_traits<T>::value_type - -# define attr_lambda_type_(T) oln::morpho::attr_traits<T>::lambda_type -# define attr_env_type_(T) oln::morpho::attr_traits<T>::env_type -# define attr_value_type_(T) oln::morpho::attr_traits<T>::value_type +# define attr_lambda_type(T) typename oln::morpho::attr::attr_traits<T>::lambda_type +# define attr_env_type(T) typename oln::morpho::attr::attr_traits<T>::env_type +# define attr_value_type(T) typename oln::morpho::attr::attr_traits<T>::value_type + +# define attr_lambda_type_(T) oln::morpho::attr::attr_traits<T>::lambda_type +# define attr_env_type_(T) oln::morpho::attr::attr_traits<T>::env_type +# define attr_value_type_(T) oln::morpho::attr::attr_traits<T>::value_type # define attr_type_decl(self_type) \ @@ -48,6 +50,9 @@ namespace oln { namespace morpho { + /*! \brief Implementation of attributes. + */ + namespace attr { /*! \brief Useful tools for morphological math. */ namespace tools { @@ -63,66 +68,6 @@ } } // !tools - /*! - ** \brief Top of environment hierarchy. - */ - template <class Exact> - struct env: public mlc_hierarchy::any<Exact> - { - }; - - /*! - ** \brief Useless environment. - ** - ** This environment is an empty one. - */ - struct NullEnv: public env<NullEnv> - { - }; - - /*! - ** \brief Environment containing image. - ** - ** Used for image substitution in other_image attribute. - */ - template <class I> - struct OtherImageEnv: public env<OtherImageEnv > - { - typedef abstract::image im_type; - - OtherImageEnv(const abstract::image &im): im_(im) - {}; - - const im_type &getImage() const - { - return im_; - } - - protected: - const im_type &im_; - }; - - /*! - ** \brief Environment containing point. - ** - ** Used for point substitution in other_point attribute. - */ - template <class I> - struct OtherPointEnv: public env<OtherPointEnv > - { - typedef abstract::image im_type; - -// OtherImageEnv(const abstract::image &im): im_(im) -// {}; - - const oln_point_type(I) &getPoint(const oln_point_type(I) &p) const - { - return p; - } - -// protected: -// const im_type &im_; - }; // the traits fwd declaration /*! @@ -526,60 +471,177 @@ }; }; - /*--------------* - | other_point | - *------------*/ -// /*! -// ** \class other_point -// ** -// ** \brief Metaclass used to change attribute behavior. -// ** -// ** This class do the same job that its Dad parameter, but force it -// ** to work on other data. -// */ -// template <class Dad, class I, class Exact = mlc::final> -// class other_point: -// public change_exact<Dad, typename mlc::exact_vt<other_point<Dad, I, Exact>, Exact>::ret >::ret -// { -// public: -// typedef other_image<Dad, I, Exact> self_type; /*< Self type of the class.*/ -// typedef typename abstract::image<mlc_exact_type(I)> im_type; /*< Type of substituted image.*/ -// attr_type_decl(self_type); -// typedef typename change_exact<Dad, -// typename mlc::exact_vt<other_point<Dad, I, Exact>, -// Exact>::ret >::ret super_type; /*< Mother class type.*/ - -// /*! -// ** \brief Constructor. -// ** -// ** Dispatch to Dad constructor. -// */ -// other_point(): super_type() -// { -// }; - -// /*! -// ** \brief lambda_type Constructor. -// ** -// ** Dispatch to Dad constructor. -// */ -// other_point(const lambda_type &lambda): super_type(lambda) -// { -// }; - -// /*! -// ** \brief Image Constructor. -// ** -// ** Dispatch to Dad constructor but substitute image argument with -// ** the image contained in the environment. -// */ -// template <typename IM> -// other_point(const abstract::image<IM> &im, -// const oln_point_type(I) &p, -// const env_type &e): super_type(im, e.getPoint(p), e) -// { -// }; -// }; + /*----------------------* + | ball_parent_change | + *--------------------*/ + /*! + ** \class other_point + ** + ** \brief Metaclass used to change attribute behavior. + ** + ** This class do the same job that its Dad parameter, but force it + ** to work on other data. + */ + template <class I, class Exact = mlc::final> + class ball_parent_change: + public attribute<mlc_2_exact_vt_type(ball_parent_change, I, Exact)> + { + public: + typedef ball_parent_change<I, Exact> self_type; /*< Self type of the class.*/ + typedef typename abstract::image<mlc_exact_type(I)> im_type; /*< Type of substituted image.*/ + attr_type_decl(self_type); + typedef oln_value_type(I) pts_type; ///< should be list <?> + typedef typename pts_type::const_iterator cst_iter_type; ///< const iterator on Point vector. + typedef typename pts_type::value_type point_type; ///< Point type associated to im_type. + typedef oln_dpoint_type(point_type) dpoint_type; ///< Dpoint type associated to im_type. + + /*! + ** \brief Constructor. + ** + ** Dispatch to Dad constructor. + */ + ball_parent_change(): value_(ntg_zero_val(value_type)), points_() + { + }; + + /*! + ** \brief lambda_type Constructor. + ** + ** Dispatch to Dad constructor. + */ + ball_parent_change(const lambda_type &lambda): value_(lambda), points_() + { + }; + + /*! + ** \brief Image Constructor. + ** + ** Dispatch to Dad constructor but substitute image argument with + ** the image contained in the environment. + */ + template <typename IM> + ball_parent_change(const abstract::image<IM> &, + const oln_point_type(IM) &p, + const env_type &e): points_()//: super_type(/*e.getImage(), */e.getPoint(p), e) + { + std::copy(e.getParent()[p].begin(), + e.getParent()[p].end(), + std::back_inserter(points_)); + }; + + /*! + ** \brief Accessor to value_. + ** + ** Virtual method. + ** \see getValue_impl() + */ + const value_type &getValue() const + { + mlc_dispatch(getValue)(); + }; + + + /*! + ** \brief Accessor to pts_. + ** + ** Virtual method. + ** \see getPts_impl() + */ + const pts_type &getPts() const + { + mlc_dispatch(getPts)(); + }; + + // impl + /*! + ** \brief Implementation of getValue(). + ** + ** Override this method in order to provide a new version of + ** getValue(). + ** + ** \warning Do not call this method, use getValue() instead. + */ + const value_type &getValue_impl() const + { + return value_; + }; + + /*! + ** \brief Implementation of getValue(). + ** + ** Override this method in order to provide a new version of + ** getPts(). + ** + ** \warning Do not call this method, use getPts() instead. + */ + const pts_type &getPts_impl() const + { + return points_; + }; + + /*! + ** \brief += operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + void pe_impl(const self_type &rhs) + { + precondition(points_.size() < (128 * 128 * 128 + 1)); + std::copy(rhs.getPts().begin(), + rhs.getPts().end(), + std::back_inserter(points_)); + compute_value(); + value_ = ntg::max(value_, rhs.getValue()); + }; + + /*! + ** \brief "<" operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + bool less_impl(const lambda_type &lambda) const + { + return value_ < lambda; + }; + + /*! + ** \brief != operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + bool ne_impl(const lambda_type &lambda) const + { + return lambda != value_; + }; + + protected: + void compute_value() + { + value_type last = value_; + value_ = ntg_zero_val(value_type); + for (cst_iter_type p1 = points_.begin(); p1 != points_.end(); ++p1) + for (cst_iter_type p2 = points_.begin(); p2 != points_.end(); ++p2) + { + unsigned d = 0; + dpoint_type p = *p1 - *p2; + for (int i = 0; i < point_traits<point_type>::dim; ++i) + d += p.nth(i) * p.nth(i); + if (d > value_) + value_ = d; + } + value_ /= 2; + value_ = ntg::max(value_, last); + } + + value_type value_; + pts_type points_; + }; /*-----------* | height | @@ -1151,11 +1213,11 @@ ** ** \arg p Point to consider in the image. */ - dist_type(const im_type&, + dist_type(//const im_type&, const point_type &p, - const env_type &) : - value_(ntg_zero_val(value_type)), - center_(p) + const env_type &) //: + // value_(ntg_zero_val(value_type)), + //center_(p) { }; @@ -1605,112 +1667,130 @@ \------------------------*/ - // integral traits + /*! + ** \brief Trait specialization for the integral attribute. + */ template <class T, class Exact> struct attr_traits<integral_type<T, Exact> > { - typedef T value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef T value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::NullEnv env_type; ///< Type of environment. }; - // height traits + /*! + ** \brief Trait specialization for the height attribute. + */ template <class T, class Exact> struct attr_traits<height_type<T, Exact> > { - typedef T value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef T value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::NullEnv env_type; ///< Type of environment. }; - // card traits + /*! + ** \brief Trait specialization for card attribute. + */ template <class T, class Exact> struct attr_traits<card_type<T, Exact> > { - typedef T value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef T value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::NullEnv env_type; ///< Type of environment. }; - // maxvalue traits + /*! + ** \brief Trait specialization for the maxvalue attribute. + */ template <class T, class Exact> struct attr_traits<maxvalue_type<T, Exact> > { - typedef T value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef T value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::NullEnv env_type; ///< Type of environment. }; - // minvalue traits + /*! + ** \brief Trait specialization for the minvalue attribute. + */ template <class T, class Exact> struct attr_traits<minvalue_type<T, Exact> > { - typedef T value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef T value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::NullEnv env_type; ///< Type of environment. }; - // ball traits + /*! + ** \brief Trait specialization for the ball attribute. + */ template <class I, class Exact> struct attr_traits<ball_type<I, Exact> > { - typedef unsigned value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef unsigned value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef oln::morpho::env::NullEnv env_type; ///< Type of environment. }; - // dist traits + /*! + ** \brief Trait specialization for the dist attribute. + */ template <class I, class Exact> struct attr_traits<dist_type<I, Exact> > { - typedef float value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef float value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef oln::morpho::env::NullEnv env_type; ///< Type of environment. }; - // cube traits + /*! + ** \brief Trait specialization for the cube attribute. + */ template <class I, class Exact> struct attr_traits<cube_type<I, Exact> > { - typedef unsigned value_type; - typedef value_type lambda_type; - typedef NullEnv env_type; + typedef unsigned value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef oln::morpho::env::NullEnv env_type; ///< Type of environment. }; - // box traits + /*! + ** \brief Trait specialization for the box attribute. + */ template <class I, class Exact> struct attr_traits<box_type<I, Exact> > { - typedef unsigned value_type; - typedef ntg::vec<I::dim, value_type, mlc::final> lambda_type; - typedef NullEnv env_type; + typedef unsigned value_type; ///< Type of data. + typedef ntg::vec<I::dim, value_type, mlc::final> lambda_type; ///< Type of lambda. + typedef oln::morpho::env::NullEnv env_type; ///< Type of environment. }; - // other_image traits + /*! + ** \brief Trait specialization for the other_image attribute. + */ template <class Dad, class I, class Exact> struct attr_traits<other_image<Dad, I, Exact> > { //typedef typename change_exact<Dad, other_image<Dad, I, Exact> >::ret super_type; typedef typename change_exact<Dad, typename mlc::exact_vt<other_image<Dad, I, Exact>, - Exact>::ret>::ret super_type; - typedef attr_value_type(super_type) value_type; - typedef attr_lambda_type(super_type) lambda_type; - typedef OtherImageEnv env_type; - }; - -// // other_point traits -// template <class Dad, class I, class Exact> -// struct attr_traits<other_point<Dad, I, Exact> > -// { -// //typedef typename change_exact<Dad, other_image<Dad, I, Exact> >::ret super_type; -// typedef typename change_exact<Dad, -// typename mlc::exact_vt<other_point<Dad, I, Exact>, -// Exact>::ret>::ret super_type; -// typedef attr_value_type(super_type) value_type; -// typedef attr_lambda_tye(super_type) lambda_type; -// typedef OtherPointEnv env_type; -// }; + Exact>::ret>::ret super_type; ///< Parent class type. + typedef attr_value_type(super_type) value_type; ///< Type of data. + typedef attr_lambda_type(super_type) lambda_type; ///< Type of lambda. + typedef oln::morpho::env::OtherImageEnv env_type; ///< Type of environment. + }; + + /*! + ** \brief Trait specialization for the ball_parent_change attribute. + */ + template <class I, class Exact> + struct attr_traits<ball_parent_change<I, Exact> > + { + typedef unsigned value_type; ///< Type of data. + typedef value_type lambda_type; ///< Type of lambda. + typedef env::ParentEnv env_type; ///< Type of environment. + }; // traits for other_image derivation @@ -1725,17 +1805,7 @@ typedef integral_type<T, NewExact> ret; }; -// /*! -// ** \brief Change the exact type of an attribute. -// ** -// ** Traits to change dist_type exact type. -// */ -// template <class NewExact, class OldExact, class T> -// struct change_exact<dist_type<T, OldExact>, NewExact> -// { -// typedef dist_type<T, NewExact> ret; -// }; - + }// !attr } // !morpho } //!oln @@ -1748,3 +1818,4 @@ #endif // !OLN_MORPHO_ATTRIBUTES + Index: olena/oln/morpho/attribute_closing_opening_map.hh --- olena/oln/morpho/attribute_closing_opening_map.hh Tue, 23 Mar 2004 13:37:46 +0100 van-vl_n (oln/j/49_attribute_ 1.10 600) +++ olena/oln/morpho/attribute_closing_opening_map.hh Wed, 24 Mar 2004 12:01:08 +0100 palma_g (oln/j/49_attribute_ 1.10 600) @@ -61,7 +61,7 @@ ** \param D Attribute exact type. ** \param Env Type of environment. */ - template <class I, class D, class Env = morpho::NullEnv> + template <class I, class D, class Env = morpho::env::NullEnv> struct f_tarjan_map { public: @@ -213,10 +213,10 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& ng, \ - const attr_lambda_type(T##_type<>)& lambda) \ + const attr_lambda_type(attr::T##_type<>)& lambda) \ { \ - return tarjan_map<T##_type<>, I, N>(false, input, ng, lambda, \ - attr_env_type(T##_type<>)()); \ + return tarjan_map<attr::T##_type<>, I, N>(false, input, ng, lambda, \ + attr_env_type(attr::T##_type<>)()); \ } // same but attribute take care of the image type @@ -225,10 +225,10 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& ng, \ - const attr_lambda_type(T##_type)& lambda) \ + const attr_lambda_type(attr::T##_type)& lambda) \ { \ - return tarjan_map<T##_type, I, N>(false, input, ng, lambda, \ - attr_env_type(T##_type)()); \ + return tarjan_map<attr::T##_type, I, N>(false, input, ng, lambda, \ + attr_env_type(attr::T##_type)()); \ } //return input; @@ -239,10 +239,10 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& ng, \ - const attr_lambda_type(T##_type<>)& lambda) \ + const attr_lambda_type(attr::T##_type<>)& lambda) \ { \ - return tarjan_map<T##_type<>, I, N>(true, input, ng, lambda, \ - attr_env_type(T##_type<>)()); \ + return tarjan_map<attr::T##_type<>, I, N>(true, input, ng, lambda, \ + attr_env_type(attr::T##_type<>)()); \ } // same but attribute take care of the image type @@ -251,10 +251,10 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& ng, \ - const attr_lambda_type(T##_type)& lambda) \ + const attr_lambda_type(attr::T##_type)& lambda) \ { \ - return tarjan_map<T##_type, I, N>(true, input, ng, lambda, \ - attr_env_type(T##_type)());\ + return tarjan_map<attr::T##_type, I, N>(true, input, ng, lambda, \ + attr_env_type(attr::T##_type)());\ } /*! Index: olena/tests/morpho/tests/attribute --- olena/tests/morpho/tests/attribute Mon, 15 Mar 2004 17:17:49 +0100 palma_g (oln/j/51_attribute 1.4 644) +++ olena/tests/morpho/tests/attribute Wed, 24 Mar 2004 12:07:10 +0100 palma_g (oln/j/51_attribute 1.4 644) @@ -28,7 +28,7 @@ bool fail(false); typedef image2d<int_u8> img_type; - typedef oln::morpho::card_type<unsigned> area_type; + typedef oln::morpho::attr::card_type<unsigned> area_type; const area_type::lambda_type area = 100; const neighborhood2d nb = neighb_c8(); // const oln::morpho::NullEnv env; Index: doc/ref/doxygen.config.in --- doc/ref/doxygen.config.in Mon, 15 Mar 2004 16:47:03 +0100 palma_g (oln/v/29_doxygen.co 1.3 644) +++ doc/ref/doxygen.config.in Wed, 24 Mar 2004 12:03:43 +0100 palma_g (oln/v/29_doxygen.co 1.3 644) @@ -206,8 +206,3 @@ # Configuration::addtions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = YES -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ Index: olena/oln/morpho/environments.hh --- olena/oln/morpho/environments.hh Thu, 25 Mar 2004 14:59:49 +0100 palma_g () +++ olena/oln/morpho/environments.hh Wed, 24 Mar 2004 17:53:34 +0100 palma_g (oln/m/17_environmen 644) @@ -0,0 +1,110 @@ +// 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. + +#ifndef OLN_MORPHO_ENVIRONMENTS_HH +# define OLN_MORPHO_ENVIRONMENTS_HH +# include <oln/basics.hh> +# include <mlc/type.hh> + +namespace oln +{ + namespace morpho + { + /*! \brief Implementation of environments used by attributes. + */ + namespace env + { + /*! brief Abstract stuff for environments. + */ + namespace abstract + { + /*! + ** \brief Top of environment hierarchy. + */ + template <class Exact> + struct env: public mlc_hierarchy::any<Exact> + { + }; + } // !abstract + + /*! + ** \brief Useless environment. + ** + ** This environment is an empty one. + */ + struct NullEnv: public abstract::env<NullEnv> + { + }; + + /*! + ** \brief Environment containing image. + ** + ** Used for image substitution in other_image attribute. + */ + template <class I> + struct OtherImageEnv: public abstract::env<OtherImageEnv > + { + typedef oln::abstract::image im_type; + + OtherImageEnv(const oln::abstract::image &im): im_(im) + {}; + + const im_type &getImage() const + { + return im_; + } + + protected: + const im_type &im_; + }; + + /*! + ** \brief Environment containing point. + ** + ** Used for point substitution in other_point attribute. + */ + template <class I> + struct ParentEnv: public abstract::env<ParentEnv > + { + typedef oln::abstract::image im_type; + + ParentEnv(const oln::abstract::image &im): im_(im) + {}; + + const im_type &getParent() const + { + return im_; + } + + protected: + const im_type &im_; + }; + + } + } +} +#endif // !OLN_MORPHO_ENVIRONMENTS_HH -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 2

oln 10.107: New tests using md5.
by Giovanni Palma 25 Mar '04

25 Mar '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/topo/tests/md5_topo_dmap_hh0: Add file. * tests/topo/tests/md5_topo_tarjan_flat-zone_hh0: Likewise. +2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr> + * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add file. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Likewise. * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4: Likewise. Index: olena/tests/topo/tests/md5_topo_tarjan_flat-zone_hh0 --- olena/tests/topo/tests/md5_topo_tarjan_flat-zone_hh0 Tue, 23 Mar 2004 15:47:49 +0100 palma_g () +++ olena/tests/topo/tests/md5_topo_tarjan_flat-zone_hh0 Tue, 23 Mar 2004 12:29:52 +0100 palma_g (oln/m/12_md5_topo_t 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/topo/tarjan/flat-zone.hh> +#include <oln/convert/stretch.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0x23, 0x57, 0x37, 0xc5, 0xf5, 0xd1, 0x56, 0x6b, 0x6a, 0x2b, 0x6b, 0xe6, 0x59, 0x5b, 0xbb, 0x57}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> img_type; + img_type in = oln::load(rdata("test-cmap.pgm")); + oln::topo::tarjan::flat_zone<img_type> z(in); + if (oln::utils::md5(oln::convert::stretch_balance<ntg:: +int_u8>(z.label, 0, 255)) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + } Index: olena/tests/topo/tests/md5_topo_dmap_hh0 --- olena/tests/topo/tests/md5_topo_dmap_hh0 Tue, 23 Mar 2004 15:47:49 +0100 palma_g () +++ olena/tests/topo/tests/md5_topo_dmap_hh0 Tue, 23 Mar 2004 12:29:37 +0100 palma_g (oln/m/13_md5_topo_d 644) @@ -0,0 +1,29 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/topo/dmap.hh> +#include <oln/convert/stretch.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0xd8, 0x5e, 0x6b, 0xc7, 0x80, 0xa6, 0xf5, 0xa2, 0x98, 0x76, 0xb2, 0x90, 0x7c, 0x45, 0x83, 0x57}; + +oln::utils::key key(data_key); + + oln::image2d<ntg::bin> in = oln::load(rdata("face_se.pbm")); + oln::topo::dmap<ntg:: +int_u<16>, +int> m(in.size(), oln::topo::chessboard()); + m.compute(in); + if (oln::utils::md5(oln::convert::stretch_balance<ntg:: +int_u8>(m.imap())) == 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

2 1

oln 10.108: New tests using md5.
by Giovanni Palma 25 Mar '04

25 Mar '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * olena/tests/level/tests/md5_level_set_level_hh0: Add file. * olena/tests/level/tests/md5_level_threshold_hh0: Likewise. +2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr> + * tests/topo/tests/md5_topo_dmap_hh0: Add file. * tests/topo/tests/md5_topo_tarjan_flat-zone_hh0: Likewise. Index: olena/tests/level/tests/md5_level_threshold_hh0 --- olena/tests/level/tests/md5_level_threshold_hh0 Tue, 23 Mar 2004 15:57:58 +0100 palma_g () +++ olena/tests/level/tests/md5_level_threshold_hh0 Tue, 23 Mar 2004 12:08:28 +0100 palma_g (oln/m/14_md5_level_ 644) @@ -0,0 +1,33 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/level/threshold.hh> +#include <ntg/all.hh> +using namespace ntg; + + +int main() +{ +oln::utils::key::value_type data_key[16] = {0x98, 0xf0, 0x2f, 0x75, 0x92, 0x22, 0xbe, 0x3f, 0x36, 0x10, 0x44, 0x1e, 0x53, 0xf3, 0xb9, 0xce}; + +oln::utils::key key(data_key); + + oln::image2d< +int_u8> in = oln::load(rdata("lena256.pgm")); + +int_u8 th = 127; + rgb_8 low = rgb_8(100, 0, 0); + rgb_8 height = rgb_8(0, 200, 255); + oln::image2d<rgb_8> out = apply(oln::level::threshold< +int_u8, rgb_8 >(th, low, height), in); + if (oln::utils::md5(out) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + } Index: olena/tests/level/tests/md5_level_set_level_hh0 --- olena/tests/level/tests/md5_level_set_level_hh0 Tue, 23 Mar 2004 15:57:58 +0100 palma_g () +++ olena/tests/level/tests/md5_level_set_level_hh0 Tue, 23 Mar 2004 15:52:08 +0100 palma_g (oln/m/15_md5_level_ 644) @@ -0,0 +1,37 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/level/set_level.hh> +#include <ntg/all.hh> + +int main() +{ + oln::utils::key::value_type data_key[16] = {0xdd, 0x90, 0x28, 0xf1, 0xd2, + 0x6f, 0xd3, 0xfb, 0x64, 0x60, + 0x80, 0xaa, 0x11, 0xbc, 0x3e, + 0xd6}; + + oln::utils::key key(data_key); + + oln::image2d<ntg::int_u8> in = oln::load(rdata("lena256.pgm")); + oln::coord R = in.nrows(); + oln::coord C = in.ncols(); + oln::level::set_level(in, + oln::point2d(R * 1/4, C* 1/2), + oln::point2d(R * 4/5, C* 7/8), + 0); + oln::box<oln::point2d> b; + b.add(oln::point2d(R * 1/6, C * 1/6)); + b.add(oln::point2d(R * 4/5, C * 1/3)); + oln::level::set_level(in, b, 255); + if (oln::utils::md5(in) == 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

2 1

oln 10.109: New test using md5.
by Giovanni Palma 25 Mar '04

25 Mar '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * olena/tests/level/tests/md5_level_hh0: Add file. +2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr> + * olena/tests/level/tests/md5_level_set_level_hh0: Add file. * olena/tests/level/tests/md5_level_threshold_hh0: Likewise. Index: olena/tests/level/tests/md5_level_hh0 --- olena/tests/level/tests/md5_level_hh0 Tue, 23 Mar 2004 16:05:35 +0100 palma_g () +++ olena/tests/level/tests/md5_level_hh0 Tue, 23 Mar 2004 16:03:28 +0100 palma_g (oln/m/16_md5_level_ 644) @@ -0,0 +1,32 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/level/cc.hh> +#include <ntg/all.hh> +#include <iostream> + +int main() +{ + oln::utils::key::value_type data_key[16] = {0x50, 0x24, 0x28, 0x80, 0x6e, + 0x54, 0x9b, 0x5a, 0xff, 0x19, + 0xf, 0xcd, 0x4b, 0xe0, 0x38, + 0x3d}; + oln::utils::key key(data_key); + + unsigned card; + oln::image2d<ntg::bin> light = oln::load(rdata("face_se.pbm")); + if (oln::utils::md5(oln::level::frontp_connected_component<ntg::int_u8> + (light, + oln::neighb_c8(), + card)) == key) + std::cout << "OK" << std::endl; + else + { + std::cout << "FAIL" << std::endl; + return true; + } + std::cout << card << " connected components" << std::endl; +} -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

2 1