August 2008 - Olena-patches

2130: Wrap meyer_wst for image2d<int_u8>.
by Roland Levillain 08 Aug '08

08 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Wrap meyer_wst for image2d<int_u8>. * int_u.ixx: New. Use it... * int_u8.i: ...here. Actually instantiate and wrap int_u8. * int_u32.i: New. * ch_value.ixx: New. Use it... * morpho.ixx: ...here. Wrap meyer_wst for image2d<int_u8>. * neighb2d.i: New. * image2d_int_u8.i: Add support for meyer_wst. * window2d.i: Aesthetic changes. * Makefile.am (EXTRA_DIST): Add ch_value.ixx, int_u.ixx, int_u32.i and neighb2d.i. * python/lena.py: Exercise meyer_wst. * python/Makefile.am: Handle modules int_u32 and neighb2d. * python/swilena.py: Import neighb2d, int_u8 and int_u32. Makefile.am | 12 +++-- ch_value.ixx | 78 +++++++++++++++++++++++++++++++++ image2d_int_u8.i | 32 +++++++++++++ int_u.ixx | 113 +++++++++++++++++++++++++++++++++++++++++++++++ int_u32.i | 42 +++++++++++++++++ int_u8.i | 4 + morpho.ixx | 27 +++++++++++ neighb2d.i | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++ python/Makefile.am | 20 ++++++++ python/lena.py | 29 ++++++++++-- python/swilena.py | 5 ++ window2d.i | 11 ++-- 12 files changed, 483 insertions(+), 15 deletions(-) Index: python/lena.py --- python/lena.py (revision 2129) +++ python/lena.py (working copy) @@ -30,14 +30,33 @@ import os from swilena import * +# Factor this part in a shared test Python file. top_srcdir = os.environ["top_srcdir"] img_dir = os.path.join(top_srcdir, "milena", "img") lena = os.path.join (img_dir, "lena.pgm") -ima = image2d_int_u8.load(lena) +# Module alias. +image = image2d_int_u8 -eroded = image2d_int_u8.erosion (ima, win_c4p()) -image2d_int_u8.save(eroded, "eroded.pgm") +ima = image.load(lena) -dilated = image2d_int_u8.dilation (ima, win_c4p()) -image2d_int_u8.save(dilated, "dilated.pgm") +eroded = image.erosion (ima, win_c4p()) +image.save(eroded, "eroded.pgm") + +dilated = image.dilation (ima, win_c4p()) +image.save(dilated, "dilated.pgm") + +# Watershed Transform. +# FIXME: Run a gradient and an area closing first. +nbasins = int_u32(); +ws = image.meyer_wst (ima, c4(), nbasins) +print (type (ws)) +# FIXME: Ugly name; move int_u32 methods outside image2d_int_u8. +image.println32(ws) +# FIXME: Actualy print the number of basins; for the moment, thus +# statement outputs something like +# +# <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' +# at 0x816e160> > +# +print nbasins Index: python/Makefile.am --- python/Makefile.am (revision 2129) +++ python/Makefile.am (working copy) @@ -62,6 +62,16 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u8-wrap.Pcc@am__quote@ nodist_python_PYTHON += int_u8.py +## int_u32. +pyexec_LTLIBRARIES += _int_u32.la +nodist__int_u32_la_SOURCES = int_u32-wrap.cc +_int_u32_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__int_u32_la_SOURCES) int_u32.py int_u32.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_int_u32-wrap.Pcc@am__quote@ +nodist_python_PYTHON += int_u32.py + ## dpoint2d. pyexec_LTLIBRARIES += _dpoint2d.la nodist__dpoint2d_la_SOURCES = dpoint2d-wrap.cc @@ -72,6 +82,16 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_dpoint2d-wrap.Pcc@am__quote@ nodist_python_PYTHON += dpoint2d.py +## neighb2d. +pyexec_LTLIBRARIES += _neighb2d.la +nodist__neighb2d_la_SOURCES = neighb2d-wrap.cc +_neighb2d_la_LIBADD = $(AM_LIBADD) +CLEANFILES += $(nodist__neighb2d_la_SOURCES) neighb2d.py neighb2d.py[co] +## Include the dependency files. Copied from Automake's generated +## case for C++. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_neighb2d-wrap.Pcc@am__quote@ +nodist_python_PYTHON += neighb2d.py + ## window2d. pyexec_LTLIBRARIES += _window2d.la nodist__window2d_la_SOURCES = window2d-wrap.cc Index: python/swilena.py --- python/swilena.py (revision 2129) +++ python/swilena.py (working copy) @@ -31,6 +31,11 @@ from point2d import * from dpoint2d import * +from neighb2d import * from window2d import * + +from int_u8 import * +from int_u32 import * + import image2d_int import image2d_int_u8 Index: window2d.i --- window2d.i (revision 2129) +++ window2d.i (working copy) @@ -37,17 +37,17 @@ #include "mln/core/window2d.hh" %} +// FIXME: Move mln::window to its own file. + %include "mln/core/concept/window.hh" -// FIXME: Wrap mln::image2d by hand, for Milena macros disturb swig. +// FIXME: Wrap mln::window by hand, for Milena macros disturb swig. // Annotate the original source code instead? namespace mln { template <typename D> - class window - /* FIXME: Simplify, so as to minimize the work. */ - : public Window< window<D> > - , public internal::dpoints_base_<D, window<D> > + class window : public Window< window<D> >, + public internal::dpoints_base_<D, window<D> > { typedef internal::dpoints_base_<D, window<D> > super_; public: @@ -103,6 +103,7 @@ // box_<mln_point(D)> b_; box_<typename D::point> b_; }; + } // end of namespace mln %include "mln/core/window2d.hh" Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2129) +++ image2d_int_u8.i (working copy) @@ -57,8 +57,40 @@ #include "mln/core/window2d.hh" %} +%import "neighb2d.i" +// FIXME: The import directive does not include the `%{ ... %}' clauses. +%{ +#include "mln/core/neighb2d.hh" +%} + %include "morpho.ixx" +/* FIXME: Can't we use `mln::value::int8' directlt here (as we can + use `mln::window2d', which is a really just typedef for + `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ %template(dilation) mln::morpho::dilation< mln::image2d< mln::value::int_u<8> >, mln::window2d >; %template(erosion) mln::morpho::erosion< mln::image2d< mln::value::int_u<8> >, mln::window2d >; + +// Explicit instantiation of this trait for the return type of +// mln::morpho::meyer_wst. +%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, + mln::value::int_u<32> >; +%template(meyer_wst) mln::morpho::meyer_wst< + mln::value::int_u<32>, + mln::image2d< mln::value::int_u<8> >, + mln::neighb2d + >; + + +/*-------------------. +| image2d<int_u32>. | +`-------------------*/ + +// FIXME: Rearrange and move this elsewhere. + +%template(image2d_int_u32) mln::image2d< mln::value::int_u<32> >; + +%template(println32) mln::debug::println< + mln::image2d< mln::value::int_u<32> > + >; Index: int_u.ixx --- int_u.ixx (revision 0) +++ int_u.ixx (revision 0) @@ -0,0 +1,113 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file int_u.i +/// \brief A wrapper of mln::value::int_u. + +%module int_u + +%{ +#include "mln/value/int_u.hh" +%} + +// FIXME: Wrap mln::int_u by hand, for Milena macros disturb swig. +// Annotate the original source code instead? +namespace mln +{ + + namespace value + { + + /*! \brief Unsigned integer value class. + * + * The parameter is \c n the number of encoding bits. + */ + template <unsigned n> + struct int_u + : + public Integer< int_u<n> >, + + public internal::value_like_< unsigned, // Equivalent. + typename internal::encoding_unsigned_<n>::ret, // Enc. + int, // Interoperation. + int_u<n> > // Exact. + { + protected: + /// Encoding associated type. + typedef typename internal::encoding_unsigned_<n>::ret enc_; + + public: + + /// Constructor without argument. + int_u(); + + /// Constructor from an integer. + int_u(int i); + + /// \{ Constructors/assignments with literals. + int_u(const mln::literal::zero_t&); + int_u& operator=(const mln::literal::zero_t&); + int_u(const mln::literal::one_t&); + int_u& operator=(const mln::literal::one_t&); + /// \} + + /// Conversion to an unsigned integer. + operator unsigned() const; + + /// Unary operator minus. + int operator-() const; + + /// Assignment from an integer. + int_u<n>& operator=(int i); + }; + + + // Safety. + template <> struct int_u<0>; + template <> struct int_u<1>; + + + + /*! \brief Print an unsigned integer \p i into the output stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] i An unsigned integer. + * + * \return The modified output stream \p ostr. + */ + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const int_u<n>& i); + + + // FIXME: Doc! + template <unsigned n> + std::istream& operator>>(std::istream& istr, int_u<n>& i); + + } // end of namespace mln::value + +} // end of namespace mln Index: ch_value.ixx --- ch_value.ixx (revision 0) +++ ch_value.ixx (revision 0) @@ -0,0 +1,78 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file ch_value.i +/// \brief A wrapper of mln::trait::ch_value. + +%module ch_value + +/* FIXME: Use this very limited workaround instead of + mln/trait/ch_value.hh or even a subset of it for the moment. */ + +%{ +#include "mln/trait/ch_value.hh" +%} + +# define mln_ch_value(I, V) typename mln::trait::ch_value< I, V >::ret +# define mln_ch_value_(I, V) mln::trait::ch_value< I, V >::ret + +namespace mln +{ + namespace trait + { + + template <typename I, typename L> + struct ch_value + { + // Nothing by default. + }; + + /* Swig is not powerful enough to parse difficult templates. For + instance, it won't match this specialization. + + template <typename T, typename U> + struct ch_value< mln::image2d< T >, U > + { + typedef mln::image2d< U > ret; + }; + + (which is even simpler than what mln/trait/ch_value.hh contains!) + + So we just give it simple ``inlined'' equivalent traits that + are compatible with the ones in mln/trait/ch_value.hh. */ + + template <> + struct ch_value< mln::image2d< mln::value::int_u<8> >, + mln::value::int_u<32> > + { + typedef mln::image2d< mln::value::int_u<32> > ret; + }; + + } // end of namespace mln::morpho + +} // end of namespace mln Index: int_u8.i --- int_u8.i (revision 2129) +++ int_u8.i (working copy) @@ -31,8 +31,12 @@ %module int_u8 +%include "int_u.ixx" + %{ #include "mln/value/int_u8.hh" %} %include "mln/value/int_u8.hh" + +%template (int_u8) mln::value::int_u<8>; Index: Makefile.am --- Makefile.am (revision 2129) +++ Makefile.am (working copy) @@ -2,11 +2,15 @@ SUBDIRS = python -# Meta-wrappers (templates). -EXTRA_DIST = fill.ixx image2d.ixx intp.ixx morpho.ixx pgm.ixx println.ixx -# Wrappers. +# Meta-wrappers (templates), not generating a module, but factoring +# common parts. +EXTRA_DIST = \ + ch_value.ixx fill.ixx image2d.ixx intp.ixx int_u.ixx \ + morpho.ixx pgm.ixx println.ixx + +# Wrappers (generating actual modules). EXTRA_DIST += \ dpoint2d.i image2d_int.i image2d_int_u8.i int_u8.i \ - point2d.i window2d.i + int_u32.i neighb2d.i point2d.i window2d.i check_SCRIPTS = run Index: neighb2d.i --- neighb2d.i (revision 0) +++ neighb2d.i (revision 0) @@ -0,0 +1,125 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file neighb2d.i +/// \brief A wrapper of mln::neighb2d. + +%module neighb2d + +%import "dpoint2d.i" + +%{ +#include "mln/core/neighb2d.hh" +%} + +// FIXME: Move mln::neighb_ to its own file. + +%include "mln/core/concept/neighborhood.hh" + +// FIXME: Wrap mln::neighb by hand, for Milena macros disturb swig. +// Annotate the original source code instead? +namespace mln +{ + + // fwd decls + template <typename D> class dpoints_fwd_piter; + template <typename D> class dpoints_bkd_piter; + + + /*! \brief Generic neighborhood class. + * + * This neighborhood of window is just like a set of delta-points. + * The parameter is \c D, type of delta-point. + */ + template <typename D> + struct neighb_ : public Neighborhood< neighb_<D> >, + public internal::dpoints_base_<D, neighb_<D> > + { + /// Dpoint associated type. + typedef D dpoint; + +// FIXME: The macro mln_point disturbs swig. +// /// Point associated type. +// typedef mln_point(D) point; + typedef typename D::point point; + + /*! \brief Point_Iterator type to browse the points of a generic + * neighborhood w.r.t. the ordering of delta-points. + */ + typedef dpoints_fwd_piter<D> fwd_niter; + + /*! \brief Point_Iterator type to browse the points of a generic + * neighborhood w.r.t. the reverse ordering of delta-points. + */ + typedef dpoints_bkd_piter<D> bkd_niter; + + /*! \brief Same as fwd_niter. + */ + typedef fwd_niter niter; + + /*! \brief Constructor without argument. + * + * The constructed neighborhood is empty. You have to use insert() + * to proceed to the neighborhood definition. + */ + neighb_(); + + /*! \brief Insert a delta-point \p dp in the neighborhood + * definition. + * + * \param[in] dp The delta-point to insert. + * + * This method also insert the symmetrical delta-point, - \p dp, + * in the neighborhood definition; thus the client has not to + * ensure the symmetry property; that is automatic. + */ + neighb_<D>& insert(const D& dp); + +// FIXME: Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D ctors for a point2d). + /// \{ Insertion of a delta-point with different numbers of + /// arguments (coordinates) w.r.t. the dimension. +// neighb_<D>& insert(const mln_coord(D)& dind); // For 1D. + +// FIXME: The macro mln_coord disturbs swig. +// neighb_<D>& insert(const mln_coord(D)& drow, +// const mln_coord(D)& dcol); // For 2D. + neighb_<D>& insert(const typename D::coord& drow, + const typename D::coord& dcol); // For 2D. + +// neighb_<D>& insert(const mln_coord(D)& dsli, +// const mln_coord(D)& drow, +// const mln_coord(D)& dcol); // For 3D. + /// \} + }; + +} // end of namespace mln + +%include "mln/core/neighb2d.hh" + +%template(neighb2d) mln::neighb_< mln::dpoint_<mln::grid::square, int > >; Index: int_u32.i --- int_u32.i (revision 0) +++ int_u32.i (revision 0) @@ -0,0 +1,42 @@ +// -*- C++ -*- +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file int_u32.i +/// \brief A wrapper of mln::value::int_u32. + +%module int_u32 + +%include "int_u.ixx" + +%{ +#include "mln/value/int_u32.hh" +%} + +%include "mln/value/int_u32.hh" + +%template (int_u32) mln::value::int_u<32>; Index: morpho.ixx --- morpho.ixx (revision 2129) +++ morpho.ixx (working copy) @@ -31,6 +31,10 @@ %module morpho +/*---------------------------. +| Dilation and erxrebosion. | +`---------------------------*/ + %{ #include "mln/morpho/dilation.hh" #include "mln/morpho/erosion.hh" @@ -44,7 +48,15 @@ { /* FIXME: How can we handle concrete in Swilena? Simplify this - for the moment, and use I directly as return type. */ + for the moment, and use I directly as return type. + + 2008-08-08: Actualy, it's very simple: just ask swig to wrap + the macro `mln_concrete'. See how we did it with + `mln_ch_value'. + + We should apply this to as many wrappers as we can: we have + inlined many `mln_*' macros so far, and it is a pain to + maintain. */ template <typename I, typename W> I @@ -57,3 +69,16 @@ } // end of namespace mln::morpho } // end of namespace mln + + +/*------------------------------------. +| Meyer's Watershed Transform (WST). | +`------------------------------------*/ + +%include "ch_value.ixx" + +%{ +#include "mln/morpho/meyer_wst.hh" +%} + +%include "mln/morpho/meyer_wst.hh"

