Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

477: More documentation on image dimension abstraction.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/core/abstract/image_dimension.hh: Add some more documentation. image_dimension.hh | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions Index: oln/core/abstract/image_dimension.hh --- oln/core/abstract/image_dimension.hh (revision 476) +++ oln/core/abstract/image_dimension.hh (working copy) @@ -30,6 +30,38 @@ # include <oln/core/abstract/image.hh> +/* Image dimension hierarchy (summary). + + + /image/ + ^ + | + ,------------------------+------------------------. + | | | + /image1d/ /image2d/ /image3d/ + ^ ^ ^ + | | | + ,---------------------. ,---------------------. ,---------------------. + | if type_of(I, grid) | | if type_of(I, grid) | | if type_of(I, grid) | + | == grid1d | | == grid2d | | == grid3d | + `---------------------' `---------------------' `---------------------' + | | | + o o o + + o + | + stc::set_entry_node<I, dimension_tag> + (image dimension selector) + ^ + | + /image_entry/ + ^ + | + I + (a concrete image) + +*/ + /*! \namespace oln ** \brief oln namespace. */

18 years, 8 months

476: Re-enable exact_type vtype.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Re-enable exact_type vtype. * oln/core/typedefs.hh (oln_super_of_, oln_super2_of_) (oln_super3_of_, oln_super_of): Remove macros. (exact_type): Enable this typedef. * oln/core/abstract/image.hh (packed_vtypes::exact_type): New typedef. (packed_vtypes::echo): Print exact_type. (packed_vtypes::ensure): Check exact_type. abstract/image.hh | 8 ++++++ typedefs.hh | 64 +++++++++++++++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 32 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 475) +++ oln/core/typedefs.hh (working copy) @@ -37,42 +37,34 @@ # include <stc/vtypes.hh> -# define oln_super_of_(Type) \ -oln::internal::get_super_type<Type>::ret - -# define oln_super2_of_(Type,_2) \ -oln::internal::get_super_type<Type,_2>::ret - -# define oln_super3_of_(Type,_2,_3) \ -oln::internal::get_super_type<Type,_2,_3>::ret - - -# define oln_super_of(Type) \ -typename oln_super_of_(Type) - - - namespace oln { - // Namespace equipment. The virtual types facility is inserted here - // because it also triggers Metalic's typedef introspection - // equipment. + /*----------------------. + | Namespace equipment. | + `----------------------*/ + + // The virtual types facility is inserted here because it also + // triggers Metalic's typedef introspection equipment. stc_equip_namespace_with_vtypes(); - // Misc. + /*-------. + | Misc. | + `-------*/ -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(exact_type); -// -------------------------------------------------------------------- + mlc_decl_typedef(exact_type); - // General. + + /*----------. + | General. | + `----------*/ mlc_decl_typedef(grid_type); - // Iterators. + + /*------------. + | Iterators. | + `------------*/ // -------------------------------------------------------------------- // FIXME: To be enabled later. @@ -94,7 +86,10 @@ // mlc_decl_typedef(bkd_niter_type); // -------------------------------------------------------------------- - // category::image. + + /*------------------. + | category::image. | + `------------------*/ // -------------------------------------------------------------------- // FIXME: To be enabled later. @@ -133,7 +128,10 @@ // mlc_decl_typedef(image_rawness_type); // -------------------------------------------------------------------- - // Extension in image_operators. + // ------------------------------ // + // Extension in image_operators. // + // ------------------------------ // + // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- @@ -144,14 +142,17 @@ // -------------------------------------------------------------------- - - // category::grid. + /*-----------------. + | category::grid. | + `-----------------*/ mlc_decl_typedef(dimvalue_type); mlc_decl_typedef(coord_type); - // category::fun1 and category::fun2. + /*------------------------------------. + | category::fun1 and category::fun2. | + `------------------------------------*/ // -------------------------------------------------------------------- // FIXME: To be enabled later. @@ -162,7 +163,6 @@ // mlc_decl_typedef(right_type); // -------------------------------------------------------------------- - } // end of namespace oln Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 475) +++ oln/core/abstract/image.hh (working copy) @@ -62,6 +62,7 @@ typedef I exact_type; typedef mlc::undefined grid_type; + // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- @@ -94,6 +95,8 @@ struct packed_vtypes<category::image, I> { // Internally defined virtual types. + typedef oln_type_of(I, exact) exact_type; + typedef oln_type_of(I, grid) grid_type; // -------------------------------------------------------------------- @@ -133,6 +136,8 @@ << "vtypes_of(oln::category::image, " << mlc_to_string(I) << ") =" << std::endl << "{" << std::endl + << " exact_type = " << mlc_to_string(exact_type) << std::endl + << " grid_type = " << mlc_to_string(grid_type) << std::endl // -------------------------------------------------------------------- @@ -166,7 +171,10 @@ static void ensure() { + mlc::assert_< mlc_is_ok(exact_type) >::check(); + mlc::assert_< mlc_is_ok(grid_type) >::check(); + // -------------------------------------------------------------------- // FIXME: To be enabled later. // --------------------------------------------------------------------

18 years, 8 months

475: oln/core/typedefs.hh: s/properties/vtypes/.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * oln/core/typedefs.hh: s/properties/vtypes/. typedefs.hh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 474) +++ oln/core/typedefs.hh (working copy) @@ -34,7 +34,7 @@ # include <mlc/flags.hh> # include <mlc/cmp.hh> # include <mlc/typedef.hh> -# include <stc/properties.hh> +# include <stc/vtypes.hh> # define oln_super_of_(Type) \ @@ -55,8 +55,10 @@ namespace oln { - // Namespace equipment. - stc_equip_namespace_with_properties(); + // Namespace equipment. The virtual types facility is inserted here + // because it also triggers Metalic's typedef introspection + // equipment. + stc_equip_namespace_with_vtypes(); // Misc.

18 years, 8 months

