Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Thierry GERAUD

2006-10-16 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * xtd/optraits.hh (get_trait_): Change mlc_is_found into mlc::is_ok_ so that mlc::undefined means 'not user-defined'. Index: xtd/optraits.hh =================================================================== --- xtd/optraits.hh (revision 645) +++ xtd/optraits.hh (working copy) @@ -187,7 +187,7 @@ typedef typename get_case_< op_<name>, mlc::pair_<L, R> >::ret case_t; typedef mlc_ret(case_t) case_ret; - typedef typename mlc::if_< mlc_is_found(user_ret), user_ret, case_ret >::ret ret; + typedef typename mlc::if_< mlc::is_ok_<user_ret>, user_ret, case_ret >::ret ret; }; @@ -205,7 +205,7 @@ typedef typename get_case_< op_<name>, T >::ret case_t; typedef mlc_ret(case_t) case_ret; - typedef typename mlc::if_< mlc_is_found(user_ret), user_ret, case_ret >::ret ret; + typedef typename mlc::if_< mlc::is_ok_<user_ret>, user_ret, case_ret >::ret ret; }; } // end of namespace xtd::internal

18 years, 2 months

645: Add binary value type plus update image hierarchy plugs.

by Thierry GERAUD

Index: ChangeLog =================================================================== --- ChangeLog (revision 644) +++ ChangeLog (working copy) @@ -1,5 +1,20 @@ 2006-10-16 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> + Add binary value type plus update image hierarchy plugs. + + * oln/value/tags.hh: New. + * oln/value/bin.hh: New. + * oln/value/all.hh: New. + * oln/core/abstract/image/type/hierarchy.hh (case_): Rely on value + tags. + (case_): Overload to handle other value types. + (include): Update. + * oln/value/greylevel.hh (greylevel_): New conversion operator. + (gl1): Remove; now replaced by value::bin. + * oln/Makefile.am: Update. + +2006-10-16 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> + Add grey-level types. * tests/grey.cc: New. Index: oln/core/abstract/image/type/hierarchy.hh =================================================================== --- oln/core/abstract/image/type/hierarchy.hh (revision 644) +++ oln/core/abstract/image/type/hierarchy.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> -# include <xtd/valtraits.hh> +# include <oln/value/tags.hh> /* Image ``type'' hierarchy (summary). @@ -93,34 +93,50 @@ namespace oln { - /// Switch on on the grid dimension. + /// Switch on the value type. /// \{ - // ----------------------------------------------- // - // Cases where the value type is an builtin type. // - // ----------------------------------------------- // + // ------------------------------------- // + // Cases where the value type is known. // + // ------------------------------------- // /// Binary case. template <typename E> struct case_< image_hierarchy_wrt_type, E, 1 > : - where_< xtd_is_binary(oln_type_of(E, value)) > + where_< value::is_binary<oln_type_of(E, value)> > { // Definition of the super class corresponding to this case. typedef abstract::binary_image<E> ret; }; - /// Grey-level case. + /// Color case. template <typename E> struct case_< image_hierarchy_wrt_type, E, 2 > : - where_< mlc::or_list_< mlc::eq_<oln_type_of(E, value), char>, - mlc::eq_<oln_type_of(E, value), signed char>, - mlc::eq_<oln_type_of(E, value), unsigned char> > > + where_< value::is_color<oln_type_of(E, value)> > { // Definition of the super class corresponding to this case. + typedef abstract::color_image<E> ret; + }; + + /// Grey-level case. + template <typename E> + struct case_< image_hierarchy_wrt_type, E, 3 > : + where_< value::is_grey_level<oln_type_of(E, value)> > + { + // Definition of the super class corresponding to this case. typedef abstract::grey_level_image<E> ret; }; + /// Label case. + template <typename E> + struct case_< image_hierarchy_wrt_type, E, 4 > : + where_< value::is_label<oln_type_of(E, value)> > + { + // Definition of the super class corresponding to this case. + typedef abstract::label_image<E> ret; + }; + // -------------- // // Default case. // // -------------- // Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 644) +++ oln/Makefile.am (working copy) @@ -152,8 +152,10 @@ morpher/tags.hh \ morpher/thru_fun.hh \ \ + value/all.hh \ value/default.hh \ value/greylevel.hh \ + value/tags.hh \ \ basics1d.hh \ basics2d.hh \ Index: oln/value/bin.hh =================================================================== --- oln/value/bin.hh (revision 0) +++ oln/value/bin.hh (revision 0) @@ -0,0 +1,110 @@ +// 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, 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 OLN_CORE_VALUE_BIN_HH +# define OLN_CORE_VALUE_BIN_HH + +# include <mlc/bexpr.hh> +# include <xtd/optraits.hh> +# include <xtd/valtraits.hh> +# include <oln/value/greylevel.hh> + + +namespace oln +{ + + namespace value + { + + typedef greylevel_<1> bin; + + + // Binary ops. + bin operator and(bin lhs, bin rhs); + bin operator or(bin lhs, bin rhs); + bin operator xor(bin lhs, bin rhs); + + // Unary ops. + bin operator not(bin val); + + +# ifndef OLN_INCLUDE_ONLY + + bin operator and(bin lhs, bin rhs) + { + return bin(bool(lhs) and bool(rhs)); + } + + bin operator or(bin lhs, bin rhs) + { + return bin(bool(lhs) or bool(rhs)); + } + + bin operator xor(bin lhs, bin rhs) + { + return bin(bool(lhs) xor bool(rhs)); + } + + bin operator not(bin val) + { + return bin(not bool(val)); + } + +# endif + + } // end of namespace oln::value + +} // end of namespace oln + + + +namespace xtd +{ + + using oln::value::bin; + + + // Logical traits. + + template <> struct set_trait_< op_land, bin, bin > { typedef bin ret; }; + template <> struct set_trait_< op_land, bool, bin > { typedef bin ret; }; + template <> struct set_trait_< op_land, bin, bool > { typedef bin ret; }; + + template <> struct set_trait_< op_lor, bin, bin > { typedef bin ret; }; + template <> struct set_trait_< op_lor, bool, bin > { typedef bin ret; }; + template <> struct set_trait_< op_lor, bin, bool > { typedef bin ret; }; + + template <> struct set_trait_< op_lxor, bin, bin > { typedef bin ret; }; + template <> struct set_trait_< op_lxor, bool, bin > { typedef bin ret; }; + template <> struct set_trait_< op_lxor, bin, bool > { typedef bin ret; }; + + template <> struct set_trait_< op_lnot, bin > { typedef bin ret; }; + +} // end of namespace xtd + + +#endif // ! OLN_CORE_VALUE_BIN_HH Index: oln/value/all.hh =================================================================== --- oln/value/all.hh (revision 0) +++ oln/value/all.hh (revision 0) @@ -0,0 +1,41 @@ +// 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, 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 OLN_VALUE_ALL_HH +# define OLN_VALUE_ALL_HH + + +# include <oln/value/tags.hh> + +# include <oln/value/greylevel.hh> +# include <oln/value/bin.hh> +# include <oln/value/default.hh> + +# include <oln/color/rgb.hh> + + +#endif // ! OLN_VALUE_ALL_HH Index: oln/value/greylevel.hh =================================================================== --- oln/value/greylevel.hh (revision 644) +++ oln/value/greylevel.hh (working copy) @@ -30,10 +30,12 @@ # include <iostream> # include <mlc/contract.hh> +# include <mlc/bexpr.hh> # include <xtd/optraits.hh> # include <oln/core/abstract/value.hh> + namespace oln { @@ -71,11 +73,14 @@ greylevel_(); /// Ctor. - explicit greylevel_(typename internal::encoding<nbits>::ret val); + explicit greylevel_(const typename internal::encoding<nbits>::ret& val); /// Access to std type. typename internal::encoding<nbits>::ret value() const; + /// Op encoding_t. + operator typename internal::encoding<nbits>::ret() const; + /// Op greylevel. operator greylevel() const; @@ -96,7 +101,6 @@ /// Aliases. - typedef greylevel_<1> gl1; typedef greylevel_<8> gl8; typedef greylevel_<16> gl16; typedef greylevel_<32> gl32; @@ -183,7 +187,7 @@ } template <unsigned nbits> - greylevel_<nbits>::greylevel_(typename internal::encoding<nbits>::ret val) + greylevel_<nbits>::greylevel_(const typename internal::encoding<nbits>::ret& val) : val_(val) { } @@ -203,6 +207,12 @@ } template <unsigned nbits> + greylevel_<nbits>::operator typename internal::encoding<nbits>::ret() const + { + return val_; + } + + template <unsigned nbits> bool greylevel_<nbits>::operator<(const greylevel_<nbits>& rhs) const { return val_ < rhs.val_; Index: oln/value/tags.hh =================================================================== --- oln/value/tags.hh (revision 0) +++ oln/value/tags.hh (revision 0) @@ -0,0 +1,105 @@ +// 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, 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 OLN_VALUE_TAGS_HH +# define OLN_VALUE_TAGS_HH + +# include <mlc/bexpr.hh> + + +namespace oln +{ + + + namespace color + { + template <typename T> class rgb_; + } // end of namespace oln::color + + + namespace value + { + + // Color trait. + + template <typename T> + struct is_color : public mlc::bexpr_<false> + { + }; + + template <typename T> + struct is_color < color::rgb_<T> > : public mlc::bexpr_<true> {}; + + + // Grey-level trait. + + template <typename T> + struct is_grey_level : public mlc::bexpr_<false> + {}; + + template <unsigned nbits> + class greylevel_; + + template <unsigned nbits> + struct is_grey_level < greylevel_<nbits> > : public mlc::bexpr_<true> {}; + + class greylevel; + + template <> + struct is_grey_level < greylevel > : public mlc::bexpr_<true> {}; + + + // Binary trait. + + template <typename T> + struct is_binary : public mlc::bexpr_<false> + { + }; + + template <> + struct is_binary < bool > : public mlc::bexpr_<true> {}; + + typedef greylevel_<1> bin; + + template <> + struct is_binary < bin > : public mlc::bexpr_<true> {}; + + + // Label trait. + + template <typename T> + struct is_label : public mlc::bexpr_<false> + { + }; + + + } // end of namespace oln::value + +} // end of namespace oln + + +#endif // ! OLN_VALUE_TAGS_HH