1 0

2129: Misc clean up in mln::value::.
by Roland Levillain 08 Aug '08

08 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Misc clean up in mln::value::. * mln/value/graylevel.hh, mln/value/graylevel_f.hh, * mln/value/int_s.hh, mln/value/int_u.hh, * mln/value/rgb.hh: Use fully qualified type names to help swig wrap typedefs (later). * mln/value/int_s8.hh, mln/value/int_s16.hh, * mln/value/int_u8.hh, mln/value/int_u16.hh: Typos in comments. * mln/value/int_s32.hh, mln/value/int_u32.hh: New files. graylevel.hh | 24 ++++++++++++------------ graylevel_f.hh | 24 ++++++++++++------------ int_s.hh | 16 ++++++++-------- int_s16.hh | 2 +- int_s32.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ int_s8.hh | 2 +- int_u.hh | 16 ++++++++-------- int_u16.hh | 2 +- int_u32.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ int_u8.hh | 2 +- rgb.hh | 20 ++++++++++---------- 11 files changed, 164 insertions(+), 54 deletions(-) Index: mln/value/int_s32.hh --- mln/value/int_s32.hh (revision 0) +++ mln/value/int_s32.hh (revision 0) @@ -0,0 +1,55 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_VALUE_INT_S32_HH +# define MLN_VALUE_INT_S32_HH + +/*! \file mln/value/int_s32.hh + * + * \brief Define the alias value::int_s32. + */ + +# include <mln/value/int_s.hh> + + +namespace mln +{ + + namespace value + { + + + /// Alias for signed 32-bit integers. + typedef int_s<32> int_s32; + + + } // end of namespace mln::value + +} // end of namespace mln + + +#endif // ! MLN_VALUE_INT_S32_HH Index: mln/value/int_s16.hh --- mln/value/int_s16.hh (revision 2128) +++ mln/value/int_s16.hh (working copy) @@ -43,7 +43,7 @@ { - /// Alias for signed 16 bit integers. + /// Alias for signed 16-bit integers. typedef int_s<16> int_s16; Index: mln/value/int_u32.hh --- mln/value/int_u32.hh (revision 0) +++ mln/value/int_u32.hh (revision 0) @@ -0,0 +1,55 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_VALUE_INT_U32_HH +# define MLN_VALUE_INT_U32_HH + +/*! \file mln/value/int_u32.hh + * + * \brief Define the alias value::int_u32. + */ + +# include <mln/value/int_u.hh> + + +namespace mln +{ + + namespace value + { + + + /// Alias for unsigned 32-bit integers. + typedef mln::value::int_u<32> int_u32; + + + } // end of namespace mln::value + +} // end of namespace mln + + +#endif // ! MLN_VALUE_INT_U32_HH Index: mln/value/int_u16.hh --- mln/value/int_u16.hh (revision 2128) +++ mln/value/int_u16.hh (working copy) @@ -43,7 +43,7 @@ { - /// Alias for unsigned 16 bit integers. + /// Alias for unsigned 16-bit integers. typedef int_u<16> int_u16; Index: mln/value/graylevel.hh --- mln/value/graylevel.hh (revision 2128) +++ mln/value/graylevel.hh (working copy) @@ -285,17 +285,17 @@ /// Ctors with literals. /// \{ - graylevel(const literal::black_t&); - graylevel(const literal::medium_gray_t&); - graylevel(const literal::white_t&); + graylevel(const mln::literal::black_t&); + graylevel(const mln::literal::medium_gray_t&); + graylevel(const mln::literal::white_t&); /// \} /// Assigment with literals. /// \{ - graylevel<n>& operator=(const literal::black_t&); - graylevel<n>& operator=(const literal::medium_gray_t&); - graylevel<n>& operator=(const literal::white_t&); + graylevel<n>& operator=(const mln::literal::black_t&); + graylevel<n>& operator=(const mln::literal::medium_gray_t&); + graylevel<n>& operator=(const mln::literal::white_t&); /// \} @@ -496,7 +496,7 @@ template <unsigned n> inline - graylevel<n>::graylevel(const literal::black_t&) + graylevel<n>::graylevel(const mln::literal::black_t&) { this->v_ = 0; } @@ -504,7 +504,7 @@ template <unsigned n> inline graylevel<n>& - graylevel<n>::operator=(const literal::black_t&) + graylevel<n>::operator=(const mln::literal::black_t&) { this->v_ = 0; return *this; @@ -512,7 +512,7 @@ template <unsigned n> inline - graylevel<n>::graylevel(const literal::medium_gray_t&) + graylevel<n>::graylevel(const mln::literal::medium_gray_t&) { this->v_ = metal::math::pow_int<2, n - 1>::value; } @@ -520,7 +520,7 @@ template <unsigned n> inline graylevel<n>& - graylevel<n>::operator=(const literal::medium_gray_t&) + graylevel<n>::operator=(const mln::literal::medium_gray_t&) { this->v_ = metal::math::pow_int<2, n - 1>::value; return *this; @@ -529,7 +529,7 @@ template <unsigned n> inline - graylevel<n>::graylevel(const literal::white_t&) + graylevel<n>::graylevel(const mln::literal::white_t&) { this->v_ = mln_max(mln_enc(int_u<n>)); } @@ -537,7 +537,7 @@ template <unsigned n> inline graylevel<n>& - graylevel<n>::operator=(const literal::white_t&) + graylevel<n>::operator=(const mln::literal::white_t&) { this->v_ = mln_max(mln_enc(int_u<n>)); return *this; Index: mln/value/graylevel_f.hh --- mln/value/graylevel_f.hh (revision 2128) +++ mln/value/graylevel_f.hh (working copy) @@ -221,16 +221,16 @@ /// Ctors with literals. /// \{ - graylevel_f(const literal::black_t&); - graylevel_f(const literal::medium_gray_t&); - graylevel_f(const literal::white_t&); + graylevel_f(const mln::literal::black_t&); + graylevel_f(const mln::literal::medium_gray_t&); + graylevel_f(const mln::literal::white_t&); /// \} /// Assigment with literals. /// \{ - graylevel_f& operator=(const literal::black_t&); - graylevel_f& operator=(const literal::medium_gray_t&); - graylevel_f& operator=(const literal::white_t&); + graylevel_f& operator=(const mln::literal::black_t&); + graylevel_f& operator=(const mln::literal::medium_gray_t&); + graylevel_f& operator=(const mln::literal::white_t&); /// \} /// Convertion to graylevel<n>. @@ -397,42 +397,42 @@ } inline - graylevel_f::graylevel_f(const literal::black_t&) + graylevel_f::graylevel_f(const mln::literal::black_t&) { this->v_ = 0.0f; } inline graylevel_f& - graylevel_f::operator=(const literal::black_t&) + graylevel_f::operator=(const mln::literal::black_t&) { this->v_ = 0.0f; return *this; } inline - graylevel_f::graylevel_f(const literal::medium_gray_t&) + graylevel_f::graylevel_f(const mln::literal::medium_gray_t&) { this->v_ = 0.5f; } inline graylevel_f& - graylevel_f::operator=(const literal::medium_gray_t&) + graylevel_f::operator=(const mln::literal::medium_gray_t&) { this->v_ = 0.5f; return *this; } inline - graylevel_f::graylevel_f(const literal::white_t&) + graylevel_f::graylevel_f(const mln::literal::white_t&) { this->v_ = 1.0f; } inline graylevel_f& - graylevel_f::operator=(const literal::white_t&) + graylevel_f::operator=(const mln::literal::white_t&) { this->v_ = 1.0f; return *this; Index: mln/value/int_s.hh --- mln/value/int_s.hh (revision 2128) +++ mln/value/int_s.hh (working copy) @@ -122,10 +122,10 @@ int_s(int i); /// \{ Constructors/assignments with literals. - int_s(const literal::zero_t&); - int_s& operator=(const literal::zero_t&); - int_s(const literal::one_t&); - int_s& operator=(const literal::one_t&); + int_s(const mln::literal::zero_t&); + int_s& operator=(const mln::literal::zero_t&); + int_s(const mln::literal::one_t&); + int_s& operator=(const mln::literal::one_t&); /// \} /// Conversion to an integer. @@ -202,7 +202,7 @@ template <unsigned n> inline - int_s<n>::int_s(const literal::zero_t&) + int_s<n>::int_s(const mln::literal::zero_t&) { this->v_ = 0; } @@ -210,7 +210,7 @@ template <unsigned n> inline int_s<n>& - int_s<n>::operator=(const literal::zero_t&) + int_s<n>::operator=(const mln::literal::zero_t&) { this->v_ = 0; return *this; @@ -218,7 +218,7 @@ template <unsigned n> inline - int_s<n>::int_s(const literal::one_t&) + int_s<n>::int_s(const mln::literal::one_t&) { this->v_ = 1; } @@ -226,7 +226,7 @@ template <unsigned n> inline int_s<n>& - int_s<n>::operator=(const literal::one_t&) + int_s<n>::operator=(const mln::literal::one_t&) { this->v_ = 1; return *this; Index: mln/value/int_u.hh --- mln/value/int_u.hh (revision 2128) +++ mln/value/int_u.hh (working copy) @@ -131,10 +131,10 @@ int_u(int i); /// \{ Constructors/assignments with literals. - int_u(const literal::zero_t&); - int_u& operator=(const literal::zero_t&); - int_u(const literal::one_t&); - int_u& operator=(const literal::one_t&); + int_u(const mln::literal::zero_t&); + int_u& operator=(const mln::literal::zero_t&); + int_u(const mln::literal::one_t&); + int_u& operator=(const mln::literal::one_t&); /// \} /// Conversion to an unsigned integer. @@ -189,7 +189,7 @@ template <unsigned n> inline - int_u<n>::int_u(const literal::zero_t&) + int_u<n>::int_u(const mln::literal::zero_t&) { this->v_ = 0; } @@ -197,7 +197,7 @@ template <unsigned n> inline int_u<n>& - int_u<n>::operator=(const literal::zero_t&) + int_u<n>::operator=(const mln::literal::zero_t&) { this->v_ = 0; return *this; @@ -205,7 +205,7 @@ template <unsigned n> inline - int_u<n>::int_u(const literal::one_t&) + int_u<n>::int_u(const mln::literal::one_t&) { this->v_ = 1; } @@ -213,7 +213,7 @@ template <unsigned n> inline int_u<n>& - int_u<n>::operator=(const literal::one_t&) + int_u<n>::operator=(const mln::literal::one_t&) { this->v_ = 1; return *this; Index: mln/value/int_s8.hh --- mln/value/int_s8.hh (revision 2128) +++ mln/value/int_s8.hh (working copy) @@ -43,7 +43,7 @@ { - /// Alias for signed 8 bit integers. + /// Alias for signed 8-bit integers. typedef int_s<8> int_s8; Index: mln/value/int_u8.hh --- mln/value/int_u8.hh (revision 2128) +++ mln/value/int_u8.hh (working copy) @@ -43,7 +43,7 @@ { - /// Alias for unsigned 8 bit integers. + /// Alias for unsigned 8-bit integers. typedef mln::value::int_u<8> int_u8; Index: mln/value/rgb.hh --- mln/value/rgb.hh (revision 2128) +++ mln/value/rgb.hh (working copy) @@ -194,12 +194,12 @@ operator algebra::vec<3, float>() const { return this->v_; } /// \{ Constructors with literals. - rgb<n>(const literal::white_t&); - rgb<n>(const literal::black_t&); + rgb<n>(const mln::literal::white_t&); + rgb<n>(const mln::literal::black_t&); - rgb<n>(const literal::blue_t&); - rgb<n>(const literal::red_t&); - rgb<n>(const literal::green_t&); + rgb<n>(const mln::literal::blue_t&); + rgb<n>(const mln::literal::red_t&); + rgb<n>(const mln::literal::green_t&); /// \} /// Assignment. @@ -333,7 +333,7 @@ template <unsigned n> inline - rgb<n>::rgb(const literal::white_t&) + rgb<n>::rgb(const mln::literal::white_t&) { this->v_[0] = mln_max(int_u<n>); this->v_[1] = mln_max(int_u<n>); @@ -342,7 +342,7 @@ template <unsigned n> inline - rgb<n>::rgb(const literal::black_t&) + rgb<n>::rgb(const mln::literal::black_t&) { this->v_[0] = 0; this->v_[1] = 0; @@ -351,7 +351,7 @@ template <unsigned n> inline - rgb<n>::rgb(const literal::red_t&) + rgb<n>::rgb(const mln::literal::red_t&) { this->v_[0] = mln_max(int_u<n>); this->v_[1] = 0; @@ -360,7 +360,7 @@ template <unsigned n> inline - rgb<n>::rgb(const literal::green_t&) + rgb<n>::rgb(const mln::literal::green_t&) { this->v_[0] = 0; this->v_[1] = mln_max(int_u<n>); @@ -369,7 +369,7 @@ template <unsigned n> inline - rgb<n>::rgb(const literal::blue_t&) + rgb<n>::rgb(const mln::literal::blue_t&) { this->v_[0] = 0; this->v_[1] = 0;

