- Olena-patches

427: Create assert.hh from bool.hh contents.
by Thierry Geraud 21 Mar '06

21 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Thierry Geraud <theo(a)lrde.epita.fr> Create assert.hh from bool.hh contents. * mlc/bool.hh (mlc_type_iff, mlc::type_iff_): Remove cause soon obsolete. (bool_<true>::ensure()): Remove to force the client to use assert_. (bool_): Add using clauses to make contents explicit. (internal::check_, internal::check_item_): Move to... (literal_, no_error_message, no_bexpr): Move to... (assert_, multiple_assert_): Move to... * mlc/assert.hh: ... this new file. * tests/is_a.cc: Update. * tests/if.cc: Update. * tests/typedef.cc: Update. * mlc/logic.hh: Update. mlc/assert.hh | 234 ++++++++++++++++++++++++++++++++++++++++++++++++ mlc/bool.hh | 267 ++++--------------------------------------------------- mlc/logic.hh | 1 tests/if.cc | 5 - tests/is_a.cc | 5 - tests/typedef.cc | 7 + 6 files changed, 267 insertions(+), 252 deletions(-) Index: tests/is_a.cc --- tests/is_a.cc (revision 426) +++ tests/is_a.cc (working copy) @@ -1,4 +1,5 @@ #include <mlc/is_a.hh> +#include <mlc/assert.hh> struct A {}; struct B : public A {}; @@ -9,6 +10,6 @@ int main () { - mlc_is_a_(B, A)::ensure(); - mlc_is_a_(D<int>, C<int>)::ensure(); + mlc::assert_< mlc_is_a_(B, A) >::check(); + mlc::assert_< mlc_is_a_(D<int>, C<int>) >::check(); } Index: tests/if.cc --- tests/if.cc (revision 426) +++ tests/if.cc (working copy) @@ -1,5 +1,6 @@ #include <mlc/if.hh> #include <mlc/cmp.hh> +#include <mlc/assert.hh> struct alpha; struct beta; @@ -10,8 +11,8 @@ main() { typedef mlc_if_(mlc::true_, alpha, beta) x; - mlc_eq(x, alpha)::ensure(); + mlc::assert_< mlc_eq(x, alpha) >::check(); typedef mlc_if_(mlc::false_, gamma, delta) y; - mlc_eq(y, delta)::ensure(); + mlc::assert_< mlc_eq(y, delta) >::check(); } Index: tests/typedef.cc --- tests/typedef.cc (revision 426) +++ tests/typedef.cc (working copy) @@ -1,5 +1,6 @@ #include <mlc/typedef.hh> #include <mlc/cmp.hh> +#include <mlc/assert.hh> struct foo { @@ -12,6 +13,8 @@ int main () { - mlc_eq(mlc_typedef_(foo, good_type), foo::good_type)::ensure(); - mlc_eq(mlc_typedef_(foo, bad_type), mlc::not_found)::ensure(); + mlc::assert_< mlc_eq(mlc_typedef_(foo, good_type), + foo::good_type) >::check(); + mlc::assert_< mlc_eq(mlc_typedef_(foo, bad_type), + mlc::not_found) >::check(); } Index: mlc/bool.hh --- mlc/bool.hh (revision 426) +++ mlc/bool.hh (working copy) @@ -30,25 +30,14 @@ # include <mlc/value.hh> # include <mlc/flags.hh> -# include <mlc/wrap.hh> -/*! \def mlc_bool(BExpr) +/*! \def mlc_bool(&Bexpr) ** ** Macro that retrieves a Boolean value from a Boolean expression type. ** Its result is either true or false. */ -# define mlc_bool(BExpr) mlc::internal::get_bool<BExpr>::value - - - -/*! \def mlc_type_iff(Type, BExpr) -** -** FIXME: doc -*/ -# define mlc_type_iff(Type, BExpr) typename mlc::type_iff_<Type, BExpr>::ret -# define mlc_type_iff_(Type, BExpr) mlc::type_iff_<Type, BExpr>::ret - +# define mlc_bool(Bexpr) mlc::internal::get_bool<Bexpr>::value @@ -141,11 +130,11 @@ ** Please note that, however, we usually do not need expression ** evaluation. The most common use of a Boolean expression is ** to check that it is verified (true) and, for that, we provide - ** "expr::ensure();" and "assert_<expr..>". For instance: - ** or_<mlc_is_a(T, int), mlc_is_a(T, unsigned)>::ensure(); + ** "assert_<bexpr, errmsg>::check()". For instance: + ** assert_< or_<mlc_is_a(T, int), mlc_is_a(T, unsigned)> >::check(); ** ensures that T is int or unsigned without using ::eval. ** - ** \see mlc::true_, mlc::false_, mlc::assert_<expr..>. + ** \see mlc::true_, mlc::false_, mlc::assert_<bexpr, errmsg>. */ typedef bool_<b> eval; @@ -163,214 +152,10 @@ }; - /*! \class mlc::internal::check_<bexpr, result> - ** - ** Internal so do not use it. This class is for use in the - ** definition of mlc::assert_<bexpr, err>. - ** - ** Design note: this class does not derive from abstract::type - ** because it is used in inheritance so a ctor should exist. - ** - ** \see mlc::assert_<bexpr, err> - */ - - template <typename bexpr, typename result> - struct check_ - { - }; - - - /*! \class mlc::internal::check_item_<i, bexpr, result> - ** - ** Internal so do not use it. This class is for use in the - ** definition of mlc::multiple_assert_<..>. - ** - ** Design note: this class does not derive from abstract::type - ** because it is used in inheritance so a ctor should exist. - ** - ** \see mlc::multiple_assert_<..> - */ - - template <unsigned i, typename bexpr, typename result> - struct check_item_ - { - }; - } // end of namespace mlc::internal - /*! \class mlc::no_error_message - ** - ** FIXME: doc - */ - - struct no_error_message; - - - /*! \class mlc::no_bexpr - ** - ** Internal class for use in mlc::multiple_assert_<..>. - */ - - struct no_bexpr - { - typedef dummy is_true; - }; - - - /*! \class mlc::assert_<bexpr, err> - ** - ** FIXME: this doc is partially obsolete! - ** - ** This class is a replacement for the instruction "expr::ensure();" - ** when there is no room for having instruction. The typical use - ** is to express a constraint (or several constraints) upon a - ** parameter (or several parameters) of a templated class. - ** - ** assert_<expr> only accepts one parameter, which has to be a - ** Boolean expression type. An equivalent version for a variadic - ** list of parameters is multiple_assert_<expr1,..> - ** - ** Sample use: - ** - ** template <class T> - ** struct foo : private virtual assert_< neq_<T, int> > - ** { ... - ** }; - ** means that T can be any type but int. - ** - ** - ** Please avoid the following code: - ** template <class T1, class T2> - ** struct bar : private virtual assert_< neq_<T1, int> >, - ** private virtual assert_< neq_<T2, int> > - ** { ... - ** }; - ** a better replacement is: - ** template <class T1, class T2> - ** struct bar : private virtual multiple_assert_< neq_<T1, int>, - ** neq_<T2, int> > - ** { ... - ** }; - ** see the design notes below for details. - ** - ** Also prefer the use of multiple_assert_<expr1, expr2> than the - ** equivalent assert_< and_<expr1, expr2> >. Actually, the former - ** provides better error messages since the compiler is able to - ** say which expr is not verified, whereas the latter cannot. - ** - ** - ** Design notes: 1) This class does not derive from abstract::type - ** because it is used in inheritance so a ctor should exist. 2) - ** This class relies on mlc::internal::assert_item_ to check that - ** the expression is true. 3) When several contrains such as - ** "private assert_<..>" appear through a hierarchy of classes or - ** for a given class, the program may not compile because of - ** multiple inheritance of the same base class; the solution is to - ** systematically write "private virtual assert_<..>". - ** - ** \see multiple_assert_<bexpr1,..> - ** - */ - - template <typename bexpr, typename err = no_error_message> - struct assert_ : - public virtual internal::check_<bexpr, typename bexpr::is_true> - { - public: - static void ensure() {} - protected: - assert_() {} - }; - - - /*! \class mlc::type_iff_<T, bexpr> - ** - ** FIXME: doc - ** returns type T iff bexpr - */ - template <typename T, typename bexpr> - struct type_iff_ : - private assert_<bexpr> - { - typedef T ret; - }; - - - /*! \class mlc::literal_<T> - ** - ** FIXME: doc - */ - - template <typename T> - struct literal_ - { - typedef T ret; - }; - - - /*! \class mlc::multiple_assert_<bexpr1..> - ** - ** FIXME: this doc is partially obsolete! - ** - ** This class is a replacement for a sequence of instructions: - ** "expr1::ensure(); .." when there is no room for having - ** instructions. The typical use is to express a constraint (or - ** several constraints) upon a parameter (or several parameters) - ** of a templated class. - ** - ** multiple_assert_<..> has a variadic list of parameters. It expects - ** at least 2 parameters and handles up to 9 parameters. Each - ** parameter has to be a Boolean expression type. To check only a - ** single expression, the appropriate tool is assert_<expr>. - ** - ** - ** Sample use: - ** - ** template <class T1, class T2> - ** struct foo : private virtual multiple_assert_< neq_<T1, int>, - ** neq_<T2, int> > - ** { ... - ** }; - ** - ** Design notes: 1) This class does not derive from abstract::type - ** because it is used in inheritance so a ctor should exist. 2) - ** This class relies on mlc::internal::assert_item_ to check that - ** each expression is true. 3) using "virtual" allow to encompass - ** the multiple base class problem. - ** - ** Limitation: no error message can be provided with this present - ** version of multiple_assert_ so prefer using several assert_. - ** - ** \see assert_<bexpr, err> - */ - - template <typename bexpr1, - typename bexpr2, - typename bexpr3 = no_bexpr, - typename bexpr4 = no_bexpr, - typename bexpr5 = no_bexpr, - typename bexpr6 = no_bexpr, - typename bexpr7 = no_bexpr, - typename bexpr8 = no_bexpr, - typename bexpr9 = no_bexpr> - struct multiple_assert_ : - private virtual internal::check_item_<1, bexpr1, typename bexpr1::is_true>, - private virtual internal::check_item_<2, bexpr2, typename bexpr2::is_true>, - private virtual internal::check_item_<3, bexpr3, typename bexpr3::is_true>, - private virtual internal::check_item_<4, bexpr4, typename bexpr4::is_true>, - private virtual internal::check_item_<5, bexpr5, typename bexpr5::is_true>, - private virtual internal::check_item_<6, bexpr6, typename bexpr6::is_true>, - private virtual internal::check_item_<7, bexpr7, typename bexpr7::is_true>, - private virtual internal::check_item_<8, bexpr8, typename bexpr8::is_true>, - private virtual internal::check_item_<9, bexpr9, typename bexpr9::is_true> - { - protected: - multiple_assert_() {} - }; - - /*! \class mlc::bool_<true> ** ** Specialization of mlc::bool_<b> for b set to true. This type @@ -388,25 +173,10 @@ template <> struct bool_<true> : public internal::value_<bool, true> { - /*! \member ensure() - ** - ** This member is inherited in every Boolean expression types that - ** derive from mlc::true_. This member is not provided in - ** mlc::false_. - ** - ** A static check to ensure that a Boolean expression type, say - ** Expr, is verified can thus be written as an instruction: - ** "Expr::ensure();" - ** - ** When there is no room in code for an instruction, use - ** mlc::assert_<bexpr> instead. - ** - ** Design note: This member is a no-op (it has no cost at - ** run-time). - ** - ** \see: mlc::assert_<expr> - */ - static void ensure() {} + + // FIXME: doc + using internal::value_<bool, true>::value; + using internal::value_<bool, true>::eval; /*! \typedef is_true ** @@ -434,23 +204,28 @@ ** is also known as mlc::false_. Every Boolean expression types ** derive either from this type or from mlc::true_. ** - ** Conversely to mlc::true_, this class does not feature ensure() - ** nor assert_. So, when a Boolean expression type, say Expr, - ** is evaluated to false, the static checks "Expr::ensure();" and - ** "Expr::assert_" do not compile. + ** Conversely to mlc::true_, this class does not feature the typedef + ** "is_true". So, when a Boolean expression type, say Expr, is + ** evaluated to false, the static checks via "assert_<Expr>" + ** do not compile. ** ** Design notes: 1) This specialization is defined so that mlc ** Booleans derive from mlc::abstract::boolean. 2) This ** specialization conforms to the interface of the generic version - ** of mlc::internal::value_. 3) Conversely to "mlc::bool_<true>" - ** no typedef "is_true" is provided. + ** of mlc::internal::value_. ** - ** \see mlc::bool_<true> + ** \see mlc::bool_<true>, mlc::assert_<bexpr, errmsg> */ template <> struct bool_<false> : public internal::value_<bool, false> { + // FIXME: doc + private: + typedef internal::value_<bool, false> super_type; + public: + using super_type::value; + using super_type::eval; }; typedef bool_<false> false_; Index: mlc/logic.hh --- mlc/logic.hh (revision 426) +++ mlc/logic.hh (working copy) @@ -29,6 +29,7 @@ # define METALIC_LOGIC_HH # include <mlc/bool.hh> +# include <mlc/assert.hh> # include <mlc/flags.hh> Index: mlc/assert.hh --- mlc/assert.hh (revision 0) +++ mlc/assert.hh (revision 0) @@ -0,0 +1,234 @@ +// Copyright (C) 2006 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 METALIC_ASSERT_HH +# define METALIC_ASSERT_HH + +# include <mlc/bool.hh> + + + +namespace mlc +{ + + + namespace internal + { + + /*! \class mlc::internal::check_<bexpr, result> + ** + ** Internal so do not use it. This class is for use in the + ** definition of mlc::assert_<bexpr, err>. + ** + ** Design note: this class does not derive from abstract::type + ** because it is used in inheritance so a ctor should exist. + ** + ** \see mlc::assert_<bexpr, err> + */ + + template <typename bexpr, typename result> + struct check_ + { + }; + + + /*! \class mlc::internal::check_item_<i, bexpr, result> + ** + ** Internal so do not use it. This class is for use in the + ** definition of mlc::multiple_assert_<..>. + ** + ** Design note: this class does not derive from abstract::type + ** because it is used in inheritance so a ctor should exist. + ** + ** \see mlc::multiple_assert_<..> + */ + + template <unsigned i, typename bexpr, typename result> + struct check_item_ + { + }; + + } // end of namespace mlc::internal + + + + /*! \class mlc::no_error_message + ** + ** FIXME: doc + */ + + struct no_error_message; + + + /*! \class mlc::no_bexpr + ** + ** Internal class for use in mlc::multiple_assert_<..>. + */ + + struct no_bexpr + { + typedef dummy is_true; + }; + + + /*! \class mlc::assert_<bexpr, err> + ** + ** FIXME: this doc is partially obsolete! + ** + ** This class is a replacement for the instruction "expr::ensure();" + ** when there is no room for having instruction. The typical use + ** is to express a constraint (or several constraints) upon a + ** parameter (or several parameters) of a templated class. + ** + ** assert_<expr> only accepts one parameter, which has to be a + ** Boolean expression type. An equivalent version for a variadic + ** list of parameters is multiple_assert_<expr1,..> + ** + ** Sample use: + ** + ** template <class T> + ** struct foo : private virtual assert_< neq_<T, int> > + ** { ... + ** }; + ** means that T can be any type but int. + ** + ** + ** Please avoid the following code: + ** template <class T1, class T2> + ** struct bar : private virtual assert_< neq_<T1, int> >, + ** private virtual assert_< neq_<T2, int> > + ** { ... + ** }; + ** a better replacement is: + ** template <class T1, class T2> + ** struct bar : private virtual multiple_assert_< neq_<T1, int>, + ** neq_<T2, int> > + ** { ... + ** }; + ** see the design notes below for details. + ** + ** Also prefer the use of multiple_assert_<expr1, expr2> than the + ** equivalent assert_< and_<expr1, expr2> >. Actually, the former + ** provides better error messages since the compiler is able to + ** say which expr is not verified, whereas the latter cannot. + ** + ** + ** Design notes: 1) This class does not derive from abstract::type + ** because it is used in inheritance so a ctor should exist. 2) + ** This class relies on mlc::internal::assert_item_ to check that + ** the expression is true. 3) When several contrains such as + ** "private assert_<..>" appear through a hierarchy of classes or + ** for a given class, the program may not compile because of + ** multiple inheritance of the same base class; the solution is to + ** systematically write "private virtual assert_<..>". + ** + ** \see multiple_assert_<bexpr1,..> + ** + */ + + template <typename bexpr, typename err = no_error_message> + struct assert_ : + public virtual internal::check_<bexpr, typename bexpr::is_true> + { + public: + static void check() {} + protected: + assert_() {} + }; + + + + /*! \class mlc::multiple_assert_<bexpr1..> + ** + ** FIXME: this doc is partially obsolete! + ** + ** This class is a replacement for a sequence of instructions: + ** "expr1::ensure(); .." when there is no room for having + ** instructions. The typical use is to express a constraint (or + ** several constraints) upon a parameter (or several parameters) + ** of a templated class. + ** + ** multiple_assert_<..> has a variadic list of parameters. It expects + ** at least 2 parameters and handles up to 9 parameters. Each + ** parameter has to be a Boolean expression type. To check only a + ** single expression, the appropriate tool is assert_<expr>. + ** + ** + ** Sample use: + ** + ** template <class T1, class T2> + ** struct foo : private virtual multiple_assert_< neq_<T1, int>, + ** neq_<T2, int> > + ** { ... + ** }; + ** + ** Design notes: 1) This class does not derive from abstract::type + ** because it is used in inheritance so a ctor should exist. 2) + ** This class relies on mlc::internal::assert_item_ to check that + ** each expression is true. 3) using "virtual" allow to encompass + ** the multiple base class problem. + ** + ** Limitation: no error message can be provided with this present + ** version of multiple_assert_ so prefer using several assert_. + ** + ** \see assert_<bexpr, err> + */ + + template <typename bexpr1, + typename bexpr2, + typename bexpr3 = no_bexpr, + typename bexpr4 = no_bexpr, + typename bexpr5 = no_bexpr, + typename bexpr6 = no_bexpr, + typename bexpr7 = no_bexpr, + typename bexpr8 = no_bexpr, + typename bexpr9 = no_bexpr> + struct multiple_assert_ : + private virtual internal::check_item_<1, bexpr1, typename bexpr1::is_true>, + private virtual internal::check_item_<2, bexpr2, typename bexpr2::is_true>, + private virtual internal::check_item_<3, bexpr3, typename bexpr3::is_true>, + private virtual internal::check_item_<4, bexpr4, typename bexpr4::is_true>, + private virtual internal::check_item_<5, bexpr5, typename bexpr5::is_true>, + private virtual internal::check_item_<6, bexpr6, typename bexpr6::is_true>, + private virtual internal::check_item_<7, bexpr7, typename bexpr7::is_true>, + private virtual internal::check_item_<8, bexpr8, typename bexpr8::is_true>, + private virtual internal::check_item_<9, bexpr9, typename bexpr9::is_true> + { + public: + static void check() {} + protected: + multiple_assert_() {} + }; + + +} // end of namespace mlc + + +# include <mlc/logic.hh> + + +#endif // ! METALIC_BOOL_HH

