Olena-patches October 2006

olena-patches@lrde.epita.fr

3 participants
108 discussions

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Reorganize and fix oln/core/1d/. * oln/core/1d/aliases.hh (oln::fwd_piter1d, oln::bkd_piter1d): Fix their definitions. * oln/core/1d/neighb1d.hh (oln::c2): Rename as... (oln::mk_c2): ...this. (c2): New object. * oln/core/1d/array1d.hh, oln/core/1d/dpoint1d.hh, * oln/core/1d/image1d.hh, oln/core/1d/neighb1d.hh, * oln/core/1d/point1d.hh: Separate the interface of the methods and functions from their implementation. * oln/core/1d/image1d.hh (oln::vtypes< image1d<T> >): Set topo_type to topo1d. (bbox_<point1d>): Move explicit instantiation... * oln/basics1d.hh: ...here (oln/core/fwd_piter.hh): Include it. * oln/core/1d/image1d.hh: Move the definition of the virtual types fwd_piter and bkd_piter of oln::image1d... * oln/core/fwd_piter.hh: ...here. * oln/core/abstract/image/hybrid/classical.hh (oln::abstract:classical_1d_image) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 1>) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 2>): Rename as... (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 2>) (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 3>): ...these. (oln::case_<image_hybrid_hierarchy_wrt_classical, E, 1>): New. Handle 1D case. basics1d.hh | 9 +++- core/1d/aliases.hh | 5 -- core/1d/array1d.hh | 70 ++++++++++++++++++++++--------- core/1d/dpoint1d.hh | 37 ++++++++++++---- core/1d/image1d.hh | 72 +++++++++++++++++++++++--------- core/1d/neighb1d.hh | 26 +++++++++++ core/1d/point1d.hh | 44 +++++++++++++++---- core/abstract/image/hybrid/classical.hh | 33 +++++++++++++- core/fwd_piter.hh | 17 +++++++ 9 files changed, 249 insertions(+), 64 deletions(-) Index: oln/core/1d/aliases.hh --- oln/core/1d/aliases.hh (revision 622) +++ oln/core/1d/aliases.hh (working copy) @@ -55,14 +55,13 @@ typedef bbox_<point1d> bbox1d; typedef topo_lbbox_<point1d> topo1d; - typedef fwd_piter_bbox_<topo1d> fwd_piter1d; - typedef bkd_piter_bbox_<topo1d> bkd_piter1d; + typedef fwd_piter_bbox_<point1d> fwd_piter1d; + typedef bkd_piter_bbox_<point1d> bkd_piter1d; typedef point1d_<float> point1df; typedef dpoint1d_<float> dpoint1df; /// \} - } // end of namespace oln Index: oln/core/1d/neighb1d.hh --- oln/core/1d/neighb1d.hh (revision 622) +++ oln/core/1d/neighb1d.hh (working copy) @@ -36,7 +36,15 @@ namespace oln { - neighb1d c2() + namespace internal + { + + neighb1d mk_c2(); + + +# ifndef OLN_INCLUDE_ONLY + + neighb1d mk_c2() { static bool flower = true; static neighb1d the_; @@ -48,6 +56,22 @@ return the_; } +# endif + + + } // end of namespace oln::internal + + + extern const neighb1d c2; + + +# ifndef OLN_INCLUDE_ONLY + + const neighb1d c2 = internal::mk_c2(); + +# endif + + } // end of namespace oln Index: oln/core/1d/array1d.hh --- oln/core/1d/array1d.hh (revision 622) +++ oln/core/1d/array1d.hh (working copy) @@ -43,7 +43,38 @@ public: /// Ctor. - array1d(coord_t min, coord_t max) : + array1d(coord_t min, coord_t max); + /// Ctor. + array1d(coord_t len); + + /// Dtor. + ~array1d(); + + value_t operator()(coord_t i) const; + value_t& operator()(coord_t i); + + bool has(coord_t i) const; + + size_t memsize() const; + + protected: + + coord_t min_, max_; + coord_t len_; + value_t* buffer_; + + private: + + void allocate_(); + void deallocate_(); + }; + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename value_t, typename coord_t> + array1d<value_t, coord_t>::array1d(coord_t min, coord_t max) : min_(min), max_(max) { precondition(max >= min); @@ -51,8 +82,8 @@ allocate_(); } - /// Ctor. - array1d(coord_t len) : + template <typename value_t, typename coord_t> + array1d<value_t, coord_t>::array1d(coord_t len) : min_(0), len_(len) { precondition(len > 0); @@ -60,55 +91,54 @@ allocate_(); } - /// Dtor. - ~array1d() + template <typename value_t, typename coord_t> + array1d<value_t, coord_t>::~array1d() { deallocate_(); } - value_t operator()(coord_t i) const + template <typename value_t, typename coord_t> + value_t array1d<value_t, coord_t>::operator()(coord_t i) const { precondition(has(i)); return buffer_[i - min_]; } - value_t& operator()(coord_t i) + template <typename value_t, typename coord_t> + value_t& array1d<value_t, coord_t>::operator()(coord_t i) { precondition(has(i)); return buffer_[i - min_]; } - bool has(coord_t i) const + template <typename value_t, typename coord_t> + bool array1d<value_t, coord_t>::has(coord_t i) const { return i >= min_ and i <= max_; } - size_t memsize() const + template <typename value_t, typename coord_t> + size_t array1d<value_t, coord_t>::memsize() const { return size_t(len_) * sizeof(value_t); } - protected: - - coord_t min_, max_; - coord_t len_; - value_t* buffer_; - - private: - - void allocate_() + template <typename value_t, typename coord_t> + void array1d<value_t, coord_t>::allocate_() { buffer_ = new value_t[size_t(len_)]; } - void deallocate_() + template <typename value_t, typename coord_t> + void array1d<value_t, coord_t>::deallocate_() { precondition(buffer_ != 0); delete[] buffer_; buffer_ = 0; // safety } - }; + +# endif } // end of namespace oln Index: oln/core/1d/dpoint1d.hh --- oln/core/1d/dpoint1d.hh (revision 622) +++ oln/core/1d/dpoint1d.hh (working copy) @@ -68,36 +68,57 @@ { typedef dpoint1d_<C> self_t; typedef stc_get_super(dpoint1d_<C>) super_t; - typedef oln_type_of(self_t, coord) coord_t; using super_t::v_; public: /// Ctor. - dpoint1d_() + dpoint1d_(); + + /// Ctor. + dpoint1d_(const xtd::vec<1,C>& v); + + /// Ctor. + dpoint1d_(C index); + + C index() const; + C& index(); + }; + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename C> + dpoint1d_<C>::dpoint1d_() { } /// Ctor. - dpoint1d_(const xtd::vec<1,coord_t>& v) + template <typename C> + dpoint1d_<C>::dpoint1d_(const xtd::vec<1,C>& v) : super_t(v) { } /// Ctor. - dpoint1d_(coord_t index) + template <typename C> + dpoint1d_<C>::dpoint1d_(C index) : super_t(xtd::mk_vec(index)) { } - coord_t index() const { return v_[0]; } - coord_t& index() { return v_[0]; } - }; + template <typename C> + C dpoint1d_<C>::index() const { return v_[0]; } + template <typename C> + C& dpoint1d_<C>::index() { return v_[0]; } + +# endif -} // end of namespace oln +} // end of namespace oln #endif // ! OLN_CORE_1D_DPOINT1D_HH Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 622) +++ oln/core/1d/image1d.hh (working copy) @@ -36,16 +36,14 @@ # include <oln/core/internal/tracked_ptr.hh> // For topo1d. # include <oln/core/1d/aliases.hh> +// For fwd_piter and bkd_piter virtual types. +// FIXME: Really necessary? +# include <oln/core/fwd_piter.hh> namespace oln { - // FIXME: Inexplicably, this explicit instantiation is required to - // have topo_lbbox_<point1d> work. See if we can get rid of it. - template class bbox_<point1d>; - - // Forward declaration. template <typename T> class image1d; @@ -54,14 +52,11 @@ template <typename T> struct vtypes< image1d<T> > { - typedef topo_lbbox_<point1d> topo_type; + typedef topo1d topo_type; typedef grid1d grid_type; typedef point1d point_type; - typedef fwd_piter_bbox_<topo_type> fwd_piter_type; - typedef bkd_piter_bbox_<topo_type> bkd_piter_type; - typedef T value_type; typedef T lvalue_type; typedef mlc::true_ is_mutable_type; @@ -89,45 +84,84 @@ public: /// Ctor using sizes. - image1d(unsigned nindices, unsigned border = 2) + image1d(unsigned nindices, unsigned border = 2); + + /// Ctor using an existing topology. + image1d(const topo1d& topo); + + const topo1d& impl_topo() const; + + T impl_op_read(const point1d& p) const; + T& impl_op_readwrite(const point1d& p); + + T* adr_at(int index); + const T* adr_at(int index) const; + + private: + + topo1d topo_; + internal::tracked_ptr<array_t> data_; + }; + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename T> + image1d<T>::image1d(unsigned nindices, unsigned border) : topo_(bbox1d(point1d(0), point1d(nindices - 1)), border), data_(new array_t(0 - border, nindices - 1 + border)) { } - /// Ctor using an existing topology. - image1d(const topo1d& topo) + template <typename T> + image1d<T>::image1d(const topo1d& topo) : topo_(topo), data_(new array_t(topo.bbox().pmin().index(), topo.bbox().pmax().index())) { } - const topo1d& impl_topo() const + template <typename T> + const topo1d& image1d<T>::impl_topo() const { return topo_; } - T impl_op_read(const point1d& p) const + template <typename T> + T image1d<T>::impl_op_read(const point1d& p) const { precondition(data_ != 0); precondition(topo_.has_large(p)); return data_->operator()(p.index()); } - T& impl_op_readwrite(const point1d& p) + template <typename T> + T& image1d<T>::impl_op_readwrite(const point1d& p) { precondition(data_ != 0); precondition(topo_.has_large(p)); return data_->operator()(p.index()); } - private: + template <typename T> + T* image1d<T>::adr_at(int index) + { + precondition(data_ != 0); + precondition(data_->has(index)); + return &(data_->operator()(index)); + } - topo1d topo_; - internal::tracked_ptr<array_t> data_; - }; + template <typename T> + const T* image1d<T>::adr_at(int index) const + { + precondition(data_ != 0); + precondition(data_->has(index)); + return &(data_->operator()(index)); + } + +# endif } // end of namespace oln Index: oln/core/1d/point1d.hh --- oln/core/1d/point1d.hh (revision 622) +++ oln/core/1d/point1d.hh (working copy) @@ -76,32 +76,58 @@ { typedef point1d_<C> self_t; typedef stc_get_super(point1d_<C>) super_t; - typedef oln_type_of(self_t, coord) coord_t; using super_t::v_; public: /// Ctor. - point1d_() + point1d_(); + + /// Ctor. + point1d_(C index); + + /// Ctor. + point1d_(const xtd::vec<1,C>& v); + + /// Dtor. + ~point1d_() { } - /// Ctor. - point1d_(coord_t index) + C index() const; + C& index(); + }; + + + +# ifndef OLN_INCLUDE_ONLY + + + template <typename C> + point1d_<C>::point1d_() + { + } + + template <typename C> + point1d_<C>::point1d_(C index) : super_t (xtd::mk_vec(index)) { } - /// Ctor. - point1d_(const xtd::vec<1,coord_t>& v) + template <typename C> + point1d_<C>::point1d_(const xtd::vec<1,C>& v) : super_t(v) { } - coord_t index() const { return v_[0]; } - coord_t& index() { return v_[0]; } - }; + template <typename C> + C point1d_<C>::index() const { return v_[0]; } + + template <typename C> + C& point1d_<C>::index() { return v_[0]; } + +# endif } // end of namespace oln Index: oln/basics1d.hh --- oln/basics1d.hh (revision 622) +++ oln/basics1d.hh (working copy) @@ -35,15 +35,18 @@ # include <oln/core/1d/grid1d.hh> # include <oln/core/1d/point1d.hh> - # include <oln/core/1d/dpoint1d.hh> # include <oln/core/gen/bbox.hh> +// FIXME: Inexplicably, this explicit instantiation is required to +// have topo_lbbox_<point1d> work. See if we can get rid of it. +namespace oln { + template class bbox_<point1d>; +} # include <oln/core/gen/topo_lbbox.hh> # include <oln/core/gen/fwd_piter_bbox.hh> - # include <oln/core/gen/bkd_piter_bbox.hh> # include <oln/core/gen/neighb.hh> @@ -51,5 +54,7 @@ # include <oln/core/1d/image1d.hh> +# include <oln/core/fwd_piter.hh> + #endif // ! OLN_BASICS1D_HH Index: oln/core/fwd_piter.hh --- oln/core/fwd_piter.hh (revision 622) +++ oln/core/fwd_piter.hh (working copy) @@ -111,6 +111,23 @@ }; + // image1d<T> + + template <typename T> class image1d; + + template <typename T> + struct single_vtype< image1d<T>, typedef_::fwd_piter_type > + { + typedef fwd_piter1d ret; + }; + + template <typename T> + struct single_vtype< image1d<T>, typedef_::bkd_piter_type > + { + typedef bkd_piter1d ret; + }; + + // image2d<T> template <typename T> class image2d; Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 622) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -31,6 +31,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> +# include <oln/core/abstract/image/dimension/1d.hh> # include <oln/core/abstract/image/dimension/2d.hh> # include <oln/core/abstract/image/bbox/hierarchy.hh> # include <oln/core/abstract/image/accessibility/hierarchy.hh> @@ -52,6 +53,15 @@ }; template <typename E> + struct classical_1d_image + : public virtual abstract::classical_image<E>, + public virtual abstract::image1d<E> + { + protected: + classical_1d_image(); + }; + + template <typename E> struct classical_2d_image : public virtual abstract::classical_image<E>, public virtual abstract::image2d<E> @@ -69,6 +79,11 @@ } template <typename E> + classical_1d_image<E>::classical_1d_image() + { + } + + template <typename E> classical_2d_image<E>::classical_2d_image() { } @@ -79,12 +94,26 @@ // Fwd. decl. + class grid1d; class grid2d; - /// 2-D case. + /// 1D case. template <typename E> struct case_< image_hybrid_hierarchy_wrt_classical, E, 1 > : + where_< mlc::and_list_< mlc::eq_< oln_type_of(E, grid), oln::grid1d >, + mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ >, + mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > + > + > + { + typedef abstract::classical_1d_image<E> ret; + }; + + + /// 2D case. + template <typename E> + struct case_< image_hybrid_hierarchy_wrt_classical, E, 2 > : where_< mlc::and_list_< mlc::eq_< oln_type_of(E, grid), oln::grid2d >, mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ >, mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > @@ -97,7 +126,7 @@ /// General case. template <typename E> - struct case_< image_hybrid_hierarchy_wrt_classical, E, 2 > : + struct case_< image_hybrid_hierarchy_wrt_classical, E, 3 > : where_< mlc::and_< mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ >, mlc::neq_< oln_deduce_type_of(E, topo, bbox), mlc::not_found > >

17 years, 7 months