1 0

Re: [Olena-patches] [Olena] #113: Review median files in mln::level
by Olena 08 Aug '08

08 Aug '08

#113: Review median files in mln::level ----------------------+----------------------------------------------------- Reporter: duhamel | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * owner: nivault => Olena Team -- Ticket URL: <https://trac.lrde.org/olena/ticket/113#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena
by Olena 08 Aug '08

08 Aug '08

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * owner: nivault => Olena Team -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #121: Add full test for mln::level
by Olena 08 Aug '08

08 Aug '08

#121: Add full test for mln::level ----------------------+----------------------------------------------------- Reporter: duhamel | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * owner: duhamel => Olena Team -- Ticket URL: <https://trac.lrde.org/olena/ticket/121#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #112: Add full test for mln::draw
by Olena 08 Aug '08

08 Aug '08

#112: Add full test for mln::draw ----------------------+----------------------------------------------------- Reporter: duhamel | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * owner: duhamel => Olena Team -- Ticket URL: <https://trac.lrde.org/olena/ticket/112#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #111: Add full test for mln::display
by Olena 08 Aug '08

08 Aug '08

#111: Add full test for mln::display ----------------------+----------------------------------------------------- Reporter: duhamel | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * owner: duhamel => Olena Team -- Ticket URL: <https://trac.lrde.org/olena/ticket/111#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #120: Handle check_full.
by Olena 08 Aug '08

