October 2006 - Olena-patches

673: Partial clean up of oln::morpher::add_neighborhood.
by Roland Levillain 24 Oct '06

24 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Partial clean up of oln::morpher::add_neighborhood. * oln/morpher/add_neighborhood.hh: Fix header guards. (oln::morpher::add_neighborhood): Use the macro stc_get_supers to set the super class. (oln::morpher::add_neighborhood::super_t): Use the macro stc_get_super to define it. add_neighborhood.hh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) Index: oln/morpher/add_neighborhood.hh --- oln/morpher/add_neighborhood.hh (revision 672) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_MORPHER_ADD_NEIGHBORHOOD -# define OLN_MORPHER_ADD_NEIGHBORHOOD +#ifndef OLN_MORPHER_ADD_NEIGHBORHOOD_HH +# define OLN_MORPHER_ADD_NEIGHBORHOOD_HH # include <oln/morpher/internal/image_extension.hh> # include <oln/core/gen/topo_add_nbh.hh> @@ -69,14 +69,13 @@ { /// Neighborhood addition morpher. template <typename Image, typename Neighb> - class add_neighborhood : public morpher::internal::image_extension< Image, - add_neighborhood<Image, Neighb> > - // FIXME: Uncomment. stc_get_supers(mlc_comma_1(add_neighborhood<Image, Neighb>)) + class add_neighborhood : + public stc_get_supers(mlc_comma_1(add_neighborhood<Image, Neighb>)) { private: typedef add_neighborhood<Image, Neighb> self_t; - typedef stc_get_nth_super(self_t, 1) super_t; + typedef stc_get_super(self_t) super_t; typedef oln_type_of(self_t, topo) topo_t; public: @@ -144,4 +143,4 @@ } // end of namespace oln -#endif // ! OLN_MORPHER_ADD_NEIGHBORHOOD +#endif // ! OLN_MORPHER_ADD_NEIGHBORHOOD_HH

1 0

672: Move oln::color to oln::value::color.
by Roland Levillain 24 Oct '06

24 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Move oln::color to oln::value::color. * oln/color/rgb.hh: Move... * oln/value/color/rgb.hh: ...here. (oln::color): Move the contents of this namespace... (oln::value::color): ...into this one. * oln/value/all.hh: Adjust. * oln/Makefile.am (nobase_oln_HEADERS): s|color/rgb.hh|value/color/rgb.hh|. Makefile.am | 4 ++-- value/all.hh | 2 +- value/color/rgb.hh | 14 ++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) Index: oln/value/all.hh --- oln/value/all.hh (revision 671) +++ oln/value/all.hh (working copy) @@ -35,7 +35,7 @@ # include <oln/value/bin.hh> # include <oln/value/default.hh> -# include <oln/color/rgb.hh> +# include <oln/value/color/rgb.hh> #endif // ! OLN_VALUE_ALL_HH Index: oln/value/color/rgb.hh --- oln/value/color/rgb.hh (revision 671) +++ oln/value/color/rgb.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_COLOR_RGB_HH -# define OLN_CORE_COLOR_RGB_HH +#ifndef OLN_CORE_VALUE_COLOR_RGB_HH +# define OLN_CORE_VALUE_COLOR_RGB_HH # include <xtd/vec.hh> # include <oln/core/abstract/value.hh> @@ -35,6 +35,10 @@ namespace oln { + namespace value + { + + // FIXME: Perhaps this additional namespace is not necessary. namespace color { @@ -177,9 +181,11 @@ # endif - } // end of namespace oln::color + } // end of namespace oln::value::color + + } // end of namespace oln::value } // end of namespace oln -#endif // ! OLN_CORE_COLOR_RGB_HH +#endif // ! OLN_CORE_VALUE_COLOR_RGB_HH Index: oln/Makefile.am --- oln/Makefile.am (revision 671) +++ oln/Makefile.am (working copy) @@ -3,8 +3,6 @@ olndir = $(includedir)/oln nobase_oln_HEADERS = \ \ - color/rgb.hh \ - \ core/1d/aliases.hh \ core/1d/array1d.hh \ core/1d/dpoint1d.hh \ @@ -180,6 +178,8 @@ morpher/thru_mfun.hh \ morpher/value_cast.hh \ \ + value/color/rgb.hh \ + \ value/accessor.hh \ value/all.hh \ value/default.hh \

1 0

671: Fix debug track and disambiguate the 'at' method overloading in const and mutable nD images.
by Thierry GERAUD 23 Oct '06

23 Oct '06

2006-10-23 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Fix debug track and disambiguate the 'at' method overloading in const and mutable nD images. * oln/core/abstract/array.hh: New. * oln/debug/track.hh (n_arrays): New. (include): Fix. * oln/core/abstract/image.hh (image): New cpy ctor so fix n_images tracking. * oln/core/abstract/image/dimension/1d.hh: Disambiguate by changing inheritance to virtual + inserting a using directive. * oln/core/abstract/image/dimension/2d.hh: Likewise. * oln/core/abstract/image/dimension/3d.hh: Likewise. * oln/core/1d/array1d.hh (array1d): Add inheritance. * oln/core/2d/array2d.hh: Likewise. * oln/core/3d/array3d.hh: Likewise. * oln/Makefile.am: Update.

1 0

670: Add stack morpher and remove the hack related to indexed mutable access.
by Thierry GERAUD 23 Oct '06

23 Oct '06