18 years, 2 months

644: Add grey-level types.

by Thierry GERAUD

2006-10-16 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add grey-level types. * tests/grey.cc: New. * tests/Makefile.am: Update. * oln/value/default.hh: New. * oln/value/greylevel.hh: New. * oln/Makefile.am: Update. * oln/core/abstract/value.hh (value): Remove inheritance so that a value type is not a regular oln type. Index: tests/grey.cc =================================================================== --- tests/grey.cc (revision 0) +++ tests/grey.cc (revision 0) @@ -0,0 +1,42 @@ +// 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, 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. + +/// Test oln::grey. +#include <oln/value/greylevel.hh> +#include <oln/value/default.hh> + + +int main() +{ + using namespace oln::value; + + gl8 a = white; + gl16 b = white; + assert((a == b) == true); + gl8 c = (a + b) / 2; + assert(c == white); +} Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 643) +++ tests/Makefile.am (working copy) @@ -35,6 +35,7 @@ \ at \ \ + grey \ io_pnm \ \ identity_morpher \ @@ -60,6 +61,9 @@ # I/O. io_pnm_SOURCES = io_pnm.cc +# Value. +grey_SOURCES = grey.cc + # Morphers. identity_morpher_SOURCES = identity_morpher.cc add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc Index: oln/core/abstract/value.hh =================================================================== --- oln/core/abstract/value.hh (revision 643) +++ oln/core/abstract/value.hh (working copy) @@ -35,7 +35,9 @@ namespace abstract { - struct value : public oln::type + // A value is not an oln::type. As a consequence, + // traits are basically defined. + struct value { protected: value(); Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 643) +++ oln/Makefile.am (working copy) @@ -152,6 +152,9 @@ morpher/tags.hh \ morpher/thru_fun.hh \ \ + value/default.hh \ + value/greylevel.hh \ + \ basics1d.hh \ basics2d.hh \ basics3d.hh Index: oln/value/default.hh =================================================================== --- oln/value/default.hh (revision 0) +++ oln/value/default.hh (revision 0) @@ -0,0 +1,59 @@ +// 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, 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 OLN_VALUE_DEFAULT_HH +# define OLN_VALUE_DEFAULT_HH + +# include <oln/value/greylevel.hh> + + +namespace oln +{ + + namespace value + { + + /// White. + extern const greylevel white; + + /// Black. + extern const greylevel black; + + +# ifndef OLN_INCLUDE_ONLY + + const greylevel white = greylevel(1, 1); + const greylevel black = greylevel(1, 0); + +# endif + + } // end of namespace oln::value + +} // end of namespace oln + + +#endif // ! OLN_VALUE_DEFAULT_HH Index: oln/value/greylevel.hh =================================================================== --- oln/value/greylevel.hh (revision 0) +++ oln/value/greylevel.hh (revision 0) @@ -0,0 +1,494 @@ +// 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, 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 OLN_CORE_VALUE_GREYLEVEL_HH +# define OLN_CORE_VALUE_GREYLEVEL_HH + +# include <iostream> +# include <mlc/contract.hh> +# include <xtd/optraits.hh> +# include <oln/core/abstract/value.hh> + + +namespace oln +{ + + namespace value + { + + + namespace internal + { + + template <unsigned nbits> + struct encoding; + + template <> struct encoding <1> { typedef bool ret; }; + template <> struct encoding <8> { typedef unsigned char ret; }; + template <> struct encoding <16> { typedef unsigned short ret; }; + template <> struct encoding <32> { typedef unsigned long ret; }; + + } // end of oln::value::internal + + + /// Fwd decl. + class greylevel; + + + /// General grey-level class on n bits. + template <unsigned nbits> + class greylevel_ : public oln::abstract::value + { + typedef typename internal::encoding<nbits>::ret encoding_t; + + public: + + /// Ctor. + greylevel_(); + + /// Ctor. + explicit greylevel_(typename internal::encoding<nbits>::ret val); + + /// Access to std type. + typename internal::encoding<nbits>::ret value() const; + + /// Op greylevel. + operator greylevel() const; + + /// Op<. + bool operator<(const greylevel_<nbits>& rhs) const; + + /// Op==. + bool operator==(const greylevel_<nbits>& rhs) const; + + protected: + encoding_t val_; + }; + + + /// Op<<. + template <unsigned nbits> + std::ostream& operator<<(std::ostream& ostr, const greylevel_<nbits>& g); + + + /// Aliases. + typedef greylevel_<1> gl1; + typedef greylevel_<8> gl8; + typedef greylevel_<16> gl16; + typedef greylevel_<32> gl32; + + + template <unsigned nbits, unsigned mbits> + bool operator==(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs); + + template <unsigned nbits, unsigned mbits> + greylevel operator+(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs); + + template <unsigned nbits, unsigned mbits> + greylevel operator-(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs); + + template <unsigned nbits> + greylevel operator*(int s, const greylevel_<nbits>& rhs); + + template <unsigned nbits> + greylevel operator*(const greylevel_<nbits>& lhs, int s); + + template <unsigned nbits> + greylevel operator/(const greylevel_<nbits>& lhs, int s); + + + + /// General grey-level class where n bits is not know at compile-time. + /// This class is used for exchange between grey-level types purpose. + class greylevel : public oln::abstract::value + { + public: + + /// Ctor. + greylevel(); + + /// Ctor. + template <unsigned n> + greylevel(const greylevel_<n>& val); + + /// Ctor. + greylevel(unsigned nbits, unsigned long val); + + /// Access to std type. + unsigned long value() const; + + unsigned nbits() const; + + void set_nbits(unsigned nbits); + + greylevel to_nbits(unsigned nbits) const; + + template <unsigned n> + operator greylevel_<n>() const; + + bool operator<(const greylevel& rhs) const; + + bool operator==(const greylevel& rhs) const; + + protected: + unsigned nbits_; + unsigned long val_; + }; + + + std::ostream& operator<<(std::ostream& ostr, const greylevel& g); + + + greylevel operator+(const greylevel& lhs, const greylevel& rhs); + greylevel operator-(const greylevel& lhs, const greylevel& rhs); + + greylevel operator*(int s, const greylevel& rhs); + greylevel operator*(const greylevel& lhs, int s); + + greylevel operator/(const greylevel& lhs, int s); + + + +# ifndef OLN_INCLUDE_ONLY + + // Greylevel_<nbits>. + + template <unsigned nbits> + greylevel_<nbits>::greylevel_() + { + } + + template <unsigned nbits> + greylevel_<nbits>::greylevel_(typename internal::encoding<nbits>::ret val) + : val_(val) + { + } + + template <unsigned nbits> + typename internal::encoding<nbits>::ret + greylevel_<nbits>::value() const + { + return val_; + } + + template <unsigned nbits> + greylevel_<nbits>::operator greylevel() const + { + greylevel tmp(nbits, val_); + return tmp; + } + + template <unsigned nbits> + bool greylevel_<nbits>::operator<(const greylevel_<nbits>& rhs) const + { + return val_ < rhs.val_; + } + + template <unsigned nbits> + bool greylevel_<nbits>::operator==(const greylevel_<nbits>& rhs) const + { + return val_ == rhs.val_; + } + + template <unsigned nbits> + std::ostream& operator<<(std::ostream& ostr, const greylevel_<nbits>& g) + { + return ostr << g.value(); + } + + + template <unsigned nbits, unsigned mbits> + bool operator==(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs) + { + return greylevel(lhs) == greylevel(rhs); + } + + template <unsigned nbits, unsigned mbits> + greylevel operator+(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs) + { + return greylevel(lhs) + greylevel(rhs); + } + + template <unsigned nbits, unsigned mbits> + greylevel operator-(const greylevel_<nbits>& lhs, const greylevel_<mbits>& rhs) + { + return greylevel(lhs) - greylevel(rhs); + } + + template <unsigned nbits> + greylevel operator*(int s, const greylevel_<nbits>& rhs) + { + precondition(s >= 0); + greylevel tmp(nbits, s * rhs.value()); + return tmp; + } + + template <unsigned nbits> + greylevel operator*(const greylevel_<nbits>& lhs, int s) + { + precondition(s >= 0); + greylevel tmp(nbits, lhs.value() * s); + return tmp; + } + + template <unsigned nbits> + greylevel operator/(const greylevel_<nbits>& lhs, int s) + { + precondition(s > 0); + greylevel tmp(nbits, lhs.value() / s); + return tmp; + } + + + + // Greylevel. + + greylevel::greylevel() + : nbits_(0) + { + } + + template <unsigned n> + greylevel::greylevel(const greylevel_<n>& g) + : nbits_(n), + val_(g.value()) + { + } + + greylevel::greylevel(unsigned nbits, unsigned long val) + : nbits_(nbits), + val_(val) + { + } + + unsigned long greylevel::value() const + { + invariant(nbits_ != 0); + return val_; + } + + unsigned greylevel::nbits() const + { + return nbits_; + } + + namespace internal + { + + unsigned long two_pow_(unsigned n) + { + if (n == 0) + return 1; + else + return 2 * two_pow_(n - 1); + } + + unsigned long two_pow_n_minus_1(unsigned n) + { + return two_pow_(n) - 1; + } + + template <unsigned n_dest> + unsigned long convert(unsigned n_src, unsigned long val) + { + if (n_dest == n_src) + return val; + else + if (n_dest > n_src) + return val * two_pow_n_minus_1(n_dest) / two_pow_n_minus_1(n_src); + else + return val / two_pow_(n_src - n_dest); + } + + } // end of oln::value::internal + + + void greylevel::set_nbits(unsigned nbits) + { + precondition(nbits != 0); + invariant(nbits_ != 0); + if (nbits == nbits_) + return; + if (nbits > nbits_) + { + val_ *= internal::two_pow_n_minus_1(nbits); + val_ /= internal::two_pow_n_minus_1(nbits_); + } + else // nbits < nbits_ + { + val_ /= internal::two_pow_(nbits_ - nbits); + } + nbits_ = nbits; + } + + + greylevel greylevel::to_nbits(unsigned nbits) const + { + precondition(nbits != 0); + invariant(nbits_ != 0); + greylevel tmp(*this); + tmp.set_nbits(nbits); + return tmp; + } + + + template <unsigned n> + greylevel::operator greylevel_<n>() const + { + precondition(nbits_ != 0); + greylevel_<n> tmp(internal::convert<n>(nbits_, val_)); + assert(tmp.value() < internal::two_pow_(n)); + return tmp; + } + + bool greylevel::operator<(const greylevel& rhs) const + { + precondition(nbits_ != 0 and rhs.nbits() != 0); + if (rhs.nbits() == nbits_) + return rhs.value() < val_; + if (nbits_ > rhs.nbits()) + return val_ < rhs.to_nbits(nbits_).value(); + else + return this->to_nbits(rhs.nbits()).value() < rhs.value(); + } + + bool greylevel::operator==(const greylevel& rhs) const + { + precondition(nbits_ != 0 and rhs.nbits() != 0); + if (rhs.nbits() == nbits_) + return rhs.value() == val_; + if (nbits_ > rhs.nbits()) + return val_ == rhs.to_nbits(nbits_).value(); + else + return this->to_nbits(rhs.nbits()).value() == rhs.value(); + } + + std::ostream& operator<<(std::ostream& ostr, const greylevel& g) + { + return ostr << g.value() << '/' << g.nbits() << "nbits"; + } + + greylevel operator+(const greylevel& lhs, const greylevel& rhs) + { + precondition(lhs.nbits() != 0 and rhs.nbits() != 0); + if (lhs.nbits() > rhs.nbits()) + { + greylevel tmp(lhs.nbits(), + lhs.value() + rhs.to_nbits(lhs.nbits()).value()); + return tmp; + } + else + { + greylevel tmp(rhs.nbits(), + lhs.to_nbits(rhs.nbits()).value() + rhs.value()); + return tmp; + } + } + + greylevel operator-(const greylevel& lhs, const greylevel& rhs) + { + precondition(lhs.nbits() != 0 and rhs.nbits() != 0); + if (lhs.nbits() > rhs.nbits()) + { + unsigned long l = rhs.to_nbits(lhs.nbits()).value(); + assert(lhs.value() >= l); + greylevel tmp(lhs.nbits(), + lhs.value() - l); + return tmp; + } + else + { + unsigned long l = lhs.to_nbits(rhs.nbits()).value(); + assert(l >= rhs.value()); + greylevel tmp(rhs.nbits(), + l - rhs.value()); + return tmp; + } + } + + greylevel operator*(int s, const greylevel& rhs) + { + precondition(s >= 0); + greylevel tmp(rhs.nbits(), rhs.value() * s); + return tmp; + } + + greylevel operator*(const greylevel& lhs, int s) + { + precondition(s >= 0); + greylevel tmp(lhs.nbits(), lhs.value() * s); + return tmp; + } + + greylevel operator/(const greylevel& lhs, int s) + { + precondition(s > 0); + greylevel tmp(lhs.nbits(), lhs.value() / s); + return tmp; + } + +# endif + + + } // end of namespace oln::value + +} // end of namespace oln + + + +namespace xtd +{ + + using oln::value::greylevel; + + template <> struct set_trait_<op_plus, greylevel, greylevel> { typedef greylevel ret; }; + template <> struct set_trait_<op_minus, greylevel, greylevel> { typedef greylevel ret; }; + template <> struct set_trait_<op_mult, int, greylevel> { typedef greylevel ret; }; + template <> struct set_trait_<op_mult, greylevel, int > { typedef greylevel ret; }; + template <> struct set_trait_<op_div, greylevel, int > { typedef greylevel ret; }; + + using oln::value::greylevel_; + + template <unsigned nbits, unsigned mbits> + struct set_trait_< op_plus, greylevel_<nbits>, greylevel_<mbits> > { typedef greylevel ret; }; + + template <unsigned nbits, unsigned mbits> + struct set_trait_< op_minus, greylevel_<nbits>, greylevel_<mbits> > { typedef greylevel ret; }; + + template <unsigned nbits> + struct set_trait_< op_mult, int, greylevel_<nbits> > { typedef greylevel ret; }; + + template <unsigned nbits> + struct set_trait_< op_mult, greylevel_<nbits>, int > { typedef greylevel ret; }; + + template <unsigned nbits> + struct set_trait_< op_div, greylevel_<nbits>, int > { typedef greylevel ret; }; + +} // end of namespace xtd + + +#endif // ! OLN_CORE_VALUE_GREYLEVEL_HH