1 0

426: Set the pseudosuper link using a separate class instead of an internal virtual type.
by Roland Levillain 14 Mar '06

14 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Set the pseudosuper link using a separate class instead of an internal virtual type. * stc/properties.hh (stc_equip_namespace_with_properties): Generate a set_pseudosuper_type struct. Use it to get the pseudosuper links in recursive vtype retrieval algorithms. (stc_set_pseudosuper, stc_pseudosuper, stc_pseudosuper_): New macros. * tests/properties.cc: Adjust. stc/properties.hh | 46 +++++++++++++++++++++++++++++++++++++--------- tests/properties.cc | 20 +++++++------------- 2 files changed, 44 insertions(+), 22 deletions(-) Index: tests/properties.cc --- tests/properties.cc (revision 425) +++ tests/properties.cc (working copy) @@ -118,24 +118,18 @@ // Forward declaration. struct C; - // C do not derive from B, but we want its vtypes to ``inherit'' - // from B's vtypes (see the specilization - // vtypes<category::my_cat, C>. + // C doesn't derive from B, but we want its vtypes to ``inherit'' + // from B's vtypes (see the specialization + // types<category::my_cat, C>). + + // Warning, this sugar might me remove from properties.hh. + /// Link to B (``pseudo'' inheritance). + stc_set_pseudosuper(C, B); /// Types associated to my::C. template<> struct vtypes<category::my_cat, C> { - // FIXME: Having this link here is not elegant when you consider - // ext_vtype<>: this means that even if you have only a vtype - // declared as ext_vtype, you'll still have to define a - // corresponding vtypes<>, at least to define the pseudosuper - // class. What about externalizing this information, maybe with - // set_pseudosuper_type<>, and a macro set_pseudosuper() as sugar? - - /// Link to B (``pseudo'' inheritance). - typedef B pseudosuper_type; - // A type defined only here (and not in the super class). typedef double zorg_type; }; Index: stc/properties.hh --- stc/properties.hh (revision 425) +++ stc/properties.hh (working copy) @@ -72,6 +72,17 @@ }; \ \ \ + /* ------------------------ */ \ + /* ``Pseudo'' inheritance. */ \ + /* ------------------------ */ \ + \ + template <typename type> \ + struct set_pseudosuper_type \ + { \ + typedef mlc::none ret; \ + }; \ + \ + \ /* --------------- */ \ /* Virtual types. */ \ /* --------------- */ \ @@ -137,8 +148,7 @@ /** Implicit parent (i.e. super), if any. */ \ typedef stc_super(from_type) super; \ /** Pseudosuper class, if any. */ \ - typedef stc_internal_get_typedef(types, typedef_::pseudosuper_type) \ - pseudosuper; \ + typedef stc_pseudosuper(from_type) pseudosuper; \ \ typedef typename \ mlc::if_< \ @@ -206,11 +216,7 @@ /** Implicit parent (i.e. super), if any. */ \ typedef stc_super(from_type) super; \ /** Pseudosuper class, if any. */ \ - /* FIXME: Looking for this information is not elegant. Have a */ \ - /* look at static/tests/properties.cc for a better suggestion. */ \ - typedef vtypes<category, from_type> types; \ - typedef stc_internal_get_typedef(types, typedef_::pseudosuper_type) \ - pseudosuper; \ + typedef stc_pseudosuper(from_type) pseudosuper; \ \ typedef typename \ mlc::if_< \ @@ -343,8 +349,10 @@ | Macros. | `---------*/ -/* FIXME: I don't know this macro will be really usable; what if T is - a template class? */ +/* FIXME: I don't know whether this macro will be really usable; what + if Type is a template class? We would have to provide additional + versions of this macro, with support for one parameter, two + parameters, etc. */ /// \def Declare the immediate base class \a Super of \a Type. # define stc_set_super(Type, Super) \ template <> \ @@ -353,6 +361,18 @@ typedef Super ret; \ } +/* FIXME: I don't know whether this macro will be really usable; what + if Type is a template class? We would have to provide additional + versions of this macro, with support for one parameter, two + parameters, etc. */ +/// \def Declare the pseudosuper class \a PseudoSuper of \a Type. +# define stc_set_pseudosuper(Type, PseudoSuper) \ + template <> \ + struct set_pseudosuper_type<Type> \ + { \ + typedef PseudoSuper ret; \ + } + /// \def Get the immediate base class of T (version with typename). # define stc_super(T) \ typename set_super_type<T>::ret @@ -361,6 +381,14 @@ # define stc_super_(T) \ set_super_type<T>::ret +/// \def Get the pseudosuper class of T (version with typename). +# define stc_pseudosuper(T) \ + typename set_pseudosuper_type<T>::ret + +/// \def Get the pseudosuper class of T (version without typename). +# define stc_pseudosuper_(T) \ + set_pseudosuper_type<T>::ret + /// Get the property \a Typedef from \a FromType (version with typename). #define stc_typeof(Category, FromType, Typedef) \ typename typeof_<Category, FromType, typedef_:: Typedef##_type >::ret

1 0

425: Clean up ChangeLogs.
by Roland Levillain 14 Mar '06

14 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * ChangeLog, metalic/ChangeLog: Clean up ChangeLogs. * extended/ChangeLog: New. extended/ChangeLog | 5 +++++ metalic/ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) Index: extended/ChangeLog --- extended/ChangeLog (revision 0) +++ extended/ChangeLog (revision 0) @@ -0,0 +1,5 @@ +2006-03-14 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am (mlcdir, nobase_mlc_HEADERS): Remove. + (AM_CPPFLAGS): New. + * xtd/Makefile.am: New file. Index: metalic/ChangeLog --- metalic/ChangeLog (revision 424) +++ metalic/ChangeLog (working copy) @@ -1,3 +1,16 @@ +2006-03-14 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with recent changes and fix some tests of Metalic. + + * mlc/properties.hh (mlc_equip_namespace_with_properties): + Catch up with recent changes in typedef.hh/ret.hh. + Don't declare a local `ret' typedef; include mlc/ret.hh, and use + the `mlc_ret' macro instead. + * mlc/cmp.hh (eq_<T, T>): Solve ambiguous calls to + ensure(). + * tests/ret.cc: Include mlc/ret.hh instead of + mlc/typedef.hh. + 2006-03-10 Thierry Geraud <theo(a)lrde.epita.fr> Minor addition. @@ -43,6 +56,33 @@ * mlc/switch.hh: Change that makes this file soon obsolete. * mlc/case.hh: New file. +2006-02-20 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the virtual types (aka properties) system. + + No longer use the C++'s inheritance mechanism to ``pack'' the + internal vtypes of a class. Rely on a metacode algorithm to + recursively look for vtypes in internal and external vtypes + instead, using both the super link and a ``pseudosuper'' link to + visit the upper classes. The set/get classes have been replaced + by a single class (in fact, by two classes, one for internal + vtypes, the other for external vtypes). The pseudosuper link is + used to inherit (or fetch) the vtypes from a given class, without + needing to inherit from this class. + + * mlc/properties.hh (mlc_equip_namespace_with_properties): + Rewrite this macro. + (set_types, set_ext_types): Rename as... + (vtypes, ext_vtypes): ...this. + (get_types, get_ext_type): Remove. + * tests/properties.cc: Update the test. + Check for new cases (external vtype, pseudo inheritance of + vtypes). + (rec_get_vtype, rec_get_ext_vtype): New. + This class holds the algorithm for the recursive retrieval of + internal/external vtypes. + (typeof_): Adjust. + 2006-02-17 Thierry Geraud <theo(a)lrde.epita.fr> Enhance error handling in mlc::switch_.

1 0

424: New subproject: Static (`stc' for short).
by Roland Levillain 14 Mar '06