2006-10-23 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add stack morpher and remove the hack related to indexed mutable access. * tests/morphers/stack_morpher.cc: New. * tests/morphers/Makefile.am: Update. * oln/debug/track.hh: New. * oln/core/automatic/image/mutable_image2d.hh: New. * oln/core/automatic/image/mutable_image3d.hh: New. * oln/core/automatic/image/mutable_image1d.hh: New. * oln/morpher/stack.hh: New. * oln/Makefile.am: Update. * oln/debug/print.hh (println): Remove; too dummy. (operator): New. * oln/level/fill.hh (fill): New specialization for C arrays. * oln/core/automatic/image/image1d.hh: Remove hack of 'at'. * oln/core/automatic/image/image2d.hh: Likewise. * oln/core/automatic/image/image3d.hh: Likewise. * oln/core/abstract/image.hh (image, ~image): Add counting. (include): Update. * oln/core/abstract/image/dimension/1d.hh (image1d): Split partially into... (mutable_image1d): ...this new class. (include): Update. * oln/core/abstract/image/dimension/2d.hh: Likewise. * oln/core/abstract/image/dimension/3d.hh: Likewise. * oln/core/abstract/image/dimension/hierarchy.hh (case_): Update. * oln/core/2d/array2d.hh (memsize): Better sig. (include): Update. * oln/core/2d/image2d.hh (image2d): New overloading for no arg. Index: tests/morphers/stack_morpher.cc =================================================================== --- tests/morphers/stack_morpher.cc (revision 0) +++ tests/morphers/stack_morpher.cc (revision 0) @@ -0,0 +1,48 @@ +// 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 the stack morpher. + +#include <cassert> +#include <oln/basics2d.hh> +#include <oln/morpher/stack.hh> + + +int main() +{ + using namespace oln; + typedef image2d<int> image_t; + + image_t ima(3,3); + morpher::stack<2,image_t> ima_v = stack(ima, ima); + + point2d p(2, 2); + ima(p) = 51; + + assert(ima(p) == ima_v.image(1)(p)); + assert(ima_v.at(2, 2) == ima_v(p)); +} Index: tests/morphers/Makefile.am =================================================================== --- tests/morphers/Makefile.am (revision 669) +++ tests/morphers/Makefile.am (working copy) @@ -22,6 +22,7 @@ identity_morpher \ add_neighborhood_morpher \ slice_morpher \ + stack_morpher \ value_cast \ \ morphers @@ -30,6 +31,7 @@ identity_morpher_SOURCES = identity_morpher.cc add_neighborhood_morpher_SOURCES = add_neighborhood_morpher.cc slice_morpher_SOURCES = slice_morpher.cc +stack_morpher_SOURCES = stack_morpher.cc value_cast_SOURCES = value_cast.cc morphers_SOURCES = morphers.cc Index: oln/debug/track.hh =================================================================== --- oln/debug/track.hh (revision 0) +++ oln/debug/track.hh (revision 0) @@ -0,0 +1,47 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_DEBUG_TRACK_HH +# define OLN_DEBUG_TRACK_HH + +# include <oln/core/abstract/image.hh> + + +namespace oln +{ + + namespace debug + { + + static unsigned n_images = 0; + + } // end of namespace oln::debug + +} // end of namespace oln + + +#endif // ! OLN_DEBUG_TRACK_HH Index: oln/debug/print.hh =================================================================== --- oln/debug/print.hh (revision 669) +++ oln/debug/print.hh (working copy) @@ -48,11 +48,7 @@ template <typename I> void print(const abstract::image& input, std::ostream& ostr = std::cout); - /// Fwd decl. - template <typename I> - void println(const abstract::image& input, std::ostream& ostr = std::cout); - # ifndef OLN_INCLUDE_ONLY namespace impl @@ -111,15 +107,6 @@ impl::print(input.exact(), ostr); } - - /// Facade. - template <typename I> - void println(const abstract::image& input, std::ostream& ostr) - { - print(input, ostr); - ostr << std::endl; - } - # endif // ! OLN_INCLUDE_ONLY } // end of namespace oln::debug Index: oln/level/fill.hh =================================================================== --- oln/level/fill.hh (revision 669) +++ oln/level/fill.hh (working copy) @@ -29,6 +29,8 @@ #ifndef OLN_LEVEL_FILL_HH # define OLN_LEVEL_FILL_HH +# include <iostream> + # include <mlc/assert.hh> # include <mlc/is_a.hh> @@ -45,14 +47,28 @@ struct FIRST_ARGUMENT_OF_oln_level_fill_IS_NOT_MUTABLE; } + + /// Fwd decl. + template <typename I, typename V> + I& operator<<(abstract::mutable_image& input, const V values[]); + + /// Fwd decl. + template <typename I> + I& operator<<(abstract::mutable_image& input, const oln_value(I)& value); + + namespace level { /// Fwd decl. template <typename I> - void fill(abstract::mutable_image& input, const oln_value(I)& val); + void fill(abstract::mutable_image& input, const oln_value(I)& value); + /// Fwd decl. + template <typename I, typename V> + void fill(abstract::mutable_image& input, const V values[]); + # ifndef OLN_INCLUDE_ONLY namespace impl @@ -60,27 +76,66 @@ /// Generic version. template <typename I> - void fill(abstract::mutable_image& input, const oln_value(I)& val) + void fill(abstract::mutable_image& input, const oln_value(I)& value) { oln_piter(I) p(input.topo()); for_all(p) - input(p) = val; + input(p) = value; } + /// Generic version. + template <typename I, typename V> + void fill(abstract::mutable_image& input, const V values[]) + { + oln_piter(I) p(input.topo()); + unsigned i = 0; + for_all(p) + input(p) = values[i++]; + } + } // end of namespace oln::level::fill /// Facade. template <typename I> - void fill(abstract::mutable_image& input, const oln_value(I)& val) + void fill(abstract::mutable_image& input, const oln_value(I)& value) { - impl::fill(input.exact(), val); + impl::fill(input.exact(), value); } + /// Facade. + template <typename I, typename V> + void fill(abstract::mutable_image& input, const V values[]) + { + return impl::fill(input.exact(), values); + } + + # endif } // end of namespace oln::level + +# ifndef OLN_INCLUDE_ONLY + + /// Fwd decl. + template <typename I, typename V> + I& operator<<(abstract::mutable_image& input, const V values[]) + { + level::fill(input, values); + return input.exact(); + } + + /// Fwd decl. + template <typename I> + I& operator<<(abstract::mutable_image& input, const oln_value(I)& value) + { + level::fill(input, value); + return input.exact(); + } + +# endif + } // end of namespace oln Index: oln/core/automatic/image/mutable_image2d.hh =================================================================== --- oln/core/automatic/image/mutable_image2d.hh (revision 0) +++ oln/core/automatic/image/mutable_image2d.hh (revision 0) @@ -0,0 +1,82 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE2D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE2D_HH + +# include <oln/core/automatic/impl.hh> +# include <oln/morpher/tags.hh> +# include <oln/core/2d/point2d.hh> + + +namespace oln +{ + // Forward declaration. + namespace abstract + { + template <typename E> class mutable_image2d; + + } // end of namespace oln::abstract + + + namespace automatic + { + + + /// Default implementation corresponding to the interface + /// oln::abstract::mutable_image2d. + template <typename E, typename tag> + class set_impl<abstract::mutable_image2d, tag, E> : + public virtual stc::any__simple<E> + { + public: + oln_lvalue(E) impl_at(const oln_coord(E)& row, const oln_coord(E)& col); + }; + + + +# ifndef OLN_INCLUDE_ONLY + + + // 1. convert (row, col) -> p then 2. call operator()(p). + + template <typename E, typename tag> + oln_lvalue(E) + set_impl<abstract::mutable_image2d, tag, E> + ::impl_at(const oln_coord(E)& row, const oln_coord(E)& col) + { + point2d tmp(row, col); + return this->exact().operator()(tmp); + } + +# endif + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE2D_HH Index: oln/core/automatic/image/mutable_image3d.hh =================================================================== --- oln/core/automatic/image/mutable_image3d.hh (revision 0) +++ oln/core/automatic/image/mutable_image3d.hh (revision 0) @@ -0,0 +1,85 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE3D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE3D_HH + +# include <oln/core/automatic/impl.hh> +# include <oln/morpher/tags.hh> +# include <oln/core/3d/point3d.hh> + + +namespace oln +{ + // Forward declaration. + namespace abstract + { + template <typename E> class mutable_image3d; + + } // end of namespace oln::abstract + + + namespace automatic + { + + + /// Default implementation corresponding to the interface + /// oln::abstract::mutable_image3d. + template <typename E, typename tag> + class set_impl<abstract::mutable_image3d, tag, E> : + public virtual stc::any__simple<E> + { + public: + oln_lvalue(E) impl_at(const oln_coord(E)& slice, + const oln_coord(E)& row, + const oln_coord(E)& col); + }; + + +# ifndef OLN_INCLUDE_ONLY + + + // 1. convert (slice, row, col) -> p then 2. call operator()(p). + + template <typename E, typename tag> + oln_lvalue(E) + set_impl<abstract::mutable_image3d, tag, E> + ::impl_at(const oln_coord(E)& slice, + const oln_coord(E)& row, + const oln_coord(E)& col) + { + point3d tmp(slice, row, col); + return this->exact().operator()(tmp); + } + +# endif + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE3D_HH Index: oln/core/automatic/image/image1d.hh =================================================================== --- oln/core/automatic/image/image1d.hh (revision 669) +++ oln/core/automatic/image/image1d.hh (working copy) @@ -58,35 +58,15 @@ oln_rvalue(E) impl_at(const oln_coord(E)& index) const; // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& index); bool impl_has_at(const oln_coord(E)& index) const; }; - - /// Implementation corresponding to the interface - /// oln::abstract::image1d for an identity morpher. - template <typename E> - class set_impl<abstract::image1d, morpher::tag::identity, E> : - public virtual stc::any__simple<E> - { - public: - - oln_rvalue(E) impl_at(const oln_coord(E)& index) const; - - // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& index); - bool impl_has_at(const oln_coord(E)& index) const; - - }; - - - # ifndef OLN_INCLUDE_ONLY - // Default is: 1. convert (index) -> p then 2. call operator()(p). + // 1. convert (index) -> p then 2. call operator()(p). template <typename E, typename tag> oln_rvalue(E) @@ -98,15 +78,6 @@ } template <typename E, typename tag> - oln_lvalue(E) - set_impl<abstract::image1d, tag, E> - ::impl_at(const oln_coord(E)& index) - { - point1d tmp(index); - return this->exact().operator()(tmp); - } - - template <typename E, typename tag> bool set_impl<abstract::image1d, tag, E> ::impl_has_at(const oln_coord(E)& index) const @@ -115,33 +86,6 @@ return this->exact().has(tmp); } - - // For morphers: delegate. - - template <typename E> - oln_rvalue(E) - set_impl<abstract::image1d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& index) const - { - return this->exact().delegate().at(index); - } - - template <typename E> - oln_lvalue(E) - set_impl<abstract::image1d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& index) - { - return this->exact().delegate().at(index); - } - - template <typename E> - bool - set_impl<abstract::image1d, morpher::tag::identity, E> - ::impl_has_at(const oln_coord(E)& index) const - { - return this->exact().delegate().has_at(index); - } - # endif } // end of namespace oln::automatic Index: oln/core/automatic/image/image2d.hh =================================================================== --- oln/core/automatic/image/image2d.hh (revision 669) +++ oln/core/automatic/image/image2d.hh (working copy) @@ -57,36 +57,17 @@ oln_rvalue(E) impl_at(const oln_coord(E)& row, const oln_coord(E)& col) const; - // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& row, const oln_coord(E)& col); + // FIXME: Hack; should be elsewhere... bool impl_has_at(const oln_coord(E)& row, const oln_coord(E)& col) const; }; - /// Implementation corresponding to the interface - /// oln::abstract::image2d for an identity morpher. - template <typename E> - class set_impl<abstract::image2d, morpher::tag::identity, E> : - public virtual stc::any__simple<E> - { - public: - - oln_rvalue(E) impl_at(const oln_coord(E)& row, const oln_coord(E)& col) const; - - // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& row, const oln_coord(E)& col); - bool impl_has_at(const oln_coord(E)& row, const oln_coord(E)& col) const; - - }; - - - # ifndef OLN_INCLUDE_ONLY - // Default is: 1. convert (row, col) -> p then 2. call operator()(p). + // 1. convert (row, col) -> p then 2. call operator()(p). template <typename E, typename tag> oln_rvalue(E) @@ -98,15 +79,6 @@ } template <typename E, typename tag> - oln_lvalue(E) - set_impl<abstract::image2d, tag, E> - ::impl_at(const oln_coord(E)& row, const oln_coord(E)& col) - { - point2d tmp(row, col); - return this->exact().operator()(tmp); - } - - template <typename E, typename tag> bool set_impl<abstract::image2d, tag, E> ::impl_has_at(const oln_coord(E)& row, const oln_coord(E)& col) const @@ -115,33 +87,6 @@ return this->exact().has(tmp); } - - // For morphers: delegate. - - template <typename E> - oln_rvalue(E) - set_impl<abstract::image2d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& row, const oln_coord(E)& col) const - { - return this->exact().delegate().at(row, col); - } - - template <typename E> - oln_lvalue(E) - set_impl<abstract::image2d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& row, const oln_coord(E)& col) - { - return this->exact().delegate().at(row, col); - } - - template <typename E> - bool - set_impl<abstract::image2d, morpher::tag::identity, E> - ::impl_has_at(const oln_coord(E)& row, const oln_coord(E)& col) const - { - return this->exact().delegate().has_at(row, col); - } - # endif } // end of namespace oln::automatic Index: oln/core/automatic/image/image3d.hh =================================================================== --- oln/core/automatic/image/image3d.hh (revision 669) +++ oln/core/automatic/image/image3d.hh (working copy) @@ -60,9 +60,6 @@ const oln_coord(E)& col) const; // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col); bool impl_has_at(const oln_coord(E)& slice, const oln_coord(E)& row, const oln_coord(E)& col) const; @@ -71,34 +68,10 @@ - /// Implementation corresponding to the interface - /// oln::abstract::image3d for an identity morpher. - template <typename E> - class set_impl<abstract::image3d, morpher::tag::identity, E> : - public virtual stc::any__simple<E> - { - public: - - oln_rvalue(E) impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) const; - - // FIXME: Hack. - oln_lvalue(E) impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col); - bool impl_has_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) const; - - }; - - - # ifndef OLN_INCLUDE_ONLY - // Default is: 1. convert (slice, row, col) -> p then 2. call operator()(p). + // 1. convert (slice, row, col) -> p then 2. call operator()(p). template <typename E, typename tag> oln_rvalue(E) @@ -112,17 +85,6 @@ } template <typename E, typename tag> - oln_lvalue(E) - set_impl<abstract::image3d, tag, E> - ::impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) - { - point3d tmp(slice, row, col); - return this->exact().operator()(tmp); - } - - template <typename E, typename tag> bool set_impl<abstract::image3d, tag, E> ::impl_has_at(const oln_coord(E)& slice, @@ -133,39 +95,6 @@ return this->exact().has(tmp); } - - // For morphers: delegate. - - template <typename E> - oln_rvalue(E) - set_impl<abstract::image3d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) const - { - return this->exact().delegate().at(slice, row, col); - } - - template <typename E> - oln_lvalue(E) - set_impl<abstract::image3d, morpher::tag::identity, E> - ::impl_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) - { - return this->exact().delegate().at(slice, row, col); - } - - template <typename E> - bool - set_impl<abstract::image3d, morpher::tag::identity, E> - ::impl_has_at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) const - { - return this->exact().delegate().has_at(slice, row, col); - } - # endif } // end of namespace oln::automatic Index: oln/core/automatic/image/mutable_image1d.hh =================================================================== --- oln/core/automatic/image/mutable_image1d.hh (revision 0) +++ oln/core/automatic/image/mutable_image1d.hh (revision 0) @@ -0,0 +1,82 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH + +# include <oln/core/automatic/impl.hh> +# include <oln/morpher/tags.hh> +# include <oln/core/1d/point1d.hh> + + +namespace oln +{ + // Forward declaration. + namespace abstract + { + template <typename E> class image1d; + + } // end of namespace oln::abstract + + + namespace automatic + { + + + /// Default implementation corresponding to the interface + /// oln::abstract::image1d. + template <typename E, typename tag> + class set_impl<abstract::image1d, tag, E> : + public virtual stc::any__simple<E> + { + public: + oln_lvalue(E) impl_at(const oln_coord(E)& index); + }; + + + +# ifndef OLN_INCLUDE_ONLY + + + // 1. convert (index) -> p then 2. call operator()(p). + + template <typename E, typename tag> + oln_lvalue(E) + set_impl<abstract::image1d, tag, E> + ::impl_at(const oln_coord(E)& index) + { + point1d tmp(index); + return this->exact().operator()(tmp); + } + +# endif + + } // end of namespace oln::automatic + +} // end of namespace oln + +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH Index: oln/core/abstract/image.hh =================================================================== --- oln/core/abstract/image.hh (revision 669) +++ oln/core/abstract/image.hh (working copy) @@ -29,9 +29,12 @@ #ifndef OLN_CORE_ABSTRACT_IMAGE_HH # define OLN_CORE_ABSTRACT_IMAGE_HH +# include <cstddef> + # include <oln/core/typedefs.hh> # include <oln/core/abstract/fwd_decls.hh> # include <oln/core/automatic/image/image.hh> +# include <oln/debug/track.hh> namespace oln @@ -136,12 +139,14 @@ template <typename E> image<E>::image() { + ++debug::n_images; } template <typename E> image<E>::~image() { decl(); + --debug::n_images; } template <typename E> Index: oln/core/abstract/image/dimension/1d.hh =================================================================== --- oln/core/abstract/image/dimension/1d.hh (revision 669) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/automatic/image/image1d.hh> +# include <oln/core/automatic/image/mutable_image1d.hh> namespace oln @@ -49,7 +50,6 @@ oln_rvalue(E) at(const oln_coord(E)& index) const; // FIXME: Hack (should be elsewhere)! - oln_lvalue(E) at(const oln_coord(E)& index); bool has_at(const oln_coord(E)& index) const; protected: @@ -58,8 +58,26 @@ }; + /// Class of 1D mutable images. + template <typename E> + struct mutable_image1d : + public image1d<E>, + public automatic::get_impl<mutable_image1d, E> + { + public: + + oln_lvalue(E) at(const oln_coord(E)& index); + + protected: + /// Constructor (protected, empty). + mutable_image1d(); + }; + + # ifndef OLN_INCLUDE_ONLY + // image1d + template <typename E> image1d<E>::image1d() { @@ -73,19 +91,26 @@ } template <typename E> - oln_lvalue(E) - image1d<E>::at(const oln_coord(E)& index) + bool + image1d<E>::has_at(const oln_coord(E)& index) const { - return this->exact().impl_at(index); + return this->exact().impl_has_at(index); } + // mutable_image1d + template <typename E> - bool - image1d<E>::has_at(const oln_coord(E)& index) const + mutable_image1d<E>::mutable_image1d() { - return this->exact().impl_has_at(index); } + template <typename E> + oln_lvalue(E) + mutable_image1d<E>::at(const oln_coord(E)& index) + { + return this->exact().impl_at(index); + } + # endif } // end of namespace oln::abstract Index: oln/core/abstract/image/dimension/2d.hh =================================================================== --- oln/core/abstract/image/dimension/2d.hh (revision 669) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/automatic/image/image2d.hh> +# include <oln/core/automatic/image/mutable_image2d.hh> namespace oln @@ -49,7 +50,6 @@ oln_rvalue(E) at(const oln_coord(E)& row, const oln_coord(E)& col) const; // FIXME: Hack (should be elsewhere)! - oln_lvalue(E) at(const oln_coord(E)& row, const oln_coord(E)& col); bool has_at(const oln_coord(E)& row, const oln_coord(E)& col) const; protected: @@ -58,8 +58,27 @@ }; + /// Class of 2D mutable images. + template <typename E> + struct mutable_image2d : + public image2d<E>, + public automatic::get_impl<mutable_image2d, E> + { + public: + + oln_lvalue(E) at(const oln_coord(E)& row, const oln_coord(E)& col); + + protected: + /// Constructor (protected, empty). + mutable_image2d(); + }; + + + # ifndef OLN_INCLUDE_ONLY + // image2d + template <typename E> image2d<E>::image2d() { @@ -73,19 +92,26 @@ } template <typename E> - oln_lvalue(E) - image2d<E>::at(const oln_coord(E)& row, const oln_coord(E)& col) + bool + image2d<E>::has_at(const oln_coord(E)& row, const oln_coord(E)& col) const { - return this->exact().impl_at(row, col); + return this->exact().impl_has_at(row, col); } + // mutable_image2d + template <typename E> - bool - image2d<E>::has_at(const oln_coord(E)& row, const oln_coord(E)& col) const + mutable_image2d<E>::mutable_image2d() { - return this->exact().impl_has_at(row, col); } + template <typename E> + oln_lvalue(E) + mutable_image2d<E>::at(const oln_coord(E)& row, const oln_coord(E)& col) + { + return this->exact().impl_at(row, col); + } + # endif } // end of namespace oln::abstract Index: oln/core/abstract/image/dimension/3d.hh =================================================================== --- oln/core/abstract/image/dimension/3d.hh (revision 669) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -30,6 +30,7 @@ # include <oln/core/abstract/image.hh> # include <oln/core/automatic/image/image3d.hh> +# include <oln/core/automatic/image/mutable_image3d.hh> namespace oln @@ -51,9 +52,6 @@ const oln_coord(E)& col) const; // FIXME: Hack (should be elsewhere)! - oln_lvalue(E) at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col); bool has_at(const oln_coord(E)& slice, const oln_coord(E)& row, const oln_coord(E)& col) const; @@ -64,8 +62,29 @@ }; + + /// Class of 3D mutable images. + template <typename E> + struct mutable_image3d : + public image3d<E>, + public automatic::get_impl<mutable_image3d, E> + { + public: + + oln_lvalue(E) at(const oln_coord(E)& slice, + const oln_coord(E)& row, + const oln_coord(E)& col); + + protected: + /// Constructor (protected, empty). + mutable_image3d(); + }; + + # ifndef OLN_INCLUDE_ONLY + // image3d + template <typename E> image3d<E>::image3d() { @@ -81,15 +100,6 @@ } template <typename E> - oln_lvalue(E) - image3d<E>::at(const oln_coord(E)& slice, - const oln_coord(E)& row, - const oln_coord(E)& col) - { - return this->exact().impl_at(slice, row, col); - } - - template <typename E> bool image3d<E>::has_at(const oln_coord(E)& slice, const oln_coord(E)& row, @@ -98,6 +108,22 @@ return this->exact().impl_has_at(slice, row, col); } + // mutable_image3d + + template <typename E> + mutable_image3d<E>::mutable_image3d() + { + } + + template <typename E> + oln_lvalue(E) + mutable_image3d<E>::at(const oln_coord(E)& slice, + const oln_coord(E)& row, + const oln_coord(E)& col) + { + return this->exact().impl_at(slice, row, col); + } + # endif } // end of namespace oln::abstract Index: oln/core/abstract/image/dimension/hierarchy.hh =================================================================== --- oln/core/abstract/image/dimension/hierarchy.hh (revision 669) +++ oln/core/abstract/image/dimension/hierarchy.hh (working copy) @@ -65,7 +65,10 @@ Default case: If no known grid type is returned by `oln_type_of(I, grid)', the entry is directly plugged to abstract::image. */ +// FIXME: Figure above is obsolete because of the introduction of +// sub-abstractions related to mutability. + /*-------------------------. | Dimension abstractions. | `-------------------------*/ @@ -90,26 +93,53 @@ /// 1D case. + template <typename E> struct case_< image_hierarchy_wrt_dimension, E, 1 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid1d > > + where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid1d >, + mlc_is_ok(oln_lvalue(E)) > > { + typedef abstract::mutable_image1d<E> ret; + }; + + template <typename E> + struct case_< image_hierarchy_wrt_dimension, E, 2 > : + where_< mlc::eq_< oln_grid(E), oln::grid1d > > + { typedef abstract::image1d<E> ret; }; /// 2D case. + template <typename E> - struct case_< image_hierarchy_wrt_dimension, E, 2 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid2d > > + struct case_< image_hierarchy_wrt_dimension, E, 3 > : + where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid2d >, + mlc_is_ok(oln_lvalue(E)) > > { + typedef abstract::mutable_image2d<E> ret; + }; + + template <typename E> + struct case_< image_hierarchy_wrt_dimension, E, 4 > : + where_< mlc::eq_< oln_grid(E), oln::grid2d > > + { typedef abstract::image2d<E> ret; }; /// 3D case. + template <typename E> - struct case_< image_hierarchy_wrt_dimension, E, 3 > : - where_< mlc::eq_< oln_type_of(E, grid), oln::grid3d > > + struct case_< image_hierarchy_wrt_dimension, E, 5 > : + where_< mlc::and_< mlc::eq_< oln_grid(E), oln::grid3d >, + mlc_is_ok(oln_lvalue(E)) > > { + typedef abstract::mutable_image3d<E> ret; + }; + + template <typename E> + struct case_< image_hierarchy_wrt_dimension, E, 6 > : + where_< mlc::eq_< oln_grid(E), oln::grid3d > > + { typedef abstract::image3d<E> ret; }; Index: oln/core/2d/array2d.hh =================================================================== --- oln/core/2d/array2d.hh (revision 669) +++ oln/core/2d/array2d.hh (working copy) @@ -29,7 +29,7 @@ #ifndef OLN_CORE_2D_ARRAY2D_HH # define OLN_CORE_2D_ARRAY2D_HH -# include <cstdlib> +# include <cstddef> # include <mlc/contract.hh> @@ -55,7 +55,7 @@ bool has(coord_t i, coord_t j) const; - size_t memsize() const; + std::size_t memsize() const; protected: Index: oln/core/2d/image2d.hh =================================================================== --- oln/core/2d/image2d.hh (revision 669) +++ oln/core/2d/image2d.hh (working copy) @@ -79,6 +79,9 @@ public: + /// Ctor without info. + image2d(); + /// Ctor using sizes. image2d(unsigned nrows, unsigned ncols, unsigned border = 2); @@ -107,6 +110,13 @@ # ifndef OLN_INCLUDE_ONLY template <typename T> + image2d<T>::image2d() + : topo_(), + data_() + { + } + + template <typename T> image2d<T>::image2d(unsigned nrows, unsigned ncols, unsigned border) : topo_(bbox2d(point2d(0, 0 ), point2d(nrows - 1, ncols - 1)), @@ -145,6 +155,7 @@ template <typename T> T image2d<T>::impl_at(int row, int col) const { + precondition(data_ != 0); precondition(data_->has(row, col)); return data_->operator()(row, col); } Index: oln/Makefile.am =================================================================== --- oln/Makefile.am (revision 669) +++ oln/Makefile.am (working copy) @@ -98,6 +98,9 @@ core/automatic/image/image2d.hh \ core/automatic/image/image3d.hh \ core/automatic/image/mutable_image.hh \ + core/automatic/image/mutable_image1d.hh \ + core/automatic/image/mutable_image2d.hh \ + core/automatic/image/mutable_image3d.hh \ core/automatic/image/image_being_random_accessible.hh \ core/automatic/image/image_having_neighborhood.hh \ core/automatic/image/image_having_neighborhood.hh \ @@ -156,6 +159,7 @@ core/type.hh \ \ debug/print.hh \ + debug/track.hh \ debug/typename.hh \ \ io/pnm.hh \ @@ -170,6 +174,7 @@ morpher/identity.hh \ morpher/tags.hh \ morpher/slice.hh \ + morpher/stack.hh \ morpher/thru_fun.hh \ morpher/thru_mfun.hh \ morpher/value_cast.hh \ Index: oln/morpher/stack.hh =================================================================== --- oln/morpher/stack.hh (revision 0) +++ oln/morpher/stack.hh (revision 0) @@ -0,0 +1,191 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_MORPHER_STACK_HH +# define OLN_MORPHER_STACK_HH + +# include <xtd/vec.hh> +# include <oln/morpher/internal/image_value_morpher.hh> + + + +namespace oln +{ + + namespace morpher + { + // Forward declaration. + template <unsigned n, typename I> struct stack; + + } // end of namespace oln::morpher + + + /// Super type. + template <unsigned n, typename I> + struct set_super_type< morpher::stack<n, I> > + { + typedef morpher::stack<n, I> self_t; + typedef morpher::internal::image_value_morpher<I, self_t> ret; + }; + + template <unsigned n, typename I> + struct vtypes< morpher::stack<n, I> > + { + typedef mlc::true_ is_computed_type; + typedef xtd::vec<n, oln_value(I)> value_type; + }; + + template <unsigned n, typename I> + struct single_vtype< morpher::stack<n, I>, typedef_::rvalue_type > + { + typedef xtd::vec<n, oln_value(I)> ret; + }; + + + namespace morpher + { + /// "Stack of images" morpher. + template <unsigned n, typename I> + class stack : public internal::image_value_morpher< I, stack<n, I> > + { + private: + + typedef stack<n, I> self_t; + typedef internal::image_value_morpher<I, self_t> super_t; + + typedef oln_psite(self_t) psite_t; + typedef oln_rvalue(self_t) rvalue_t; + + public: + + stack(const xtd::vec<n, I>& images); + + xtd::vec<n, oln_value(I)> impl_op_read(const psite_t& p) const; + + const I& image(unsigned i) const; + + protected: + xtd::vec<n, I> images_; + }; + + +# ifndef OLN_INCLUDE_ONLY + + template <unsigned n, typename I> + stack<n, I>::stack(const xtd::vec<n, I>& images) : + super_t(images[0]), + images_(images) + { + } + + template <unsigned n, typename I> + xtd::vec<n, oln_value(I)> + stack<n, I>::impl_op_read(const typename stack<n, I>::psite_t& p) const + { + xtd::vec<n, oln_value(I)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = images_[i](p); + return tmp; + } + + template <unsigned n, typename I> + const I& + stack<n, I>::image(unsigned i) const + { + precondition(i < n); + return images_[i]; + } + +# endif + + } // end of namespace oln::morpher + + + template <typename I> + morpher::stack<2, I> + stack(const abstract::image& image_0, + const abstract::image& image_1); + + template <typename I> + morpher::stack<3, I> + stack(const abstract::image& image_0, + const abstract::image& image_1, + const abstract::image& image_2); + + template <typename I> + morpher::stack<4, I> + stack(const abstract::image& image_0, + const abstract::image& image_1, + const abstract::image& image_2, + const abstract::image& image_3); + + +# ifndef OLN_INCLUDE_ONLY + + + template <typename I> + morpher::stack<2, I> + stack(const abstract::image& image_0, + const abstract::image& image_1) + { + morpher::stack<2, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact())); + return tmp; + } + + template <typename I> + morpher::stack<3, I> + stack(const abstract::image& image_0, + const abstract::image& image_1, + const abstract::image& image_2) + { + morpher::stack<3, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact(), + image_2.exact())); + return tmp; + } + + template <typename I> + morpher::stack<4, I> + stack(const abstract::image& image_0, + const abstract::image& image_1, + const abstract::image& image_2, + const abstract::image& image_3) + { + morpher::stack<4, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact(), + image_2.exact(), + image_3.exact())); + return tmp; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_MORPHER_STACK_HH