474: Rename stc/properties.hh as stc/vtypes.hh.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Rename stc/properties.hh as stc/vtypes.hh. * stc/properties.hh: Rename as... * stc/vtypes.hh: ...this. (stc_equip_namespace_with_properties): Rename as... (stc_equip_namespace_with_vtypes): ...this. Adjust. * stc/Makefile.am (nobase_stc_HEADERS): Rename properties.hh as vtypes.hh. * tests/properties.cc: Rename as... * tests/vtypes.cc: ...this. Adjust. * tests/entry.cc: Adjust. * tests/Makefile.am (check_PROGRAMS): Rename properties as vtypes. (properties_SOURCES): Likewise. Rename variable as... (vtypes_SOURCES): ...this. stc/Makefile.am | 2 +- stc/vtypes.hh | 26 +++++++++++++------------- tests/Makefile.am | 4 ++-- tests/entry.cc | 5 ++--- tests/vtypes.cc | 4 ++-- 5 files changed, 20 insertions(+), 21 deletions(-) Index: tests/entry.cc --- tests/entry.cc (revision 473) +++ tests/entry.cc (working copy) @@ -113,9 +113,8 @@ namespace my_lib { - // Virtual types. - // We don't use all the equipment of stc/properties.hh for - // simplicity purpose. + // Virtual types. We don't use all the equipment of stc/vtypes.hh + // for the sake of simplicity. template <typename T> struct vtypes { Index: tests/Makefile.am --- tests/Makefile.am (revision 473) +++ tests/Makefile.am (working copy) @@ -10,10 +10,10 @@ check_PROGRAMS = \ any \ entry \ - properties + vtypes any_SOURCES = any.cc -properties_SOURCES = properties.cc entry_SOURCES = entry.cc +vtypes_SOURCES = vtypes.cc TESTS = $(check_PROGRAMS) Index: tests/vtypes.cc --- tests/vtypes.cc (revision 472) +++ tests/vtypes.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#include <stc/properties.hh> +#include <stc/vtypes.hh> #include <mlc/cmp.hh> #include <mlc/assert.hh> #include <mlc/int.hh> @@ -58,7 +58,7 @@ | Namespace equipment. | `----------------------*/ - stc_equip_namespace_with_properties(); + stc_equip_namespace_with_vtypes(); /*-----------. Index: stc/vtypes.hh --- stc/vtypes.hh (revision 472) +++ stc/vtypes.hh (working copy) @@ -25,13 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -// \file stc/properties.hh -// \brief Property mechanism. -// -// From Theo's presentation (olena-06-jan.pdf). +/* \file stc/vtypes.hh + \brief Virtual types (also known as ``properties'') mechanism. -#ifndef STATIC_PROPERTIES_HH -# define STATIC_PROPERTIES_HH + Based on Theo's presentation from January 2006 (olena-06-jan.pdf). */ + +#ifndef STATIC_VTYPES_HH +# define STATIC_VTYPES_HH # include <mlc/flags.hh> # include <mlc/typedef.hh> @@ -100,7 +100,7 @@ typename TypedefName::template from_< Type >::ret // FIXME: Add support for hierarchies with several super classes. -# define stc_equip_namespace_with_properties() \ +# define stc_equip_namespace_with_vtypes() \ \ /* ----------------------- */ \ /* Typedefs declarations. */ \ @@ -166,7 +166,7 @@ }; \ \ /** Optional packing structure, to be specialized by the user. */ \ - /** See tests/properties.hh for an example of use. */ \ + /** See tests/vtypes.hh for an example of use. */ \ template <typename category, typename from_type> \ struct packed_vtypes \ { \ @@ -474,25 +474,25 @@ // could get rid of local versions (stc_local_type_of and // stc_local_type_of_). -/// Get the property \a Typedef, declared in the current namespace, +/// Get the vtype \a Typedef, declared in the current namespace, /// from \a FromType (version to be used inside a template). #define stc_local_type_of(Category, FromType, Typedef) \ typename stc_type_of_(Category, FromType, Typedef) -/// Get the property \a Typedef, declared in the current namespace, +/// Get the vtype \a Typedef, declared in the current namespace, /// from \a FromType (version to be used outside a template). #define stc_local_type_of_(Category, FromType, Typedef) \ type_of_<Category, FromType, typedef_:: Typedef##_type >::ret -/// Get the property \a Typedef, declared in \a Namespace, from \a +/// Get the vtype \a Typedef, declared in \a Namespace, from \a /// FromType (version to be used inside a template). #define stc_type_of(Namespace, Category, FromType, Typedef) \ typename stc_type_of_(Namespace, Category, FromType, Typedef) -/// Get the property \a Typedef, declared in \a Namespace, from \a +/// Get the vtype \a Typedef, declared in \a Namespace, from \a /// FromType (version to be used outside a template). #define stc_type_of_(Namespace, Category, FromType, Typedef) \ Namespace::type_of_<Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret -#endif // ! STATIC_PROPERTIES_HH +#endif // ! STATIC_VTYPES_HH Index: stc/Makefile.am --- stc/Makefile.am (revision 473) +++ stc/Makefile.am (working copy) @@ -4,4 +4,4 @@ nobase_stc_HEADERS = \ any.hh \ entry.hh \ - properties.hh + vtypes.hh

18 years, 8 months

473: Catch up with the latest name changes in Static.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Catch up with the latest name changes in Static. * oln/core/abstract/image_dimension.hh (case_<grid_dim_tag, grid_type, 1>) (case_<grid_dim_tag, grid_type, 2>) (case_<grid_dim_tag, grid_type, 3>): s/stc::is_a/stc::abstraction_as_type/. * oln/core/abstract/macros.hh (oln_type_of, oln_type_of_) * oln/core/abstract/grid.hh (oln_grd_type_of, oln_grd_type_of_): Catch up with the new names of Static macros. * tests/image_entry.cc: Adjust test. oln/core/abstract/grid.hh | 4 ++-- oln/core/abstract/image_dimension.hh | 6 +++--- oln/core/abstract/macros.hh | 9 ++------- tests/image_entry.cc | 3 ++- 4 files changed, 9 insertions(+), 13 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 472) +++ tests/image_entry.cc (working copy) @@ -74,7 +74,8 @@ mlc::assert_< mlc_eq(my::image::grid_type, oln::grid1d) >::check(); // Check its externally defined vtype. mlc::assert_< mlc_eq( my::image::image_dimension_type, - stc::is_a<oln::abstract::image1d> ) >::check(); + stc::abstraction_as_type<oln::abstract::image1d> ) + >::check(); // Check its image dimension abstraction. mlc::assert_< mlc_is_a_(my::image, oln::abstract::image1d) >::check(); // Ensure we can instantiate it. Index: oln/core/abstract/macros.hh --- oln/core/abstract/macros.hh (revision 472) +++ oln/core/abstract/macros.hh (working copy) @@ -28,19 +28,14 @@ #ifndef OLENA_CORE_ABSTRACT_MACROS_HH # define OLENA_CORE_ABSTRACT_MACROS_HH -// FIXME: Perhaps only ``external'' versions are really useful (since -// they are more precise), and we could get rid of other versions. -// Likewise, we could drop the stc_typeof without namespace -// information. - /// \def Shortcuts for virtual types associated to images (version to // be used inside a template). # define oln_type_of(ImageType, Alias) \ -stc_typeof_in_namespace(oln, oln::category::image, ImageType, Alias) +stc_type_of(oln, oln::category::image, ImageType, Alias) /// \def Shortcuts for virtual types associated to images (version to // be used outside a template). # define oln_type_of_(ImageType, Alias) \ -stc_typeof_in_namespace_(oln, oln::category::image, ImageType, Alias) +stc_type_of_(oln, oln::category::image, ImageType, Alias) #endif // ! OLENA_CORE_ABSTRACT_MACROS_HH Index: oln/core/abstract/grid.hh --- oln/core/abstract/grid.hh (revision 472) +++ oln/core/abstract/grid.hh (working copy) @@ -36,10 +36,10 @@ # define oln_grd_type_of(GridType, Alias) \ -stc_typeof_in_namespace(oln, oln::category::grid, GridType, Alias) +stc_type_of(oln, oln::category::grid, GridType, Alias) # define oln_grd_type_of_(GridType, Alias) \ -stc_typeof_in_namespace_(oln, oln::category::grid, GridType, Alias) +stc_type_of_(oln, oln::category::grid, GridType, Alias) namespace oln { Index: oln/core/abstract/image_dimension.hh --- oln/core/abstract/image_dimension.hh (revision 472) +++ oln/core/abstract/image_dimension.hh (working copy) @@ -107,7 +107,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid1d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image1d> ret; + typedef stc::abstraction_as_type<abstract::image1d> ret; }; template <typename grid_type> @@ -116,7 +116,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid2d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image2d> ret; + typedef stc::abstraction_as_type<abstract::image2d> ret; }; template <typename grid_type> @@ -125,7 +125,7 @@ public mlc::where_< mlc_eq(grid_type, oln::grid3d) > { // Super class if test succeeds. - typedef stc::is_a<abstract::image3d> ret; + typedef stc::abstraction_as_type<abstract::image3d> ret; }; /// Abort when grid_type is not handled by the previous cases.

