- 25 Sep, 2006 1 commit
-
-
Roland Levillain authored
* oln/Makefile.am (nobase_oln_HEADERS): Add morpher/tags.hh. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@559 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 24 Sep, 2006 2 commits
-
-
Roland Levillain authored
* oln/core/macros.hh (oln_direct_type_of, oln_direct_type_of_): New macros. * oln/morpher/internal/image_extension.hh (oln): Use `oln_direct_type_of(Exact, ...)' instead of `oln_type_of(self_t, ...)'. * tests/morphers.cc (main): Add more static assertions. * tests/identity_morpher.cc: More documentation. * tests/add_neighborhood_morpher.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add add_neighborhood_morpher. (add_neighborhood_morpher_SOURCES): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@558 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
directly (new behavior), the other working on its exact type (old behavior). * stc/vtypes.hh (type_of_): Don't perform the virtual type retrieval on the exact type of `from_type', use it directly. (exact_type_of_): New. Perform a virtual type retrieval using the exact type of `from_type' (i.e., implement the previous behavior of type_of_). (stc_type_of): Adjust macro. (stc_direct_type_of, stc_direct_type_of_): New macros. (stc_local_type_of, stc_local_type_of_): Remove these macros, as they are used nowhere (but in tests), and are just (useless) sugar for `stc_type_of' and `stc_type_of_'. * tests/vtypes.cc (my_type_of_) * tests/vtypes-and-exact.cc (my_type_of_) * tests/vtypes-multiple-supers.cc (my_type_of_): Adjust. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@557 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 22 Sep, 2006 1 commit
-
-
Thierry Geraud authored
Add image point iterators parameterized by the image topology; factor code into an internal class. * oln/core/gen/bbox_fwd_piter.hh: Change inheritance and move methods into... * oln/core/internal/bbox_fwd_piter.hh: ...this new class. * oln/core/gen/bbox_bkd_piter.hh: Change inheritance and move methods into... * oln/core/internal/bbox_bkd_piter.hh: ...this new class. * oln/core/gen/fwd_piter_bbox.hh: New. * oln/core/gen/bkd_piter_bbox.hh: New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@556 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 20 Sep, 2006 3 commits
-
-
Roland Levillain authored
* oln/automatic/image_having_neighborhood.hh: Add a forward declaration of oln::abstract::image_having_neighborhood. (impl<abstract::image_having_neighborhood, morpher::tag::identity, E>): Inherit from abstract::image<E>. (impl_neighborhood): Make it const. Get the exact type before calling delegate(). * oln/core/abstract/image_having_neighborhood.hh (oln/automatic/image_having_neighborhood.hh): Include it. (oln::abstract::image_having_neighborhood::neighborhood): New. (case_<image_hierarchy_wrt_neighborhood, E, 1>): Only inherit from oln::abstract::image_having_neighborhood if neighborhood is different from mlc::not_found. (oln::ext_vtype<image_entry<E>, typedef_::neighborhood_type>): Remove. * oln/core/image_entry.hh (single_vtype<image_entry<E>, typedef_::morpher_type>): Remove. Instead, defined the `morpher' virtual type... (vtypes< image_entry<E> >): ...here. * oln/morpher/internal/image_extension.hh (image_extension): Fix the inheritance: derive from `oln::image_entry<Exact>' instead of `oln::image_entry< image_extension<Image, Exact> >'. * oln/morpher/identity.hh (oln/morpher/tags.hh): Include it. (oln::single_vtype<morpher::identity<Image>, typedef_::morpher_type>): Remove. Instead, defined the `morpher' virtual type... (oln::vtypes< morpher::identity<Image> >): ...here (oln::morpher::tag::identity): Move... * oln/morpher/tags.hh: ...here (new file). * oln/morpher/add_neighborhood.hh (oln/morpher/tags.hh) (oln/core/2d/aliases.hh): Include them. (oln::single_vtype<morpher::add_neighborhood<Image>, typedef_::morpher_type>): Remove. Instead, defined the `morpher' virtual type... (oln::vtypes< morpher::add_neighborhood<Image> >): ...here (oln::morpher::add_neighborhood::neighborhood_t): Fix the virtual type retrieval: get it from `self_t', not from `Image'. (ext_vtype<morpher::add_neighborhood< oln::image2d<T> >, typedef_::neighborhood_type>): Remove. Remove corresponding forward declarations as well. (oln::morpher::tag::add_neighborhood): Move... * oln/morpher/tags.hh: ...here. * tests/identity_morpher.cc, tests/morphers.cc: Fix the test. Add more static assertions. * oln/Makefile.am (nobase_oln_HEADERS): Add core/2d/neighb2d.hh, core/abstract/neighborhood.hh, core/gen/neighb.hh and core/neighborhood_entry.hh. * oln/core/2d/image2d.hh: Fix copyright header. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@555 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
definitions of single_vtype and ext_vtype (for aesthetic purpose only). git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@554 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Add classes for classical 2d neighborhood. * oln/core/neighborhood_entry.hh: New. * oln/core/abstract/neighborhood.hh: New. * oln/core/2d/neighb2d.hh: New. * oln/core/gen/neighb.hh: New. * oln/core/2d/aliases.hh (neighb2d): New. * oln/basics2d.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@553 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 18 Sep, 2006 6 commits
-
-
Roland Levillain authored
* oln/core/typedefs.hh (morpher_type, neighborhood_type): New typedef declarations. (neighb_type, image_neighbness_type, image_constness_type) (image_dimension_type, image_typeness_type) (image_valuedness_type, image_rawness_type): Remove typedef declarations. * oln/core/image_entry.hh (single_vtype<image_entry<E>, typedef_::morpher_type>): New virtual type. * oln/core/abstract/image.hh: Check it. * oln/core/abstract/image_hierarchies.hh (image_dimension_hierarchy, image_type_hierarchy): Rename as... (image_hierarchy_wrt_dimension, image_hierarchy_wrt_type): ...this. (image_neighborhood_hierarchy): Make it the third image hierarchy. Rename as... (image_hierarchy_wrt_neighborhood). (image_value_hierarchy, image_rawness_hierarchy): Adjust and rename as... (image_hierarchy_wrt_value, image_hierarchy_wrt_data_retrieval): ...this. (oln/core/abstract/image_having_neighborhood.hh): Include it. * oln/core/abstract/image_dimension.hh: s/image_dimension_hierarchy/image_hierarchy_wrt_dimension/. (oln::abstract::image1d, oln::abstract::image2d) (oln::abstract::image3d): Inherit from automatic::impl. * oln/core/abstract/image_type.hh, * oln/core/abstract/image_type_integre.hh: s/image_type_hierarchy/image_hierarchy_wrt_type/. * oln/core/abstract/image_having_neighborhood.hh: New abstraction. * oln/automatic/image_having_neighborhood.hh: New automatic implementation. * oln/morpher/internal/image_extension.hh: New abstract class. * oln/morpher/identity.hh, * oln/morpher/add_neighborhood.hh: New morphers. * tests/morphers.cc, tests/identity_morpher.cc: New tests. * oln/Makefile.am (nobase_oln_HEADERS): Catch up with renamings from the previous patches. Add automatic/image_having_neighborhood.hh, core/abstract/image_having_neighborhood.hh, morpher/internal/image_extension.hh, morpher/add_neighborhood.hh and morpher/identity.hh. * tests/Makefile.am (check_PROGRAMS): Add identity_morpher and morphers. (identity_morpher_SOURCES, morphers_SOURCES): New. * oln/core/abstract/topology_hierarchies.hh: Aesthetic changes. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@552 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Rename bbox point iterators. * oln/core/abstract/iterator_on_points.hh (p_): Remove. Abstract classes should not have attributes. (to_point): Turn abstract. (point_adr): New. * oln/core/gen/fwd_piter.hh: Update and rename as... * oln/core/gen/bbox_fwd_piter.hh: ...this. * oln/core/gen/bkd_piter.hh: Update and rename as... * oln/core/gen/bbox_bkd_piter.hh: ...this. * oln/core/2d/aliases.hh: Update. * oln/core/gen/bbox.hh: Update. * oln/basics2d.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@551 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Move some abstract classes below entries into internal. * oln/core/abstract/point_nd.hh: Update and rename as... * oln/core/internal/point_nd.hh: ...this. * oln/core/abstract/dpoint_nd.hh: Update and rename as... * oln/core/internal/dpoint_nd.hh: ...this. * oln/core/point_set_entry.hh (is_connected_type): Add in vtypes. * oln/core/abstract/bbox.hh: Change super class from point_set_entry to point_set_having_bbox. (vtypes): Remove. (set_super_type): Remove. * oln/core/abstract/point_set_hierarchies.hh (include): Update. * oln/core/abstract/point_set_having_bbox.hh (case_): Move to... * oln/core/abstract/bbox.hh: ...this file. (case_): Refine for abstract::bbox. * oln/core/2d/dpoint2d.hh: Update. * oln/core/2d/point2d.hh: Update. * oln/core/gen/bbox.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@550 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Rename point set related classes. * oln/core/pset_entry.hh: Update and rename as... * oln/core/point_set_entry.hh: ...this. * oln/core/abstract/pset_fixed.hh: Update and rename as... * oln/core/abstract/point_set_having_known_size.hh: ...this. * oln/core/abstract/pset_ra.hh: Update and rename as... * oln/core/abstract/point_set_being_random_accessible.hh: ...this. * oln/core/abstract/pset_bboxed.hh: Update and rename as... * oln/core/abstract/point_set_having_bbox.hh: ...this. * oln/core/abstract/pset.hh: Update and rename as... * oln/core/abstract/point_set.hh: ...this. * oln/core/abstract/pset_hierarchies.hh: Update and rename as... * oln/core/abstract/point_set_hierarchies.hh: ...this. * oln/core/abstract/pset_cnx.hh: Update and rename as... * oln/core/abstract/point_set_being_connected.hh: ...this. * oln/core/abstract/piter.hh: Update and rename as... * oln/core/abstract/iterator_on_points.hh: ...this. * oln/core/abstract/iter.hh: Update and rename as... * oln/core/abstract/iterator.hh: ...this. * oln/core/typedefs.hh (fixed_type, ra_type, cnx_type): Rename as... (has_known_size_type, is_random_accessible_type): ...these and... (is_connected_type): ....this. * oln/core/abstract/bbox.hh: Update. * oln/core/gen/fwd_piter.hh: Update. * oln/core/gen/bkd_piter.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@549 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
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. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@548 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* 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. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@547 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 15 Sep, 2006 5 commits
-
-
Thierry Geraud authored
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. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@546 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
implementations. * stc/vtypes.hh (automatic::impl): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@545 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
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. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@544 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
* xtd/vec.hh (operator-): Fix missing const. (mk_vec): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@543 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/Makefile.am (nobase_oln_HEADERS): Add core/abstract/piter. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@542 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 14 Sep, 2006 7 commits
-
-
Roland Levillain authored
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@541 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* xtd/Makefile.am (nobase_xtd_HEADERS): Add vec.hh. * xtd/TODO: Rename as... * TODO: ...this. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@540 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* configure.ac: Configure dynamic/Makefile. * Makefile.am (SUBDIRS): Add dynamic. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@539 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* Makefile.am: New file. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@538 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* mlc/TODO: Move... * TODO: ...here. * Makefile.am (EXTRA_DIST): New. Add TODO. * tests/Makefile.am (check_PROGRAMS): Add gcase. (gcase_SOURCES): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@537 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/abstract/image_entry.hh: Remove. * oln/core/abstract/image_hierarchies.hh: New. * oln/core/abstract/image.hh (oln/core/abstract/image_hierarchies.hh): Include it. * oln/core/image_entry.hh: Aesthetic change. * oln/core/abstract/image_dimension.hh: Update the documentation. (oln::ERROR::UNKNOWN_GRID_TYPE): Remove error message. (oln::grid_dim_tag): Remove tag. (stc::set_entry_node<I, oln::abstract::dimension_tag>): Remove switch. (case_<grid_dim_tag, grid_type, 1>) (case_<grid_dim_tag, grid_type, 2>) (case_<grid_dim_tag, grid_type, 3>): Update and rename as... (case_<image_dimension_hierarchy, E, 1>) (case_<image_dimension_hierarchy, E, 2>) (case_<image_dimension_hierarchy, E, 3>): ...this. (default_case_<grid_dim_tag, grid_type>): Remove. (oln::ext_vtype<abstract::image<I>, typedef_::image_dimension_type>): Remove external vtype. * oln/core/abstract/image_typeness.hh: Rename as... * oln/core/abstract/image_type.hh: ...this. Adjust header guards. Update the documentation. (oln::value_type_tag): Remove tag. (stc::set_entry_node<I, oln::abstract::typeness_tag>): Remove switch. (case_<value_type_tag, value_type, 1>) (case_<value_type_tag, value_type, 2>) (default_case_<value_type_tag, value_type>): Update and rename as... (case_<image_type_hierarchy, E, 1>) (case_<image_type_hierarchy, E, 2>) (default_case_<image_type_hierarchy, E>): ...this. No longer provide an `image_typeness_type' typedef. (oln::ext_vtype<abstract::image<I>, typedef_::image_typeness_type>): Remove external vtype. * oln/core/abstract/image_typeness_integre.hh: Rename as... * oln/core/abstract/image_type_integre.hh: ...this. Adjust header guards. (case_<value_type_tag, value_type, 3>) (case_<value_type_tag, value_type, 4>) (case_<value_type_tag, value_type, 5>) (case_<value_type_tag, value_type, 6>): Update and rename as... (case_<image_type_hierarchy, E, 3>) (case_<image_type_hierarchy, E, 4>) (case_<image_type_hierarchy, E, 5>) (case_<image_type_hierarchy, E, 6>): ...this. No longer provide an `image_typeness_type' typedef. * tests/image_entry.cc (my::image): Set oln::image_entry<my::image> as super type. (oln::vtypes<my::image>::psite_type) (oln::vtypes<my::image>::rvalue_type) (oln::vtypes<my::image>::piter_type): Remove these typedefs, as they are already defined as single typedefs in oln/core/image_entry.hh. (my::image::grid_type, my::image::value_type): Rename as... (my::image::grid_t, my::image::value_t): ...this. (my::image::image_dimension_type, my::image::image_typeness_type): Remove. (main): Adjust, and remove irrelevant assertions. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@536 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/Makefile.am (nobase_oln_HEADERS): Add core/2d/aliases.hh, core/2d/dpointd2.hh, core/2d/grid2d.hh, core/2d/image2d.hh, core/2d/point2d.hh, core/abstract/bbox.hh, core/abstract/dpoint.hh, core/abstract/dpoint_nd.hh, core/abstract/entry.hh, core/abstract/image_hierarchies.hh, core/abstract/image_type.hh, core/abstract/image_type_integre.hh, core/abstract/iter.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/image_entry.hh, core/pset_entry.hh, core/traits.hh, core/traits_id.hh, core/topo_entry.hh, core/type.hh and basics2d.hh Remove core/abstract/image_abstractions.hh, core/abstract/image_entry.hh, core/abstract/image_typeness.hh, and core/abstract/image_typeness_integre.hh. * oln/basics2d.hh: Fix copyright header. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@535 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 13 Sep, 2006 5 commits
-
-
Roland Levillain authored
* stc/vtypes.hh (VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE) (VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_EXTERNAL) (VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_SINGLE_AND_EXTERNAL) (VIRTUAL_TYPE_MULTIPLY_DEFINED_AS_INTERNAL_AND_SINGLE_AND_EXTERNAL) (NO_VALID_VIRTUAL_TYPE_FOUND): New error messages. (select_typedef): Add specializations for erroneous cases. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@534 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* xtd/math/constraints.hh (xtd::constraints_) (xtd::constraints_2_): Add missing first parameter of mlc::abort_. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@533 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* mlc/abort.hh (mlc::abort_): Inherit from internal::check_ (from mlc/assert.hh's) to obtain the right behavior from mlc::abort_. (mlc::abort_::check): New class method. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@532 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* stc/vtypes.hh (packed_vtypes_in_category, packed_vtypes): Remove. * tests/vtypes.cc (my::packed_vtypes_in_category<category::my_cat, T>): Remove (my::A::~A, , my::B::~B, my::C::~C): Remove dtors. * tests/vtypes-and-exact.cc (my::packed_vtypes_in_category<category::my_cat, T>): Remove. (my::A::~A, , my::B::~B, my::C::~C): Remove dtors. * tests/vtypes-multiple-supers.cc (my::packed_vtypes_in_category<category::my_cat, T>): Remove. (my::A::~A, , my::B::~B, my::C::~C): Remove dtors. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@531 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* oln/core/abstract/image.hh (oln::category::grid): Remove declaration. * oln/core/abstract/grid.hh (oln::packed_vtypes_in_category<category::grid, G>): (oln::grid::~grid): Remove dtor. (oln::category::grid): Remove declaration. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@530 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 12 Sep, 2006 2 commits
-
-
Roland Levillain authored
tests. * oln/core/abstract/internal/image_impl.hh (oln::category::image): Move this declaration... * oln/core/abstract/image.hh: ...here. * oln/core/case.hh: New file. * oln/core/abstract/image_abstractions.hh, * olena/oln/core/abstract/entry.hh, * oln/core/traits.hh: Use it. * oln/Makefile.am (nobase_oln_HEADERS): Add core/case.hh. * oln/core/abstract/image_dimension.hh (oln::ERROR::UNKNOWN_GRID_TYPE): New. (oln::default_case_<grid_dim_tag, grid_type): Use it. (ext_vtype_in_category): Turn into... (ext_vtype): ...this. * oln/core/abstract/image_typeness.hh (ext_vtype_in_category): Turn into... (ext_vtype): ...this. * oln/core/typedefs.hh (oln_type_of, oln_type_of_): Move these macros... * oln/core/abstract/macros.hh: ...here, and replace the previous ones. Rename file as... * oln/core/macros.hh: ...this. Adjust header guards. * oln/core/abstract/internal/image_impl.hh: Adjust users. * oln/Makefile.am (nobase_oln_HEADERS): Remove core/abstract/macros.hh. Add core/macros.hh * oln/core/abstract/grid.hh (oln_grd_type_of, oln_grd_type_of_): Remove macros. (vtypes_in_category< category::grid, abstract::grid<G> >): Turn into... (vtypes< abstract::grid<G> >): ...this. (packed_vtypes_in_category<category::grid, G>): s/oln_grd_type_of/oln_type_of/g. * oln/core/1d/grid1d.hh, oln/core/2d/grid2d.hh, * oln/core/3d/grid3d.hh (vtypes_in_category): Turn into... (vtypes): ...this. * tests/grid.cc: s/oln_grd_type_of_/oln_type_of_/g * tests/image_entry.cc (my::dummy): New declaration. (vtypes_in_category<category::image, my::image>): Turn into... (vtypes<my::image>): ...this. Add missing virtual types. (my::image): Fix base class. (main): Remove any references to packed_vtypes_in_category<oln::category::image, my::image>, since it no longer exists. * tests/Makefile.am (AM_CPPFLAGS): Add -I$(top_srcdir)/extended. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@529 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@528 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 07 Sep, 2006 3 commits
-
-
Thierry Geraud authored
Add image2d and fix topo-related classes. * olena/tests/npoints.cc: New. * olena/tests/Makefile.am: Update. * olena/oln/core/image_entry.hh: New. * olena/oln/core/2d/image2d.hh: New. * olena/oln/basics2d.hh: Force instantiation and include oln/core/2d/image2d.hh. * olena/oln/core/typedefs.hh: Include mlc/assert.hh and mlc/to_string.hh. (piter_type): Uncomment. (rvalue_type): New. (psite_type): New. (concrete_type): Uncomment. (size_type): Add comment. (topo_type): New. * olena/oln/core/abstract/topo.hh (bbox): Remove this method which is redundant with the one of topo_with_bbox. * olena/oln/core/abstract/topo_with_bbox.hh (bbox): Fix typo. * olena/oln/core/abstract/entry.hh (next_entry_node): New specialization to handle the specific and rare case of having no sub-hierarchy. * olena/oln/core/abstract/topo_ra.hh: Fix cut n paste errors. * olena/oln/core/abstract/pset.hh (piter): New vtype decl. * olena/oln/core/gen/fwd_piter.hh (fwd_piter_): Add commented forthcoming ctors. * olena/oln/core/gen/bbox_topo.hh: Cosmetics. * olena/oln/core/pset_entry.hh (piter_type): New. * olena/oln/core/abstract/image.hh: Update. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@527 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
Start the topology hierarchy. * oln/core/topo_entry.hh: New. * oln/core/abstract/topo.hh: New. * oln/core/abstract/topo_hierarchies.hh: New. * oln/core/abstract/topo_with_bbox.hh: New. * oln/core/abstract/topo_ra.hh: New. * oln/core/gen/bbox_topo.hh: New. * oln/core/2d/aliases.hh (topo2d): New. Add a new sub-hierarchy to abstract::pset. * oln/core/abstract/pset_cnx.hh: New. * oln/core/typedefs.hh (cnx_type): New. * oln/core/abstract/pset_hierarchies.hh (pset_cnx_hierarchy): New. * oln/core/abstract/bbox.hh (cnx_type): New. * oln/core/abstract/pset_bboxed.hh (is_valid): Move this method into... * oln/core/abstract/pset.hh (pset): ...this class. (dim): New vtype. * oln/core/pset_entry.hh (single_vtype): Add vtype dim. * oln/basics2d.hh: Include oln/core/gen/bbox_topo.hh. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@526 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
* mlc/cmp.hh (assert_ok_): New shortcut. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@525 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 06 Sep, 2006 2 commits
-
-
Thierry Geraud authored
Update abstract::pset hierarchy to final SCOOP-2 design. * oln/core/pset_entry.hh: New. * oln/core/typedefs.hh: Include oln/core/abstract/entry.hh. * oln/core/abstract/bbox.hh: Clean includes. (set_super_type): Change from abstract::pset<E> to pset_entry<E>. (bbox): Update. * oln/core/abstract/entry.hh (set_super_type): New specialization. * oln/core/abstract/pset.hh (Copyright): Fix years. (vtypes, ext_vtype): Remove. (fixed_pset, ra_pset, bboxed_pset): Move and dispatch to... * oln/core/abstract/pset_fixed.hh: ...this new file. * oln/core/abstract/pset_ra.hh: ...this new file. * oln/core/abstract/pset_bboxed.hh: ...this new file. * oln/core/abstract/pset.hh (pset_fixed_hierarchy, pset_ra_hierarchy, pset_bboxed_hierarchy) (case_): Move to... * oln/core/abstract/pset_hierarchies.hh: ...this new file. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@524 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Thierry Geraud authored
New macro to declare virtual types in abstract classes. * stc/vtypes.hh (stc_virtual_typedef): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@523 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 05 Sep, 2006 1 commit
-
-
Thierry Geraud authored
Test on abstract::pset alternative code for static inheritance. * oln/core/abstract/entry.hh: New proposition for entry class in static hierarchies. This is a test file that should be removed after stc update. * oln/core/typedefs.hh (fixed_type, ra_type, bbox_type): New typedef declarations. * oln/core/abstract/bbox.hh (fwd_piter_, bkd_piter_): Remove these forward declarations. (ext_vtype): Remove. (vtypes): New. (ra_type, fixed_type, bbox_type): New associated types. (bbox): Change inheritance from abstract::pset to an entry class. (bbox): Remove all methods except print from this class; the methods are dispatched into abstract::bboxed_pset and gen::bbox_<P>. (bbox): Likewise for attributes. (print): Reject code to subclasses. (impl_bbox): New method. * oln/core/abstract/pset.hh: Include entry.hh. (fwd_piter_type, bkd_piter_type): New associated types. (bbox_type, ra_type, fixed_type): Likewise (pset): Add virtual to inheritance. (~pset): Extend check code. (fixed_pset, ra_pset, bboxed_pset): New sub-abstractions. (pset_fixed_hierarchy, pset_ra_hierarchy, pset_bboxed_hierarchy): New hierarchy tags. * oln/core/gen/bbox.hh: Update. (operator=): New. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@522 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
- 04 Sep, 2006 2 commits
-
-
Roland Levillain authored
* oln/core/abstract/image.hh, * oln/core/abstract/image_dimension.hh, * oln/core/abstract/image_typeness.hh, * oln/core/abstract/grid.hh, oln/core/1d/grid1d.hh, * oln/core/2d/grid2d.hh, oln/core/3d/grid3d.hh, * tests/image_entry.cc (vtypes): Rename as... (vtypes_in_category): ...this. * oln/core/abstract/image.hh, oln/core/abstract/grid.hh, * tests/image_entry.cc (packed_vtypes): Rename as... (packed_vtypes_in_category): ...this. * oln/core/abstract/point.hh, oln/core/abstract/dpoint.hh, * oln/core/abstract/piter.hh, oln/core/abstract/pset.hh, * oln/core/gen/bbox.hh, * oln/core/gen/bkd_piter.hh, oln/core/gen/fwd_piter.hh, * oln/core/2d/point2d.hh, oln/core/2d/dpoint2d.hh (vtypes_): Rename as... (vtypes). * oln/core/abstract/pset.hh, oln/core/abstract/bbox.hh (ext_vtype_): Rename as... (ext_vtype): ...this. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@521 4aad255d-cdde-0310-9447-f3009e2ae8c0
-
Roland Levillain authored
* stc/vtypes.hh (vtypes, single_vtype, ext_vtype): Rename as... (vtypes_in_category, single_vtype_in_category, ext_vtype_in_category): ...this. (vtypes_, single_vtype_, ext_vtype_): Rename as... (vtypes, single_vtype, ext_vtype): ...this. (packed_vtypes): Rename as... (packed_vtypes_in_category): ...this. (packed_vtypes_): Rename as... (packed_vtypes): ...this * tests/vtypes.cc, tests/vtypes-and-exact.cc, * tests/vtypes-multiple-supers.cc: Adjust. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@520 4aad255d-cdde-0310-9447-f3009e2ae8c0
-