622: Aesthetic changes.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/core/abstract/image/dimension/1d.hh * oln/core/abstract/image/dimension/2d.hh * oln/core/abstract/image/dimension/3d.hh * oln/core/abstract/image/dimension/hierarchy.hh * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh, oln/core/2d/array2d.hh, * oln/core/2d/dpoint2d.hh, oln/core/2d/point2d.hh, * tests/image1d.cc, tests/image2d.cc, tests/image3d.cc, * tests/image_entry.cc, tests/io_pnm.cc, tests/Makefile.am: Aesthetic changes. oln/core/1d/grid1d.hh | 2 +- oln/core/2d/array2d.hh | 9 +-------- oln/core/2d/dpoint2d.hh | 1 + oln/core/2d/grid2d.hh | 2 +- oln/core/2d/point2d.hh | 5 ----- oln/core/3d/grid3d.hh | 2 +- oln/core/abstract/image/dimension/1d.hh | 2 +- oln/core/abstract/image/dimension/2d.hh | 2 +- oln/core/abstract/image/dimension/3d.hh | 2 +- oln/core/abstract/image/dimension/hierarchy.hh | 6 +++--- tests/Makefile.am | 4 +++- tests/image1d.cc | 6 +++--- tests/image2d.cc | 6 +++--- tests/image3d.cc | 6 +++--- tests/image_entry.cc | 2 +- tests/io_pnm.cc | 1 - 16 files changed, 24 insertions(+), 34 deletions(-) Index: oln/core/abstract/image/dimension/1d.hh --- oln/core/abstract/image/dimension/1d.hh (revision 621) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -37,7 +37,7 @@ namespace abstract { - /// Class of 1-D images. + /// Class of 1D images. template <typename E> struct image1d : public virtual image<E>, Index: oln/core/abstract/image/dimension/2d.hh --- oln/core/abstract/image/dimension/2d.hh (revision 621) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -37,7 +37,7 @@ namespace abstract { - /// Class of 2-D images. + /// Class of 2D images. template <typename E> struct image2d : public virtual image<E>, Index: oln/core/abstract/image/dimension/3d.hh --- oln/core/abstract/image/dimension/3d.hh (revision 621) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -37,7 +37,7 @@ namespace abstract { - /// Class of 3-D images. + /// Class of 3D images. template <typename E> struct image3d : public virtual image<E>, Index: oln/core/abstract/image/dimension/hierarchy.hh --- oln/core/abstract/image/dimension/hierarchy.hh (revision 621) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -91,7 +91,7 @@ class grid2d; class grid3d; - /// 1-D case. + /// 1D case. template <typename E> struct case_< image_hierarchy_wrt_dimension, E, 1 > : where_< mlc::eq_< oln_type_of(E, grid), oln::grid1d > > @@ -99,7 +99,7 @@ typedef abstract::image1d<E> ret; }; - /// 2-D case. + /// 2D case. template <typename E> struct case_< image_hierarchy_wrt_dimension, E, 2 > : where_< mlc::eq_< oln_type_of(E, grid), oln::grid2d > > @@ -107,7 +107,7 @@ typedef abstract::image2d<E> ret; }; - /// 3-D case. + /// 3D case. template <typename E> struct case_< image_hierarchy_wrt_dimension, E, 3 > : where_< mlc::eq_< oln_type_of(E, grid), oln::grid3d > > Index: oln/core/1d/grid1d.hh --- oln/core/1d/grid1d.hh (revision 621) +++ oln/core/1d/grid1d.hh (working copy) @@ -48,7 +48,7 @@ typedef mlc::uint_<1> dimvalue_type; }; - /// A 1-dimension grid. + /// A 1D grid. struct grid1d : public stc_get_supers(grid1d) { protected: Index: oln/core/2d/grid2d.hh --- oln/core/2d/grid2d.hh (revision 621) +++ oln/core/2d/grid2d.hh (working copy) @@ -48,7 +48,7 @@ typedef mlc::uint_<2> dimvalue_type; }; - /// A 2-dimension rectangular grid. + /// A 2D rectangular grid. struct grid2d : public stc_get_supers(grid2d) { protected: Index: oln/core/3d/grid3d.hh --- oln/core/3d/grid3d.hh (revision 621) +++ oln/core/3d/grid3d.hh (working copy) @@ -47,7 +47,7 @@ typedef mlc::uint_<3> dimvalue_type; }; - /// A 3-dimension cubic grid. + /// A 3D cubic grid. struct grid3d : public stc_get_supers(grid3d) { protected: Index: oln/core/2d/array2d.hh --- oln/core/2d/array2d.hh (revision 621) +++ oln/core/2d/array2d.hh (working copy) @@ -43,9 +43,7 @@ public: /// Ctor. - array2d(coord_t imin, coord_t jmin, - coord_t imax, coord_t jmax); - + array2d(coord_t imin, coord_t jmin, coord_t imax, coord_t jmax); /// Ctor. array2d(coord_t ilen, coord_t jlen); @@ -53,7 +51,6 @@ ~array2d(); value_t operator()(coord_t i, coord_t j) const; - value_t& operator()(coord_t i, coord_t j); bool has(coord_t i, coord_t j) const; @@ -70,13 +67,11 @@ private: void allocate_(); - void deallocate_(); }; - # ifndef OLN_INCLUDE_ONLY template <typename value_t, typename coord_t> @@ -94,7 +89,6 @@ } template <typename value_t, typename coord_t> - /// Ctor. array2d<value_t, coord_t>::array2d(coord_t ilen, coord_t jlen) : imin_(0), jmin_(0), @@ -108,7 +102,6 @@ } template <typename value_t, typename coord_t> - /// Dtor. array2d<value_t, coord_t>::~array2d() { deallocate_(); Index: oln/core/2d/dpoint2d.hh --- oln/core/2d/dpoint2d.hh (revision 621) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -91,6 +91,7 @@ }; + # ifndef OLN_INCLUDE_ONLY template <typename C> Index: oln/core/2d/point2d.hh --- oln/core/2d/point2d.hh (revision 621) +++ oln/core/2d/point2d.hh (working copy) @@ -124,11 +124,6 @@ { } -// template <typename C> -// point2d_<C>::~point2d_() -// { -// } - template <typename C> C point2d_<C>::row() const { return v_[0]; } Index: tests/image1d.cc --- tests/image1d.cc (revision 621) +++ tests/image1d.cc (working copy) @@ -36,18 +36,18 @@ int main() { - // Fill a 1-d image using its iterator. + // Fill a 1D image using its iterator. oln::image1d<char> ima1(3); oln_type_of_(oln::image1d<char>, piter) p1(ima1.topo()); for_all(p1) ima1(p1) = 1; - // Fill a 1-d image using a classic loop. + // Fill a 1D image using a classic loop. oln::image1d<int> ima2(ima1.topo()); for (unsigned i = 0; i < 3; ++i) ima2(oln::point1d(i)) = 2; - // Fill a 1-d image using the routine oln::level::fill. + // Fill a 1D image using the routine oln::level::fill. oln::image1d<long> ima3(ima1.topo()); oln::level::fill(ima3, 3); Index: tests/image2d.cc --- tests/image2d.cc (revision 621) +++ tests/image2d.cc (working copy) @@ -36,19 +36,19 @@ int main() { - // Fill a 2-d image using its iterator. + // Fill a 2D image using its iterator. oln::image2d<char> ima1(3, 3); oln_type_of_(oln::image2d<char>, piter) p1(ima1.topo()); for_all(p1) ima1(p1) = 1; - // Fill a 2-d image using a classic loop. + // Fill a 2D image using a classic loop. oln::image2d<int> ima2(ima1.topo()); for (unsigned i = 0; i < 3; ++i) for (unsigned j = 0; j < 3; ++j) ima2(oln::point2d(i, j)) = 2; - // Fill a 2-d image using the routine oln::level::fill. + // Fill a 2D image using the routine oln::level::fill. oln::image2d<long> ima3(ima1.topo()); oln::level::fill(ima3, 3); Index: tests/image3d.cc --- tests/image3d.cc (revision 621) +++ tests/image3d.cc (working copy) @@ -36,20 +36,20 @@ int main() { - // Fill a 3-d image using its iterator. + // Fill a 3D image using its iterator. oln::image3d<char> ima1(3, 3, 3); oln_type_of_(oln::image3d<char>, piter) p1(ima1.topo()); for_all(p1) ima1(p1) = 1; - // Fill a 3-d image using a classic loop. + // Fill a 3D image using a classic loop. oln::image3d<int> ima2(ima1.topo()); for (unsigned i = 0; i < 3; ++i) for (unsigned j = 0; j < 3; ++j) for (unsigned k = 0; k < 3; ++k) ima2(oln::point3d(i, j, k)) = 2; - // Fill a 3-d image using the routine oln::level::fill. + // Fill a 3D image using the routine oln::level::fill. oln::image3d<long> ima3(ima1.topo()); oln::level::fill(ima3, 3); Index: tests/image_entry.cc --- tests/image_entry.cc (revision 621) +++ tests/image_entry.cc (working copy) @@ -72,7 +72,7 @@ namespace my { - // A very simple 1-D image. + // A very simple 1D image. class image : public oln::get_super_types<my::image>::ret { public: Index: tests/io_pnm.cc --- tests/io_pnm.cc (revision 621) +++ tests/io_pnm.cc (working copy) @@ -34,7 +34,6 @@ int main() { - // Fill a 2-d image using its iterator. oln::image2d<bool> ima = oln::io::load_pbm("../img/chien.pbm"); oln::image2d<unsigned char> ima2 = oln::io::load_pgm("../img/lena32.pgm"); } Index: tests/Makefile.am --- tests/Makefile.am (revision 621) +++ tests/Makefile.am (working copy) @@ -46,6 +46,9 @@ npoints_SOURCES = npoints.cc window2d_SOURCES = window2d.cc +# I/O. +io_pnm_SOURCES = io_pnm.cc + # Morphers. identity_morpher_SOURCES = identity_morpher.cc add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc @@ -53,7 +56,6 @@ # Algorithms. fill_SOURCES = fill.cc -io_pnm_SOURCES = io_pnm.cc TESTS = $(check_PROGRAMS)

17 years, 7 months

621: Add static assertions to oln::topo_bbox_ and oln::topo_lbbox_.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add static assertions to oln::topo_bbox_ and oln::topo_lbbox_. * oln/core/gen/topo_bbox.hh (oln::topo_bbox_<point>) * oln/core/gen/topo_lbbox.hh (oln::topo_lbbox_<point>): Ensure parameter point is an oln::abstract::point. topo_bbox.hh | 4 +++- topo_lbbox.hh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) Index: oln/core/gen/topo_bbox.hh --- oln/core/gen/topo_bbox.hh (revision 620) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -60,7 +60,9 @@ /// Bounding box topology based on a point class. template <typename point> - class topo_bbox_ : public topology_entry< topo_bbox_<point> > + class topo_bbox_ : + public topology_entry< topo_bbox_<point> >, + private mlc::assert_< mlc_is_a(point, abstract::point) > { typedef topo_bbox_<point> self_t; typedef topology_entry<self_t> super_t; Index: oln/core/gen/topo_lbbox.hh --- oln/core/gen/topo_lbbox.hh (revision 620) +++ oln/core/gen/topo_lbbox.hh (working copy) @@ -62,7 +62,9 @@ /// Bounding box topology based on a point class. template <typename point> - class topo_lbbox_ : public topology_entry< topo_lbbox_<point> > + class topo_lbbox_ : + public topology_entry< topo_lbbox_<point> >, + private mlc::assert_< mlc_is_a(point, abstract::point) > { typedef bbox_<point> bbox_t;

17 years, 7 months

620: Add new facilities to access to components such as row, col, etc.

by Thierry GERAUD

