October 2008 - Olena-patches

cleanup-2008 2527: Some fixes.
by Thierry Geraud 06 Oct '08

06 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Some fixes. * mln/morpho/erosion.spe.hh: Fix missing namespace. * mln/morpho/includes.hh: Fix missing include. * mln/canvas/browsing/fwd.hh: Remove useless trace. canvas/browsing/fwd.hh | 6 ------ morpho/erosion.spe.hh | 2 +- morpho/includes.hh | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2526) +++ mln/morpho/erosion.spe.hh (working copy) @@ -487,7 +487,7 @@ const I& input, const W& win) { if (win.is_centered()) - return erosion_on_set_centered(input, win); + return impl::erosion_on_set_centered(input, win); else return impl::generic::erosion_on_set(input, win); } Index: mln/morpho/includes.hh --- mln/morpho/includes.hh (revision 2526) +++ mln/morpho/includes.hh (working copy) @@ -40,6 +40,8 @@ # include <mln/core/concept/window.hh> # include <mln/core/concept/neighborhood.hh> +# include <mln/core/routine/clone.hh> + # include <mln/value/ops.hh> # include <mln/accu/min.hh> Index: mln/canvas/browsing/fwd.hh --- mln/canvas/browsing/fwd.hh (revision 2526) +++ mln/canvas/browsing/fwd.hh (working copy) @@ -93,19 +93,13 @@ mln_precondition(f.input.has_data()); typedef typename F::I I; mln_fwd_piter(I) p(f.input.domain()); - trace::entering("canvas::browsing::fwd::init"); f.init(); - trace::exiting("canvas::browsing::fwd::init"); for_all(p) { f.p = p; - trace::entering("canvas::browsing::fwd::next"); f.next(); - trace::exiting("canvas::browsing::fwd::next"); } - trace::entering("canvas::browsing::fwd::final"); f.final(); - trace::exiting("canvas::browsing::fwd::final"); trace::exiting("canvas::browsing::fwd"); }

1 0

cleanup-2008 2525: Prototype for bijective and 2 ways functions.
by Alexandre Abraham 06 Oct '08

