- Olena-patches

oln 10.218: Optimize Hermite polynomials computation in Shapelets transform.
by Damien Thivolle 11 Sep '04

11 Sep '04

Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/transforms/shapelets.hh: Optimize Hermite polynomials computation. Index: olena/oln/transforms/shapelets.hh --- olena/oln/transforms/shapelets.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/r/10_shapelets. 1.4 600) +++ olena/oln/transforms/shapelets.hh Sat, 11 Sep 2004 01:29:25 +0200 thivol_d (oln/r/10_shapelets. 1.4 600) @@ -18,12 +18,23 @@ { T operator()(unsigned n, T x) { + T a; + T b; + T c; if (n == 0) - return 1; + return 1.; if (n == 1) return 2. * x; - return 2. * x * (*this)(n - 1, x) - 2. * T(n - 1) * (*this)(n - 2, x); + a = 1.; + b = 2. * x; + for (unsigned i = 2; i <= n; i++) + { + c = b; + b = 2. * x * b - 2. * T(i - 1) * a; + a = c; + } + return b; } }; Ben ca va plus vite. -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 1

oln 10.217: suite de 10.215
by Giovanni Palma 09 Sep '04

09 Sep '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/makefile.src: Add morpho/abstract/attribute references. * oln/morpho/attributes.hh: Remove comments. * oln/morpho/abstract/attribute.hh: Real add the file. * oln/morpho/abstract/attribute.hxx: Likewise. Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Wed, 08 Sep 2004 10:15:22 +0200 palma_g (oln/j/45_attributes 1.13.1.6 600) +++ olena/oln/morpho/attributes.hh Thu, 09 Sep 2004 11:14:29 +0200 palma_g (oln/j/45_attributes 1.13.1.6 644) @@ -33,17 +33,6 @@ # include <oln/morpho/environments.hh> # include <oln/morpho/abstract/attribute.hh> -// // attribute dedicated macros -// # 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 - - - namespace oln { namespace morpho { /*! \brief Implementation of attributes. @@ -64,15 +53,6 @@ } } // !tools - -// // the traits fwd declaration -// /*! -// ** Traits for attributes information. -// ** \param T Exact type of the attribute. -// */ -// template <class T> -// struct attr_traits; - /*! ** \brief Change the exact type of an attribute. ** @@ -84,9 +64,6 @@ struct change_exact; - // the attributes hierarchy - - /*-----------* | card | *-----------*/ Index: olena/oln/makefile.src --- olena/oln/makefile.src Tue, 13 Jul 2004 11:48:20 +0200 palma_g (oln/r/4_makefile.s 1.6 600) +++ olena/oln/makefile.src Thu, 09 Sep 2004 11:16:39 +0200 palma_g (oln/r/4_makefile.s 1.6 644) @@ -158,6 +158,8 @@ morpher/piece_morpher.hh \ morpher/slicing_morpher.hh \ morpher/subq_morpher.hh \ + morpho/abstract/attribute.hh \ + morpho/abstract/attribute.hxx \ morpho/attribute_closing_opening.hh \ morpho/attribute_closing_opening_map.hxx \ morpho/attribute_closing_opening_map.hh \ Index: olena/oln/morpho/abstract/attribute.hxx --- olena/oln/morpho/abstract/attribute.hxx Thu, 09 Sep 2004 11:23:50 +0200 palma_g () +++ olena/oln/morpho/abstract/attribute.hxx Thu, 09 Sep 2004 11:21:53 +0200 palma_g (oln/v/38_attribute. 644) @@ -0,0 +1,109 @@ +// 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_ABSTRACT_ATTRIBUTE_HXX +# define OLN_MORPHO_ABSTRACT_ATTRIBUTE_HXX + +namespace oln +{ + namespace morpho + { + namespace attr + { + namespace abstract + { + template <class Exact> + inline void + attribute<Exact>::operator+=(const exact_type &rhs) + { + mlc_dispatch(pe)(rhs); + } + + template <class Exact> + inline bool + attribute<Exact>::operator>=(const lambda_type &lambda) const + { + mlc_dispatch(ge)(lambda); + } + + template <class Exact> + inline + bool + attribute<Exact>::operator<(const lambda_type &lambda) const + { + mlc_dispatch(less)(lambda); + } + + template <class Exact> + inline + bool + attribute<Exact>::operator<(const exact_type &x) const + { + mlc_dispatch(less2)(x); + } + + template <class Exact> + inline + bool + attribute<Exact>::operator!=(const lambda_type &lambda) const + { + mlc_dispatch(ne)(lambda); + } + + template <class Exact> + inline const typename attribute<Exact>::lambda_type & + attribute<Exact>::toLambda() const + { + mlc_dispatch(toLambda)(); + } + + template <class Exact> + inline + bool + attribute<Exact>::ge_impl(const lambda_type &lambda) const + { + return !(*this < lambda); + } + + template <class Exact> + inline + bool + attribute<Exact>::less2_impl(const exact_type &x) const + { + return *this < x.toLambda(); + } + + template <class Exact> + inline + attribute<Exact>::attribute() + {} + } // !abstract + } // !attr + } // !morpho +} // !oln + +#endif // !OLN_MORPHO_ABSTRACT_ATTRIBUTE_HXX Index: olena/oln/morpho/abstract/attribute.hh --- olena/oln/morpho/abstract/attribute.hh Thu, 09 Sep 2004 11:23:50 +0200 palma_g () +++ olena/oln/morpho/abstract/attribute.hh Thu, 09 Sep 2004 11:21:23 +0200 palma_g (oln/v/40_attribute. 644) @@ -0,0 +1,155 @@ +// 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_ABSTRACT_ATTRIBUTE_HH +# define OLN_MORPHO_ABSTRACT_ATTRIBUTE_HH +# include <oln/morpho/environments.hh> + +// attribute dedicated macros +# 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) \ + typedef mlc_exact_vt_type(self_type, Exact) exact_type; \ + typedef attr_value_type(exact_type) value_type; \ + typedef attr_env_type(exact_type) env_type; \ + typedef attr_lambda_type(exact_type) lambda_type + +namespace oln +{ + namespace morpho + { + namespace attr + { + // the traits fwd declaration + /*! + ** Traits for attributes information. + ** \param T Exact type of the attribute. + */ + template <class T> + struct attr_traits; + // } + + namespace abstract + { + // namespace attr + // { + + /*! + ** \brief Attribute abstract class + ** + ** Top of the attribute hierarchy. + */ + template <class Exact> + class attribute: public mlc_hierarchy::any<Exact> + { + public: + typedef attribute<Exact> self_type; /*< Self type of the class.*/ + attr_type_decl(self_type); + + /*! + ** \brief += operator + ** + ** This is a static dispatcher for the += operator. + ** This method is abstract. + */ + void operator+=(const exact_type &rhs); + + /*! + ** \brief >= operator + ** + ** This is a static dispatcher for the >= operator. + */ + bool operator>=(const lambda_type &lambda) const; + + /*! + ** \brief "<" operator + ** + ** This is a static dispatcher for the "<" operator. + ** This method is abstract. + */ + bool operator<(const lambda_type &lambda) const; + + /*! + ** \brief "<" operator + ** + ** This is a static dispatcher for the "<" operator. + ** This method is abstract. + */ + bool operator<(const exact_type &x) const; + + /*! + ** \brief != operator + ** + ** This is a static dispatcher for the != operator. + ** This method is abstract. + */ + bool operator!=(const lambda_type &lambda) const; + + /*! + ** \brief conversion to lambda type. + ** + ** \warning Virtual method. + */ + const lambda_type &toLambda() const; + + /*! + ** \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 be called. + */ + bool ge_impl(const lambda_type &lambda) const; + + /*! + ** \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 be called. + */ + bool less2_impl(const exact_type &x) const; + + protected: + attribute(); + }; + } // !abstract + } // !attr + } // !morpho +} // !oln + +# include <oln/morpho/abstract/attribute.hxx> + +#endif // !OLN_MORPHO_ABSTRACT_ATTRIBUTE_HH -- Giovanni Palma EPITA - promo 2005 - LRDE Mob. : +33 (0)6 60 97 31 74

