Olena-patches September 2006

olena-patches@lrde.epita.fr

3 participants
92 discussions

568: Have all classes of oln::automatic inherit from stc::any__simple.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Have all classes of oln::automatic inherit from stc::any__simple. * oln/automatic/image_having_neighborhood.hh (impl<abstract::image_having_neighborhood, morpher::tag::identity, E>): Inherit from stc::any__simple<E> instead of abstract::image<E>. image_having_neighborhood.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: oln/automatic/image_having_neighborhood.hh --- oln/automatic/image_having_neighborhood.hh (revision 567) +++ oln/automatic/image_having_neighborhood.hh (working copy) @@ -50,7 +50,7 @@ class impl< abstract::image_having_neighborhood, morpher::tag::identity, E> : - public virtual abstract::image<E> + public virtual stc::any__simple<E> { private: typedef oln_type_of(E, neighborhood) neighborhood_t;

17 years, 7 months

567: Fix the distribution.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * olena/oln/Makefile.am (nobase_oln_HEADERS): Add automatic/image.hh, automatic/topology_being_random_accessible.hh, automatic/topology_having_bbox.hh, automatic/topology_having_neighborhood.hh, core/abstract/topology_having_neighborhood.hh, core/gen/topo_add_nbh.hh and core/internal/topology_morpher.hh. Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) Index: olena/oln/Makefile.am --- olena/oln/Makefile.am (revision 566) +++ olena/oln/Makefile.am (working copy) @@ -3,7 +3,12 @@ olndir = $(includedir)/oln nobase_oln_HEADERS = \ + \ + automatic/image.hh \ automatic/image_having_neighborhood.hh \ + automatic/topology_being_random_accessible.hh \ + automatic/topology_having_bbox.hh \ + automatic/topology_having_neighborhood.hh \ \ core/1d/grid1d.hh \ \ @@ -43,18 +48,21 @@ core/abstract/topology.hh \ core/abstract/topology_being_random_accessible.hh \ core/abstract/topology_having_bbox.hh \ + core/abstract/topology_having_neighborhood.hh \ core/abstract/topology_hierarchies.hh \ \ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \ core/gen/neighb.hh \ + core/gen/topo_add_nbh.hh \ core/gen/topo_bbox.hh \ \ core/internal/bbox_bkd_piter.hh \ core/internal/bbox_fwd_piter.hh \ core/internal/dpoint_nd.hh \ core/internal/point_nd.hh \ + core/internal/topology_morpher.hh \ \ core/case.hh \ core/image_entry.hh \

17 years, 7 months

566: Properly define fwd_piter_type and bkd_piter_type for the add_neighborhood image morpher.

by Thierry GERAUD

2006-09-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Properly define fwd_piter_type and bkd_piter_type for the add_neighborhood image morpher. * oln/core/abstract/image_hierarchies.hh: Remove end blank line. * oln/core/gen/fwd_piter_bbox.hh (change_topology_): New. * oln/core/gen/bkd_piter_bbox.hh (change_topology_): New. * oln/morpher/add_neighborhood.hh (morpher_type): Remove; obsolete cause defined in super class. (fwd_piter_type, bkd_piter_type): New definitions. Index: oln/core/abstract/image_hierarchies.hh =================================================================== --- oln/core/abstract/image_hierarchies.hh (revision 565) +++ oln/core/abstract/image_hierarchies.hh (working copy) @@ -59,4 +59,3 @@ #endif // ! OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH - Index: oln/core/gen/fwd_piter_bbox.hh =================================================================== --- oln/core/gen/fwd_piter_bbox.hh (revision 565) +++ oln/core/gen/fwd_piter_bbox.hh (working copy) @@ -95,6 +95,12 @@ return ostr; } + template <typename new_topo_t> + struct change_topology_ + { + typedef fwd_piter_bbox_<new_topo_t> ret; + }; + protected: const topo_t& topo_; Index: oln/core/gen/bkd_piter_bbox.hh =================================================================== --- oln/core/gen/bkd_piter_bbox.hh (revision 565) +++ oln/core/gen/bkd_piter_bbox.hh (working copy) @@ -95,6 +95,12 @@ return ostr; } + template <typename new_topo_t> + struct change_topology_ + { + typedef bkd_piter_bbox_<new_topo_t> ret; + }; + protected: const topo_t& topo_; Index: oln/morpher/add_neighborhood.hh =================================================================== --- oln/morpher/add_neighborhood.hh (revision 565) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -55,11 +55,17 @@ template <typename Image, typename Neighb> struct vtypes< morpher::add_neighborhood<Image, Neighb> > { + private: + + typedef oln_type_of(Image, fwd_piter) basic_fwd_piter_type; + typedef oln_type_of(Image, bkd_piter) basic_bkd_piter_type; + + public: // Topology type. typedef topo_add_nbh< oln_type_of(Image, topo), Neighb > topo_type; - // Morpher type. - typedef oln::morpher::tag::identity morpher_type; + typedef typename basic_fwd_piter_type::template change_topology_<topo_type>::ret fwd_piter_type; + typedef typename basic_bkd_piter_type::template change_topology_<topo_type>::ret bkd_piter_type; // Neighborhood type. typedef Neighb neighborhood_type;

17 years, 7 months

565: Update image_extension, add_neighborhood, and some related classes.

by Thierry GERAUD