18 years, 2 months

643: Enhance xtd traits mechanism so that set of traits can be defined.

by Thierry GERAUD

2006-10-16 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Enhance xtd traits mechanism so that set of traits can be defined. * xtd/optraits.hh (from_set_traits_): New. * xtd/traits.hh (set_traits_): New. (from_set_traits_): New. (set_trait_): New specialization. Index: xtd/optraits.hh =================================================================== --- xtd/optraits.hh (revision 642) +++ xtd/optraits.hh (working copy) @@ -63,7 +63,6 @@ }; - // logic struct land : public abstract::op_tag {}; @@ -112,8 +111,27 @@ + namespace internal + { + // Unary operators (op_lnot and op_uminus) can be fetched from type traits. + template < typename T > + struct from_set_traits_< op_lnot, T > + { + typedef typename xtd::set_traits_<T>::op_lnot_ret ret; + }; + + template < typename T > + struct from_set_traits_< op_uminus, T > + { + typedef typename xtd::set_traits_<T>::op_uminus_ret ret; + }; + + } // end of namespace xtd::internal + + + template < typename name, typename data > struct default_case_ < op_<name>, data > Index: xtd/traits.hh =================================================================== --- xtd/traits.hh (revision 642) +++ xtd/traits.hh (working copy) @@ -42,15 +42,69 @@ + // This class aims at being specialized by the client. + template < typename T > + struct set_traits_ : public mlc::undefined + { + // Unary operators. + typedef mlc::undefined op_lnot_ret; + typedef mlc::undefined op_uminus_ret; + + // Values. + typedef mlc::undefined min_ret; + typedef mlc::undefined max_ret; + typedef mlc::undefined zero_ret; + typedef mlc::undefined one_ret; + + // Quantization. + typedef mlc::undefined nbits; + + // Features. + typedef mlc::undefined is_scalar; + typedef mlc::undefined is_signed; + + // FIXME: ... + }; + + + + namespace internal + { + + // This class should be specialized for each 'subject' so + // that set_trait_ gets related to set_traits_. + template < typename subject, + typename T > + struct from_set_traits_ : public mlc::undefined + { + // FIXME: Add a static check to make sure that this class has + // been specialized. + }; + + } // end of namespace xtd::internal + + + + // This class aims at being specialized by the client. template < typename subject, typename T1, typename T2 = mlc::none > struct set_trait_ : public mlc::undefined { + // A definition, e.g., + // typedef int ret; }; + template < typename subject, + typename T > + struct set_trait_< subject, T, mlc::none > : public internal::from_set_traits_<subject, T> + { + // A definition, e.g., + // typedef int ret; + }; + namespace internal {