2 1

oln 10.216: Minor fix
by Damien Thivolle 09 Sep '04

09 Sep '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Minor fix. +2004-09-08 Damien Thivolle <damien(a)lrde.epita.fr> + * config/oln.m4: Add tests to check for future versions of doxygen and gcc. Index: config/oln.m4 --- config/oln.m4 Wed, 08 Sep 2004 16:47:15 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.9 600) +++ config/oln.m4 Wed, 08 Sep 2004 18:50:51 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.10 600) @@ -483,9 +483,9 @@ [case `$CXX --version` in *3.[2-9]* | \ *[4-9].* ) - ac_cv_bison_version=recent;; + ac_cv_cxx_style=GNU;; *) - ac_cv_bison_version=old;; + ac_cv_cxx_style=weakGNU;; esac] elif $CXX -V 2>&1 | grep -i "WorkShop">/dev/null 2>&1; then ac_cv_cxx_style=Sun -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 1

oln 10.215: Add tests to check for future versions of gcc and doxygen
by Damien Thivolle 08 Sep '04

08 Sep '04

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Add tests to check for future versions of doxygen and gcc. Index: config/oln.m4 --- config/oln.m4 Thu, 24 Jun 2004 18:10:23 +0200 odou_s (oln/j/15_oln.m4 1.38.1.8 640) +++ config/oln.m4 Wed, 08 Sep 2004 16:33:06 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.9 600) @@ -348,11 +348,14 @@ [dnl AC_CACHE_CHECK([for doxygen >= 1.3.4], [ac_cv_doxygen_version], - [if $DOXYGEN --version 2>&1 | grep ['1.3.[4567]'] > /dev/null 2>&1; then - ac_cv_doxygen_version=recent - else - ac_cv_doxygen_version=old - fi]) + [[case `$DOXYGEN --version` in + *1.3.[4-9]* | \ + *1.[4-9]* | \ + *[2-9].* ) + ac_cv_doxygen_version=recent;; + *) + ac_cv_doxygen_version=old;; + esac]]) if [ [ "$ac_cv_doxygen_version" = "old" ] ] ; then AC_MSG_ERROR([Doxygen 1.3.4 or newer is required, run ./configure with --without-doc to disable the doc build]) fi @@ -477,11 +480,13 @@ [ac_cv_cxx_style], [ac_cv_cxx_style=unknown if test "x$ac_compiler_gnu" != xno; then - if $CXX --version | grep [' 3\.[234]'] >/dev/null ; then - ac_cv_cxx_style=GNU - else - ac_cv_cxx_style=weakGNU - fi + [case `$CXX --version` in + *3.[2-9]* | \ + *[4-9].* ) + ac_cv_bison_version=recent;; + *) + ac_cv_bison_version=old;; + esac] elif $CXX -V 2>&1 | grep -i "WorkShop">/dev/null 2>&1; then ac_cv_cxx_style=Sun elif $CXX -V 2>&1 | grep -i "Intel(R) C++">/dev/null 2>&1; -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