08 Aug '08

#120: Handle check_full. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: ------------------------+--------------------------------------------------- Changes (by levill_r): * owner: levil_r => levill_r Comment: Reassign to `levill_r` (with two 'l'!). -- Ticket URL: <https://trac.lrde.org/olena/ticket/120#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

2128: Add actual complex-based psite and pset.
by Roland Levillain 07 Aug '08

07 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add actual complex-based psite and pset and give new names to faces-related entities. * mln/core/complex_psite.hh: Rename as... * mln/core/faces_psite.hh: ...this. (mln::complex_psite<P, N, D>): Turn into... (mln::faces_psite<N, D, P>): ...this. * mln/core/p_complex.hh: Rename as... * mln/core/p_faces.hh: ...this. (mln::p_complex<P, N, D>): Turn into... (mln::p_faces<N, D, P>): ...this. * mln/core/complex_psite.hh, mln/core/p_complex.hh: New. * tests/core/complex.cc: Exercise the variants of mln::complex<D>::nfaces(). * tests/core/p_complex.cc: Rename as... * tests/core/complex_image.cc: ...this. Exercise mln::p_complex, mln::complex_psite, and mln::faces_psite. * tests/core/Makefile.am (check_PROGRAMS): s/p_complex/complex_image/. (p_complex_SOURCES): Likewise. Rename as... (complex_image_SOURCES): ...this. mln/core/complex_psite.hh | 101 +++++++++++++++++++----------------------- mln/core/faces_psite.hh | 104 +++++++++++++++++++++----------------------- mln/core/p_complex.hh | 68 ++++++++++++++++------------ mln/core/p_faces.hh | 90 +++++++++++++++++++++----------------- tests/core/Makefile.am | 4 - tests/core/complex.cc | 13 +++++ tests/core/complex_image.cc | 83 +++++++++++++++++++++++++---------- 7 files changed, 260 insertions(+), 203 deletions(-) Index: tests/core/complex.cc --- tests/core/complex.cc (revision 2127) +++ tests/core/complex.cc (working copy) @@ -75,4 +75,17 @@ face_handle<2, 2> t1 = c.add_face(e1 + e3 + e4); std::cout << c << std::endl; + + std::cout << "``Static'' manipulators." << std::endl; + std::cout << " number of 0-faces: " << c.nfaces<0>() << std::endl; + std::cout << " number of 1-faces: " << c.nfaces<1>() << std::endl; + std::cout << " number of 2-faces: " << c.nfaces<2>() << std::endl; + std::cout << " total number of faces: " << c.nfaces() << std::endl; + + std::cout << std::endl; + + std::cout << "``Dynamic'' manipulators." << std::endl; + std::cout << " number of 0-faces: " << c.nfaces(0) << std::endl; + std::cout << " number of 1-faces: " << c.nfaces(1) << std::endl; + std::cout << " number of 2-faces: " << c.nfaces(2) << std::endl; } Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2123) +++ tests/core/complex_image.cc (working copy) @@ -25,16 +25,18 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/p_complex.cc -/// \brief Test of mln::p_complex. +/// \file tests/core/complex_image.cc +/// \brief Test of mln::complex_image. #include <iostream> -#include <mln/core/p_complex.hh> #include <mln/core/point2d.hh> +// #include <mln/core/complex_image.hh> +#include <mln/core/p_faces.hh> +#include <mln/core/p_complex.hh> + -// FIXME: Extend this test and rename it as complex_image.cc. int main() { @@ -62,34 +64,71 @@ */ - complex<2> c; + const unsigned D = 2; + + complex<D> c; // 0-faces (points). - face_handle<0, 2> v0 = c.add_face(); - face_handle<0, 2> v1 = c.add_face(); - face_handle<0, 2> v2 = c.add_face(); - face_handle<0, 2> v3 = c.add_face(); + face_handle<0, D> v0 = c.add_face(); + face_handle<0, D> v1 = c.add_face(); + face_handle<0, D> v2 = c.add_face(); + face_handle<0, D> v3 = c.add_face(); // 1-faces (segments). - face_handle<1, 2> e0 = c.add_face(v0 + v1); - face_handle<1, 2> e1 = c.add_face(v0 + v2); - face_handle<1, 2> e2 = c.add_face(v1 + v2); - face_handle<1, 2> e3 = c.add_face(v0 + v3); - face_handle<1, 2> e4 = c.add_face(v2 + v3); + face_handle<1, D> e0 = c.add_face(v0 + v1); + face_handle<1, D> e1 = c.add_face(v0 + v2); + face_handle<1, D> e2 = c.add_face(v1 + v2); + face_handle<1, D> e3 = c.add_face(v0 + v3); + face_handle<1, D> e4 = c.add_face(v2 + v3); // 2-faces (triangles). - face_handle<2, 2> t0 = c.add_face(e0 + e1 + e2); - face_handle<2, 2> t1 = c.add_face(e1 + e3 + e4); + face_handle<2, D> t0 = c.add_face(e0 + e1 + e2); + face_handle<2, D> t1 = c.add_face(e1 + e3 + e4); - /*----------------------. - | Complex-based psets. | - `----------------------*/ + /*---------------------. + | Complex-based pset. | + `---------------------*/ + + // A pset. + p_complex<D, point2d> pc0(c); + // An any-face handle (on E0) + any_face_handle<D> af(c, 1, 0); + // An associated psite. + complex_psite<D, point2d> cs(af); + + + /*--------------------. + | Faces-based psets. | + `--------------------*/ // Pset of 0-faces. - p_complex<point2d, 0, 2> pc0(c); + p_faces<0, D, point2d> pf0(c); // Pset of 1-faces. - p_complex<point2d, 1, 2> pc1(c); + p_faces<1, D, point2d> pf1(c); // Pset of 2-faces. - p_complex<point2d, 2, 2> pc2(c); + p_faces<2, D, point2d> pf2(c); + + // Some psites on faces. + faces_psite<0, D, point2d> fs0(v0); + faces_psite<1, D, point2d> fs1(e0); + faces_psite<2, D, point2d> fs2(t0); + + + // FIXME: Enable when complex_image is available. +#if 0 + /*----------------------. + | Complex-based image. | + `----------------------*/ + + // An image type built on a 2-complex with mln::int_u8 values on + // each face. + typedef ima_t complex_image< p_complex<D, point2d>, int_u8>; + + // FIXME: Create and init IMA. + // ... + ima_t ima(pc2); + + mln_piter_(ima_t) p(ima.domain()); +#endif } Property changes on: tests/core/complex_image.cc ___________________________________________________________________ Added: svn:mergeinfo Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 2127) +++ tests/core/Makefile.am (working copy) @@ -13,6 +13,7 @@ clock_test \ clone \ complex \ + complex_image \ \ decorated_image \ dpoint1d \ @@ -51,7 +52,6 @@ \ obased_rle_image \ \ - p_complex \ p_priority_queue \ p_priority_queue_fast \ p_priority_queue_fast_with_array \ @@ -101,6 +101,7 @@ clock_test_SOURCES = clock_test.cc clone_SOURCES = clone.cc complex_SOURCES = complex.cc +complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc dpoint1d_SOURCES = dpoint1d.cc @@ -139,7 +140,6 @@ obased_rle_image_SOURCES = obased_rle_image.cc -p_complex_SOURCES = p_complex.cc p_priority_queue_SOURCES = p_priority_queue.cc p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc Index: mln/core/complex_psite.hh --- mln/core/complex_psite.hh (revision 2127) +++ mln/core/complex_psite.hh (working copy) @@ -38,21 +38,16 @@ namespace mln { - /* FIXME: Write also a complex_psite where N is dynamic, and can be - changed? */ + /* FIXME: Get rid of P? */ - /* FIXME: Currently, P and N are free variables; we might want to - relate them, e.g., have P::dim == N. Or even get rid of P. */ - - /// \brief Point site associated to a mln::complex_image. + /// \brief Point site associated to a mln::p_complex. /// + /// \arg \p D The dimension of the complex this psite belongs to. /// \arg \p P The type of point associated to this psite. - /// \arg \p N The dimension of the face associated to this psite. - /// \arg \p D The dimention of the complex this psite belongs to. - template <typename P, unsigned N, unsigned D> - class complex_psite : public Point_Site< complex_psite<P, N, D> > + template <unsigned D, typename P> + class complex_psite : public Point_Site< complex_psite<D, P> > { - typedef complex_psite<P, N, D> self_; + typedef complex_psite<D, P> self_; typedef Point_Site<self_> super_; public: @@ -65,7 +60,7 @@ /// Construction and assignment. /// \{ complex_psite(); - complex_psite(const face_handle<N, D>& face); + complex_psite(const any_face_handle<D>& face); complex_psite(const self_& rhs); self_& operator= (const self_& rhs); /// \} @@ -82,7 +77,7 @@ /// \} /// Return the face handle of this point site. - face_handle<N, D> face() const; + any_face_handle<D> face() const; /// Return the complex on which this site is built. const complex<D>& cplx() const; @@ -91,7 +86,7 @@ private: /// The handle of the face this psite is pointing towards. - face_handle<N, D> face_; + any_face_handle<D> face_; // FIXME: Actually, this is a dummy value! point p_; }; @@ -106,10 +101,10 @@ /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::complex. - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator==(const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs); + operator==(const complex_psite<D, P>& lhs, + const complex_psite<D, P>& rhs); /// \brief Is \a lhs ``less'' than \a rhs? /// @@ -117,51 +112,45 @@ /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::complex. - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator< (const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs); + operator< (const complex_psite<D, P>& lhs, + const complex_psite<D, P>& rhs); /// \} # ifndef MLN_INCLUDE_ONLY - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite() + complex_psite<D, P>::complex_psite() : super_(), // Dummy initializations. face_(), p_() { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite(const face_handle<N, D>& face) + complex_psite<D, P>::complex_psite(const any_face_handle<D>& face) : super_(), face_(face), p_() { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite(const complex_psite<P, N, D>& rhs) + complex_psite<D, P>::complex_psite(const complex_psite<D, P>& rhs) : super_(rhs), face_(rhs.face_), p_() { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - complex_psite<P, N, D>& - complex_psite<P, N, D>::operator= (const complex_psite<P, N, D>& rhs) + complex_psite<D, P>& + complex_psite<D, P>::operator= (const complex_psite<D, P>& rhs) { if (&rhs == this) return *this; @@ -169,52 +158,52 @@ return *this; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline bool - complex_psite<P, N, D>::is_valid() const + complex_psite<D, P>::is_valid() const { - return face.is_valid(); + return face_.is_valid(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - const complex_psite<P, N, D>& - complex_psite<P, N, D>::to_psite() const + const complex_psite<D, P>& + complex_psite<D, P>::to_psite() const { return *this; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline const P& - complex_psite<P, N, D>::to_point() const + complex_psite<D, P>::to_point() const { // FIXME: Dummy value. return p_; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline mln_coord(P) - complex_psite<P, N, D>::operator[](unsigned i) const + complex_psite<D, P>::operator[](unsigned i) const { mln_precondition(is_valid()); return to_point()[i]; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - face_handle<N, D> - complex_psite<P, N, D>::face() const + any_face_handle<D> + complex_psite<D, P>::face() const { return face_; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline const complex<D>& - complex_psite<P, N, D>::cplx() const + complex_psite<D, P>::cplx() const { return face_.cplx(); } @@ -223,19 +212,19 @@ | Comparisons. | `--------------*/ - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator==(const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs) + operator==(const complex_psite<D, P>& lhs, + const complex_psite<D, P>& rhs) { mln_precondition(&lhs.cplx() == &rhs.cplx()); return lhs.face() == rhs.face(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator< (const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs) + operator< (const complex_psite<D, P>& lhs, + const complex_psite<D, P>& rhs) { mln_precondition(&lhs.cplx() == &rhs.cplx()); return lhs.face() < rhs.face(); Index: mln/core/faces_psite.hh --- mln/core/faces_psite.hh (revision 2123) +++ mln/core/faces_psite.hh (working copy) @@ -25,11 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_COMPLEX_PSITE_HH -# define MLN_CORE_COMPLEX_PSITE_HH +#ifndef MLN_CORE_FACES_PSITE_HH +# define MLN_CORE_FACES_PSITE_HH -/// \file mln/core/complex_psite.hh -/// \brief Definition of a complex-based point site. +/// \file mln/core/faces_psite.hh +/// \brief Definition of a point site based on the n-faces of a +/// complex. # include <mln/core/concept/point_site.hh> @@ -38,21 +39,18 @@ namespace mln { - /* FIXME: Write also a complex_psite where N is dynamic, and can be - changed? */ - /* FIXME: Currently, P and N are free variables; we might want to relate them, e.g., have P::dim == N. Or even get rid of P. */ - /// \brief Point site associated to a mln::complex_image. + /// \brief Point site associated to a mln::p_faces. /// - /// \arg \p P The type of point associated to this psite. /// \arg \p N The dimension of the face associated to this psite. - /// \arg \p D The dimention of the complex this psite belongs to. - template <typename P, unsigned N, unsigned D> - class complex_psite : public Point_Site< complex_psite<P, N, D> > + /// \arg \p D The dimension of the complex this psite belongs to. + /// \arg \p P The type of point associated to this psite. + template <unsigned N, unsigned D, typename P> + class faces_psite : public Point_Site< faces_psite<N, D, P> > { - typedef complex_psite<P, N, D> self_; + typedef faces_psite<N, D, P> self_; typedef Point_Site<self_> super_; public: @@ -64,9 +62,9 @@ /// Construction and assignment. /// \{ - complex_psite(); - complex_psite(const face_handle<N, D>& face); - complex_psite(const self_& rhs); + faces_psite(); + faces_psite(const face_handle<N, D>& face); + faces_psite(const self_& rhs); self_& operator= (const self_& rhs); /// \} @@ -97,7 +95,7 @@ }; - /// Comparison of two instances of mln::complex_psite. + /// Comparison of two instances of mln::faces_psite. /// \{ /* FIXME: Shouldn't those comparisons be part of a much general mechanism? */ @@ -106,10 +104,10 @@ /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::complex. - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator==(const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs); + operator==(const faces_psite<N, D, P>& lhs, + const faces_psite<N, D, P>& rhs); /// \brief Is \a lhs ``less'' than \a rhs? /// @@ -117,19 +115,19 @@ /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::complex. - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator< (const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs); + operator< (const faces_psite<N, D, P>& lhs, + const faces_psite<N, D, P>& rhs); /// \} # ifndef MLN_INCLUDE_ONLY - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite() + faces_psite<N, D, P>::faces_psite() : super_(), // Dummy initializations. face_(), p_() @@ -138,9 +136,9 @@ metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite(const face_handle<N, D>& face) + faces_psite<N, D, P>::faces_psite(const face_handle<N, D>& face) : super_(), face_(face), p_() { @@ -148,9 +146,9 @@ metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - complex_psite<P, N, D>::complex_psite(const complex_psite<P, N, D>& rhs) + faces_psite<N, D, P>::faces_psite(const faces_psite<N, D, P>& rhs) : super_(rhs), face_(rhs.face_), p_() { @@ -158,10 +156,10 @@ metal::bool_< N <= D >::check(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - complex_psite<P, N, D>& - complex_psite<P, N, D>::operator= (const complex_psite<P, N, D>& rhs) + faces_psite<N, D, P>& + faces_psite<N, D, P>::operator= (const faces_psite<N, D, P>& rhs) { if (&rhs == this) return *this; @@ -169,52 +167,52 @@ return *this; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline bool - complex_psite<P, N, D>::is_valid() const + faces_psite<N, D, P>::is_valid() const { - return face.is_valid(); + return face_.is_valid(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - const complex_psite<P, N, D>& - complex_psite<P, N, D>::to_psite() const + const faces_psite<N, D, P>& + faces_psite<N, D, P>::to_psite() const { return *this; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline const P& - complex_psite<P, N, D>::to_point() const + faces_psite<N, D, P>::to_point() const { // FIXME: Dummy value. return p_; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline mln_coord(P) - complex_psite<P, N, D>::operator[](unsigned i) const + faces_psite<N, D, P>::operator[](unsigned i) const { mln_precondition(is_valid()); return to_point()[i]; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline face_handle<N, D> - complex_psite<P, N, D>::face() const + faces_psite<N, D, P>::face() const { return face_; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline const complex<D>& - complex_psite<P, N, D>::cplx() const + faces_psite<N, D, P>::cplx() const { return face_.cplx(); } @@ -223,19 +221,19 @@ | Comparisons. | `--------------*/ - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator==(const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs) + operator==(const faces_psite<N, D, P>& lhs, + const faces_psite<N, D, P>& rhs) { mln_precondition(&lhs.cplx() == &rhs.cplx()); return lhs.face() == rhs.face(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator< (const complex_psite<P, N, D>& lhs, - const complex_psite<P, N, D>& rhs) + operator< (const faces_psite<N, D, P>& lhs, + const faces_psite<N, D, P>& rhs) { mln_precondition(&lhs.cplx() == &rhs.cplx()); return lhs.face() < rhs.face(); @@ -246,4 +244,4 @@ } // end of mln -#endif // MLN_CORE_COMPLEX_PSITE_HH +#endif // MLN_CORE_FACES_PSITE_HH Property changes on: mln/core/faces_psite.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/core/p_complex.hh --- mln/core/p_complex.hh (revision 2127) +++ mln/core/p_complex.hh (working copy) @@ -43,12 +43,23 @@ namespace mln { - /// A complex psite set based on a complex of dimension \p D (a \p - /// D-complex). - template<typename P, unsigned N, unsigned D> + // FIXME: Rename as p_faces. + + /* FIXME: For compatibility reasons with mln::Point_Set, a point + type \P is attached to this complex-based pset (but it is not + used actually). We should either: + + - use it, and make it mandatory (good solution for the moment); + - use it, and make it optional (better solution, but implies + changes in mln::Point_Set; + - remove it (easy and bad solution). */ + + /// A complex psite set based on a the \N-faces of a complex of + /// dimension \p D (a \p D-complex). + template <unsigned D, typename P> struct p_complex - : public internal::point_set_base_< complex_psite<P, N, D>, - p_complex<P, N, D> > + : public internal::point_set_base_< complex_psite<D, P>, + p_complex<D, P> > { /// \brief Construct a complex psite set from a complex. /// @@ -59,7 +70,7 @@ p_complex (const complex<D>& cplx); /// Point_Site associated type. - typedef complex_psite<P, N, D> psite; + typedef complex_psite<D, P> psite; // FIXME: Fake. typedef void fwd_piter; @@ -94,9 +105,9 @@ /// /// Two mln::p_complex's are considered equal if they share the /// same complex. - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + operator==(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs); /// \brief Inclusion of a mln::p_complex in another one. /// @@ -106,23 +117,20 @@ /// /// \todo Refine this later, when we are able to express subcomplex /// relations. - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + operator<=(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs); # ifndef MLN_INCLUDE_ONLY - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline - p_complex<P, N, D>::p_complex(const complex<D>& cplx) + p_complex<D, P>::p_complex(const complex<D>& cplx) // Create a deep, managed copy of CPLX. : cplx_(new complex<D>(cplx)) { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); - // FIXME: Dummy initialization. accu::bbox<P> a; for (unsigned i = 0; i < npoints(); ++i) @@ -130,35 +138,35 @@ bb_ = a.to_result(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline std::size_t - p_complex<P, N, D>::npoints() const + p_complex<D, P>::npoints() const { return nfaces(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline std::size_t - p_complex<P, N, D>::nfaces() const + p_complex<D, P>::nfaces() const { - return this->cplx_->template nfaces<N>(); + return cplx_->nfaces(); } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline const box_<P>& - p_complex<P, N, D>::bbox() const + p_complex<D, P>::bbox() const { // FIXME: Dummy value. return bb_; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> inline bool - p_complex<P, N, D>::has(const psite& p) const + p_complex<D, P>::has(const psite& p) const { return // Check whether P's complex is compatible with this pset's complex. @@ -168,25 +176,25 @@ } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> const complex<D>& - p_complex<P, N, D>::cplx() const + p_complex<D, P>::cplx() const { mln_precondition(cplx_); return *cplx_.ptr_; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + operator==(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs) { return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; } - template <typename P, unsigned N, unsigned D> + template <unsigned D, typename P> bool - operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + operator<=(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs) { return lhs == rhs; } Index: mln/core/p_faces.hh --- mln/core/p_faces.hh (revision 2123) +++ mln/core/p_faces.hh (working copy) @@ -25,11 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_COMPLEX_HH -# define MLN_CORE_P_COMPLEX_HH +#ifndef MLN_CORE_P_FACES_HH +# define MLN_CORE_P_FACES_HH -/// \file mln/core/p_complex.hh -/// \brief Definition of a point set based on a complex. +/// \file mln/core/p_faces.hh +/// \brief Definition of a point set based on the set of n-faces of a +/// complex. # include <mln/core/internal/point_set_base.hh> @@ -37,18 +38,27 @@ # include <mln/util/tracked_ptr.hh> # include <mln/core/complex.hh> -# include <mln/core/complex_psite.hh> +# include <mln/core/faces_psite.hh> namespace mln { - /// A complex psite set based on a complex of dimension \p D (a \p - /// D-complex). - template<typename P, unsigned N, unsigned D> - struct p_complex - : public internal::point_set_base_< complex_psite<P, N, D>, - p_complex<P, N, D> > + /* FIXME: For compatibility reasons with mln::Point_Set, a point + type \P is attached to this complex-based pset (but it is not + used actually). We should either: + + - use it, and make it mandatory (good solution for the moment); + - use it, and make it optional (better solution, but implies + changes in mln::Point_Set; + - remove it (easy and bad solution). */ + + /// A complex psite set based on a the \N-faces of a complex of + /// dimension \p D (a \p D-complex). + template <unsigned N, unsigned D, typename P> + struct p_faces + : public internal::point_set_base_< faces_psite<N, D, P>, + p_faces<N, D, P> > { /// \brief Construct a complex psite set from a complex. /// @@ -56,10 +66,10 @@ /// /// \a gr is \em copied internally, so that the complex psite set is /// still valid after the initial complex has been removed. - p_complex (const complex<D>& cplx); + p_faces (const complex<D>& cplx); /// Point_Site associated type. - typedef complex_psite<P, N, D> psite; + typedef faces_psite<N, D, P> psite; // FIXME: Fake. typedef void fwd_piter; @@ -79,7 +89,7 @@ bool has(const psite& p) const; - /// Return the complex associated to the p_complex domain. + /// Return the complex associated to the p_faces domain. const complex<D>& cplx() const; private: @@ -90,33 +100,33 @@ }; - /// \brief Comparison between two mln::p_complex's. + /// \brief Comparison between two mln::p_faces's. /// - /// Two mln::p_complex's are considered equal if they share the + /// Two mln::p_faces's are considered equal if they share the /// same complex. - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + operator==(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs); - /// \brief Inclusion of a mln::p_complex in another one. + /// \brief Inclusion of a mln::p_faces in another one. /// /// This inclusion relation is very strict for the moment, since our - /// infrastrure for complexs is simple: a mln::p_complex is included + /// infrastrure for complexs is simple: a mln::p_faces is included /// in another one if their are equal. /// /// \todo Refine this later, when we are able to express subcomplex /// relations. - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + operator<=(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs); # ifndef MLN_INCLUDE_ONLY - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline - p_complex<P, N, D>::p_complex(const complex<D>& cplx) + p_faces<N, D, P>::p_faces(const complex<D>& cplx) // Create a deep, managed copy of CPLX. : cplx_(new complex<D>(cplx)) { @@ -130,35 +140,35 @@ bb_ = a.to_result(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline std::size_t - p_complex<P, N, D>::npoints() const + p_faces<N, D, P>::npoints() const { return nfaces(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline std::size_t - p_complex<P, N, D>::nfaces() const + p_faces<N, D, P>::nfaces() const { - return this->cplx_->template nfaces<N>(); + return cplx_->template nfaces<N>(); } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline const box_<P>& - p_complex<P, N, D>::bbox() const + p_faces<N, D, P>::bbox() const { // FIXME: Dummy value. return bb_; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> inline bool - p_complex<P, N, D>::has(const psite& p) const + p_faces<N, D, P>::has(const psite& p) const { return // Check whether P's complex is compatible with this pset's complex. @@ -168,25 +178,25 @@ } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> const complex<D>& - p_complex<P, N, D>::cplx() const + p_faces<N, D, P>::cplx() const { mln_precondition(cplx_); return *cplx_.ptr_; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + operator==(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; } - template <typename P, unsigned N, unsigned D> + template <unsigned N, unsigned D, typename P> bool - operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + operator<=(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { return lhs == rhs; } @@ -196,4 +206,4 @@ } // end of mln -#endif // MLN_CORE_P_COMPLEX_HH +#endif // MLN_CORE_P_FACES_HH

