October 2006 - Olena-patches

642: Fix the distribution.
by Roland Levillain 16 Oct '06

16 Oct '06

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

1 0

641: Get rid of the explicit instantiations of oln::bbox<>.
by Roland Levillain 16 Oct '06

16 Oct '06

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

1 0

640: Fix oln/core/iterator_vtypes.hh w.r.t. backward niters.
by Roland Levillain 13 Oct '06

13 Oct '06

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

1 0

639: Add backward iterators on neighborhoods and windows.
by Roland Levillain 13 Oct '06

13 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add backward iterators on neighborhoods and windows. * oln/core/gen/bkd_niter_neighb.hh, * oln/core/gen/bkd_qiter_win.hh: New. * oln/core/gen/fwd_niter_neighb.hh (oln::fwd_niter_neighb_<point_t>::fwd_niter_neighb_) (oln::fwd_niter_neighb_<point_t>::impl_next) * oln/core/gen/fwd_qiter_win.hh (oln::fwd_qiter_win_<point_t>::fwd_qiter_win_) (oln::fwd_qiter_win_<point_t>::impl_next): Initialize i_ using this->invalidate(). * oln/core/1d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter1d): New typedef. * oln/core/2d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter2d): New typedef. * oln/core/3d/aliases.hh (oln::bkd_qiter_win_): New forward declaration. (oln::bkd_qiter3d): New typedef. * oln/core/iterator_vtypes.hh (oln::single_vtype<image1d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image2d<T>, typedef_::bkd_qiter_type>) (oln::single_vtype<image3d<T>, typedef_::bkd_qiter_type>): New vtypes. * oln/basics1d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): * oln/basics2d.hh (oln/core/gen/bkd_qiter_win.hh) * oln/basics3d.hh (oln/core/gen/window.hh) (oln/core/gen/fwd_qiter_win.hh, oln/core/gen/bkd_qiter_win.hh): Include them. * oln/Makefile.am (nobase_oln_HEADERS): Add core/gen/bkd_niter_neighb.hh and core/gen/bkd_qiter_win.hh. Makefile.am | 2 basics1d.hh | 4 basics2d.hh | 1 basics3d.hh | 4 core/1d/aliases.hh | 6 - core/2d/aliases.hh | 6 - core/3d/aliases.hh | 6 - core/gen/bkd_niter_neighb.hh | 200 +++++++++++++++++++++++++++++++++++++++++++ core/gen/bkd_qiter_win.hh | 181 ++++++++++++++++++++++++++++++++++++++ core/gen/fwd_niter_neighb.hh | 12 +- core/gen/fwd_qiter_win.hh | 6 - core/iterator_vtypes.hh | 42 +++------ 12 files changed, 426 insertions(+), 44 deletions(-) Index: oln/basics1d.hh --- oln/basics1d.hh (revision 638) +++ oln/basics1d.hh (working copy) @@ -44,6 +44,10 @@ # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/gen/window.hh> +# include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> + # include <oln/core/gen/neighb.hh> # include <oln/core/1d/neighb1d.hh> Index: oln/core/iterator_vtypes.hh --- oln/core/iterator_vtypes.hh (revision 638) +++ oln/core/iterator_vtypes.hh (working copy) @@ -66,14 +66,12 @@ typedef fwd_qiter1d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image1d. -// template <typename T> -// struct single_vtype< image1d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter1d ret; -// }; + /// bkd_qiter vtype of image1d. + template <typename T> + struct single_vtype< image1d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter1d ret; + }; /*------------------. @@ -104,14 +102,12 @@ typedef fwd_qiter2d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image2d. -// template <typename T> -// struct single_vtype< image2d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter2d ret; -// }; + /// bkd_qiter vtype of image2d. + template <typename T> + struct single_vtype< image2d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter2d ret; + }; /*------------------. @@ -142,14 +138,12 @@ typedef fwd_qiter3d ret; }; - // FIXME : Not yet available. - -// /// bkd_qiter vtype of image3d. -// template <typename T> -// struct single_vtype< image3d<T>, typedef_::bkd_qiter_type > -// { -// typedef bkd_qiter3d ret; -// }; + /// bkd_qiter vtype of image3d. + template <typename T> + struct single_vtype< image3d<T>, typedef_::bkd_qiter_type > + { + typedef bkd_qiter3d ret; + }; /*--------------------------------------------. Index: oln/core/1d/aliases.hh --- oln/core/1d/aliases.hh (revision 638) +++ oln/core/1d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename T> class fwd_piter_bbox_; template <typename T> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point1d> bkd_piter1d; typedef fwd_qiter_win_<point1d> fwd_qiter1d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point1d> fwd_qiter1d; + typedef bkd_qiter_win_<point1d> bkd_qiter1d; typedef point1d_<float> point1df; typedef dpoint1d_<float> dpoint1df; Index: oln/core/2d/aliases.hh --- oln/core/2d/aliases.hh (revision 638) +++ oln/core/2d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename P> class fwd_piter_bbox_; template <typename P> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point2d> bkd_piter2d; typedef fwd_qiter_win_<point2d> fwd_qiter2d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point2d> fwd_qiter2d; + typedef bkd_qiter_win_<point2d> bkd_qiter2d; typedef point2d_<float> point2df; typedef dpoint2d_<float> dpoint2df; Index: oln/core/3d/aliases.hh --- oln/core/3d/aliases.hh (revision 638) +++ oln/core/3d/aliases.hh (working copy) @@ -45,8 +45,7 @@ template <typename T> class fwd_piter_bbox_; template <typename T> class bkd_piter_bbox_; template <typename P> class fwd_qiter_win_; -// FIXME: Not yet available. -// template <typename P> class bkd_qiter_win_; + template <typename P> class bkd_qiter_win_; /// \} @@ -67,8 +66,7 @@ typedef bkd_piter_bbox_<point3d> bkd_piter3d; typedef fwd_qiter_win_<point3d> fwd_qiter3d; -// FIXME: Not yet available. -// typedef bkd_qiter_win_<point3d> fwd_qiter3d; + typedef bkd_qiter_win_<point3d> bkd_qiter3d; typedef point3d_<float> point3df; typedef dpoint3d_<float> dpoint3df; Index: oln/core/gen/bkd_qiter_win.hh --- oln/core/gen/bkd_qiter_win.hh (revision 0) +++ oln/core/gen/bkd_qiter_win.hh (revision 0) @@ -0,0 +1,181 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_BKD_QITER_WIN_HH +# define OLN_CORE_GEN_BKD_QITER_WIN_HH + +# include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/abstract/window.hh> +# include <oln/core/gen/window.hh> + + +namespace oln +{ + + + // Backward declaration. + template <typename point_t> class bkd_qiter_win_; + + + // Super type declaration. + template <typename point_t> + struct set_super_type< bkd_qiter_win_<point_t> > + { + typedef bkd_qiter_win_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> ret; + }; + + + /// Virtual types associated to oln::bkd_qiter_win_<point_t>. + template <typename point_t> + struct vtypes< bkd_qiter_win_<point_t> > + { + typedef point_t point_type; + typedef oln_type_of(point_t, grid) grid_type; + }; + + + + /// Abstract backward point iterator class. + template <typename point_t> + class bkd_qiter_win_ : public abstract::iterator_on_points< bkd_qiter_win_<point_t> > + { + typedef bkd_qiter_win_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> super_t; + + typedef oln_type_of(point_t, dpoint) dpoint_t; + + public: + + template <typename P, typename W> + bkd_qiter_win_(const abstract::iterator_on_points& it, + const abstract::window<W>& win); + + template <typename P, typename W> + bkd_qiter_win_(const abstract::point& p, + const abstract::window<W>& win); + + void impl_start(); + + void impl_next(); + + void impl_invalidate(); + + bool impl_is_valid() const; + + point_t impl_to_point() const; + + const point_t* impl_point_adr() const; + + protected: + + const point_t* p_ref_; + window_<dpoint_t> win_; + int i_; + point_t p_; + + }; // end of class oln::bkd_qiter_win_<point_t> + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename point_t> + template <typename P, typename W> + bkd_qiter_win_<point_t>::bkd_qiter_win_(const abstract::iterator_on_points& it, + const abstract::window<W>& win) + : p_ref_(it.point_adr()), + win_(win.exact()) + { + precondition(win_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + template <typename P, typename W> + bkd_qiter_win_<point_t>::bkd_qiter_win_(const abstract::point& p, + const abstract::window<W>& win) + : p_ref_(&(p.exact())), + win_(win.exact()) + { + precondition(win_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_start() + { + i_ = int(win_.card()) - 1; + p_ = *p_ref_+ win_.dp(i_); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_next() + { + --i_; + if (i_ == -1) + return; + p_ = *p_ref_ + win_.dp(i_); + } + + template <typename point_t> + void + bkd_qiter_win_<point_t>::impl_invalidate() + { + i_ = -1; + } + + template <typename point_t> + bool + bkd_qiter_win_<point_t>::impl_is_valid() const + { + return i_ != -1; + } + + template <typename point_t> + point_t + bkd_qiter_win_<point_t>::impl_to_point() const + { + return p_; + } + + template <typename point_t> + const point_t* + bkd_qiter_win_<point_t>::impl_point_adr() const + { + return &p_; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_BKD_QITER_WIN_HH + Index: oln/core/gen/fwd_niter_neighb.hh --- oln/core/gen/fwd_niter_neighb.hh (revision 638) +++ oln/core/gen/fwd_niter_neighb.hh (working copy) @@ -75,6 +75,8 @@ fwd_niter_neighb_(const abstract::iterator_on_points& it, const abstract::topology<T>& topo); + // FIXME: To be possibly enabled later (still unsure about it). + // template <typename P, typename N> // fwd_niter_neighb_(const abstract::iterator_on_points& it, // const abstract::neighborhood<N>& nbh) @@ -82,7 +84,7 @@ // nbh_(nbh.exact()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } // template <typename P, typename T> @@ -92,7 +94,7 @@ // nbh_(topo.exact().neighborhood()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } // template <typename P, typename N> @@ -102,7 +104,7 @@ // nbh_(nbh.exact()) // { // precondition(nbh_.card() > 0); - // i_ = -1; + // this->invalidate(); // } void impl_start(); @@ -139,7 +141,7 @@ nbh_(topo.exact().neighborhood()) { precondition(nbh_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -157,7 +159,7 @@ ++i_; if (i_ == int(nbh_.card())) { - i_ = -1; + this->invalidate(); return; } p_ = *p_ref_ + nbh_.dp(i_); Index: oln/core/gen/fwd_qiter_win.hh --- oln/core/gen/fwd_qiter_win.hh (revision 638) +++ oln/core/gen/fwd_qiter_win.hh (working copy) @@ -112,7 +112,7 @@ win_(win.exact()) { precondition(win_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -123,7 +123,7 @@ win_(win.exact()) { precondition(win_.card() > 0); - i_ = -1; + this->invalidate(); } template <typename point_t> @@ -141,7 +141,7 @@ ++i_; if (i_ == int(win_.card())) { - i_ = -1; + this->invalidate(); return; } p_ = *p_ref_ + win_.dp(i_); Index: oln/core/gen/bkd_niter_neighb.hh --- oln/core/gen/bkd_niter_neighb.hh (revision 0) +++ oln/core/gen/bkd_niter_neighb.hh (revision 0) @@ -0,0 +1,200 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_BKD_NITER_NEIGHB_HH +# define OLN_CORE_GEN_BKD_NITER_NEIGHB_HH + +# include <oln/core/abstract/topology.hh> +# include <oln/core/abstract/iterator_on_points.hh> +# include <oln/core/gen/neighb.hh> + + +namespace oln +{ + + + // Backward declaration. + template <typename point_t> class bkd_niter_neighb_; + + + // Super type declaration. + template <typename point_t> + struct set_super_type< bkd_niter_neighb_<point_t> > + { + typedef bkd_niter_neighb_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> ret; + }; + + + /// Virtual types associated to oln::bkd_niter_neighb_<point_t>. + template <typename point_t> + struct vtypes< bkd_niter_neighb_<point_t> > + { + typedef point_t point_type; + typedef oln_type_of(point_t, grid) grid_type; + }; + + + + /// Abstract backward point iterator class. + template <typename point_t> + class bkd_niter_neighb_ : public abstract::iterator_on_points< bkd_niter_neighb_<point_t> > + { + typedef bkd_niter_neighb_<point_t> self_t; + typedef abstract::iterator_on_points<self_t> super_t; + + typedef oln_type_of(point_t, dpoint) dpoint_t; + + public: + + template <typename P, typename T> + bkd_niter_neighb_(const abstract::iterator_on_points& it, + const abstract::topology<T>& topo); + + // FIXME: To be possibly enabled later (still unsure about it). + + // template <typename P, typename N> + // bkd_niter_neighb_(const abstract::iterator_on_points& it, + // const abstract::neighborhood<N>& nbh) + // : p_ref_(it.point_adr()), + // nbh_(nbh.exact()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + // template <typename P, typename T> + // bkd_niter_neighb_(const abstract::point& p, + // const abstract::topology<T>& topo) + // : p_ref_(&(p.exact())), + // nbh_(topo.exact().neighborhood()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + // template <typename P, typename N> + // bkd_niter_neighb_(const abstract::point& p, + // const abstract::neighborhood<N>& nbh) + // : p_ref_(&(p.exact())), + // nbh_(nbh.exact()) + // { + // precondition(nbh_.card() > 0); + // this->invalidate(); + // } + + void impl_start(); + + void impl_next(); + + void impl_invalidate(); + + bool impl_is_valid() const; + + point_t impl_to_point() const; + + const point_t* impl_point_adr() const; + + protected: + + const point_t* p_ref_; + neighb_<dpoint_t> nbh_; + int i_; + point_t p_; + + }; // end of class oln::bkd_niter_neighb_<point_t> + + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename point_t> + template <typename P, typename T> + bkd_niter_neighb_<point_t>::bkd_niter_neighb_(const abstract::iterator_on_points& it, + const abstract::topology<T>& topo) + : p_ref_(it.point_adr()), + nbh_(topo.exact().neighborhood()) + { + precondition(nbh_.card() > 0); + this->invalidate(); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_start() + { + i_ = int(nbh_.card()) - 1; + p_ = *p_ref_+ nbh_.dp(i_); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_next() + { + --i_; + if (i_ == -1) + return; + p_ = *p_ref_ + nbh_.dp(i_); + } + + template <typename point_t> + void + bkd_niter_neighb_<point_t>::impl_invalidate() + { + i_ = -1; + } + + template <typename point_t> + bool + bkd_niter_neighb_<point_t>::impl_is_valid() const + { + return i_ != -1; + } + + template <typename point_t> + point_t + bkd_niter_neighb_<point_t>::impl_to_point() const + { + return p_; + } + + template <typename point_t> + const point_t* + bkd_niter_neighb_<point_t>::impl_point_adr() const + { + return &p_; + } + +# endif + + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_BKD_NITER_NEIGHB_HH + Index: oln/basics2d.hh --- oln/basics2d.hh (revision 638) +++ oln/basics2d.hh (working copy) @@ -46,6 +46,7 @@ # include <oln/core/gen/window.hh> # include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> # include <oln/core/gen/neighb.hh> # include <oln/core/2d/neighb2d.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 638) +++ oln/Makefile.am (working copy) @@ -104,7 +104,9 @@ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \ + core/gen/bkd_niter_neighb.hh \ core/gen/bkd_piter_bbox.hh \ + core/gen/bkd_qiter_win.hh \ core/gen/fwd_niter_neighb.hh \ core/gen/fwd_piter_bbox.hh \ core/gen/fwd_qiter_win.hh \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 638) +++ oln/basics3d.hh (working copy) @@ -44,6 +44,10 @@ # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> +# include <oln/core/gen/window.hh> +# include <oln/core/gen/fwd_qiter_win.hh> +# include <oln/core/gen/bkd_qiter_win.hh> + # include <oln/core/gen/neighb.hh> # include <oln/core/3d/neighb3d.hh>