18 years, 2 months

642: Fix the distribution.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * oln/Makefile.am (nobase_oln_HEADERS): Remove core/1d/bbox1d.hh, core/2d/bbox2d.hh and core/3d/bbox3d.hh. Makefile.am | 3 --- 1 file changed, 3 deletions(-) Index: oln/Makefile.am --- oln/Makefile.am (revision 641) +++ oln/Makefile.am (working copy) @@ -7,7 +7,6 @@ \ core/1d/aliases.hh \ core/1d/array1d.hh \ - core/1d/bbox1d.hh \ core/1d/dpoint1d.hh \ core/1d/image1d.hh \ core/1d/neighb1d.hh \ @@ -15,7 +14,6 @@ \ core/2d/aliases.hh \ core/2d/array2d.hh \ - core/2d/bbox2d.hh \ core/2d/dpoint2d.hh \ core/2d/image2d.hh \ core/2d/neighb2d.hh \ @@ -23,7 +21,6 @@ \ core/3d/aliases.hh \ core/3d/array3d.hh \ - core/3d/bbox3d.hh \ core/3d/dpoint3d.hh \ core/3d/image3d.hh \ core/3d/neighb3d.hh \

18 years, 2 months

641: Get rid of the explicit instantiations of oln::bbox<>.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Get rid of the explicit instantiations of oln::bbox<>. * oln/core/gen/topo_lbbox.hh (oln::vtypes< topo_lbbox_<point> >): Define this virtul type using `bbox_<point>::self_t' instead of just `bbox_<point>' to force the instiantiation of oln::bbox_<point> at this point. (oln::topo_lbbox_<point>::bbox_t): Use oln_type_of to define it (more of an aesthetic change than a functional change). * oln/core/1d/bbox1d.hh, oln/core/2d/bbox2d.hh, * oln/core/3d/bbox3d.hh: Remove. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh, * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh: Remove their inclusions. basics1d.hh | 1 basics2d.hh | 1 basics3d.hh | 1 core/1d/image1d.hh | 1 core/2d/image2d.hh | 1 core/3d/image3d.hh | 1 core/gen/topo_lbbox.hh | 57 +++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 55 insertions(+), 8 deletions(-) Index: oln/basics1d.hh --- oln/basics1d.hh (revision 640) +++ oln/basics1d.hh (working copy) @@ -39,7 +39,6 @@ # include <oln/core/gen/bbox.hh> # include <oln/core/gen/topo_lbbox.hh> -# include <oln/core/1d/bbox1d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 640) +++ oln/core/1d/image1d.hh (working copy) @@ -35,7 +35,6 @@ # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/1d/array1d.hh> # include <oln/core/1d/point1d.hh> -# include <oln/core/1d/bbox1d.hh> // For topo1d. # include <oln/core/1d/aliases.hh> // For fwd_piter and bkd_piter virtual types. Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 640) +++ oln/core/2d/image2d.hh (working copy) @@ -35,7 +35,6 @@ # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/2d/array2d.hh> # include <oln/core/2d/point2d.hh> -# include <oln/core/2d/bbox2d.hh> // For topo2d. # include <oln/core/2d/aliases.hh> // For fwd_piter and bkd_piter virtual types. Index: oln/core/3d/image3d.hh --- oln/core/3d/image3d.hh (revision 640) +++ oln/core/3d/image3d.hh (working copy) @@ -35,7 +35,6 @@ # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/3d/array3d.hh> # include <oln/core/3d/point3d.hh> -# include <oln/core/3d/bbox3d.hh> // For topo3d. # include <oln/core/3d/aliases.hh> // For fwd_piter and bkd_piter virtual types. Index: oln/core/gen/topo_lbbox.hh --- oln/core/gen/topo_lbbox.hh (revision 640) +++ oln/core/gen/topo_lbbox.hh (working copy) @@ -54,7 +54,59 @@ template <typename point> struct vtypes< topo_lbbox_<point> > { - typedef bbox_<point> bbox_type; + /* Trick to force the instantiation of bbox_<point>. + + As bbox_<point> is a template type used to define the `bbox' + virtual type of topo_lbbox_<point>, it requires some attention + regarding its instantiation. + + + Metalic's mlc_is_a is used by the static hierarchy mechanism of + Static. mlc_is_a performs a static typedef introspection, + taking advantage of the SFINAE rule. However, there two + phenomena seem to happen here (probably due to the very nature + of SFINAE): + + 1. the statement `mlc_is_a(B, A)' requires the knowledge of the + entire declaration of the inspected class to answer + positively if a `B' actually *is a* `A'. If B is a template + class, this implies that B must have been instantiated for + mlc_is_a to be able to inspect it; + + 2. mlc_is_a does *not* trigger the instantiation of the + inspected type (probably to prevent any error, in accordance + to the SFINAE rule). + + When a template type is used to define a virtual type, it + *must* have been instantiated, because it might be used during + the construction of the base classes of the class it belongs + to. That is the case of bbox_<point> here. + + So, how one can trigger such an instantiation? We used to + address this problem by using explicit template instantiations + placed before the definition of the class holding the template + type used a virtual type : + + template class bbox_<point1d>; + template class bbox_<point2d>; + template class bbox_<point3d>; + + And so on. But this is not good w.r.t. software engineering: + one must take care of the correct explicit instantiations at + the right place, which is error-prone --and the C++ compiler + won't produces easily understandable messages!-- and requires a + manual addition for each instantiation of the template type + potentially used as a definition of a virtual type. + + A better solution is to force the compiler to instantiate the + type at the definition site of the virtual type (here, as for + bbox_<point>). Such an instantiation can be triggered by + requesting the use of a typedef contained within this type. As + many template types define a typedef `self_t' to refer to + themselves, we use this typename to both trigger the + instantiation of bbox_<point>, and to define + `vtypes< topo_lbbox_<point> >::bbox_type'. */ + typedef typename bbox_<point>::self_t bbox_type; typedef point point_type; typedef mlc::true_ is_random_accessible_type; }; @@ -66,7 +118,8 @@ public topology_entry< topo_lbbox_<point> >, private mlc::assert_< mlc_is_a(point, abstract::point) > { - typedef bbox_<point> bbox_t; + typedef topo_lbbox_<point> self_t; + typedef oln_type_of(self_t, bbox) bbox_t; public: Index: oln/basics2d.hh --- oln/basics2d.hh (revision 640) +++ oln/basics2d.hh (working copy) @@ -39,7 +39,6 @@ # include <oln/core/gen/bbox.hh> # include <oln/core/gen/topo_lbbox.hh> -# include <oln/core/2d/bbox2d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> Index: oln/basics3d.hh --- oln/basics3d.hh (revision 640) +++ oln/basics3d.hh (working copy) @@ -39,7 +39,6 @@ # include <oln/core/gen/bbox.hh> # include <oln/core/gen/topo_lbbox.hh> -# include <oln/core/3d/bbox3d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh>