2006-10-11 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add new facilities to access to components such as row, col, etc. * oln/core/spe/row.hh: New. * oln/core/spe/col.hh: New. * oln/core/spe/slice.hh: New. * oln/debug/print.hh (print): Use min_row, etc. (include): Update. * oln/core/typedefs.hh (index_comp_type): New. (row_comp_type, col_comp_type, slice_comp_type): New. (vec_type): New. * oln/core/abstract/iterator_on_points.hh (coord_type): New. * oln/core/abstract/point.hh (vec_type): New. (vec): New. * oln/core/1d/dpoint1d.hh (index_comp_type): New. * oln/core/1d/point1d.hh (index_comp_type): New. * oln/core/2d/dpoint2d.hh (row_comp_type, col_comp_type): New. * oln/core/2d/point2d.hh (row_comp_type, col_comp_type): New. * oln/core/3d/dpoint3d.hh (slice_comp_type, row_comp_type, col_comp_type): New. * oln/core/3d/point3d.hh (slice_comp_type, row_comp_type, col_comp_type): New. * oln/core/internal/point_nd.hh (vec_t): New. (vec): Rename as... (impl_vec): this. * oln/basics2d.hh (include): Update. * oln/basics3d.hh (include): Update. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: oln/debug/print.hh =================================================================== --- oln/debug/print.hh (revision 619) +++ oln/debug/print.hh (working copy) @@ -32,6 +32,8 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hybrid/classical.hh> # include <oln/core/abstract/iterator.hh> +# include <oln/core/spe/row.hh> +# include <oln/core/spe/col.hh> # include <oln/core/2d/point2d.hh> @@ -50,6 +52,7 @@ template <typename I> void println(const abstract::image& input, std::ostream& ostr = std::cout); + # ifndef OLN_INCLUDE_ONLY namespace impl @@ -82,9 +85,9 @@ void print(const abstract::classical_2d_image& input, std::ostream& ostr) { - for (int row = input.pmin().row(); row <= input.pmax().row(); ++row) + for (int row = min_row(input); row <= max_row(input); ++row) { - for (int col = input.pmin().col(); col <= input.pmax().col(); ++col) + for (int col = min_col(input); col <= max_col(input); ++col) { point2d p(row, col); if (input.has(p)) Index: oln/core/typedefs.hh =================================================================== --- oln/core/typedefs.hh (revision 619) +++ oln/core/typedefs.hh (working copy) @@ -74,7 +74,12 @@ mlc_decl_typedef(grid_type); + mlc_decl_typedef(index_comp_type); + mlc_decl_typedef(row_comp_type); + mlc_decl_typedef(col_comp_type); + mlc_decl_typedef(slice_comp_type); + /*------------. | Iterators. | `------------*/ @@ -182,6 +187,7 @@ `-----------------*/ mlc_decl_typedef(dim_type); + mlc_decl_typedef(vec_type); /*------------------------------------. Index: oln/core/spe/row.hh =================================================================== --- oln/core/spe/row.hh (revision 0) +++ oln/core/spe/row.hh (revision 0) @@ -0,0 +1,155 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_SPE_ROW_HH +# define OLN_CORE_SPE_ROW_HH + +# include <mlc/value.hh> +# include <oln/core/abstract/point.hh> +# include <oln/core/abstract/dpoint.hh> +# include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/image.hh> +# include <oln/core/abstract/iterator_on_points.hh> + + +namespace oln +{ + + template <typename P> + oln_coord(P) row(const abstract::point& p); + + template <typename P> + oln_coord(P)& row(abstract::point& p); + + + template <typename D> + oln_coord(D) row(const abstract::dpoint<D>& dp); + + template <typename D> + oln_coord(D)& row(abstract::dpoint<D>& dp); + + + template <typename It> + oln_coord(It) row(const abstract::iterator_on_points<It>& it); + + + template <typename Ps> + oln_coord(Ps) min_row(const abstract::point_set_having_bbox<Ps>& ps); + + template <typename Ps> + oln_coord(Ps) max_row(const abstract::point_set_having_bbox<Ps>& ps); + + + template <typename I> + oln_coord(I) min_row(const abstract::image_having_bbox& ima); + + template <typename I> + oln_coord(I) max_row(const abstract::image_having_bbox& ima); + + + +# ifndef OLN_INCLUDE_ONLY + + // From point. + + template <typename P> + oln_coord(P) row(const abstract::point& p) + { + typedef oln_type_of(P, row_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename P> + oln_coord(P)& row(abstract::point& p) + { + typedef oln_type_of(P, row_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From dpoint. + + template <typename D> + oln_coord(D) row(const abstract::dpoint<D>& p) + { + typedef oln_type_of(D, row_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename D> + oln_coord(D)& row(abstract::dpoint<D>& p) + { + typedef oln_type_of(D, row_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From iterator. + + template <typename P> + oln_coord(P) row(const abstract::iterator_on_points& it) + { + typedef oln_deduce_type_of(P, point, row_comp) comp_t; + return it.to_point().vec()[mlc_value(comp_t)]; + } + + // From point set. + + template <typename Ps> + oln_coord(Ps) min_row(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, row_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename Ps> + oln_coord(Ps) max_row(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, row_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + + // From image. + + template <typename I> + oln_coord(I) min_row(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, row_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename I> + oln_coord(I) max_row(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, row_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_CORE_SPE_ROW_HH Index: oln/core/spe/col.hh =================================================================== --- oln/core/spe/col.hh (revision 0) +++ oln/core/spe/col.hh (revision 0) @@ -0,0 +1,155 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_SPE_COL_HH +# define OLN_CORE_SPE_COL_HH + +# include <mlc/value.hh> +# include <oln/core/abstract/point.hh> +# include <oln/core/abstract/dpoint.hh> +# include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/image.hh> +# include <oln/core/abstract/iterator_on_points.hh> + + +namespace oln +{ + + template <typename P> + oln_coord(P) col(const abstract::point& p); + + template <typename P> + oln_coord(P)& col(abstract::point& p); + + + template <typename D> + oln_coord(D) col(const abstract::dpoint<D>& dp); + + template <typename D> + oln_coord(D)& col(abstract::dpoint<D>& dp); + + + template <typename It> + oln_coord(It) col(const abstract::iterator_on_points<It>& it); + + + template <typename Ps> + oln_coord(Ps) min_col(const abstract::point_set_having_bbox<Ps>& ps); + + template <typename Ps> + oln_coord(Ps) max_col(const abstract::point_set_having_bbox<Ps>& ps); + + + template <typename I> + oln_coord(I) min_col(const abstract::image_having_bbox& ima); + + template <typename I> + oln_coord(I) max_col(const abstract::image_having_bbox& ima); + + + +# ifndef OLN_INCLUDE_ONLY + + // From point. + + template <typename P> + oln_coord(P) col(const abstract::point& p) + { + typedef oln_type_of(P, col_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename P> + oln_coord(P)& col(abstract::point& p) + { + typedef oln_type_of(P, col_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From dpoint. + + template <typename D> + oln_coord(D) col(const abstract::dpoint<D>& p) + { + typedef oln_type_of(D, col_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename D> + oln_coord(D)& col(abstract::dpoint<D>& p) + { + typedef oln_type_of(D, col_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From iterator. + + template <typename P> + oln_coord(P) col(const abstract::iterator_on_points& it) + { + typedef oln_deduce_type_of(P, point, col_comp) comp_t; + return it.to_point().vec()[mlc_value(comp_t)]; + } + + // From point set. + + template <typename Ps> + oln_coord(Ps) min_col(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, col_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename Ps> + oln_coord(Ps) max_col(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, col_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + + // From image. + + template <typename I> + oln_coord(I) min_col(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, col_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename I> + oln_coord(I) max_col(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, col_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_CORE_SPE_COL_HH Index: oln/core/spe/slice.hh =================================================================== --- oln/core/spe/slice.hh (revision 0) +++ oln/core/spe/slice.hh (revision 0) @@ -0,0 +1,155 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_SPE_SLICE_HH +# define OLN_CORE_SPE_SLICE_HH + +# include <mlc/value.hh> +# include <oln/core/abstract/point.hh> +# include <oln/core/abstract/dpoint.hh> +# include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/image.hh> +# include <oln/core/abstract/iterator_on_points.hh> + + +namespace oln +{ + + template <typename P> + oln_coord(P) slice(const abstract::point& p); + + template <typename P> + oln_coord(P)& slice(abstract::point& p); + + + template <typename D> + oln_coord(D) slice(const abstract::dpoint<D>& dp); + + template <typename D> + oln_coord(D)& slice(abstract::dpoint<D>& dp); + + + template <typename It> + oln_coord(It) slice(const abstract::iterator_on_points<It>& it); + + + template <typename Ps> + oln_coord(Ps) min_slice(const abstract::point_set_having_bbox<Ps>& ps); + + template <typename Ps> + oln_coord(Ps) max_slice(const abstract::point_set_having_bbox<Ps>& ps); + + + template <typename I> + oln_coord(I) min_slice(const abstract::image_having_bbox& ima); + + template <typename I> + oln_coord(I) max_slice(const abstract::image_having_bbox& ima); + + + +# ifndef OLN_INCLUDE_ONLY + + // From point. + + template <typename P> + oln_coord(P) slice(const abstract::point& p) + { + typedef oln_type_of(P, slice_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename P> + oln_coord(P)& slice(abstract::point& p) + { + typedef oln_type_of(P, slice_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From dpoint. + + template <typename D> + oln_coord(D) slice(const abstract::dpoint<D>& p) + { + typedef oln_type_of(D, slice_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + template <typename D> + oln_coord(D)& slice(abstract::dpoint<D>& p) + { + typedef oln_type_of(D, slice_comp) comp_t; + return p.vec()[mlc_value(comp_t)]; + } + + // From iterator. + + template <typename P> + oln_coord(P) slice(const abstract::iterator_on_points& it) + { + typedef oln_deduce_type_of(P, point, slice_comp) comp_t; + return it.to_point().vec()[mlc_value(comp_t)]; + } + + // From point set. + + template <typename Ps> + oln_coord(Ps) min_slice(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, slice_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename Ps> + oln_coord(Ps) max_slice(const abstract::point_set_having_bbox<Ps>& ps) + { + typedef oln_deduce_type_of(Ps, point, slice_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + + // From image. + + template <typename I> + oln_coord(I) min_slice(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, slice_comp) comp_t; + return ps.pmin().vec()[mlc_value(comp_t)]; + } + + template <typename I> + oln_coord(I) max_slice(const abstract::image_having_bbox& ps) + { + typedef oln_deduce_type_of(I, point, slice_comp) comp_t; + return ps.pmax().vec()[mlc_value(comp_t)]; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_CORE_SPE_SLICE_HH Index: oln/core/abstract/iterator_on_points.hh =================================================================== --- oln/core/abstract/iterator_on_points.hh (revision 619) +++ oln/core/abstract/iterator_on_points.hh (working copy) @@ -56,7 +56,14 @@ typedef mlc::undefined point_type; }; + template <typename E> + struct single_vtype< abstract::iterator_on_points<E>, typedef_::coord_type > + { + typedef oln_type_of(E, point) point_t; + typedef oln_type_of(point_t, coord) ret; + }; + namespace abstract { Index: oln/core/abstract/point.hh =================================================================== --- oln/core/abstract/point.hh (revision 619) +++ oln/core/abstract/point.hh (working copy) @@ -60,9 +60,18 @@ typedef mlc::undefined dpoint_type; typedef mlc::undefined coord_type; typedef mlc::undefined dim_type; + typedef mlc::undefined vec_type; }; + template <typename E> + struct single_vtype< abstract::point<E>, typedef_::vec_type > + { + typedef oln_type_of(E, coord) coord_t; + typedef oln_type_of(E, dim) dim_t; + typedef xtd::vec<mlc_value(dim_t), coord_t> ret; + }; + namespace abstract { @@ -72,6 +81,7 @@ public oln::type { typedef oln_type_of(E, dpoint) dpoint_t; + typedef oln_type_of(E, vec) vec_t; public: @@ -197,6 +207,10 @@ /// \} + const vec_t& vec() const; + vec_t& vec(); + + ~point() { // FIXME: See code below. @@ -388,8 +402,23 @@ } template <typename E> + const typename point<E>::vec_t& + point<E>::vec() const + { + return this->exact().impl_vec(); + } + + template <typename E> + typename point<E>::vec_t& + point<E>::vec() + { + return this->exact().impl_vec(); + } + + template <typename E> point<E>::point() - {} + { + } // template <typename E> // point<E>::~point() Index: oln/core/1d/dpoint1d.hh =================================================================== --- oln/core/1d/dpoint1d.hh (revision 619) +++ oln/core/1d/dpoint1d.hh (working copy) @@ -56,6 +56,8 @@ typedef point1d point_type; typedef C coord_type; typedef mlc::uint_<1> dim_type; + + typedef mlc::uint_<0> index_comp_type; }; Index: oln/core/1d/point1d.hh =================================================================== --- oln/core/1d/point1d.hh (revision 619) +++ oln/core/1d/point1d.hh (working copy) @@ -65,6 +65,8 @@ typedef dpoint1d dpoint_type; typedef C coord_type; typedef mlc::uint_<1> dim_type; + + typedef mlc::uint_<0> index_comp_type; }; Index: oln/core/2d/dpoint2d.hh =================================================================== --- oln/core/2d/dpoint2d.hh (revision 619) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -56,6 +56,9 @@ typedef point2d point_type; typedef C coord_type; typedef mlc::uint_<2> dim_type; + + typedef mlc::uint_<0> row_comp_type; + typedef mlc::uint_<1> col_comp_type; }; Index: oln/core/2d/point2d.hh =================================================================== --- oln/core/2d/point2d.hh (revision 619) +++ oln/core/2d/point2d.hh (working copy) @@ -65,6 +65,9 @@ typedef dpoint2d dpoint_type; typedef C coord_type; typedef mlc::uint_<2> dim_type; + + typedef mlc::uint_<0> row_comp_type; + typedef mlc::uint_<1> col_comp_type; }; Index: oln/core/3d/dpoint3d.hh =================================================================== --- oln/core/3d/dpoint3d.hh (revision 619) +++ oln/core/3d/dpoint3d.hh (working copy) @@ -56,6 +56,10 @@ typedef point3d point_type; typedef C coord_type; typedef mlc::uint_<3> dim_type; + + typedef mlc::uint_<0> slice_comp_type; + typedef mlc::uint_<1> row_comp_type; + typedef mlc::uint_<2> col_comp_type; }; Index: oln/core/3d/point3d.hh =================================================================== --- oln/core/3d/point3d.hh (revision 619) +++ oln/core/3d/point3d.hh (working copy) @@ -65,6 +65,10 @@ typedef dpoint3d dpoint_type; typedef C coord_type; typedef mlc::uint_<3> dim_type; + + typedef mlc::uint_<0> slice_comp_type; + typedef mlc::uint_<1> row_comp_type; + typedef mlc::uint_<2> col_comp_type; }; Index: oln/core/internal/point_nd.hh =================================================================== --- oln/core/internal/point_nd.hh (revision 619) +++ oln/core/internal/point_nd.hh (working copy) @@ -74,12 +74,11 @@ typedef oln_type_of(E, dim) dim; typedef oln_type_of(E, coord) coord_t; typedef oln_type_of(E, dpoint) dpoint_t; + typedef oln_type_of(E, vec) vec_t; - public: enum { n = mlc_value(dim) }; - typedef xtd::vec<n,coord_t> vec_t; coord_t operator[](unsigned i) const; coord_t& operator[](unsigned i); @@ -98,7 +97,8 @@ dpoint_t impl_minus(const self_t& rhs) const; - const vec_t& vec() const; + const vec_t& impl_vec() const; + vec_t& impl_vec(); protected: @@ -185,12 +185,19 @@ template <typename E> const typename point_nd<E>::vec_t& - point_nd<E>::vec() const + point_nd<E>::impl_vec() const { return v_; } template <typename E> + typename point_nd<E>::vec_t& + point_nd<E>::impl_vec() + { + return v_; + } + + template <typename E> point_nd<E>::point_nd() {} Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 619) +++ oln/basics2d.hh (working copy) @@ -54,5 +54,8 @@ # include <oln/core/fwd_piter.hh> +# include <oln/core/spe/row.hh> +# include <oln/core/spe/col.hh> + #endif // ! OLN_BASICS2D_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 619) +++ oln/Makefile.am (working copy) @@ -114,6 +114,10 @@ core/gen/topo_lbbox.hh \ core/gen/window.hh \ \ + core/spe/col.hh \ + core/spe/row.hh \ + core/spe/slice.hh \ + \ core/internal/bbox_bkd_piter.hh \ core/internal/bbox_fwd_piter.hh \ core/internal/dpoint_nd.hh \ Index: oln/basics3d.hh =================================================================== --- oln/basics3d.hh (revision 619) +++ oln/basics3d.hh (working copy) @@ -51,5 +51,9 @@ # include <oln/core/3d/image3d.hh> +# include <oln/core/spe/slice.hh> +# include <oln/core/spe/row.hh> +# include <oln/core/spe/col.hh> + #endif // ! OLN_BASICS3D_HH

17 years, 7 months

619: New facilities related to windows and q-iterators.

by Thierry GERAUD