1 0

oln-0.10 10.230: Work around a bug in SWIG 1.3.29
by Roland Levillain 13 Oct '06

13 Oct '06

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

1 2

638: Add some documentation to image abstractions.
by Roland Levillain 13 Oct '06

13 Oct '06

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

1 0

637: Factor oln::grid1d, oln::grid2d and oln::grid3d into oln::grid_<>.
by Roland Levillain 13 Oct '06

13 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Factor oln::grid1d, oln::grid2d and oln::grid3d into oln::grid_<>. * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh: Remove. * oln/core/gen/grid.hh: New file. * oln/core/1d/image1d.hh, oln/core/2d/image2d.hh, * oln/core/3d/image3d.hh: Include it. * oln/core/1d/aliases.hh (oln::grid_): Declare it. (oln::grid1d): Adjust definition. * oln/core/2d/aliases.hh (oln::grid_): Declare it. (oln::grid2d): Adjust definition. * oln/core/3d/aliases.hh (oln::grid_): Declare it. (oln::grid3d): Adjust definition. * oln/basics1d.hh, oln/basics2d.hh, oln/basics3d.hh, * oln/core/abstract/image/dimension/hierarchy.hh, * oln/core/abstract/image/hybrid/classical.hh, * oln/core/abstract/point_set/point_set_being_connected.hh, * oln/Makefile.am, * tests/grid.cc: Adjust. oln/Makefile.am | 4 oln/basics1d.hh | 2 oln/basics2d.hh | 2 oln/basics3d.hh | 2 oln/core/1d/aliases.hh | 8 + oln/core/1d/image1d.hh | 1 oln/core/2d/aliases.hh | 8 + oln/core/2d/image2d.hh | 1 oln/core/3d/aliases.hh | 8 + oln/core/3d/image3d.hh | 1 oln/core/abstract/image/dimension/hierarchy.hh | 8 + oln/core/abstract/image/hybrid/classical.hh | 9 + oln/core/abstract/point_set/point_set_being_connected.hh | 7 - oln/core/gen/grid.hh | 68 +++++++++++++++ tests/grid.cc | 7 - 15 files changed, 108 insertions(+), 28 deletions(-) Index: tests/grid.cc --- tests/grid.cc (revision 636) +++ tests/grid.cc (working copy) @@ -28,9 +28,10 @@ /// Test grids. #include <cassert> -#include <oln/core/1d/grid1d.hh> -#include <oln/core/2d/grid2d.hh> -#include <oln/core/3d/grid3d.hh> +#include <oln/core/1d/aliases.hh> +#include <oln/core/2d/aliases.hh> +#include <oln/core/3d/aliases.hh> +#include <oln/core/gen/grid.hh> int main() Index: oln/basics1d.hh --- oln/basics1d.hh (revision 636) +++ oln/basics1d.hh (working copy) @@ -32,7 +32,7 @@ # include <oln/core/1d/aliases.hh> -# include <oln/core/1d/grid1d.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/1d/point1d.hh> # include <oln/core/1d/dpoint1d.hh> Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 636) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -108,10 +108,11 @@ } // end of namespace oln::abstract - // Fwd. decl. - class grid1d; - class grid2d; - class grid3d; + // Forward declarations. + template <unsigned D> struct grid_; + typedef grid_<1> grid1d; + typedef grid_<2> grid2d; + typedef grid_<3> grid3d; /// 1D case. Index: oln/core/abstract/image/dimension/hierarchy.hh --- oln/core/abstract/image/dimension/hierarchy.hh (revision 636) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -87,9 +87,11 @@ { // Forward declarations. - class grid1d; - class grid2d; - class grid3d; + template <unsigned D> struct grid_; + typedef grid_<1> grid1d; + typedef grid_<2> grid2d; + typedef grid_<3> grid3d; + /// 1D case. template <typename E> Index: oln/core/abstract/point_set/point_set_being_connected.hh --- oln/core/abstract/point_set/point_set_being_connected.hh (revision 636) +++ oln/core/abstract/point_set/point_set_being_connected.hh (working copy) @@ -157,9 +157,10 @@ // Forward declarations. - class grid1d; - class grid2d; - class grid3d; + template <unsigned D> struct grid_; + typedef grid_<1> grid1d; + typedef grid_<2> grid2d; + typedef grid_<3> grid3d; template <typename E> Index: oln/core/1d/aliases.hh --- oln/core/1d/aliases.hh (revision 636) +++ oln/core/1d/aliases.hh (working copy) @@ -33,8 +33,9 @@ namespace oln { - /// \{ /// Forward declarations. + /// \{ + template <unsigned D> struct grid_; template <typename C> class point1d_; template <typename C> class dpoint1d_; template <typename D> class neighb_; @@ -46,12 +47,13 @@ template <typename P> class fwd_qiter_win_; // FIXME: Not yet available. // template <typename P> class bkd_qiter_win_; - class grid1d; /// \} + /// Aliases. /// \{ - /// Alliases. + typedef grid_<1> grid1d; + typedef point1d_<int> point1d; typedef dpoint1d_<int> dpoint1d; Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 636) +++ oln/core/1d/image1d.hh (working copy) @@ -30,6 +30,7 @@ # define OLN_CORE_1D_IMAGE1D_HH # include <oln/core/image_entry.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/1d/array1d.hh> Index: oln/core/2d/aliases.hh --- oln/core/2d/aliases.hh (revision 636) +++ oln/core/2d/aliases.hh (working copy) @@ -33,8 +33,9 @@ namespace oln { - /// \{ /// Forward declarations. + /// \{ + template <unsigned D> struct grid_; template <typename C> class point2d_; template <typename C> class dpoint2d_; template <typename D> class neighb_; @@ -46,12 +47,13 @@ template <typename P> class fwd_qiter_win_; // FIXME: Not yet available. // template <typename P> class bkd_qiter_win_; - class grid2d; /// \} + /// Aliases. /// \{ - /// Alliases. + typedef grid_<2> grid2d; + typedef point2d_<int> point2d; typedef dpoint2d_<int> dpoint2d; Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 636) +++ oln/core/2d/image2d.hh (working copy) @@ -30,6 +30,7 @@ # define OLN_CORE_2D_IMAGE2D_HH # include <oln/core/image_entry.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/2d/array2d.hh> Index: oln/core/3d/aliases.hh --- oln/core/3d/aliases.hh (revision 636) +++ oln/core/3d/aliases.hh (working copy) @@ -33,8 +33,9 @@ namespace oln { - /// \{ /// Forward declarations. + /// \{ + template <unsigned D> struct grid_; template <typename C> class point3d_; template <typename C> class dpoint3d_; template <typename D> class neighb_; @@ -46,12 +47,13 @@ template <typename P> class fwd_qiter_win_; // FIXME: Not yet available. // template <typename P> class bkd_qiter_win_; - class grid3d; /// \} - /// \{ /// Alliases. + /// \{ + typedef grid_<3> grid3d; + typedef point3d_<int> point3d; typedef dpoint3d_<int> dpoint3d; Index: oln/core/3d/image3d.hh --- oln/core/3d/image3d.hh (revision 636) +++ oln/core/3d/image3d.hh (working copy) @@ -30,6 +30,7 @@ # define OLN_CORE_3D_IMAGE3D_HH # include <oln/core/image_entry.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/gen/topo_lbbox.hh> # include <oln/core/internal/tracked_ptr.hh> # include <oln/core/3d/array3d.hh> Index: oln/core/gen/grid.hh --- oln/core/gen/grid.hh (revision 0) +++ oln/core/gen/grid.hh (revision 0) @@ -0,0 +1,68 @@ +// 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 tog +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_GRID_HH +# define OLN_CORE_GEN_GRID_HH + +# include <mlc/int.hh> +# include <oln/core/abstract/grid.hh> + + +namespace oln +{ + + // Forward declaration. + template <unsigned D> struct grid_; + + + /// Super type declaration. + template <unsigned D> + struct set_super_type< grid_<D> > + { + typedef abstract::grid< grid_<D> > ret; + }; + + + /// Virtual types associated to oln::grid1d. + template <unsigned D> + struct vtypes< grid_<D> > + { + typedef mlc::uint_<D> dimvalue_type; + }; + + /// A 1D grid. + template <unsigned D> + struct grid_ : public stc_get_supers(grid_<D>) + { + protected: + grid_() {} + }; + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_GRID_HH Index: oln/basics2d.hh --- oln/basics2d.hh (revision 636) +++ oln/basics2d.hh (working copy) @@ -32,7 +32,7 @@ # include <oln/core/2d/aliases.hh> -# include <oln/core/2d/grid2d.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/2d/point2d.hh> # include <oln/core/2d/dpoint2d.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 636) +++ oln/Makefile.am (working copy) @@ -9,7 +9,6 @@ core/1d/array1d.hh \ core/1d/bbox1d.hh \ core/1d/dpoint1d.hh \ - core/1d/grid1d.hh \ core/1d/image1d.hh \ core/1d/neighb1d.hh \ core/1d/point1d.hh \ @@ -18,7 +17,6 @@ core/2d/array2d.hh \ core/2d/bbox2d.hh \ core/2d/dpoint2d.hh \ - core/2d/grid2d.hh \ core/2d/image2d.hh \ core/2d/neighb2d.hh \ core/2d/point2d.hh \ @@ -27,7 +25,6 @@ core/3d/array3d.hh \ core/3d/bbox3d.hh \ core/3d/dpoint3d.hh \ - core/3d/grid3d.hh \ core/3d/image3d.hh \ core/3d/neighb3d.hh \ core/3d/point3d.hh \ @@ -111,6 +108,7 @@ core/gen/fwd_niter_neighb.hh \ core/gen/fwd_piter_bbox.hh \ core/gen/fwd_qiter_win.hh \ + core/gen/grid.hh \ core/gen/mapimage.hh \ core/gen/neighb.hh \ core/gen/topo_add_nbh.hh \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 636) +++ oln/basics3d.hh (working copy) @@ -32,7 +32,7 @@ # include <oln/core/3d/aliases.hh> -# include <oln/core/3d/grid3d.hh> +# include <oln/core/gen/grid.hh> # include <oln/core/3d/point3d.hh> # include <oln/core/3d/dpoint3d.hh>