1 0

669: Move ops of xtd::vec outside of class.
by Thierry GERAUD 23 Oct '06

23 Oct '06

2006-10-23 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * xtd/vec.hh (ops): Move outside of class. (vec_base_): New specialization for <4, T>. (mk_vec): New overloading for 4 args. Index: xtd/vec.hh =================================================================== --- xtd/vec.hh (revision 664) +++ xtd/vec.hh (working copy) @@ -25,7 +25,6 @@ // reasons why the executable file might be covered by the GNU General // Public License. - #ifndef XTD_VEC_HH # define XTD_VEC_HH @@ -89,7 +88,22 @@ T data_[3]; }; + template <typename T> + class vec_base_ <4, T> + { + public: + void set(const T& val0, const T& val1, const T& val2, const T& val3) + { + data_[0] = val0; + data_[1] = val1; + data_[2] = val2; + data_[3] = val3; + } + protected: + T data_[4]; + }; + } // end of namespace xtd::internal @@ -124,7 +138,7 @@ return *this; } - const T operator[](unsigned i) const + const T& operator[](unsigned i) const { precondition(i < n); return data_[i]; @@ -147,123 +161,134 @@ return n; } - // eq + }; - bool operator==(const vec& rhs) const - { - for (unsigned i = 0; i < n; ++i) - if (data_[i] != rhs[i]) - return false; - return true; - } - bool operator!=(const vec& rhs) const - { - return not (*this == rhs); - } - // + - template <typename U> - vec& operator+=(const vec<n,U>& rhs) - { - for (unsigned i = 0; i < n; ++i) - data_[i] += rhs[i]; - return *this; - } + // eq - template <typename U> - vec<n, xtd_op_plus_trait(T, U)> - operator+(const vec<n,U>& rhs) const - { - vec<n, xtd_op_plus_trait(T, U)> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = data_[i] + rhs[i]; - return tmp; - } + template <unsigned n, typename T, typename U> + bool operator==(const vec<n,T>& lhs, const vec<n,U>& rhs) + { + for (unsigned i = 0; i < n; ++i) + if (lhs[i] != rhs[i]) + return false; + return true; + } - // - + template <unsigned n, typename T, typename U> + bool operator!=(const vec<n,T>& lhs, const vec<n,U>& rhs) + { + return not (lhs == rhs); + } - template <typename U> - vec& operator-=(const vec<n,U>& rhs) - { - for (unsigned i = 0; i < n; ++i) - data_[i] -= rhs[i]; - return *this; - } - template <typename U> - vec<n, xtd_op_minus_trait(T, U)> - operator-(const vec<n,U>& rhs) const - { - vec<n, xtd_op_plus_trait(T, U)> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = data_[i] - rhs[i]; - return tmp; - } + // + - vec<n, xtd_op_uminus_trait(T)> - operator-() const - { - vec<n, xtd_op_uminus_trait(T)> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = - data_[i]; - return tmp; - } + template <unsigned n, typename T, typename U> + vec<n,T>& + operator+=(vec<n,T>& lhs, const vec<n,U>& rhs) + { + for (unsigned i = 0; i < n; ++i) + lhs[i] += rhs[i]; + return lhs; + } - // * + template <unsigned n, typename T, typename U> + vec<n, xtd_op_plus_trait(T, U)> + operator+(const vec<n,T>& lhs, const vec<n,U>& rhs) + { + vec<n, xtd_op_plus_trait(T, U)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = lhs[i] + rhs[i]; + return tmp; + } - template <typename U> void operator*=(const vec<n,U>& rhs); - template <typename U> void operator*(const vec<n,U>& rhs) const; - template <typename S> - vec& operator*=(const S& scalar) - { - for (unsigned i = 0; i < n; ++i) - data_[i] *= scalar; - return *this; - } + // - - template <typename S> - vec<n, xtd_op_mult_trait(T, S)> - operator*(const S& scalar) const - { - vec<n, xtd_op_mult_trait(T, S)> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = data_[i] * scalar; - return tmp; - } + template <unsigned n, typename T, typename U> + vec<n,T>& + operator-=(vec<n,T>& lhs, const vec<n,U>& rhs) + { + for (unsigned i = 0; i < n; ++i) + lhs[i] -= rhs[i]; + return lhs; + } - // / - - template <typename U> void operator/=(const vec<n,U>& rhs); - template <typename U> void operator/(const vec<n,U>& rhs) const; + template <unsigned n, typename T, typename U> + vec<n, xtd_op_minus_trait(T, U)> + operator-(const vec<n,T>& lhs, const vec<n,U>& rhs) + { + vec<n, xtd_op_plus_trait(T, U)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = lhs[i] - rhs[i]; + return tmp; + } - template <typename S> - vec& operator/=(const S& scalar) - { - precondition(scalar != 0); - for (unsigned i = 0; i < n; ++i) - data_[i] /= scalar; - return *this; - } + template <unsigned n, typename T> + vec<n, xtd_op_uminus_trait(T)> + operator-(const vec<n,T>& lhs) + { + vec<n, xtd_op_uminus_trait(T)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = - lhs[i]; + return tmp; + } - template <typename S> - vec<n, xtd_op_div_trait(T, S)> - operator/(const S& scalar) const - { - precondition(scalar != 0); - vec<n, xtd_op_div_trait(T, S)> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = data_[i] / scalar; - return tmp; - } - }; + // * + template <unsigned n, typename T, typename S> + vec<n,T>& + operator*=(vec<n,T>& lhs, const S& scalar) + { + for (unsigned i = 0; i < n; ++i) + lhs[i] *= scalar; + return lhs; + } + template <unsigned n, typename T, typename S> + vec<n, xtd_op_mult_trait(T, S)> + operator*(const vec<n,T>& lhs, const S& scalar) + { + vec<n, xtd_op_mult_trait(T, S)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = lhs[i] * scalar; + return tmp; + } + + + // / + + template <unsigned n, typename T, typename S> + vec<n,T>& + operator/=(vec<n,T>& lhs, const S& scalar) + { + precondition(scalar != 0); + for (unsigned i = 0; i < n; ++i) + lhs[i] /= scalar; + return lhs; + } + + template <unsigned n, typename T, typename S> + vec<n, xtd_op_div_trait(T, S)> + operator/(const vec<n,T>& lhs, const S& scalar) + { + precondition(scalar != 0); + vec<n, xtd_op_div_trait(T, S)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = lhs[i] / scalar; + return tmp; + } + + + // << + template <unsigned n, typename T> - std::ostream& operator<<(std::ostream& ostr, const vec<n,T>& v) + std::ostream& + operator<<(std::ostream& ostr, const vec<n,T>& v) { ostr << '('; for (unsigned i = 0; i < n; ++i) @@ -272,7 +297,8 @@ } template <unsigned n> - std::ostream& operator<<(std::ostream& ostr, const vec<n,unsigned char>& v) + std::ostream& + operator<<(std::ostream& ostr, const vec<n,unsigned char>& v) { ostr << '('; for (unsigned i = 0; i < n; ++i) @@ -281,7 +307,8 @@ } template <unsigned n> - std::ostream& operator<<(std::ostream& ostr, const vec<n,signed char>& v) + std::ostream& + operator<<(std::ostream& ostr, const vec<n,signed char>& v) { ostr << '('; for (unsigned i = 0; i < n; ++i) @@ -359,7 +386,18 @@ return tmp; } + template <typename T> + vec<4, T> mk_vec(const T& v_0, const T& v_1, const T& v_2, const T& v_3) + { + vec<4, T> tmp; + tmp[0] = v_0; + tmp[1] = v_1; + tmp[2] = v_2; + tmp[3] = v_3; + return tmp; + } + } // end of namespace xtd