1 0

2126: Add a dimension-agnostic face handle.
by Roland Levillain 07 Aug '08

07 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a dimension-agnostic face handle. * mln/core/face.hh (mln::any_face_handle<D>): New class. (operator==(const any_face_handle<D>&, const any_face_handle<D>&)) (operator< (const any_face_handle<D>&, const any_face_handle<D>&)): New. (mln::face_handle<N, D>::face_handle): Use std::numeric_limits instead of UINT_MAX. face.hh | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 190 insertions(+), 4 deletions(-) Index: mln/core/face.hh --- mln/core/face.hh (revision 2126) +++ mln/core/face.hh (working copy) @@ -31,12 +31,24 @@ /// \file mln/core/face.hh /// \brief Face of a complex. -#include <climits> +#include <limits> #include <vector> #include <mln/core/contract.hh> +/* FIXME: Suggestions: + + - rename `face' as `face_data', and move it into complex.hh or its + own file; + - rename `face_handle' as `face', and move it to its own file; + - rename `any_face_handle' as `any_face', and move it to its own file. + + Anyway, whatever the decision, splitting `face', `face_handle' and + `any_face_handle' seems to be sound. + + (And what about `faces_set'? Should we move it to its own file as + well?) */ namespace mln { @@ -58,8 +70,6 @@ } - // FIXME: Rename `face' as `face_data' and `face_handle' as face. - /*-------. | Face. | `-------*/ @@ -234,6 +244,78 @@ /// \} + /*----------------------. + | ``Any-face'' handle. | + `----------------------*/ + + // Face handle in a complex, where the dimension is dynamic. + template <unsigned D> + struct any_face_handle + { + /// Build a non-initialized face handle. + any_face_handle(); + /// Build a face handle from \a complex and \a face_id. + any_face_handle(complex<D>& complex, unsigned n, unsigned face_id); + + /// Copy and assignment. + /// \{ + any_face_handle(const any_face_handle<D>& rhs); + any_face_handle<D>& operator=(const any_face_handle<D>& rhs); + /// \} + + /// Is this handle valid? + bool is_valid() const; + + /// Accessors. + /// \{ + /// Return the complex the face belongs to. + complex<D>& cplx() const; + /// Return the dimension of the face. + unsigned n() const; + /// Return the id of the face. + unsigned face_id() const; + + // FIXME: Implement. +// /// Return the mln::face pointed by this handle. +// template <unsigned N> +// face<N, D>& to_face() const; + /// \} + + private: + /// \brief The complex the face belongs to. + /// + /// A const any_face_handle can be used to modify a complex. + mutable complex<D>* cplx_; + /// The dimension of the face. + unsigned n_; + /// \brief The id of the face. + unsigned face_id_; + }; + + + /// Comparison of two instances of mln::any_face_handle. + /// \{ + /// \brief Is \a lhs equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + template <unsigned D> + bool + operator==(const any_face_handle<D>& lhs, const any_face_handle<D>& rhs); + + /// \brief Is \a lhs ``less'' than \a rhs? + /// + /// This comparison is required by algorithms sorting face handles. + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + /// \pre Arguments \a lhs and \a rhs must have the same dimension. + template <unsigned D> + bool + operator< (const any_face_handle<D>& lhs, const any_face_handle<D>& rhs); + /// \} + + # ifndef MLN_INCLUDE_ONLY @@ -266,7 +348,7 @@ template <unsigned N, unsigned D> face_handle<N, D>::face_handle() - : cplx_(0), face_id_(UINT_MAX) + : cplx_(0), face_id_(std::numeric_limits<unsigned>::max()) { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); @@ -342,6 +424,7 @@ bool operator==(const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) { + // Ensure LHS and RHS belong to the same complex. mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); return lhs.face().id() == rhs.face().id(); } @@ -350,6 +433,7 @@ bool operator< (const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) { + // Ensure LHS and RHS belong to the same complex. mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); return lhs.face().id() < rhs.face().id(); } @@ -396,6 +480,108 @@ return fs2; } + + /*----------------------. + | ``Any-face'' handle. | + `----------------------*/ + + template <unsigned D> + any_face_handle<D>::any_face_handle() + : cplx_(0), + n_(std::numeric_limits<unsigned>::max()), + face_id_(std::numeric_limits<unsigned>::max()) + { + } + + template <unsigned D> + any_face_handle<D>::any_face_handle(complex<D>& c, unsigned n, + unsigned face_id) + : cplx_(&c), n_(n), face_id_(face_id) + { + // Ensure N is compatible with D. + } + + template <unsigned D> + any_face_handle<D>::any_face_handle(const any_face_handle<D>& rhs) + : cplx_(rhs.cplx_), face_id_(rhs.face_id_) + { + } + + template <unsigned D> + any_face_handle<D>& + any_face_handle<D>::operator=(const any_face_handle<D>& rhs) + { + if (&rhs != this) + { + cplx_ = rhs.cplx_; + n_ = rhs.n_; + face_id_ = rhs.face_id_; + } + return *this; + } + + template <unsigned D> + bool + any_face_handle<D>::is_valid() const + { + return cplx_ != 0 && face_id_ < cplx_->nfaces(n_); + } + + template <unsigned D> + complex<D>& + any_face_handle<D>::cplx() const + { + mln_precondition(cplx_); + return *cplx_; + } + + template <unsigned D> + unsigned + any_face_handle<D>::n() const + { + return n_; + } + + template <unsigned D> + unsigned + any_face_handle<D>::face_id() const + { + return face_id_; + } + +// template <unsigned D> +// template <unsigned n> +// face<N, D>& +// any_face_handle<D>::to_face() const +// { +// // FIXME: Adjust. +// // mln_precondition(is_valid()); +// // return cplx_->template face_<N>(face_id_); +// } + + + template <unsigned D> + bool + operator==(const any_face_handle<D>& lhs, const any_face_handle<D>& rhs) + { + // Ensure LHS and RHS belong to the same complex. + mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); + return + lhs.face().n() == rhs.face().n() && + lhs.face().id() == rhs.face().id(); + } + + template <unsigned D> + bool + operator< (const any_face_handle<D>& lhs, const any_face_handle<D>& rhs) + { + // Ensure LHS and RHS belong to the same complex. + mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); + // Ensure LHS and RHS have the same dimension. + mln_precondition(lhs.face().n() == rhs.face().n()); + return lhs.face().id() < rhs.face().id(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

1 0