2006-10-11 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> New facilities related to windows and q-iterators. * tests/window2d.cc: New. * tests/Makefile.am (window2d_SOURCES): New. * oln/debug/print.hh (format): New. (print): Update; use format to correctly print 'unsigned char'. * oln/level/fill.hh: Separate header and implementation. (fill): Use shortcut. * oln/core/typedefs.hh: New shortcuts oln_something(T) for oln_type_of(T, something). * oln/core/fwd_piter.hh (fwd_qiter_type): New. * oln/core/abstract/window.hh: New. * oln/core/2d/aliases.hh (window2d, fwd_qiter2d): New. * oln/core/gen/fwd_qiter_win.hh (include): Add abstract::window.hh. (fwd_qiter_win_): Update ctor signature. * oln/core/gen/window.hh (grid_type): New. (window_): Add inheritance from abstract::window. (impl_is_valid): New. (include): Update. * oln/basics2d.hh (include): Add window.hh and fwd_qiter_win.hh. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: tests/window2d.cc =================================================================== --- tests/window2d.cc (revision 0) +++ tests/window2d.cc (revision 0) @@ -0,0 +1,41 @@ +#include <oln/basics2d.hh> +#include <oln/debug/print.hh> +#include <oln/io/pnm.hh> +#include <oln/morpher/add_neighborhood.hh> + + +namespace test +{ + + template <typename I, typename W> + void run(const oln::abstract::image& ima, + const oln::abstract::window<W>& win) + { + oln_piter(I) p(ima.topo()); + oln_qiter(I) q(p, win); + for_all(p) + { + std::cout << unsigned(ima(p)) << ": "; + for_all(q) + std::cout << unsigned(ima(q)) << " "; + std::cout << std::endl; + } + } + +} + + +int main() +{ + using namespace oln; + + image2d<unsigned char> ima = io::load_pgm("../img/lena32.pgm"); + debug::println(ima); + + window2d win; + win + .add(dpoint2d(-1, 0)) + .add(dpoint2d(-2, 0)); + + test::run(ima, win); +} Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 618) +++ tests/Makefile.am (working copy) @@ -26,6 +26,7 @@ image2d \ image3d \ npoints \ + window2d \ \ identity_morpher \ add_neighborhood_morpher \ @@ -43,6 +44,7 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc npoints_SOURCES = npoints.cc +window2d_SOURCES = window2d.cc # Morphers. identity_morpher_SOURCES = identity_morpher.cc Index: oln/debug/print.hh =================================================================== --- oln/debug/print.hh (revision 618) +++ oln/debug/print.hh (working copy) @@ -44,24 +44,36 @@ /// Fwd decl. template <typename I> - void print(const abstract::image& input, std::ostream& ostr); + void print(const abstract::image& input, std::ostream& ostr = std::cout); /// Fwd decl. template <typename I> - void println(const abstract::image& input, std::ostream& ostr); + void println(const abstract::image& input, std::ostream& ostr = std::cout); # ifndef OLN_INCLUDE_ONLY namespace impl { + template <typename T> + const T& format(const T& value) + { + return value; + } + + unsigned format(const unsigned char& value) + { + return value; + } + + /// Generic version. template <typename I> void print(const abstract::image& input, std::ostream& ostr) { oln_type_of(I, fwd_piter) p(input.topo()); for_all(p) - ostr << p.to_point() << ':' << ima(p) << ' '; + ostr << p.to_point() << ':' << format(input(p)) << ' '; } @@ -76,7 +88,7 @@ { point2d p(row, col); if (input.has(p)) - ostr << input(p); + ostr << format(input(p)); else ostr << '-'; ostr << ' '; Index: oln/level/fill.hh =================================================================== --- oln/level/fill.hh (revision 618) +++ oln/level/fill.hh (working copy) @@ -53,6 +53,8 @@ void fill(abstract::image& input, const oln_type_of(I, value)& val); +# ifndef OLN_INCLUDE_ONLY + namespace impl { @@ -71,7 +73,7 @@ /// Facade. template <typename I> - void fill(abstract::image& input, const oln_type_of(I, value)& val) + void fill(abstract::image& input, const oln_value(I)& val) { // Precondition. mlc::assert_< @@ -82,6 +84,8 @@ impl::fill(input.exact(), val); } +# endif + } // end of namespace oln::level } // end of namespace oln Index: oln/core/typedefs.hh =================================================================== --- oln/core/typedefs.hh (revision 618) +++ oln/core/typedefs.hh (working copy) @@ -200,6 +200,63 @@ } // end of namespace oln + +/// \{ +/// Shortcuts formed such as "oln_something(T) means oln_type_of(T, something)". + +# define oln_coord(T) oln_type_of(T, coord) +# define oln_coord_(T) oln_type_of_(T, coord) + +# define oln_grid(T) oln_type_of(T, grid) +# define oln_grid_(T) oln_type_of_(T, grid) + +# define oln_point(T) oln_type_of(T, point) +# define oln_point_(T) oln_type_of_(T, point) + +# define oln_dpoint(T) oln_type_of(T, dpoint) +# define oln_dpoint_(T) oln_type_of_(T, dpoint) + +# define oln_value(T) oln_type_of(T, value) +# define oln_value_(T) oln_type_of_(T, value) + +# define oln_rvalue(T) oln_type_of(T, rvalue) +# define oln_rvalue_(T) oln_type_of_(T, rvalue) + +# define oln_lvalue(T) oln_type_of(T, lvalue) +# define oln_lvalue_(T) oln_type_of_(T, lvalue) + +# define oln_fwd_piter(T) oln_type_of(T, fwd_piter) +# define oln_fwd_piter_(T) oln_type_of_(T, fwd_piter) + +# define oln_bkd_piter(T) oln_type_of(T, bkd_piter) +# define oln_bkd_piter_(T) oln_type_of_(T, bkd_piter) + +# define oln_fwd_qiter(T) oln_type_of(T, fwd_qiter) +# define oln_fwd_qiter_(T) oln_type_of_(T, fwd_qiter) + +# define oln_bkd_qiter(T) oln_type_of(T, bkd_qiter) +# define oln_bkd_qiter_(T) oln_type_of_(T, bkd_qiter) + +# define oln_fwd_niter(T) oln_type_of(T, fwd_niter) +# define oln_fwd_niter_(T) oln_type_of_(T, fwd_niter) + +# define oln_bkd_niter(T) oln_type_of(T, bkd_niter) +# define oln_bkd_niter_(T) oln_type_of_(T, bkd_niter) + +# define oln_piter(T) oln_type_of(T, fwd_piter) +# define oln_piter_(T) oln_type_of_(T, fwd_piter) + +# define oln_qiter(T) oln_type_of(T, fwd_qiter) +# define oln_qiter_(T) oln_type_of_(T, fwd_qiter) + +# define oln_niter(T) oln_type_of(T, fwd_niter) +# define oln_niter_(T) oln_type_of_(T, fwd_niter) + +/// \} + + + + # include <oln/core/abstract/entry.hh> Index: oln/core/fwd_piter.hh =================================================================== --- oln/core/fwd_piter.hh (revision 618) +++ oln/core/fwd_piter.hh (working copy) @@ -127,7 +127,13 @@ typedef bkd_piter2d ret; }; + template <typename T> + struct single_vtype< image2d<T>, typedef_::fwd_qiter_type > + { + typedef fwd_qiter2d ret; + }; + } // end of namespace oln Index: oln/core/abstract/window.hh =================================================================== --- oln/core/abstract/window.hh (revision 0) +++ oln/core/abstract/window.hh (revision 0) @@ -0,0 +1,98 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_WINDOW_HH +# define OLN_CORE_ABSTRACT_WINDOW_HH + +# include <oln/core/typedefs.hh> + + +namespace oln +{ + + namespace abstract + { + + + /// Abstract window class. + template <typename E> + class window : public virtual stc::any__simple<E>, + public virtual oln::type + { + public: + + bool is_valid() const; + + struct decl + { + oln_virtual_typedef(grid); + + decl(); + }; + + protected: + + window(); + ~window(); + + }; // end of class oln::abstract::window<E> + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename E> + bool window<E>::is_valid() const + { + return this->exact().impl_is_valid(); + } + + template <typename E> + window<E>::window() + { + } + + template <typename E> + window<E>::~window() + { + decl(); + } + + template <typename E> + window<E>::decl::decl() + { + } + +# endif + + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLN_CORE_ABSTRACT_WINDOW_HH Index: oln/core/2d/aliases.hh =================================================================== --- oln/core/2d/aliases.hh (revision 618) +++ oln/core/2d/aliases.hh (working copy) @@ -38,10 +38,12 @@ template <typename C> class point2d_; template <typename C> class dpoint2d_; template <typename D> class neighb_; + template <typename D> class window_; template <typename P> class bbox_; template <typename P> class topo_lbbox_; template <typename P> class fwd_piter_bbox_; template <typename P> class bkd_piter_bbox_; + template <typename P> class fwd_qiter_win_; class grid2d; /// \} @@ -52,12 +54,16 @@ typedef dpoint2d_<int> dpoint2d; typedef neighb_<dpoint2d> neighb2d; + typedef window_<dpoint2d> window2d; typedef bbox_<point2d> bbox2d; typedef topo_lbbox_<point2d> topo2d; + typedef fwd_piter_bbox_<point2d> fwd_piter2d; typedef bkd_piter_bbox_<point2d> bkd_piter2d; + typedef fwd_qiter_win_<point2d> fwd_qiter2d; + typedef point2d_<float> point2df; typedef dpoint2d_<float> dpoint2df; /// \} Index: oln/core/gen/fwd_qiter_win.hh =================================================================== --- oln/core/gen/fwd_qiter_win.hh (revision 618) +++ oln/core/gen/fwd_qiter_win.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_GEN_FWD_QITER_WIN_HH # include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/abstract/window.hh> # include <oln/core/gen/window.hh> @@ -70,12 +71,13 @@ public: - template <typename P, typename D> + template <typename P, typename W> fwd_qiter_win_(const abstract::iterator_on_points& it, - const window_<D>& win); - template <typename P, typename D> + const abstract::window<W>& win); + + template <typename P, typename W> fwd_qiter_win_(const abstract::point& p, - const window_<D>& win); + const abstract::window<W>& win); void impl_start(); @@ -103,22 +105,22 @@ # ifndef OLN_INCLUDE_ONLY template <typename point_t> - template <typename P, typename D> + template <typename P, typename W> fwd_qiter_win_<point_t>::fwd_qiter_win_(const abstract::iterator_on_points& it, - const window_<D>& win) + const abstract::window<W>& win) : p_ref_(it.point_adr()), - win_(win) + win_(win.exact()) { precondition(win_.card() > 0); i_ = -1; } template <typename point_t> - template <typename P, typename D> + template <typename P, typename W> fwd_qiter_win_<point_t>::fwd_qiter_win_(const abstract::point& p, - const window_<D>& win) + const abstract::window<W>& win) : p_ref_(&(p.exact())), - win_(win) + win_(win.exact()) { precondition(win_.card() > 0); i_ = -1; Index: oln/core/gen/window.hh =================================================================== --- oln/core/gen/window.hh (revision 618) +++ oln/core/gen/window.hh (working copy) @@ -33,14 +33,27 @@ # include <vector> # include <mlc/assert.hh> # include <oln/core/abstract/dpoint.hh> +# include <oln/core/abstract/window.hh> namespace oln { + // Fwd decl. + template <typename dpoint> class window_; + + + template <typename dpoint> + struct vtypes< window_<dpoint> > + { + typedef oln_type_of(dpoint, grid) grid_type; + }; + + /// Abstract forward dpoint iterator class. template <typename dpoint> - class window_ : private mlc::assert_< mlc_is_a(dpoint, abstract::dpoint) > + class window_ : public abstract::window< window_<dpoint> >, + private mlc::assert_< mlc_is_a(dpoint, abstract::dpoint) > { typedef window_<dpoint> self_t; @@ -51,11 +64,13 @@ window_<dpoint>& add(const dpoint& dp); template <typename D> - window_<dpoint>& add(const abstract::dpoint<D>& dp); + window_<dpoint>& add(const abstract::dpoint<D>& dp); + dpoint dp(unsigned i) const; + unsigned card() const; - dpoint dp(unsigned i) const; + bool impl_is_valid() const; protected: @@ -107,6 +122,13 @@ } template <typename dpoint> + bool + window_<dpoint>::impl_is_valid() const + { + return v_.size() != 0; + } + + template <typename dpoint> void window_<dpoint>::update_() { Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 618) +++ oln/basics2d.hh (working copy) @@ -44,6 +44,9 @@ # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/gen/window.hh> +# include <oln/core/gen/fwd_qiter_win.hh> + # include <oln/core/gen/neighb.hh> # include <oln/core/2d/neighb2d.hh> Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 618) +++ oln/Makefile.am (working copy) @@ -85,6 +85,7 @@ core/abstract/point_set.hh \ core/abstract/topology.hh \ core/abstract/value.hh \ + core/abstract/window.hh \ \ core/automatic/image.hh \ core/automatic/image_being_mutable.hh \

17 years, 7 months

618: Add some tools related to morphers over image value.

by Thierry GERAUD

2006-10-11 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add some tools related to morphers over image value. * oln/core/abstract/value.hh: New. * oln/morpher/thru_fun.hh: New. * oln/morpher/internal/image_value_morpher.hh: New. * oln/color: New. * oln/color/rgb.hh: New. * tests/Makefile.am (check_PROGRAMS): Reorganize. (io_pnm_SOURCES): New. * oln/core/abstract/grid.hh (grid): Add inheritance from oln::type. * oln/Makefile.am (nobase_oln_HEADERS): Update. Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 617) +++ tests/Makefile.am (working copy) @@ -25,14 +25,14 @@ image1d \ image2d \ image3d \ - io_pnm \ npoints \ \ identity_morpher \ add_neighborhood_morpher \ morphers \ \ - fill + fill \ + io_pnm # Images and auxiliary structures. dpoint2d_SOURCES = dpoint2d.cc @@ -51,6 +51,7 @@ # Algorithms. fill_SOURCES = fill.cc +io_pnm_SOURCES = io_pnm.cc TESTS = $(check_PROGRAMS) Index: oln/core/abstract/grid.hh =================================================================== --- oln/core/abstract/grid.hh (revision 617) +++ oln/core/abstract/grid.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_ABSTRACT_GRID_HH # define OLN_CORE_ABSTRACT_GRID_HH +# include <oln/core/type.hh> # include <oln/core/typedefs.hh> @@ -49,7 +50,8 @@ namespace abstract { template <typename E> - struct grid : public virtual stc::any__simple<E> + struct grid : public virtual stc::any__simple<E>, + public oln::type { protected: grid(); Index: oln/core/abstract/value.hh =================================================================== --- oln/core/abstract/value.hh (revision 0) +++ oln/core/abstract/value.hh (revision 0) @@ -0,0 +1,58 @@ +// 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 OLN_CORE_ABSTRACT_VALUE_HH +# define OLN_CORE_ABSTRACT_VALUE_HH + +# include <oln/core/type.hh> + + +namespace oln { + + namespace abstract { + + struct value : public oln::type + { + protected: + value(); + }; + + +# ifndef OLN_INCLUDE_ONLY + + value::value() + { + } + +# endif + + } // end of namespace oln::abstract + +} // end of namespace oln + + +#endif // ! OLN_CORE_ABSTRACT_VALUE_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 617) +++ oln/Makefile.am (working copy) @@ -3,6 +3,8 @@ olndir = $(includedir)/oln nobase_oln_HEADERS = \ \ + color/rgb.hh \ + \ core/1d/aliases.hh \ core/1d/array1d.hh \ core/1d/dpoint1d.hh \ @@ -82,6 +84,7 @@ core/abstract/point.hh \ core/abstract/point_set.hh \ core/abstract/topology.hh \ + core/abstract/value.hh \ \ core/automatic/image.hh \ core/automatic/image_being_mutable.hh \ @@ -135,10 +138,12 @@ level/fill.hh \ \ morpher/internal/image_extension.hh \ + morpher/internal/image_value_morpher.hh \ \ morpher/add_neighborhood.hh \ morpher/identity.hh \ morpher/tags.hh \ + morpher/thru_fun.hh \ \ basics1d.hh \ basics2d.hh \ Index: oln/morpher/thru_fun.hh =================================================================== --- oln/morpher/thru_fun.hh (revision 0) +++ oln/morpher/thru_fun.hh (revision 0) @@ -0,0 +1,157 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_MORPHER_THRU_FUN +# define OLN_MORPHER_THRU_FUN + +# include <xtd/abstract/open_nary_fun.hh> +# include <xtd/res.hh> +# include <oln/morpher/internal/image_value_morpher.hh> + + + +namespace oln +{ + + namespace morpher + { + // Forward declaration. + template <typename Image, typename Fun> struct thru_fun; + + } // end of namespace oln::morpher + + + /// Super type. + template <typename Image, typename Fun> + struct set_super_type< morpher::thru_fun<Image, Fun> > + { + typedef morpher::thru_fun<Image, Fun> self_t; + typedef morpher::internal::image_value_morpher<Image, self_t> ret; + }; + + + template <typename Image, typename Fun> + struct vtypes< morpher::thru_fun<Image, Fun> > + { + private: + typedef oln_type_of(Image, rvalue) old_value_type; + public: + typedef xtd_res_1(Fun, old_value_type) value_type; + typedef mlc::false_ is_mutable_type; + }; + + + template <typename Image, typename Fun> + struct single_vtype< morpher::thru_fun<Image, Fun>, typedef_::rvalue_type > + { + typedef morpher::thru_fun<Image, Fun> self_t; + typedef oln_type_of(self_t, value) ret; + }; + + + + namespace morpher + { + + /// 'Image thru Function' morpher. + template <typename Image, typename Fun> + class thru_fun : public internal::image_value_morpher< Image, + thru_fun<Image, Fun> > + { + private: + + typedef thru_fun<Image, Fun> self_t; + typedef internal::image_value_morpher<Image, self_t> super_t; + + typedef oln_type_of(self_t, psite) psite_t; + typedef oln_type_of(self_t, rvalue) rvalue_t; + + public: + + thru_fun(const Image& image, const Fun& fun); + + rvalue_t impl_op_read(const psite_t& p) const; + + protected: + + Fun fun_; + }; + + +# ifndef OLN_INCLUDE_ONLY + + template <typename Image, typename Fun> + thru_fun<Image, Fun>::thru_fun(const Image& image, const Fun& fun) : + super_t(image), + fun_(fun) + { + } + + template <typename Image, typename Fun> + typename thru_fun<Image, Fun>::rvalue_t + thru_fun<Image, Fun>::impl_op_read(const typename thru_fun<Image, Fun>::psite_t& p) const + { + return fun_(this->image_(p)); + } + +# endif + + } // end of namespace oln::morpher + + +} // end of namespace oln + + + + +namespace xtd +{ + + // open_nary_fun_<1, Fun>::operator()(const A& a) const + // where A is an oln::abstract::image + + template <typename Fun, typename A> + struct case_ < tag::fun_operator_1, mlc::pair_<Fun, A>, 2 > + : where_< mlc_is_a(A, oln::abstract::image) > + { + typedef stc_to_exact(A) I; + typedef oln::morpher::thru_fun<I, Fun> res; + + static res impl(const Fun& fun, // target + const oln::abstract::image& ima) + { + res tmp(ima.exact(), fun); + return tmp; + } + }; + +} // end of namespace xtd + + + + +#endif // ! OLN_MORPHER_THRU_FUN Index: oln/morpher/internal/image_value_morpher.hh =================================================================== --- oln/morpher/internal/image_value_morpher.hh (revision 0) +++ oln/morpher/internal/image_value_morpher.hh (revision 0) @@ -0,0 +1,137 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_MORPHER_INTERNAL_IMAGE_VALUE_MORPHER_HH +# define OLN_MORPHER_INTERNAL_IMAGE_VALUE_MORPHER_HH + +# include <oln/core/image_entry.hh> +# include <oln/morpher/tags.hh> + + +namespace oln +{ + namespace morpher + { + namespace internal + { + + // Forward declaration. + template <typename Image, typename Exact> + class image_value_morpher; + + } // end of namespace oln::morpher::internal + + } // end of namespace oln::morpher + + + /// Create an ``uplink'' from + /// oln::morpher::internal::image_value_morpher to the morphed \a Image, + /// so as to get all its virtual types. + template <typename Image, typename Exact> + struct + set_pseudosuper_type< morpher::internal::image_value_morpher<Image, Exact> > + { + typedef Image ret; + }; + + + template <typename Image, typename Exact> + struct vtypes< morpher::internal::image_value_morpher<Image, Exact> > + { + // Morpher type. + typedef oln::morpher::tag::identity morpher_type; // FIXME: Wrong! + + typedef mlc::undefined value_type; + }; + + template <typename Image, typename Exact> + struct single_vtype< morpher::internal::image_value_morpher<Image, Exact>, + typedef_::rvalue_type > + { + typedef mlc::undefined ret; + }; + + template <typename Image, typename Exact> + struct single_vtype< morpher::internal::image_value_morpher<Image, Exact>, + typedef_::lvalue_type > + { + typedef mlc::undefined ret; + }; + + + namespace morpher + { + namespace internal + { + + template <typename Image, typename Exact> + class image_value_morpher : public oln::image_entry<Exact> + { + public: + + // FIXME: Handle the constness. + image_value_morpher(const Image& image); + const Image& delegate() const; + Image& delegate(); + + protected: + Image image_; + }; + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename Image, typename Exact> + image_value_morpher<Image, Exact>::image_value_morpher(const Image& image) : + image_(image) + { + } + + template <typename Image, typename Exact> + const Image& + image_value_morpher<Image, Exact>::delegate() const + { + return image_; + } + + template <typename Image, typename Exact> + Image& + image_value_morpher<Image, Exact>::delegate() + { + return image_; + } + +# endif + + } // end of namespace oln::morpher::internal + + } // end of namespace oln::morpher + +} // end of namespace oln + +#endif // ! OLN_MORPHER_INTERNAL_IMAGE_VALUE_MORPHER_HH Index: oln/color/rgb.hh =================================================================== --- oln/color/rgb.hh (revision 0) +++ oln/color/rgb.hh (revision 0) @@ -0,0 +1,185 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_COLOR_RGB_HH +# define OLN_CORE_COLOR_RGB_HH + +# include <xtd/vec.hh> +# include <oln/core/abstract/value.hh> + + +namespace oln +{ + + namespace color + { + + + /// General RGB class. + template <typename T> + class rgb_ : public oln::abstract::value + { + public: + + /// Ctor. + rgb_(); + + /// Ctor. + rgb_(const T& r, const T& g, const T& b); + + /// Cpy ctor. + template <typename U> + rgb_(const rgb_& rhs); + + /// Op=. + template <typename U> + rgb_<T>& operator=(const rgb_& rhs); + + T red() const; + T& red(); + typedef T red_type; + + T green() const; + T& green(); + typedef T green_type; + + T blue() const; + T& blue(); + typedef T blue_type; + + const xtd::vec<3,T>& to_vec() const; + xtd::vec<3,T>& to_vec(); + + protected: + xtd::vec<3,T> val_; + }; + + typedef rgb_<unsigned char> rgb8; + + template <unsigned n, typename T> + std::ostream& operator<<(std::ostream& ostr, const rgb_<T>& c); + + +# ifndef OLN_INCLUDE_ONLY + + + template <typename T> + rgb_<T>::rgb_() + { + } + + template <typename T> + rgb_<T>::rgb_(const T& r, const T& g, const T& b) + { + val_[0] = r; + val_[1] = g; + val_[2] = b; + } + + template <typename T> + template <typename U> + rgb_<T>::rgb_(const rgb_& rhs) + { + val_[0] = rhs.red(); + val_[1] = rhs.green(); + val_[2] = rhs.blue(); + } + + template <typename T> + template <typename U> + rgb_<T>& rgb_<T>::operator=(const rgb_& rhs) + { + val_[0] = rhs.red(); + val_[1] = rhs.green(); + val_[2] = rhs.blue(); + return *this; + } + + template <typename T> + T rgb_<T>::red() const + { + return val_[0]; + } + + template <typename T> + T& rgb_<T>::red() + { + return val_[0]; + } + + template <typename T> + T rgb_<T>::green() const + { + return val_[1]; + } + + template <typename T> + T& rgb_<T>::green() + { + return val_[1]; + } + + template <typename T> + T rgb_<T>::blue() const + { + return val_[2]; + } + + template <typename T> + T& rgb_<T>::blue() + { + return val_[2]; + } + + template <typename T> + const xtd::vec<3,T>& rgb_<T>::to_vec() const + { + return val_; + } + + template <typename T> + xtd::vec<3,T>& rgb_<T>::to_vec() + { + return val_; + } + + + template <typename T> + std::ostream& operator<<(std::ostream& ostr, const rgb_<T>& c) + { + return ostr << c.to_vec(); + } + +# endif + + + } // end of namespace oln::color + +} // end of namespace oln + + +#endif // ! OLN_CORE_COLOR_RGB_HH