18 years, 2 months

640: Fix oln/core/iterator_vtypes.hh w.r.t. backward niters.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix oln/core/iterator_vtypes.hh w.r.t. backward niters. * oln/core/iterator_vtypes.hh (oln::bkd_niter_neighb_): New forward declaration. (single_vtype<morpher::add_neighborhood<Image, Neighb>, typedef_::bkd_niter_type >): Fix ret. Add comments. Aesthetic changes. * oln/morpher/add_neighborhood.hh (oln/core/gen/bkd_niter_neighb.hh): Include it. core/iterator_vtypes.hh | 64 +++++++++++++++++++++++++++++++++++++------- morpher/add_neighborhood.hh | 1 2 files changed, 56 insertions(+), 9 deletions(-) Index: oln/core/iterator_vtypes.hh --- oln/core/iterator_vtypes.hh (revision 639) +++ oln/core/iterator_vtypes.hh (working copy) @@ -42,8 +42,12 @@ | oln::image1d<T>. | `------------------*/ + // Forward declaration. template <typename T> class image1d; + + /// piters. + /// fwd_piter vtype of image1d. template <typename T> struct single_vtype< image1d<T>, typedef_::fwd_piter_type > @@ -59,6 +63,8 @@ }; + /// qiters. + /// fwd_qiter vtype of image1d. template <typename T> struct single_vtype< image1d<T>, typedef_::fwd_qiter_type > @@ -78,8 +84,12 @@ | oln::image2d<T>. | `------------------*/ + // Forward declaration. template <typename T> class image2d; + + // piters. + /// fwd_piter vtype of image2d. template <typename T> struct single_vtype< image2d<T>, typedef_::fwd_piter_type > @@ -95,6 +105,8 @@ }; + // qiters. + /// fwd_qiter vtype of image2d. template <typename T> struct single_vtype< image2d<T>, typedef_::fwd_qiter_type > @@ -114,8 +126,12 @@ | oln::image3d<T>. | `------------------*/ + // Forward declaration. template <typename T> class image3d; + + // piters. + /// fwd_piter vtype of image3d. template <typename T> struct single_vtype< image3d<T>, typedef_::fwd_piter_type > @@ -131,6 +147,8 @@ }; + // qiters. + /// fwd_qiter vtype of image3d. template <typename T> struct single_vtype< image3d<T>, typedef_::fwd_qiter_type > @@ -150,46 +168,65 @@ | oln::morpher::add_isubset<Image, Isubset>. | `--------------------------------------------*/ + // Forward declarations. namespace morpher { template <typename Image, typename Isubset> struct add_isubset; } template <typename piter_t, typename isubset_t> class piter_isubset_; + // piters. + + /// fwd_piter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::fwd_piter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::fwd_piter_type > { typedef piter_isubset_<oln_type_of(Image, fwd_piter), Isubset> ret; }; + /// bkd_piter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::bkd_piter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::bkd_piter_type > { typedef piter_isubset_<oln_type_of(Image, bkd_piter), Isubset> ret; }; + // qiters. + + /// fwd_qiter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::fwd_qiter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::fwd_qiter_type > { typedef piter_isubset_<oln_type_of(Image, fwd_qiter), Isubset> ret; }; + /// bkd_qiter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::bkd_qiter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::bkd_qiter_type > { typedef piter_isubset_<oln_type_of(Image, bkd_qiter), Isubset> ret; }; + // niters. + + /// fwd_niter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::fwd_niter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::fwd_niter_type > { typedef piter_isubset_<oln_type_of(Image, fwd_niter), Isubset> ret; }; + /// bkd_niter vtype on morpher::add_isubset. template <typename Image, typename Isubset> - struct single_vtype< morpher::add_isubset<Image, Isubset>, typedef_::bkd_niter_type > + struct single_vtype< morpher::add_isubset<Image, Isubset>, + typedef_::bkd_niter_type > { typedef piter_isubset_<oln_type_of(Image, bkd_niter), Isubset> ret; }; @@ -199,13 +236,20 @@ | oln::morpher::add_neighborhood<Image, Isubset>. | `-------------------------------------------------*/ + // Forward declarations. namespace morpher { template <typename Image, typename Neighb> struct add_neighborhood; } template <typename point_t> class fwd_niter_neighb_; + template <typename point_t> class bkd_niter_neighb_; + + + // qiters. + /// fwd_niter vtype of morpher::add_neighborhood. template <typename Image, typename Neighb> - struct single_vtype< morpher::add_neighborhood<Image, Neighb>, typedef_::fwd_niter_type > + struct single_vtype< morpher::add_neighborhood<Image, Neighb>, + typedef_::fwd_niter_type > { private: typedef oln_type_of(Image, point) point_t; @@ -213,13 +257,15 @@ typedef fwd_niter_neighb_<point_t> ret; }; + /// bkd_niter vtype of morpher::add_neighborhood. template <typename Image, typename Neighb> - struct single_vtype< morpher::add_neighborhood<Image, Neighb>, typedef_::bkd_niter_type > + struct single_vtype< morpher::add_neighborhood<Image, Neighb>, + typedef_::bkd_niter_type > { private: typedef oln_type_of(Image, point) point_t; public: - typedef fwd_niter_neighb_<point_t> ret; // FIXME: should be bkd but not yet impled! + typedef bkd_niter_neighb_<point_t> ret; }; Index: oln/morpher/add_neighborhood.hh --- oln/morpher/add_neighborhood.hh (revision 639) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -32,6 +32,7 @@ # include <oln/core/gen/topo_add_nbh.hh> # include <oln/core/iterator_vtypes.hh> # include <oln/core/gen/fwd_niter_neighb.hh> +# include <oln/core/gen/bkd_niter_neighb.hh> namespace oln