1 0

668: Add files for oln::window[123]d.
by Roland Levillain 23 Oct '06

23 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add files for oln::window[123]d. * oln/core/1d/window1d.hh: New file. * oln/basics1d.hh: Include it. * oln/core/2d/window2d.hh: New file. * oln/basics2d.hh: Include it. * oln/core/3d/window3d.hh: New file. * oln/basics3d.hh: Include it. * oln/Makefile.am (nobase_oln_HEADERS): Add core/1d/window1d.hh, core/2d/window2d.hh and core/3d/window3d.hh * tests/morphers/slice_morpher.cc: Remove FIXME. oln/Makefile.am | 3 +++ oln/basics1d.hh | 5 ++--- oln/basics2d.hh | 5 ++--- oln/basics3d.hh | 5 ++--- oln/core/1d/window1d.hh | 37 +++++++++++++++++++++++++++++++++++++ oln/core/2d/window2d.hh | 37 +++++++++++++++++++++++++++++++++++++ oln/core/3d/window3d.hh | 37 +++++++++++++++++++++++++++++++++++++ tests/morphers/slice_morpher.cc | 3 --- 8 files changed, 120 insertions(+), 12 deletions(-) Index: tests/morphers/slice_morpher.cc --- tests/morphers/slice_morpher.cc (revision 667) +++ tests/morphers/slice_morpher.cc (working copy) @@ -32,9 +32,6 @@ #include <mlc/assert.hh> #include <mlc/is_a.hh> -// FIXME: We should not include oln/basics2d.hh and oln/basics3d.hh, -// but only oln/core/3d/image3d.hh and oln/core/2d/image2d.hh, -// oln/core/2d/window2d. #include <oln/basics2d.hh> #include <oln/basics3d.hh> #include <oln/morpher/slice.hh> Index: oln/basics1d.hh --- oln/basics1d.hh (revision 667) +++ oln/basics1d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/1d/point1d.hh> # include <oln/core/1d/dpoint1d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/1d/topo1d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/1d/window1d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh> Index: oln/core/1d/window1d.hh --- oln/core/1d/window1d.hh (revision 0) +++ oln/core/1d/window1d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_1D_WINDOW1D_HH +# define OLN_CORE_1D_WINDOW1D_HH + +// Headers required for the complete definition of oln::window1d +// (i.e., oln::window_<dpoint1d>). +# include <oln/core/1d/aliases.hh> +# include <oln/core/1d/dpoint1d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_1D_WINDOW1D_HH Index: oln/core/2d/window2d.hh --- oln/core/2d/window2d.hh (revision 0) +++ oln/core/2d/window2d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_2D_WINDOW2D_HH +# define OLN_CORE_2D_WINDOW2D_HH + +// Headers required for the complete definition of oln::window2d +// (i.e., oln::window_<dpoint2d>). +# include <oln/core/2d/aliases.hh> +# include <oln/core/2d/dpoint2d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_2D_WINDOW2D_HH Index: oln/core/3d/window3d.hh --- oln/core/3d/window3d.hh (revision 0) +++ oln/core/3d/window3d.hh (revision 0) @@ -0,0 +1,37 @@ +// Copyright (C) 2006 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_3D_WINDOW3D_HH +# define OLN_CORE_3D_WINDOW3D_HH + +// Headers required for the complete definition of oln::window3d +// (i.e., oln::window_<dpoint3d>). +# include <oln/core/3d/aliases.hh> +# include <oln/core/3d/dpoint3d.hh> +# include <oln/core/gen/window.hh> + +#endif // ! OLN_CORE_3D_WINDOW3D_HH Index: oln/basics2d.hh --- oln/basics2d.hh (revision 667) +++ oln/basics2d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/2d/point2d.hh> # include <oln/core/2d/dpoint2d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/2d/topo2d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/2d/window2d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 667) +++ oln/Makefile.am (working copy) @@ -13,6 +13,7 @@ core/1d/neighb1d.hh \ core/1d/point1d.hh \ core/1d/topo1d.hh \ + core/1d/window1d.hh \ \ core/2d/aliases.hh \ core/2d/array2d.hh \ @@ -22,6 +23,7 @@ core/2d/neighb2d.hh \ core/2d/point2d.hh \ core/2d/topo2d.hh \ + core/2d/window2d.hh \ \ core/3d/aliases.hh \ core/3d/array3d.hh \ @@ -31,6 +33,7 @@ core/3d/neighb3d.hh \ core/3d/point3d.hh \ core/3d/topo3d.hh \ + core/3d/window3d.hh \ \ core/abstract/image/accessibility/hierarchy.hh \ \ Index: oln/basics3d.hh --- oln/basics3d.hh (revision 667) +++ oln/basics3d.hh (working copy) @@ -37,13 +37,12 @@ # include <oln/core/3d/point3d.hh> # include <oln/core/3d/dpoint3d.hh> -# include <oln/core/gen/bbox.hh> -# include <oln/core/gen/topo_lbbox.hh> +# include <oln/core/3d/topo3d.hh> # include <oln/core/gen/fwd_piter_bbox.hh> # include <oln/core/gen/bkd_piter_bbox.hh> -# include <oln/core/gen/window.hh> +# include <oln/core/3d/window3d.hh> # include <oln/core/gen/fwd_qiter_win.hh> # include <oln/core/gen/bkd_qiter_win.hh>