2006-09-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Update image_extension, add_neighborhood, and some related classes. * oln/automatic/image.hh: New. * oln/core/abstract/image.hh: Include oln/automatic/image.hh. Inherit from automatic::impl. (has): Add FIXME. * oln/core/abstract/image_having_neighborhood.hh (neighborhood): Change so that it relies on topo(). impl_neighborhood() is now obsolete in image classes. * oln/core/2d/aliases.hh (topo2d, fwd_piter2d, bkd_piter2d): Update aliases. * oln/basics2d.hh: Update. * oln/core/2d/image2d.hh (topo2d, fwd_piter2d, bkd_piter2d): Update and make them explicit. (ctor): Add border argument with default. (impl_op_read): Change fake code. * oln/core/2d/neighb2d.hh: Cosmetics. * oln/core/gen/bbox.hh: Include files for piter types. * oln/morpher/internal/image_extension.hh (morpher_type): New. This class thus factors this definition. (impl_topo, impl_op_read, impl_has): Remove. These methods are expected to be automatically fetch from top implementation classes. (self_t, image_t, topo_t, value_t, point_t): Remove cause obsolete. * oln/morpher/add_neighborhood.hh (add_neighborhood): Add second parameter Neighb. (include, set_super_type): Update. (neighborhood_type): Change. (ctor): Update. (impl_neighborhood): Remove. (impl_topo): New. (nbh_): Remove. (topo_): New. * tests/add_neighborhood_morpher.cc: Update. * tests/morphers.cc: Update. Index: tests/add_neighborhood_morpher.cc =================================================================== --- tests/add_neighborhood_morpher.cc (revision 564) +++ tests/add_neighborhood_morpher.cc (working copy) @@ -58,7 +58,7 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ - typedef oln::morpher::add_neighborhood<image_t> image_with_nbh_t; + typedef oln::morpher::add_neighborhood<image_t, oln::neighb2d> image_with_nbh_t; // Check that the instantiated add_neighborhood morpher realizes the // same interfaces as the underlying morphed image. Index: tests/morphers.cc =================================================================== --- tests/morphers.cc (revision 564) +++ tests/morphers.cc (working copy) @@ -40,6 +40,8 @@ int main() { + typedef oln::neighb2d neighb_t; + /*----------------. | image2d<char>. | `----------------*/ @@ -60,7 +62,7 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ - typedef oln::morpher::add_neighborhood<image_t> image_with_nbh_t; + typedef oln::morpher::add_neighborhood<image_t, neighb_t> image_with_nbh_t; // Check that the instantiated neighborhood addition morpher // realizes the same abstraction as the underlying morphed image. @@ -80,9 +82,9 @@ oln::neighb2d nbh2 = ima_with_nbh.neighborhood(); - /*------------------------------------------------. - | identity< add_neighborhood< image2d<char> > >. | - `------------------------------------------------*/ + /*----------------------------------------------------------. + | identity< add_neighborhood< image2d<char>, neighb_t > >. | + `----------------------------------------------------------*/ typedef oln::morpher::identity<image_with_nbh_t> image_with_nbh_id_t; Index: oln/automatic/image.hh =================================================================== --- oln/automatic/image.hh (revision 0) +++ oln/automatic/image.hh (revision 0) @@ -0,0 +1,82 @@ +// 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 OLENA_AUTOMATIC_IMAGE_HH +# define OLENA_AUTOMATIC_IMAGE_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + // Forward declaration. + namespace abstract + { + template <typename E> class image; + + } // end of namespace oln::abstract + + + namespace automatic + { + + /// Implementation corresponding to the interface + /// oln::abstract::image for an identity morpher. + template <typename E> + class impl< abstract::image, + morpher::tag::identity, + E> : + public virtual stc::any__simple<E> + { + private: + + typedef oln_type_of(E, topo) topo_t; + typedef oln_type_of(E, rvalue) rvalue_t; + typedef oln_type_of(E, psite) psite_t; + + public: + + /// Delegation. + + const topo_t& impl_topo() const + { + return this->exact().delegate().topo(); + } + + rvalue_t impl_op_read(const psite_t& p) const + { + return this->exact().delegate().operator()(p); + } + + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLENA_AUTOMATIC_IMAGE_HH Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 564) +++ oln/core/abstract/image.hh (working copy) @@ -30,7 +30,7 @@ # define OLENA_CORE_ABSTRACT_IMAGE_HH # include <oln/core/typedefs.hh> -// # include <oln/core/abstract/internal/image_impl.hh> +# include <oln/automatic/image.hh> namespace oln @@ -54,8 +54,10 @@ template <typename E> struct image : public virtual stc::any__simple<E>, - public virtual oln::type - // , public internal::get_image_impl < image<E>, E > + public virtual oln::type, + public automatic::impl< image, + oln_type_of(E, morpher), + E > { public: @@ -138,6 +140,8 @@ return this->exact().impl_has(p); } + // FIXME: has should *not* be defined for all image classes. + protected: /*! \brief Constructor (protected, empty). Index: oln/core/abstract/image_having_neighborhood.hh =================================================================== --- oln/core/abstract/image_having_neighborhood.hh (revision 564) +++ oln/core/abstract/image_having_neighborhood.hh (working copy) @@ -69,7 +69,7 @@ public: neighborhood_t neighborhood() const { - return this->exact().impl_neighborhood(); + return this->topo().neighborhood(); } protected: Index: oln/core/2d/aliases.hh =================================================================== --- oln/core/2d/aliases.hh (revision 564) +++ oln/core/2d/aliases.hh (working copy) @@ -39,9 +39,9 @@ template <typename C> class dpoint2d_; template <typename D> class neighb_; template <typename P> class bbox_; - template <typename P> class topo_bbox_; - template <typename P> class bbox_fwd_piter_; - template <typename P> class bbox_bkd_piter_; + template <typename P> class topo_lbbox_; + template <typename T> class fwd_piter_bbox_; + template <typename T> class bkd_piter_bbox_; class grid2d; /// \} @@ -54,9 +54,9 @@ typedef neighb_<dpoint2d> neighb2d; typedef bbox_<point2d> bbox2d; - typedef bbox_fwd_piter_<point2d> fwd_piter2d; - typedef bbox_bkd_piter_<point2d> bkd_piter2d; - typedef topo_bbox_<point2d> topo2d; + typedef topo_lbbox_<point2d> topo2d; + typedef fwd_piter_bbox_<topo2d> fwd_piter2d; + typedef bkd_piter_bbox_<topo2d> bkd_piter2d; typedef point2d_<float> point2df; typedef dpoint2d_<float> dpoint2df; Index: oln/core/2d/neighb2d.hh =================================================================== --- oln/core/2d/neighb2d.hh (revision 564) +++ oln/core/2d/neighb2d.hh (working copy) @@ -101,4 +101,3 @@ #endif // ! OLENA_CORE_2D_NEIGHB2D_HH - Index: oln/core/2d/image2d.hh =================================================================== --- oln/core/2d/image2d.hh (revision 564) +++ oln/core/2d/image2d.hh (working copy) @@ -43,13 +43,13 @@ template <typename T> struct vtypes< image2d<T> > { - typedef topo2d topo_type; + typedef topo_lbbox_<point2d> topo_type; typedef grid2d grid_type; typedef point2d point_type; - typedef fwd_piter2d fwd_piter_type; - typedef bkd_piter2d bkd_piter_type; + typedef fwd_piter_bbox_<topo_type> fwd_piter_type; + typedef bkd_piter_bbox_<topo_type> bkd_piter_type; typedef T value_type; @@ -75,8 +75,8 @@ public: /// Ctor. - image2d(unsigned nrows, unsigned ncols) - : topo_( bbox2d( point2d(0,0), point2d(nrows-1, ncols-1) ) ) + image2d(unsigned nrows, unsigned ncols, unsigned border = 2) + : topo_( bbox2d( point2d(0,0), point2d(nrows-1, ncols-1)), border ) { } @@ -87,8 +87,9 @@ T impl_op_read(const point2d& p) const { - static T val_; - return ++val_; + return (T)(void*)this; +// static T val_; +// return ++val_; } bool impl_has(const point2d& p) const Index: oln/core/gen/bbox.hh =================================================================== --- oln/core/gen/bbox.hh (revision 564) +++ oln/core/gen/bbox.hh (working copy) @@ -218,4 +218,8 @@ } // end of namespace oln +# include <oln/core/gen/bbox_fwd_piter.hh> +# include <oln/core/gen/bbox_bkd_piter.hh> + + #endif // ! OLENA_CORE_GEN_BBOX_HH Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 564) +++ oln/basics2d.hh (working copy) @@ -41,14 +41,14 @@ # include <oln/core/gen/bbox.hh> namespace oln { template class bbox_<point2d>; } -# include <oln/core/gen/bbox_fwd_piter.hh> -namespace oln { template class bbox_fwd_piter_<point2d>; } +# include <oln/core/gen/topo_lbbox.hh> +namespace oln { template class topo_lbbox_<point2d>; } -# include <oln/core/gen/bbox_bkd_piter.hh> -namespace oln { template class bbox_bkd_piter_<point2d>; } +# include <oln/core/gen/fwd_piter_bbox.hh> +namespace oln { template class fwd_piter_bbox_<topo2d>; } -# include <oln/core/gen/topo_bbox.hh> -namespace oln { template class topo_bbox_<point2d>; } +# include <oln/core/gen/bkd_piter_bbox.hh> +namespace oln { template class bkd_piter_bbox_<topo2d>; } # include <oln/core/gen/neighb.hh> namespace oln { template class neighb_<dpoint2d>; } Index: oln/morpher/internal/image_extension.hh =================================================================== --- oln/morpher/internal/image_extension.hh (revision 564) +++ oln/morpher/internal/image_extension.hh (working copy) @@ -57,6 +57,15 @@ typedef Image ret; }; + + template <typename Image, typename Exact> + struct vtypes< morpher::internal::image_extension<Image, Exact> > + { + // Morpher type. + typedef oln::morpher::tag::identity morpher_type; + }; + + namespace morpher { namespace internal @@ -66,46 +75,19 @@ template <typename Image, typename Exact> class image_extension : public oln::image_entry<Exact> { - private: - typedef image_extension<Image, Exact> self_t; - - /// Type of morphed image. - typedef Image image_t; - - typedef oln_direct_type_of(Exact, topo) topo_t; - typedef oln_direct_type_of(Exact, value) value_t; - typedef oln_direct_type_of(Exact, point) point_t; - public: + // FIXME: Handle the constness. image_extension(const Image& image) : image_(image) - { - } + { + } const Image& delegate() const { return image_; } - /// Delegations. - /// \{ - const topo_t& impl_topo() const - { - return delegate()->impl_topo(); - } - - value_t impl_op_read(const point_t& p) const - { - return delegate()->impl_op_read(p); - } - - bool impl_has(const point_t& p) const - { - return delegate()->impl_has(p); - } - /// \} - protected: const Image& image_; }; Index: oln/morpher/add_neighborhood.hh =================================================================== --- oln/morpher/add_neighborhood.hh (revision 564) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/morpher/internal/image_extension.hh> # include <oln/morpher/tags.hh> -# include <oln/core/2d/aliases.hh> +# include <oln/core/gen/topo_add_nbh.hh> namespace oln @@ -39,61 +39,81 @@ namespace morpher { // Forward declaration. - template <typename Image> struct add_neighborhood; + template <typename Image, typename Neighb> struct add_neighborhood; } // end of namespace oln::morpher /// Super type. - template <typename Image> - struct set_super_type< morpher::add_neighborhood<Image> > + template <typename Image, typename Neighb> + struct set_super_type< morpher::add_neighborhood<Image, Neighb> > { - typedef morpher::add_neighborhood<Image> self_t; + typedef morpher::add_neighborhood<Image, Neighb> self_t; typedef morpher::internal::image_extension<Image, self_t> ret; }; - template <typename Image> - struct vtypes< morpher::add_neighborhood<Image> > + template <typename Image, typename Neighb> + struct vtypes< morpher::add_neighborhood<Image, Neighb> > { + // Topology type. + typedef topo_add_nbh< oln_type_of(Image, topo), Neighb > topo_type; + // Morpher type. - typedef oln::morpher::tag::add_neighborhood morpher_type; + typedef oln::morpher::tag::identity morpher_type; // Neighborhood type. - typedef - mlc_if( mlc_is_a_(Image, abstract::image2d), neighb2d, mlc::none ) - neighborhood_type; + typedef Neighb neighborhood_type; }; namespace morpher { /// Neighborhood addition morpher. - template <typename Image> - class add_neighborhood : public stc_get_supers(add_neighborhood<Image>) + template <typename Image, typename Neighb> + class add_neighborhood : public stc_get_supers(mlc_comma_1(add_neighborhood<Image, Neighb>)) { private: - typedef add_neighborhood<Image> self_t; + + typedef add_neighborhood<Image, Neighb> self_t; typedef stc_get_nth_super(self_t, 1) super_t; - typedef oln_check_type_of(self_t, neighborhood) neighborhood_t; + typedef oln_type_of(self_t, topo) topo_t; public: + // FIXME: Handle the constness. - add_neighborhood(const Image& image, const neighborhood_t& nbh) : - super_t(image), nbh_(nbh) + + add_neighborhood(const Image& image, const Neighb& nbh) : + super_t(image), + topo_(image.topo(), nbh) { + mlc::assert_equal_<oln_type_of(Image, grid), oln_type_of(Neighb, grid)>::check(); + // FIXME: check that Image is without a nbh } - neighborhood_t impl_neighborhood() const + const topo_t& impl_topo() const { - return nbh_; + return topo_; } protected: - neighborhood_t nbh_; + topo_t topo_; }; } // end of namespace oln::morpher + + template <typename I, typename N> + morpher::add_neighborhood<I, N> + operator + (const abstract::image<I>& image, + const abstract::neighborhood<N>& nbh) + { + mlc::assert_equal_<oln_type_of(I, grid), oln_type_of(N, grid)>::check(); + // FIXME: check that Image is without a nbh + morpher::add_neighborhood<I, N> tmp(image.exact(), nbh.exact()); + return tmp; + } + + } // end of namespace oln

17 years, 7 months

564: Add morpher capabilities to topology classes.

by Thierry GERAUD

2006-09-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add morpher capabilities to topology classes. * oln/automatic/topology_having_bbox.hh: New. * oln/automatic/topology_being_random_accessible.hh: New. * oln/automatic/topology_having_neighborhood.hh: New. * oln/core/abstract/topology_having_neighborhood.hh: New. * oln/core/gen/topo_add_nbh.hh: New. * oln/core/internal/topology_morpher.hh: New. * oln/automatic/image_having_neighborhood.hh: Fix typo in guards. Fix comment. Fix delegation code. * oln/core/topology_entry.hh (neighborhood_type, morpher_type): New. * oln/core/abstract/topology_hierarchies.hh (topology_hierarchy_wrt_neighborhood): New. Update include. * oln/core/abstract/topology_having_bbox.hh: Inherit from automatic::impl. * oln/core/abstract/topology_being_random_accessible.hh: Likewise. * oln/core/abstract/topology.hh (neighborhood): New vtype. Index: oln/automatic/topology_having_bbox.hh =================================================================== --- oln/automatic/topology_having_bbox.hh (revision 0) +++ oln/automatic/topology_having_bbox.hh (revision 0) @@ -0,0 +1,74 @@ +// 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 OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +# define OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + + // Forward declaration. + namespace abstract + { + template <typename E> class topology_having_bbox; + + } // end of namespace oln::abstract + + + namespace automatic + { + + /// Implementation corresponding to the interface + /// oln::abstract::topology_having_bbox for an identity morpher. + + template <typename E> + class impl< abstract::topology_having_bbox, + morpher::tag::identity, + E> : + public virtual stc::any__simple<E> + { + private: + typedef oln_type_of(E, bbox) bbox_t; + + public: + + const bbox_t& impl_bbox() const + { + return this->exact().delegate().bbox(); + } + + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLENA_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH Index: oln/automatic/image_having_neighborhood.hh =================================================================== --- oln/automatic/image_having_neighborhood.hh (revision 563) +++ oln/automatic/image_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORDHOOD_HH -# define OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORDHOOD_HH +#ifndef OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +# define OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH # include <oln/core/typedefs.hh> # include <oln/morpher/tags.hh> @@ -45,7 +45,7 @@ namespace automatic { /// Implementation corresponding to the interface - /// oln::abstract::image1d for an identity morpher. + /// oln::abstract::image_having_neighborhood for an identity morpher. template <typename E> class impl< abstract::image_having_neighborhood, morpher::tag::identity, @@ -59,7 +59,7 @@ /// Accessor delegation. neighborhood_t impl_neighborhood() const { - return this->exact().delegate().impl_neighborhood(); + return this->exact().delegate().neighborhood(); } }; @@ -67,4 +67,4 @@ } // end of namespace oln -#endif // ! OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORDHOOD_HH +#endif // ! OLENA_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH Index: oln/automatic/topology_being_random_accessible.hh =================================================================== --- oln/automatic/topology_being_random_accessible.hh (revision 0) +++ oln/automatic/topology_being_random_accessible.hh (revision 0) @@ -0,0 +1,79 @@ +// 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 OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + + // Forward declaration. + namespace abstract + { + template <typename E> class topology_being_random_accessible; + + } // end of namespace oln::abstract + + + namespace automatic + { + + /// Implementation corresponding to the interface + /// oln::abstract::topology_being_random_accessible for an identity morpher. + + template <typename E> + class impl< abstract::topology_being_random_accessible, + morpher::tag::identity, + E> : + public virtual stc::any__simple<E> + { + private: + typedef oln_type_of(E, point) point_t; + + public: + + bool impl_has(const point_t& p) const + { + return this->exact().delegate().has(p); + } + + bool impl_has_large(const point_t& p) const + { + return this->exact().delegate().has_large(p); + } + + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLENA_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/automatic/topology_having_neighborhood.hh =================================================================== --- oln/automatic/topology_having_neighborhood.hh (revision 0) +++ oln/automatic/topology_having_neighborhood.hh (revision 0) @@ -0,0 +1,74 @@ +// 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 OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + + // Forward declaration. + namespace abstract + { + template <typename E> class topology_having_neighborhood; + + } // end of namespace oln::abstract + + + namespace automatic + { + + /// Implementation corresponding to the interface + /// oln::abstract::topology_having_neighborhood for an identity morpher. + + template <typename E> + class impl< abstract::topology_having_neighborhood, + morpher::tag::identity, + E> : + public virtual stc::any__simple<E> + { + private: + typedef oln_type_of(E, neighborhood) neighborhood_t; + + public: + + const neighborhood_t& impl_neighborhood() const + { + return this->exact().delegate().neighborhood(); + } + + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLENA_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/topology_entry.hh =================================================================== --- oln/core/topology_entry.hh (revision 563) +++ oln/core/topology_entry.hh (working copy) @@ -55,11 +55,17 @@ { typedef mlc::undefined point_type; typedef mlc::undefined bbox_type; - + typedef mlc::none neighborhood_type; typedef mlc::undefined is_random_accessible_type; }; + template <typename E> + struct single_vtype< topology_entry<E>, typedef_::morpher_type > + { + typedef mlc::none ret; + }; + } // end of namespace oln Index: oln/core/abstract/topology_hierarchies.hh =================================================================== --- oln/core/abstract/topology_hierarchies.hh (revision 563) +++ oln/core/abstract/topology_hierarchies.hh (working copy) @@ -36,6 +36,7 @@ typedef hierarchy< abstract::topology, 1 > topology_hierarchy_wrt_accessibility; typedef hierarchy< abstract::topology, 2 > topology_hierarchy_wrt_bbox; + typedef hierarchy< abstract::topology, 3 > topology_hierarchy_wrt_neighborhood; } // end of namespace oln @@ -43,10 +44,13 @@ // Hierarchy 1: topology w.r.t. accessibility. # include <oln/core/abstract/topology_being_random_accessible.hh> -// Hierarchy 2: topology w.r.t. bbox. +// Hierarchy 2: topology w.r.t. bounding box. # include <oln/core/abstract/topology_having_bbox.hh> +// Hierarchy 2: topology w.r.t. neighborhood. +# include <oln/core/abstract/topology_having_neighborhood.hh> + #endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH Index: oln/core/abstract/topology_having_bbox.hh =================================================================== --- oln/core/abstract/topology_having_bbox.hh (revision 563) +++ oln/core/abstract/topology_having_bbox.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/abstract/topology.hh> +# include <oln/automatic/topology_having_bbox.hh> namespace oln @@ -39,7 +40,11 @@ template <typename E> - class topology_having_bbox : public virtual topology<E> + class topology_having_bbox + : public virtual topology<E>, + public automatic::impl< topology_having_bbox, + oln_type_of(E, morpher), + E > { typedef oln_type_of(E, bbox) bbox_t; Index: oln/core/abstract/topology_being_random_accessible.hh =================================================================== --- oln/core/abstract/topology_being_random_accessible.hh (revision 563) +++ oln/core/abstract/topology_being_random_accessible.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/topology.hh> +# include <oln/automatic/topology_being_random_accessible.hh> @@ -40,7 +41,11 @@ template <typename E> - class topology_being_random_accessible : public virtual topology<E> + class topology_being_random_accessible + : public virtual topology<E>, + public automatic::impl< topology_being_random_accessible, + oln_type_of(E, morpher), + E > { typedef oln_type_of(E, point) point_t; @@ -51,6 +56,11 @@ return this->exact().impl_has(p); } + bool has_large(const point_t& p) const + { + return this->exact().impl_has_large(p); + } + protected: topology_being_random_accessible() Index: oln/core/abstract/topology_having_neighborhood.hh =================================================================== --- oln/core/abstract/topology_having_neighborhood.hh (revision 0) +++ oln/core/abstract/topology_having_neighborhood.hh (revision 0) @@ -0,0 +1,86 @@ +// 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 OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH + +# include <oln/core/abstract/topology.hh> +# include <oln/automatic/topology_having_neighborhood.hh> + + +namespace oln +{ + + namespace abstract + { + + + template <typename E> + class topology_having_neighborhood + : public virtual topology<E>, + public automatic::impl< topology_having_neighborhood, + oln_type_of(E, morpher), + E > + { + typedef oln_type_of(E, neighborhood) neighborhood_t; + + public: + + // abstract + const neighborhood_t& neighborhood() const + { + return this->exact().impl_neighborhood(); + } + + // concrete + operator neighborhood_t() const + { + return this->neighborhood(); + } + + protected: + + topology_having_neighborhood() + {} + }; + + + } // end of namespace oln::abstract + + + template <typename E> + struct case_ < topology_hierarchy_wrt_neighborhood, E, 1 > + : where_< mlc::neq_< oln_type_of(E, neighborhood), mlc::none > > + { + typedef abstract::topology_having_neighborhood<E> ret; + }; + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/abstract/topology.hh =================================================================== --- oln/core/abstract/topology.hh (revision 563) +++ oln/core/abstract/topology.hh (working copy) @@ -55,7 +55,10 @@ // provides .has(p) and .has_large(p) stc_virtual_typedef(point); + stc_virtual_typedef(neighborhood); + stc_virtual_typedef(morpher); + decl() { // constraint: // mlc::assert_< mlc::implies_< mlc::neq_< bbox, mlc::none >, Index: oln/core/gen/topo_add_nbh.hh =================================================================== --- oln/core/gen/topo_add_nbh.hh (revision 0) +++ oln/core/gen/topo_add_nbh.hh (revision 0) @@ -0,0 +1,102 @@ +// 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 OLENA_CORE_GEN_TOPO_ADD_NBH_HH +# define OLENA_CORE_GEN_TOPO_ADD_NBH_HH + +# include <oln/core/internal/topology_morpher.hh> + + + +namespace oln +{ + + + // Forward declarations. + template <typename topo, typename nbh> class topo_add_nbh; + + + // Super type declaration. + template <typename topo, typename nbh> + struct set_super_type< topo_add_nbh<topo, nbh> > + { + typedef topo_add_nbh<topo, nbh> self_t; + typedef internal::topology_morpher<topo, self_t> ret; + }; + + + /// Virtual types associated to oln::bbox_<point>. + template <typename topo, typename nbh> + struct vtypes< topo_add_nbh<topo, nbh> > + { + typedef nbh neighborhood_type; + }; + + template <typename topo, typename nbh> + struct single_vtype< topo_add_nbh<topo, nbh>, typedef_::delegated_type > + { + typedef topo ret; + }; + + + /// Bounding box topology based on a point class. + template <typename topo_t, typename nbh_t> + class topo_add_nbh : public internal::topology_morpher<topo_t, topo_add_nbh<topo_t, nbh_t> > + { + public: + + topo_add_nbh() + { + } + + topo_add_nbh(const topo_t& topo, const nbh_t& nbh) + : topo_(topo), + nbh_(nbh) + { + } + + const nbh_t& impl_neighborhood() const + { + return nbh_; + } + + const topo_t& delegate() const + { + return topo_; + } + + protected: + + topo_t topo_; + nbh_t nbh_; + }; + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_GEN_TOPO_ADD_NBH_HH Index: oln/core/internal/topology_morpher.hh =================================================================== --- oln/core/internal/topology_morpher.hh (revision 0) +++ oln/core/internal/topology_morpher.hh (revision 0) @@ -0,0 +1,77 @@ +// 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 OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH +# define OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH + +# include <oln/core/topology_entry.hh> + + + +namespace oln +{ + + namespace internal + { + template <typename Topo, typename E> + struct topology_morpher; + + } // end of namespace oln::internal + + template <typename Topo, typename E> + struct set_pseudosuper_type< internal::topology_morpher<Topo, E> > + { + typedef Topo ret; + }; + + template <typename Topo, typename E> + struct single_vtype< internal::topology_morpher<Topo, E>, typedef_::morpher_type > + { + typedef morpher::tag::identity ret; + }; + + + namespace internal + { + + /// Base internal class for morphers on topology. + + template <typename Topo, typename E> + struct topology_morpher : public topology_entry<E> + { + protected: + topology_morpher() {} + }; + + } // end of namespace oln::internal + + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_INTERNAL_TOPOLOGY_MORPHER_HH

17 years, 7 months

563: Fix the distribution (again).

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 (again). * oln/Makefile.am (nobase_oln_HEADERS): Add core/internal/bbox_bkd_piter.hh and core/internal/bbox_fwd_piter.hh. Makefile.am | 2 ++ 1 file changed, 2 insertions(+) Index: oln/Makefile.am --- oln/Makefile.am (revision 562) +++ oln/Makefile.am (working copy) @@ -51,6 +51,8 @@ core/gen/neighb.hh \ core/gen/topo_bbox.hh \ \ + core/internal/bbox_bkd_piter.hh \ + core/internal/bbox_fwd_piter.hh \ core/internal/dpoint_nd.hh \ core/internal/point_nd.hh \ \

17 years, 7 months

562: Add convenience shortcuts for stc_{direct_, }check_type_of{_, }.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add convenience shortcuts for stc_{direct_,}check_type_of{_,}. * oln/core/macros.hh (oln_check_type_of, oln_check_type_of_) (oln_check_direct_type_of, oln_check_direct_type_of_): New macros. * oln/morpher/internal/image_extension.hh, oln/morpher/identity.hh * oln/morpher/add_neighborhood.hh: Remove FIXMEs. core/macros.hh | 54 ++++++++++++++++++++++++++++++++++++ morpher/add_neighborhood.hh | 5 --- morpher/identity.hh | 1 morpher/internal/image_extension.hh | 1 4 files changed, 55 insertions(+), 6 deletions(-) Index: oln/core/macros.hh --- oln/core/macros.hh (revision 561) +++ oln/core/macros.hh (working copy) @@ -28,6 +28,10 @@ #ifndef OLENA_CORE_MACROS_HH # define OLENA_CORE_MACROS_HH +// --------------------- // +// Virtual type access. // +// --------------------- // + /// \def oln_type_of(OlnType, Alias) /// /// Macro to retrieve an associated type \a Alias from the exact type of @@ -62,4 +66,54 @@ stc_direct_type_of_(oln, void, OlnType, Alias) +// ------------------------------- // +// Virtual type check and access. // +// ------------------------------- // + +/* These macros are the same as the previous ones, but they use + stc_check_type_of{_,} (resp. stc_check_direct_type_of{_,}) instead of + stc_type_of{_,} (resp. stc_direct_type_of{_,}). */ + +/// \def oln_check_type_of(OlnType, Alias) +/// +/// Macro to retrieve an associated type \a Alias from the exact type of +/// an oln type \a OlnType whose category is not specified (version to be +/// used inside a template). +/// +/// If the virtual type is not found, raise a static error. +# define oln_check_type_of(OlnType, Alias) \ + stc_check_type_of(oln, void, OlnType, Alias) + +/// \def oln_check_type_of(OlnType, Alias) +/// +/// Macro to retrieve an associated type \a Alias from the exact type of +/// an oln type \a OlnType whose category is not specified (version to be +/// used outside a template). +/// +/// If the virtual type is not found, raise a static error. +# define oln_check_type_of_(OlnType, Alias) \ + stc_check_type_of_(oln, void, OlnType, Alias) + + +/// \def oln_check_direct_type_of(OlnType, Alias) +/// +/// Macro to retrieve an associated type \a Alias from an oln type \a +/// OlnType directly, and whose category is not specified (version to +/// be used inside a template). +/// +/// If the virtual type is not found, raise a static error. +# define oln_check_direct_type_of(OlnType, Alias) \ + stc_check_direct_type_of(oln, void, OlnType, Alias) + +/// \def oln_check_direct_type_of_(OlnType, Alias) +/// +/// Macro to retrieve an associated type \a Alias from an oln type \a +/// OlnType directly, and whose category is not specified (version to +/// be used inside a template). +/// +/// If the virtual type is not found, raise a static error. +# define oln_check_direct_type_of_(OlnType, Alias) \ + stc_check_direct_type_of_(oln, void, OlnType, Alias) + + #endif // ! OLENA_CORE_MACROS_HH Index: oln/morpher/identity.hh --- oln/morpher/identity.hh (revision 561) +++ oln/morpher/identity.hh (working copy) @@ -66,7 +66,6 @@ { /// Identity morpher. template <typename Image> - // FIXME: class identity : public stc_get_supers(identity<Image>) { private: Index: oln/morpher/internal/image_extension.hh --- oln/morpher/internal/image_extension.hh (revision 561) +++ oln/morpher/internal/image_extension.hh (working copy) @@ -47,7 +47,6 @@ } // end of namespace oln::morpher - // FIXME: Use set_super_type instead? /// Create an ``uplink'' from /// oln::morpher::internal::image_extension to the morphed \a Image, /// so as to get all its virtual types. Index: oln/morpher/add_neighborhood.hh --- oln/morpher/add_neighborhood.hh (revision 561) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -74,10 +74,7 @@ private: typedef add_neighborhood<Image> self_t; typedef stc_get_nth_super(self_t, 1) super_t; - // FIXME: This should be replaced by a call to a new version of - // `oln_type_of', (named, for instance, `oln_check_type_of' or - // `oln_type_of_defined_'). Do the necessary changes in Static. - typedef oln_type_of(self_t, neighborhood) neighborhood_t; + typedef oln_check_type_of(self_t, neighborhood) neighborhood_t; public: // FIXME: Handle the constness.

17 years, 7 months

561: Add a version of type_of_ checking that the vtype is actually found.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a version of type_of_ checking that the vtype is actually found. * stc/vtypes.hh (stc::ERROR::NO_VALID_VIRTUAL_TYPE_FOUND), (stc::ERROR::NO_VALID_RETURN_TYPE_FOR_type_of_): Remove. (stc::ERROR::VIRTUAL_TYPE_NOT_FOUND): New. (check_direct_type_of_, check_type_of_): New. (stc_check_type_of, stc_check_type_of_) (stc_check_direct_type_of, stc_check_direct_type_of_): New macros. vtypes.hh | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 5 deletions(-) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 560) +++ stc/vtypes.hh (working copy) @@ -65,20 +65,31 @@ namespace ERROR { + /// Errors from internal::get_super_types_helper. + /// \{ struct PARAMETER_OF_get_super_types_helper_IS_NOT_A_VALID_VALIST; + /// \} + /// Errors from internal rec_get_vtype. + /// \{ struct FIRST_PARAMETER_OF_rec_get_vtype_IS_NOT_A_TAG; struct FIRST_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_TAG; struct THIRD_PARAMETER_OF_rec_get_vtype_from_list_IS_NOT_A_LIST; + /// \} + /// Errors from internal::select_typedef. + /// \{ struct VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE; struct VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_EXTERNAL; struct VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_SINGLE_AND_EXTERNAL; struct VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE_AND_EXTERNAL; - struct NO_VALID_VIRTUAL_TYPE_FOUND; + /// \} - struct NO_VALID_RETURN_TYPE_FOR_type_of_; + /// Errors from check_type_of_ and check_exact_type_of_. + /// \{ + struct VIRTUAL_TYPE_NOT_FOUND; + /// \} } // end of namespace stc::ERROR @@ -771,6 +782,9 @@ } /** End of namespace internal. */ \ \ \ + /* Entry points. */ \ + /* ------------- */ \ + \ /** Entry point of the vtype retrieval algorithm. */ \ template <typename category, typename from_type, typename typedef_type> \ struct direct_type_of_ \ @@ -820,6 +834,41 @@ direct_type_of_<category, from_exact_type, typedef_type>::ret ret; \ }; \ \ + \ + /** Like direct_type_of_, but ensure that the result is different */ \ + /** from mlc::not_found. */ \ + template <typename category, typename from_type, typename typedef_type> \ + struct check_direct_type_of_ \ + { \ + /* Candidate type. */ \ + typedef typename \ + direct_type_of_<category, from_type, typedef_type>::ret candidate; \ + /* Check that CANDIDATE is found. */ \ + typedef typename \ + mlc::assert_and_return_< \ + mlc_neq(candidate, mlc::not_found), \ + candidate, \ + stc::ERROR::VIRTUAL_TYPE_NOT_FOUND \ + >::ret ret; \ + }; \ + \ + /** Like type_of_, but ensure that the result is different from */ \ + /** mlc::not_found. */ \ + template <typename category, typename from_type, typename typedef_type> \ + struct check_type_of_ \ + { \ + /* Candidate type. */ \ + typedef typename \ + type_of_<category, from_type, typedef_type>::ret candidate; \ + /* Check that CANDIDATE is found. */ \ + typedef typename \ + mlc::assert_and_return_< \ + mlc_neq(candidate, mlc::not_found), \ + candidate, \ + stc::ERROR::VIRTUAL_TYPE_NOT_FOUND \ + >::ret ret; \ + }; \ + \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n @@ -933,9 +982,9 @@ set_pseudosuper_type< Type >::ret -// ---------------------- // -// Virtual types access. // -// ---------------------- // +// --------------------- // +// Virtual type access. // +// --------------------- // /// Get the vtype \a Typedef, declared in \a Namespace, from the /// exact type of \a FromType (version to be used inside a template). @@ -961,6 +1010,45 @@ Namespace::typedef_:: Typedef##_type >::ret +// ------------------------------- // +// Virtual type check and access. // +// ------------------------------- // + +/* These macros are the same as the previous ones, but they use + check_type_of_ (resp. check_direct_type_of_) instead of type_of_ + (resp. direct_type_of_). */ + +/// Get the vtype \a Typedef, declared in \a Namespace, from the +/// exact type of \a FromType (version to be used inside a template). +/// If the virtual type is not found, raise a static error. +#define stc_check_type_of(Namespace, Category, FromType, Typedef) \ + typename stc_check_type_of_(Namespace, Category, FromType, Typedef) + +/// Get the vtype \a Typedef, declared in \a Namespace, from the +/// exact type of \a FromType (version to be used outside a template). +/// If the virtual type is not found, raise a static error. +#define stc_check_type_of_(Namespace, Category, FromType, Typedef) \ + Namespace::check_type_of_< Category, FromType, \ + Namespace::typedef_:: Typedef##_type >::ret + + +/// Get the vtype \a Typedef, declared in \a Namespace, from \a +/// FromType directly. (version to be used inside a template). +/// If the virtual type is not found, raise a static error. +#define stc_check_direct_type_of(Namespace, Category, FromType, Typedef) \ + typename stc_check_direct_type_of_(Namespace, Category, FromType, Typedef) + +/// Get the vtype \a Typedef, declared in \a Namespace, from \a +/// FromType directly (version to be used outside a template). +/// If the virtual type is not found, raise a static error. +#define stc_check_direct_type_of_(Namespace, Category, FromType, Typedef) \ + Namespace::check_direct_type_of_< \ + Category, \ + FromType, \ + Namespace::typedef_:: Typedef##_type \ + >::ret + + /// Declare the vtype \a Typedef in an abstract class (see sample code /// for details). Warning: this macro assumes that the exact type

17 years, 7 months

560: Keep type_of_ its original semantics, and be consistent with macro names.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Keep type_of_ its original semantics, and be consistent with macro names. * stc/vtypes.hh (type_of_): Rename as... (direct_type_of_): ...this. (exact_type_of_): Rename as... (type_of_): ...this. (stc_type_of_, stc_direct_type_of_): Adjust macros. vtypes.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 559) +++ stc/vtypes.hh (working copy) @@ -773,7 +773,7 @@ \ /** Entry point of the vtype retrieval algorithm. */ \ template <typename category, typename from_type, typename typedef_type> \ - struct type_of_ \ + struct direct_type_of_ \ { \ /* Look for the typedef in internal vtypes. */ \ typedef typename \ @@ -811,13 +811,13 @@ /** Entry point of the vtype retrieval algorithm (working on the */ \ /** exact version of \a from_type). */ \ template <typename category, typename from_type, typename typedef_type> \ - struct exact_type_of_ \ + struct type_of_ \ { \ /* Get the exact type of \a from_type. */ \ typedef stc_to_exact(from_type) from_exact_type; \ /* ``Run'' type_of_. */ \ typedef typename \ - type_of_<category, from_exact_type, typedef_type>::ret ret; \ + direct_type_of_<category, from_exact_type, typedef_type>::ret ret; \ }; \ \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n @@ -945,7 +945,7 @@ /// Get the vtype \a Typedef, declared in \a Namespace, from the /// exact type of \a FromType (version to be used outside a template). #define stc_type_of_(Namespace, Category, FromType, Typedef) \ - Namespace::exact_type_of_< Category, FromType, \ + Namespace::type_of_< Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret @@ -957,7 +957,7 @@ /// Get the vtype \a Typedef, declared in \a Namespace, from \a /// FromType directly (version to be used outside a template). #define stc_direct_type_of_(Namespace, Category, FromType, Typedef) \ - Namespace::type_of_< Category, FromType, \ + Namespace::direct_type_of_< Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret

17 years, 7 months

559: 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): Add morpher/tags.hh. Makefile.am | 1 + 1 file changed, 1 insertion(+) Index: oln/Makefile.am --- oln/Makefile.am (revision 558) +++ oln/Makefile.am (working copy) @@ -69,5 +69,6 @@ \ morpher/add_neighborhood.hh \ morpher/identity.hh \ + morpher/tags.hh \ \ basics2d.hh

17 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2006