18 years, 8 months

472: Rename some Static entities.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Rename some Static entities. * stc/properties.hh (typeof_): Rename class as... (type_of_): ...this. (stc::is_a): Rename class as... (stc::abstraction_as_type): ...this. (stc_typeof, stc_typeof_, stc_typeof_in_namespace) (stc_typeof_in_namespace_): Rename macros as... (stc_local_type_of, stc_local_type_of_, stc_type_of) (stc_type_of_): ...these. * tests/properties.cc: Adjust test. * tests/entry.cc: Typos in comments. stc/properties.hh | 41 ++++++++++++++++++++++------------------- tests/entry.cc | 8 ++++---- tests/properties.cc | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) Index: tests/properties.cc --- tests/properties.cc (revision 471) +++ tests/properties.cc (working copy) @@ -38,7 +38,7 @@ typename my_type_of_(FromType, Typedef) #define my_type_of_(FromType, Typedef) \ - stc_typeof_(my::category::my_cat, FromType, Typedef) + stc_local_type_of_(my::category::my_cat, FromType, Typedef) namespace my { Index: tests/entry.cc --- tests/entry.cc (revision 471) +++ tests/entry.cc (working copy) @@ -158,7 +158,7 @@ // Test. public mlc::where_< mlc_is_a(prop1_type, int) > { - // Super class if test succeed. + // Super class if test succeeds. typedef property1a ret; }; @@ -167,7 +167,7 @@ // Test. public mlc::where_< mlc_is_a(prop1_type, long) > { - // Super class if test succeed. + // Super class if test succeeds. typedef property1b ret; }; @@ -208,7 +208,7 @@ // Test. public mlc::where_< mlc_is_a(prop2_type, float) > { - // Super class if test succeed. + // Super class if test succeeds. typedef property2a ret; }; @@ -217,7 +217,7 @@ // Test. public mlc::where_< mlc_is_a(prop2_type, double) > { - // Super class if test succeed. + // Super class if test succeeds. typedef property2b ret; }; Index: stc/properties.hh --- stc/properties.hh (revision 471) +++ stc/properties.hh (working copy) @@ -88,7 +88,7 @@ }; /// \} -} +} // end of namespace mlc /*------------. @@ -376,7 +376,7 @@ /* FIXME: Don't query from_type directly, but exact_type(from_type) */ \ /* instead. We need mlc::any for this. */ \ template <typename category, typename from_type, typename typedef_type> \ - struct typeof_ \ + struct type_of_ \ { \ /* Look for the typedef as an external type. */ \ typedef typename \ @@ -410,7 +410,7 @@ /// Allow the manipulation of an abstraction (i.e., a template type) /// as a plain type. template <template <typename> class abstraction> - struct is_a + struct abstraction_as_type { template <typename E> struct instantiated_with @@ -418,7 +418,7 @@ typedef abstraction<E> ret; }; }; -} +} // end of namespace stc /*---------. @@ -469,27 +469,30 @@ # define stc_pseudosuper_(T) \ set_pseudosuper_type<T>::ret -// FIXME: s/stc_typeof/stc_type_of/. - -/// Get the property \a Typedef from \a FromType (version to be used -/// inside a template). -#define stc_typeof(Category, FromType, Typedef) \ - typename stc_typeof_(Category, FromType, Typedef) - -/// Get the property \a Typedef from \a FromType (version to be used -/// outside a template). -#define stc_typeof_(Category, FromType, Typedef) \ - typeof_<Category, FromType, typedef_:: Typedef##_type >::ret +// FIXME: Perhaps only ``external'' (i.e., non local) versions of +// stc_type_of are really useful (since they are more precise), and we +// could get rid of local versions (stc_local_type_of and +// stc_local_type_of_). + +/// Get the property \a Typedef, declared in the current namespace, +/// from \a FromType (version to be used inside a template). +#define stc_local_type_of(Category, FromType, Typedef) \ + typename stc_type_of_(Category, FromType, Typedef) + +/// Get the property \a Typedef, declared in the current namespace, +/// from \a FromType (version to be used outside a template). +#define stc_local_type_of_(Category, FromType, Typedef) \ + type_of_<Category, FromType, typedef_:: Typedef##_type >::ret /// Get the property \a Typedef, declared in \a Namespace, from \a /// FromType (version to be used inside a template). -#define stc_typeof_in_namespace(Namespace, Category, FromType, Typedef) \ - typename stc_typeof_in_namespace_(Namespace, Category, FromType, Typedef) +#define stc_type_of(Namespace, Category, FromType, Typedef) \ + typename stc_type_of_(Namespace, Category, FromType, Typedef) /// Get the property \a Typedef, declared in \a Namespace, from \a /// FromType (version to be used outside a template). -#define stc_typeof_in_namespace_(Namespace, Category, FromType, Typedef) \ - Namespace::typeof_<Category, FromType, \ +#define stc_type_of_(Namespace, Category, FromType, Typedef) \ + Namespace::type_of_<Category, FromType, \ Namespace::typedef_:: Typedef##_type >::ret #endif // ! STATIC_PROPERTIES_HH

18 years, 8 months