1 0

667: Add qiters for oln::morpher::slice.
by Roland Levillain 23 Oct '06

23 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add qiters for oln::morpher::slice. * oln/core/type_fun/slice.hh (TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER): Rename as... (TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER): ...this. Adjust. (oln::type_fun::slice_piter): Rename as... (oln::type_fun::slice_iterator): ...this. (oln::type_fun::slice_iterator<fwd_qiter2d>) (oln::type_fun::slice_iterator<bkd_qiter2d>) (oln::type_fun::slice_iterator<fwd_qiter3d>) (oln::type_fun::slice_iterator<bkd_qiter3d>) * oln/core/iterator_vtypes.hh: s/slice_piter/slice_iterator/g. (oln::single_vtype<morpher::slice<Image>, typedef_::fwd_qiter_type>) (oln::single_vtype<morpher::slice<Image>, typedef_::bkd_qiter_type>) * oln/morpher/slice.hh: Adjust comments. * tests/morphers/slice_morpher.cc: s/ima_with_nbh/slice/g Test fwd_qiter on oln::morpher::slice. oln/core/iterator_vtypes.hh | 31 +++++++++++++++++++++++++--- oln/core/type_fun/slice.hh | 44 ++++++++++++++++++++++++++++++---------- oln/morpher/slice.hh | 4 +-- tests/morphers/slice_morpher.cc | 42 ++++++++++++++++++++++++++------------ 4 files changed, 93 insertions(+), 28 deletions(-) Index: oln/core/type_fun/slice.hh --- oln/core/type_fun/slice.hh (revision 666) +++ oln/core/type_fun/slice.hh (working copy) @@ -145,7 +145,7 @@ /// Error messages raised by static assertions/abortions. namespace ERROR { - struct TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER; + struct TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER; struct TYPE_FUNCTION_slice_topo_NOT_DEFINED_FOR_THIS_PARAMETER; } @@ -153,9 +153,9 @@ namespace type_fun { - /*------------------------. - | type_fun::slice_piter. | - `------------------------*/ + /*---------------------------. + | type_fun::slice_iterator. | + `---------------------------*/ /// Type function returning the ``sliced'' piter corresponding to /// \a Piter @@ -163,10 +163,10 @@ /// Default version, undefined. template <typename Piter> - struct slice_piter : + struct slice_iterator : public mlc::abort_< Piter, - oln::ERROR::TYPE_FUNCTION_slice_piter_NOT_DEFINED_FOR_THIS_PARAMETER + oln::ERROR::TYPE_FUNCTION_slice_iterator_NOT_DEFINED_FOR_THIS_PARAMETER > { typedef mlc::undefined ret; @@ -178,34 +178,58 @@ // --------- // template <> - struct slice_piter<fwd_piter2d> + struct slice_iterator<fwd_piter2d> { typedef fwd_piter1d ret; }; template <> - struct slice_piter<bkd_piter2d> + struct slice_iterator<bkd_piter2d> { typedef bkd_piter1d ret; }; + template <> + struct slice_iterator<fwd_qiter2d> + { + typedef fwd_qiter1d ret; + }; + + template <> + struct slice_iterator<bkd_qiter2d> + { + typedef bkd_qiter1d ret; + }; + // --------- // // image3d. // // --------- // template <> - struct slice_piter<fwd_piter3d> + struct slice_iterator<fwd_piter3d> { typedef fwd_piter2d ret; }; template <> - struct slice_piter<bkd_piter3d> + struct slice_iterator<bkd_piter3d> { typedef bkd_piter2d ret; }; + template <> + struct slice_iterator<fwd_qiter3d> + { + typedef fwd_qiter2d ret; + }; + + template <> + struct slice_iterator<bkd_qiter3d> + { + typedef bkd_qiter2d ret; + }; + /// \} Index: oln/core/iterator_vtypes.hh --- oln/core/iterator_vtypes.hh (revision 666) +++ oln/core/iterator_vtypes.hh (working copy) @@ -284,6 +284,8 @@ template <typename Piter, typename Topo> class piter_slice_; + // piters. + /// fwd_piter vtype of morpher::slice. template <typename Image> struct single_vtype< morpher::slice<Image>, typedef_::fwd_piter_type > @@ -291,7 +293,7 @@ private: typedef oln_type_of(Image, fwd_piter) orig_fwd_piter; public: - typedef typename type_fun::slice_piter<orig_fwd_piter>::ret ret; + typedef typename type_fun::slice_iterator<orig_fwd_piter>::ret ret; }; /// bkd_piter vtype of morpher::slice. @@ -301,11 +303,34 @@ private: typedef oln_type_of(Image, bkd_piter) orig_bkd_piter; public: - typedef typename type_fun::slice_piter<orig_bkd_piter>::ret ret; + typedef typename type_fun::slice_iterator<orig_bkd_piter>::ret ret; + }; + + + // qiters. + + /// fwd_qiter vtype of morpher::slice. + template <typename Image> + struct single_vtype< morpher::slice<Image>, typedef_::fwd_qiter_type > + { + private: + typedef oln_type_of(Image, fwd_qiter) orig_fwd_qiter; + public: + typedef typename type_fun::slice_iterator<orig_fwd_qiter>::ret ret; + }; + + /// bkd_qiter vtype of morpher::slice. + template <typename Image> + struct single_vtype< morpher::slice<Image>, typedef_::bkd_qiter_type > + { + private: + typedef oln_type_of(Image, bkd_qiter) orig_bkd_qiter; + public: + typedef typename type_fun::slice_iterator<orig_bkd_qiter>::ret ret; }; - // FIXME: What about niters and qiter? + // FIXME: What about niters? } // end of namespace oln Index: oln/morpher/slice.hh --- oln/morpher/slice.hh (revision 666) +++ oln/morpher/slice.hh (working copy) @@ -90,8 +90,8 @@ // fwd_piter_type: see oln/core/iterator_vtypes.hh. // bkd_piter_type: see oln/core/iterator_vtypes.hh. - // FIXME: fwd_qiter_type? - // FIXME: bkd_qiter_type? + // fwd_qiter_type: see oln/core/iterator_vtypes.hh. + // bkd_qiter_type: see oln/core/iterator_vtypes.hh. typedef oln::morpher::tag::slice morpher_type; Index: tests/morphers/slice_morpher.cc --- tests/morphers/slice_morpher.cc (revision 666) +++ tests/morphers/slice_morpher.cc (working copy) @@ -33,7 +33,8 @@ #include <mlc/is_a.hh> // FIXME: We should not include oln/basics2d.hh and oln/basics3d.hh, -// but only oln/core/2d/image2d.hh and oln/core/3d/image3d.hh. +// but only oln/core/3d/image3d.hh and oln/core/2d/image2d.hh, +// oln/core/2d/window2d. #include <oln/basics2d.hh> #include <oln/basics3d.hh> #include <oln/morpher/slice.hh> @@ -45,7 +46,7 @@ main() { /*---------------. - | image2d<int>. | + | image3d<int>. | `---------------*/ typedef oln::image3d<int> image_t; @@ -58,27 +59,27 @@ /*----------------------------. - | add_slice< image2d<int> >. | + | add_slice< image3d<int> >. | `----------------------------*/ typedef oln::morpher::slice<image_t> slice_t; // Check that the instantiated slice morpher realizes the suited // interfaces. - mlc::assert_< mlc::eq_<oln_type_of_(slice_t, grid), oln::grid2d> >::check(); + mlc::assert_< mlc::eq_<oln_grid_(slice_t), oln::grid2d> >::check(); mlc::assert_< mlc_is_a_(slice_t, oln::abstract::image2d) >::check(); mlc::assert_< mlc_is_a_(slice_t, oln::abstract::mutable_image) >::check(); // Create a slice of \a ima along the 2nd axis (which the ``row'' // axis, numbered 1), and check its peoperties. int slice_row = 2; - slice_t ima_with_nbh(ima, 1, slice_row); - assert(ima_with_nbh.bbox().nrows() == 3); - assert(ima_with_nbh.bbox().ncols() == 5); - // Fill a slice of \a ima by filling \a ima_with_nbh. - oln::level::fill (ima_with_nbh, 51); + slice_t slice(ima, 1, slice_row); + assert(slice.bbox().nrows() == 3); + assert(slice.bbox().ncols() == 5); + // Fill a slice of \a ima by filling \a slice. + oln::level::fill (slice, 51); - // Check that \a ima has been altered, by comapring it to a similar + // Check that \a ima has been altered, by comparing it to a similar // 3D image. image_t ref(3, 4, 5); oln::level::fill (ref, 42); @@ -86,7 +87,22 @@ for (unsigned c = 0; c < ima.bbox().ncols(); ++c) ref.at(s, slice_row, c) = 51; // FIXME: Implement equality on images. - oln_type_of_(image_t, piter) p (ima.topo()); - for_all (p) - assert(ima(p) == ref(p)); + oln_piter_(image_t) pi (ima.topo()); + for_all (pi) + assert(ima(pi) == ref(pi)); + + // Test foward q-iterator. + typedef oln::window2d slice_win_t; + slice_win_t win_c4p; + win_c4p. + add(oln::dpoint2d(-1, 0)). + add(oln::dpoint2d(+1, 0)). + add(oln::dpoint2d( 0, -1)). + add(oln::dpoint2d( 0, +1)); + oln_piter_(slice_t) ps (slice.topo()); + oln_qiter_(slice_t) q (ps, win_c4p); + for_all (ps) + for_all (q) + if (slice.has(q)) + assert(slice(q) == 51); }

1 0

olena-0.10 10.267: Fix the distribution (again)
by Roland Levillain 22 Oct '06

22 Oct '06

2006-10-22 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution (again). * ruby/Makefile.am: s/ruby_DATA/dist_ruby_DATA/g. --- 10.266/tools/swilena/ruby/Makefile.am Sat, 21 Oct 2006 22:31:35 +0200 levill_r (oln/v/17_Makefile.a 1.10 600) +++ 10.267/tools/swilena/ruby/Makefile.am Sun, 22 Oct 2006 11:57:38 +0200 levill_r (oln/v/17_Makefile.a 1.11 600) @@ -8,10 +8,10 @@ rubydir = $(libdir)/ruby # ltrequire.rb: Extension of the `require' understanding Libtool libraries. -ruby_DATA = ltrequire.rb +dist_ruby_DATA = ltrequire.rb # A utility script to display images (not installed). -ruby_DATA += swilena_display.rb +dist_ruby_DATA += swilena_display.rb $(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ --- 10.266/oln.prj +++ 10.267/oln.prj @@ -1,18 +1,17 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 266) -(Parent-Version oln 10 265) -(Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> +(Project-Version oln 10 267) +(Parent-Version oln 10 266) +(Version-Log "2006-10-22 Roland Levillain <roland(a)lrde.epita.fr> - Fix the distribution. + Fix the distribution (again). - * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and - convol/slow_gaussian.hxx. + * ruby/Makefile.am: s/ruby_DATA/dist_ruby_DATA/g. ") (New-Version-Log "") -(Checkin-Time "Sat, 21 Oct 2006 22:32:07 +0200") +(Checkin-Time "Sun, 22 Oct 2006 11:57:38 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -131,7 +130,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.6 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.52 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600)) @@ -1052,7 +1051,7 @@ (tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644)) (tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744)) - (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.10 600)) + (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.11 600)) (tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644)) (tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755))

1 0

olena-0.10 10.266: Fix the distribution (Olena)
by Roland Levillain 21 Oct '06

21 Oct '06

2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and convol/slow_gaussian.hxx. --- 10.265/olena/oln/makefile.src Wed, 05 Jul 2006 18:22:20 +0200 levill_r (oln/r/4_makefile.s 1.9 600) +++ 10.266/olena/oln/makefile.src Sat, 21 Oct 2006 22:32:07 +0200 levill_r (oln/r/4_makefile.s 1.10 600) @@ -1,4 +1,4 @@ -## +## -*- makefile -*- ## List of headers in olena ## Include this file to have access to their name. ## @@ -39,6 +39,8 @@ convol/fast_gaussian_coefficient.hh \ convol/nagao.hh \ convol/nagao.hxx \ + convol/slow_gaussian.hh \ + convol/slow_gaussian.hxx \ core/abstract/binary_image.hh \ core/abstract/behavior.hh \ core/abstract/dpoint.hh \ --- 10.265/oln.prj +++ 10.266/oln.prj @@ -1,19 +1,18 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 265) -(Parent-Version oln 10 264) +(Project-Version oln 10 266) +(Parent-Version oln 10 265) (Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. - * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): - Remove. - (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. + * oln/makefile.src (OLN_DEP): Add convol/slow_gaussian.hh and + convol/slow_gaussian.hxx. ") (New-Version-Log "") -(Checkin-Time "Sat, 21 Oct 2006 22:31:35 +0200") +(Checkin-Time "Sat, 21 Oct 2006 22:32:07 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -130,7 +129,7 @@ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)) (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600)) (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) - (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.5 600)) + (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.6 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) @@ -1451,7 +1450,7 @@ (olena/tests/morpho/tests/gradient (oln/r/1_gradient 1.2 600)) (integre/ntg/makefile.src (oln/r/2_makefile.s 1.1 600)) (metalic/mlc/makefile.src (oln/r/3_makefile.s 1.1 600)) - (olena/oln/makefile.src (oln/r/4_makefile.s 1.9 600)) + (olena/oln/makefile.src (oln/r/4_makefile.s 1.10 600)) (olena/oln/convol/slow_gaussian.hh (oln/r/7_slow_gauss 1.4 600)) (olena/oln/convol/slow_gaussian.hxx (oln/r/8_slow_gauss 1.4 600))

1 0

olena-0.10 10.265: Fix the distribution (Swilena)
by Roland Levillain 21 Oct '06

21 Oct '06

2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): Remove. (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. --- 10.264/tools/swilena/ruby/Makefile.am Fri, 20 Oct 2006 19:00:57 +0200 levill_r (oln/v/17_Makefile.a 1.9 600) +++ 10.265/tools/swilena/ruby/Makefile.am Sat, 21 Oct 2006 22:31:35 +0200 levill_r (oln/v/17_Makefile.a 1.10 600) @@ -8,11 +8,10 @@ rubydir = $(libdir)/ruby # ltrequire.rb: Extension of the `require' understanding Libtool libraries. -dist_ruby_SCRIPT = ltrequire.rb +ruby_DATA = ltrequire.rb # A utility script to display images (not installed). -# FIXME: Is it still useful? -dist_noinst_ruby_SCRIPT = swilena_display.rb +ruby_DATA += swilena_display.rb $(srcdir)/makefile.swig: $(top_srcdir)/tools/swilena/expand.sh top_srcdir="$(top_srcdir)" $< $(top_srcdir)/tools/swilena/ --- 10.264/oln.prj +++ 10.265/oln.prj @@ -1,15 +1,19 @@ ;; -*- Prcs -*- (Created-By-Prcs-Version 1 3 3) (Project-Description "Olena") -(Project-Version oln 10 264) -(Parent-Version oln 10 263) -(Version-Log "2006-10-20 Roland Levillain <roland(a)lrde.epita.fr> - - * oln/lrde/ufmt/Makefile.am (noinst_HEADERS): Add attributes.hh +(Project-Version oln 10 265) +(Parent-Version oln 10 264) +(Version-Log "2006-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the distribution. + + * ruby/Makefile.am (dist_ruby_SCRIPT, dist_noinst_ruby_SCRIPT): + Remove. + (ruby_DATA): New. Add ltrequire.rb and swilena_display.rb. ") (New-Version-Log "") -(Checkin-Time "Fri, 20 Oct 2006 19:13:44 +0200") +(Checkin-Time "Sat, 21 Oct 2006 22:31:35 +0200") (Checkin-Login levill_r) ;; diff-ignore tests/data/.*pbm$ ;; diff-ignore .*\.pbm$ @@ -128,7 +132,7 @@ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600)) (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.18.1.5 600)) (tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600)) - (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.50 600)) + (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.51 600)) (olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600)) (doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600)) @@ -1049,7 +1053,7 @@ (tools/swilena/python/tests/Makefile.am (oln/v/15_Makefile.a 1.9 644)) (tools/swilena/python/tests/simple1.py (oln/v/16_simple1.py 1.6 744)) - (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.9 600)) + (tools/swilena/ruby/Makefile.am (oln/v/17_Makefile.a 1.10 600)) (tools/swilena/ruby/tests/Makefile.am (oln/v/18_Makefile.a 1.8 644)) (tools/swilena/ruby/tests/simple1.rb (oln/v/19_simple1.rb 1.6 755))

1 0