2 2

oln 10.214: clean attribute.
by Giovanni Palma 08 Sep '04

08 Sep '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/morpho/abstract/attribute.hh: Add file. * oln/morpho/abstract/attribute.hxx: Likewse. * oln/morpho/attributes.hh: Clean the file. Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Fri, 09 Jul 2004 17:34:56 +0200 palma_g (oln/j/45_attributes 1.13.1.5 644) +++ olena/oln/morpho/attributes.hh Tue, 07 Sep 2004 19:05:40 +0200 palma_g (oln/j/45_attributes 1.13.1.5 644) @@ -31,22 +31,18 @@ # include <mlc/type.hh> # include <vector> # include <oln/morpho/environments.hh> +# include <oln/morpho/abstract/attribute.hh> -// attribute dedicated macros -# 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 +// // attribute dedicated macros +// # 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) \ - typedef mlc_exact_vt_type(self_type, Exact) exact_type; \ - typedef attr_value_type(exact_type) value_type; \ - typedef attr_env_type(exact_type) env_type; \ - typedef attr_lambda_type(exact_type) lambda_type namespace oln { namespace morpho { @@ -69,13 +65,13 @@ } // !tools - // the traits fwd declaration - /*! - ** Traits for attributes information. - ** \param T Exact type of the attribute. - */ - template <class T> - struct attr_traits; +// // the traits fwd declaration +// /*! +// ** Traits for attributes information. +// ** \param T Exact type of the attribute. +// */ +// template <class T> +// struct attr_traits; /*! ** \brief Change the exact type of an attribute. @@ -90,115 +86,6 @@ // the attributes hierarchy - /*------------* - | attribute | - *-----------*/ - /*! - ** \brief Attribute abstract class - ** - ** Top of the attribute hierarchy. - */ - template <class Exact> - class attribute: public mlc_hierarchy::any<Exact> - { - public: - typedef attribute<Exact> self_type; /*< Self type of the class.*/ - attr_type_decl(self_type); - - /*! - ** \brief += operator - ** - ** This is a static dispatcher for the += operator. - ** This method is abstract. - */ - void operator+=(const exact_type &rhs) - { - mlc_dispatch(pe)(rhs); - }; - - /*! - ** \brief >= operator - ** - ** This is a static dispatcher for the >= operator. - */ - bool operator>=(const lambda_type &lambda) const - { - mlc_dispatch(ge)(lambda); - }; - - /*! - ** \brief "<" operator - ** - ** This is a static dispatcher for the "<" operator. - ** This method is abstract. - */ - bool operator<(const lambda_type &lambda) const - { - mlc_dispatch(less)(lambda); - }; - - /*! - ** \brief "<" operator - ** - ** This is a static dispatcher for the "<" operator. - ** This method is abstract. - */ - bool operator<(const exact_type &x) const - { - mlc_dispatch(less2)(x); - }; - - /*! - ** \brief != operator - ** - ** This is a static dispatcher for the != operator. - ** This method is abstract. - */ - bool operator!=(const lambda_type &lambda) const - { - mlc_dispatch(ne)(lambda); - }; - - /*! - ** \brief conversion to lambda type. - ** - ** \warning Virtual method. - */ - const lambda_type &toLambda() const - { - mlc_dispatch(toLambda)(); - }; - - /*! - ** \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 be called. - */ - bool ge_impl(const lambda_type &lambda) const - { - return !(*this < 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 be called. - */ - bool less2_impl(const exact_type &x) const - { - return *this < x.toLambda(); - }; - - - - protected: - attribute() {}; - - }; /*-----------* | card | @@ -211,7 +98,7 @@ */ template <class T = unsigned, class Exact = mlc::final> class card_type: - public attribute<mlc_2_exact_vt_type(card_type, T, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(card_type, T, Exact)> { public: typedef card_type<T, Exact> self_type; /*!< Self type of the class. */ @@ -240,7 +127,7 @@ ** Every parameters are useless. */ template <class I> - card_type(const abstract::image&, + card_type(const oln::abstract::image&, const oln_point_type(I)&, const env_type&): value_(ntg_unit_val(value_type)) @@ -338,7 +225,7 @@ ** Every parameters are useless. */ template <class I2> - card_full_type(const abstract::image<I2> &im, + card_full_type(const oln::abstract::image<I2> &im, const oln_point_type(I2) &p, const env_type &env): super_type(im, p, env) { @@ -356,7 +243,7 @@ */ template <class I, class Exact = mlc::final> class volume_type: - public attribute<mlc_2_exact_vt_type(volume_type, I, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(volume_type, I, Exact)> { public: typedef volume_type<I, Exact> self_type; /*!< Self type of the class. */ @@ -383,7 +270,7 @@ ** \brief Ctor from a point and an image. */ template <class J> - volume_type(const abstract::image<J> &, + volume_type(const oln::abstract::image<J> &, const oln_point_type(J) &p, const env_type &e) : // reflevel_(e.getImage()[p]), @@ -521,7 +408,7 @@ */ template <class T = unsigned, class Exact = mlc::final> class integral_type: - public attribute<mlc_2_exact_vt_type(integral_type, T, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(integral_type, T, Exact)> { public: typedef integral_type<T, Exact> self_type; /*!< Self type of the class. */ @@ -548,7 +435,7 @@ ** \brief Ctor from a point and an image. */ template <class I> - integral_type(const abstract::image &input, + integral_type(const oln::abstract::image &input, const oln_point_type(I) &p, const env_type &) : value_(input[p]) @@ -639,7 +526,7 @@ { 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.*/ + typedef typename oln::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_image<Dad, I, Exact>, @@ -670,7 +557,7 @@ ** the image contained in the environment. */ template <typename IM> - other_image(const abstract::image<IM> &, + other_image(const oln::abstract::image<IM> &, const oln_point_type(I) &p, const env_type & e): super_type(e.getImage(), p, e) { @@ -690,11 +577,11 @@ */ template <class I, class Exact = mlc::final> class ball_parent_change: - public attribute<mlc_2_exact_vt_type(ball_parent_change, I, Exact)> + public abstract::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.*/ + typedef typename oln::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. @@ -726,7 +613,7 @@ ** the image contained in the environment. */ template <typename IM> - ball_parent_change(const abstract::image<IM> &, + ball_parent_change(const oln::abstract::image<IM> &, const oln_point_type(IM) &p, const env_type &e): points_()//: super_type(/*e.getImage(), */e.getPoint(p), e) { @@ -857,7 +744,7 @@ */ template <class T = unsigned, class Exact = mlc::final> class height_type: - public attribute<mlc_2_exact_vt_type(height_type, T, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(height_type, T, Exact)> { public: typedef height_type<T, Exact> self_type; @@ -887,7 +774,7 @@ ** \brief Ctor from a point and an image. */ template <class I> - height_type(const abstract::image &input, + height_type(const oln::abstract::image &input, const oln_point_type(I) &p, const env_type&): value_(ntg_zero_val(value_type)), @@ -1000,7 +887,7 @@ */ template <class T = unsigned, class Exact = mlc::final> class maxvalue_type: - public attribute<mlc_2_exact_vt_type(maxvalue_type, T, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(maxvalue_type, T, Exact)> { public: typedef maxvalue_type<T, Exact> self_type; ///< Self type of the class. @@ -1034,7 +921,7 @@ ** \arg p Point to consider in the image. */ template <class I> - maxvalue_type(const abstract::image &input, + maxvalue_type(const oln::abstract::image &input, const oln_point_type(I) &p, const env_type &): value_(input[p]) @@ -1116,7 +1003,7 @@ */ template <class T = unsigned, class Exact = mlc::final> class minvalue_type: - public attribute<mlc_2_exact_vt_type(minvalue_type, T, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(minvalue_type, T, Exact)> { public: typedef minvalue_type<T, Exact> self_type; @@ -1150,7 +1037,7 @@ ** \arg p Point to consider in the image. */ template <class I> - minvalue_type(const abstract::image &input, + minvalue_type(const oln::abstract::image &input, const oln_point_type(I) &p, const env_type &) : value_(input[p]) @@ -1232,12 +1119,12 @@ */ template <class I, class Exact = mlc::final> class ball_type: - public attribute<mlc_2_exact_vt_type(ball_type, I, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(ball_type, I, Exact)> { public: typedef ball_type<I, Exact> self_type; ///< Self type of the class. attr_type_decl(self_type); - typedef abstract::image<mlc_exact_type(I)> im_type; ///< Image type. + typedef oln::abstract::image<mlc_exact_type(I)> im_type; ///< Image type. typedef oln_point_type(im_type) point_type; ///< Point type associated to im_type. typedef oln_dpoint_type(im_type) dpoint_type; ///< Dpoint type associated to im_type. typedef std::vector<point_type> pts_type; ///< Point vector type. @@ -1395,12 +1282,12 @@ */ template <class I, class Exact = mlc::final> class dist_type: - public attribute<mlc_2_exact_vt_type(dist_type, I, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(dist_type, I, Exact)> { public: typedef dist_type<I, Exact> self_type; ///< Self type of the class. attr_type_decl(self_type); - typedef abstract::image<mlc_exact_type(I)> im_type; ///< Image type. + typedef oln::abstract::image<mlc_exact_type(I)> im_type; ///< Image type. typedef oln_point_type(im_type) point_type; ///< Point type associated to im_type. typedef oln_dpoint_type(im_type) dpoint_type; ///< Dpoint type associated to im_type. @@ -1547,12 +1434,12 @@ */ template <class I, class Exact = mlc::final> class cube_type: - public attribute<mlc_2_exact_vt_type(cube_type, I, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(cube_type, I, Exact)> { public: typedef cube_type<I, Exact> self_type; ///< Self type of the class. attr_type_decl(self_type); - typedef abstract::image<mlc_exact_type(I)> im_type; ///< Image type. + typedef oln::abstract::image<mlc_exact_type(I)> im_type; ///< Image type. typedef oln_point_type(im_type) point_type; ///< Point type associated to im_type. typedef oln_dpoint_type(im_type) dpoint_type; ///< Dpoint type associated to im_type. @@ -1716,12 +1603,12 @@ */ template <class I, class Exact = mlc::final> class box_type: - public attribute<mlc_2_exact_vt_type(box_type, I, Exact)> + public abstract::attribute<mlc_2_exact_vt_type(box_type, I, Exact)> { public: typedef box_type<I, Exact> self_type; ///< Self type of the class. attr_type_decl(self_type); - typedef abstract::image<mlc_exact_type(I)> im_type; ///< Image type. + typedef oln::abstract::image<mlc_exact_type(I)> im_type; ///< Image type. typedef oln_point_type(im_type) point_type; ///< Point type associated to im_type. typedef oln_dpoint_type(im_type) dpoint_type; ///< Dpoint type associated to im_type. enum {dim = point_traits<point_type>::dim }; -- Giovanni Palma EPITA - promo 2005 - LRDE Mob. : +33 (0)6 60 97 31 74