17 years, 7 months

617: Fix sanity checks and reorganize hierarchies of abstractions.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix sanity checks. * oln/core/abstract/image/hybrid/classical.hh, * oln/core/gen/neighb.hh, oln/core/gen/window.hh, * oln/core/gen/fwd_qiter_win.hh, oln/core/gen/piter_isubset.hh, * oln/core/gen/mapimage.hh, * oln/core/internal/bbox_fwd_piter.hh, * oln/core/internal/bbox_bkd_piter.hh, * oln/core/fwd_piter.hh, oln/core/1d/point1d.hh, * oln/core/1d/dpoint1d.hh, oln/core/2d/point2d.hh, * oln/core/2d/dpoint2d.hh, oln/core/2d/neighb2d.hh, * oln/core/3d/point3d.hh, oln/core/3d/dpoint3d.hh, * oln/core/3d/neighb3d.hh, * oln/morpher/add_isubset.hh, oln/morpher/add_neighborhood.hh, * oln/debug/print.hh, oln/io/pnm.hh, oln/level/fill.hh: Include needed (missing) headers. * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh: Likewise. Instantiate oln::bbox_ explicitly. * oln/core/gen/bbox.hh (oln/core/gen/bbox_fwd_piter.hh, oln/core/gen/bbox_bkd_piter.hh): Don't include them. * oln/core/gen/topo_bbox.hh (impl_has_large): Typo. Reorganize the abstract::image hierarchy. * oln/core/abstract/image/hierarchies.hh: Move inclusions of point set abstractions... * oln/core/abstract/image/all.hh: ...here (new file). * oln/core/image_entry.hh: Adjust. * oln/Makefile.am (nobase_oln_HEADERS): Adjust. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh: Remove explicit template instantiations. * oln/core/abstract/image.hh (oln/core/abstract/image/hierarchies.hh): Don't include it. * oln/core/abstract/image/dimension/hierarchy.hh * oln/core/abstract/image/type/hierarchy.hh, * oln/core/abstract/image/neighborhood/hierarchy.hh * oln/core/abstract/image/bbox/hierarchy.hh * oln/core/abstract/image/accessibility/hierarchy.hh * oln/core/abstract/image/mutability/hierarchy.hh * oln/core/abstract/image/hybrid/classical.hh (oln/core/abstract/image/hierarchies.hh): Include it. * oln/core/abstract/image/type/integre.hh (oln::abstract::case_<image_hierarchy_wrt_type, E, 4>) (oln::abstract::case_<image_hierarchy_wrt_type, E, 5>) (oln::abstract::case_<image_hierarchy_wrt_type, E, 6>): Catch up with image type hierarchy. Reorganize the abstract::point_set hierarchy. * oln/core/abstract/point_set_hierarchies.hh: Rename as... * oln/core/abstract/point_set/hierarchies.hh: ...this. Move inclusions of point set abstractions... * oln/core/abstract/point_set/all.hh: ...here (new file). * oln/core/point_set_entry.hh: Adjust. * oln/core/abstract/point_set_being_connected.hh, * oln/core/abstract/point_set_being_random_accessible.hh, * oln/core/abstract/point_set_having_bbox.hh, * oln/core/abstract/point_set_having_known_size.hh: Rename as... * oln/core/abstract/point_set/point_set_being_connected.hh, * oln/core/abstract/point_set/point_set_being_random_accessible.hh, * oln/core/abstract/point_set/point_set_having_bbox.hh, * oln/core/abstract/point_set/point_set_having_known_size.hh: ...these. Adjust header guards and inclusions. * oln/Makefile.am (nobase_oln_HEADERS): Adjust. * oln/core/abstract/bbox.hh (oln::case_<point_set_hierarchy_wrt_bbox, E, 1>) (oln::case_<point_set_hierarchy_wrt_bbox, E, 2>): Move... * oln/core/abstract/point_set/point_set_having_bbox.hh: ...here. (oln::abstract::point_set_having_bbox): s/oln_type_of/oln_check_type_of/g. Reorganize the abstract::topology hierarchy. * oln/core/abstract/topology_hierarchies.hh: Rename as... * oln/core/abstract/topology/hierarchies.hh: ...this. Move inclusions of topology abstractions... * oln/core/abstract/topology/all.hh: ...here (new file). * oln/core/topology_entry.hh: Adjust * oln/core/abstract/topology_being_random_accessible.hh, * oln/core/abstract/topology_having_bbox.hh, * oln/core/abstract/topology_having_neighborhood.hh, * oln/core/abstract/topology_having_subset.hh: Rename as... * oln/core/abstract/topology/topology_being_random_accessible.hh, * oln/core/abstract/topology/topology_having_bbox.hh, * oln/core/abstract/topology/topology_having_neighborhood.hh, * oln/core/abstract/topology/topology_having_subset.hh: ...these. Adjust header guards and inclusions. * oln/Makefile.am (nobase_oln_HEADERS): Adjust. Makefile.am | 36 +++---- basics1d.hh | 7 - basics2d.hh | 1 basics3d.hh | 7 - core/1d/dpoint1d.hh | 3 core/1d/image1d.hh | 9 + core/1d/neighb1d.hh | 2 core/1d/point1d.hh | 4 core/2d/dpoint2d.hh | 3 core/2d/image2d.hh | 9 + core/2d/neighb2d.hh | 2 core/2d/point2d.hh | 4 core/3d/dpoint3d.hh | 2 core/3d/image3d.hh | 9 + core/3d/neighb3d.hh | 2 core/3d/point3d.hh | 4 core/abstract/bbox.hh | 19 ---- core/abstract/image.hh | 3 core/abstract/image/accessibility/hierarchy.hh | 1 core/abstract/image/all.hh | 50 +++++++++++ core/abstract/image/bbox/hierarchy.hh | 13 +- core/abstract/image/dimension/hierarchy.hh | 1 core/abstract/image/hierarchies.hh | 23 ----- core/abstract/image/hybrid/classical.hh | 5 + core/abstract/image/mutability/hierarchy.hh | 9 + core/abstract/image/neighborhood/hierarchy.hh | 15 +-- core/abstract/image/type/hierarchy.hh | 13 +- core/abstract/image/type/integre.hh | 12 +- core/abstract/point_set.hh | 5 - core/abstract/point_set/all.hh | 45 +++++++++ core/abstract/point_set/hierarchies.hh | 9 - core/abstract/point_set/point_set_being_connected.hh | 7 - core/abstract/point_set/point_set_being_random_accessible.hh | 7 - core/abstract/point_set/point_set_having_bbox.hh | 39 ++++++-- core/abstract/point_set/point_set_having_known_size.hh | 8 - core/abstract/topology.hh | 5 - core/abstract/topology/all.hh | 45 +++++++++ core/abstract/topology/hierarchies.hh | 15 --- core/abstract/topology/topology_being_random_accessible.hh | 7 - core/abstract/topology/topology_having_bbox.hh | 7 - core/abstract/topology/topology_having_neighborhood.hh | 7 - core/abstract/topology/topology_having_subset.hh | 7 - core/fwd_piter.hh | 3 core/gen/bbox.hh | 4 core/gen/fwd_qiter_win.hh | 3 core/gen/mapimage.hh | 4 core/gen/neighb.hh | 1 core/gen/piter_isubset.hh | 3 core/gen/topo_bbox.hh | 4 core/gen/window.hh | 2 core/image_entry.hh | 2 core/internal/bbox_bkd_piter.hh | 1 core/internal/bbox_fwd_piter.hh | 1 core/point_set_entry.hh | 3 core/topology_entry.hh | 3 debug/print.hh | 3 io/pnm.hh | 6 + level/fill.hh | 1 morpher/add_isubset.hh | 2 morpher/add_neighborhood.hh | 1 60 files changed, 332 insertions(+), 196 deletions(-) Index: oln/debug/print.hh --- oln/debug/print.hh (revision 616) +++ oln/debug/print.hh (working copy) @@ -30,6 +30,9 @@ # include <iostream> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hybrid/classical.hh> +# include <oln/core/abstract/iterator.hh> +# include <oln/core/2d/point2d.hh> namespace oln Index: oln/level/fill.hh --- oln/level/fill.hh (revision 616) +++ oln/level/fill.hh (working copy) @@ -33,6 +33,7 @@ # include <mlc/is_a.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/iterator.hh> # include <oln/core/automatic/image_being_mutable.hh> Index: oln/basics1d.hh --- oln/basics1d.hh (revision 616) +++ oln/basics1d.hh (working copy) @@ -35,25 +35,18 @@ # include <oln/core/1d/grid1d.hh> # include <oln/core/1d/point1d.hh> -namespace oln { template class point1d_<int>; } # include <oln/core/1d/dpoint1d.hh> -namespace oln { template class dpoint1d_<int>; } # include <oln/core/gen/bbox.hh> -namespace oln { template class bbox_<point1d>; } # include <oln/core/gen/topo_lbbox.hh> -namespace oln { template class topo_lbbox_<point1d>; } # include <oln/core/gen/fwd_piter_bbox.hh> -namespace oln { template class fwd_piter_bbox_<topo1d>; } # include <oln/core/gen/bkd_piter_bbox.hh> -namespace oln { template class bkd_piter_bbox_<topo1d>; } # include <oln/core/gen/neighb.hh> -namespace oln { template class neighb_<dpoint1d>; } # include <oln/core/1d/neighb1d.hh> # include <oln/core/1d/image1d.hh> Index: oln/io/pnm.hh --- oln/io/pnm.hh (revision 616) +++ oln/io/pnm.hh (working copy) @@ -33,6 +33,12 @@ # include <fstream> # include <string> +# include <oln/core/abstract/iterator.hh> +# include <oln/core/gen/fwd_piter_bbox.hh> +# include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/fwd_piter.hh> +# include <oln/core/2d/aliases.hh> +# include <oln/core/2d/dpoint2d.hh> # include <oln/core/2d/image2d.hh> Index: oln/core/fwd_piter.hh --- oln/core/fwd_piter.hh (revision 616) +++ oln/core/fwd_piter.hh (working copy) @@ -30,6 +30,9 @@ # include <oln/core/abstract/entry.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/1d/aliases.hh> +# include <oln/core/2d/aliases.hh> +# include <oln/core/3d/aliases.hh> namespace oln Index: oln/core/point_set_entry.hh --- oln/core/point_set_entry.hh (revision 616) +++ oln/core/point_set_entry.hh (working copy) @@ -29,8 +29,7 @@ # define OLN_CORE_POINT_SET_ENTRY_HH # include <oln/core/abstract/entry.hh> -# include <oln/core/abstract/point_set.hh> - +# include <oln/core/abstract/point_set/all.hh> namespace oln Index: oln/core/topology_entry.hh --- oln/core/topology_entry.hh (revision 616) +++ oln/core/topology_entry.hh (working copy) @@ -29,8 +29,7 @@ # define OLN_CORE_TOPOLOGY_ENTRY_HH # include <oln/core/abstract/entry.hh> -# include <oln/core/abstract/topology.hh> - +# include <oln/core/abstract/topology/all.hh> namespace oln Index: oln/core/image_entry.hh --- oln/core/image_entry.hh (revision 616) +++ oln/core/image_entry.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_IMAGE_ENTRY_HH # include <oln/core/abstract/entry.hh> -# include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/all.hh> Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 616) +++ oln/core/abstract/image.hh (working copy) @@ -179,7 +179,4 @@ } // end of namespace oln -# include <oln/core/abstract/image/hierarchies.hh> - - #endif // ! OLN_CORE_ABSTRACT_IMAGE_HH Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 616) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_HYBRID_CLASSICAL_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> # include <oln/core/abstract/image/dimension/2d.hh> # include <oln/core/abstract/image/bbox/hierarchy.hh> @@ -77,6 +78,10 @@ } // end of namespace oln::abstract + // Fwd. decl. + class grid2d; + + /// 2-D case. template <typename E> struct case_< image_hybrid_hierarchy_wrt_classical, E, 1 > : Index: oln/core/abstract/image/type/integre.hh --- oln/core/abstract/image/type/integre.hh (revision 616) +++ oln/core/abstract/image/type/integre.hh (working copy) @@ -108,34 +108,34 @@ /// 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 ) > + where_< mlc_is_a( 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; + typedef abstract::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 ) > + where_< mlc_is_a( 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; + typedef abstract::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 ) > + where_< mlc_is_a( 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; + typedef abstract::color_image<E> ret; }; /// \} Index: oln/core/abstract/image/type/hierarchy.hh --- oln/core/abstract/image/type/hierarchy.hh (revision 616) +++ oln/core/abstract/image/type/hierarchy.hh (working copy) @@ -28,8 +28,9 @@ #ifndef OLN_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH # define OLN_CORE_ABSTRACT_IMAGE_TYPE_HIERARCHY_HH -# include <xtd/valtraits.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> +# include <xtd/valtraits.hh> /* Image ``type'' hierarchy (summary). @@ -38,7 +39,7 @@ /image/ ^ | - ,--------------+-------------+-------------+--------+ + ,--------------+-------------+-------------+--------. | | | | | /grey_level_image/ /color_image/ /label_image/ /data_image/ ... ^ ^ ^ ^ ^ ^ @@ -46,10 +47,10 @@ | | | /binary_image/ | | | | | ^ | | | | | | | | - ,----------------------------------------------------------. - | The selection of the super class(es) is made according | - | to the value of type_of(I, value). | - `----------------------------------------------------------' + ,-------------------------------------------------------------. + | The selection of the super class(es) is made according to | + | the value of type_of(I, value). | + `-------------------------------------------------------------' | | | | | | o o o o o o Index: oln/core/abstract/image/mutability/hierarchy.hh --- oln/core/abstract/image/mutability/hierarchy.hh (revision 616) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_MUTABILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> # include <oln/core/automatic/image_being_mutable.hh> @@ -37,7 +38,7 @@ { /*-------------------------. - | Dimension abstractions. | + | Mutability abstraction. | `-------------------------*/ namespace abstract @@ -105,9 +106,9 @@ } // end of namespace oln::abstract - /*-------------------. - | Dimension switch. | - `-------------------*/ + /*--------------------. + | Mutability switch. | + `--------------------*/ /// With mutability. template <typename E> Index: oln/core/abstract/image/hierarchies.hh --- oln/core/abstract/image/hierarchies.hh (revision 616) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -52,27 +52,4 @@ } // end of namespace oln - -// Hierarchy 1: image w.r.t. dimension. -# include <oln/core/abstract/image/dimension/hierarchy.hh> - -// Hierarchy 2: image w.r.t. type of data. -# include <oln/core/abstract/image/type/hierarchy.hh> - -// Hierarchy 3: image w.r.t. neighborhood. -# include <oln/core/abstract/image/neighborhood/hierarchy.hh> - -// Hierarchy 4: image w.r.t. bounding box. -# include <oln/core/abstract/image/bbox/hierarchy.hh> - -// Hierarchy 5: image w.r.t. accessibility. -# include <oln/core/abstract/image/accessibility/hierarchy.hh> - -// Hierarchy 6: image w.r.t. data mutability. -# include <oln/core/abstract/image/mutability/hierarchy.hh> - -// Hybrid hierarchy 7: image w.r.t. classical features. -# include <oln/core/abstract/image/hybrid/classical.hh> - - #endif // ! OLN_CORE_ABSTRACT_IMAGE_HIERARCHIES_HH Index: oln/core/abstract/image/dimension/hierarchy.hh --- oln/core/abstract/image/dimension/hierarchy.hh (revision 616) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> /* Image dimension hierarchy (summary). Index: oln/core/abstract/image/all.hh --- oln/core/abstract/image/all.hh (revision 0) +++ oln/core/abstract/image/all.hh (revision 0) @@ -0,0 +1,50 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_IMAGE_ALL_HH +# define OLN_CORE_ABSTRACT_IMAGE_ALL_HH + +# include <oln/core/abstract/image.hh> + +# include <oln/core/abstract/image/hierarchies.hh> + +// Hierarchy 1: image w.r.t. dimension. +# include <oln/core/abstract/image/dimension/hierarchy.hh> +// Hierarchy 2: image w.r.t. type of data. +# include <oln/core/abstract/image/type/hierarchy.hh> +// Hierarchy 3: image w.r.t. neighborhood. +# include <oln/core/abstract/image/neighborhood/hierarchy.hh> +// Hierarchy 4: image w.r.t. bounding box. +# include <oln/core/abstract/image/bbox/hierarchy.hh> +// Hierarchy 5: image w.r.t. accessibility. +# include <oln/core/abstract/image/accessibility/hierarchy.hh> +// Hierarchy 6: image w.r.t. data mutability. +# include <oln/core/abstract/image/mutability/hierarchy.hh> +// Hybrid hierarchy 7: image w.r.t. classical features. +# include <oln/core/abstract/image/hybrid/classical.hh> + +#endif // ! OLN_CORE_ABSTRACT_IMAGE_ALL_HH Index: oln/core/abstract/image/accessibility/hierarchy.hh --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 616) +++ oln/core/abstract/image/accessibility/hierarchy.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> # include <oln/core/automatic/image_being_random_accessible.hh> Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 616) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -29,13 +29,14 @@ # define OLN_CORE_ABSTRACT_IMAGE_NEIGHBORHOOD_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> # include <oln/core/automatic/image_having_neighborhood.hh> /* Image having neighborhood hierarchy (summary). -FIXME: TODO! + FIXME: TODO (diagram)! Default case: If the neighborhood type returned by @@ -46,9 +47,9 @@ namespace oln { - /*-------------------------. - | Dimension abstractions. | - `-------------------------*/ + /*---------------------------. + | Neighborhood abstraction. | + `---------------------------*/ namespace abstract { @@ -109,9 +110,9 @@ } // end of namespace oln::abstract - /*-------------------. - | Dimension switch. | - `-------------------*/ + /*----------------------. + | Neighborhood switch. | + `----------------------*/ /// With neighborhood. template <typename E> Index: oln/core/abstract/image/bbox/hierarchy.hh --- oln/core/abstract/image/bbox/hierarchy.hh (revision 616) +++ oln/core/abstract/image/bbox/hierarchy.hh (working copy) @@ -29,15 +29,16 @@ # define OLN_CORE_ABSTRACT_IMAGE_BBOX_HIERARCHY_HH # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/hierarchies.hh> # include <oln/core/abstract/bbox.hh> namespace oln { - /*-------------------------. - | Dimension abstractions. | - `-------------------------*/ + /*---------------------------. + | Bounding box abstraction. | + `---------------------------*/ namespace abstract { @@ -126,9 +127,9 @@ } // end of namespace oln::abstract - /*-------------------. - | Dimension switch. | - `-------------------*/ + /*----------------------. + | Bounding box switch. | + `----------------------*/ /// With bbox. template <typename E> Index: oln/core/abstract/bbox.hh --- oln/core/abstract/bbox.hh (revision 616) +++ oln/core/abstract/bbox.hh (working copy) @@ -29,7 +29,7 @@ #ifndef OLN_CORE_ABSTRACT_BBOX_HH # define OLN_CORE_ABSTRACT_BBOX_HH -# include <oln/core/abstract/point_set_having_bbox.hh> +# include <oln/core/abstract/point_set/point_set_having_bbox.hh> namespace oln @@ -98,23 +98,6 @@ } // end of namespace oln::abstract - - template <typename E> - struct case_ < point_set_hierarchy_wrt_bbox, E, 1 > - : where_< mlc::eq_< oln_type_of(E, bbox), E > > - { - typedef abstract::bbox<E> ret; - }; - - - template <typename E> - struct case_ < point_set_hierarchy_wrt_bbox, E, 2 > - : where_< mlc::neq_< oln_type_of(E, bbox), mlc::none > > - { - typedef abstract::point_set_having_bbox<E> ret; - }; - - } // end of namespace oln Index: oln/core/abstract/point_set.hh --- oln/core/abstract/point_set.hh (revision 616) +++ oln/core/abstract/point_set.hh (working copy) @@ -116,9 +116,4 @@ } // end of namespace oln - -# include <oln/core/abstract/point_set_hierarchies.hh> - - - #endif // ! OLN_CORE_ABSTRACT_POINT_SET_HH Index: oln/core/abstract/point_set/point_set_being_random_accessible.hh --- oln/core/abstract/point_set/point_set_being_random_accessible.hh (revision 0) +++ oln/core/abstract/point_set/point_set_being_random_accessible.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/point_set/hierarchies.hh> @@ -83,4 +84,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/point_set/point_set_having_known_size.hh --- oln/core/abstract/point_set/point_set_having_known_size.hh (revision 0) +++ oln/core/abstract/point_set/point_set_having_known_size.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH -# define OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_KNOWN_SIZE_HH +# define OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_KNOWN_SIZE_HH # include <oln/core/abstract/point_set.hh> - +# include <oln/core/abstract/point_set/hierarchies.hh> namespace oln @@ -82,5 +82,5 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HAVING_KNOWN_SIZE_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_KNOWN_SIZE_HH Index: oln/core/abstract/point_set/hierarchies.hh --- oln/core/abstract/point_set/hierarchies.hh (revision 0) +++ oln/core/abstract/point_set/hierarchies.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH # define OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH +# include <oln/core/abstract/entry.hh> # include <oln/core/abstract/point_set.hh> @@ -42,13 +43,5 @@ } // end of namespace oln -# include <oln/core/abstract/point_set_having_known_size.hh> -# include <oln/core/abstract/point_set_being_random_accessible.hh> -# include <oln/core/abstract/point_set_having_bbox.hh> -# include <oln/core/abstract/bbox.hh> -# include <oln/core/abstract/point_set_being_connected.hh> - - - #endif // ! OLN_CORE_ABSTRACT_POINT_SET_HIERARCHIES_HH Index: oln/core/abstract/point_set/all.hh --- oln/core/abstract/point_set/all.hh (revision 0) +++ oln/core/abstract/point_set/all.hh (revision 0) @@ -0,0 +1,45 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_POINT_SET_ALL_HH +# define OLN_CORE_ABSTRACT_POINT_SET_ALL_HH + +# include <oln/core/abstract/point_set.hh> + +# include <oln/core/abstract/point_set/hierarchies.hh> + +// Hierarchy 1: point set w.r.t. size. +# include <oln/core/abstract/point_set/point_set_having_known_size.hh> +// Hierarchy 2: point set w.r.t. accessibility. +# include <oln/core/abstract/point_set/point_set_being_random_accessible.hh> +// Hierarchy 3: point set w.r.t. bbox. +# include <oln/core/abstract/point_set/point_set_having_bbox.hh> +# include <oln/core/abstract/bbox.hh> +// Hierarchy 4: point set w.r.t. connexity. +# include <oln/core/abstract/point_set/point_set_being_connected.hh> + +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_ALL_HH Index: oln/core/abstract/point_set/point_set_being_connected.hh --- oln/core/abstract/point_set/point_set_being_connected.hh (revision 0) +++ oln/core/abstract/point_set/point_set_being_connected.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH -# define OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_CONNECTED_HH +# define OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_CONNECTED_HH # include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/point_set/hierarchies.hh> namespace oln @@ -198,4 +199,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_POINT_SET_BEING_CONNECTED_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_BEING_CONNECTED_HH Index: oln/core/abstract/point_set/point_set_having_bbox.hh --- oln/core/abstract/point_set/point_set_having_bbox.hh (revision 0) +++ oln/core/abstract/point_set/point_set_having_bbox.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH -# define OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH +#ifndef OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_BBOX_HH +# define OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_BBOX_HH # include <oln/core/abstract/point_set.hh> +# include <oln/core/abstract/point_set/hierarchies.hh> namespace oln @@ -37,15 +38,14 @@ namespace abstract { - template <typename E> class point_set_having_bbox : public virtual point_set<E> { - typedef oln_type_of(E, point) point_t; - typedef oln_type_of(E, bbox) bbox_t; + typedef oln_check_type_of(E, point) point_t; + typedef oln_check_type_of(E, bbox) bbox_t; - typedef oln_type_of(point_t, coord) coord_t; - typedef oln_type_of(point_t, dim) dim_t; + typedef oln_check_type_of(point_t, coord) coord_t; + typedef oln_check_type_of(point_t, dim) dim_t; enum { n = mlc_value(dim_t) }; public: @@ -129,11 +129,30 @@ } // end of namespace oln::abstract - // an abstract sub-class of point_set_having_bbox<E> is abstract::bbox<E>; - // the switch-case mechanism is in oln/core/abstract/bbox.hh + // Fwd. decl. + namespace abstract + { + template <typename E> class bbox; + } + + + template <typename E> + struct case_ < point_set_hierarchy_wrt_bbox, E, 1 > + : where_< mlc::eq_< oln_type_of(E, bbox), E > > + { + typedef abstract::bbox<E> ret; + }; + + + template <typename E> + struct case_ < point_set_hierarchy_wrt_bbox, E, 2 > + : where_< mlc::neq_< oln_type_of(E, bbox), mlc::none > > + { + typedef abstract::point_set_having_bbox<E> ret; + }; } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_POINT_SET_HAVING_BBOX_HH +#endif // ! OLN_CORE_ABSTRACT_POINT_SET_POINT_SET_HAVING_BBOX_HH Index: oln/core/abstract/topology.hh --- oln/core/abstract/topology.hh (revision 616) +++ oln/core/abstract/topology.hh (working copy) @@ -101,9 +101,4 @@ } // end of namespace oln - -# include <oln/core/abstract/topology_hierarchies.hh> - - - #endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HH Index: oln/core/abstract/topology/topology_having_bbox.hh --- oln/core/abstract/topology/topology_having_bbox.hh (revision 0) +++ oln/core/abstract/topology/topology_having_bbox.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH -# define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/topology/hierarchies.hh> # include <oln/core/automatic/topology_having_bbox.hh> @@ -106,4 +107,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH Index: oln/core/abstract/topology/hierarchies.hh --- oln/core/abstract/topology/hierarchies.hh (revision 0) +++ oln/core/abstract/topology/hierarchies.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH # define OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH +# include <oln/core/abstract/entry.hh> # include <oln/core/abstract/topology.hh> @@ -42,19 +43,5 @@ } // end of namespace oln -// Hierarchy 1: topology w.r.t. accessibility. -# include <oln/core/abstract/topology_being_random_accessible.hh> - -// Hierarchy 2: topology w.r.t. bounding box. -# include <oln/core/abstract/topology_having_bbox.hh> - -// Hierarchy 3: topology w.r.t. neighborhood. -# include <oln/core/abstract/topology_having_neighborhood.hh> - -// Hierarchy 4: topology w.r.t. neighborhood. -# include <oln/core/abstract/topology_having_subset.hh> - - - #endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH Index: oln/core/abstract/topology/all.hh --- oln/core/abstract/topology/all.hh (revision 0) +++ oln/core/abstract/topology/all.hh (revision 0) @@ -0,0 +1,45 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_ALL_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_ALL_HH + +# include <oln/core/abstract/topology.hh> + +# include <oln/core/abstract/topology/hierarchies.hh> + +// Hierarchy 1: topology w.r.t. accessibility. +# include <oln/core/abstract/topology/topology_being_random_accessible.hh> +// Hierarchy 2: topology w.r.t. bounding box. +# include <oln/core/abstract/topology/topology_having_bbox.hh> +// Hierarchy 3: topology w.r.t. neighborhood. +# include <oln/core/abstract/topology/topology_having_neighborhood.hh> +// Hierarchy 4: topology w.r.t. subset. +# include <oln/core/abstract/topology/topology_having_subset.hh> + +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_ALL_HH + Index: oln/core/abstract/topology/topology_being_random_accessible.hh --- oln/core/abstract/topology/topology_being_random_accessible.hh (revision 0) +++ oln/core/abstract/topology/topology_being_random_accessible.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/topology/hierarchies.hh> # include <oln/core/automatic/topology_being_random_accessible.hh> @@ -94,4 +95,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/topology/topology_having_subset.hh --- oln/core/abstract/topology/topology_having_subset.hh (revision 0) +++ oln/core/abstract/topology/topology_having_subset.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_SUBSET_HH -# define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_SUBSET_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH # include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/topology/hierarchies.hh> # include <oln/core/automatic/topology_having_subset.hh> @@ -86,4 +87,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_SUBSET_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH Index: oln/core/abstract/topology/topology_having_neighborhood.hh --- oln/core/abstract/topology/topology_having_neighborhood.hh (revision 0) +++ oln/core/abstract/topology/topology_having_neighborhood.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# define OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH # include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/topology/hierarchies.hh> # include <oln/core/automatic/topology_having_neighborhood.hh> @@ -97,4 +98,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_ABSTRACT_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/1d/neighb1d.hh --- oln/core/1d/neighb1d.hh (revision 616) +++ oln/core/1d/neighb1d.hh (working copy) @@ -30,7 +30,7 @@ # define OLN_CORE_1D_NEIGHB1D_HH # include <oln/core/gen/neighb.hh> -# include <oln/core/1d/aliases.hh> +# include <oln/core/1d/dpoint1d.hh> namespace oln Index: oln/core/1d/dpoint1d.hh --- oln/core/1d/dpoint1d.hh (revision 616) +++ oln/core/1d/dpoint1d.hh (working copy) @@ -32,6 +32,8 @@ # include <mlc/int.hh> # include <oln/core/1d/point1d.hh> # include <oln/core/internal/dpoint_nd.hh> +// For oln::dpoint1d and oln::dpoint1df. +# include <oln/core/1d/aliases.hh> namespace oln @@ -95,4 +97,5 @@ } // end of namespace oln + #endif // ! OLN_CORE_1D_DPOINT1D_HH Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 616) +++ oln/core/1d/image1d.hh (working copy) @@ -31,12 +31,21 @@ # include <oln/core/image_entry.hh> # include <oln/core/1d/array1d.hh> +# include <oln/core/1d/point1d.hh> +# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> +// For topo1d. +# include <oln/core/1d/aliases.hh> namespace oln { + // FIXME: Inexplicably, this explicit instantiation is required to + // have topo_lbbox_<point1d> work. See if we can get rid of it. + template class bbox_<point1d>; + + // Forward declaration. template <typename T> class image1d; Index: oln/core/1d/point1d.hh --- oln/core/1d/point1d.hh (revision 616) +++ oln/core/1d/point1d.hh (working copy) @@ -31,6 +31,8 @@ # include <mlc/int.hh> # include <oln/core/internal/point_nd.hh> +// For oln::point1d and oln::point1df. +# include <oln/core/1d/aliases.hh> namespace oln @@ -102,7 +104,5 @@ } // end of namespace oln -# include <oln/core/1d/dpoint1d.hh> - #endif // ! OLN_CORE_1D_POINT1D_HH Index: oln/core/2d/neighb2d.hh --- oln/core/2d/neighb2d.hh (revision 616) +++ oln/core/2d/neighb2d.hh (working copy) @@ -30,7 +30,7 @@ # define OLN_CORE_2D_NEIGHB2D_HH # include <oln/core/gen/neighb.hh> -# include <oln/core/2d/aliases.hh> +# include <oln/core/2d/dpoint2d.hh> namespace oln Index: oln/core/2d/dpoint2d.hh --- oln/core/2d/dpoint2d.hh (revision 616) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -32,6 +32,8 @@ # include <mlc/int.hh> # include <oln/core/2d/point2d.hh> # include <oln/core/internal/dpoint_nd.hh> +// For oln::dpoint2d and oln::dpoint2df. +# include <oln/core/2d/aliases.hh> namespace oln @@ -121,6 +123,7 @@ # endif + } // end of namespace oln Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 616) +++ oln/core/2d/image2d.hh (working copy) @@ -31,12 +31,21 @@ # include <oln/core/image_entry.hh> # include <oln/core/2d/array2d.hh> +# include <oln/core/2d/point2d.hh> +# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> +// For topo2d. +# include <oln/core/2d/aliases.hh> namespace oln { + // FIXME: Inexplicably, this explicit instantiation is required to + // have topo_lbbox_<point2d> work. See if we can get rid of it. + template class bbox_<point2d>; + + // Forward declaration. template <typename T> class image2d; Index: oln/core/2d/point2d.hh --- oln/core/2d/point2d.hh (revision 616) +++ oln/core/2d/point2d.hh (working copy) @@ -31,6 +31,8 @@ # include <mlc/int.hh> # include <oln/core/internal/point_nd.hh> +// For oln::point2d and oln::point2df. +# include <oln/core/2d/aliases.hh> namespace oln @@ -140,7 +142,5 @@ } // end of namespace oln -# include <oln/core/2d/dpoint2d.hh> - #endif // ! OLN_CORE_2D_POINT2D_HH Index: oln/core/3d/neighb3d.hh --- oln/core/3d/neighb3d.hh (revision 616) +++ oln/core/3d/neighb3d.hh (working copy) @@ -30,7 +30,7 @@ # define OLN_CORE_3D_NEIGHB3D_HH # include <oln/core/gen/neighb.hh> -# include <oln/core/3d/aliases.hh> +# include <oln/core/3d/dpoint3d.hh> namespace oln Index: oln/core/3d/dpoint3d.hh --- oln/core/3d/dpoint3d.hh (revision 616) +++ oln/core/3d/dpoint3d.hh (working copy) @@ -32,6 +32,8 @@ # include <mlc/int.hh> # include <oln/core/3d/point3d.hh> # include <oln/core/internal/dpoint_nd.hh> +// For oln::dpoint3d and oln::dpoint3df. +# include <oln/core/3d/aliases.hh> namespace oln Index: oln/core/3d/image3d.hh --- oln/core/3d/image3d.hh (revision 616) +++ oln/core/3d/image3d.hh (working copy) @@ -31,12 +31,21 @@ # include <oln/core/image_entry.hh> # include <oln/core/3d/array3d.hh> +# include <oln/core/3d/point3d.hh> +# include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> +// For topo3d. +# include <oln/core/3d/aliases.hh> namespace oln { + // FIXME: Inexplicably, this explicit instantiation is required to + // have topo_lbbox_<point3d> work. See if we can get rid of it. + template class bbox_<point3d>; + + // Forward declaration. template <typename T> class image3d; Index: oln/core/3d/point3d.hh --- oln/core/3d/point3d.hh (revision 616) +++ oln/core/3d/point3d.hh (working copy) @@ -31,6 +31,8 @@ # include <mlc/int.hh> # include <oln/core/internal/point_nd.hh> +// For oln::point3d and oln::point3df. +# include <oln/core/3d/aliases.hh> namespace oln @@ -108,7 +110,5 @@ } // end of namespace oln -# include <oln/core/3d/dpoint3d.hh> - #endif // ! OLN_CORE_3D_POINT3D_HH Index: oln/core/gen/piter_isubset.hh --- oln/core/gen/piter_isubset.hh (revision 616) +++ oln/core/gen/piter_isubset.hh (working copy) @@ -28,8 +28,9 @@ #ifndef OLN_CORE_GEN_PITER_ISUBSET_HH # define OLN_CORE_GEN_PITER_ISUBSET_HH -# include <oln/core/abstract/topology.hh> # include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/abstract/topology.hh> +# include <oln/core/gen/topo_add_isubset.hh> namespace oln Index: oln/core/gen/bbox.hh --- oln/core/gen/bbox.hh (revision 616) +++ oln/core/gen/bbox.hh (working copy) @@ -262,8 +262,4 @@ } // end of namespace oln -# include <oln/core/gen/bbox_fwd_piter.hh> -# include <oln/core/gen/bbox_bkd_piter.hh> - - #endif // ! OLN_CORE_GEN_BBOX_HH Index: oln/core/gen/topo_bbox.hh --- oln/core/gen/topo_bbox.hh (revision 616) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -32,11 +32,9 @@ # include <oln/core/topology_entry.hh> - namespace oln { - // Forward declarations. template <typename point> class topo_bbox_; @@ -137,7 +135,7 @@ bool topo_bbox_<point>::impl_has_large(const point& p) const { - return lbb_.has(p); + return bb_.has(p); } # endif Index: oln/core/gen/neighb.hh --- oln/core/gen/neighb.hh (revision 616) +++ oln/core/gen/neighb.hh (working copy) @@ -32,6 +32,7 @@ # include <set> # include <vector> # include <oln/core/neighborhood_entry.hh> +# include <oln/core/abstract/dpoint.hh> namespace oln Index: oln/core/gen/fwd_qiter_win.hh --- oln/core/gen/fwd_qiter_win.hh (revision 616) +++ oln/core/gen/fwd_qiter_win.hh (working copy) @@ -28,9 +28,8 @@ #ifndef OLN_CORE_GEN_FWD_QITER_WIN_HH # define OLN_CORE_GEN_FWD_QITER_WIN_HH -# include <oln/core/abstract/topology.hh> # include <oln/core/abstract/iterator_on_points.hh> -# include <oln/core/gen/win.hh> +# include <oln/core/gen/window.hh> namespace oln Index: oln/core/gen/window.hh --- oln/core/gen/window.hh (revision 616) +++ oln/core/gen/window.hh (working copy) @@ -31,6 +31,8 @@ # include <set> # include <vector> +# include <mlc/assert.hh> +# include <oln/core/abstract/dpoint.hh> namespace oln Index: oln/core/gen/mapimage.hh --- oln/core/gen/mapimage.hh (revision 616) +++ oln/core/gen/mapimage.hh (working copy) @@ -29,9 +29,11 @@ #ifndef OLN_CORE_GEN_MAPIMAGE_HH # define OLN_CORE_GEN_MAPIMAGE_HH +# include <map> # include <oln/core/image_entry.hh> # include <oln/core/gen/topo_bbox.hh> -# include <map> +# include <oln/core/gen/fwd_piter_bbox.hh> +# include <oln/core/gen/bkd_piter_bbox.hh> namespace oln Index: oln/core/internal/bbox_bkd_piter.hh --- oln/core/internal/bbox_bkd_piter.hh (revision 616) +++ oln/core/internal/bbox_bkd_piter.hh (working copy) @@ -32,6 +32,7 @@ # include <oln/core/abstract/iterator_on_points.hh> # include <oln/core/abstract/point.hh> # include <oln/core/gen/bbox.hh> +# include <oln/core/fwd_piter.hh> namespace oln Index: oln/core/internal/bbox_fwd_piter.hh --- oln/core/internal/bbox_fwd_piter.hh (revision 616) +++ oln/core/internal/bbox_fwd_piter.hh (working copy) @@ -32,6 +32,7 @@ # include <oln/core/abstract/iterator_on_points.hh> # include <oln/core/abstract/point.hh> # include <oln/core/gen/bbox.hh> +# include <oln/core/fwd_piter.hh> namespace oln Index: oln/basics2d.hh --- oln/basics2d.hh (revision 616) +++ oln/basics2d.hh (working copy) @@ -38,7 +38,6 @@ # include <oln/core/2d/dpoint2d.hh> # include <oln/core/gen/bbox.hh> -namespace oln { template class bbox_<point2d>; } # include <oln/core/gen/topo_lbbox.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 616) +++ oln/Makefile.am (working copy) @@ -29,15 +29,6 @@ \ core/abstract/image/accessibility/hierarchy.hh \ \ - core/abstract/any.hh \ - core/abstract/bbox.hh \ - core/abstract/dpoint.hh \ - core/abstract/entry.hh \ - core/abstract/fwd_decls.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 \ @@ -46,6 +37,7 @@ core/abstract/image/dimension/hierarchy.hh \ \ core/abstract/image/hybrid/classical.hh \ + \ core/abstract/image/mutability/hierarchy.hh \ \ core/abstract/image/neighborhood/hierarchy.hh \ @@ -58,14 +50,30 @@ core/abstract/image/type/integre.hh \ core/abstract/image/type/label.hh \ \ + core/abstract/image/all.hh \ core/abstract/image/hierarchies.hh \ \ core/abstract/internal/image_impl.hh \ \ + core/abstract/point_set/all.hh \ + core/abstract/point_set/hierarchies.hh \ + core/abstract/point_set/point_set_being_connected.hh \ + core/abstract/point_set/point_set_being_random_accessible.hh \ + core/abstract/point_set/point_set_having_bbox.hh \ + core/abstract/point_set/point_set_having_known_size.hh \ + \ + core/abstract/topology/all.hh \ + core/abstract/topology/hierarchies.hh \ + core/abstract/topology/topology_being_random_accessible.hh \ + core/abstract/topology/topology_having_bbox.hh \ + core/abstract/topology/topology_having_neighborhood.hh \ + core/abstract/topology/topology_having_subset.hh \ + \ core/abstract/any.hh \ core/abstract/bbox.hh \ core/abstract/dpoint.hh \ core/abstract/entry.hh \ + core/abstract/fwd_decls.hh \ core/abstract/grid.hh \ core/abstract/image.hh \ core/abstract/iterator.hh \ @@ -73,17 +81,7 @@ core/abstract/neighborhood.hh \ core/abstract/point.hh \ core/abstract/point_set.hh \ - core/abstract/point_set_being_connected.hh \ - core/abstract/point_set_being_random_accessible.hh \ - core/abstract/point_set_having_bbox.hh \ - core/abstract/point_set_having_known_size.hh \ - core/abstract/point_set_hierarchies.hh \ core/abstract/topology.hh \ - core/abstract/topology_being_random_accessible.hh \ - core/abstract/topology_having_bbox.hh \ - core/abstract/topology_having_neighborhood.hh \ - core/abstract/topology_having_subset.hh \ - core/abstract/topology_hierarchies.hh \ \ core/automatic/image.hh \ core/automatic/image_being_mutable.hh \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 616) +++ oln/basics3d.hh (working copy) @@ -35,25 +35,18 @@ # include <oln/core/3d/grid3d.hh> # include <oln/core/3d/point3d.hh> -namespace oln { template class point3d_<int>; } # include <oln/core/3d/dpoint3d.hh> -namespace oln { template class dpoint3d_<int>; } # include <oln/core/gen/bbox.hh> -namespace oln { template class bbox_<point3d>; } # include <oln/core/gen/topo_lbbox.hh> -namespace oln { template class topo_lbbox_<point3d>; } # include <oln/core/gen/fwd_piter_bbox.hh> -namespace oln { template class fwd_piter_bbox_<topo3d>; } # include <oln/core/gen/bkd_piter_bbox.hh> -namespace oln { template class bkd_piter_bbox_<topo3d>; } # include <oln/core/gen/neighb.hh> -namespace oln { template class neighb_<dpoint3d>; } # include <oln/core/3d/neighb3d.hh> # include <oln/core/3d/image3d.hh> Index: oln/morpher/add_isubset.hh --- oln/morpher/add_isubset.hh (revision 616) +++ oln/morpher/add_isubset.hh (working copy) @@ -28,6 +28,8 @@ #ifndef OLN_MORPHER_ADD_ISUBSET # define OLN_MORPHER_ADD_ISUBSET +# include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/type/binary.hh> # include <oln/morpher/internal/image_extension.hh> # include <oln/core/gen/topo_add_isubset.hh> # include <oln/core/gen/piter_isubset.hh> Index: oln/morpher/add_neighborhood.hh --- oln/morpher/add_neighborhood.hh (revision 616) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/morpher/internal/image_extension.hh> # include <oln/core/gen/topo_add_nbh.hh> +# include <oln/core/fwd_piter.hh> # include <oln/core/gen/fwd_niter_neighb.hh>