18 years, 2 months

639: Add backward iterators on neighborhoods and windows.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add backward iterators on neighborhoods and windows. * oln/core/gen/bkd_niter_neighb.hh, * oln/core/gen/bkd_qiter_win.hh: New. * oln/core/gen/fwd_niter_neighb.hh (oln::fwd_niter_neighb_<point_t>::fwd_niter_neighb_) (oln::fwd_niter_neighb_<point_t>::impl_next) * oln/core/gen/fwd_qiter_win.hh (oln::fwd_qiter_win_<point_t>::fwd_qiter_win_) (oln::fwd_qiter_win_<point_t>::impl_next): Initialize i_ using this->invalidate(). * oln/core/1d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter1d): New typedef. * oln/core/2d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter2d): New typedef. * oln/core/3d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter3d): New typedef. * oln/core/iterator_vtypes.hh (oln::single_vtype<image1d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image2d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image3d<T>, typedef_::bkd_qiter_type>): New vtypes. * oln/basics1d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): * oln/basics2d.hh (oln/core/gen/bkd_qiter_win.hh) * oln/basics3d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): Include them. * oln/Makefile.am (nobase_oln_HEADERS): Add core/gen/bkd_niter_neighb.hh and core/gen/bkd_qiter_win.hh. Makefile.am | 2 basics1d.hh | 4 basics2d.hh | 1 basics3d.hh | 4 core/1d/aliases.hh | 6 - core/2d/aliases.hh | 6 - core/3d/aliases.hh | 6 - core/gen/bkd_niter_neighb.hh | 200 +++++++++++++++++++++++++++++++++++++++++++ core/gen/bkd_qiter_win.hh | 181 ++++++++++++++++++++++++++++++++++++++ core/gen/fwd_niter_neighb.hh | 12 +- core/gen/fwd_qiter_win.hh | 6 - core/iterator_vtypes.hh | 42 +++------ 12 files changed, 426 insertions(+), 44 deletions(-) Index: oln/basics1d.hh --- oln/basics1d.hh (revision 638) +++ oln/basics1d.hh (working copy) @@ -44,6 +44,10 @@ # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/gen/window.hh> +# include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> + # include <oln/core/gen/neighb.hh> # include <oln/core/1d/neighb1d.hh> Index: oln/core/iterator_vtypes.hh --- oln/core/iterator_vtypes.hh (revision 638) +++ oln/core/iterator_vtypes.hh (working copy) @@ -66,14 +66,12 @@ typedef fwd_qiter1d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image1d. -// template <typename T> -// struct single_vtype< image1d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter1d ret; -// }; + /// bkd_qiter vtype of image1d. + template <typename T> + struct single_vtype< image1d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter1d ret; + }; /*------------------. @@ -104,14 +102,12 @@ typedef fwd_qiter2d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image2d. -// template <typename T> -// struct single_vtype< image2d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter2d ret; -// }; + /// bkd_qiter vtype of image2d. + template <typename T> + struct single_vtype< image2d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter2d ret; + }; /*------------------. @@ -142,14 +138,12 @@ typedef fwd_qiter3d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image3d. -// template <typename T> -// struct single_vtype< image3d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter3d ret; -// }; + /// bkd_qiter vtype of image3d. + template <typename T> + struct single_vtype< image3d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter3d ret; + }; /*--------------------------------------------. Index: oln/core/1d/aliases.hh --- oln/core/1d/aliases.hh (revision 638) +++ oln/core/1d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename T> class fwd_piter_bbox_; template <typename T> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point1d> bkd_piter1d; typedef fwd_qiter_win_<point1d> fwd_qiter1d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point1d> fwd_qiter1d; + typedef bkd_qiter_win_<point1d> bkd_qiter1d; typedef point1d_<float> point1df; typedef dpoint1d_<float> dpoint1df; Index: oln/core/2d/aliases.hh --- oln/core/2d/aliases.hh (revision 638) +++ oln/core/2d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename P> class fwd_piter_bbox_; template <typename P> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point2d> bkd_piter2d; typedef fwd_qiter_win_<point2d> fwd_qiter2d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point2d> fwd_qiter2d; + typedef bkd_qiter_win_<point2d> bkd_qiter2d; typedef point2d_<float> point2df; typedef dpoint2d_<float> dpoint2df; Index: oln/core/3d/aliases.hh --- oln/core/3d/aliases.hh (revision 638) +++ oln/core/3d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename T> class fwd_piter_bbox_; template <typename T> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point3d> bkd_piter3d; typedef fwd_qiter_win_<point3d> fwd_qiter3d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point3d> fwd_qiter3d; + typedef bkd_qiter_win_<point3d> bkd_qiter3d; typedef point3d_<float> point3df; typedef dpoint3d_<float> dpoint3df; Index: oln/core/gen/bkd_qiter_win.hh --- oln/core/gen/bkd_qiter_win.hh (revision 0) +++ oln/core/gen/bkd_qiter_win.hh (revision 0) @@ -0,0 +1,181 @@ +// 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, 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 OLN_CORE_GEN_BKD_QITER_WIN_HH +# define OLN_CORE_GEN_BKD_QITER_WIN_HH + +# include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/abstract/window.hh> +# include <oln/core/gen/window.hh> + + +namespace oln +{ + + + // Backward declaration. + template <typename point_t> class bkd_qiter_win_; + + + // Super type declaration. + template <typename point_t> + struct set_super_type< bkd_qiter_win_<point_t> > + { + typedef bkd_qiter_win_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> ret; + }; + + + /// Virtual types associated to oln::bkd_qiter_win_<point_t>. + template <typename point_t> + struct vtypes< bkd_qiter_win_<point_t> > + { + typedef point_t point_type; + typedef oln_type_of(point_t, grid) grid_type; + }; + + + + /// Abstract backward point iterator class. + template <typename point_t> + class bkd_qiter_win_ : public abstract::iterator_on_points< bkd_qiter_win_<point_t> > + { + typedef bkd_qiter_win_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> super_t; + + typedef oln_type_of(point_t, dpoint) dpoint_t; + + public: + + template <typename P, typename W> + bkd_qiter_win_(const abstract::iterator_on_points& it, + const abstract::window<W>& win); + + template <typename P, typename W> + bkd_qiter_win_(const abstract::point& p, + const abstract::window<W>& win); + + void impl_start(); + + void impl_next(); + + void impl_invalidate(); + + bool impl_is_valid() const; + + point_t impl_to_point() const; + + const point_t* impl_point_adr() const; + + protected: + + const point_t* p_ref_; + window_<dpoint_t> win_; + int i_; + point_t p_; + + }; // end of class oln::bkd_qiter_win_<point_t> + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename point_t> + template <typename P, typename W> + bkd_qiter_win_<point_t>::bkd_qiter_win_(const abstract::iterator_on_points& it, + const abstract::window<W>& win) + : p_ref_(it.point_adr()), + win_(win.exact()) + { + precondition(win_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + template <typename P, typename W> + bkd_qiter_win_<point_t>::bkd_qiter_win_(const abstract::point& p, + const abstract::window<W>& win) + : p_ref_(&(p.exact())), + win_(win.exact()) + { + precondition(win_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_start() + { + i_ = int(win_.card()) - 1; + p_ = *p_ref_+ win_.dp(i_); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_next() + { + --i_; + if (i_ == -1) + return; + p_ = *p_ref_ + win_.dp(i_); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_invalidate() + { + i_ = -1; + } + + template <typename point_t> + bool + bkd_qiter_win_<point_t>::impl_is_valid() const + { + return i_ != -1; + } + + template <typename point_t> + point_t + bkd_qiter_win_<point_t>::impl_to_point() const + { + return p_; + } + + template <typename point_t> + const point_t* + bkd_qiter_win_<point_t>::impl_point_adr() const + { + return &p_; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_BKD_QITER_WIN_HH + Index: oln/core/gen/fwd_niter_neighb.hh --- oln/core/gen/fwd_niter_neighb.hh (revision 638) +++ oln/core/gen/fwd_niter_neighb.hh (working copy) @@ -75,6 +75,8 @@ fwd_niter_neighb_(const abstract::iterator_on_points& it, const abstract::topology<T>& topo); + // FIXME: To be possibly enabled later (still unsure about it). + // template <typename P, typename N> // fwd_niter_neighb_(const abstract::iterator_on_points& it, // const abstract::neighborhood<N>& nbh) @@ -82,7 +84,7 @@ // nbh_(nbh.exact()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } // template <typename P, typename T> @@ -92,7 +94,7 @@ // nbh_(topo.exact().neighborhood()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } // template <typename P, typename N> @@ -102,7 +104,7 @@ // nbh_(nbh.exact()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } void impl_start(); @@ -139,7 +141,7 @@ nbh_(topo.exact().neighborhood()) { precondition(nbh_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -157,7 +159,7 @@ ++i_; if (i_ == int(nbh_.card())) { - i_ = -1; + this->invalidate(); return; } p_ = *p_ref_ + nbh_.dp(i_); Index: oln/core/gen/fwd_qiter_win.hh --- oln/core/gen/fwd_qiter_win.hh (revision 638) +++ oln/core/gen/fwd_qiter_win.hh (working copy) @@ -112,7 +112,7 @@ win_(win.exact()) { precondition(win_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -123,7 +123,7 @@ win_(win.exact()) { precondition(win_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -141,7 +141,7 @@ ++i_; if (i_ == int(win_.card())) { - i_ = -1; + this->invalidate(); return; } p_ = *p_ref_ + win_.dp(i_); Index: oln/core/gen/bkd_niter_neighb.hh --- oln/core/gen/bkd_niter_neighb.hh (revision 0) +++ oln/core/gen/bkd_niter_neighb.hh (revision 0) @@ -0,0 +1,200 @@ +// 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, 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 OLN_CORE_GEN_BKD_NITER_NEIGHB_HH +# define OLN_CORE_GEN_BKD_NITER_NEIGHB_HH + +# include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/gen/neighb.hh> + + +namespace oln +{ + + + // Backward declaration. + template <typename point_t> class bkd_niter_neighb_; + + + // Super type declaration. + template <typename point_t> + struct set_super_type< bkd_niter_neighb_<point_t> > + { + typedef bkd_niter_neighb_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> ret; + }; + + + /// Virtual types associated to oln::bkd_niter_neighb_<point_t>. + template <typename point_t> + struct vtypes< bkd_niter_neighb_<point_t> > + { + typedef point_t point_type; + typedef oln_type_of(point_t, grid) grid_type; + }; + + + + /// Abstract backward point iterator class. + template <typename point_t> + class bkd_niter_neighb_ : public abstract::iterator_on_points< bkd_niter_neighb_<point_t> > + { + typedef bkd_niter_neighb_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> super_t; + + typedef oln_type_of(point_t, dpoint) dpoint_t; + + public: + + template <typename P, typename T> + bkd_niter_neighb_(const abstract::iterator_on_points& it, + const abstract::topology<T>& topo); + + // FIXME: To be possibly enabled later (still unsure about it). + + // template <typename P, typename N> + // bkd_niter_neighb_(const abstract::iterator_on_points& it, + // const abstract::neighborhood<N>& nbh) + // : p_ref_(it.point_adr()), + // nbh_(nbh.exact()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + // template <typename P, typename T> + // bkd_niter_neighb_(const abstract::point& p, + // const abstract::topology<T>& topo) + // : p_ref_(&(p.exact())), + // nbh_(topo.exact().neighborhood()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + // template <typename P, typename N> + // bkd_niter_neighb_(const abstract::point& p, + // const abstract::neighborhood<N>& nbh) + // : p_ref_(&(p.exact())), + // nbh_(nbh.exact()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + void impl_start(); + + void impl_next(); + + void impl_invalidate(); + + bool impl_is_valid() const; + + point_t impl_to_point() const; + + const point_t* impl_point_adr() const; + + protected: + + const point_t* p_ref_; + neighb_<dpoint_t> nbh_; + int i_; + point_t p_; + + }; // end of class oln::bkd_niter_neighb_<point_t> + + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename point_t> + template <typename P, typename T> + bkd_niter_neighb_<point_t>::bkd_niter_neighb_(const abstract::iterator_on_points& it, + const abstract::topology<T>& topo) + : p_ref_(it.point_adr()), + nbh_(topo.exact().neighborhood()) + { + precondition(nbh_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_start() + { + i_ = int(nbh_.card()) - 1; + p_ = *p_ref_+ nbh_.dp(i_); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_next() + { + --i_; + if (i_ == -1) + return; + p_ = *p_ref_ + nbh_.dp(i_); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_invalidate() + { + i_ = -1; + } + + template <typename point_t> + bool + bkd_niter_neighb_<point_t>::impl_is_valid() const + { + return i_ != -1; + } + + template <typename point_t> + point_t + bkd_niter_neighb_<point_t>::impl_to_point() const + { + return p_; + } + + template <typename point_t> + const point_t* + bkd_niter_neighb_<point_t>::impl_point_adr() const + { + return &p_; + } + +# endif + + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_BKD_NITER_NEIGHB_HH + Index: oln/basics2d.hh --- oln/basics2d.hh (revision 638) +++ oln/basics2d.hh (working copy) @@ -46,6 +46,7 @@ # include <oln/core/gen/window.hh> # include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> # include <oln/core/gen/neighb.hh> # include <oln/core/2d/neighb2d.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 638) +++ oln/Makefile.am (working copy) @@ -104,7 +104,9 @@ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \ + core/gen/bkd_niter_neighb.hh \ core/gen/bkd_piter_bbox.hh \ + core/gen/bkd_qiter_win.hh \ core/gen/fwd_niter_neighb.hh \ core/gen/fwd_piter_bbox.hh \ core/gen/fwd_qiter_win.hh \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 638) +++ oln/basics3d.hh (working copy) @@ -44,6 +44,10 @@ # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/gen/window.hh> +# include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> + # include <oln/core/gen/neighb.hh> # include <oln/core/3d/neighb3d.hh>