06 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Prototype for bijective and 2 ways functions. Not tested yet so it goes to sandbox * abraham/mln/fun: New. * abraham/mln/fun/v2w2v: New. * abraham/mln/fun/v2w2v/cos.hh: New Example of bijective function using cosinus. * abraham/mln/fun/v2w_w2v: New. * abraham/mln/fun/v2w_w2v/norm.hh: New Example of 2 way function using norm. * abraham/mln/core: New. * abraham/mln/core/concept: New. * abraham/mln/core/concept/function.hh: New Definition of bijective and 2 way function concepts (Function_v2w2v and Function_v2w_w2v). * abraham/mln/math: New. * abraham/mln/math/cos.hh: New templated mln::math::cos function. * abraham/mln/math/acos.hh: New templated mln::math::acos function. core/concept/function.hh | 513 +++++++++++++++++++++++++++++++++++++++++++++++ fun/v2w2v/cos.hh | 95 ++++++++ math/acos.hh | 65 +++++ math/cos.hh | 65 +++++ 4 files changed, 738 insertions(+) Index: abraham/mln/fun/v2w2v/cos.hh --- abraham/mln/fun/v2w2v/cos.hh (revision 0) +++ abraham/mln/fun/v2w2v/cos.hh (revision 0) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_FUN_V2W2V_COS_HH +# define MLN_FUN_V2W2V_COS_HH + +/*! \file mln/fun/v2w2v/cos.hh + * + * \brief Cos functor. + * + * \see mln/math/. + */ + +# include <mln/core/concept/function.hh> +# include <mln/trait/value_.hh> + +# include <mln/math/cos.hh> +# include <mln/math/acos.hh> + + +namespace mln +{ + + namespace fun + { + + namespace v2w2v + { + + /*! \brief Cosinus bijective functor. + * + * \c V is the type of input values and the result type. + * + * \see mln::math::cos. + */ + template <typename V> + struct cos : public Function_v2w2v< cos<V> > + { + typedef V result; + V operator()(const V& v) const; + V f_1 (const V& v) const; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + inline + V + cos<V>::operator()(const V& v) const + { + return mln::math::cos (v); + } + + template <typename V> + inline + V + cos<V>::f_1(const V& v) const + { + return mln::math::acos (v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::v2w2v + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_V2W2V_COS_HH Index: abraham/mln/fun/v2w_w2v/norm.hh Index: abraham/mln/core/concept/function.hh --- abraham/mln/core/concept/function.hh (revision 0) +++ abraham/mln/core/concept/function.hh (revision 0) @@ -0,0 +1,513 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_CONCEPT_FUNCTION_HH +# define MLN_CORE_CONCEPT_FUNCTION_HH + +/*! \file mln/core/concept/function.hh + * + * \brief Definition of several concepts of functions. + */ + +# include <mln/core/concept/object.hh> + + +namespace mln +{ + + // Fwd decls. + template <typename E> struct Function; + template <typename E> struct Function_v2v; + template <typename E> struct Function_v2w2v; + template <typename E> struct Function_v2w_w2v; + template <typename E> struct Function_i2v; + template <typename E> struct Function_p2v; + template <typename E> struct Function_v2b; + template <typename E> struct Function_p2b; + template <typename E> struct Function_p2p; + template <typename E> struct Function_x2x; + + template <typename E> struct Function_vv2v; + + + /// Function category flag type. + template <> + struct Function<void> + { + typedef Object<void> super; + }; + + + /*! \brief Base class for implementation of function-objects. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function : public Object<E> + { + typedef Function<void> category; + + /* + An operator() has to be provided. Its signature depends + on the particular function-object one considers. + */ + protected: + Function(); + Function(const Function&); + }; + + + /*-----------------. + | Value -> Value. | + `-----------------*/ + + template <> + struct Function_v2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value to value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_v2v : public Function<E> + { + typedef Function_v2v<void> category; + protected: + Function_v2v(); + Function_v2v(const Function_v2v&); + }; + + + /*----------------------------. + | Value <-> Value (Bijective) | + `----------------------------*/ + + // FIXME : should it also be a v2v function? + + template <> + struct Function_v2w2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value V to value W and vice versa. + * + * The parameter \a E is the exact type. + */ + + template <typename E> + struct Function_v2w2v : public Function<E> + { + typedef Function_v2w2v<void> category; + + /* + result operator() (value); + value f_1 (result); + */ + + protected: + Function_v2w2v(); + Function_v2w2v(const Function_v2w2v&); + }; + + + /*---------------------------. + | Value <-> Value (Two ways) | + `---------------------------*/ + + // FIXME : should it also be a v2v function? + + template <> + struct Function_v2w_w2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value V to value W and from W to V thanks to the previous + * value V. + * + * The parameter \a E is the exact type. + * + * eg: f : x -> norm(x) + * f_1: (x, n) -> x' := x / norm(x) * n + */ + + template <typename E> + struct Function_v2w_w2v : public Function<E> + { + typedef Function_v2w2v<void> category; + + /* + result operator() (value); + value f_1 (result, value); + */ + + protected: + Function_v2w_w2v(); + Function_v2w_w2v(const Function_v2w2v&); + }; + + + /*-----------------. + | Index -> Value. | + `-----------------*/ + + template <> + struct Function_i2v<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * index to value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_i2v : public Function_v2v<E> + { + typedef Function_i2v<void> category; + protected: + Function_i2v(); + Function_i2v(const Function_i2v&); + }; + + + /*-----------------. + | Point -> Value. | + `-----------------*/ + + template <> + struct Function_p2v<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from point to + * value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2v : public virtual Function_v2v<E> + { + typedef Function_p2v<void> category; + protected: + Function_p2v(); + Function_p2v(const Function_p2v&); + }; + + + /*----------------. + | Value -> bool. | + `----------------*/ + + template <> + struct Function_v2b<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from value to + * bool. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_v2b : public virtual Function_v2v<E> + { + typedef Function_v2b<void> category; + typedef bool result; + protected: + Function_v2b(); + Function_v2b(const Function_v2b&); + }; + + + /*----------------. + | Point -> bool. | + `----------------*/ + + template <> + struct Function_p2b<void> { typedef Function_p2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from point to + * bool. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2b : public Function_p2v<E>, + public Function_v2b<E> + { + typedef Function_p2b<void> category; + typedef bool result; + protected: + Function_p2b(); + Function_p2b(const Function_p2b&); + }; + + + /*-----------------. + | Point -> Point. | + `-----------------*/ + + template <> + struct Function_p2p<void> { typedef Function_p2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from point to + * point. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2p : public Function_p2v<E> + { + typedef Function_p2p<void> category; + protected: + Function_p2p(); + Function_p2p(const Function_p2p&); + }; + + + /*-------------------. + | Vector -> Vector. | + `-------------------*/ + + template <> + struct Function_x2x<void> { typedef Function_v2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from vector to + * vector. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_x2x : public Function_v2v<E> + { + typedef Function_x2x<void> category; + protected: + Function_x2x(); + Function_x2x(const Function_x2x&); + }; + + + /*--------------------. + | Vector <-> Vector. | + `--------------------*/ + + /*! + * \brief Base class for implementation of bijective function-objects from + * vector to vector. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Bijection_x2x : public Function_x2x< E > + { + /* + typedef invert; + invert inv() const; + */ + protected: + Bijection_x2x(); + }; + + + /*------------------------. + | Value, Value -> Value. | + `------------------------*/ + + template <> + struct Function_vv2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * a couple of values to a value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_vv2v : public Function<E> + { + typedef Function_vv2v<void> category; + protected: + Function_vv2v(); + Function_vv2v(const Function_vv2v&); + }; + + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename E> + inline + Function<E>::Function() + { + typedef mln_result(E) result; + } + + template <typename E> + inline + Function<E>::Function(const Function<E>& rhs) + : Object<E>(rhs) + { + } + + template <typename E> + inline + Function_v2v<E>::Function_v2v() + { + } + + template <typename E> + inline + Function_v2v<E>::Function_v2v(const Function_v2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_v2w2v<E>::Function_v2w2v(const Function_v2w2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_v2w_w2v<E>::Function_v2w_w2v(const Function_v2w_w2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_i2v<E>::Function_i2v() + { + } + + template <typename E> + inline + Function_i2v<E>::Function_i2v(const Function_i2v<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_p2v<E>::Function_p2v() + { + } + + template <typename E> + inline + Function_p2v<E>::Function_p2v(const Function_p2v<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_v2b<E>::Function_v2b() + { + } + + template <typename E> + inline + Function_v2b<E>::Function_v2b(const Function_v2b<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_p2b<E>::Function_p2b() + { + } + + template <typename E> + inline + Function_p2b<E>::Function_p2b(const Function_p2b<E>& rhs) + : Function_v2v<E>(rhs), + Function_p2v<E>(rhs), + Function_v2b<E>(rhs) + { + } + + template <typename E> + inline + Function_p2p<E>::Function_p2p() + { + } + + template <typename E> + inline + Function_p2p<E>::Function_p2p(const Function_p2p<E>& rhs) + : Function_p2v<E>(rhs) + { + } + + template <typename E> + inline + Function_x2x<E>::Function_x2x() + { + } + + template <typename E> + inline + Function_x2x<E>::Function_x2x(const Function_x2x<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Bijection_x2x<E>::Bijection_x2x() + { + typedef typename E::invert invert; + invert (E::*m)() const = & E::inv; + m = 0; + } + + template <typename E> + inline + Function_vv2v<E>::Function_vv2v() + { + } + + template <typename E> + inline + Function_vv2v<E>::Function_vv2v(const Function_vv2v<E>& rhs) + : Function<E>(rhs) + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_CONCEPT_FUNCTION_HH Index: abraham/mln/math/cos.hh --- abraham/mln/math/cos.hh (revision 0) +++ abraham/mln/math/cos.hh (revision 0) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MATH_COS_HH +# define MLN_MATH_COS_HH + +/*! \file mln/math/cos.hh + * + * \brief Define the cosinus (cos) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T cos(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + T cos(const T& v) + { + return std::cos(v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_COS_HH Index: abraham/mln/math/acos.hh --- abraham/mln/math/acos.hh (revision 0) +++ abraham/mln/math/acos.hh (revision 0) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MATH_ACOS_HH +# define MLN_MATH_ACOS_HH + +/*! \file mln/math/acos.hh + * + * \brief Define the arc cosinus (acos) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T acos(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + T acos(const T& v) + { + return std::acos(v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_ACOS_HH

1 0

scool r109: Fix bug in r107 (not translating scool AST in some cases)
by Maxime van Noppen 06 Oct '08

06 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix bug in r107 (not translating scool AST in some cases) * Class.str: Translate the StaticFunctionCall into C++. Class.str | 8 +++++--- Expression.str | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) Index: branches/scool-ng/src/scoolt/Expression.str =================================================================== --- branches/scool-ng/src/scoolt/Expression.str (revision 108) +++ branches/scool-ng/src/scoolt/Expression.str (revision 109) @@ -8,6 +8,7 @@ Identifier(idf) -> CxxId(idf) + BaseExpressionToCxx: idf -> cxx_idf where Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 108) +++ branches/scool-ng/src/scoolt/Class.str (revision 109) @@ -1,6 +1,6 @@ module Class -imports libstratego-lib Cxx Scool Declaration +imports libstratego-lib Cxx Scool Declaration Expression rules @@ -50,14 +50,16 @@ <?Some("abstract") <+ ?None()> cqualif AddExactParameter(| cqualif, cxx_idf): - SimpleType(type) -> StaticFunctionCall(Identifier(type), Parameters([params])) + SimpleType(type) -> cxx_class where <ExactParameter(| cqualif, cxx_idf)> [] => params + ; <StaticExpressionToCxx> StaticFunctionCall(Identifier(type), Parameters([params])) => cxx_class AddExactParameter(| cqualif, cxx_idf): - StaticFunctionCall(idf, Parameters(params)) -> StaticFunctionCall(idf, Parameters(new_params)) + StaticFunctionCall(idf, Parameters(params)) -> cxx_class where <conc> ([<ExactParameter(| cqualif, cxx_idf)> []], params) => new_params + ; <StaticExpressionToCxx> StaticFunctionCall(idf, Parameters(new_params)) => cxx_class ExactParameter(| cqualif, cxx_idf): _ -> Identifier(idf) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r108: Fix reference files
by Maxime van Noppen 06 Oct '08

