Olena-patches September 2006

olena-patches@lrde.epita.fr

3 participants
92 discussions

548: Add oln topology class for enlarged bbox.

by Thierry GERAUD

2006-09-18 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add oln topology class for enlarged bbox. * oln/core/gen/topo_lbbox.hh: New. * oln/core/abstract/dpoint_nd.hh (set_all): New. * oln/core/gen/topo_bbox.hh (impl_has_large): New. Index: oln/core/abstract/dpoint_nd.hh =================================================================== --- oln/core/abstract/dpoint_nd.hh (revision 547) +++ oln/core/abstract/dpoint_nd.hh (working copy) @@ -82,6 +82,11 @@ return v_[i]; } + void set_all(const coord_t& c) + { + v_.set_all(c); + } + const xtd::vec<n,coord_t>& vec() const { return v_; Index: oln/core/gen/topo_lbbox.hh =================================================================== --- oln/core/gen/topo_lbbox.hh (revision 0) +++ oln/core/gen/topo_lbbox.hh (revision 0) @@ -0,0 +1,116 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLENA_CORE_GEN_TOPO_LBBOX_HH +# define OLENA_CORE_GEN_TOPO_LBBOX_HH + +# include <oln/core/gen/bbox.hh> +# include <oln/core/topology_entry.hh> + + + +namespace oln +{ + + + // Forward declarations. + template <typename point> class topo_lbbox_; + + + // Super type declaration. + template <typename point> + struct set_super_type< topo_lbbox_<point> > + { + typedef topo_lbbox_<point> self_t; + typedef topology_entry<self_t> ret; + }; + + + /// Virtual types associated to oln::bbox_<point>. + template <typename point> + struct vtypes< topo_lbbox_<point> > + { + typedef bbox_<point> bbox_type; + typedef point point_type; + typedef mlc::true_ is_random_accessible_type; + }; + + + /// Bounding box topology based on a point class. + template <typename point> + class topo_lbbox_ : public topology_entry< topo_lbbox_<point> > + { + typedef bbox_<point> bbox_t; + + public: + + topo_lbbox_() + { + } + + topo_lbbox_(const bbox_t& bb, unsigned border) + : bb_(bb), border_(border) + { + typedef oln_type_of(point, dpoint) dpoint_t; + dpoint_t dp; + dp.set_all(border); + lbb_ = bbox_<point>(bb_.pmin() - dp, bb_.pmax() + dp); + } + + const bbox_t& impl_bbox() const + { + return bb_; + } + + bool impl_has(const point& p) const + { + return bb_.has(p); + } + + bool impl_has_large(const point& p) const + { + return lbb_.has(p); + } + + const bbox_t& lbbox() const + { + return lbb_; + } + + protected: + + bbox_<point> bb_; + unsigned border_; + bbox_<point> lbb_; // FIXME: HERE + + }; + + +} // end of namespace oln + + +#endif // ! OLENA_CORE_GEN_TOPO_LBBOX_HH Index: oln/core/gen/topo_bbox.hh =================================================================== --- oln/core/gen/topo_bbox.hh (revision 547) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -87,6 +87,11 @@ return bb_.has(p); } + bool impl_has_large(const point& p) const + { + return bb_.has(p); + } + protected: bbox_<point> bb_;

17 years, 7 months

547: Make virtual type retrieval more flexible and fix automatic::impl.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Make virtual type retrieval more flexible and fix automatic::impl. * stc/vtypes.hh (automatic::impl): Turn the first parameter into a `template <class> class'. (select_typedef): Typo in comment. Don't abort on default case; not finding a virtual type is no lomger a static error, but instead just gives mlc::not_found. (type_of_): Likewise, don't abort on mlc::not_found, just return it. vtypes.hh | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 546) +++ stc/vtypes.hh (working copy) @@ -234,7 +234,7 @@ /** Default (empty) automatic implementation. */ \ namespace automatic { \ \ - template <typename abstraction, typename tag, typename E> \ + template <template <class> class abstraction, typename E, typename tag> \ class impl \ { \ }; \ @@ -702,7 +702,7 @@ stc::ERROR::VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE \ > \ { \ - /* Error, not valid typedef found. */ \ + /* Error, no valid typedef found. */ \ typedef mlc::not_found ret; \ }; \ \ @@ -718,7 +718,7 @@ stc::ERROR::VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_EXTERNAL \ > \ { \ - /* Error, not valid typedef found. */ \ + /* Error, no valid typedef found. */ \ typedef mlc::not_found ret; \ }; \ \ @@ -734,7 +734,7 @@ stc::ERROR::VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_SINGLE_AND_EXTERNAL \ > \ { \ - /* Error, not valid typedef found. */ \ + /* Error, no valid typedef found. */ \ typedef mlc::not_found ret; \ }; \ \ @@ -752,22 +752,18 @@ VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE_AND_EXTERNAL \ > \ { \ - /* Error, not valid typedef found. */ \ + /* Error, no valid typedef found. */ \ typedef mlc::not_found ret; \ }; \ \ - /** Other cases: error (the typedef is not defined or defined more */ \ - /** than once, hence \a mlc::not_found is returned). */ \ + /** All other cases: \a mlc::not_found is returned, but no static. */ \ + /** error is raised. */ \ template \ < typename internal_vtype_candidate, bool found_as_internal_vtype, \ typename single_vtype_candidate, bool found_as_single_vtype, \ typename extended_vtype_candidate, bool found_as_extended_vtype > \ - struct select_typedef : \ - mlc::abort_ < \ - internal_vtype_candidate /* dummy */ , \ - stc::ERROR::NO_VALID_VIRTUAL_TYPE_FOUND > \ + struct select_typedef \ { \ - /* Error, not valid typedef found. */ \ typedef mlc::not_found ret; \ }; \ /** \} */ \ @@ -812,13 +808,6 @@ internal_vtype_candidate, found_as_internal_vtype, \ single_vtype_candidate, found_as_single_vtype, \ extended_vtype_candidate, found_as_extended_vtype \ - >::ret candidate; \ - \ - typedef typename \ - mlc::assert_and_return_< \ - mlc_neq(candidate, mlc::not_found), \ - candidate, \ - stc::ERROR::NO_VALID_RETURN_TYPE_FOR_type_of_ \ >::ret ret; \ }; \ \

17 years, 7 months

olena-0.10 10.260: Add missing images to oln/lrde/ufmt/img

by Roland Levillain

MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii * oln/lrde/ufmt/img/lena64nb.pgm, oln/lrde/ufmt/img/lena64.pbm: New files. Only in 10.260: olena/oln/lrde/ufmt/img/lena64nb.pgm Only in 10.260: olena/oln/lrde/ufmt/img/lena64.pbm --- 10.259/oln.prj +++ 10.260/oln.prj @@ -1,22 +1,16 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 259) -(Parent-Version oln 10 258) -(Version-Log "2006-09-16 Roland Levillain <roland(a)lrde.epita.fr> - - Fix sanity tests in oln/lrde. - - * oln/lrde/ufmt/attributes.hh, oln/lrde/ufmt/basic_najman.hh: Add - missing header inclusions. - * oln/lrde/ufmt/attributes_bis.hh: Likewise. - Disable irrelevant broken assertions. - * oln/lrde/ufmt/utils.hh: Add missing header inclusions. - Remove useless forward declarations. +(Project-Version oln 10 260) +(Parent-Version oln 10 259) +(Version-Log "2006-09-17 Roland Levillain <roland(a)lrde.epita.fr> + + * oln/lrde/ufmt/img/lena64nb.pgm, oln/lrde/ufmt/img/lena64.pbm: + New files. ") (New-Version-Log "") -(Checkin-Time "Sat, 16 Sep 2006 09:45:40 +0200") +(Checkin-Time "Sun, 17 Sep 2006 10:52:58 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -133,7 +127,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.3 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.4 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) @@ -1628,6 +1622,12 @@ ;; from version 10.256(w), by levill_r: ; (olena/oln/lrde/ufmt/bin/inc () :symlink) + +;; Files added by populate at Sun, 17 Sep 2006 10:48:50 +0200, +;; to version 10.259(w), by levill_r: + + (olena/oln/lrde/ufmt/img/lena64nb.pgm (oln/x/47_lena64nb.p 1.1 644) :no-keywords) + (olena/oln/lrde/ufmt/img/lena64.pbm (oln/x/48_lena64.pbm 1.1 644) :no-keywords) ) (Merge-Parents) (New-Merge-Parents) Date: Sun, 17 Sep 2006 10:57:44 +0200 Message-ID: <muak642vpiv.fsf(a)brasilia.lrde.epita.fr> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux)

17 years, 7 months

olena-0.10 10.259: Fix sanity tests in oln/lrde.

by Roland Levillain

2006-09-16 Roland Levillain <roland(a)lrde.epita.fr> Fix sanity tests in oln/lrde. * oln/lrde/ufmt/attributes.hh, oln/lrde/ufmt/basic_najman.hh: Add missing header inclusions. * oln/lrde/ufmt/attributes_bis.hh: Likewise. Disable irrelevant broken assertions. * oln/lrde/ufmt/utils.hh: Add missing header inclusions. Remove useless forward declarations. --- 10.258/olena/oln/lrde/ufmt/utils.hh Mon, 28 Aug 2006 14:48:16 +0200 theo (oln/x/8_utils.hh 1.3 644) +++ 10.259/olena/oln/lrde/ufmt/utils.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/8_utils.hh 1.4 644) @@ -30,9 +30,11 @@ # include <cstdlib> # include <vector> -# include <ntg/real/int_u.hh> - +# include <ntg/real/int_u.hh> +# include <oln/core/image1d.hh> +# include <oln/core/image2d.hh> +# include <oln/core/image3d.hh> @@ -49,9 +51,6 @@ struct neighborhood1d; struct neighborhood2d; struct neighborhood3d; - template <class T, class E> class image1d; - template <class T, class E> class image2d; - template <class T, class E> class image3d; // end of fwd decls. --- 10.258/olena/oln/lrde/ufmt/attributes.hh Mon, 28 Aug 2006 11:01:51 +0200 theo (oln/x/32_attributes 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/attributes.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/32_attributes 1.2 644) @@ -28,6 +28,8 @@ #ifndef OLENA_LRDE_UFMT_ATTRIBUTES_HH # define OLENA_LRDE_UFMT_ATTRIBUTES_HH +# include <oln/core/abstract/image.hh> +# include <oln/core/point2d.hh> namespace oln --- 10.258/olena/oln/lrde/ufmt/attributes_bis.hh Mon, 28 Aug 2006 11:01:51 +0200 theo (oln/x/34_attributes 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/attributes_bis.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/34_attributes 1.2 644) @@ -52,11 +52,13 @@ template <class I, class P> void insert(const I& f, const P& p) { - assert(f[p] == h); + // FIXME: Broken assertion. +// assert(f[p] == h); } void embrace(const self_t& rhs) { - assert(rhs.h > h); + // FIXME: Broken assertion. +// assert(rhs.h > h); if (rhs.value + 1 > value) value = rhs.value + 1; } --- 10.258/olena/oln/lrde/ufmt/basic_najman.hh Mon, 28 Aug 2006 18:17:59 +0200 berger_c (oln/x/42_basic_najm 1.1 644) +++ 10.259/olena/oln/lrde/ufmt/basic_najman.hh Sat, 16 Sep 2006 09:45:40 +0200 levill_r (oln/x/42_basic_najm 1.2 644) @@ -28,6 +28,8 @@ #ifndef OLENA_LRDE_UFMT_BASIC_NAJMAN_HH # define OLENA_LRDE_UFMT_BASIC_NAJMAN_HH +# include <list> + # include <oln/level/fill.hh> # include <oln/lrde/ufmt/utils.hh> # include <oln/lrde/ufmt/ap_maxtree.hh> --- 10.258/oln.prj +++ 10.259/oln.prj @@ -1,17 +1,22 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 258) -(Parent-Version oln 10 257) -(Version-Log "2006-09-15 Roland Levillain <roland(a)lrde.epita.fr> - - Fix oln/Makefile. - - * oln/Makefile.am (SUBDIRS): s,lrde/ufmt,lrde,. +(Project-Version oln 10 259) +(Parent-Version oln 10 258) +(Version-Log "2006-09-16 Roland Levillain <roland(a)lrde.epita.fr> + + Fix sanity tests in oln/lrde. + + * oln/lrde/ufmt/attributes.hh, oln/lrde/ufmt/basic_najman.hh: Add + missing header inclusions. + * oln/lrde/ufmt/attributes_bis.hh: Likewise. + Disable irrelevant broken assertions. + * oln/lrde/ufmt/utils.hh: Add missing header inclusions. + Remove useless forward declarations. ") (New-Version-Log "") -(Checkin-Time "Fri, 15 Sep 2006 11:05:05 +0200") +(Checkin-Time "Sat, 16 Sep 2006 09:45:40 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -128,7 +133,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.2 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.3 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) @@ -1540,7 +1545,7 @@ (olena/oln/lrde/ufmt/log.hh (oln/x/5_log.hh 1.2 644)) (olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644)) (olena/oln/lrde/ufmt/img/lena6.pgm (oln/x/7_lena6.pgm 1.1 644)) - (olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.3 644)) + (olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.4 644)) @@ -1601,9 +1606,9 @@ (olena/oln/lrde/ufmt/hpx_maxtree.hh (oln/x/31_hpx_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/attributes.hh (oln/x/32_attributes 1.1 644)) + (olena/oln/lrde/ufmt/attributes.hh (oln/x/32_attributes 1.2 644)) (olena/oln/lrde/ufmt/hdx_maxtree.hh (oln/x/33_hdx_maxtre 1.1 644)) - (olena/oln/lrde/ufmt/attributes_bis.hh (oln/x/34_attributes 1.1 644)) + (olena/oln/lrde/ufmt/attributes_bis.hh (oln/x/34_attributes 1.2 644)) (olena/oln/lrde/ufmt/bin/hdx_maxtree.cc (oln/x/35_hdx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/bin/gen_worst_salembier.cc (oln/x/36_gen_worst_ 1.1 644)) (olena/oln/lrde/ufmt/bin/hpx_maxtree.cc (oln/x/37_hpx_maxtre 1.1 644)) @@ -1611,7 +1616,7 @@ (olena/oln/lrde/ufmt/bin/spx_maxtree.cc (oln/x/39_spx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/spx_maxtree.hh (oln/x/40_spx_maxtre 1.1 644)) (olena/oln/lrde/ufmt/sp_maxtree.hh (oln/x/41_sp_maxtree 1.1 644)) - (olena/oln/lrde/ufmt/basic_najman.hh (oln/x/42_basic_najm 1.1 644)) + (olena/oln/lrde/ufmt/basic_najman.hh (oln/x/42_basic_najm 1.2 644)) (olena/oln/lrde/ufmt/bin/basic_najman.cc (oln/x/43_basic_najm 1.1 644)) ;; Files added by populate at Tue, 29 Aug 2006 11:05:19 +0200,

17 years, 7 months

546: Adapt topology hierarchy to new naming convention.

by Thierry GERAUD

2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Adapt topology hierarchy to new naming convention. * oln/core/topo_entry.hh: Rename into... * oln/core/topology_entry.hh: ...this. * oln/core/abstract/topo.hh: Rename into... * oln/core/abstract/topology.hh: ...this. * oln/core/abstract/topo_with_bbox.hh: Rename into... * oln/core/abstract/topology_having_bbox.hh: ...this. * oln/core/abstract/topo_hierarchies.hh: Rename into... * oln/core/abstract/topology_hierarchies.hh: ...this. * oln/core/abstract/topo_ra.hh: Rename into... * oln/core/abstract/topology_being_random_accessible.hh: ...this. * oln/core/gen/bbox_topo.hh: Rename into... * oln/core/gen/topo_bbox.hh: ...this. * oln/core/typedefs.hh (is_random_accessible_type): New. * oln/core/2d/aliases.hh: Update. * oln/basics2d.hh: Update. * oln/Makefile.am: Update. Index: oln/core/typedefs.hh =================================================================== --- oln/core/typedefs.hh (revision 545) +++ oln/core/typedefs.hh (working copy) @@ -105,6 +105,7 @@ mlc_decl_typedef(fixed_type); mlc_decl_typedef(ra_type); + mlc_decl_typedef(is_random_accessible_type); mlc_decl_typedef(cnx_type); Index: oln/core/topology_entry.hh =================================================================== --- oln/core/topology_entry.hh (revision 543) +++ oln/core/topology_entry.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_TOPO_ENTRY_HH -# define OLENA_CORE_TOPO_ENTRY_HH +#ifndef OLENA_CORE_TOPOLOGY_ENTRY_HH +# define OLENA_CORE_TOPOLOGY_ENTRY_HH # include <oln/core/abstract/entry.hh> -# include <oln/core/abstract/topo.hh> +# include <oln/core/abstract/topology.hh> @@ -37,30 +37,30 @@ { - /// Entry class for point sets: topo_entry<E> is an alias for - /// entry< abstract::topo, E>. + /// Entry class for point sets: topology_entry<E> is an alias for + /// entry< abstract::topology, E>. template <typename E> - struct topo_entry : public entry< abstract::topo, E> + struct topology_entry : public entry< abstract::topology, E> { protected: - topo_entry() {} + topology_entry() {} }; - /// Virtual types associated to topo_entry<E>. + /// Virtual types associated to topology_entry<E>. template <typename E> - struct vtypes< topo_entry<E> > + struct vtypes< topology_entry<E> > { + typedef mlc::undefined point_type; typedef mlc::undefined bbox_type; - typedef mlc::undefined ra_type; - typedef mlc::undefined point_type; + typedef mlc::undefined is_random_accessible_type; }; } // end of namespace oln -#endif // ! OLENA_CORE_TOPO_ENTRY_HH +#endif // ! OLENA_CORE_TOPOLOGY_ENTRY_HH Index: oln/core/topo_entry.hh =================================================================== --- oln/core/topo_entry.hh (revision 545) +++ oln/core/topo_entry.hh (working copy) @@ -1,66 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_TOPO_ENTRY_HH -# define OLENA_CORE_TOPO_ENTRY_HH - -# include <oln/core/abstract/entry.hh> -# include <oln/core/abstract/topo.hh> - - - -namespace oln -{ - - - /// Entry class for point sets: topo_entry<E> is an alias for - /// entry< abstract::topo, E>. - - template <typename E> - struct topo_entry : public entry< abstract::topo, E> - { - protected: - topo_entry() {} - }; - - - /// Virtual types associated to topo_entry<E>. - - template <typename E> - struct vtypes< topo_entry<E> > - { - typedef mlc::undefined bbox_type; - typedef mlc::undefined ra_type; - - typedef mlc::undefined point_type; - }; - - -} // end of namespace oln - - -#endif // ! OLENA_CORE_TOPO_ENTRY_HH Index: oln/core/abstract/topo.hh =================================================================== --- oln/core/abstract/topo.hh (revision 545) +++ oln/core/abstract/topo.hh (working copy) @@ -1,83 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_ABSTRACT_TOPO_HH -# define OLENA_CORE_ABSTRACT_TOPO_HH - -# include <oln/core/typedefs.hh> - - -namespace oln -{ - - namespace abstract - { - - - /// Abstract point class. - template <typename E> - class topo : public virtual stc::any__simple<E>, - public virtual oln::type - { - public: - - struct decl - { - stc_virtual_typedef(bbox); // for being bboxed; provides .bbox() - stc_virtual_typedef(ra); // for random access; provides .has(p) - - stc_virtual_typedef(point); - - decl() { - // constraint: -// mlc::assert_< mlc::implies_< mlc::neq_< bbox, mlc::none >, -// mlc_is_a(bbox, abstract::bbox) > >::check(); - } - }; - - protected: - - topo() - {} - - ~topo() { decl(); } - - }; // end of class oln::abstract::topo<E> - - - - } // end of namespace oln::abstract - -} // end of namespace oln - - - -# include <oln/core/abstract/topo_hierarchies.hh> - - - -#endif // ! OLENA_CORE_ABSTRACT_TOPO_HH Index: oln/core/abstract/topology_hierarchies.hh =================================================================== --- oln/core/abstract/topology_hierarchies.hh (revision 543) +++ oln/core/abstract/topology_hierarchies.hh (working copy) @@ -25,25 +25,28 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH +#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH +# define OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH -# include <oln/core/abstract/topo.hh> +# include <oln/core/abstract/topology.hh> namespace oln { - typedef hierarchy< abstract::topo, 1 > topo_ra_hierarchy; - typedef hierarchy< abstract::topo, 2 > topo_with_bbox_hierarchy; + typedef hierarchy< abstract::topology, 1 > topology_hierarchy_wrt_accessibility; + typedef hierarchy< abstract::topology, 2 > topology_hierarchy_wrt_bbox; } // end of namespace oln -# include <oln/core/abstract/topo_ra.hh> -# include <oln/core/abstract/topo_with_bbox.hh> +// hierarchy 1: topology wrt accessibility +# include <oln/core/abstract/topology_being_random_accessible.hh> +// hierarchy 2: topology wrt bbox +# include <oln/core/abstract/topology_having_bbox.hh> -#endif // ! OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH +#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HIERARCHIES_HH + Index: oln/core/abstract/topology_having_bbox.hh =================================================================== --- oln/core/abstract/topology_having_bbox.hh (revision 543) +++ oln/core/abstract/topology_having_bbox.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH -# define OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH +#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH +# define OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH -# include <oln/core/abstract/topo.hh> +# include <oln/core/abstract/topology.hh> namespace oln @@ -39,7 +39,7 @@ template <typename E> - class topo_with_bbox : public virtual topo<E> + class topology_having_bbox : public virtual topology<E> { typedef oln_type_of(E, bbox) bbox_t; @@ -59,7 +59,7 @@ protected: - topo_with_bbox() + topology_having_bbox() {} }; @@ -68,14 +68,14 @@ template <typename E> - struct case_ < topo_with_bbox_hierarchy, E, 1 > + struct case_ < topology_hierarchy_wrt_bbox, E, 1 > : where_< mlc::neq_< oln_type_of(E, bbox), mlc::none > > { - typedef abstract::topo_with_bbox<E> ret; + typedef abstract::topology_having_bbox<E> ret; }; } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH +#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HAVING_BBOX_HH Index: oln/core/abstract/topo_with_bbox.hh =================================================================== --- oln/core/abstract/topo_with_bbox.hh (revision 545) +++ oln/core/abstract/topo_with_bbox.hh (working copy) @@ -1,81 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH -# define OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH - -# include <oln/core/abstract/topo.hh> - - -namespace oln -{ - - namespace abstract - { - - - template <typename E> - class topo_with_bbox : public virtual topo<E> - { - typedef oln_type_of(E, bbox) bbox_t; - - public: - - // abstract - const bbox_t& bbox() const - { - return this->exact().impl_bbox(); - } - - // concrete - operator bbox_t() const - { - return this->bbox(); - } - - protected: - - topo_with_bbox() - {} - }; - - - } // end of namespace oln::abstract - - - template <typename E> - struct case_ < topo_with_bbox_hierarchy, E, 1 > - : where_< mlc::neq_< oln_type_of(E, bbox), mlc::none > > - { - typedef abstract::topo_with_bbox<E> ret; - }; - - -} // end of namespace oln - - -#endif // ! OLENA_CORE_ABSTRACT_TOPO_WITH_BBOX_HH Index: oln/core/abstract/topo_hierarchies.hh =================================================================== --- oln/core/abstract/topo_hierarchies.hh (revision 545) +++ oln/core/abstract/topo_hierarchies.hh (working copy) @@ -1,49 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH -# define OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH - -# include <oln/core/abstract/topo.hh> - - -namespace oln -{ - - typedef hierarchy< abstract::topo, 1 > topo_ra_hierarchy; - typedef hierarchy< abstract::topo, 2 > topo_with_bbox_hierarchy; - -} // end of namespace oln - - -# include <oln/core/abstract/topo_ra.hh> -# include <oln/core/abstract/topo_with_bbox.hh> - - - -#endif // ! OLENA_CORE_ABSTRACT_TOPO_HIERARCHIES_HH - Index: oln/core/abstract/topology_being_random_accessible.hh =================================================================== --- oln/core/abstract/topology_being_random_accessible.hh (revision 543) +++ oln/core/abstract/topology_being_random_accessible.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPO_RA_HH -# define OLENA_CORE_ABSTRACT_TOPO_RA_HH +#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH +# define OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH -# include <oln/core/abstract/topo.hh> +# include <oln/core/abstract/topology.hh> @@ -40,7 +40,7 @@ template <typename E> - class ra_topo : public virtual topo<E> + class topology_being_random_accessible : public virtual topology<E> { typedef oln_type_of(E, point) point_t; @@ -52,7 +52,8 @@ } protected: - ra_topo() + + topology_being_random_accessible() {} }; @@ -61,14 +62,14 @@ template <typename E> - struct case_ < topo_ra_hierarchy, E, 1 > - : where_< mlc::eq_< oln_type_of(E, ra), mlc::true_ > > + struct case_ < topology_hierarchy_wrt_accessibility, E, 1 > + : where_< mlc::eq_< oln_type_of(E, is_random_accessible), mlc::true_ > > { - typedef abstract::ra_topo<E> ret; + typedef abstract::topology_being_random_accessible<E> ret; }; } // end of namespace oln -#endif // ! OLENA_CORE_ABSTRACT_TOPO_RA_HH +#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_BEING_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/topo_ra.hh =================================================================== --- oln/core/abstract/topo_ra.hh (revision 545) +++ oln/core/abstract/topo_ra.hh (working copy) @@ -1,74 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_ABSTRACT_TOPO_RA_HH -# define OLENA_CORE_ABSTRACT_TOPO_RA_HH - -# include <oln/core/abstract/topo.hh> - - - -namespace oln -{ - - namespace abstract - { - - - template <typename E> - class ra_topo : public virtual topo<E> - { - typedef oln_type_of(E, point) point_t; - - public: - - bool has(const point_t& p) const - { - return this->exact().impl_has(p); - } - - protected: - ra_topo() - {} - }; - - - } // end of namespace oln::abstract - - - template <typename E> - struct case_ < topo_ra_hierarchy, E, 1 > - : where_< mlc::eq_< oln_type_of(E, ra), mlc::true_ > > - { - typedef abstract::ra_topo<E> ret; - }; - - -} // end of namespace oln - - -#endif // ! OLENA_CORE_ABSTRACT_TOPO_RA_HH Index: oln/core/abstract/topology.hh =================================================================== --- oln/core/abstract/topology.hh (revision 543) +++ oln/core/abstract/topology.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_ABSTRACT_TOPO_HH -# define OLENA_CORE_ABSTRACT_TOPO_HH +#ifndef OLENA_CORE_ABSTRACT_TOPOLOGY_HH +# define OLENA_CORE_ABSTRACT_TOPOLOGY_HH # include <oln/core/typedefs.hh> @@ -34,22 +34,26 @@ namespace oln { + namespace abstract { - /// Abstract point class. + /// Abstract topology class. template <typename E> - class topo : public virtual stc::any__simple<E>, - public virtual oln::type + class topology : public virtual stc::any__simple<E>, + public virtual oln::type { public: struct decl { - stc_virtual_typedef(bbox); // for being bboxed; provides .bbox() - stc_virtual_typedef(ra); // for random access; provides .has(p) + stc_virtual_typedef(bbox); + // for being bboxed; provides .bbox() + stc_virtual_typedef(is_random_accessible); + // provides .has(p) and .has_large(p) + stc_virtual_typedef(point); decl() { @@ -61,12 +65,12 @@ protected: - topo() + topology() {} - ~topo() { decl(); } + ~topology() { decl(); } - }; // end of class oln::abstract::topo<E> + }; // end of class oln::abstract::topology<E> @@ -76,8 +80,8 @@ -# include <oln/core/abstract/topo_hierarchies.hh> +# include <oln/core/abstract/topology_hierarchies.hh> -#endif // ! OLENA_CORE_ABSTRACT_TOPO_HH +#endif // ! OLENA_CORE_ABSTRACT_TOPOLOGY_HH Index: oln/core/2d/aliases.hh =================================================================== --- oln/core/2d/aliases.hh (revision 545) +++ oln/core/2d/aliases.hh (working copy) @@ -38,7 +38,7 @@ template <typename C> class point2d_; template <typename C> class dpoint2d_; template <typename P> class bbox_; - template <typename P> class bbox_topo_; + template <typename P> class topo_bbox_; template <typename P> class fwd_piter_; template <typename P> class bkd_piter_; class grid2d; @@ -53,7 +53,7 @@ typedef bbox_<point2d> bbox2d; typedef fwd_piter_<point2d> fwd_piter2d; typedef bkd_piter_<point2d> bkd_piter2d; - typedef bbox_topo_<point2d> topo2d; + typedef topo_bbox_<point2d> topo2d; typedef point2d_<float> point2df; typedef dpoint2d_<float> dpoint2df; Index: oln/core/gen/bbox_topo.hh =================================================================== --- oln/core/gen/bbox_topo.hh (revision 545) +++ oln/core/gen/bbox_topo.hh (working copy) @@ -1,95 +0,0 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef OLENA_CORE_GEN_BBOX_TOPO_HH -# define OLENA_CORE_GEN_BBOX_TOPO_HH - -# include <oln/core/gen/bbox.hh> -# include <oln/core/topo_entry.hh> - - - -namespace oln -{ - - - // Forward declarations. - template <typename point> class bbox_topo_; - - - // Super type declaration. - template <typename point> - struct set_super_type< bbox_topo_<point> > - { - typedef bbox_topo_<point> self_t; - typedef topo_entry<self_t> ret; - }; - - - /// Virtual types associated to oln::bbox_<point>. - template <typename point> - struct vtypes< bbox_topo_<point> > - { - typedef bbox_<point> bbox_type; - typedef point point_type; - typedef mlc::true_ ra_type; - }; - - - /// Bounding box topology based on a point class. - template <typename point> - class bbox_topo_ : public topo_entry< bbox_topo_<point> > - { - typedef bbox_<point> bbox_t; - - public: - - bbox_topo_() - { - } - - bbox_topo_(const bbox_t& bb) - : bb_(bb) - { - } - - const bbox_t& impl_bbox() const - { - return bb_; - } - - protected: - - bbox_<point> bb_; - - }; - - -} // end of namespace oln - - -#endif // ! OLENA_CORE_GEN_BBOX_TOPO_HH Index: oln/core/gen/topo_bbox.hh =================================================================== --- oln/core/gen/topo_bbox.hh (revision 543) +++ oln/core/gen/topo_bbox.hh (working copy) @@ -25,11 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLENA_CORE_GEN_BBOX_TOPO_HH -# define OLENA_CORE_GEN_BBOX_TOPO_HH +#ifndef OLENA_CORE_GEN_TOPO_BBOX_HH +# define OLENA_CORE_GEN_TOPO_BBOX_HH # include <oln/core/gen/bbox.hh> -# include <oln/core/topo_entry.hh> +# include <oln/core/topology_entry.hh> @@ -38,41 +38,41 @@ // Forward declarations. - template <typename point> class bbox_topo_; + template <typename point> class topo_bbox_; // Super type declaration. template <typename point> - struct set_super_type< bbox_topo_<point> > + struct set_super_type< topo_bbox_<point> > { - typedef bbox_topo_<point> self_t; - typedef topo_entry<self_t> ret; + typedef topo_bbox_<point> self_t; + typedef topology_entry<self_t> ret; }; /// Virtual types associated to oln::bbox_<point>. template <typename point> - struct vtypes< bbox_topo_<point> > + struct vtypes< topo_bbox_<point> > { typedef bbox_<point> bbox_type; typedef point point_type; - typedef mlc::true_ ra_type; + typedef mlc::true_ is_random_accessible_type; }; /// Bounding box topology based on a point class. template <typename point> - class bbox_topo_ : public topo_entry< bbox_topo_<point> > + class topo_bbox_ : public topology_entry< topo_bbox_<point> > { typedef bbox_<point> bbox_t; public: - bbox_topo_() + topo_bbox_() { } - bbox_topo_(const bbox_t& bb) + topo_bbox_(const bbox_t& bb) : bb_(bb) { } @@ -82,6 +82,11 @@ return bb_; } + bool impl_has(const point& p) const + { + return bb_.has(p); + } + protected: bbox_<point> bb_; @@ -92,4 +97,4 @@ } // end of namespace oln -#endif // ! OLENA_CORE_GEN_BBOX_TOPO_HH +#endif // ! OLENA_CORE_GEN_TOPO_BBOX_HH Index: oln/basics2d.hh =================================================================== --- oln/basics2d.hh (revision 545) +++ oln/basics2d.hh (working copy) @@ -47,8 +47,8 @@ # include <oln/core/gen/bkd_piter.hh> namespace oln { template class bkd_piter_<point2d>; } -# include <oln/core/gen/bbox_topo.hh> -namespace oln { template class bbox_topo_<point2d>; } +# include <oln/core/gen/topo_bbox.hh> +namespace oln { template class topo_bbox_<point2d>; } # include <oln/core/2d/image2d.hh> Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 545) +++ oln/Makefile.am (working copy) @@ -2,59 +2,59 @@ olndir = $(includedir)/oln -nobase_oln_HEADERS = \ - core/1d/grid1d.hh \ - \ - core/2d/grid2d.hh \ - core/2d/aliases.hh \ - core/2d/dpoint2d.hh \ - core/2d/grid2d.hh \ - core/2d/image2d.hh \ - core/2d/point2d.hh \ - \ - core/3d/grid3d.hh \ - \ - core/abstract/internal/image_impl.hh \ - \ - core/abstract/any.hh \ - core/abstract/bbox.hh \ - core/abstract/dpoint.hh \ - core/abstract/dpoint_nd.hh \ - core/abstract/entry.hh \ - core/abstract/grid.hh \ - core/abstract/image_dimension.hh \ - core/abstract/image.hh \ - core/abstract/image_hierarchies.hh \ - core/abstract/image_type.hh \ - core/abstract/image_type_integre.hh \ - core/abstract/iter.hh \ - core/abstract/piter.hh \ - core/abstract/point.hh \ - core/abstract/point_nd.hh \ - core/abstract/pset_bboxed.hh \ - core/abstract/pset_cnx.hh \ - core/abstract/pset_fixed.hh \ - core/abstract/pset.hh \ - core/abstract/pset_hierarchies.hh \ - core/abstract/pset_ra.hh \ - core/abstract/topo.hh \ - core/abstract/topo_hierarchies.hh \ - core/abstract/topo_ra.hh \ - core/abstract/topo_with_bbox.hh \ - \ - core/gen/bbox.hh \ - core/gen/bbox_topo.hh \ - core/gen/bkd_piter.hh \ - core/gen/fwd_piter.hh \ - \ - core/case.hh \ - core/image_entry.hh \ - core/macros.hh \ - core/pset_entry.hh \ - core/traits.hh \ - core/traits_id.hh \ - core/topo_entry.hh \ - core/typedefs.hh \ - core/type.hh \ - \ +nobase_oln_HEADERS = \ + core/1d/grid1d.hh \ + \ + core/2d/grid2d.hh \ + core/2d/aliases.hh \ + core/2d/dpoint2d.hh \ + core/2d/grid2d.hh \ + core/2d/image2d.hh \ + core/2d/point2d.hh \ + \ + core/3d/grid3d.hh \ + \ + core/abstract/internal/image_impl.hh \ + \ + core/abstract/any.hh \ + core/abstract/bbox.hh \ + core/abstract/dpoint.hh \ + core/abstract/dpoint_nd.hh \ + core/abstract/entry.hh \ + core/abstract/grid.hh \ + core/abstract/image_dimension.hh \ + core/abstract/image.hh \ + core/abstract/image_hierarchies.hh \ + core/abstract/image_type.hh \ + core/abstract/image_type_integre.hh \ + core/abstract/iter.hh \ + core/abstract/piter.hh \ + core/abstract/point.hh \ + core/abstract/point_nd.hh \ + core/abstract/pset_bboxed.hh \ + core/abstract/pset_cnx.hh \ + core/abstract/pset_fixed.hh \ + core/abstract/pset.hh \ + core/abstract/pset_hierarchies.hh \ + core/abstract/pset_ra.hh \ + core/abstract/topology.hh \ + core/abstract/topology_hierarchies.hh \ + core/abstract/topology_being_random_accessible.hh \ + core/abstract/topology_having_bbox.hh \ + \ + core/gen/bbox.hh \ + core/gen/topo_bbox.hh \ + core/gen/bkd_piter.hh \ + core/gen/fwd_piter.hh \ + \ + core/case.hh \ + core/image_entry.hh \ + core/macros.hh \ + core/pset_entry.hh \ + core/traits.hh \ + core/traits_id.hh \ + core/topology_entry.hh \ + core/typedefs.hh \ + core/type.hh \ + \ basics2d.hh

17 years, 7 months

545: Add a default (empty) class for automatically retrieved implementations.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a default (empty) class for automatically retrieved implementations. * stc/vtypes.hh (automatic::impl): New. /usr/lib/ruby/gems/1.8/gems/objective_command-0.1.1.0/lib/objective_command/runners/exec.rb:14: warning: Insecure world writable dir /work, mode 041777 vtypes.hh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: stc/vtypes.hh --- stc/vtypes.hh (revision 544) +++ stc/vtypes.hh (working copy) @@ -227,6 +227,21 @@ }; \ \ \ + /* ----------------------------------------- */ \ + /* Automatically retrieved implementations. */ \ + /* ----------------------------------------- */ \ + \ + /** Default (empty) automatic implementation. */ \ + namespace automatic { \ + \ + template <typename abstraction, typename tag, typename E> \ + class impl \ + { \ + }; \ + \ + } /* end of namespace automatic */ \ + \ + \ /* --------------- */ \ /* Virtual types. */ \ /* --------------- */ \

17 years, 7 months

544: Add xtd::mk_vec.

by Thierry GERAUD

2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add operator- to n-dimensional dpoint types. * oln/core/traits_id.hh (op_uminus_dpointnd): New. * oln/core/abstract/dpoint_nd.hh (operator-): New. (impl_less): New. (case_): New case for operator-. * oln/core/2d/dpoint2d.hh (dpoint2d_): New ctor. Index: oln/core/traits_id.hh =================================================================== --- oln/core/traits_id.hh (revision 543) +++ oln/core/traits_id.hh (working copy) @@ -39,7 +39,7 @@ /// \{ - /// Identifiers for oln operators +. + /// Identifiers for oln binary operators +. enum { op_plus_pointnd_dpointnd = 1 @@ -50,7 +50,7 @@ /// \{ - /// Identifiers for oln operators -. + /// Identifiers for oln binary operators -. enum { op_minus_pointnd_pointnd = 1, @@ -60,6 +60,17 @@ /// \} + + /// \{ + /// Identifiers for oln unary operators -. + + enum { + op_uminus_dpointnd = 1 + }; + + /// \} + + } // end of namespace oln::id } // end of namespace oln Index: oln/core/abstract/dpoint_nd.hh =================================================================== --- oln/core/abstract/dpoint_nd.hh (revision 543) +++ oln/core/abstract/dpoint_nd.hh (working copy) @@ -31,6 +31,7 @@ # include <mlc/value.hh> # include <xtd/vec.hh> +# include <stc/exact.hh> # include <oln/core/abstract/dpoint.hh> @@ -55,6 +56,7 @@ template <typename E> class dpoint_nd : public abstract::dpoint<E> { + typedef E exact_t; typedef dpoint_nd<E> self_t; typedef oln_type_of(E, dim) dim; typedef oln_type_of(E, coord) coord_t; @@ -85,6 +87,17 @@ return v_; } + exact_t operator-() const + { + exact_t tmp(-v_); + return tmp; + } + + bool impl_less(const self_t& rhs) const + { + return xtd::lexi_less(v_, rhs.vec()); + } + protected: /// Ctor. @@ -102,6 +115,18 @@ } // end of namespace oln::abstract + + /// - abstract::dpoint_nd + template <typename D> + struct case_ < xtd::op_uminus, D, + oln::id::op_uminus_dpointnd > + : where_< mlc_is_a(D, abstract::dpoint_nd) > + { + typedef stc_to_exact(D) ret; + }; + + + } // end of namespace oln Index: oln/core/2d/dpoint2d.hh =================================================================== --- oln/core/2d/dpoint2d.hh (revision 543) +++ oln/core/2d/dpoint2d.hh (working copy) @@ -79,6 +79,12 @@ { } + /// Ctor. + dpoint2d_(coord_t row, coord_t col) + : super_t(xtd::mk_vec(row, col)) + { + } + coord_t row() const { return v_[0]; } coord_t& row() { return v_[0]; }

17 years, 7 months

543: Add xtd::mk_vec.

by Thierry GERAUD

2006-09-15 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * xtd/vec.hh (operator-): Fix missing const. (mk_vec): New. Index: xtd/vec.hh =================================================================== --- xtd/vec.hh (revision 542) +++ xtd/vec.hh (working copy) @@ -203,7 +203,7 @@ } vec<n, xtd_op_uminus_trait(T)> - operator-() + operator-() const { vec<n, xtd_op_uminus_trait(T)> tmp; for (unsigned i = 0; i < n; ++i) @@ -311,6 +311,37 @@ }; + + /// mk_vec. + + template <typename T> + vec<1, T> mk_vec(const T& v_0) + { + vec<1, T> tmp; + tmp[0] = v_0; + return tmp; + } + + template <typename T> + vec<2, T> mk_vec(const T& v_0, const T& v_1) + { + vec<2, T> tmp; + tmp[0] = v_0; + tmp[1] = v_1; + return tmp; + } + + template <typename T> + vec<3, T> mk_vec(const T& v_0, const T& v_1, const T& v_2) + { + vec<3, T> tmp; + tmp[0] = v_0; + tmp[1] = v_1; + tmp[2] = v_2; + return tmp; + } + + } // end of namespace xtd

17 years, 7 months

olena-0.10 10.258: Fix oln/Makefile

by Roland Levillain

2006-09-15 Roland Levillain <roland(a)lrde.epita.fr> Fix oln/Makefile. * oln/Makefile.am (SUBDIRS): s,lrde/ufmt,lrde,. --- 10.257/olena/oln/Makefile.am Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.2 600) +++ 10.258/olena/oln/Makefile.am Fri, 15 Sep 2006 11:05:05 +0200 levill_r (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.3 600) @@ -16,5 +16,5 @@ ## The contents of `olena/lrde' should be moved to subdirectory of ## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests' ## or to `tools'. -SUBDIRS = . lrde/ufmt +SUBDIRS = . lrde ## ---------------------------------------- FIXME: Improve integration. -- --- 10.257/oln.prj +++ 10.258/oln.prj @@ -1,18 +1,17 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 257) -(Parent-Version oln 10 256) -(Version-Log "2006-09-13 Roland Levillain <roland(a)lrde.epita.fr> +(Project-Version oln 10 258) +(Parent-Version oln 10 257) +(Version-Log "2006-09-15 Roland Levillain <roland(a)lrde.epita.fr> - Prevent recursive traversals accross directories. + Fix oln/Makefile. - * oln/lrde/ufmt/bin/inc: Remove this symbolic link. - * oln/lrde/ufmt/bin/gpp, oln/lrde/ufmt/bin/gppo: Adjust. + * oln/Makefile.am (SUBDIRS): s,lrde/ufmt,lrde,. ") (New-Version-Log "") -(Checkin-Time "Wed, 13 Sep 2006 13:11:27 +0200") +(Checkin-Time "Fri, 15 Sep 2006 11:05:05 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -129,7 +128,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.1 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.2 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600)) @@ -806,7 +805,7 @@ (integre/tests/check/defs.in (oln/q/42_defs.in 1.1 600)) (metalic/mlc/array/objs.hh (oln/q/45_objs.hh 1.3 600)) (metalic/mlc/config/system.hh (oln/q/46_system.hh 1.2 600)) - (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.2 600)) + (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.3 600)) (integre/ntg/config/system.hh (oln/q/48_system.hh 1.2 600)) (metalic/tests/main/tests/is_a1 (oln/r/17_is_a1 1.4 600)) (metalic/tests/main/tests/ensure3 (oln/r/18_ensure3 1.4 600))

17 years, 7 months

542: Add a missing file to the distribution.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a missing file to the distribution. * oln/Makefile.am (nobase_oln_HEADERS): Add core/abstract/piter. Makefile.am | 1 + 1 file changed, 1 insertion(+) Index: oln/Makefile.am --- oln/Makefile.am (revision 541) +++ oln/Makefile.am (working copy) @@ -28,6 +28,7 @@ core/abstract/image_type.hh \ core/abstract/image_type_integre.hh \ core/abstract/iter.hh \ + core/abstract/piter.hh \ core/abstract/point.hh \ core/abstract/point_nd.hh \ core/abstract/pset_bboxed.hh \

17 years, 7 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2006