17 years, 7 months

616: Add xtd accessors (pure functions based on accessor methods).

by Thierry GERAUD

2006-10-10 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add xtd accessors (pure functions based on accessor methods). * xtd/accessor.hh: New. * xtd/vec.hh (operator<<): Move outside of class. (operator<<): New specializations for 'unsigned char' and 'signed char' so that data is considered as number and not as 'char'. Index: xtd/accessor.hh =================================================================== --- xtd/accessor.hh (revision 0) +++ xtd/accessor.hh (revision 0) @@ -0,0 +1,77 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef XTD_ACCESSOR_HH +# define XTD_ACCESSOR_HH + +# include <xtd/abstract/plain_nary_fun.hh> +# include <xtd/mfun.hh> + + +# define xtd_decl_accessor(MethodName) \ + \ +namespace xtd \ +{ \ + \ + namespace accessor \ + { \ + template <typename T> struct MethodName##_; \ + } \ + \ + template <typename T> \ + struct fun_traits_< accessor::MethodName##_<T> > \ + { \ + typedef T arg_type; \ + typedef typename T::MethodName##_type res_type; \ + }; \ + \ + namespace accessor \ + { \ + \ + template <typename T> \ + struct MethodName##_ \ + : public xtd::abstract::plain_nary_fun_< 1, MethodName##_<T> > \ + { \ + xtd_res(MethodName##_<T>) impl_op(const T& arg) const \ + { \ + return arg.red(); \ + } \ + }; \ + \ + typedef xtd::m1fun_<MethodName##_> MethodName##_type; \ + \ + static const MethodName##_type MethodName; \ + \ + } \ + \ +} \ + \ +struct e_n_d__w_i_t_h__s_e_m_i_c_o_l_o_n + + + +#endif // ! XTD_ACCESSOR_HH Index: xtd/vec.hh =================================================================== --- xtd/vec.hh (revision 615) +++ xtd/vec.hh (working copy) @@ -259,19 +259,37 @@ return tmp; } - friend - std::ostream& operator<<(std::ostream& ostr, const vec<n,T>& v) - { - ostr << '('; - for (unsigned i = 0; i < n; ++i) - ostr << v[i] << (i == n - 1 ? ")" : ", "); - return ostr; - } - }; + template <unsigned n, typename T> + std::ostream& operator<<(std::ostream& ostr, const vec<n,T>& v) + { + ostr << '('; + for (unsigned i = 0; i < n; ++i) + ostr << v[i] << (i == n - 1 ? ")" : ", "); + return ostr; + } + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const vec<n,unsigned char>& v) + { + ostr << '('; + for (unsigned i = 0; i < n; ++i) + ostr << (unsigned int)(v[i]) << (i == n - 1 ? ")" : ", "); + return ostr; + } + + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const vec<n,signed char>& v) + { + ostr << '('; + for (unsigned i = 0; i < n; ++i) + ostr << (signed int)(v[i]) << (i == n - 1 ? ")" : ", "); + return ostr; + } + + struct lexi_less_t { template <unsigned n, typename T>