2 4

oln 10.207: Remove some files.
by Giovanni Palma 07 Sep '04

07 Sep '04

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

2 3

oln 10.213: Fix changelog
by Giovanni Palma 07 Sep '04

07 Sep '04

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/md5_morpho_attribute_closing_opening_light_hh5: Remove file because the test already exists. -- Giovanni Palma EPITA - promo 2005 - LRDE Mob. : +33 (0)6 60 97 31 74

1 0

News.
by Niels van Vliet 07 Sep '04

07 Sep '04

"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

2 1

oln 10.212: Fix oln::utils::timer::restart()
by Roland Levillain 16 Aug '04

16 Aug '04

Index: olena/ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/utils/timer.hh (timer::restart): Fix method to allow a running timer to be restarted. (timer::resume): Fix documentation. * tests/utils/tests/timer (check): Add a test case to check the behavior of restart() on a running timer. Index: olena/oln/utils/timer.hh --- olena/oln/utils/timer.hh Sat, 13 Mar 2004 21:28:08 +0100 van-vl_n (oln/8_timer.hh 1.9 640) +++ olena/oln/utils/timer.hh Mon, 16 Aug 2004 17:46:12 +0200 levill_r (oln/8_timer.hh 1.9 640) @@ -73,13 +73,14 @@ { assertion(status_ != e_unknown); float val = total_time(); + status_ = e_stopped; start(); return val; } /*! Resume the timer. ** - ** \pre The timer should be running. + ** \pre The timer should be stopped. */ void resume() Index: olena/tests/utils/tests/timer --- olena/tests/utils/tests/timer Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/u/29_timer.cc 1.5 600) +++ olena/tests/utils/tests/timer Mon, 16 Aug 2004 19:28:37 +0200 levill_r (oln/u/29_timer.cc 1.5 600) @@ -68,5 +68,17 @@ if (b >= 0) OK_OR_FAIL; + b = t.total_time (); + + t.restart (); + + for (int i = 0; i < 1000000000; ) + ++i; + + b = t.total_time() - b; + + if (b >= 0) + OK_OR_FAIL; + return fail; }

1 0

oln 10.211: Typo in ChangeLog.
by Roland Levillain 13 Aug '04

13 Aug '04

Index: olena/ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> inverted argument and return value in the documentation.

1 0