14 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> New subproject: Static (`stc' for short). Move the SCOOP machinery (virtual types/properties) from Metalic to Static. * configure.ac (static/Makefile, static/stc/Makefile) (static/tests/Makefile): Configure these files. * metalic/stc/properties.hh: Move... * static/stc/properties.hh: ...here. (mlc_internal_get_typedef, mlc_equip_namespace_with_properties) (mlc_set_super, mlc_super, mlc_super_, mlc_typeof, mlc_typeof_): Rename as... (stc_internal_get_typedef, stc_equip_namespace_with_properties) (stc_set_super, stc_super, stc_super_, stc_typeof, stc_typeof_): ...this. Adjust. * metalic/tests/properties.cc: Move... * static/tests/properties.cc: ...here. Adjust. * Makefile.am (SUBDIRS): Add static. * static/Makefile.am, static/stc/Makefile.am, * static/tests/Makefile.am: New. * metalic/mlc/Makefile.am (nobase_mlc_HEADERS): Remove properties.hh. * metalic/tests/Makefile.am (check_PROGRAMS): Remove properties. (properties_SOURCES): Remove. * extended/tests/Makefile.am (AM_CPPFLAGS): Add -I$(top_srcdir)/metalic. Makefile.am | 2 +- configure.ac | 10 ++++++++-- extended/tests/Makefile.am | 2 +- metalic/mlc/Makefile.am | 1 - metalic/tests/Makefile.am | 2 -- static/Makefile.am | 3 +++ static/stc/Makefile.am | 5 +++++ static/stc/properties.hh | 36 ++++++++++++++++++------------------ static/tests/Makefile.am | 15 +++++++++++++++ static/tests/properties.cc | 12 ++++++------ 10 files changed, 57 insertions(+), 31 deletions(-) Index: extended/tests/Makefile.am --- extended/tests/Makefile.am (revision 423) +++ extended/tests/Makefile.am (working copy) @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -AM_CPPFLAGS = -I$(top_srcdir)/extended +AM_CPPFLAGS = -I$(top_srcdir)/extended -I$(top_srcdir)/metalic # FIXME: Add # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb Index: configure.ac --- configure.ac (revision 423) +++ configure.ac (working copy) @@ -20,7 +20,7 @@ ## --------------------- ## -## C++ Compiler Set up. ## +## C++ compiler set up. ## ## --------------------- ## # Look for a C++ compiler. @@ -39,7 +39,11 @@ # Students should create their test suite in tests/. Add the needed # configure options here. -AC_CONFIG_FILES([metalic/tests/Makefile extended/tests/Makefile]) +AC_CONFIG_FILES([ + metalic/tests/Makefile + extended/tests/Makefile + static/tests/Makefile +]) ## --------------- ## @@ -56,6 +60,8 @@ metalic/mlc/Makefile extended/Makefile extended/xtd/Makefile + static/Makefile + static/stc/Makefile ]) # Checks for library functions. Index: static/tests/properties.cc --- static/tests/properties.cc (revision 0) +++ static/tests/properties.cc (working copy) @@ -1,16 +1,16 @@ -#include <mlc/properties.hh> +#include <stc/properties.hh> #include <mlc/cmp.hh> // FIXME: Split this test into several smaller tests? For instance, // we have to test inheritance, properties/associated types, // ``external properties'', etc. The best approach is probably to -// browse mlc/properties.hh so as to make a list of the features to be +// browse stc/properties.hh so as to make a list of the features to be // checked. // Helper macro. #define my_type_of_(FromType, Typedef) \ - mlc_typeof_(my::category::my_cat, FromType, Typedef) + stc_typeof_(my::category::my_cat, FromType, Typedef) namespace my { @@ -30,7 +30,7 @@ | Namespace equipment. | `----------------------*/ - mlc_equip_namespace_with_properties(); + stc_equip_namespace_with_properties(); /*-----------. @@ -77,7 +77,7 @@ struct B; // Warning, this sugar might me remove from properties.hh. - mlc_set_super(B, A); + stc_set_super(B, A); /// Types associated to my::B. template<> @@ -100,7 +100,7 @@ typedef unsigned long ret; }; - struct B : public mlc_super_(B) + struct B : public stc_super_(B) { // Aliases. typedef my_type_of_(B, foo) foo_type; Index: static/tests/Makefile.am --- static/tests/Makefile.am (revision 0) +++ static/tests/Makefile.am (revision 0) @@ -0,0 +1,15 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +AM_CPPFLAGS = -I$(top_srcdir)/static -I$(top_srcdir)/metalic +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# +# when oln.m4 is available in the distribution. + +check_PROGRAMS = \ + properties + +properties_SOURCES = properties.cc + +TESTS = $(check_PROGRAMS) Index: static/stc/Makefile.am --- static/stc/Makefile.am (revision 0) +++ static/stc/Makefile.am (revision 0) @@ -0,0 +1,5 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +stcdir = $(includedir)/stc +nobase_stc_HEADERS = \ + properties.hh Index: static/stc/properties.hh --- static/stc/properties.hh (revision 0) +++ static/stc/properties.hh (working copy) @@ -25,13 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -// \file mlc/properties.hh +// \file stc/properties.hh // \brief Property mechanism. // // From Theo's presentation (olena-06-jan.pdf). -#ifndef METALIC_PROPERTIES_HH -# define METALIC_PROPERTIES_HH +#ifndef STATIC_PROPERTIES_HH +# define STATIC_PROPERTIES_HH # include <mlc/flags.hh> # include <mlc/typedef.hh> @@ -47,11 +47,11 @@ `------------*/ // Note: TypedefName *must* be of the form `typedef_::foo'. -# define mlc_internal_get_typedef(Type, TypedefName) \ +# define stc_internal_get_typedef(Type, TypedefName) \ typename TypedefName::template from_< Type >::ret // FIXME: Add support for hierarchies with several super classes. -# define mlc_equip_namespace_with_properties() \ +# define stc_equip_namespace_with_properties() \ \ /* ----------------------- */ \ /* Typedefs declarations. */ \ @@ -132,12 +132,12 @@ /** Set of vtypes associated with FROM_TYPE. */ \ typedef vtypes<category, from_type> types; \ /** Typedef in the current vtypes (may be mlc::not_found). */ \ - typedef mlc_internal_get_typedef(types, typedef_type) type; \ + typedef stc_internal_get_typedef(types, typedef_type) type; \ \ /** Implicit parent (i.e. super), if any. */ \ - typedef mlc_super(from_type) super; \ + typedef stc_super(from_type) super; \ /** Pseudosuper class, if any. */ \ - typedef mlc_internal_get_typedef(types, typedef_::pseudosuper_type) \ + typedef stc_internal_get_typedef(types, typedef_::pseudosuper_type) \ pseudosuper; \ \ typedef typename \ @@ -204,12 +204,12 @@ typedef mlc_ret(ext_type) type; \ \ /** Implicit parent (i.e. super), if any. */ \ - typedef mlc_super(from_type) super; \ + typedef stc_super(from_type) super; \ /** Pseudosuper class, if any. */ \ /* FIXME: Looking for this information is not elegant. Have a */ \ - /* look at metalic/tests/properties.cc for a better suggestion. */ \ + /* look at static/tests/properties.cc for a better suggestion. */ \ typedef vtypes<category, from_type> types; \ - typedef mlc_internal_get_typedef(types, typedef_::pseudosuper_type) \ + typedef stc_internal_get_typedef(types, typedef_::pseudosuper_type) \ pseudosuper; \ \ typedef typename \ @@ -345,8 +345,8 @@ /* FIXME: I don't know this macro will be really usable; what if T is a template class? */ -// mlc_set_super_type(T, S) to declare the immediate base class S of T -# define mlc_set_super(Type, Super) \ +/// \def Declare the immediate base class \a Super of \a Type. +# define stc_set_super(Type, Super) \ template <> \ struct set_super_type<Type> \ { \ @@ -354,20 +354,20 @@ } /// \def Get the immediate base class of T (version with typename). -# define mlc_super(T) \ +# define stc_super(T) \ typename set_super_type<T>::ret /// \def Get the immediate base class of T (version without typename). -# define mlc_super_(T) \ +# define stc_super_(T) \ set_super_type<T>::ret /// Get the property \a Typedef from \a FromType (version with typename). -#define mlc_typeof(Category, FromType, Typedef) \ +#define stc_typeof(Category, FromType, Typedef) \ typename typeof_<Category, FromType, typedef_:: Typedef##_type >::ret /// Get the property \a Typedef from \a FromType (version without typename). -#define mlc_typeof_(Category, FromType, Typedef) \ +#define stc_typeof_(Category, FromType, Typedef) \ typeof_<Category, FromType, typedef_:: Typedef##_type >::ret -#endif // ! METALIC_PROPERTIES_HH +#endif // ! STATIC_PROPERTIES_HH Index: static/Makefile.am --- static/Makefile.am (revision 0) +++ static/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +SUBDIRS = stc tests Index: Makefile.am --- Makefile.am (revision 423) +++ Makefile.am (working copy) @@ -1,3 +1,3 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- -SUBDIRS = build-aux metalic extended +SUBDIRS = build-aux metalic extended static Index: metalic/tests/Makefile.am --- metalic/tests/Makefile.am (revision 423) +++ metalic/tests/Makefile.am (working copy) @@ -11,7 +11,6 @@ case \ if \ is_a \ - properties \ ret \ switch \ typedef @@ -19,7 +18,6 @@ case_SOURCES = case.cc if_SOURCES = if.cc is_a_SOURCES = is_a.cc -properties_SOURCES = properties.cc ret_SOURCES = ret.cc switch_SOURCES = switch.cc typedef_SOURCES = typedef.cc Index: metalic/mlc/Makefile.am --- metalic/mlc/Makefile.am (revision 423) +++ metalic/mlc/Makefile.am (working copy) @@ -13,7 +13,6 @@ is_a.hh \ logic.hh \ pair.hh \ - properties.hh \ ret.hh \ to_string.hh \ type.hh \

1 0

423: Catch up with recent changes and fix some tests of Metalic.
by Roland Levillain 14 Mar '06

14 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with recent changes and fix some tests of Metalic. * metalic/mlc/properties.hh (mlc_equip_namespace_with_properties): Catch up with recent changes in typedef.hh/ret.hh. Don't declare a local `ret' typedef; include mlc/ret.hh, and use the `mlc_ret' macro instead. * metalic/mlc/cmp.hh (eq_<T, T>): Solve ambiguous calls to ensure(). * metalic/tests/ret.cc: Include mlc/ret.hh instead of mlc/typedef.hh. * extended/tests/Makefile.am (mlcdir, nobase_mlc_HEADERS): Remove. (AM_CPPFLAGS): New. * extended/xtd/Makefile.am: New file. extended/tests/Makefile.am | 8 ++++++-- extended/xtd/Makefile.am | 6 ++++++ metalic/mlc/cmp.hh | 3 +++ metalic/mlc/properties.hh | 7 ++----- metalic/tests/ret.cc | 2 +- 5 files changed, 18 insertions(+), 8 deletions(-) Index: extended/xtd/Makefile.am --- extended/xtd/Makefile.am (revision 0) +++ extended/xtd/Makefile.am (revision 0) @@ -0,0 +1,6 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +xtddir = $(includedir)/xtd + +# FIXME: To be filled. +#nobase_xtd_HEADERS = Index: extended/tests/Makefile.am --- extended/tests/Makefile.am (revision 422) +++ extended/tests/Makefile.am (working copy) @@ -1,4 +1,8 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -mlcdir = $(includedir)/xtd -nobase_mlc_HEADERS = \ +AM_CPPFLAGS = -I$(top_srcdir)/extended +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# +# when oln.m4 is available in the distribution. Index: metalic/tests/ret.cc --- metalic/tests/ret.cc (revision 422) +++ metalic/tests/ret.cc (working copy) @@ -1,5 +1,5 @@ # include <iostream> -# include <mlc/typedef.hh> +# include <mlc/ret.hh> struct yes { Index: metalic/mlc/properties.hh --- metalic/mlc/properties.hh (revision 422) +++ metalic/mlc/properties.hh (working copy) @@ -35,6 +35,7 @@ # include <mlc/flags.hh> # include <mlc/typedef.hh> +# include <mlc/ret.hh> # include <mlc/bool.hh> # include <mlc/cmp.hh> # include <mlc/if.hh> @@ -56,10 +57,6 @@ /* Typedefs declarations. */ \ /* ----------------------- */ \ \ - /* FIXME: Should we use the `ret' typdef defined in the global */ \ - /* namespace instead ? (see at the end mlc/typedef.hh). */ \ - mlc_decl_typedef(ret); \ - \ /* Declare the ``uplink'' typedef (access to a pseudosuper class). */ \ mlc_decl_typedef(pseudosuper_type); \ \ @@ -204,7 +201,7 @@ /** Set of vtypes associated with FROM_TYPE. */ \ typedef ext_vtype<category, from_type, typedef_type> ext_type; \ /** Typedef in the current vtypes (maybe mlc::not_found). */ \ - typedef mlc_internal_get_typedef(ext_type, typedef_::ret) type; \ + typedef mlc_ret(ext_type) type; \ \ /** Implicit parent (i.e. super), if any. */ \ typedef mlc_super(from_type) super; \ Index: metalic/mlc/cmp.hh --- metalic/mlc/cmp.hh (revision 422) +++ metalic/mlc/cmp.hh (working copy) @@ -67,6 +67,9 @@ struct eq_ <T, T> : private assert_< is_not_value<T> >, public true_ { + // Solve the ambiguity on ensure(), a static member function + // inherited both from true_ and assert_. + using true_::ensure; }; /// \}

1 0

422: Minor addition.
by Thierry Geraud 10 Mar '06

10 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Thierry Geraud <theo(a)lrde.epita.fr> Minor addition. * mlc/comma.hh: Add version for 4 commas. comma.hh | 1 + 1 files changed, 1 insertion(+) Index: mlc/comma.hh --- mlc/comma.hh (revision 421) +++ mlc/comma.hh (working copy) @@ -34,6 +34,7 @@ # define mlc_comma_1(a, b) a, b # define mlc_comma_2(a, b, c) a, b, c # define mlc_comma_3(a, b, c, d) a, b, c, d +# define mlc_comma_4(a, b, c, d, e) a, b, c, d, e #endif // ! METALIC_COMMA_HH

1 0

proto-1.0 421: Watersnakes : add reconstruction by erosion with tarjan union-find.
by Nicolas Widynski 09 Mar '06

09 Mar '06

https://svn/svn/oln/prototypes/proto-1.0/olena Index: ChangeLog from Nicolas Widynski <nicolas.widynski(a)lrde.epita.fr> Watersnakes : add reconstruction by erosion with tarjan union-find. * oln/morpho/watersnakes.hh: Add reconstruction by erosion with tarjan union-find (quicker). watersnakes.hh | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) Index: oln/morpho/watersnakes.hh --- oln/morpho/watersnakes.hh (revision 420) +++ oln/morpho/watersnakes.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004, 2006 EPITA Research and Development Laboratory +// Copyright (C) 2006 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 @@ -37,9 +37,18 @@ # include <oln/level/compare.hh> # include <oln/morpho/gradient_morpho.hh> +# include <oln/basics2d.hh> +# include <oln/level/fill.hh> +# include <ntg/basics.hh> + +# include "misc.hh" +# include "Rs.hh" + + const float INFTY = 1000000000000.f; # define WSHED 255 # define MASK_VALUE -1 +typedef enum version_t { TARJAN = 0, NORMAL = 1 } version; namespace oln { @@ -66,7 +75,6 @@ if (input[n] < input[p]) LS[p] = LS[p] > (float)(input[p] - input[n]) ? LS[p] : (float)(input[p] - input[n]); } - LS[p] = LS[p] == 256 ? 0 : LS[p]; } return LS; } @@ -412,7 +420,8 @@ const image2d<T>& orig, const image2d<T2>& marqueur, const window2d& ng, - int b) + int b, + version v) { image2d<T> res(input.size()); image2d<int> label; @@ -431,7 +440,16 @@ for_all(p) propagate_minima_(input, mark, ng, p); - image2d<T> recon = reconstruction_by_erosion(input, mark); + image2d<T> recon; + + if (v == NORMAL) + recon = reconstruction_by_erosion(input, mark); + else + { // version de tarjan + typedef Rs::tarjan< image2d<T2>, image2d<T> > op_type; + op_type op(marqueur, input, ng); + recon = op.output; + } image2d<float> LS = lower_slope(recon, ng); label = init_watershed_(recon, mark, ng, nb_compo); @@ -476,12 +494,13 @@ watersnakes_(const image2d<T>& input, const image2d<T2>& marqueur, const window2d& ng, - int b) + int b, + version v) { image2d<T> grad(input.size()); grad = morpho::gradient_morpho(input, ng); - return watershed_line(grad, input, marqueur, ng, b); + return watershed_line(grad, input, marqueur, ng, b, v); } @@ -493,9 +512,10 @@ watersnakes(const image2d<T>& input, const image2d<T2>& marqueur, const window2d& ng, - int b) + int b, + version v = TARJAN) { - return impl::watersnakes_(input, marqueur, ng, b); + return impl::watersnakes_(input, marqueur, ng, b, v); } } // end of oln::morpho

1 0

proto-1.0 420: Implementation of watersnake algorithm.
by Nicolas Widynski 09 Mar '06

09 Mar '06

https://svn/svn/oln/prototypes/proto-1.0/olena Index: ChangeLog from Nicolas Widynski <nicolas.widynski(a)lrde.epita.fr> Implementation of watersnake algorithm. * oln/morpho/watersnakes.hh: New. Watershed + snake algorithm. Snakes aim at smoothing boundaries. Note: This algorithm is non optimized for the moment. watersnakes.hh | 505 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 505 insertions(+) Index: oln/morpho/watersnakes.hh --- oln/morpho/watersnakes.hh (revision 0) +++ oln/morpho/watersnakes.hh (revision 0) @@ -0,0 +1,505 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2006 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 OLENA_MORPHO_WATERSNAKES_HH +# define OLENA_MORPHO_WATERSNAKES_HH + +# include <string> + +# include <oln/basics.hh> +# include <oln/morpho/erosion.hh> +# include <oln/morpho/geodesic_erosion.hh> +# include <oln/morpho/reconstruction.hh> +# include <oln/level/compare.hh> +# include <oln/morpho/gradient_morpho.hh> + +const float INFTY = 1000000000000.f; +# define WSHED 255 +# define MASK_VALUE -1 + +namespace oln { + + namespace morpho { + + namespace impl { + + template<class T> + image2d<float> + lower_slope(const image2d<T>& input, + const window2d& ng) + { + image2d<float> LS(input.size()); + oln_iter_type(image2d<T>) p(input); + + for_all(p) + { + LS[p] = 0; + oln_neighb_type(window2d) n(ng, p); + for_all(n) + { + if (input.hold(n)) + if (p != n) + if (input[n] < input[p]) + LS[p] = LS[p] > (float)(input[p] - input[n]) ? LS[p] : (float)(input[p] - input[n]); + } + LS[p] = LS[p] == 256 ? 0 : LS[p]; + } + return LS; + } + + template <class T> + float + local_grad(const image2d<T>& input, + const image2d<float>& LS, + const point2d& p, + const point2d& n) + { + if (input[p] < input[n]) + return LS[n]; + if (input[p] > input[n]) + return LS[p]; + return std::min(LS[p], LS[n]); + } + + + float chamfer_distance(const point2d& p, const point2d& p2) + { + return sqrt((p.row() - p2.row()) * (p.row() - p2.row()) + + (p.col() - p2.col()) * (p.col() - p2.col())); + } + + + template <typename T, typename T2> + image2d<T> + reconstruction_by_erosion(const image2d<T>& input, + const image2d<T2>& marqueur) + { + image2d<T> out(input.size()); + image2d<T> tmp; + bool stop = false; + + oln_iter_type(image2d<T>) p(input); + + for_all(p) + out[p] = marqueur[p] == false ? 0 : 255; + + while (stop == false) + { + stop = true; + tmp = morpho::erosion(out, win_c4p()); + for_all(p) + { + if (out[p] != ntg::max(input[p], tmp[p])) + { + stop = false; + out[p] = ntg::max(input[p], tmp[p]); + } + } + } + return out; + } + + bool futur_fwd(const point2d& n, const point2d& p) + { + if ((n.row() == p.row() and n.col() == p.col() + 1) or + n.row() > p.row()) + return true; + return false; + } + + + bool futur_bkd(const point2d& n, const point2d& p) + { + if ((n.row() == p.row() and n.col() == p.col() - 1) or + n.row() < p.row()) + return true; + return false; + } + + template <typename T> + const T point_at(const image2d<T>& ima, const point2d& p, int x, int y) + { + int x1 = p.row(); + int y1 = p.col(); + + if (x1 + x >= 0 and x1 + x < ima.size().nrows() and + y1 + y >= 0 and y1 + y < ima.size().ncols()) + return ima(x1 + x, y1 + y); + return 0; + } + + template <typename T> + int nb_label(const image2d<T>& ima, const point2d& p, int x, int y, const T& l) + { + if (point_at(ima, p, x, y) == l) + return 1; + return 0; + } + + float compute_perimeter(const image2d<int>& label, + const point2d& p, + unsigned nb, + int b) + { + float n4 = nb_label(label, p, -1, 0, (int)nb) + nb_label(label, p, 1, 0, (int)nb) + + nb_label(label, p, 0, 1, (int)nb) + nb_label(label, p, 0, -1, (int)nb); + + float n8 = nb_label(label, p, -1, -1, (int)nb) + nb_label(label, p, 1, 1, (int)nb) + + nb_label(label, p, -1, 1, (int)nb) + nb_label(label, p, 1, -1, (int)nb); // p + + float nk = nb_label(label, p, -2, 1, (int)nb) + nb_label(label, p, -2, -1, (int)nb) + + nb_label(label, p, -1, 2, (int)nb) + nb_label(label, p, -1, -2, (int)nb) + + nb_label(label, p, 2, -1, (int)nb) + nb_label(label, p, 2, 1, (int)nb) + + nb_label(label, p, 1, 2, (int)nb) + nb_label(label, p, 1, -2, (int)nb); // p + return 2 * b * (0.26 * n4 + 0.19 * n8 + 0.06 * nk); + } + + + template <typename T> + bool is_a_boundary_point(const image2d<int>& label, + const window2d& ng, + const T& p, + unsigned& label_b) + { + oln_neighb_type(window2d) q(win_c4p(), p); + for_all (q) + if (label.hold(q)) + if (label[p] != label[q]) + { + label_b = label[q]; + return 1; + } + return 0; + } + + template <typename T> + bool + snake_iteration(image2d<T>& label, + const window2d& ng, + const image2d<float *>& dist, + unsigned nb_compo, + int b) + { + float dist_min = INFTY; + point2d p_replace; + unsigned label_replace; + + oln_iter_type(image2d<T>) p(label); + for_all(p) + { + unsigned label_b; + if (is_a_boundary_point(label, ng, p, label_b)) + { + float tmp = - dist[p][label[p] - 1] + compute_perimeter(label, p, label[p], b) + + dist[p][label_b - 1] - compute_perimeter(label, p, label_b, b); + if (dist_min > tmp) + { + dist_min = tmp; + p_replace = p; + label_replace = label_b; + } + } + } + if (dist_min < 0) + { + label[p_replace] = label_replace; + return 1; + } + return 0; + } + + + template <class T, typename T2> + image2d<float*> + topographic_distance(const image2d<T>& input, + const image2d<float>& LS, + const image2d<T2>& marqueur, + image2d<int>& label, + const window2d& ng, + unsigned nb_compo) + { + image2d<float*> dist(input.size()); + oln_iter_type(image2d<T>) p(input); + oln_bkd_iter_type(image2d<T>) p2(input); + + for_all(p) + { + dist[p] = new float[nb_compo]; + + if (marqueur[p] == false) + { + dist[p][label[p] - 1] = input[p]; + for (int i = 0; i < nb_compo; i++) + if (i != label[p] - 1) + dist[p][i] = INFTY; + } + else + { + for (int i = 0; i < nb_compo; i++) + dist[p][i] = INFTY; + } + + } + + int i = 0; + + bool stop = false; + while (stop == false) + { + stop = true; + // forward + for_all(p) + { + oln_neighb_type(window2d) n(ng, p); + for_all(n) + { + if (input.hold(n) and futur_fwd(n, p)) + { + float grad = local_grad(input, LS, p, n); + float tmp = chamfer_distance(p, n) * grad; + + for (int k = 0; k < nb_compo; k++) + if (dist[p][k] + tmp < dist[n][k]) + { + dist[n][k] = dist[p][k] + tmp; + stop = false; + } + } + } + } + + // backward + for_all(p2) + { + oln_neighb_type(window2d) n(ng, p2); + for_all(n) + { + if (input.hold(n) and futur_bkd(n, p2)) + { + float grad = local_grad(input, LS, p2, n); + float tmp = chamfer_distance(p2, n) * grad; + + for (int k = 0; k < nb_compo; k++) + if (dist[p2][k] + tmp < dist[n][k]) + { + dist[n][k] = dist[p2][k] + tmp; + stop = false; + } + } + } + } + if (++i > 20) + stop = true; + } + return dist; + } + + template <typename T> + std::ostream& operator<<(std::ostream& ostr, const image2d<T>& ima) + { + for (int i = 0; i < ima.size().nrows(); i++) + { + for (int j = 0; j < ima.size().ncols(); j++) + ostr << ima(i,j) << "\t"; + ostr << std::endl; + } + return ostr; + } + + template <typename T, typename T2> + void propagate_minima_(const image2d<T>& input, + image2d<T2>& mark, + const window2d& ng, + const point2d& p) + { + if (mark[p] == false) + { + oln_neighb_type(window2d) n(ng, p); + for_all(n) + { + if (input.hold(n) and input[p] == input[n] and mark[n] == true) + { + mark[n] = false; + propagate_minima_(input, mark, ng, n); + } + } + } + } + + + template <typename T, typename T2, typename T3> + void mark_compo_(const image2d<T>& input, + image2d<T2>& label, + const image2d<T3>& minima, + const window2d& win, + const point2d& p, + unsigned& compo) + { + if (minima[p] == false and label[p] == MASK_VALUE) + { + bool test = false; + oln_neighb_type(window2d) q(win, p); + for_all (q) + if (input.hold(q) and minima[q] == false and label[q] != MASK_VALUE) + { + test = true; + label[p] = label[q]; + } + if (test == true) + { + for_all (q) + if (input.hold(q) and minima[q] == false and label[q] == MASK_VALUE) + mark_compo_(input, label, minima, win, q, compo); + } + if (test == false) + { + label[p] = ++compo; + for_all (q) + if (input.hold(q) and minima[q] == false) + mark_compo_(input, label, minima, win, q, compo); + } + } + } + + + template <typename T, typename T2> + image2d<int> + init_watershed_(const image2d<T>& input, + const image2d<T2>& minima, + const window2d& win, + unsigned& cpt) + { + image2d<int> output(input.size()); + + level::fill(output, MASK_VALUE); + unsigned tmp; + + oln_iter_type(image2d<T>) p(input); + for_all (p) + if (minima[p] == false) + mark_compo_(input, output, minima, win, p, cpt); + + return output; + } + + template<typename T, typename T2> + image2d<T> + watershed_line(const image2d<T>& input, + const image2d<T>& orig, + const image2d<T2>& marqueur, + const window2d& ng, + int b) + { + image2d<T> res(input.size()); + image2d<int> label; + image2d<T2> mark(input.size()); + oln_iter_type(image2d<T>) p(input); + image2d<bool> is_wshed_line(input.size()); + float dist; + float tmp; + unsigned nb_compo = 0; + + int i = 0; + + for_all(p) + mark[p] = marqueur[p]; + + for_all(p) + propagate_minima_(input, mark, ng, p); + + image2d<T> recon = reconstruction_by_erosion(input, mark); + + image2d<float> LS = lower_slope(recon, ng); + label = init_watershed_(recon, mark, ng, nb_compo); + + image2d<float*> topo = topographic_distance(recon, LS, mark, label, ng, nb_compo); + + for_all(p) + { + unsigned mini_label = 1; + float mini_topo = topo[p][0]; + int h = 1; + for (; h < nb_compo; h++) + if (mini_topo > topo[p][h]) + { + mini_topo = topo[p][h]; + mini_label = h + 1; + } + label[p] = mini_label; + } + while (snake_iteration(label, ng, topo, nb_compo, b)) + ; + + level::fill(res, 0); + for_all(p) + { + oln_neighb_type(window2d) q(win_c4p(), p); + for_all (q) + if (input.hold(q)) + if (label[p] != label[q] and res[q] != WSHED) + res[p] = WSHED; + if (res[p] == 0) + res[p] = orig[p]; + } + + return res; + } + + + + template<typename T, typename T2> + image2d<T> + watersnakes_(const image2d<T>& input, + const image2d<T2>& marqueur, + const window2d& ng, + int b) + { + image2d<T> grad(input.size()); + + grad = morpho::gradient_morpho(input, ng); + return watershed_line(grad, input, marqueur, ng, b); + } + + + } //end of oln::morpho::impl + + + template<typename T, typename T2> + image2d<T> + watersnakes(const image2d<T>& input, + const image2d<T2>& marqueur, + const window2d& ng, + int b) + { + return impl::watersnakes_(input, marqueur, ng, b); + } + + } // end of oln::morpho + +} // end of oln + +#endif // ! OLENA_MORPHO_WATERSNAKES_HH

1 0

419: Some non significative update.
by Thierry Geraud 07 Mar '06

07 Mar '06

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Thierry Geraud <theo(a)lrde.epita.fr> Some non significative update. * mlc/ret.hh (typedef_::ret): Move from namespace global to mlc and update file contents. * mlc/bool.hh (assert_::ensure): New method so that the user can form "assert_<bexpr, error_msg>::ensure();" * mlc/TODO: New. TODO | 5 +++++ bool.hh | 2 ++ ret.hh | 13 ++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) Index: mlc/ret.hh --- mlc/ret.hh (revision 418) +++ mlc/ret.hh (working copy) @@ -38,14 +38,21 @@ ** a default equipment for this particular typedef. FIXME: doc */ +namespace mlc +{ + mlc_decl_typedef(ret); -# define mlc_ret(Type) typename typedef_::ret::from_<Type>::ret +} // end of namespace mlc + + + +# define mlc_ret(Type) typename mlc::typedef_::ret::from_<Type>::ret // test code -# define mlc_ret2(Type) typename typedef_::ret::from_<Type>::ret2 +# define mlc_ret2(Type) typename mlc::typedef_::ret::from_<Type>::ret2 namespace mlc @@ -53,7 +60,7 @@ template <typename T> struct ret_found_in_ - : public mlc::eq_< typename typedef_::ret::from_<T>::ret2::first_elt, + : public mlc::eq_< typename mlc::typedef_::ret::from_<T>::ret2::first_elt, mlc::found > {}; Index: mlc/bool.hh --- mlc/bool.hh (revision 418) +++ mlc/bool.hh (working copy) @@ -278,6 +278,8 @@ struct assert_ : public virtual internal::check_<bexpr, typename bexpr::is_true> { + public: + static void ensure() {} protected: assert_() {} }; Index: mlc/TODO --- mlc/TODO (revision 0) +++ mlc/TODO (revision 0) @@ -0,0 +1,5 @@ + -*- outline -*- + +* files + +create assert.hh from bool.hh

1 0

[Olena-patches]proto-1.0 416 : Watershed by hill climbing.
by Nicolas Widynski 03 Mar '06

03 Mar '06

https://svn/svn/oln/prototypes/proto-1.0/olena Index: ChangeLog from Nicolas Widynski <nicolas.widynski(a)lrde.epita.fr> Watershed by hill climbing. * oln/morpho/watershed.hh: New. Watershed by hill climbing. Note: It is necessary to use a lower completion algorithm on the input image before using the watershed by hill climbing. watershed.hh | 299 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) Index: oln/morpho/watershed.hh --- oln/morpho/watershed.hh (revision 0) +++ oln/morpho/watershed.hh (revision 0) @@ -0,0 +1,299 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 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 OLENA_MORPHO_WATERSHED_HH +# define OLENA_MORPHO_WATERSHED_HH + +# include <vector> + +# include <mlc/cmp.hh> + +# include <oln/utils/record.hh> +# include <oln/basics.hh> +# include <oln/morpho/local.hh> +# include <oln/core/2d/window2d.hh> +# include <oln/utils/clone.hh> +# include <oln/level/fill.hh> + +#include <oln/io/write_image.hh> + +# define WSHED 255 +# define MASK_VALUE -1 + +namespace oln { + + namespace morpho { + + // Watershed by hill climbing + template<typename I, typename W> + oln_type_of(I, concrete) watershed(const abstract::image<I>& input, + const abstract::window<W>& win); + + + namespace impl { + + + template <typename I, typename II, typename W> + void propagate_minima_(const abstract::image<I>& input, + abstract::image<II>& minima, + const abstract::window<W>& win, + const oln_type_of(I, point)& p) + { + if (minima[p] == false) + { + oln_wn_type_of(W, fwd_iter) q(win); + for_all_q_of_p (q, p) + if (input.hold(q) and input[p] == input[q] and minima[q] == true) + { + minima[q] = false; + propagate_minima_(input, minima, win, q); + } + } + } + + + template <typename I, typename W> + oln_ch_concrete_type(I, ntg::bin) + set_minima_zero_(abstract::image<I>& input, + const abstract::window<W>& win) + { + oln_ch_concrete_type(I, ntg::bin) output(input.size(), "output"); + bool is_min = true; + + oln_type_of(I, fwd_piter) p(input.size()); + for_all_p (p) + { + is_min = true; + oln_wn_type_of(W, fwd_iter) q(win); + for_all_q_of_p (q, p) + if (input.hold(q) and input[p] > input[q]) + is_min = false; + output[p] = is_min; + } + for_all_p (p) + if (output[p] == false) + propagate_minima_(input, output, win, p); + for_all_p (p) + if (output[p] == true) + input[p] = 0; + return output; + } + + + template <typename I, typename II, typename III, typename W> + void mark_compo_(const abstract::image<I>& input, + abstract::image<II>& label, + const abstract::image<III>& minima, + const abstract::window<W>& win, + const oln_type_of(I, point)& p, + unsigned& compo) + { + if (minima[p] == true and label[p] == MASK_VALUE) + { + bool test = false; + oln_wn_type_of(W, fwd_iter) q(win); + for_all_q_of_p (q, p) + if (input.hold(q) and minima[q] == true and label[q] != MASK_VALUE) + { + test = true; + label[p] = label[q]; + } + if (test == true) + { + for_all_q_of_p (q, p) + if (input.hold(q) and minima[q] == true and label[q] == MASK_VALUE) + mark_compo_(input, label, minima, win, q, compo); + + } + if (test == false) + { + label[p] = ++compo; + for_all_q_of_p (q, p) + if (input.hold(q) and minima[q] == true) + mark_compo_(input, label, minima, win, q, compo); + } + } + } + + + + template <typename I, typename II, typename W> + oln_ch_concrete_type(I, int) + init_watershed_(const abstract::image<I>& input, + const abstract::image<II>& minima, + const abstract::window<W>& win) + { + oln_ch_concrete_type(I, int) output(input.size(), "mask"); + + level::fill(output, MASK_VALUE); + unsigned cpt = 0; + unsigned tmp; + + oln_type_of(I, fwd_piter) p(input.size()); + for_all_p (p) + { + if (minima[p] == true) + { + mark_compo_(input, output, minima, win, p, cpt); + } + } + return output; + } + + template <typename I, typename II, typename W> + std::vector<std::vector<oln_type_of(I, point)> > + compute_list_(const abstract::image<I>& input, + const abstract::image<II>& minima, + const abstract::window<W>& win) + { + typedef oln_type_of(I, point) point_type; + std::vector<std::vector<point_type> > l(256); + oln_type_of(I, fwd_piter) p(input.size()); + bool add = false; + + for_all_p (p) + { + add = false; + oln_wn_type_of(W, fwd_iter) q(win); + for_all_q_of_p (q, p) + if (input.hold(q)) + if (input[q] != input[p]) + add = true; + if (add == true) + l[input[p]].push_back(p); + } + return l; + } + + template <typename I, typename W> + oln_ch_concrete_type(I, std::vector<oln_type_of(I, point)>) + inverse_LS_(const abstract::image<I>& input, + const abstract::window<W>& win) + { + oln_ch_concrete_type(I, std::vector<oln_type_of(I, point)>) output(input.size(), "inverse_ls"); + + + oln_type_of(I, fwd_piter) p(input.size()); + for_all_p (p) + { + oln_type_of(I, point) pt = p; + oln_wn_type_of(W, fwd_iter) q(win); + int max = 0; + for_all_q_of_p (q, p) + if (input.hold(q)) + max = (int)(input[q] - input[p]) > max ? (int)(input[q] - input[p]) : max; + if (max) + for_all_q_of_p (q, p) + if (input.hold(q) and (int)(input[q] - input[p]) == max) + output.at(p).push_back(q); + } + return output; + } + + // Fwd decl of watershed facade. + + template<typename I, typename W> + oln_type_of(I, concrete) + watershed_(const abstract::image<I>& input, + const abstract::window<W>& win) + { + oln_type_of(I, concrete) output(input.size(), "out"); + oln_type_of(I, concrete) in; + oln_ch_concrete_type(I, int) label; + oln_ch_concrete_type(I, ntg::bin) mask(input.size(), "mask"); + oln_ch_concrete_type(I, std::vector<oln_type_of(I, point)>) inverse_ls; + std::vector<std::vector<oln_type_of(I, point)> > S; + + in = clone(input); + mask = set_minima_zero_(in, win); + label = init_watershed_(in, mask, win); + S = compute_list_(in, mask, win); + inverse_ls = inverse_LS_(in, win); + + typename std::vector<oln_type_of(I, point)>::const_iterator it; + + for (int i = 0; i < 256; i++) + for (it = S[i].begin(); it != S[i].end(); it++) + { + typename std::vector<oln_type_of(I, point)>::const_iterator it2; + for (it2 = inverse_ls.at(*it).begin(); it2 != inverse_ls.at(*it).end(); it2++) + { + + bool stop = false; + typename std::vector<oln_type_of(I, point)>::const_iterator it3; + for (int j = i + 1; j < 256 and stop == false; j++) + for (it3 = S[j].begin(); it3 != S[j].end() and stop == false; it3++) + if (*it3 == *it2) + stop = true; + + if (stop == true) + { + if (label[*it2] == MASK_VALUE) + label[*it2] = label[*it]; + else + if (label[*it2] != WSHED and label[*it2] != label[*it]) + label[*it2] = WSHED; + } + } + } + + oln_type_of(I, fwd_piter) p(input.size()); + for_all_p (p) + output[p] = label[p] == MASK_VALUE ? 0 : label[p]; + + return output; + } + + + } // end of namespace oln::morpho::impl + + + + + /// Generic watershed (facade). + + template<typename I, typename W> + oln_type_of(I, concrete) watershed(const abstract::image<I>& input, + const abstract::window<W>& win) + { + mlc::eq<oln_type_of(I, grid), oln_wn_type_of(W, grid)>::ensure(); + entering("morpho::watershed"); + + oln_type_of(I, concrete) output("output"); + output = impl::watershed_(input.exact(), win.exact()); + + exiting("morpho::watershed"); + return output; + } + + + } // end of namespace oln::morpho + +} // end of namespace oln + + +#endif // ! OLENA_MORPHO_WATERSHED_HH

1 0