17 years, 7 months

615: Add i/o read for pbm and pgm formats.

by Thierry GERAUD

2006-10-10 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add i/o read for pbm and pgm formats. * tests/io_pnm.cc: New. * tests/Makefile.am (check_PROGRAMS): Update. * oln/io: New directory. * oln/io/pnm.hh: New. * oln/core/image_entry.hh (coord_type): New single_vtype. * oln/core/abstract/image.hh (decl): New comment. * oln/core/2d/image2d.hh (adr_at): New. * oln/basics2d.hh (include): Add fwd_piter.hh. * oln/Makefile.am (nobase_oln_HEADERS): Update. * img: New directory. * img/chien.pbm: New. * img/lena32.pgm: New. Index: tests/io_pnm.cc =================================================================== --- tests/io_pnm.cc (revision 0) +++ tests/io_pnm.cc (revision 0) @@ -0,0 +1,40 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// Test oln::io_pnm.cc. + +#include <cassert> +#include <oln/basics2d.hh> +#include <oln/io/pnm.hh> + +int +main() +{ + // Fill a 2-d image using its iterator. + oln::image2d<bool> ima = oln::io::load_pbm("../img/chien.pbm"); + oln::image2d<unsigned char> ima2 = oln::io::load_pgm("../img/lena32.pgm"); +} Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision 614) +++ tests/Makefile.am (working copy) @@ -25,6 +25,7 @@ image1d \ image2d \ image3d \ + io_pnm \ npoints \ \ identity_morpher \ Index: oln/io/pnm.hh =================================================================== --- oln/io/pnm.hh (revision 0) +++ oln/io/pnm.hh (revision 0) @@ -0,0 +1,224 @@ +// 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 OLN_IO_PNM_HH +# define OLN_IO_PNM_HH + +# include <iostream> +# include <fstream> +# include <string> + +# include <oln/core/2d/image2d.hh> + + +namespace oln { + + namespace io { + + namespace internal { + + void abort() + { + std::cerr << " aborting." << std::endl; + exit(0); + } + + bool read_pnm_header(std::istream& istr, + char& type, + int& nrows, int& ncols, + bool test = false) + { + // check magic + if (istr.get() != 'P' ) + goto err; + type = istr.get(); + if (type < '1' or type > '6') + goto err; + if (istr.get() != '\n') + goto err; + + // skip comments + while (istr.peek() == '#') + { + std::string line; + std::getline(istr, line); + } + + // get size + istr >> ncols >> nrows; + if (nrows <= 0 or ncols <= 0) + goto err; + + // skip maxvalue + if (istr.get() != '\n') + goto err; + if (type != '1' and type != '4') + { + std::string line; + std::getline(istr, line); + } + return true; + + err: + if (not test) + { + std::cerr << "error: badly formed header!"; + abort(); + } + return false; + } + + void read_pnm_header(char ascii, char raw, + std::istream& istr, + char& type, + int& nrows, int& ncols) + { + read_pnm_header(istr, type, nrows, ncols); + if (not (type == ascii or type == raw)) + { + std::cerr << "error: bad pnm type; " + << "expected P" << ascii + << " or P" << raw + << ", get P" << type << "!"; + abort(); + } + } + + + /// load_pbm_raw. + template <typename I> + void load_pbm_raw(std::ifstream& file, I& ima) + { + oln_type_of(I, coord) cols = 0; + unsigned bits = 0; + unsigned char c = 0; + oln_type_of(I, fwd_piter) p(ima.topo()); + for_all(p) + { + if (bits == 0) + { + c = file.get(); + bits = 8; + } + ima(p) = (c & (1 << --bits)) ? false : true; + if (++cols >= int(ima.bbox().ncols())) + cols = bits = 0; + } + } + + + /// load_pbm_ascii. + template <typename I> + void load_pbm_ascii(std::ifstream& file, I& ima) + { + oln_type_of(I, fwd_piter) p(ima.topo()); + for_all(p) + ima(p) = (file.get() == '0'); + } + + + /// load_ascii. + template <typename I> + void load_pnm_ascii(std::ifstream& file, I& ima) + { + oln_type_of(I, fwd_piter) p(ima.topo()); + for_all(p) + { + oln_type_of(I, value) value; + file >> value; + ima(p) = value; + // FIXME: Test alt code below. + // file >> ima(p); + } + } + + + /// load_raw_2d. + template <typename I> + void load_pnm_raw_2d(std::ifstream& file, I& ima) + { + int col = ima.pmin().col(); + size_t len = ima.bbox().ncols(); + for (int row = ima.pmin().row(); row <= ima.pmax().row(); ++row) + file.read((char*)(ima.adr_at(row, col)), + len * sizeof(oln_type_of(I, value))); + } + + + } // end of namespace oln::io::internal + + + image2d<bool> load_pbm(const std::string& filename) + { + std::ifstream file(filename.c_str()); + if (not file) + { + std::cerr << "error: file '" << filename + << "' not found!"; + abort(); + } + char type; + int nrows, ncols; + internal::read_pnm_header('1', '4', file, type, nrows, ncols); + image2d<bool> ima(nrows, ncols); + if (type == '4') + internal::load_pbm_raw(file, ima); + else + // type == '1' + internal::load_pbm_ascii(file, ima); + return ima; + } + + + image2d<unsigned char> load_pgm(const std::string& filename) + { + std::ifstream file(filename.c_str()); + if (not file) + { + std::cerr << "error: file '" << filename + << "' not found!"; + abort(); + } + char type; + int nrows, ncols; + internal::read_pnm_header('2', '5', file, type, nrows, ncols); + image2d<unsigned char> ima(nrows, ncols); + if (type == '4') + internal::load_pnm_raw_2d(file, ima); + else + // type == '1' + internal::load_pnm_ascii(file, ima); + return ima; + } + + } // end of namespace oln::io + +} // end of namespace oln + + +#endif // ! OLN_IO_PNM_HH Index: oln/core/image_entry.hh =================================================================== --- oln/core/image_entry.hh (revision 614) +++ oln/core/image_entry.hh (working copy) @@ -67,6 +67,8 @@ typedef mlc::undefined topo_type; typedef mlc::undefined grid_type; + // coord_type: see below. + // psite_type: see below. typedef mlc::undefined point_type; @@ -82,13 +84,23 @@ }; + // Coord. template <typename E> + struct single_vtype< image_entry<E>, typedef_::coord_type > + { + typedef oln_deduce_type_of(E, point, coord) ret; + }; + + + // Psite. + template <typename E> struct single_vtype< image_entry<E>, typedef_::psite_type > { typedef oln_type_of(E, point) ret; }; + // Piter. template <typename E> struct single_vtype< image_entry<E>, typedef_::piter_type > { @@ -96,6 +108,7 @@ }; + // Rvalue. template <typename E> struct single_vtype< image_entry<E>, typedef_::rvalue_type > { Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 614) +++ oln/core/abstract/image.hh (working copy) @@ -66,6 +66,8 @@ // oln_virtual_typedef(topo); // oln_virtual_typedef(grid); +// oln_virtual_typedef(coord); + // oln_virtual_typedef(psite); // oln_virtual_typedef(point); Index: oln/core/2d/image2d.hh =================================================================== --- oln/core/2d/image2d.hh (revision 614) +++ oln/core/2d/image2d.hh (working copy) @@ -89,6 +89,9 @@ T& impl_op_readwrite(const point2d& p); + T* adr_at(int row, int col); + const T* adr_at(int row, int col) const; + private: topo2d topo_; @@ -143,6 +146,22 @@ return data_->operator()(p.row(), p.col()); } + template <typename T> + T* image2d<T>::adr_at(int row, int col) + { + precondition(data_ != 0); + precondition(data_->has(row, col)); + return &(data_->operator()(row, col)); + } + + template <typename T> + const T* image2d<T>::adr_at(int row, int col) const + { + precondition(data_ != 0); + precondition(data_->has(row, col)); + return &(data_->operator()(row, col)); + } + # endif } // end of namespace oln Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 614) +++ oln/basics2d.hh (working copy) @@ -50,5 +50,7 @@ # include <oln/core/2d/image2d.hh> +# include <oln/core/fwd_piter.hh> + #endif // ! OLN_BASICS2D_HH Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 614) +++ oln/Makefile.am (working copy) @@ -132,6 +132,8 @@ \ debug/print.hh \ \ + io/pnm.hh \ + \ level/fill.hh \ \ morpher/internal/image_extension.hh \ Index: img/chien.pbm =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/chien.pbm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/lena32.pgm =================================================================== --- img/lena32.pgm (revision 0) +++ img/lena32.pgm (revision 0) @@ -0,0 +1,4 @@ +P5 +32 32 +255 +€chmzt¹Šsy{{`£bgly~~~~vv Áw{Y3 ¡ `fkx}~~~}wt³³uV40¡]dlw|ªysrÆp02.r Xbhsy{w}«ºÀ°io@02<hk Ybhsxrs{ŠºÇÏÁqhdB/1FyYkYbhtvov«ÀÇËÐ·o>yZ129uZkV`g{ynz¢Ž»ÁÇÉÑ SŠÁK12aao Ycfxlx§¯±·ŸŸÅÁ¥ ¶ÎÉO-F`p£Zacl|§ª«±µ²µŸÆÊÀ©<4v_r€Zaav±œÃÉ¿r.Scu¥Ya`¢z~r[fU[¢¿ÀŸ¥|B4wfs€X_a|ª|zbF>H]Ž¶Ž|F/H£fn£X`ep |vX@C;P°¬»¿mlF32e¡ dl£[citxT:6?Sª¥ÃÐRE6=ck£[ci}naD:6C§y»²pJO4T_d£\`pUKI73j¯qVo«mEFU4n\]€blnZJOU/C®THX<±NS¡brZSD>V;swv«±cFXM ÀÅHMfhV\D9UVuGu¡§V@^gºÉÍIX¡b]NYYAVrIIw£@>d ÇÎÐA^€f[DR_iQ5Jt d7@fªÏÑÓ7_ŠhSDdcp56Aa~?8Dj³ÕÓÒ1a£^HAdotB548Cbf2>Lmº×Ï·;Ra>A]jqM935>d ^AOo}~ÀÍOwY€Z8GKWse>59Go¡»ÁGqs}ÅTXsp€O1A:KkoI5<UqÃÎirªÇsac_t¢I1A4>foN:KewŠœÒ }Í®gc`Sz£M295@XY<7_hŽËÄ~Ÿ\^Z[¢M075<^I,BakªÄÐWP«\W]Oi E39B>UA.Od~¡¹Ïa[iOU_FQ<9ANKJBFl|°È°esr`T_X? \ No newline at end of file

17 years, 7 months

614: Fix oln::tracked_ptr.

by Thierry GERAUD

2006-10-09 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * oln/core/internal/tracked_ptr.hh (operator bool): Fix signature. (operator bool): Add line to remove warning. Index: oln/core/internal/tracked_ptr.hh =================================================================== --- oln/core/internal/tracked_ptr.hh (revision 613) +++ oln/core/internal/tracked_ptr.hh (working copy) @@ -94,7 +94,6 @@ # ifndef OLN_INCLUDE_ONLY template <typename T> - tracked_ptr<T>:: tracked_ptr<T>::operator bool() const { invariant_(); @@ -227,6 +226,7 @@ invariant(holders_->size() > 0); tracked_ptr<T>* this_ = const_cast<tracked_ptr<T>*>(this); invariant(holders_->find(this_) != holders_->end()); + this_ = 0; typename holders_t::const_iterator i; for (i = holders_->begin(); i != holders_->end(); ++i) invariant((*i)->ptr_ == ptr_);

17 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2006