471: Inheritance from image dimension abstraction based on the grid type.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Plug image_entry's inheritance to the right image dimension abstraction according to the grid type of the exact image type. * oln/core/abstract/image_entry.hh: Add switch/case equipment in the oln namespace. * oln/core/abstract/image_dimension.hh (grid_dim_tag) (case_<grid_dim_tag, grid_type, 1>) (case_<grid_dim_tag, grid_type, 2>) (case_<grid_dim_tag, grid_type, 3>) (default_case_<grid_dim_tag, grid_type>): New Metalic switch/case on grid type, returning the corresponding image dimension type. (set_entry_node<I, oln::abstract::dimension_tag>): Use this Metalic switch/case to choose the dimension abstraction in the inheritance tree. * oln/core/abstract/image.hh (vtypes): Don't define image_dimension_type as an internal vtype, instead... * oln/core/abstract/image_dimension.hh (oln::ext_vtype<category::image, abstract::image, typedef_::image_dimension_type>): ...define it externally, using the switch used inheritance-plugging mechanism based on the grid type. * tests/image_entry.cc (oln): Adjust. Check my::image's virtual types. Print my::image's vtypes on the standard output. oln/core/abstract/image.hh | 7 +-- oln/core/abstract/image_dimension.hh | 80 +++++++++++++++++++++++++++++++---- oln/core/abstract/image_entry.hh | 7 ++- tests/image_entry.cc | 27 ++++++++--- 4 files changed, 101 insertions(+), 20 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 470) +++ tests/image_entry.cc (working copy) @@ -46,12 +46,10 @@ template<> struct vtypes<category::image, my::image> { - // FIXME: Don't use the abstraction as a property, but the - // corresponding grid instead. The switch for image_dimension - // (above image_entry) should plug the inheritance relationship to - // the right image_dimension class using the sole grid information - // (the grid can be seen here as a ``tag''). - typedef stc::is_a<abstract::image1d> image_dimension_type; + // The switch for image_dimension (above image_entry) plugs the + // inheritance relation to the right abstract::image_dimension + // class using the sole grid information (the grid can be seen + // here as a ``tag''). typedef oln::grid1d grid_type; }; } @@ -62,6 +60,9 @@ class image : public oln::set_super_type<my::image>::ret { typedef image self_type; + // An internal vtype. + typedef oln_type_of_(self_type, grid) grid_type; + // An external vtype. typedef oln_type_of_(self_type, image_dimension) image_dimension_type; }; } @@ -69,7 +70,17 @@ int main() { - // Instantiate it, and check its dimension. + // Check its internally defined vtype. + mlc::assert_< mlc_eq(my::image::grid_type, oln::grid1d) >::check(); + // Check its externally defined vtype. + mlc::assert_< mlc_eq( my::image::image_dimension_type, + stc::is_a<oln::abstract::image1d> ) >::check(); + // Check its image dimension abstraction. + mlc::assert_< mlc_is_a_(my::image, oln::abstract::image1d) >::check(); + // Ensure we can instantiate it. my::image i; - mlc::assert_< mlc_is_a_(my::image::image, oln::abstract::image1d) >::check(); + + // Print my::image's vtypes. + // FIXME: To be removed in the final version. + oln::packed_vtypes<oln::category::image, my::image>::echo (std::cout); } Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 470) +++ oln/core/abstract/image.hh (working copy) @@ -87,13 +87,13 @@ // typedef is_a<abstract::readonly_image> image_constness_type; // typedef mlc::undefined image_rawness_type; // -------------------------------------------------------------------- - typedef mlc::undefined image_dimension_type; }; /// Packing of the virtual types of any image class. template <typename I> struct packed_vtypes<category::image, I> { + // Internally defined virtual types. typedef oln_type_of(I, grid) grid_type; // -------------------------------------------------------------------- @@ -122,10 +122,11 @@ // typedef oln_type_of(I, image_constness) image_constness_type; // typedef oln_type_of(I, image_rawness) image_rawness_type; // -------------------------------------------------------------------- - typedef oln_type_of(I, image_dimension) image_dimension_type; - //... + // Defined externally virtual types. + typedef oln_type_of(I, image_dimension) image_dimension_type; + /// Pretty-printing. static void echo(std::ostream& ostr) { ostr Index: oln/core/abstract/image_entry.hh --- oln/core/abstract/image_entry.hh (revision 470) +++ oln/core/abstract/image_entry.hh (working copy) @@ -28,8 +28,9 @@ #ifndef OLENA_CORE_ABSTRACT_IMAGE_ENTRY_HH # define OLENA_CORE_ABSTRACT_IMAGE_ENTRY_HH -# include <oln/core/abstract/image.hh> +# include <mlc/case.hh> # include <stc/entry.hh> +# include <oln/core/abstract/image.hh> namespace oln { @@ -75,4 +76,8 @@ } // end of namespace oln +// Add switch/case equipment in the oln namespace. +mlc_case_equipment_for_namespace(oln); + + #endif // ! OLENA_CORE_ABSTRACT_IMAGE_ENTRY_HH Index: oln/core/abstract/image_dimension.hh --- oln/core/abstract/image_dimension.hh (revision 470) +++ oln/core/abstract/image_dimension.hh (working copy) @@ -82,24 +82,88 @@ image3d() {} }; - } // end of namespace oln::abstract + + /*-------------------. + | Dimension switch. | + `-------------------*/ + + /// Forward declarations. + /// \{ + class grid1d; + class grid2d; + class grid3d; + /// \} + + /// Case tag for the dimension. + struct grid_dim_tag; + + /// Switch on on the grid dimension. + /// \{ + template <typename grid_type> + struct case_<grid_dim_tag, grid_type, 1> : + // Test. + public mlc::where_< mlc_eq(grid_type, oln::grid1d) > + { + // Super class if test succeeds. + typedef stc::is_a<abstract::image1d> ret; + }; + + template <typename grid_type> + struct case_<grid_dim_tag, grid_type, 2> : + // Test. + public mlc::where_< mlc_eq(grid_type, oln::grid2d) > + { + // Super class if test succeeds. + typedef stc::is_a<abstract::image2d> ret; + }; + + template <typename grid_type> + struct case_<grid_dim_tag, grid_type, 3> : + // Test. + public mlc::where_< mlc_eq(grid_type, oln::grid3d) > + { + // Super class if test succeeds. + typedef stc::is_a<abstract::image3d> ret; + }; + + /// Abort when grid_type is not handled by the previous cases. + template <typename grid_type> + struct default_case_<grid_dim_tag, grid_type> + { + typedef mlc::abort_<grid_dim_tag> ret; + }; + /// \} + } // end of namespace oln // Register the dimension switch for oln::abstract::image_entry. namespace stc { - template <typename E> - struct set_entry_node<E, oln::abstract::dimension_tag> : - // FIXME: Don't use the abstraction as a property, but the - // corresponding grid instead. - public oln_type_of_(E, image_dimension) - ::template instantiated_with<E>::ret + template <typename I> + struct set_entry_node<I, oln::abstract::dimension_tag> : + public oln::switch_< oln::grid_dim_tag, oln_type_of(I, grid) >::ret + ::template instantiated_with::ret { }; -} +} // end of namespace stc +namespace oln +{ + /// An external type associated to my::B. + template <typename I> + struct ext_vtype< category::image, + abstract::image, + // FIXME: Get rid of this typedef_:: qualifier. + typedef_::image_dimension_type > + { + // Use the same switch as the one use in the inheritance-plugging + // mechanism above. + typedef typename oln::switch_< oln::grid_dim_tag, + oln_type_of(I, grid) >::ret ret; + }; +} #endif // ! OLENA_CORE_ABSTRACT_IMAGE_DIMENSION_HH

18 years, 8 months

470: Add grids.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add grids. * oln/core/abstract/grid.hh, * oln/core/1d/grid1d.hh, * oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh: New files (imported from Olena proto-1.0, and modified). * oln/core/typedefs.hh (grid_type, point_type, dpoint_type) (size_type, dimvalue_type, coord_type): Enable these types. * oln/core/abstract/image.hh (grid_type): Don't mlc-declare this typedef, since oln/core/typedefs.hh already takes care of it. (vtypes< category::image, abstract::image >): Enable grid_type. (packed_vtypes): Likewise. * oln/core/abstract/internal/image_impl.hh: Improve comment. * tests/grid.cc: New test. * tests/image_entry.cc: Update this test. * oln/Makefile.am (nobase_oln_HEADERS): Add core/abstract/grid.hh, core/1d/grid1d.hh, core/2d/grid2d.hh and core/3d/grid3d.hh. * tests/Makefile.am (check_PROGRAMS): Add grid. (grid_SOURCES): New. oln/Makefile.am | 7 +++ oln/core/1d/grid1d.hh | 45 ++++++++++------------ oln/core/2d/grid2d.hh | 33 +++++++--------- oln/core/3d/grid3d.hh | 32 +++++++--------- oln/core/abstract/grid.hh | 62 ++++++++++++++++++------------- oln/core/abstract/image.hh | 21 ++++------ oln/core/abstract/internal/image_impl.hh | 2 - oln/core/typedefs.hh | 24 +++++------- tests/Makefile.am | 2 + tests/grid.cc | 44 ++++++++++++++++++++++ tests/image_entry.cc | 8 ++-- 11 files changed, 166 insertions(+), 114 deletions(-) Index: tests/image_entry.cc --- tests/image_entry.cc (revision 469) +++ tests/image_entry.cc (working copy) @@ -27,12 +27,13 @@ /// Test oln::abstract::image_entry. +#include <oln/core/1d/grid1d.hh> #include <oln/core/abstract/image_entry.hh> #include <oln/core/abstract/image_dimension.hh> namespace my { - // Fwd decl. + // Forward declaration. class image; } @@ -41,7 +42,7 @@ // Warning, this sugar might be removed in the future. stc_set_super(my::image, abstract::image_entry<my::image>); - /// Virtual types associated to my::A. + /// Virtual types associated to my::image. template<> struct vtypes<category::image, my::image> { @@ -51,13 +52,14 @@ // the right image_dimension class using the sole grid information // (the grid can be seen here as a ``tag''). typedef stc::is_a<abstract::image1d> image_dimension_type; + typedef oln::grid1d grid_type; }; } namespace my { // A very simple 1D image. - class image : public oln::set_super_type<image>::ret + class image : public oln::set_super_type<my::image>::ret { typedef image self_type; typedef oln_type_of_(self_type, image_dimension) image_dimension_type; Index: tests/Makefile.am --- tests/Makefile.am (revision 469) +++ tests/Makefile.am (working copy) @@ -10,8 +10,10 @@ # when oln.m4 is available in the distribution. check_PROGRAMS = \ + grid \ image_entry image_entry_SOURCES = image_entry.cc +grid_SOURCES = grid.cc TESTS = $(check_PROGRAMS) Index: tests/grid.cc --- tests/grid.cc (revision 0) +++ tests/grid.cc (revision 0) @@ -0,0 +1,44 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// Test grids. + +#include <cassert> +#include <oln/core/1d/grid1d.hh> +#include <oln/core/2d/grid2d.hh> +#include <oln/core/3d/grid3d.hh> + +int +main() +{ + // The extra pairs of parenthesis around mlc_value are needed to + // prevent the assert macro from interpreting the arguments of + // mlc_value as its own. + assert((mlc_value(oln_grd_type_of_(oln::grid1d, dimvalue))) == 1); + assert((mlc_value(oln_grd_type_of_(oln::grid2d, dimvalue))) == 2); + assert((mlc_value(oln_grd_type_of_(oln::grid3d, dimvalue))) == 3); +} Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 469) +++ oln/core/typedefs.hh (working copy) @@ -68,11 +68,7 @@ // General. -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(grid_type); -// -------------------------------------------------------------------- + mlc_decl_typedef(grid_type); // Iterators. @@ -106,17 +102,21 @@ // mlc_decl_typedef(neighb_type); // mlc_decl_typedef(value_storage_type); // mlc_decl_typedef(storage_type); -// mlc_decl_typedef(point_type); -// mlc_decl_typedef(dpoint_type); +// -------------------------------------------------------------------- + mlc_decl_typedef(point_type); + mlc_decl_typedef(dpoint_type); +// -------------------------------------------------------------------- +// FIXME: To be enabled later. +// -------------------------------------------------------------------- // mlc_decl_typedef(image_type); // mlc_decl_typedef(concrete_type); // -------------------------------------------------------------------- mlc_decl_typedef(delegated_type); + mlc_decl_typedef(size_type); // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// mlc_decl_typedef(size_type); // mlc_decl_typedef(window_type); // mlc_decl_typedef(image_neighbness_type); @@ -145,12 +145,8 @@ // category::grid. -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(dimvalue_type); -// mlc_decl_typedef(coord_type); -// -------------------------------------------------------------------- + mlc_decl_typedef(dimvalue_type); + mlc_decl_typedef(coord_type); // category::fun1 and category::fun2. Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 469) +++ oln/core/abstract/image.hh (working copy) @@ -37,11 +37,11 @@ namespace oln { - // fwd decl + // Forward declaration. template <typename I> class value_box; - // fwd decls + // Forward declarations. namespace abstract { template <typename I> class image; @@ -55,19 +55,16 @@ // -------------------------------------------------------------------- } - // Declare virtual types. - mlc_decl_typedef(grid_type); - /// Virtual types associated to oln::abstract::image. template <typename I> struct vtypes< category::image, abstract::image > { typedef I exact_type; + typedef mlc::undefined grid_type; // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// typedef mlc::undefined grid_type; // typedef mlc::undefined concrete_type; // typedef mlc::undefined value_type; // typedef mlc::undefined point_type; @@ -97,11 +94,11 @@ template <typename I> struct packed_vtypes<category::image, I> { + typedef oln_type_of(I, grid) grid_type; + // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// typedef oln_type_of(I, grid) grid_type; - // typedef oln_type_of(I, concrete) concrete_type; // typedef oln_type_of(I, value) value_type; // typedef oln_type_of(I, point) point_type; @@ -135,11 +132,11 @@ << "vtypes_of(oln::category::image, " << mlc_to_string(I) << ") =" << std::endl << "{" << std::endl + << " grid_type = " << mlc_to_string(grid_type) << std::endl + // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// << " grid_type = " << mlc_to_string(grid_type) << std::endl - // << " concrete_type = " << mlc_to_string(concrete_type) << std::endl // << " value_type = " << mlc_to_string(value_type) << std::endl // << " point_type = " << mlc_to_string(point_type) << std::endl @@ -168,10 +165,10 @@ static void ensure() { + mlc::assert_< mlc_is_ok(grid_type) >::check(); // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// mlc::assert_< mlc_is_ok(grid_type) >::check(); // mlc::assert_< mlc_is_ok(concrete_type) >::check(); // mlc::assert_< mlc_is_ok(value_type) >::check(); // mlc::assert_< mlc_is_ok(point_type) >::check(); @@ -181,7 +178,7 @@ // mlc::assert_< mlc_is_ok(bkd_piter_type) >::check(); // mlc::assert_< mlc_is_ok(value_storage_type) >::check(); -// mlc::assert_< mlc_is_ok(storage_type) >::check();x +// mlc::assert_< mlc_is_ok(storage_type) >::check(); // -------------------------------------------------------------------- mlc::assert_< mlc_is_ok(delegated_type) >::check(); // -------------------------------------------------------------------- Index: oln/core/abstract/grid.hh --- oln/core/abstract/grid.hh (revision 0) +++ oln/core/abstract/grid.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory +// 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 @@ -12,8 +12,8 @@ // // 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, 59 Temple Place - Suite 330, Boston, -// MA 02111-1307, USA. +// 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 @@ -28,39 +28,49 @@ #ifndef OLENA_CORE_ABSTRACT_GRID_HH # define OLENA_CORE_ABSTRACT_GRID_HH +# include <mlc/assert.hh> +# include <mlc/cmp.hh> +# include <mlc/to_string.hh> # include <oln/core/abstract/any.hh> # include <oln/core/typedefs.hh> # define oln_grd_type_of(GridType, Alias) \ -mlc_type_of(oln, oln::category::grid, GridType, Alias) +stc_typeof_in_namespace(oln, oln::category::grid, GridType, Alias) # define oln_grd_type_of_(GridType, Alias) \ -mlc_type_of_(oln, oln::category::grid, GridType, Alias) +stc_typeof_in_namespace_(oln, oln::category::grid, GridType, Alias) namespace oln { + /// Category grid. namespace category { struct grid; } + // Forward declaration. + namespace abstract + { + template <typename G> class grid; + } - template <> - struct set_default_props < category::grid > + /// Virtual types associated to oln::abstract::image. + template <typename G> + struct vtypes< category::grid, abstract::grid<G> > { - typedef mlc::undefined_type point_type; - typedef mlc::no_type dpoint_type; - typedef mlc::undefined_type size_type; - typedef mlc::undefined_type coord_type; - typedef mlc::undefined_type dimvalue_type; + typedef mlc::undefined point_type; + typedef mlc::none dpoint_type; + typedef mlc::undefined size_type; + typedef mlc::undefined coord_type; + typedef mlc::undefined dimvalue_type; }; template <typename G> - struct get_props < category::grid, G > + struct packed_vtypes<category::grid, G> { typedef oln_grd_type_of(G, point) point_type; typedef oln_grd_type_of(G, dpoint) dpoint_type; @@ -70,23 +80,25 @@ static void echo(std::ostream& ostr) { - ostr << "props_of( oln::category::grid, " << mlc_to_string(G) << " ) =" << std::endl + ostr + << "vtypes(oln::category::grid, " << mlc_to_string(G) << ") =" + << std::endl << "{" << std::endl - << "\t point_type = " << mlc_to_string(point_type) << std::endl - << "\t dpoint_type = " << mlc_to_string(dpoint_type) << std::endl - << "\t coord_type = " << mlc_to_string(coord_type) << std::endl - << "\t size_type = " << mlc_to_string(size_type) << std::endl - << "\t dimvalue_type = " << mlc_to_string(dimvalue_type) << std::endl + << " point_type = " << mlc_to_string(point_type) << std::endl + << " dpoint_type = " << mlc_to_string(dpoint_type) << std::endl + << " coord_type = " << mlc_to_string(coord_type) << std::endl + << " size_type = " << mlc_to_string(size_type) << std::endl + << " dimvalue_type = " << mlc_to_string(dimvalue_type) << std::endl << "}" << std::endl; } static void ensure() { - mlc::is_ok< point_type >::ensure(); - mlc::is_ok< dpoint_type >::ensure(); - mlc::is_ok< coord_type >::ensure(); - mlc::is_ok< size_type >::ensure(); - mlc::is_ok< dimvalue_type >::ensure(); + mlc::assert_< mlc_is_ok(point_type) >::check(); + mlc::assert_< mlc_is_ok(dpoint_type) >::check(); + mlc::assert_< mlc_is_ok(coord_type) >::check(); + mlc::assert_< mlc_is_ok(size_type) >::check(); + mlc::assert_< mlc_is_ok(dimvalue_type) >::check(); } }; @@ -102,7 +114,7 @@ ~grid() { - get_props<category::grid, E>::ensure(); + packed_vtypes<category::grid, E>::ensure(); } }; Index: oln/core/abstract/internal/image_impl.hh --- oln/core/abstract/internal/image_impl.hh (revision 469) +++ oln/core/abstract/internal/image_impl.hh (working copy) @@ -38,7 +38,7 @@ namespace oln { - /// Image category. + /// Category image. namespace category { struct image; Index: oln/core/1d/grid1d.hh --- oln/core/1d/grid1d.hh (revision 0) +++ oln/core/1d/grid1d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory +// 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 @@ -11,9 +11,9 @@ // 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, 59 Temple Place - Suite 330, Boston, -// MA 02111-1307, USA. +// 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 @@ -28,45 +28,42 @@ #ifndef OLENA_CORE_1D_GRID1D_HH # define OLENA_CORE_1D_GRID1D_HH -# include <mlc/value.hh> +# include <mlc/int.hh> # include <oln/core/abstract/grid.hh> -namespace oln { +namespace oln +{ - // fwd decls - struct grid1d; - struct point1d; - struct dpoint1d; - struct size1d; - struct coord_t; + // Forward declarations. + class grid1d; + class point1d; + class dpoint1d; + class size1d; + class coord_t; - // super type - template <> - struct set_super_type < grid1d > { typedef abstract::grid< grid1d > ret; }; + // Super type. + stc_set_super(grid1d, abstract::grid<grid1d>); - // props + /// Virtual types associated to oln::grid1d. template <> - struct set_props < category::grid, grid1d > + struct vtypes<category::grid, grid1d> { typedef point1d point_type; typedef dpoint1d dpoint_type; typedef coord_t coord_type; typedef size1d size_type; - typedef mlc::value<unsigned,1> dimvalue_type; + typedef mlc::uint_<1> dimvalue_type; }; - - - struct grid1d : public abstract::grid< grid1d > + /// A 1-dimension rectangular grid. + struct grid1d : public stc_super_(grid1d) { protected: - grid1d() - {} + grid1d() {} }; } // end of namespace oln - #endif // ! OLENA_CORE_1D_GRID1D_HH Index: oln/core/2d/grid2d.hh --- oln/core/2d/grid2d.hh (revision 0) +++ oln/core/2d/grid2d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory +// 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 @@ -12,8 +12,8 @@ // // 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, 59 Temple Place - Suite 330, Boston, -// MA 02111-1307, USA. +// 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 @@ -28,45 +28,42 @@ #ifndef OLENA_CORE_2D_GRID2D_HH # define OLENA_CORE_2D_GRID2D_HH -# include <mlc/value.hh> +# include <mlc/int.hh> # include <oln/core/abstract/grid.hh> -namespace oln { +namespace oln +{ - // fwd decls + // Forward declarations. struct grid2d; struct point2d; struct dpoint2d; struct size2d; struct coord_t; - // super type - template <> - struct set_super_type < grid2d > { typedef abstract::grid< grid2d > ret; }; + // Super type. + stc_set_super(grid2d, abstract::grid<grid2d>); - // props + /// Virtual types associated to oln::grid2d. template <> - struct set_props < category::grid, grid2d > + struct vtypes<category::grid, grid2d> { typedef point2d point_type; typedef dpoint2d dpoint_type; typedef size2d size_type; typedef coord_t coord_type; - typedef mlc::value<unsigned,2> dimvalue_type; + typedef mlc::uint_<2> dimvalue_type; }; - - - struct grid2d : public abstract::grid< grid2d > + /// A 2-dimension rectangular grid. + struct grid2d : public stc_super_(grid2d) { protected: - grid2d() - {} + grid2d() {} }; } // end of namespace oln - #endif // ! OLENA_CORE_2D_GRID2D_HH Index: oln/core/3d/grid3d.hh --- oln/core/3d/grid3d.hh (revision 0) +++ oln/core/3d/grid3d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2005 EPITA Research and Development Laboratory +// 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 @@ -12,8 +12,8 @@ // // 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, 59 Temple Place - Suite 330, Boston, -// MA 02111-1307, USA. +// 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 @@ -28,41 +28,39 @@ #ifndef OLENA_CORE_3D_GRID3D_HH # define OLENA_CORE_3D_GRID3D_HH -# include <mlc/value.hh> +# include <mlc/int.hh> # include <oln/core/abstract/grid.hh> -namespace oln { +namespace oln +{ - // fwd decls + // Forward declarations. struct grid3d; struct point3d; struct dpoint3d; struct size3d; struct coord_t; - // super type - template <> - struct set_super_type < grid3d > { typedef abstract::grid< grid3d > ret; }; + // Super type. + stc_set_super(grid3d, abstract::grid<grid3d>); - // props + /// Virtual types associated to oln::grid3d. template <> - struct set_props < category::grid, grid3d > + struct vtypes<category::grid, grid3d> { typedef point3d point_type; typedef dpoint3d dpoint_type; typedef size3d size_type; typedef coord_t coord_type; - typedef mlc::value<unsigned,2> dimvalue_type; + typedef mlc::uint_<3> dimvalue_type; }; - - - struct grid3d : public abstract::grid< grid3d > + /// A 3-dimension rectangular grid. + struct grid3d : public stc_super_(grid3d) { protected: - grid3d() - {} + grid3d() {} }; } // end of namespace oln Index: oln/Makefile.am --- oln/Makefile.am (revision 469) +++ oln/Makefile.am (working copy) @@ -4,7 +4,14 @@ nobase_oln_HEADERS = \ core/typedefs.hh \ \ + core/1d/grid1d.hh \ + \ + core/2d/grid2d.hh \ + \ + core/3d/grid3d.hh \ + \ core/abstract/any.hh \ + core/abstract/grid.hh \ core/abstract/image.hh \ core/abstract/image_entry.hh \ core/abstract/image_dimension.hh \

18 years, 8 months

469: Allow the use of Metalic values as virtual types.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/static This is currently a workaround inside Static, but it would be better to let Metalic deal with this instead. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Allow the use of Metalic values as virtual types. * stc/properties.hh (mlc::eqv, mlc::neqv): New (workaround) classes. (mlc_eqv, mlc_neqv): New macros. (rec_get_vtype, rec_get_ext_vtype): Use them, to allow the use of Metalic values as virtual types. * tests/properties.cc: Ensure Metalic values can be valid virtual types. stc/properties.hh | 59 ++++++++++++++++++++++++++++++++++++++++++++++++---- tests/properties.cc | 18 +++++++++++++-- 2 files changed, 70 insertions(+), 7 deletions(-) Index: tests/properties.cc --- tests/properties.cc (revision 468) +++ tests/properties.cc (working copy) @@ -28,6 +28,7 @@ #include <stc/properties.hh> #include <mlc/cmp.hh> #include <mlc/assert.hh> +#include <mlc/int.hh> // This test focuses on the virtual types system, so the exact type of // classes is not propagated here (stc::any is not used). @@ -82,8 +83,13 @@ template<> struct vtypes<category::my_cat, my::A> { + // A native type. typedef int foo_type; - typedef float bar_type; + // A Metalic value, used here is to ensure that + // mlc::abstract::values are accepted as virtual types, as well as + // any other type). + typedef mlc::int_<42> bar_type; + // An undefined type. typedef mlc::undefined baz_type; }; @@ -212,10 +218,16 @@ { // Check types associated to A. mlc::assert_<mlc_eq(my::A::foo_type, int)>::check(); - mlc::assert_<mlc_eq(my::A::bar_type, float)>::check(); + /* FIXME: Note that we use mlc_eqv, not mlc_eq, since the latter + doesn't accept Metalic values. Try to get rid of this + limitation. */ + mlc::assert_<mlc_eqv(my::A::bar_type, mlc::int_<42>)>::check(); // Check types associated to B. - mlc::assert_<mlc_neq(my::B::bar_type, my::A::bar_type)>::check(); + /* FIXME: Note that we use mlc_neqv, not mlc_neq, since the latter + doesn't accept Metalic values. Try to get rid of this + limitation. */ + mlc::assert_<mlc_neqv(my::B::bar_type, my::A::bar_type)>::check(); mlc::assert_<mlc_eq(my::B::baz_type, char)>::check(); mlc::assert_<mlc_eq(my::B::quux_type, long)>::check(); mlc::assert_<mlc_eq(my::B::yin_type, unsigned long)>::check(); Index: stc/properties.hh --- stc/properties.hh (revision 468) +++ stc/properties.hh (working copy) @@ -42,6 +42,55 @@ # include <mlc/is_a.hh> +/*----------------------. +| Metalic workarounds. | +`----------------------*/ + +/// Shortcuts. +/// \{ +# define mlc_eqv( T1, T2) mlc::eqv_ <T1, T2> +# define mlc_neqv(T1, T2) mlc::neqv_<T1, T2> +/// \} + +namespace mlc +{ + /* FIXME: This really is a work around Metalic's limitations + regarding the operands of its logic operators than cannot be + subtypes of mlc::abstract::value. This limitations breaks Static + when a virtual type *is* a Metalic value! Hence the introduction + of this more laxist version of mlc_neq. */ + + /// Equality test between a couple of types, also accepting Metalic + /// values (i.e., subtypes of mlc::abstract::value). + /// \{ + template <typename T1, typename T2> + struct eqv_ : public bexpr_<false> + { + }; + + template <typename T> + struct eqv_ <T, T> : public bexpr_<true> + { + }; + /// \} + + /// Inequality test between a couple of types, also accepting Metalic + /// values (i.e., subtypes of mlc::abstract::value). + /// \{ + template <typename T1, typename T2> + struct neqv_ : public bexpr_<true> + { + }; + + template <typename T> + struct neqv_ <T, T> : public bexpr_<false> + { + }; + /// \} + +} + + /*------------. | Equipment. | `------------*/ @@ -159,7 +208,7 @@ \ typedef typename \ mlc::if_< \ - mlc::neq_< type, mlc::not_found >, \ + mlc::neqv_< type, mlc::not_found >, \ /* then */ \ /* return it */ \ /* (the typedef has been found in the vtypes */ \ @@ -169,7 +218,7 @@ /* check if the vtype of the `super' of FROM_TYPE */ \ /* has the typedef */ \ typename \ - mlc::if_< mlc::neq_< typename rec_get_vtype< category, \ + mlc::if_< mlc::neqv_< typename rec_get_vtype<category, \ super, \ typedef_type >::ret, \ mlc::not_found >, \ @@ -227,7 +276,7 @@ \ typedef typename \ mlc::if_< \ - mlc::neq_< type, mlc::not_found >, \ + mlc::neqv_< type, mlc::not_found >, \ /* then */ \ /* return it */ \ /* (the typedef has been found in the vtypes */ \ @@ -237,7 +286,7 @@ /* check if the vtype of the `super' of FROM_TYPE */ \ /* has the typedef */ \ typename \ - mlc::if_< mlc::neq_< typename rec_get_ext_vtype< category, \ + mlc::if_< mlc::neqv_< typename rec_get_ext_vtype<category, \ super, \ typedef_type >::ret, \ mlc::not_found >, \ @@ -420,6 +469,8 @@ # define stc_pseudosuper_(T) \ set_pseudosuper_type<T>::ret +// FIXME: s/stc_typeof/stc_type_of/. + /// Get the property \a Typedef from \a FromType (version to be used /// inside a template). #define stc_typeof(Category, FromType, Typedef) \

18 years, 8 months

468: Fix packed_vtypes<category::image, I>.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix packed_vtypes<category::image, I>. * oln/core/abstract/image.hh (packed_vtypes): Remove. (packed_vtypes<category::image, I>): Use mlc::assert to test the virtual types. Aesthetic changes. (image::~image): Check the vtypes thanks to packed_vtypes<category::image, I>. image.hh | 79 +++++++++++++++++++++++++++++---------------------------------- 1 files changed, 37 insertions, 42 deletions Index: oln/core/abstract/image.hh --- oln/core/abstract/image.hh (revision 467) +++ oln/core/abstract/image.hh (working copy) @@ -29,6 +29,7 @@ #ifndef OLENA_CORE_ABSTRACT_IMAGE_HH # define OLENA_CORE_ABSTRACT_IMAGE_HH +# include <mlc/assert.hh> # include <mlc/cmp.hh> # include <mlc/to_string.hh> # include <oln/core/abstract/internal/image_impl.hh> @@ -92,14 +93,7 @@ typedef mlc::undefined image_dimension_type; }; - // FIXME: This should be placed into stc/properties.hh. - template <typename Category, typename T> - struct packed_vtypes - { - // Empty. - }; - - /// Retrieval of any image type properties (FIXME: say 'packing'). + /// Packing of the virtual types of any image class. template <typename I> struct packed_vtypes < category::image, I > { @@ -138,37 +132,37 @@ static void echo(std::ostream& ostr) { ostr - << "props_of( oln::category::image, " << mlc_to_string(I) << " ) =" + << "vtypes_of(oln::category::image, " << mlc_to_string(I) << ") =" << std::endl << "{" << std::endl // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// << "\t grid_type = " << mlc_to_string(grid_type) << std::endl +// << " grid_type = " << mlc_to_string(grid_type) << std::endl -// << "\t concrete_type = " << mlc_to_string(concrete_type) << std::endl -// << "\t value_type = " << mlc_to_string(value_type) << std::endl -// << "\t point_type = " << mlc_to_string(point_type) << std::endl -// << "\t size_type = " << mlc_to_string(size_type) << std::endl - -// << "\t piter_type = " << mlc_to_string(piter_type) << std::endl -// << "\t fwd_piter_type = " << mlc_to_string(fwd_piter_type) << std::endl -// << "\t bkd_piter_type = " << mlc_to_string(bkd_piter_type) << std::endl +// << " concrete_type = " << mlc_to_string(concrete_type) << std::endl +// << " value_type = " << mlc_to_string(value_type) << std::endl +// << " point_type = " << mlc_to_string(point_type) << std::endl +// << " size_type = " << mlc_to_string(size_type) << std::endl + +// << " piter_type = " << mlc_to_string(piter_type) << std::endl +// << " fwd_piter_type = " << mlc_to_string(fwd_piter_type) << std::endl +// << " bkd_piter_type = " << mlc_to_string(bkd_piter_type) << std::endl -// << "\t value_storage_type = " << mlc_to_string(value_storage_type) << std::endl -// << "\t storage_type = " << mlc_to_string(storage_type) << std::endl +// << " value_storage_type = " << mlc_to_string(value_storage_type) << std::endl +// << " storage_type = " << mlc_to_string(storage_type) << std::endl // --------------------------------------------------------------------- - << "\t delegated_type = " << mlc_to_string(delegated_type) << std::endl + << " delegated_type = " << mlc_to_string(delegated_type) << std::endl // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// << "\t neighb_type = " << mlc_to_string(neighb_type) << std::endl +// << " neighb_type = " << mlc_to_string(neighb_type) << std::endl -// << "\t image_neighbness_type = " << mlc_to_string(image_neighbness_type) << std::endl -// << "\t image_constness_type = " << mlc_to_string(image_constness_type) << std::endl -// << "\t image_rawness_type = " << mlc_to_string(image_rawness_type) << std::endl +// << " image_neighbness_type = " << mlc_to_string(image_neighbness_type) << std::endl +// << " image_constness_type = " << mlc_to_string(image_constness_type) << std::endl +// << " image_rawness_type = " << mlc_to_string(image_rawness_type) << std::endl // -------------------------------------------------------------------- - << "\t image_dimension_type = " << mlc_to_string(image_dimension_type) << std::endl + << " image_dimension_type = " << mlc_to_string(image_dimension_type) << std::endl << "}" << std::endl; } @@ -177,29 +171,29 @@ // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// mlc::is_ok_< grid_type >::ensure(); -// mlc::is_ok_< concrete_type >::ensure(); -// mlc::is_ok_< value_type >::ensure(); -// mlc::is_ok_< point_type >::ensure(); -// mlc::is_ok_< size_type >::ensure(); -// mlc::is_ok_< piter_type >::ensure(); -// mlc::is_ok_< fwd_piter_type >::ensure(); -// mlc::is_ok_< bkd_piter_type >::ensure(); +// mlc::assert_< mlc_is_ok(grid_type) >::check(); +// mlc::assert_< mlc_is_ok(concrete_type) >::check(); +// mlc::assert_< mlc_is_ok(value_type) >::check(); +// mlc::assert_< mlc_is_ok(point_type) >::check(); +// mlc::assert_< mlc_is_ok(size_type) >::check(); +// mlc::assert_< mlc_is_ok(piter_type) >::check(); +// mlc::assert_< mlc_is_ok(fwd_piter_type) >::check(); +// mlc::assert_< mlc_is_ok(bkd_piter_type) >::check(); -// mlc::is_ok_< value_storage_type >::ensure(); -// mlc::is_ok_< storage_type >::ensure();x +// mlc::assert_< mlc_is_ok(value_storage_type) >::check(); +// mlc::assert_< mlc_is_ok(storage_type) >::check();x // -------------------------------------------------------------------- - mlc::is_ok_< delegated_type >::ensure(); + mlc::assert_< mlc_is_ok(delegated_type) >::check(); // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- -// mlc::is_ok_< neighb_type >::ensure(); +// mlc::assert_< mlc_is_ok(neighb_type) >::check(); -// mlc::is_ok_< image_neighbness_type >::ensure(); -// mlc::is_ok_< image_constness_type >::ensure(); -// mlc::is_ok_< image_rawness_type >::ensure(); +// mlc::assert_< mlc_is_ok(image_neighbness_type) >::check(); +// mlc::assert_< mlc_is_ok(image_constness_type) >::check(); +// mlc::assert_< mlc_is_ok(image_rawness_type) >::check(); // -------------------------------------------------------------------- - mlc::is_ok_< image_dimension_type >::ensure(); + mlc::assert_< mlc_is_ok(image_dimension_type) >::check(); } }; @@ -416,6 +410,7 @@ virtual ~image() { + packed_vtypes<category::image, E>::ensure(); // FIXME: static check fails because "pointer to member conversion via virtual base"... // mlc_check_method_impl(E, const size_type&, size, , const); // mlc_check_method_impl(E, unsigned long, npoints, , const);

18 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches