[Olena-patches] 634: Reorganize oln/core/automatic like oln/core/abstract.

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