18 years, 2 months

oln-0.10 10.230: Work around a bug in SWIG 1.3.29

by Roland Levillain

I haven't checked whether this bug has been fixed in SWIG's Subversion repository yet (but it wasn't present in SWIG 1.3.28). 2006-07-04 Roland Levillain <roland(a)lrde.epita.fr> Work around a bug in SWIG 1.3.29. * generate_arith_instantiations.py (write_algorithms) * generate_morpho_instantiations.py (write_algorithms): Work around a bug in SWIG 1.3.29 in the generation of C++ wrappers. Index: 10.229/tools/swilena/generate_morpho_instantiations.py --- 10.229/tools/swilena/generate_morpho_instantiations.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/24_generate_m 1.8.1.1 700) +++ 10.229(w)/tools/swilena/generate_morpho_instantiations.py Mon, 03 Jul 2006 12:23:42 +0200 levill_r (oln/v/24_generate_m 1.8.1.1 700) @@ -57,7 +57,13 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - img_type = "::oln::image%(dim)sd< %(type)s >" % vars() + # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from + # the global (top-level) namespace, i.e. `::oln::image', + # but it makes swig 1.3.29 generate invalid C++ code when + # used ad a template argument: the space between `<' and + # `::' is eaten by swig, and `<:' is understood as a + # trigraph (for `[') by the C++ compiler. + img_type = "oln::image%(dim)sd< %(type)s >" % vars() win_type = "::oln::window%(dim)sd" % vars() neighb_type = "::oln::neighborhood%(dim)sd" % vars() @@ -135,10 +141,12 @@ instantiate(idx, "top_hat_contrast_op", img_type, img_type, win_type) instantiate(idx, "fast_top_hat_contrast_op", img_type, img_type, win_type) # Watershed - img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() + # FIXME: SWIG 1.3.29 Bug (same as above). + img_ret_type = "oln::image%(dim)sd< ntg_int_u32 >" % vars() instantiate(idx, "watershed_seg", img_ret_type, img_type, neighb_type) instantiate(idx, "watershed_con", img_ret_type, img_type, neighb_type) - bin_img_type = "::oln::image%(dim)sd< ntg_bin >" % vars() + # FIXME: SWIG 1.3.29 Bug (same as above). + bin_img_type = "oln::image%(dim)sd< ntg_bin >" % vars() instantiate(idx, "sure_minima_imposition", img_type, img_type, bin_img_type, neighb_type) instantiate(idx, "sequential_minima_imposition", img_type, img_type, bin_img_type, neighb_type) instantiate(idx, "hybrid_minima_imposition", img_type, img_type, bin_img_type, neighb_type) Index: 10.229/tools/swilena/generate_arith_instantiations.py --- 10.229/tools/swilena/generate_arith_instantiations.py Fri, 30 Jun 2006 17:26:15 +0200 levill_r (oln/v/51_generate_a 1.1.1.1 700) +++ 10.229(w)/tools/swilena/generate_arith_instantiations.py Mon, 03 Jul 2006 11:44:33 +0200 levill_r (oln/v/51_generate_a 1.1.1.1 700) @@ -59,13 +59,19 @@ "ntg_int_u8", "ntg_int_u32", "ntg_int_s8", "ntg_int_s32", "ntg_float" ]: - img_type = "::oln::image%(dim)sd< %(type)s >" % vars() + # FIXME: SWIG 1.3.29 Bug. We used to refer to `oln::image' from + # the global (top-level) namespace, i.e. `::oln::image', + # but it makes swig 1.3.29 generate invalid C++ code when + # used ad a template argument: the space between `<' and + # `::' is eaten by swig, and `<:' is understood as a + # trigraph (for `[') by the C++ compiler. + img_type = "oln::image%(dim)sd< %(type)s >" % vars() bigger_type = get_bigger_type(type) - return_img_type = "::oln::image%(dim)sd< %(bigger_type)s >" % vars() + return_img_type = "oln::image%(dim)sd< %(bigger_type)s >" % vars() # FIXME: these algorithms do not work with bin if type != "ntg_bin": - for algo in [ "plus", "minus", "times", "div" ]: + for algo in [ "plus", "minus", "times", "div" ]: instantiate(dim, algo, return_img_type, img_type, img_type) instantiate(dim, "min", return_img_type, img_type, img_type)

18 years, 3 months

638: Add some documentation to image abstractions.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add some documentation to image abstractions. * oln/core/abstract/image/hybrid/classical.hh: Add documentation. * oln/core/abstract/image/dimension/hierarchy.hh, * oln/core/abstract/image/type/hierarchy.hh: Update documentation. * oln/core/abstract/image/neighborhood/hierarchy.hh: Remove dead comments. dimension/hierarchy.hh | 6 ---- hybrid/classical.hh | 56 ++++++++++++++++++++++++++++++++++++++++++++++ neighborhood/hierarchy.hh | 11 --------- type/hierarchy.hh | 6 ---- 4 files changed, 58 insertions(+), 21 deletions(-) Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 637) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -38,12 +38,64 @@ # include <oln/core/abstract/image/accessibility/hierarchy.hh> +/* Image dimension hierarchy (summary). + + + /image/ + ^ + | + ,----------------+-------+--------+----------------. + | | | | + /classical_1d_image1d/ | /classical_3d_image/ | + ^ | ^ | + | /classical_2d_image1d/ | /classical_image/ + | ^ | ^ + | | | | + | | | | + ,---------------------. | ,---------------------. | + | if type_of(I, grid) | | | if type_of(I, grid) | | + | == grid1d | | | == grid3d | | + `---------------------' | `---------------------' | + | | | | + | ,---------------------. | | + | | if type_of(I, grid) | | | + | | == grid2d | | | + | `---------------------' | | + | | | | + | | | | + ,-------------------------------------------------------------. + | if (deduce_type_of(I, topo, is_random_accessible) == true) | + | and (deduce_type_of(I, topo, bbox) != not_found) | + `-------------------------------------------------------------' + | | | | + o o o o + + o + | + (image `hybrid' selector) + ^ + | + image_entry + ^ + | + I + (a concrete image) + + + Default case: If the image I does not meet any of these conditions, the + entry is directly plugged to abstract::image. */ + + namespace oln { namespace abstract { + /*----------------------. + | Hybrid abstractions. | + `----------------------*/ + template <typename E> struct classical_image : public virtual abstract::image_having_bbox<E>, @@ -108,6 +160,10 @@ } // end of namespace oln::abstract + /*----------------. + | Hybrid switch. | + `----------------*/ + // Forward declarations. template <unsigned D> struct grid_; typedef grid_<1> grid1d; Index: oln/core/abstract/image/type/hierarchy.hh --- oln/core/abstract/image/type/hierarchy.hh (revision 637) +++ oln/core/abstract/image/type/hierarchy.hh (working copy) @@ -56,11 +56,7 @@ o | - /switch_<image_dimension_type, I>::ret/ - (image type selector) - ^ - | - /entry<abstract::image, I>/ + (image `type' selector) ^ | image_entry Index: oln/core/abstract/image/dimension/hierarchy.hh --- oln/core/abstract/image/dimension/hierarchy.hh (revision 637) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -52,11 +52,7 @@ o | - /switch_<image_hierarchy_wrt_dimension, I>::ret/ - (image dimension selector) - ^ - | - /entry<abstract::image, I>/ + (image `dimension' selector) ^ | image_entry Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 637) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -33,17 +33,6 @@ # include <oln/core/automatic/image/image_having_neighborhood.hh> -/* Image having neighborhood hierarchy (summary). - - - FIXME: TODO (diagram)! - - - Default case: If the neighborhood type returned by - `oln_type_of(I, neighborhood)', the entry is directly plugged to - abstract::image. */ - - namespace oln {

18 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches