- Olena-patches

578: Add array2d and tracked_ptr.
by Thierry GERAUD 27 Sep '06

27 Sep '06

2006-09-27 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add array2d and tracked_ptr. * oln/core/2d/array2d.hh: New. This file also provides the tracked_ptr class which should be moved later in a more appropriate file. * oln/core/2d/image2d.hh (lvalue_type, is_mutable_type): Add. (data_): New attribute. (impl_op_read): Update; code is no more fake. (impl_op_readwrite): New. (image2d): Update. * oln/Makefile.am (nobase_oln_HEADERS): Update; remove the core/2d/grid2d.hh duplicate. Index: oln/core/2d/array2d.hh =================================================================== --- oln/core/2d/array2d.hh (revision 0) +++ oln/core/2d/array2d.hh (revision 0) @@ -0,0 +1,313 @@ +// Copyright (C) 2001, 2003, 2004, 2006 EPITA Research and Development +// Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_2D_ARRAY2D_HH +# define OLENA_CORE_2D_ARRAY2D_HH + +# include <cstdlib> +# include <set> +# include <mlc/contract.hh> + + +namespace oln +{ + + template <typename T> + struct tracked_ptr + { + typedef tracked_ptr<T> self_t; + typedef std::set<self_t*> holders_t; + + T* ptr_; + holders_t* holders_; + + /// Coercion towards Boolean (for arithmetical tests). + operator bool() const + { + invariant_(); + return ptr_ != 0; + } + + /// Negation (for arithmetical tests). + bool operator not() const + { + invariant_(); + return not bool(*this); + } + + /*! \brief Mimics the behavior of op-> for a pointer in the const case. + ** + ** \invariant Pointer proxy exists. + */ + const T*const operator->() const + { + invariant_(); + precondition(ptr_ != 0); + return ptr_; + } + + /*! \brief Mimics the behavior of op-> for a pointer in the mutable case. + ** + ** \invariant Pointer proxy exists. + */ + T*const operator->() + { + invariant_(); + precondition(ptr_ != 0); + return ptr_; + } + + /// Ctor. + tracked_ptr() : + ptr_(0), + holders_(0) + { + invariant_(); + } + + /// Ctor. + tracked_ptr(T* ptr) : + ptr_(ptr) + { + if (ptr == 0) + holders_ = 0; + else + { + holders_ = new holders_t; + holders_->insert(this); + } + invariant_(); + } + + /// Cpy ctor. + tracked_ptr(const self_t& rhs) : + ptr_(rhs.ptr_), + holders_(rhs.holders_) + { + rhs.invariant_(); + if (ptr_ != 0) + holders_->insert(this); + invariant_(); + } + + /// Assignment. + self_t& operator=(const self_t& rhs) + { + invariant_(); + rhs.invariant_(); + if (&rhs == this or rhs.ptr_ == ptr_) + // no-op + return *this; + clean_(); + ptr_ = rhs.ptr_; + holders_ = rhs.holders_; + holders_->insert(this); + return *this; + } + + /// Assignment. + self_t& operator=(T* ptr) + { + invariant_(); + if (ptr == ptr_) + // no-op + return *this; + clean_(); + ptr_ = ptr; + if (ptr == 0) + holders_ = 0; + else + { + holders_ = new holders_t; + holders_->insert(this); + } + return *this; + } + + /// Dtor. + ~tracked_ptr() + { + clean_(); + } + + void invariant_() const + { + invariant((ptr_ and holders_) or (not ptr_ and not holders_)); + if (ptr_ == 0) + return; + invariant(holders_->size() > 0); + self_t* this_ = const_cast<self_t*>(this); + invariant(holders_->find(this_) != holders_->end()); + typename holders_t::const_iterator i; + for (i = holders_->begin(); i != holders_->end(); ++i) + invariant((*i)->ptr_ == ptr_); + } + + void clean_() + { + invariant_(); + if (ptr_ == 0) + // no-op + return; + if (holders_->size() == 1) + { + delete ptr_; + delete holders_; + } + else + holders_->erase(this); + ptr_ = 0; + holders_ = 0; + invariant_(); + } + + friend std::ostream& operator<<(std::ostream& ostr, const self_t& tp) + { + ostr << "tracked_ptr @ " << (&tp) + << " { ptr = " << tp.ptr_ + << " / holders = "; + if (tp.holders_ == 0) + ostr << "0"; + else + { + typename holders_t::const_iterator i; + for (i = tp.holders_->begin(); i != tp.holders_->end(); ++i) + ostr << (*i) << ' '; + } + ostr << " }"; + return ostr; + } + }; + + + /// General 2D array class. + template <typename value_t, typename coord_t = int> + class array2d + { + public: + + /// Ctor. + array2d(coord_t imin, coord_t jmin, + coord_t imax, coord_t jmax) : + imin_(imin), + jmin_(jmin), + imax_(imax), + jmax_(jmax) + { + precondition(imax >= imin and jmax >= jmin); + ilen_ = imax - imin + 1; + jlen_ = jmax - jmin + 1; + allocate_(); + } + + /// Ctor. + array2d(coord_t ilen, coord_t jlen) : + imin_(0), + jmin_(0), + ilen_(ilen), + jlen_(jlen) + { + precondition(ilen > 0 and jlen > 0); + imax_ = imin_ + ilen_; + jmax_ = jmin_ + ilen_; + allocate_(); + } + + /// Dtor. + ~array2d() + { + deallocate_(); + } + + value_t operator()(coord_t i, coord_t j) const + { + precondition(has(i, j)); + return array_[i][j]; + } + + value_t& operator()(coord_t i, coord_t j) + { + precondition(has(i, j)); + return array_[i][j]; + } + + bool has(coord_t i, coord_t j) const + { + return + i >= imin_ and i <= imax_ and + j >= jmin_ and j <= jmax_; + } + + size_t memsize() const + { + return + // buffer_ + size_t(ilen_) * size_t(jlen_) * sizeof(value_t) + + + // array_ + size_t(ilen_) * sizeof(value_t*); + } + + protected: + + coord_t imin_, jmin_, imax_, jmax_; + coord_t ilen_, jlen_; + value_t* buffer_; + value_t** array_; + + private: + + void allocate_() + { + buffer_ = new value_t[size_t(ilen_) * size_t(jlen_)]; + array_ = new value_t*[size_t(ilen_)]; + value_t* buf = buffer_ - jmin_; + for (coord_t i = 0; i < ilen_; ++i) + { + array_[i] = buf; + buf += jlen_; + } + array_ -= imin_; + } + + void deallocate_() + { + precondition(buffer_ != 0 and array_ != 0); + delete[] buffer_; + buffer_ = 0; // safety + array_ += imin_; + delete[] array_; + array_ = 0; // safety + } + }; + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_2D_ARRAY2D_HH Index: oln/core/2d/image2d.hh =================================================================== --- oln/core/2d/image2d.hh (revision 577) +++ oln/core/2d/image2d.hh (working copy) @@ -30,6 +30,7 @@ # define OLENA_CORE_2D_IMAGE2D_HH # include <oln/core/image_entry.hh> +# include <oln/core/2d/array2d.hh> namespace oln @@ -52,6 +53,8 @@ typedef bkd_piter_bbox_<topo_type> bkd_piter_type; typedef T value_type; + typedef T lvalue_type; + typedef mlc::true_ is_mutable_type; typedef image2d<T> real_type; }; @@ -71,12 +74,16 @@ class image2d : public image_entry< image2d<T> > { typedef image2d<T> self_t; + typedef array2d<T> array_t; public: /// Ctor. image2d(unsigned nrows, unsigned ncols, unsigned border = 2) - : topo_( bbox2d( point2d(0,0), point2d(nrows-1, ncols-1)), border ) + : topo_(bbox2d(point2d(0, 0), + point2d(nrows-1, ncols-1)), + border), + data_(new array_t(0, 0, nrows-1, ncols-1)) { } @@ -87,19 +94,22 @@ T impl_op_read(const point2d& p) const { - return (T)(void*)this; -// static T val_; -// return ++val_; + precondition(data_ != 0); + precondition(topo_.has_large(p)); + return data_->operator()(p.row(), p.col()); } - bool impl_has(const point2d& p) const + T& impl_op_readwrite(const point2d& p) { - return true; + precondition(data_ != 0); + precondition(topo_.has_large(p)); + return data_->operator()(p.row(), p.col()); } private: topo2d topo_; + tracked_ptr<array_t> data_; }; Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 577) +++ oln/Makefile.am (working copy) @@ -15,8 +15,8 @@ \ core/1d/grid1d.hh \ \ - core/2d/grid2d.hh \ core/2d/aliases.hh \ + core/2d/array2d.hh \ core/2d/dpoint2d.hh \ core/2d/grid2d.hh \ core/2d/image2d.hh \

1 0

577: Compile tests with no optimization to speed them up
by Roland Levillain 27 Sep '06

27 Sep '06

This is a multiple-subproject patch. Index: extended/tests/Makefile.am =================================================================== --- extended/tests/Makefile.am (révision 576) +++ extended/tests/Makefile.am (révision 577) @@ -1,12 +1,14 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- AM_CPPFLAGS = -I$(top_srcdir)/extended -I$(top_srcdir)/metalic -# FIXME: Add +# FIXME: Add # -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) -ggdb # # when oln.m4 is available in the distribution. +AM_CXXFLAGS = -O0 -ggdb + check_PROGRAMS = \ abs \ bind \ Index: extended/ChangeLog =================================================================== --- extended/ChangeLog (révision 576) +++ extended/ChangeLog (révision 577) @@ -1,3 +1,7 @@ +2006-09-27 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am (AM_CXXFLAGS): Set to -O0 -ggdb. + 2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * xtd/vec.hh (operator-): Fix missing const. Index: static/tests/Makefile.am =================================================================== --- static/tests/Makefile.am (révision 576) +++ static/tests/Makefile.am (révision 577) @@ -3,10 +3,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/static -I$(top_srcdir)/metalic # FIXME: Add # -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) -ggdb # # when oln.m4 is available in the distribution. +AM_CXXFLAGS = -O0 -ggdb + check_PROGRAMS = \ any \ entry \ Index: static/ChangeLog =================================================================== --- static/ChangeLog (révision 576) +++ static/ChangeLog (révision 577) @@ -1,3 +1,7 @@ +2006-09-27 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am (AM_CXXFLAGS): Set to -O0 -ggdb. + 2006-09-26 Roland Levillain <roland(a)lrde.epita.fr> Rename stc/vtypes.hh as stc/scoop.hh. Index: metalic/tests/Makefile.am =================================================================== --- metalic/tests/Makefile.am (révision 576) +++ metalic/tests/Makefile.am (révision 577) @@ -1,12 +1,14 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- AM_CPPFLAGS = -I$(top_srcdir)/metalic -# FIXME: Add +# FIXME: Add # -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) -ggdb # # when oln.m4 is available in the distribution. +AM_CXXFLAGS = -O0 -ggdb + check_PROGRAMS = \ case \ gcase \ Index: metalic/ChangeLog =================================================================== --- metalic/ChangeLog (révision 576) +++ metalic/ChangeLog (révision 577) @@ -1,3 +1,7 @@ +2006-09-27 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am (AM_CXXFLAGS): Set to -O0 -ggdb. + 2006-09-14 Roland Levillain <roland(a)lrde.epita.fr> Clean up Metalic's distribution. Index: olena/tests/Makefile.am =================================================================== --- olena/tests/Makefile.am (révision 576) +++ olena/tests/Makefile.am (révision 577) @@ -5,10 +5,12 @@ -I$(top_srcdir)/static -I$(top_srcdir)/metalic # FIXME: Add # -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_OPTIMIZE) -ggdb +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) -ggdb # # when oln.m4 is available in the distribution. +AM_CXXFLAGS = -O0 -ggdb + check_PROGRAMS = \ grid \ image_entry \ Index: olena/ChangeLog =================================================================== --- olena/ChangeLog (révision 576) +++ olena/ChangeLog (révision 577) @@ -1,3 +1,7 @@ +2006-09-27 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am (AM_CXXFLAGS): Set to -O0 -ggdb. + 2006-09-26 Roland Levillain <roland(a)lrde.epita.fr> Let neighborhood() return a const reference instead of a copy.

1 0

576: Let neighborhood() return a const reference instead of a copy.
by Roland Levillain 26 Sep '06

26 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Let neighborhood() return a const reference instead of a copy. * oln/automatic/image_having_neighborhood.hh (impl_neighborhood) * oln/core/abstract/image/neighborhood/hierarchy.hh (image_having_neighborhood::neighborhood): Return a const reference instead of a copy. automatic/image_having_neighborhood.hh | 2 +- core/abstract/image/neighborhood/hierarchy.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: oln/automatic/image_having_neighborhood.hh --- oln/automatic/image_having_neighborhood.hh (revision 575) +++ oln/automatic/image_having_neighborhood.hh (working copy) @@ -57,7 +57,7 @@ public: /// Accessor delegation. - neighborhood_t impl_neighborhood() const + const neighborhood_t& impl_neighborhood() const { return this->exact().delegate().neighborhood(); } Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 575) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -74,7 +74,7 @@ // stc_virtual_typedef(bkd_niter); }; - neighborhood_t neighborhood() const + const neighborhood_t& neighborhood() const { return this->topo().neighborhood(); }

1 0

575: Add mapimage type and update.
by Thierry GERAUD 26 Sep '06

26 Sep '06

2006-09-26 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add mapimage type and update. * oln/core/gen/mapimage.hh: New. * oln/automatic/image_being_random_accessible.hh: New. * oln/core/abstract/topology_having_bbox.hh (bbox): New; mutable version. * oln/core/abstract/image.hh (has): Remove; this method is now specific to a sub-abstraction. * oln/core/abstract/image/mutability/hierarchy.hh (lvalue_t, psite_t): Update. (~image_being_mutable): Fix typo. (using): New; it allows disambiguation of overloading thru inheritance. * oln/core/abstract/image/accessibility/hierarchy.hh (has, has_large): Update. (include): Update. * oln/core/abstract/image/bbox/hierarchy.hh (bbox_t, point_t): Update. (bbox): Change return signature. (pmin, pmax): New. * oln/core/gen/topo_bbox.hh (impl_bbox): New. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: oln/automatic/image_being_random_accessible.hh =================================================================== --- oln/automatic/image_being_random_accessible.hh (revision 0) +++ oln/automatic/image_being_random_accessible.hh (revision 0) @@ -0,0 +1,104 @@ +// 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_BEING_RANDOM_ACCESSIBLE_HH +# define OLENA_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + + // Forward declaration. + namespace abstract + { + template <typename E> class image_being_random_accessible; + + } // end of namespace oln::abstract + + + namespace automatic + { + + /// Default implementation corresponding to the interface + /// oln::abstract::image_being_random_accessible. + + template <typename E, typename M> + class impl< abstract::image_being_random_accessible, M, 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().topo().has(p); + } + + bool impl_has_large(const point_t& p) const + { + return this->exact().has(p); + } + + }; + + + /// Implementation corresponding to the interface + /// oln::abstract::image_being_random_accessible for an identity morpher. + + template <typename E> + class impl< abstract::image_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_IMAGE_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/topology_having_bbox.hh =================================================================== --- oln/core/abstract/topology_having_bbox.hh (revision 574) +++ oln/core/abstract/topology_having_bbox.hh (working copy) @@ -56,6 +56,12 @@ return this->exact().impl_bbox(); } + // abstract + bbox_t& bbox() + { + return this->exact().impl_bbox(); + } + // concrete operator bbox_t() const { Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 574) +++ oln/core/abstract/image.hh (working copy) @@ -123,23 +123,6 @@ return this->exact().impl_op_read(p); } - - /*! \brief Test if the point \a p belongs to the current image. - ** Please note that a point of the outer boundary of an image - ** does NOT belong to the image. - ** - ** \return True if p belongs to the current image, false otherwise. - ** - ** \see hold_large - */ - - bool has(const psite_t& p) const - { - 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/mutability/hierarchy.hh =================================================================== --- oln/core/abstract/image/mutability/hierarchy.hh (revision 574) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -53,8 +53,8 @@ { private: - typedef oln_type_of(E, lvalue) lvalue_t; - typedef oln_type_of(E, psite) psite_t; + typedef oln_check_type_of(E, lvalue) lvalue_t; + typedef oln_check_type_of(E, psite) psite_t; public: @@ -66,7 +66,9 @@ ** the current image. */ - lvalue_t& operator()(const psite_t& p) const + using image<E>::operator(); + + lvalue_t& operator()(const psite_t& p) { return this->exact().impl_op_readwrite(p); } @@ -77,7 +79,7 @@ image_being_mutable() {} /// Destructor (protected). - image_being_mutable() { decl(); } + ~image_being_mutable() { decl(); } }; Index: oln/core/abstract/image/accessibility/hierarchy.hh =================================================================== --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 574) +++ oln/core/abstract/image/accessibility/hierarchy.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/automatic/image_being_random_accessible.hh> @@ -52,16 +53,16 @@ public: - // Concrete method. + // Abstract method. bool has(const point_t& p) const { - return this->topo().has(p); + return this->exact().impl_has(p); } - // Concrete method. + // Abstract method. bool has_large(const point_t& p) const { - return this->topo().has_large(p); + return this->exact().impl_has_large(p); } protected: Index: oln/core/abstract/image/bbox/hierarchy.hh =================================================================== --- oln/core/abstract/image/bbox/hierarchy.hh (revision 574) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -48,8 +48,10 @@ public automatic::impl< image_having_bbox, oln_type_of(E, morpher), E > { private: - typedef oln_type_of(E, bbox) bbox_t; + typedef oln_check_type_of(E, bbox) bbox_t; + typedef oln_check_type_of(E, point) point_t; + public: struct decl { @@ -57,11 +59,23 @@ }; // Concrete method. - bbox_t bbox() const + const bbox_t& bbox() const { return this->topo().bbox(); } + // Concrete method. + const point_t& pmin() const + { + return this->topo().bbox().pmin(); + } + + // Concrete method. + const point_t& pmax() const + { + return this->topo().bbox().pmax(); + } + protected: /// Constructor (protected, empty). Index: oln/core/gen/topo_bbox.hh =================================================================== --- oln/core/gen/topo_bbox.hh (revision 574) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -64,6 +64,8 @@ template <typename point> class topo_bbox_ : public topology_entry< topo_bbox_<point> > { + typedef topo_bbox_<point> self_t; + typedef topology_entry<self_t> super_t; typedef bbox_<point> bbox_t; public: @@ -82,6 +84,11 @@ return bb_; } + bbox_t& impl_bbox() + { + return bb_; + } + bool impl_has(const point& p) const { return bb_.has(p); Index: oln/core/gen/mapimage.hh =================================================================== --- oln/core/gen/mapimage.hh (revision 0) +++ oln/core/gen/mapimage.hh (revision 0) @@ -0,0 +1,123 @@ +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 EPITA Research and +// Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_MAPIMAGE_HH +# define OLENA_CORE_GEN_MAPIMAGE_HH + +# include <oln/core/image_entry.hh> +# include <oln/core/gen/topo_bbox.hh> +# include <map> + + +namespace oln +{ + + // Forward declaration. + template <typename point_t, typename value_t> class mapimage; + + + /// Virtual types associated to oln::mapimage<>. + template <typename point_t, typename value_t> + struct vtypes< mapimage<point_t, value_t> > + { + typedef topo_bbox_<point_t> topo_type; + typedef oln_type_of(point_t, grid) grid_type; + + typedef point_t point_type; + + typedef fwd_piter_bbox_<topo_type> fwd_piter_type; + typedef bkd_piter_bbox_<topo_type> bkd_piter_type; + + typedef value_t value_type; + + typedef mlc::true_ is_mutable_type; + typedef value_t lvalue_type; + + typedef void real_type; // FIXME + }; + + + /// Super type declaration. + template <typename point_t, typename value_t> + struct set_super_type< mapimage<point_t, value_t> > + { + typedef mapimage<point_t, value_t> self_t; + typedef image_entry<self_t> ret; + }; + + + /// General 2D image class. + template <typename point_t, typename value_t> + class mapimage : public image_entry< mapimage<point_t, value_t> > + { + typedef mapimage<point_t, value_t> self_t; + typedef oln_type_of(self_t, topo) topo_t; + + public: + + /// Ctor. + mapimage(const value_t& val) + : val_(val) + { + } + + const topo_t& impl_topo() const + { + return topo_; + } + + value_t impl_op_read(const point_t& p) const + { + if (not has(p)) + return val_; + return data_[p]; + } + + value_t& impl_op_readwrite(const point_t& p) + { + topo_.bbox().take(p); + return data_[p]; + } + + bool impl_has(const point_t& p) const + { + return data_.find(p) != data_.end(); + } + + private: + + value_t val_; + mutable topo_t topo_; + mutable std::map<point_t, value_t> data_; + }; + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_GEN_MAPIMAGE_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 574) +++ oln/Makefile.am (working copy) @@ -5,7 +5,10 @@ nobase_oln_HEADERS = \ \ automatic/image.hh \ + automatic/image_being_mutable.hh \ + automatic/image_being_random_accessible.hh \ automatic/image_having_neighborhood.hh \ + automatic/image_having_neighborhood.hh \ automatic/topology_being_random_accessible.hh \ automatic/topology_having_bbox.hh \ automatic/topology_having_neighborhood.hh \ @@ -30,11 +33,14 @@ core/abstract/entry.hh \ core/abstract/grid.hh \ core/abstract/image.hh \ + core/abstract/image/accessibility/hierarchy.hh \ + core/abstract/image/bbox/hierarchy.hh \ core/abstract/image/dimension/1d.hh \ core/abstract/image/dimension/2d.hh \ core/abstract/image/dimension/3d.hh \ core/abstract/image/dimension/hierarchy.hh \ core/abstract/image/hierarchies.hh \ + core/abstract/image/mutability/hierarchy.hh \ core/abstract/image/neighborhood/hierarchy.hh \ core/abstract/image/type/binary.hh \ core/abstract/image/type/color.hh \ @@ -62,9 +68,13 @@ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \ + core/gen/bkd_piter_bbox.hh \ + core/gen/fwd_piter_bbox.hh \ + core/gen/mapimage.hh \ core/gen/neighb.hh \ core/gen/topo_add_nbh.hh \ core/gen/topo_bbox.hh \ + core/gen/topo_lbbox.hh \ \ core/internal/bbox_bkd_piter.hh \ core/internal/bbox_fwd_piter.hh \

1 0

574: Add some abstract image sub-hierarchies.
by Thierry GERAUD 26 Sep '06

26 Sep '06

2006-09-26 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add some abstract image sub-hierarchies. * oln/automatic/image_being_mutable.hh: New. * oln/core/abstract/image/mutability/hierarchy.hh: New. * oln/core/abstract/image/accessibility/hierarchy.hh: New. * oln/core/abstract/image/bbox/hierarchy.hh: New. * oln/core/typedefs.hh (lvalue_type, is_mutable_type): New. * oln/core/macros.hh (oln_deduce_type_of): New. * oln/core/abstract/image.hh: Cosmetics. * oln/core/abstract/image/hierarchies.hh (image_hierarchy_wrt_bbox): New. (image_hierarchy_wrt_accessibility): New. (image_hierarchy_wrt_mutability): New. (include): Update. * oln/core/abstract/image/neighborhood/hierarchy.hh (decl): New. (~image_having_neighborhood): New. Index: oln/automatic/image_being_mutable.hh =================================================================== --- oln/automatic/image_being_mutable.hh (revision 0) +++ oln/automatic/image_being_mutable.hh (revision 0) @@ -0,0 +1,69 @@ +// 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_BEING_MUTABLE_HH +# define OLENA_AUTOMATIC_IMAGE_BEING_MUTABLE_HH + +# include <oln/core/typedefs.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + // Forward declaration. + namespace abstract + { + template <typename E> class image_being_mutable; + + } // end of namespace oln::abstract + + + namespace automatic + { + /// Implementation corresponding to the interface + /// oln::abstract::image_being_mutable for an identity morpher. + template <typename E> + class impl< abstract::image_being_mutable, morpher::tag::identity, E> : + public virtual stc::any__simple<E> + { + private: + typedef oln_type_of(E, lvalue) lvalue_t; + typedef oln_type_of(E, psite) psite_t; + + public: + /// Accessor delegation. + lvalue_t& impl_op_readwrite(const psite_t& p) const + { + return this->exact().delegate().operator()(p); + } + }; + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLENA_AUTOMATIC_IMAGE_BEING_MUTABLE_HH Index: oln/core/typedefs.hh =================================================================== --- oln/core/typedefs.hh (revision 573) +++ oln/core/typedefs.hh (working copy) @@ -120,6 +120,8 @@ // -------------------------------------------------------------------- mlc_decl_typedef(value_type); mlc_decl_typedef(rvalue_type); + mlc_decl_typedef(lvalue_type); + mlc_decl_typedef(is_mutable_type); // -------------------------------------------------------------------- // FIXME: To be enabled later. Index: oln/core/macros.hh =================================================================== --- oln/core/macros.hh (revision 573) +++ oln/core/macros.hh (working copy) @@ -40,6 +40,14 @@ # define oln_type_of(OlnType, Alias) \ stc_type_of(oln, void, OlnType, Alias) + +/// FIXME: Temporary macro to be able to perform "oln_type_of(oln_type_of(A, B), C)". +# define oln_deduce_type_of(OlnType, Alias1, Alias2) \ +typename oln::type_of_<void, \ + typename oln::type_of_<void, OlnType, oln::typedef_::Alias1##_type >::ret, \ + oln::typedef_::Alias2##_type >::ret + + /// \def oln_type_of(OlnType, Alias) /// /// Macro to retrieve an associated type \a Alias from the exact type of Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 573) +++ oln/core/abstract/image.hh (working copy) @@ -55,9 +55,7 @@ template <typename E> struct image : public virtual stc::any__simple<E>, public virtual oln::type, - public automatic::impl< image, - oln_type_of(E, morpher), - E > + public automatic::impl< image, oln_type_of(E, morpher), E > { public: Index: oln/core/abstract/image/mutability/hierarchy.hh =================================================================== --- oln/core/abstract/image/mutability/hierarchy.hh (revision 0) +++ oln/core/abstract/image/mutability/hierarchy.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_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH + +# include <oln/core/abstract/image.hh> + +// Automatically-inherited implementations. +# include <oln/automatic/image_being_mutable.hh> + + + +namespace oln +{ + + /*-------------------------. + | Dimension abstractions. | + `-------------------------*/ + + namespace abstract + { + + /// Image being mutable. + template <typename E> + struct image_being_mutable : + public virtual image<E>, + public automatic::impl< image_being_mutable, oln_type_of(E, morpher), E > + { + private: + + typedef oln_type_of(E, lvalue) lvalue_t; + typedef oln_type_of(E, psite) psite_t; + + public: + + struct decl { + stc_virtual_typedef(lvalue); + }; + + /*! \brief Gives writable access to the value stored at \a p in + ** the current image. + */ + + lvalue_t& operator()(const psite_t& p) const + { + return this->exact().impl_op_readwrite(p); + } + + protected: + + /// Constructor (protected, empty). + image_being_mutable() {} + + /// Destructor (protected). + image_being_mutable() { decl(); } + + }; + + } // end of namespace oln::abstract + + + /*-------------------. + | Dimension switch. | + `-------------------*/ + + /// With mutability. + template <typename E> + struct case_< image_hierarchy_wrt_mutability, E, 1 > : + where_< mlc::eq_< oln_type_of(E, is_mutable), mlc::true_ > > + { + typedef abstract::image_being_mutable<E> ret; + }; + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH Index: oln/core/abstract/image/hierarchies.hh =================================================================== --- oln/core/abstract/image/hierarchies.hh (revision 573) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -37,11 +37,14 @@ typedef hierarchy<abstract::image, 1> image_hierarchy_wrt_dimension; typedef hierarchy<abstract::image, 2> image_hierarchy_wrt_type; typedef hierarchy<abstract::image, 3> image_hierarchy_wrt_neighborhood; + typedef hierarchy<abstract::image, 4> image_hierarchy_wrt_bbox; + typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_accessibility; + typedef hierarchy<abstract::image, 6> image_hierarchy_wrt_mutability; // FIXME: To be continued. #if 0 - typedef hierarchy<abstract::image, 4> image_hierarchy_wrt_value; - typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_data_retrieval; + typedef hierarchy<abstract::image, 7> image_hierarchy_wrt_value; + typedef hierarchy<abstract::image, 8> image_hierarchy_wrt_data_retrieval; // ... #endif @@ -57,5 +60,14 @@ // Hierarchy 3: topology w.r.t. neighborhood. # include <oln/core/abstract/image/neighborhood/hierarchy.hh> +// Hierarchy 4: topology w.r.t. bounding box. +# include <oln/core/abstract/image/bbox/hierarchy.hh> +// Hierarchy 5: topology w.r.t. accessibility. +# include <oln/core/abstract/image/accessibility/hierarchy.hh> + +// // // Hierarchy 6: topology w.r.t. data mutability. +# include <oln/core/abstract/image/mutability/hierarchy.hh> + + #endif // ! OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/core/abstract/image/neighborhood/hierarchy.hh =================================================================== --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 573) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -67,14 +67,26 @@ typedef oln_type_of(E, neighborhood) neighborhood_t; public: + + struct decl { + // FIXME: Uncomment. + // stc_virtual_typedef(fwd_niter); + // stc_virtual_typedef(bkd_niter); + }; + neighborhood_t neighborhood() const { return this->topo().neighborhood(); } protected: + /// Constructor (protected, empty). image_having_neighborhood() {} + + /// Destructor (protected). + ~image_having_neighborhood() { decl(); } + }; } // end of namespace oln::abstract Index: oln/core/abstract/image/accessibility/hierarchy.hh =================================================================== --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 0) +++ oln/core/abstract/image/accessibility/hierarchy.hh (revision 0) @@ -0,0 +1,91 @@ +// 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_IMAGE_ACCESSIBILITY_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH + +# include <oln/core/abstract/image.hh> + + + +namespace oln +{ + + /*-------------------------. + | Dimension abstractions. | + `-------------------------*/ + + namespace abstract + { + + /// Image having a accessibility. + template <typename E> + struct image_being_random_accessible : + public virtual image<E>, + public automatic::impl< image_being_random_accessible, oln_type_of(E, morpher), E > + { + typedef oln_type_of(E, point) point_t; + + public: + + // Concrete method. + bool has(const point_t& p) const + { + return this->topo().has(p); + } + + // Concrete method. + bool has_large(const point_t& p) const + { + return this->topo().has_large(p); + } + + protected: + + /// Constructor (protected, empty). + image_being_random_accessible() {} + }; + + } // end of namespace oln::abstract + + + /*-------------------. + | Dimension switch. | + `-------------------*/ + + /// With accessibility. + template <typename E> + struct case_< image_hierarchy_wrt_accessibility, E, 1 > : + where_< mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ > > + { + typedef abstract::image_being_random_accessible<E> ret; + }; + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH Index: oln/core/abstract/image/bbox/hierarchy.hh =================================================================== --- oln/core/abstract/image/bbox/hierarchy.hh (revision 0) +++ oln/core/abstract/image/bbox/hierarchy.hh (revision 0) @@ -0,0 +1,105 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + /*-------------------------. + | Dimension abstractions. | + `-------------------------*/ + + namespace abstract + { + + /// Image having a bbox. + template <typename E> + struct image_having_bbox : + public virtual image<E>, + public automatic::impl< image_having_bbox, oln_type_of(E, morpher), E > + { + private: + typedef oln_type_of(E, bbox) bbox_t; + + public: + + struct decl { + stc_virtual_typedef(bbox); + }; + + // Concrete method. + bbox_t bbox() const + { + return this->topo().bbox(); + } + + protected: + + /// Constructor (protected, empty). + + image_having_bbox() {} + /// Destructor. + virtual ~image_having_bbox() { decl(); } + }; + + } // end of namespace oln::abstract + + + /*-------------------. + | Dimension switch. | + `-------------------*/ + + /// With bbox. + template <typename E> + struct case_< image_hierarchy_wrt_bbox, E, 1 > : + where_< mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > > + { + typedef abstract::image_having_bbox<E> ret; + }; + + + template <typename E> struct image_entry; + + + template <typename E> + struct single_vtype< image_entry<E>, typedef_::bbox_type > + { + private: + typedef oln_type_of(E, topo) topo_t; + public: + typedef oln_type_of(topo_t, bbox) ret; + }; + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH

1 0

573: Catch up with changes in Static's stc/scoop.hh.
by Roland Levillain 26 Sep '06

26 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/core/typedefs.hh: Catch up with changes in Static's stc/scoop.hh. typedefs.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 572) +++ oln/core/typedefs.hh (working copy) @@ -41,25 +41,25 @@ # include <stc/any.hh> # include <stc/exact.hh> -# include <stc/vtypes.hh> +# include <stc/scoop.hh> # include <oln/core/type.hh> // FIXME: Move to oln/core. # include <oln/core/macros.hh> -namespace oln -{ - /*----------------------. | Namespace equipment. | `----------------------*/ // The virtual types facility is inserted here because it also // triggers Metalic's typedef introspection equipment. - stc_equip_namespace_with_vtypes(); +stc_scoop_equipment_for_namespace(oln); +namespace oln +{ + /*-------. | Misc. | `-------*/

1 0

572: Rename stc/vtypes.hh as stc/scoop.hh.
by Roland Levillain 26 Sep '06

26 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Rename stc/vtypes.hh as stc/scoop.hh. * stc/vtypes.hh: Rename as... * stc/scoop.hh: ..this. Adjust headers guards. (stc_equip_namespace_with_vtypes): Pass the enclosing namespace as an argument of this macro. Rename as... (stc_scoop_equipment_for_namespace): ...this. Adjust. (stc::abstraction_as_type): Remove. * tests/super.cc, tests/multiple-supers.cc, * tests/vtypes.cc, tests/vtypes-and-exact.cc, * tests/vtypes-multiple-supers.cc: Adjust. stc/Makefile.am | 2 - stc/scoop.hh | 46 ++++++++++++++-------------------------- tests/multiple-supers.cc | 12 ++++------ tests/super.cc | 12 ++++------ tests/vtypes-and-exact.cc | 24 ++++++++++---------- tests/vtypes-multiple-supers.cc | 21 ++++++++---------- tests/vtypes.cc | 20 ++++++++--------- 7 files changed, 60 insertions(+), 77 deletions(-) Index: tests/vtypes-and-exact.cc --- tests/vtypes-and-exact.cc (revision 571) +++ tests/vtypes-and-exact.cc (working copy) @@ -25,15 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <stc/any.hh> -#include <stc/vtypes.hh> +/// Check the virtual types system on a SCOOP hierarchy propagating the +/// exact (static) type throughout the inheritance tree (using +/// stc::any). + #include <mlc/cmp.hh> #include <mlc/assert.hh> #include <mlc/int.hh> -// Check the virtual types system on a SCOOP hierarchy propagating the -// exact (static) type throughout the inheritance tree (using -// stc::any). +#include <stc/any.hh> +#include <stc/scoop.hh> + // Helper macros. #define my_type_of(FromType, Typedef) \ @@ -42,6 +44,11 @@ #define my_type_of_(FromType, Typedef) \ stc_type_of_(my, my::category::my_cat, FromType, Typedef) + +// Namespace equipment. +stc_scoop_equipment_for_namespace(my); + + namespace my { /*-----------. @@ -56,13 +63,6 @@ mlc_decl_typedef(zorg_type); - /*----------------------. - | Namespace equipment. | - `----------------------*/ - - stc_equip_namespace_with_vtypes(); - - /*-----------. | Category. | `-----------*/ Index: tests/super.cc --- tests/super.cc (revision 571) +++ tests/super.cc (working copy) @@ -27,20 +27,18 @@ // Check Static's super relationship. -#include <stc/vtypes.hh> #include <mlc/is_a.hh> #include <mlc/assert.hh> +#include <stc/scoop.hh> -namespace my -{ - /*----------------------. - | Namespace equipment. | - `----------------------*/ +// Namespace equipment. +stc_scoop_equipment_for_namespace(my); - stc_equip_namespace_with_vtypes(); +namespace my +{ /*----. | A. | Index: tests/vtypes-multiple-supers.cc --- tests/vtypes-multiple-supers.cc (revision 571) +++ tests/vtypes-multiple-supers.cc (working copy) @@ -25,15 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <stc/vtypes.hh> +/// This test focuses on the support of virtual types in hierachies +/// with multiple inheritance. + +// FIXME: To do: Check extended vtypes, too. + #include <mlc/cmp.hh> #include <mlc/assert.hh> #include <mlc/int.hh> -// This test focuses on the support of virtual types in hierachies -// with multiple inheritance. +#include <stc/scoop.hh> -// FIXME: To do: Check extended vtypes, too. /// Helper macros. /// \{ @@ -45,6 +47,10 @@ /// \} +// Namespace equipment. +stc_scoop_equipment_for_namespace(my); + + namespace my { /*-----------. @@ -56,13 +62,6 @@ mlc_decl_typedef(baz_type); - /*----------------------. - | Namespace equipment. | - `----------------------*/ - - stc_equip_namespace_with_vtypes(); - - /*----------------. | Various types. | `----------------*/ Index: tests/vtypes.cc --- tests/vtypes.cc (revision 571) +++ tests/vtypes.cc (working copy) @@ -25,13 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <stc/vtypes.hh> +/// This test focuses on the virtual types system, so the exact type of +/// classes is not propagated here (stc::any is not used). + #include <mlc/cmp.hh> #include <mlc/assert.hh> #include <mlc/int.hh> -// This test focuses on the virtual types system, so the exact type of -// classes is not propagated here (stc::any is not used). +#include <stc/scoop.hh> + // Helper macros. #define my_type_of(FromType, Typedef) \ @@ -40,6 +42,11 @@ #define my_type_of_(FromType, Typedef) \ stc_type_of_(my, my::category::my_cat, FromType, Typedef) + +// Namespace equipment. +stc_scoop_equipment_for_namespace(my); + + namespace my { /*-----------. @@ -54,13 +61,6 @@ mlc_decl_typedef(zorg_type); - /*----------------------. - | Namespace equipment. | - `----------------------*/ - - stc_equip_namespace_with_vtypes(); - - /*-----------. | Category. | `-----------*/ Index: tests/multiple-supers.cc --- tests/multiple-supers.cc (revision 571) +++ tests/multiple-supers.cc (working copy) @@ -27,20 +27,18 @@ // Check Static's multiple super relationship. -#include <stc/vtypes.hh> #include <mlc/is_a.hh> #include <mlc/assert.hh> +#include <stc/scoop.hh> -namespace my -{ - /*----------------------. - | Namespace equipment. | - `----------------------*/ +// Namespace equipment. +stc_scoop_equipment_for_namespace(my); - stc_equip_namespace_with_vtypes(); +namespace my +{ /*--. | A | Index: stc/scoop.hh --- stc/scoop.hh (revision 567) +++ stc/scoop.hh (working copy) @@ -26,12 +26,14 @@ // Public License. /* \file stc/vtypes.hh - \brief Virtual types (also known as ``properties'') mechanism. + + \brief Equipment for SCOOP: notably, Virtual types (also known as + ``properties'') mechanism. Based on Theo's presentation from January 2006 (olena-06-jan.pdf). */ -#ifndef STATIC_VTYPES_HH -# define STATIC_VTYPES_HH +#ifndef STATIC_SCOOP_HH +# define STATIC_SCOOP_HH # include <mlc/flags.hh> # include <mlc/typedef.hh> @@ -121,7 +123,10 @@ // FIXME: Could we extract some classes from this gigantic macro? -# define stc_equip_namespace_with_vtypes() \ +# define stc_scoop_equipment_for_namespace(SCOOPED_NAMESPACE) \ + \ +namespace SCOOPED_NAMESPACE \ +{ \ \ /* ----------------------- */ \ /* Typedefs declarations. */ \ @@ -158,7 +163,7 @@ mlc_ret(mlc_comma_1(set_super_type< type, N >)) >::ret \ ret; \ }; \ - } /* end of namespace internal */ \ + } /* end of namespace SCOOPED_NAMESPACE ::internal */ \ \ template <typename type> \ struct get_supers_list \ @@ -216,7 +221,7 @@ { \ }; \ \ - } /* end of namespace internal */ \ + } /* end of namespace SCOOPED_NAMESPACE ::internal */ \ \ \ template<typename type> \ @@ -250,7 +255,7 @@ { \ }; \ \ - } /* end of namespace automatic */ \ + } /* end of namespace SCOOPED_NAMESPACE ::automatic */ \ \ \ /* --------------- */ \ @@ -426,7 +431,7 @@ /** Tag for retrieval within extended vtypes. */ \ struct extended : public method {}; \ \ - } /** end of stc::internal::tag */ \ + } /* end of namespace SCOOPED_NAMESPACE ::internal::tag */ \ \ /** Try to get \a typedef_type from \a from_type. In case this */ \ /** typedef is mlc::not_found, don't perform a recursive */ \ @@ -779,7 +784,7 @@ }; \ /** \} */ \ \ - } /** End of namespace internal. */ \ + } /* End of namespace SCOOPED_NAMESPACE ::internal */ \ \ \ /* Entry points. */ \ @@ -869,28 +874,11 @@ >::ret ret; \ }; \ \ +} /* end of namespace SCOOPED_NAMESPACE */ \ + \ struct e_n_d__w_i_t_h___s_e_m_i_c_o_l_o_n -/*---------------------. -| Abstraction helper. | -`---------------------*/ - -namespace stc -{ - /// Allow the manipulation of an abstraction (i.e., a template type) - /// as a plain type. - template <template <typename> class abstraction> - struct abstraction_as_type - { - template <typename E> - struct instantiated_with - { - typedef abstraction<E> ret; - }; - }; -} // end of namespace stc - /*---------. | Macros. | @@ -1057,4 +1045,4 @@ typedef oln_type_of(E, Typedef) Typedef -#endif // ! STATIC_VTYPES_HH +#endif // ! STATIC_SCOOP_HH Index: stc/Makefile.am --- stc/Makefile.am (revision 571) +++ stc/Makefile.am (working copy) @@ -6,7 +6,7 @@ entry.hh \ exact.hh \ find_exact.hh \ + scoop.hh \ valist_aggregator.hh \ - vtypes.hh \ \ internal/extract_vtype_from_list.hh

1 0

571: Catch up with changes in the image abstractions hierachies.
by Roland Levillain 26 Sep '06

26 Sep '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with changes in the image abstractions hierachies. * tests/identity_morpher.cc, tests/add_neighborhood_morpher.cc, * tests/morphers.cc: Catch up with changes in the image abstractions hierachies. add_neighborhood_morpher.cc | 7 ++----- identity_morpher.cc | 4 ---- morphers.cc | 9 +-------- 3 files changed, 3 insertions(+), 17 deletions(-) Index: tests/add_neighborhood_morpher.cc --- tests/add_neighborhood_morpher.cc (revision 570) +++ tests/add_neighborhood_morpher.cc (working copy) @@ -48,8 +48,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -58,15 +56,14 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ - typedef oln::morpher::add_neighborhood<image_t, oln::neighb2d> image_with_nbh_t; + typedef oln::neighb2d neighb_t; + typedef oln::morpher::add_neighborhood<image_t, neighb_t> image_with_nbh_t; // Check that the instantiated add_neighborhood morpher realizes the // same interfaces as the underlying morphed image. mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_t, neighborhood), oln::neighb2d) >::check(); Index: tests/morphers.cc --- tests/morphers.cc (revision 570) +++ tests/morphers.cc (working copy) @@ -40,8 +40,6 @@ int main() { - typedef oln::neighb2d neighb_t; - /*----------------. | image2d<char>. | `----------------*/ @@ -52,8 +50,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -62,6 +58,7 @@ | add_neighborhood< image2d<char> >. | `------------------------------------*/ + typedef oln::neighb2d neighb_t; typedef oln::morpher::add_neighborhood<image_t, neighb_t> image_with_nbh_t; // Check that the instantiated neighborhood addition morpher @@ -69,8 +66,6 @@ mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_t, oln::abstract::image_having_neighborhood) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_t, neighborhood), oln::neighb2d) >::check(); @@ -94,8 +89,6 @@ oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_with_nbh_id_t, oln::abstract::image_having_neighborhood) >::check(); - mlc::assert_< mlc_is_a_(image_with_nbh_id_t, - oln::abstract::not_binary_image) >::check(); // Check the type of neighborhood. mlc::assert_< mlc_eq(oln_type_of_(image_with_nbh_id_t, neighborhood), oln::neighb2d) >::check(); Index: tests/identity_morpher.cc --- tests/identity_morpher.cc (revision 570) +++ tests/identity_morpher.cc (working copy) @@ -48,8 +48,6 @@ mlc::assert_< mlc_is_a_(image_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_t, - oln::abstract::not_binary_image) >::check(); image_t ima(42, 51); @@ -65,8 +63,6 @@ mlc::assert_< mlc_is_a_(image_id_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(image_id_t, oln::abstract::grey_level_image) >::check(); - mlc::assert_< mlc_is_a_(image_id_t, - oln::abstract::not_binary_image) >::check(); image_id_t ima_id(ima); }

1 0

570: Dispatch image abstract classes into subdirs and files.
by Thierry GERAUD 26 Sep '06

26 Sep '06

2006-09-26 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Dispatch image abstract classes into subdirs and files. * oln/core/abstract/image/type: New directory. * oln/core/abstract/image/dimension: New directory. * oln/core/abstract/image/neighborhood: New directory. * oln/core/abstract/image_type.hh (internal): Remove. Rename into... * oln/core/abstract/image/type/hierarchy.hh: ...this file. * oln/core/abstract/image_dimension.hh: Rename into... * oln/core/abstract/image/dimension/hierarchy.hh: ...this file. * oln/core/abstract/image_hierarchies.hh: Rename into... * oln/core/abstract/image/hierarchies.hh: ...this file. * oln/core/abstract/image_type_integre.hh: Rename into... * oln/core/abstract/image/type/integre.hh: ...this file. * oln/core/abstract/image_having_neighborhood.hh: Rename into... * oln/core/abstract/image/neighborhood/hierarchy.hh: ...this file. * oln/core/abstract/image.hh (include): Update. * Makefile.am: Update. Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 569) +++ oln/core/abstract/image.hh (working copy) @@ -160,7 +160,7 @@ } // end of namespace oln -# include <oln/core/abstract/image_hierarchies.hh> +# include <oln/core/abstract/image/hierarchies.hh> #endif // ! OLENA_CORE_ABSTRACT_IMAGE_HH Index: oln/core/abstract/image_type.hh =================================================================== --- oln/core/abstract/image_type.hh (revision 569) +++ oln/core/abstract/image_type.hh (working copy) @@ -1,275 +0,0 @@ -// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 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_IMAGE_TYPE_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_HH - -# include <oln/core/abstract/image.hh> - - -/* Image ``type'' hierarchy (summary). - - - /image/ - ^ - | - ,--------------+-------------+-------------+--------+---------. - | | | | | | - /grey_level_image/ /color_image/ /label_image/ /data_image/ ... /not_binary_ - ^ ^ ^ ^ ^ ^ image/ - | | | | | | ^ - | | | /binary_image/ | | | - | | | ^ | | | - | | | | | | | - ,---------------------------------------------------------------------. - | The selection of the super class(es) is made according to the value | - | of type_of(I, value). | - `---------------------------------------------------------------------' - | | | | | | | - o o o o o o o - - o - | - /switch_<image_dimension_type, I>::ret/ - (image type selector) - ^ - | - /entry<abstract::image, I>/ - ^ - | - image_entry - ^ - | - I - (a concrete image) - - - Default case: If no known value type is returned by `oln_type_of(I, value)', - the entry is plugged to abstract::data_image. */ - - -/*--------------------. -| Type abstractions. | -`--------------------*/ - -namespace oln -{ - - namespace abstract - { - - /// \brief Class of grey-level images. - /// - /// An image that contains values whose type is \c int or - /// <tt>unsigned char</tt>, or ntg::int_u<8> (...) is not a - /// grey-level image. - /// - /// FIXME: Say more. - template <typename E> - struct grey_level_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - grey_level_image() {} - }; - - /// Class of color images. - template <typename E> - struct color_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - color_image() {} - }; - - /// \brief Class of images whose data are NOT Boolean values. - /// - /// However such images can derive from abstract::label_image (we - /// can have labels that are not binary ones). - template <typename E> - struct not_binary_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - not_binary_image() {} - }; - - /// \brief Class of images whose data are labels. - /// - /// Such images do not support arithmetics. - template <typename E> - struct label_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - label_image() {} - }; - - /// \brief Class of images whose data are Boolean values. - /// - /// Such images are also oln::abstract::label_image. - template <typename E> - struct binary_image : public label_image<E> - { - protected: - /// Constructor (protected, empty). - binary_image() {} - }; - - /// \brief Class of images whose data cannot be qualified of - /// grey-levels, colors, or labels. - template <typename E> - struct data_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - data_image() {} - }; - - - // -------------------- // - // Conjunctions types. // - // -------------------- // - - namespace internal - { - - /// \brief Conjunctions types - /// - /// These types are helpers to express the inheritance relation - /// ``is a X and not_binary_image''. These abstractions are not - /// to be used by client code (i.e., algorithms), they are only - /// part of the inheritance machinery. - // - /// \{ - - /// Grey-level image and not binary image abstraction. - template <typename E> - struct grey_level_image_ : public grey_level_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - grey_level_image_() {} - }; - - /// Label image and not binary image abstraction. - template <typename E> - struct label_image_ : public label_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - label_image_() {} - }; - - /// Color image and not binary image abstraction. - template <typename E> - struct color_image_ : public color_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - color_image_() {} - }; - - /// Data image and not binary image abstraction. - template <typename E> - struct data_image_ : public data_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - data_image_() {} - }; - - /// \} - - } // end of namespace oln::abstract::internal - - } // end of namespace oln::abstract - -} // end of namespace oln - - -/*--------------. -| Type switch. | -`--------------*/ - -namespace oln -{ - - /// Switch on on the grid dimension. - /// \{ - - // ----------------------------------------------- // - // Cases where the value type is an builtin type. // - // ----------------------------------------------- // - - /// Binary case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 1 > : - where_< mlc::eq_< oln_type_of(E, value), bool > > - { - // Definition of the super class corresponding to this case. - typedef abstract::binary_image<E> ret; - }; - - /// Grey-level case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 2 > : - where_< mlc::or_list_< mlc::eq_<oln_type_of(E, value), char>, - mlc::eq_<oln_type_of(E, value), signed char>, - mlc::eq_<oln_type_of(E, value), unsigned char> > > - { - // Definition of the super class corresponding to this case - // (abstract::grey_level_image_ is the conjunction of - // abstract::grey_level_image and abstract::not_binary_image). - typedef abstract::internal::grey_level_image_<E> ret; - }; - - - // -------------- // - // Default case. // - // -------------- // - - /// Default case: image of ``data''. - template <typename E> - struct default_case_< image_hierarchy_wrt_type, E > - { - // Definition of the super class corresponding to this case - // (abstract::data_image_ is the conjunction of - // abstract::data_image and abstract::not_binary_image). - typedef abstract::internal::data_image_<E> ret; - }; - - /// \} - -} // end of namespace oln - - -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_HH Index: oln/core/abstract/image/type/binary.hh =================================================================== --- oln/core/abstract/image/type/binary.hh (revision 0) +++ oln/core/abstract/image/type/binary.hh (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_TYPE_BINARY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH + +# include <oln/core/abstract/image/type/label.hh> + + +namespace oln +{ + + namespace abstract + { + + /// \brief Class of images whose data are Boolean values. + /// + /// Such images are also oln::abstract::label_image. + template <typename E> + struct binary_image : public label_image<E> + { + protected: + /// Constructor (protected, empty). + binary_image() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_BINARY_HH Index: oln/core/abstract/image/type/data.hh =================================================================== --- oln/core/abstract/image/type/data.hh (revision 0) +++ oln/core/abstract/image/type/data.hh (revision 0) @@ -0,0 +1,54 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_TYPE_DATA_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH + +# include <oln/core/abstract/image.hh> + +namespace oln +{ + + namespace abstract + { + + /// \brief Class of images whose data cannot be qualified of + /// grey-levels, colors, or labels. + template <typename E> + struct data_image : public virtual image<E> + { + protected: + /// Constructor (protected, empty). + data_image() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_DATA_HH Index: oln/core/abstract/image/type/integre.hh =================================================================== --- oln/core/abstract/image/type/integre.hh (revision 0) +++ oln/core/abstract/image/type/integre.hh (working copy) @@ -32,7 +32,7 @@ #ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH # define OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH -# include <oln/core/abstract/image_type.hh> +# include <oln/core/abstract/image/type/hierarchy.hh> // Forward declarations. Index: oln/core/abstract/image/type/grey_level.hh =================================================================== --- oln/core/abstract/image/type/grey_level.hh (revision 0) +++ oln/core/abstract/image/type/grey_level.hh (revision 0) @@ -0,0 +1,60 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_TYPE_GREY_LEVEL_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace abstract + { + + /// \brief Class of grey-level images. + /// + /// An image that contains values whose type is \c int or + /// <tt>unsigned char</tt>, or ntg::int_u<8> (...) is not a + /// grey-level image. + /// + /// FIXME: Say more. + template <typename E> + struct grey_level_image : public virtual image<E> + { + protected: + /// Constructor (protected, empty). + grey_level_image() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_GREY_LEVEL_HH Index: oln/core/abstract/image/type/hierarchy.hh =================================================================== --- oln/core/abstract/image/type/hierarchy.hh (revision 0) +++ oln/core/abstract/image/type/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_HH +#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -37,20 +37,20 @@ /image/ ^ | - ,--------------+-------------+-------------+--------+---------. - | | | | | | - /grey_level_image/ /color_image/ /label_image/ /data_image/ ... /not_binary_ - ^ ^ ^ ^ ^ ^ image/ - | | | | | | ^ - | | | /binary_image/ | | | - | | | ^ | | | - | | | | | | | - ,---------------------------------------------------------------------. - | The selection of the super class(es) is made according to the value | - | of type_of(I, value). | - `---------------------------------------------------------------------' - | | | | | | | - o o o o o o o + ,--------------+-------------+-------------+--------+ + | | | | | + /grey_level_image/ /color_image/ /label_image/ /data_image/ ... + ^ ^ ^ ^ ^ ^ + | | | | | | + | | | /binary_image/ | | + | | | ^ | | + | | | | | | + ,----------------------------------------------------------. + | The selection of the super class(es) is made according | + | to the value of type_of(I, value). | + `----------------------------------------------------------' + | | | | | | + o o o o o o o | @@ -72,150 +72,22 @@ the entry is plugged to abstract::data_image. */ + /*--------------------. | Type abstractions. | `--------------------*/ -namespace oln -{ +# include <oln/core/abstract/image/type/binary.hh> +# include <oln/core/abstract/image/type/color.hh> +# include <oln/core/abstract/image/type/data.hh> +# include <oln/core/abstract/image/type/grey_level.hh> +# include <oln/core/abstract/image/type/label.hh> - namespace abstract - { +// FIXME: do we really want this file? +// # include <oln/core/abstract/image/type/integre.hh> - /// \brief Class of grey-level images. - /// - /// An image that contains values whose type is \c int or - /// <tt>unsigned char</tt>, or ntg::int_u<8> (...) is not a - /// grey-level image. - /// - /// FIXME: Say more. - template <typename E> - struct grey_level_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - grey_level_image() {} - }; - /// Class of color images. - template <typename E> - struct color_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - color_image() {} - }; - /// \brief Class of images whose data are NOT Boolean values. - /// - /// However such images can derive from abstract::label_image (we - /// can have labels that are not binary ones). - template <typename E> - struct not_binary_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - not_binary_image() {} - }; - - /// \brief Class of images whose data are labels. - /// - /// Such images do not support arithmetics. - template <typename E> - struct label_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - label_image() {} - }; - - /// \brief Class of images whose data are Boolean values. - /// - /// Such images are also oln::abstract::label_image. - template <typename E> - struct binary_image : public label_image<E> - { - protected: - /// Constructor (protected, empty). - binary_image() {} - }; - - /// \brief Class of images whose data cannot be qualified of - /// grey-levels, colors, or labels. - template <typename E> - struct data_image : public virtual image<E> - { - protected: - /// Constructor (protected, empty). - data_image() {} - }; - - - // -------------------- // - // Conjunctions types. // - // -------------------- // - - namespace internal - { - - /// \brief Conjunctions types - /// - /// These types are helpers to express the inheritance relation - /// ``is a X and not_binary_image''. These abstractions are not - /// to be used by client code (i.e., algorithms), they are only - /// part of the inheritance machinery. - // - /// \{ - - /// Grey-level image and not binary image abstraction. - template <typename E> - struct grey_level_image_ : public grey_level_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - grey_level_image_() {} - }; - - /// Label image and not binary image abstraction. - template <typename E> - struct label_image_ : public label_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - label_image_() {} - }; - - /// Color image and not binary image abstraction. - template <typename E> - struct color_image_ : public color_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - color_image_() {} - }; - - /// Data image and not binary image abstraction. - template <typename E> - struct data_image_ : public data_image<E>, - public not_binary_image<E> - { - protected: - /// Constructor (protected, empty). - data_image_() {} - }; - - /// \} - - } // end of namespace oln::abstract::internal - - } // end of namespace oln::abstract - -} // end of namespace oln - - /*--------------. | Type switch. | `--------------*/ @@ -246,10 +118,8 @@ mlc::eq_<oln_type_of(E, value), signed char>, mlc::eq_<oln_type_of(E, value), unsigned char> > > { - // Definition of the super class corresponding to this case - // (abstract::grey_level_image_ is the conjunction of - // abstract::grey_level_image and abstract::not_binary_image). - typedef abstract::internal::grey_level_image_<E> ret; + // Definition of the super class corresponding to this case. + typedef abstract::grey_level_image<E> ret; }; @@ -261,10 +131,8 @@ template <typename E> struct default_case_< image_hierarchy_wrt_type, E > { - // Definition of the super class corresponding to this case - // (abstract::data_image_ is the conjunction of - // abstract::data_image and abstract::not_binary_image). - typedef abstract::internal::data_image_<E> ret; + // Definition of the super class corresponding to this case. + typedef abstract::data_image<E> ret; }; /// \} @@ -272,4 +140,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_HH +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH Index: oln/core/abstract/image/type/color.hh =================================================================== --- oln/core/abstract/image/type/color.hh (revision 0) +++ oln/core/abstract/image/type/color.hh (revision 0) @@ -0,0 +1,55 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_TYPE_COLOR_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace abstract + { + + /// Class of color images. + template <typename E> + struct color_image : public virtual image<E> + { + protected: + /// Constructor (protected, empty). + color_image() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_COLOR_HH Index: oln/core/abstract/image/type/label.hh =================================================================== --- oln/core/abstract/image/type/label.hh (revision 0) +++ oln/core/abstract/image/type/label.hh (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_TYPE_LABEL_HH +# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace abstract + { + + /// \brief Class of images whose data are labels. + /// + /// Such images do not support arithmetics. + template <typename E> + struct label_image : public virtual image<E> + { + protected: + /// Constructor (protected, empty). + label_image() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_LABEL_HH Index: oln/core/abstract/image/hierarchies.hh =================================================================== --- oln/core/abstract/image/hierarchies.hh (revision 0) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -49,13 +49,13 @@ // Hierarchy 1: topology w.r.t. dimension. -# include <oln/core/abstract/image_dimension.hh> +# include <oln/core/abstract/image/dimension/hierarchy.hh> // Hierarchy 2: topology w.r.t. type of data. -# include <oln/core/abstract/image_type.hh> +# include <oln/core/abstract/image/type/hierarchy.hh> // Hierarchy 3: topology w.r.t. neighborhood. -# include <oln/core/abstract/image_having_neighborhood.hh> +# include <oln/core/abstract/image/neighborhood/hierarchy.hh> #endif // ! OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/core/abstract/image/dimension/1d.hh =================================================================== --- oln/core/abstract/image/dimension/1d.hh (revision 0) +++ oln/core/abstract/image/dimension/1d.hh (revision 0) @@ -0,0 +1,55 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_DIMENSION_1D_HH +# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH + +# include <oln/core/abstract/image.hh> + +namespace oln +{ + + namespace abstract + { + + /// Class of 1-D images. + template <typename E> + struct image1d : + public virtual image<E>, + public automatic::impl< image1d, oln_type_of(E, morpher), E> + { + protected: + /// Constructor (protected, empty). + image1d() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH Index: oln/core/abstract/image/dimension/2d.hh =================================================================== --- oln/core/abstract/image/dimension/2d.hh (revision 0) +++ oln/core/abstract/image/dimension/2d.hh (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_DIMENSION_2D_HH +# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace abstract + { + + /// Class of 2-D images. + template <typename E> + struct image2d : + public virtual image<E>, + public automatic::impl< image2d, oln_type_of(E, morpher), E> + { + protected: + /// Constructor (protected, empty). + image2d() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH Index: oln/core/abstract/image/dimension/3d.hh =================================================================== --- oln/core/abstract/image/dimension/3d.hh (revision 0) +++ oln/core/abstract/image/dimension/3d.hh (revision 0) @@ -0,0 +1,56 @@ +// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 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_IMAGE_DIMENSION_3D_HH +# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace abstract + { + + /// Class of 3-D images. + template <typename E> + struct image3d : + public virtual image<E>, + public automatic::impl< image3d, oln_type_of(E, morpher), E> + { + protected: + /// Constructor (protected, empty). + image3d() {} + }; + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH Index: oln/core/abstract/image/dimension/hierarchy.hh =================================================================== --- oln/core/abstract/image/dimension/hierarchy.hh (revision 0) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH +#ifndef OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -73,50 +73,11 @@ | Dimension abstractions. | `-------------------------*/ -namespace oln -{ - - namespace abstract - { +# include <oln/core/abstract/image/dimension/1d.hh> +# include <oln/core/abstract/image/dimension/2d.hh> +# include <oln/core/abstract/image/dimension/3d.hh> - /// Class of 1-D images. - template <typename E> - struct image1d : - public virtual image<E>, - public automatic::impl< image1d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image1d() {} - }; - /// Class of 2-D images. - template <typename E> - struct image2d : - public virtual image<E>, - public automatic::impl< image2d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image2d() {} - }; - - /// Class of 3-D images. - template <typename E> - struct image3d : - public virtual image<E>, - public automatic::impl< image3d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image3d() {} - }; - - } // end of namespace oln::abstract - -} // end of namespace oln - - /*-------------------. | Dimension switch. | `-------------------*/ @@ -156,4 +117,4 @@ } -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH Index: oln/core/abstract/image/neighborhood/hierarchy.hh =================================================================== --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 0) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_IMAGE_HAVING_NEIGHBORHOOD_HH -# define OLENA_CORE_ABSTRACT_IMAGE_HAVING_NEIGHBORHOOD_HH +#ifndef OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH +# define OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH # include <oln/core/abstract/image.hh> @@ -95,4 +95,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_HAVING_NEIGHBORHOOD_HH +#endif // ! OLENA_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH Index: oln/core/abstract/image_dimension.hh =================================================================== --- oln/core/abstract/image_dimension.hh (revision 569) +++ oln/core/abstract/image_dimension.hh (working copy) @@ -1,159 +0,0 @@ -// Copyright (C) 2005, 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 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_IMAGE_DIMENSION_HH -# define OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH - -# include <oln/core/abstract/image.hh> - - -/* Image dimension hierarchy (summary). - - - /image/ - ^ - | - ,------------------------+------------------------. - | | | - /image1d/ /image2d/ /image3d/ - ^ ^ ^ - | | | - ,---------------------. ,---------------------. ,---------------------. - | if type_of(I, grid) | | if type_of(I, grid) | | if type_of(I, grid) | - | == grid1d | | == grid2d | | == grid3d | - `---------------------' `---------------------' `---------------------' - | | | - o o o - - o - | - /switch_<image_hierarchy_wrt_dimension, I>::ret/ - (image dimension selector) - ^ - | - /entry<abstract::image, I>/ - ^ - | - image_entry - ^ - | - I - (a concrete image) - - - Default case: If no known grid type is returned by `oln_type_of(I, grid)', - the entry is directly plugged to abstract::image. */ - - -/*-------------------------. -| Dimension abstractions. | -`-------------------------*/ - -namespace oln -{ - - namespace abstract - { - - /// Class of 1-D images. - template <typename E> - struct image1d : - public virtual image<E>, - public automatic::impl< image1d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image1d() {} - }; - - /// Class of 2-D images. - template <typename E> - struct image2d : - public virtual image<E>, - public automatic::impl< image2d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image2d() {} - }; - - /// Class of 3-D images. - template <typename E> - struct image3d : - public virtual image<E>, - public automatic::impl< image3d, oln_type_of(E, morpher), E> - { - protected: - /// Constructor (protected, empty). - image3d() {} - }; - - } // end of namespace oln::abstract - -} // end of namespace oln - - -/*-------------------. -| Dimension switch. | -`-------------------*/ - -namespace oln -{ - - // Forward declarations. - class grid1d; - class grid2d; - class grid3d; - - /// 1-D case. - template <typename E> - struct case_< image_hierarchy_wrt_dimension, E, 1 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid1d > > - { - typedef abstract::image1d<E> ret; - }; - - /// 2-D case. - template <typename E> - struct case_< image_hierarchy_wrt_dimension, E, 2 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid2d > > - { - typedef abstract::image2d<E> ret; - }; - - /// 3-D case. - template <typename E> - struct case_< image_hierarchy_wrt_dimension, E, 3 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid3d > > - { - typedef abstract::image3d<E> ret; - }; - -} - - -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH Index: oln/core/abstract/image_hierarchies.hh =================================================================== --- oln/core/abstract/image_hierarchies.hh (revision 569) +++ oln/core/abstract/image_hierarchies.hh (working copy) @@ -1,61 +0,0 @@ -// 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_IMAGE_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH - -# include <oln/core/abstract/image.hh> - - -namespace oln -{ - - typedef hierarchy<abstract::image, 1> image_hierarchy_wrt_dimension; - typedef hierarchy<abstract::image, 2> image_hierarchy_wrt_type; - typedef hierarchy<abstract::image, 3> image_hierarchy_wrt_neighborhood; - - // FIXME: To be continued. -#if 0 - typedef hierarchy<abstract::image, 4> image_hierarchy_wrt_value; - typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_data_retrieval; - // ... -#endif - -} // end of namespace oln - - -// Hierarchy 1: topology w.r.t. dimension. -# include <oln/core/abstract/image_dimension.hh> - -// Hierarchy 2: topology w.r.t. type of data. -# include <oln/core/abstract/image_type.hh> - -// Hierarchy 3: topology w.r.t. neighborhood. -# include <oln/core/abstract/image_having_neighborhood.hh> - - -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/core/abstract/image_type_integre.hh =================================================================== --- oln/core/abstract/image_type_integre.hh (revision 569) +++ oln/core/abstract/image_type_integre.hh (working copy) @@ -1,145 +0,0 @@ -// 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. - - -// FIXME: Move this file into Integre? Or in a another project, -// serving as a glue between Integre and Olena? - -#ifndef OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH -# define OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH - -# include <oln/core/abstract/image_type.hh> - - -// Forward declarations. -/* FIXME: These are Integre values; should'nt we let Integre add the - necessary cases itself? */ -namespace ntg -{ - class bin; - template <unsigned nbits, typename behavior> class int_u; - template <unsigned nbits, typename behavior> class int_s; - template <typename E> class color_value; - template <typename E> class enum_value; - template <typename E> class real_value; - - /** \brief ``eq'' operator dedicated to ntg::int_u<nbits, behavior> and - ntg::int_s<nbits, behavior>, with nbits a known unsigned (e.g., - int_u<1, behavior>). - - Checking whether value_type is a ntg::int_u<1, behavior> - (behavior being a template parameter) is a bit tricky: we - can't use mlc_eq() since ntg::int_u<1, B> is not a (complete) - type, nor mlc_is_a(), since it is a partially-valued template. - Hence this dedicated approach, used for ntg::int_u and - ntg::int_s. - - (Olena proto-1.0 used to mimic mlc_is_a with its own - machinery, for all kind of value type, which is redundant with - mlc_is_a). - \{ */ - template< template <unsigned, class> class T, unsigned nbits, typename U > - struct eq_ : public mlc::bexpr_<false> - { - }; - - template< template <unsigned, class> class T, unsigned nbits, - typename behavior > - struct eq_< T, nbits, T<nbits, behavior> > : public mlc::bexpr_<true> - { - }; - /** \} */ - -} // end of namespace ntg - - -/*----------------------. -| Type switch (cont.). | -`----------------------*/ - -namespace oln { - - - /// Switch on on the value type. - /// \{ - - // ----------------------------------------------- // - // Cases where the value type is an Integre type. // - // ----------------------------------------------- // - - // (The first cases are located in oln/core/abstract/image_type.hh). - - - /// Binary case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 3 > : - where_< mlc::or_list_< mlc::eq_<oln_type_of(E, value), ntg::bin>, - ntg::eq_<ntg::int_u, 1, oln_type_of(E, value)>, - ntg::eq_<ntg::int_s, 1, oln_type_of(E, value)> > > - { - // Definition of the super class corresponding to this case. - typedef abstract::binary_image<E> ret; - }; - - /// Grey-level case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 4 > : - where_< mlc_is_a( mlc_comma_1(oln_type_of(E, value)), ntg::real_value ) > - { - // Definition of the super class corresponding to this case - // (abstract::grey_level_image_ is the conjunction of - // abstract::grey_level_image and abstract::not_binary_image). - typedef abstract::internal::grey_level_image_<E> ret; - }; - - /// Label case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 5 > : - where_< mlc_is_a( mlc_comma_1(oln_type_of(E, value)), ntg::enum_value ) > - { - // Definition of the super class corresponding to this case - // (abstract::label_image_ is the conjunction of - // abstract::label_image and abstract::not_binary_image). - typedef abstract::internal::label_image_<E> ret; - }; - - /// Color case. - template <typename E> - struct case_< image_hierarchy_wrt_type, E, 6 > : - where_< mlc_is_a( mlc_comma_1(oln_type_of(E, value)), ntg::color_value ) > - { - // Definition of the super class corresponding to this case - // (abstract::color_image_ is the conjunction of - // abstract::color_image and abstract::not_binary_image). - typedef abstract::internal::color_image_<E> ret; - }; - - /// \} - -} // end of namespace oln - -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_TYPE_INTEGRE_HH Index: oln/core/abstract/image_having_neighborhood.hh =================================================================== --- oln/core/abstract/image_having_neighborhood.hh (revision 569) +++ oln/core/abstract/image_having_neighborhood.hh (working copy) @@ -1,98 +0,0 @@ -// 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_IMAGE_HAVING_NEIGHBORHOOD_HH -# define OLENA_CORE_ABSTRACT_IMAGE_HAVING_NEIGHBORHOOD_HH - -# include <oln/core/abstract/image.hh> - -// Automatically-inherited implementations. -# include <oln/automatic/image_having_neighborhood.hh> - - -/* Image having neighborhood hierarchy (summary). - - -FIXME: TODO! - - - Default case: If the neighborhood type returned by - `oln_type_of(I, neighborhood)', the entry is directly plugged to - abstract::image. */ - - -namespace oln -{ - - /*-------------------------. - | Dimension abstractions. | - `-------------------------*/ - - namespace abstract - { - - /// Image having a neighborhood. - template <typename E> - struct image_having_neighborhood : - public virtual image<E>, - public automatic::impl< image_having_neighborhood, - oln_type_of(E, morpher), - E > - { - private: - typedef oln_type_of(E, neighborhood) neighborhood_t; - - public: - neighborhood_t neighborhood() const - { - return this->topo().neighborhood(); - } - - protected: - /// Constructor (protected, empty). - image_having_neighborhood() {} - }; - - } // end of namespace oln::abstract - - - /*-------------------. - | Dimension switch. | - `-------------------*/ - - /// With neighborhood. - template <typename E> - struct case_< image_hierarchy_wrt_neighborhood, E, 1 > : - where_< mlc::neq_< oln_type_of(E, neighborhood), mlc::not_found > > - { - typedef abstract::image_having_neighborhood<E> ret; - }; - -} // end of namespace oln - - -#endif // ! OLENA_CORE_ABSTRACT_IMAGE_HAVING_NEIGHBORHOOD_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 569) +++ oln/Makefile.am (working copy) @@ -30,11 +30,19 @@ core/abstract/entry.hh \ core/abstract/grid.hh \ core/abstract/image.hh \ - core/abstract/image_dimension.hh \ - core/abstract/image_having_neighborhood.hh \ - core/abstract/image_hierarchies.hh \ - core/abstract/image_type.hh \ - core/abstract/image_type_integre.hh \ + core/abstract/image/dimension/1d.hh \ + core/abstract/image/dimension/2d.hh \ + core/abstract/image/dimension/3d.hh \ + core/abstract/image/dimension/hierarchy.hh \ + core/abstract/image/hierarchies.hh \ + core/abstract/image/neighborhood/hierarchy.hh \ + core/abstract/image/type/binary.hh \ + core/abstract/image/type/color.hh \ + core/abstract/image/type/data.hh \ + core/abstract/image/type/grey_level.hh \ + core/abstract/image/type/hierarchy.hh \ + core/abstract/image/type/integre.hh \ + core/abstract/image/type/label.hh \ core/abstract/iterator.hh \ core/abstract/iterator_on_points.hh \ core/abstract/neighborhood.hh \

1 0

569: Clean up ChangeLog.
by Roland Levillain 26 Sep '06

26 Sep '06

Index: ChangeLog =================================================================== --- ChangeLog (révision 568) +++ ChangeLog (révision 569) @@ -1,6 +1,7 @@ 2006-09-26 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>. @@ -9,19 +10,19 @@ 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. - + 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. @@ -59,7 +60,7 @@ 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. @@ -91,7 +92,7 @@ Add convenience shortcuts for stc_{direct_,}check_type_of{_,}. - * oln/core/macros.hh (oln_check_type_of, oln_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. @@ -122,7 +123,7 @@ Add image point iterators parameterized by the image topology; factor code into an internal class. - + * oln/core/gen/bbox_fwd_piter.hh: Change inheritance and move methods into... * oln/core/internal/bbox_fwd_piter.hh: ...this new class. @@ -131,7 +132,7 @@ * oln/core/internal/bbox_bkd_piter.hh: ...this new class. * oln/core/gen/fwd_piter_bbox.hh: New. * oln/core/gen/bkd_piter_bbox.hh: New. - + 2006-09-20 Roland Levillain <roland(a)lrde.epita.fr> Fix the identity and neighborhood addition morphers. @@ -222,7 +223,7 @@ (image_value_hierarchy, image_rawness_hierarchy): Adjust and rename as... (image_hierarchy_wrt_value, image_hierarchy_wrt_data_retrieval): - ...this. + ...this. (oln/core/abstract/image_having_neighborhood.hh): Include it. * oln/core/abstract/image_dimension.hh: s/image_dimension_hierarchy/image_hierarchy_wrt_dimension/. @@ -257,7 +258,7 @@ 2006-09-18 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Rename bbox point iterators. - + * oln/core/abstract/iterator_on_points.hh (p_): Remove. Abstract classes should not have attributes. (to_point): Turn abstract. @@ -273,7 +274,7 @@ 2006-09-18 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Move some abstract classes below entries into internal. - + * oln/core/abstract/point_nd.hh: Update and rename as... * oln/core/internal/point_nd.hh: ...this. * oln/core/abstract/dpoint_nd.hh: Update and rename as... @@ -290,11 +291,11 @@ * oln/core/2d/dpoint2d.hh: Update. * oln/core/2d/point2d.hh: Update. * oln/core/gen/bbox.hh: Update. - + 2006-09-18 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Rename point set related classes. - + * oln/core/pset_entry.hh: Update and rename as... * oln/core/point_set_entry.hh: ...this. * oln/core/abstract/pset_fixed.hh: Update and rename as... @@ -324,7 +325,7 @@ 2006-09-18 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add oln topology class for enlarged bbox. - + * oln/core/gen/topo_lbbox.hh: New. * oln/core/abstract/dpoint_nd.hh (set_all): New. * oln/core/gen/topo_bbox.hh (impl_has_large): New. @@ -332,7 +333,7 @@ 2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Adapt topology hierarchy to new naming convention. - + * oln/core/topo_entry.hh: Rename into... * oln/core/topology_entry.hh: ...this. * oln/core/abstract/topo.hh: Rename into... @@ -353,7 +354,7 @@ 2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add operator- to n-dimensional dpoint types. - + * oln/core/traits_id.hh (op_uminus_dpointnd): New. * oln/core/abstract/dpoint_nd.hh (operator-): New. (impl_less): New. @@ -473,7 +474,7 @@ * oln/core/abstract/image.hh (oln::category::grid): Remove declaration. * oln/core/abstract/grid.hh - (oln::packed_vtypes_in_category<category::grid, G>): + (oln::packed_vtypes_in_category<category::grid, G>): (oln::grid::~grid): Remove dtor. (oln::category::grid): Remove declaration. @@ -537,7 +538,7 @@ 2006-09-07 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add image2d and fix topo-related classes. - + * tests/npoints.cc: New. * tests/Makefile.am: Update. * oln/core/image_entry.hh: New. @@ -569,7 +570,7 @@ 2006-09-07 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Start the topology hierarchy. - + * oln/core/topo_entry.hh: New. * oln/core/abstract/topo.hh: New. * oln/core/abstract/topo_hierarchies.hh: New. @@ -579,7 +580,7 @@ * oln/core/2d/aliases.hh (topo2d): New. Add a new sub-hierarchy to abstract::pset. - + * oln/core/abstract/pset_cnx.hh: New. * oln/core/typedefs.hh (cnx_type): New. * oln/core/abstract/pset_hierarchies.hh (pset_cnx_hierarchy): New. @@ -593,7 +594,7 @@ 2006-09-06 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Update abstract::pset hierarchy to final SCOOP-2 design. - + * oln/core/pset_entry.hh: New. * oln/core/typedefs.hh: Include oln/core/abstract/entry.hh. * oln/core/abstract/bbox.hh: Clean includes. @@ -610,11 +611,11 @@ (pset_fixed_hierarchy, pset_ra_hierarchy, pset_bboxed_hierarchy) (case_): Move to... * oln/core/abstract/pset_hierarchies.hh: ...this new file. - + 2006-09-05 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> - Test on abstract::pset alternative code for static inheritance. - + Test on abstract::pset alternative code for static inheritance. + * oln/core/abstract/entry.hh: New proposition for entry class in static hierarchies. This is a test file that should be removed after stc update. @@ -642,7 +643,7 @@ New hierarchy tags. * oln/core/gen/bbox.hh: Update. (operator=): New. - + 2006-09-04 Roland Levillain <roland(a)lrde.epita.fr> Adjust virtual types class names. @@ -707,7 +708,7 @@ 2006-09-01 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add bboxes and iterators. - + * oln/core/abstract/piter.hh: New. * oln/core/abstract/bbox.hh: New. * oln/core/abstract/iter.hh: New. @@ -732,7 +733,7 @@ 2006-08-31 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add dpoint, oln traits, and operators on point/dpoint. - + * oln/core/type.hh: New. * oln/core/traits_id.hh: New. * oln/core/abstract/dpoint.hh: New. @@ -758,11 +759,11 @@ (point2d): New ctor. (coord): Rename as... (coord_t): ...this. - + 2006-08-30 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Start point hierarchy. - + * oln/core/typedefs.hh (oln_type_of): New macro. (dim_type): New typedef decl. * oln/core/abstract/point.hh: New. @@ -933,4 +934,3 @@ * oln/core/abstract/macros.hh: New file. * tests/image_entry.cc: New test. * Makefile.am, oln/Makefile.am, tests/Makefile.am: New files. -

1 0