06 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix reference files * class/c++_ast/inheritance_001.aterm, * class/c++_ast/inheritance_002.aterm, * class/c++_ast/inheritance_004.aterm: here. inheritance_001.aterm | 2 +- inheritance_002.aterm | 2 +- inheritance_004.aterm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",StaticFunctionCall(Identifier("Bar"),Parameters([Identifier("Exact")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",CxxType(CxxId("Bar"),[CxxId("Exact")])),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",StaticFunctionCall(Identifier("Animal"),Parameters([Identifier("Exact")]))),[]),CxxClassDecl([],CxxId("Monkey"),("public",StaticFunctionCall(Identifier("Mammal"),Parameters([Identifier("Monkey")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",CxxType(CxxId("Animal"),[CxxId("Exact")])),[]),CxxClassDecl([],CxxId("Monkey"),("public",CxxType(CxxId("Mammal"),[CxxId("Monkey")])),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",StaticFunctionCall(Identifier("Foo"),Parameters([Identifier("Exact"),Integer("42")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",CxxType(CxxId("Foo"),[CxxId("Exact"),CxxInt("42")])),[])]) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r107: Handle inheritance from templated classes
by Maxime van Noppen 06 Oct '08

06 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle inheritance from templated classes * Class.str: Here. Class.str | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 106) +++ branches/scool-ng/src/scoolt/Class.str (revision 107) @@ -54,12 +54,16 @@ where <ExactParameter(| cqualif, cxx_idf)> [] => params + AddExactParameter(| cqualif, cxx_idf): + StaticFunctionCall(idf, Parameters(params)) -> StaticFunctionCall(idf, Parameters(new_params)) + where + <conc> ([<ExactParameter(| cqualif, cxx_idf)> []], params) => new_params + ExactParameter(| cqualif, cxx_idf): _ -> Identifier(idf) where <? Some("final")> cqualif ; <? CxxId(idf)> cxx_idf - // FIXME : I only have the cxx_idf and rather want the scl_idf to build my SFC ExactParameter(| cqualif, cxx_idf): _ -> Identifier("Exact") -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r106: Add reference files for tests on inheritance
by Maxime van Noppen 06 Oct '08