1 0

636: Configure olena/img/Makefile.
by Roland Levillain 13 Oct '06

13 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * configure.ac (olena/img/Makefile): Configure it. configure.ac | 1 + 1 file changed, 1 insertion(+) Index: configure.ac --- configure.ac (revision 635) +++ configure.ac (working copy) @@ -72,6 +72,7 @@ static/stc/Makefile olena/Makefile olena/oln/Makefile + olena/img/Makefile dynamic/Makefile ]) # FIXME: Should be performed through oln.m4 macros.

1 0

635: Add a Makefile to img/ and fix the previous patch.
by Roland Levillain 13 Oct '06

13 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a Makefile to img/ and fix the previous patch. * img/Makefile.am: New. * Makefile.am (SUBDIRS): Add img. * oln/Makefile.am (nobase_oln_HEADERS): Remove core/automatic/image_having_neighborhood.hh. Add core/automatic/image/image_having_neighborhood.hh. Makefile.am | 2 +- img/Makefile.am | 3 +++ oln/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) Index: oln/Makefile.am --- oln/Makefile.am (revision 634) +++ oln/Makefile.am (working copy) @@ -97,7 +97,7 @@ core/automatic/image/image_being_mutable.hh \ core/automatic/image/image_being_random_accessible.hh \ core/automatic/image/image_having_neighborhood.hh \ - core/automatic/image_having_neighborhood.hh \ + core/automatic/image/image_having_neighborhood.hh \ core/automatic/impl.hh \ core/automatic/topology/topology_being_random_accessible.hh \ core/automatic/topology/topology_having_bbox.hh \ Index: Makefile.am --- Makefile.am (revision 634) +++ Makefile.am (working copy) @@ -1,3 +1,3 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = oln tests +SUBDIRS = oln img tests Index: img/Makefile.am --- img/Makefile.am (revision 0) +++ img/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +EXTRA_DIST = chien.pbm lena32.pgm