06 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on inheritance * class/c++_ast/inheritance_001.aterm: New. * class/c++_ast/inheritance_002.aterm: New. * class/c++_ast/inheritance_004.aterm: New. inheritance_001.aterm | 1 + inheritance_002.aterm | 1 + inheritance_004.aterm | 1 + 3 files changed, 3 insertions(+) Index: branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",StaticFunctionCall(Identifier("Bar"),Parameters([Identifier("Exact")]))),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",StaticFunctionCall(Identifier("Animal"),Parameters([Identifier("Exact")]))),[]),CxxClassDecl([],CxxId("Monkey"),("public",StaticFunctionCall(Identifier("Mammal"),Parameters([Identifier("Monkey")]))),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",StaticFunctionCall(Identifier("Foo"),Parameters([Identifier("Exact"),Integer("42")]))),[])]) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

2525: Simplify face iterators using the new accessors of face handles.
by Roland Levillain 06 Oct '08

06 Oct '08

* mln/topo/face_iter.hh (mln::topo::face_fwd_iter<D>::next_) (mln::topo::face_bkd_iter<D>::next_) * mln/topo/n_face_iter.hh (mln::topo::n_face_fwd_iter<D>::next_) (mln::topo::n_face_bkd_iter<D>::next_) * mln/topo/static_n_face_iter.hh (mln::topo::static_n_face_fwd_iter<N, D>::next_) (mln::topo::static_n_face_bkd_iter<N, D>::next_): Here. --- milena/ChangeLog | 15 +++++++++++ milena/mln/topo/face_iter.hh | 42 +++++++------------------------- milena/mln/topo/n_face_iter.hh | 28 +++------------------ milena/mln/topo/static_n_face_iter.hh | 30 +++-------------------- 4 files changed, 32 insertions(+), 83 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d647d7e..18b410e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + Simplify face iterators using the new accessors of face handles. + + * mln/topo/face_iter.hh + (mln::topo::face_fwd_iter<D>::next_) + (mln::topo::face_bkd_iter<D>::next_) + * mln/topo/n_face_iter.hh + (mln::topo::n_face_fwd_iter<D>::next_) + (mln::topo::n_face_bkd_iter<D>::next_) + * mln/topo/static_n_face_iter.hh + (mln::topo::static_n_face_fwd_iter<N, D>::next_) + (mln::topo::static_n_face_bkd_iter<N, D>::next_): + Here. + +2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + Add extra accessors for topo::face<D> and topo::n_face<N, D>. * mln/topo/face.hh diff --git a/milena/mln/topo/face_iter.hh b/milena/mln/topo/face_iter.hh index b34bfbd..2c0df92 100644 --- a/milena/mln/topo/face_iter.hh +++ b/milena/mln/topo/face_iter.hh @@ -169,26 +169,14 @@ namespace mln { if (is_valid()) { - unsigned n = f_.n(); - unsigned face_id = f_.face_id(); - - if (face_id + 1 < f_.cplx().nfaces(n)) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().nfaces(f_.n())) + f_.inc_face_id(); else // Start to iterate on the faces of the next dimension if // possible. - if (n <= D) + if (f_.n() <= D) { - // FIXME: Same remark as above. - f_.set_n(n + 1); + f_.inc_n(); f_.set_face_id(0u); } else @@ -233,27 +221,15 @@ namespace mln { if (is_valid()) { - unsigned n = f_.n(); - unsigned face_id = f_.face_id(); - - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else // Start to iterate on the faces of the previous dimension // if it exists. - if (n > 0) + if (f_.n() > 0) { - // FIXME: Same remark as above. - f_.set_n(n - 1); - f_.set_face_id(f_.cplx().nfaces(n - 1) - 1); + f_.dec_n(); + f_.set_face_id(f_.cplx().nfaces(f_.n()) - 1); } else invalidate(); diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh index eaf9ef9..4b658bb 100644 --- a/milena/mln/topo/n_face_iter.hh +++ b/milena/mln/topo/n_face_iter.hh @@ -191,19 +191,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - // The number of faces of dimension N in cplx_. - unsigned nn_faces = f_.cplx().nfaces(n()); - if (face_id + 1 < nn_faces) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().nfaces(n())) + f_.inc_face_id(); else invalidate(); } @@ -265,17 +254,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else invalidate(); } diff --git a/milena/mln/topo/static_n_face_iter.hh b/milena/mln/topo/static_n_face_iter.hh index 3868e01..db184ba 100644 --- a/milena/mln/topo/static_n_face_iter.hh +++ b/milena/mln/topo/static_n_face_iter.hh @@ -174,20 +174,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - // The number of faces of dimension N in cplx_. - unsigned nn_faces = f_.cplx().template nfaces<N>(); - if (face_id + 1 < nn_faces) - /* FIXME: Provide accessor face::face_id() - returning a mutable reference? This way, we could just - write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().template nfaces<N>()) + f_.inc_face_id(); else invalidate(); } @@ -235,18 +223,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() - returning a mutable reference? This way, we could just - write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else invalidate(); } -- 1.5.6.5

1 0

2524: Add extra accessors for topo::face<D> and topo::n_face<N, D>.
by Roland Levillain 06 Oct '08

06 Oct '08

* mln/topo/face.hh (mln::topo::face<D>::inc_n) (mln::topo::face<D>::dec_n) (mln::topo::face<D>::inc_face_id) (mln::topo::face<D>::dec_face_id) * mln/topo/n_face.hh (mln::topo::n_face<N, D>::inc_face_id) (mln::topo::n_face<N, D>::dec_face_id): New methods. --- milena/ChangeLog | 14 ++++++++++++++ milena/mln/topo/face.hh | 42 ++++++++++++++++++++++++++++++++++++++++++ milena/mln/topo/n_face.hh | 20 ++++++++++++++++++++ 3 files changed, 76 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 03789ee..d647d7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,17 @@ +2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + + Add extra accessors for topo::face<D> and topo::n_face<N, D>. + + * mln/topo/face.hh + (mln::topo::face<D>::inc_n) + (mln::topo::face<D>::dec_n) + (mln::topo::face<D>::inc_face_id) + (mln::topo::face<D>::dec_face_id) + * mln/topo/n_face.hh + (mln::topo::n_face<N, D>::inc_face_id) + (mln::topo::n_face<N, D>::dec_face_id): + New methods. + 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> Introduce a header for iterators on complexes. diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index ac02877..bd2c3cd 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -88,10 +88,20 @@ namespace mln /// Set the complex the face belongs to. void set_cplx(complex<D>& cplx); + /// Set the dimension of the face. void set_n(unsigned n); + /// Increment the dimension of the face. + void inc_n(); + /// Decrement the dimension of the face. + void dec_n(); + /// Set the id of the face. void set_face_id(unsigned face_id); + /// Increment the id of the face. + void inc_face_id(); + /// Decrement the id of the face. + void dec_face_id(); /// Return the mln::topo::face_data pointed by this handle. template <unsigned N> @@ -248,12 +258,44 @@ namespace mln template <unsigned D> inline void + face<D>::inc_n() + { + ++n_; + } + + template <unsigned D> + inline + void + face<D>::dec_n() + { + --n_; + } + + template <unsigned D> + inline + void face<D>::set_face_id(unsigned face_id) { face_id_ = face_id; } template <unsigned D> + inline + void + face<D>::inc_face_id() + { + ++face_id_; + } + + template <unsigned D> + inline + void + face<D>::dec_face_id() + { + --face_id_; + } + + template <unsigned D> template <unsigned N> inline face_data<N, D>& diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index 6cf3b37..f0a7277 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -86,6 +86,10 @@ namespace mln unsigned n() const; /// Set the id of the face. void set_face_id(unsigned face_id); + /// Increment the id of the face. + void inc_face_id(); + /// Decrement the id of the face. + void dec_face_id(); /// Return the mln::topo::face_data pointed by this handle. face_data<N, D>& data() const; @@ -223,6 +227,22 @@ namespace mln template <unsigned N, unsigned D> inline + void + n_face<N, D>::inc_face_id() + { + ++face_id_; + } + + template <unsigned N, unsigned D> + inline + void + n_face<N, D>::dec_face_id() + { + --face_id_; + } + + template <unsigned N, unsigned D> + inline face_data<N, D>& n_face<N, D>::data() const { -- 1.5.6.5

1 0

[Olena] #158: Clean up complex-based images
by Olena 06 Oct '08

06 Oct '08

#158: Clean up complex-based images -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- See the `FIXME`s in files listed in wiki:Olena/ComplexBasedImages. In particular, it seems wise to move complexes out of face handles (after all), since it solves many problems, to the price of relaxed (dynamic) checks (i.e., less guarantees on the validity of complex handles, psites and iterators). -- Ticket URL: <https://trac.lrde.org/olena/ticket/158> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

2522: Fix entry of revision 2518 in milena/ChangeLog.
by Roland Levillain 04 Oct '08

04 Oct '08

--- milena/ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d466a7a..03789ee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -30,7 +30,7 @@ Add a centered window of lower/higher-dim. adjacent complex faces. - * mln/core/image/complex_lower_higher_neighborhood.hh: New. + * mln/core/image/complex_lower_higher_window_p.hh: New. * tests/morpho/complex_image_morpho.cc: Exercise this window. 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0