1 0

634: Reorganize oln/core/automatic like oln/core/abstract.
by Roland Levillain 13 Oct '06

13 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Reorganize oln/core/automatic like oln/core/abstract. * oln/core/automatic/image.hh, * oln/core/automatic/image1d.hh, * oln/core/automatic/image2d.hh, * oln/core/automatic/image3d.hh, * oln/core/automatic/image_being_mutable.hh, * oln/core/automatic/image_being_random_accessible.hh, * oln/core/automatic/image_having_neighborhood.hh, * oln/core/automatic/topology_being_random_accessible.hh, * oln/core/automatic/topology_having_bbox.hh, * oln/core/automatic/topology_having_neighborhood.hh, * oln/core/automatic/topology_having_subset.hh: Move... * oln/core/automatic/image/image.hh, * oln/core/automatic/image/image1d.hh, * oln/core/automatic/image/image2d.hh, * oln/core/automatic/image/image3d.hh, * oln/core/automatic/image/image_being_mutable.hh, * oln/core/automatic/image/image_being_random_accessible.hh, * oln/core/automatic/image/image_having_neighborhood.hh, * oln/core/automatic/topology/topology_being_random_accessible.hh, * oln/core/automatic/topology/topology_having_bbox.hh, * oln/core/automatic/topology/topology_having_neighborhood.hh * oln/core/automatic/topology/topology_having_subset.hh: ...here. * oln/core/abstract/image.hh, * oln/core/abstract/image/accessibility/hierarchy.hh, * 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/mutability/hierarchy.hh, * oln/core/abstract/image/neighborhood/hierarchy.hh, * 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, * oln/level/fill.hh, oln/Makefile.am: Adjust paths. Makefile.am | 22 ++++++------ core/abstract/image.hh | 2 - core/abstract/image/accessibility/hierarchy.hh | 2 - core/abstract/image/dimension/1d.hh | 2 - core/abstract/image/dimension/2d.hh | 2 - core/abstract/image/dimension/3d.hh | 2 - core/abstract/image/mutability/hierarchy.hh | 2 - core/abstract/image/neighborhood/hierarchy.hh | 2 - core/abstract/topology/topology_being_random_accessible.hh | 2 - core/abstract/topology/topology_having_bbox.hh | 2 - core/abstract/topology/topology_having_neighborhood.hh | 2 - core/abstract/topology/topology_having_subset.hh | 2 - core/automatic/image/image.hh | 6 +-- core/automatic/image/image1d.hh | 6 +-- core/automatic/image/image2d.hh | 6 +-- core/automatic/image/image3d.hh | 6 +-- core/automatic/image/image_being_mutable.hh | 6 +-- core/automatic/image/image_being_random_accessible.hh | 6 +-- core/automatic/image/image_having_neighborhood.hh | 6 +-- core/automatic/topology/topology_being_random_accessible.hh | 6 +-- core/automatic/topology/topology_having_bbox.hh | 6 +-- core/automatic/topology/topology_having_neighborhood.hh | 6 +-- core/automatic/topology/topology_having_subset.hh | 6 +-- level/fill.hh | 2 - 24 files changed, 56 insertions(+), 56 deletions(-) Index: oln/level/fill.hh --- oln/level/fill.hh (revision 633) +++ oln/level/fill.hh (working copy) @@ -34,7 +34,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/iterator.hh> -# include <oln/core/automatic/image_being_mutable.hh> +# include <oln/core/automatic/image/image_being_mutable.hh> namespace oln Index: oln/core/automatic/image/image.hh --- oln/core/automatic/image/image.hh (revision 0) +++ oln/core/automatic/image/image.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_HH -# define OLN_CORE_AUTOMATIC_IMAGE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -89,4 +89,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HH Index: oln/core/automatic/image/image_being_random_accessible.hh --- oln/core/automatic/image/image_being_random_accessible.hh (revision 0) +++ oln/core/automatic/image/image_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -87,4 +87,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/automatic/image/image_having_neighborhood.hh --- oln/core/automatic/image/image_having_neighborhood.hh (revision 0) +++ oln/core/automatic/image/image_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH -# define OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HAVING_NEIGHBORHOOD_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -76,4 +76,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_HAVING_NEIGHBORHOOD_HH Index: oln/core/automatic/image/image1d.hh --- oln/core/automatic/image/image1d.hh (revision 0) +++ oln/core/automatic/image/image1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE1D_HH -# define OLN_CORE_AUTOMATIC_IMAGE1D_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -148,4 +148,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE1D_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH Index: oln/core/automatic/image/image2d.hh --- oln/core/automatic/image/image2d.hh (revision 0) +++ oln/core/automatic/image/image2d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE2D_HH -# define OLN_CORE_AUTOMATIC_IMAGE2D_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE2D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE2D_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -148,4 +148,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE2D_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE2D_HH Index: oln/core/automatic/image/image3d.hh --- oln/core/automatic/image/image3d.hh (revision 0) +++ oln/core/automatic/image/image3d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE3D_HH -# define OLN_CORE_AUTOMATIC_IMAGE3D_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE3D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE3D_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -172,4 +172,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE3D_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE3D_HH Index: oln/core/automatic/image/image_being_mutable.hh --- oln/core/automatic/image/image_being_mutable.hh (revision 0) +++ oln/core/automatic/image/image_being_mutable.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH -# define OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_MUTABLE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_MUTABLE_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -71,4 +71,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_BEING_MUTABLE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_MUTABLE_HH Index: oln/core/automatic/topology/topology_having_bbox.hh --- oln/core/automatic/topology/topology_having_bbox.hh (revision 0) +++ oln/core/automatic/topology/topology_having_bbox.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH -# define OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -80,4 +80,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_BBOX_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_BBOX_HH Index: oln/core/automatic/topology/topology_being_random_accessible.hh --- oln/core/automatic/topology/topology_being_random_accessible.hh (revision 0) +++ oln/core/automatic/topology/topology_being_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -89,4 +89,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/automatic/topology/topology_having_subset.hh --- oln/core/automatic/topology/topology_having_subset.hh (revision 0) +++ oln/core/automatic/topology/topology_having_subset.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_SUBSET_HH -# define OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_SUBSET_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -80,4 +80,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_SUBSET_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_SUBSET_HH Index: oln/core/automatic/topology/topology_having_neighborhood.hh --- oln/core/automatic/topology/topology_having_neighborhood.hh (revision 0) +++ oln/core/automatic/topology/topology_having_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH -# define OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#ifndef OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +# define OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -80,4 +80,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_HAVING_NEIGHBORHOOD_HH +#endif // ! OLN_CORE_AUTOMATIC_TOPOLOGY_TOPOLOGY_HAVING_NEIGHBORHOOD_HH Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 633) +++ oln/core/abstract/image.hh (working copy) @@ -31,7 +31,7 @@ # include <oln/core/typedefs.hh> # include <oln/core/abstract/fwd_decls.hh> -# include <oln/core/automatic/image.hh> +# include <oln/core/automatic/image/image.hh> namespace oln Index: oln/core/abstract/image/mutability/hierarchy.hh --- oln/core/abstract/image/mutability/hierarchy.hh (revision 633) +++ oln/core/abstract/image/mutability/hierarchy.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> -# include <oln/core/automatic/image_being_mutable.hh> +# include <oln/core/automatic/image/image_being_mutable.hh> Index: oln/core/abstract/image/dimension/1d.hh --- oln/core/abstract/image/dimension/1d.hh (revision 633) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_1D_HH # include <oln/core/abstract/image.hh> -# include <oln/core/automatic/image1d.hh> +# include <oln/core/automatic/image/image1d.hh> namespace oln Index: oln/core/abstract/image/dimension/2d.hh --- oln/core/abstract/image/dimension/2d.hh (revision 633) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_2D_HH # include <oln/core/abstract/image.hh> -# include <oln/core/automatic/image2d.hh> +# include <oln/core/automatic/image/image2d.hh> namespace oln Index: oln/core/abstract/image/dimension/3d.hh --- oln/core/abstract/image/dimension/3d.hh (revision 633) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -29,7 +29,7 @@ # define OLN_CORE_ABSTRACT_IMAGE_DIMENSION_3D_HH # include <oln/core/abstract/image.hh> -# include <oln/core/automatic/image3d.hh> +# include <oln/core/automatic/image/image3d.hh> namespace oln Index: oln/core/abstract/image/accessibility/hierarchy.hh --- oln/core/abstract/image/accessibility/hierarchy.hh (revision 633) +++ oln/core/abstract/image/accessibility/hierarchy.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> -# include <oln/core/automatic/image_being_random_accessible.hh> +# include <oln/core/automatic/image/image_being_random_accessible.hh> namespace oln Index: oln/core/abstract/image/neighborhood/hierarchy.hh --- oln/core/abstract/image/neighborhood/hierarchy.hh (revision 633) +++ oln/core/abstract/image/neighborhood/hierarchy.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> -# include <oln/core/automatic/image_having_neighborhood.hh> +# include <oln/core/automatic/image/image_having_neighborhood.hh> /* Image having neighborhood hierarchy (summary). Index: oln/core/abstract/topology/topology_having_bbox.hh --- oln/core/abstract/topology/topology_having_bbox.hh (revision 633) +++ oln/core/abstract/topology/topology_having_bbox.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/topology.hh> # include <oln/core/abstract/topology/hierarchies.hh> -# include <oln/core/automatic/topology_having_bbox.hh> +# include <oln/core/automatic/topology/topology_having_bbox.hh> namespace oln Index: oln/core/abstract/topology/topology_being_random_accessible.hh --- oln/core/abstract/topology/topology_being_random_accessible.hh (revision 633) +++ oln/core/abstract/topology/topology_being_random_accessible.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/topology.hh> # include <oln/core/abstract/topology/hierarchies.hh> -# include <oln/core/automatic/topology_being_random_accessible.hh> +# include <oln/core/automatic/topology/topology_being_random_accessible.hh> namespace oln Index: oln/core/abstract/topology/topology_having_subset.hh --- oln/core/abstract/topology/topology_having_subset.hh (revision 633) +++ oln/core/abstract/topology/topology_having_subset.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/topology.hh> # include <oln/core/abstract/topology/hierarchies.hh> -# include <oln/core/automatic/topology_having_subset.hh> +# include <oln/core/automatic/topology/topology_having_subset.hh> namespace oln Index: oln/core/abstract/topology/topology_having_neighborhood.hh --- oln/core/abstract/topology/topology_having_neighborhood.hh (revision 633) +++ oln/core/abstract/topology/topology_having_neighborhood.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/abstract/topology.hh> # include <oln/core/abstract/topology/hierarchies.hh> -# include <oln/core/automatic/topology_having_neighborhood.hh> +# include <oln/core/automatic/topology/topology_having_neighborhood.hh> namespace oln Index: oln/Makefile.am --- oln/Makefile.am (revision 633) +++ oln/Makefile.am (working copy) @@ -90,19 +90,19 @@ core/abstract/value.hh \ core/abstract/window.hh \ \ - core/automatic/image.hh \ - core/automatic/image1d.hh \ - core/automatic/image2d.hh \ - core/automatic/image3d.hh \ - core/automatic/image_being_mutable.hh \ - core/automatic/image_being_random_accessible.hh \ - core/automatic/image_having_neighborhood.hh \ + core/automatic/image/image.hh \ + core/automatic/image/image1d.hh \ + core/automatic/image/image2d.hh \ + core/automatic/image/image3d.hh \ + core/automatic/image/image_being_mutable.hh \ + core/automatic/image/image_being_random_accessible.hh \ + core/automatic/image/image_having_neighborhood.hh \ core/automatic/image_having_neighborhood.hh \ core/automatic/impl.hh \ - core/automatic/topology_being_random_accessible.hh \ - core/automatic/topology_having_bbox.hh \ - core/automatic/topology_having_neighborhood.hh \ - core/automatic/topology_having_subset.hh \ + core/automatic/topology/topology_being_random_accessible.hh \ + core/automatic/topology/topology_having_bbox.hh \ + core/automatic/topology/topology_having_neighborhood.hh \ + core/automatic/topology/topology_having_subset.hh \ \ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \

1 0