Olena-patches June 2008

olena-patches@lrde.epita.fr

9 participants
135 discussions

by Olena

#149: Revamp util::graph -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- * Get rid of superfluous dynamic allocations (w.r.t. vertices & edges handling). * Move properties attached to vertices and edges out of the graph (this should allow the merging of `util::graph` and `util::internal::graph_base`. * Allow the removal of vertices and edges. Don't forget to warn users about the invalidation of vertex and edge ids (handlers). * Stop using the term « id » (« identifier ») for vertices and edges, and prefer the term « handler » ? (The BGL call them « descriptors ».) All these changes might bring us closer to the BGL' `adjacency_list`. See how we could factor things, while not requiring a dependency on the BGL. -- Ticket URL: <https://trac.lrde.org/olena/ticket/149> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #153: Write a test using Ubigraph

by Olena

#153: Write a test using Ubigraph -----------------------------------+---------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: rendering third-party | -----------------------------------+---------------------------------------- Ubigraph is a promising graph manipulation and visualization project: * http://ubietylab.net/ubigraph/ We could write a small test exercising its display capabilities, e.g., the construction of a skeleton on a binary, graph-based image (even a 2-D image on a regular grid). Check the license(s); the client part is Free Software, but the server doesn't seem so. -- Ticket URL: <https://trac.lrde.org/olena/ticket/153> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #143: Reorganize milena/mln/core/

by Olena

#143: Reorganize milena/mln/core/ ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- (This ticket is just a proposal. We might close it even if no change occur in `milena/mln/core`.) There are many things in source:trunk/milena/mln/core/, that could be reorganized and/or split in several directories/subdirectories: * basic/classic images and entites (`mln::image2d`, etc.) * graph-based images and entities (`mln::graph_image`, etc.) * non classic images and associated tools (`mln::rle_image`, etc.) * morphers (`mln::cast_image`, etc.) * internal/core mechanisms (`initialize.hh` etc.) * general tools (`contract.hh`, `inplace.hh`, etc.) * concepts (though they are located in their own directory, `mln/core/concept/`) * implementation/factoring classes (thought most of them are in `mln/core/internal/`) * other entities, that should be moved elsewhere (`mln::h_vec`, etc.) * and so on. To my (Roland) mind, we should: 1. Identify the different kind of files present in `core/`. 2. Assign one (maybe two) kinds to each file of this directory. 3. Determine a new file layout, and perform the moves. -- Ticket URL: <https://trac.lrde.org/olena/ticket/143> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #140: Add points having floating-point coordinates

by Olena

#140: Add points having floating-point coordinates ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Name regular instances `point1df`, `point2df` and `point3df`. (N.B.: Aroune will need them so as to build the 3-d surface graph from a set of triangles.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/140> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

15 years, 7 months

[Olena] #130: Don not pass neighborhoods as argument to algorithms

by Olena

#130: Don not pass neighborhoods as argument to algorithms ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Neighborhoods shall be bound to images: they are a property of them. Hence an algorithm (at least a facade) shall not accept an image along with an ''external'' neighborhood. Most of the time, these algorithms are based on windows improperly called neighborhoods. Here is the list of files to revamp, as of revision 1663: * source:trunk/labeling/level.spe.hh * source:trunk/labeling/regional_maxima.hh * source:trunk/labeling/regional_minima.hh * source:trunk/make/voronoi.hh * source:trunk/milena/mln/geom/labeling/blobs.hh * source:trunk/milena/mln/geom/seeds2tiling_roundness.hh * source:trunk/milena/mln/labeling/background.hh * source:trunk/milena/mln/labeling/flat_zones.hh * source:trunk/milena/mln/labeling/foreground.hh * source:trunk/milena/mln/labeling/level.hh * source:trunk/morpho/Rd.hh * source:trunk/morpho/dilation.hh * source:trunk/morpho/opening_area.hh * source:trunk/morpho/opening_attribute.hh -- Ticket URL: <https://trac.lrde.org/olena/ticket/130> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

15 years, 7 months

[Olena] #142: Add iterators on graphs

by Olena

#142: Add iterators on graphs ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- We need these, at least: * iterator on vertices (forward, backward) * iterator on edges (forward, backward) * iterator on the adjacent edges of a vertex (forward, backward) * iterator on the adjacent edges of an edge (forward, backward) -- Ticket URL: <https://trac.lrde.org/olena/ticket/142> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years, 2 months

[Olena] #154: Revive Swilena in Olena 1.0

by Olena

#154: Revive Swilena in Olena 1.0 ---------------------------------------------------+------------------------ Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Swilena | Version: 1.0 Keywords: dynamic interpreter shell interactive | ---------------------------------------------------+------------------------ Start with a very small test (e.g., a single image type + some morphological filters + a (topological) watershed transform). BTW, we might want to promote [https://svn.lrde.epita.fr/svn/clspr/trunk/ clspr] (C++-Libtool-SWIG-Python-Ruby) as a reusable component (but this is just an idea; it might not be usable as-is practically). (N.B. : Some future users of Olena have requested this (fast) reintroduction of Swilena; we should work on the distribution of the project in parallel as well, to have something usable for them.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/154> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years, 4 months

Add config/ directory

by yabo

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-06-26 Maxime van Noppen <yabo(a)lrde.epita.fr> Add the config/ directory * config/Makefile.am: New. * config: New. Makefile.am | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: branches/scool-ng/config/Makefile.am =================================================================== --- branches/scool-ng/config/Makefile.am (revision 0) +++ branches/scool-ng/config/Makefile.am (revision 64) @@ -0,0 +1,15 @@ +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(STANDARD_TOOLS) + +STANDARD_TOOLS = \ + install-sh \ + missing \ + mkinstalldirs \ + depcomp + +EXTRA_DIST = \ + Makefile.xt \ + autoxt.m4 + +bootclean: -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 5 months

***SPAM*** L1 cleanup-2008 2088: Start cleaning up level::fill.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start cleaning up level::fill. * tests/level/fill_with_value.cc: New. * tests/level/Makefile.am: Update. * mln/level/fill_with_image.hh: New. * mln/level/fill.hh (generic): Remove. (fill): Use fill_with_value and fill_with_image. * mln/level/fill.spe.hh: Deactivate obsolete contents. * mln/level/fill_with_value.hh: New. mln/level/fill.hh | 70 +++---------- mln/level/fill.spe.hh | 33 ------ mln/level/fill_with_image.hh | 128 ++++++++++++++++++++++++ mln/level/fill_with_value.hh | 211 +++++++++++++++++++++++++++++++++++++++++ tests/level/Makefile.am | 2 tests/level/fill_with_value.cc | 48 +++++++++ 6 files changed, 406 insertions(+), 86 deletions(-) Index: tests/level/fill_with_value.cc --- tests/level/fill_with_value.cc (revision 0) +++ tests/level/fill_with_value.cc (revision 0) @@ -0,0 +1,48 @@ +// Copyright (C) 2007, 2008 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. + +/*! \file tests/level/fill_with_value.cc + * + * \brief Tests on mln::level::fill_with_value + */ + +#include <mln/core/image2d.hh> +#include <mln/level/fill_with_value.hh> + + +int main() +{ + using namespace mln; + + const unsigned size = 100; + + image2d<unsigned char> ima(size, size); + level::fill_with_value(ima, 51); + box2d::piter p(ima.domain()); + for_all(p) + mln_assertion(ima(p) == 51); +} Index: tests/level/Makefile.am --- tests/level/Makefile.am (revision 2087) +++ tests/level/Makefile.am (working copy) @@ -12,6 +12,7 @@ compare \ compute \ fill \ + fill_with_value \ median \ median_dir \ median_fast \ @@ -34,6 +35,7 @@ compare_SOURCES = compare.cc compute_SOURCES = compute.cc fill_SOURCES = fill.cc +fill_with_value_SOURCES = fill_with_value.cc median_SOURCES = median.cc median_dir_SOURCES = median_dir.cc median_fast_SOURCES = median_fast.cc Index: mln/level/fill_with_image.hh --- mln/level/fill_with_image.hh (revision 0) +++ mln/level/fill_with_image.hh (revision 0) @@ -0,0 +1,128 @@ +// Copyright (C) 2008 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 MLN_LEVEL_FILL_WITH_IMAGE_HH +# define MLN_LEVEL_FILL_WITH_IMAGE_HH + +/*! \file mln/level/fill_with_image.hh + * + * \brief Fill an image with the values from another image. + * + * \todo Specialize with line_piter... + */ + +# include <mln/core/concept/image.hh> +# include <mln/core/inplace.hh> + + +namespace mln +{ + + namespace level + { + + /*! Fill the image \p ima with the values of the image \p data. + * + * \param[in,out] ima The image to be filled. + * \param[in] data The image. + * + * \warning The definition domain of \p ima has to be included in + * the one of \p data. + * + * \pre \p ima.domain <= \p data.domain. + */ + template <typename I, typename J> + void fill_with_image(Image& ima, const Image<J>& data); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename J> + inline + void fill_with_image(I& ima, const J& data) + { + trace::entering("level::impl::generic::fill_with_image"); + + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = data(p); + + trace::exiting("level::impl::generic::fill_with_image"); + } + + } // end if namespace mln::level::impl::generic + + + // Selector. + + template <typename I, typename J> + inline + void fill_with_image_(I& ima, const J& data) + { + generic::fill_with_image(ima, data); + } + + } // end of namespace mln::level::impl + + + + /// Facade. + + template <typename I, typename J> + inline + void fill_with_image(Image& ima_, const Image<J>& data_) + { + trace::entering("level::fill_with_image"); + + mlc_is(mln_trait_image_value_io(I), + mln::trait::image::value_io::read_write)::check(); + mlc_converts_to(mln_value(J), mln_value(I))::check(); + + I& ima = exact(ima_); + const J& data = exact(data_); + mln_precondition(ima.domain() <= data.domain()); + + impl::fill_with_image_(ima, data); + + trace::exiting("level::fill_with_image"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_FILL_WITH_IMAGE_HH Index: mln/level/fill.hh --- mln/level/fill.hh (revision 2087) +++ mln/level/fill.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -35,16 +35,14 @@ * \todo Re-organize this file contents + Overload for fastest images. */ -# include <cstring> - -# include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/core/inplace.hh> -# include <mln/level/memset_.hh> +# include <mln/level/fill_with_value.hh> +# include <mln/level/fill_with_image.hh> // Specializations are in: -# include <mln/level/fill.spe.hh> +// # include <mln/level/fill.spe.hh> + namespace mln { @@ -55,7 +53,7 @@ /*! Fill the whole image \p ima with the single value \p v. * * \param[in,out] ima The image to be filled. - * \param[in] v The value to assign to all pixels. + * \param[in] v The value to assign to all sites. * * \pre \p ima has to be initialized. * @@ -132,44 +130,27 @@ # ifndef MLN_INCLUDE_ONLY - namespace impl - { - namespace generic - { + // With: value + template <typename I> inline - void fill_with_value(I& ima, const mln_value(I)& value) + void fill(Image& ima, const mln_value(I)& value) { - trace::entering("level::impl::generic::fill_with_value"); - - mln_piter(I) p(ima.domain()); - for_all(p) - ima(p) = value; - - trace::exiting("level::impl::generic::fill_with_value"); + trace::entering("level::fill"); + fill_with_value(ima, value); + trace::exiting("level::fill"); } - } // end if namespace mln::level::impl::generic - - } // end of namespace mln::level::impl - + // with: Image<J> - // with: value - - template <typename I> + template <typename I, typename J> inline - void fill(Image& ima, const mln_value(I)& value) + void fill(Image& ima, const Image<J>& data) { trace::entering("level::fill"); - - mlc_is(mln_trait_image_value_io(I), - trait::image::value_io::read_write)::check(); // FIXME: Only the upcoming general facade!!! - mln_precondition(exact(ima).has_data()); - impl::fill_with_value(mln_trait_image_speed(I)(), exact(ima), - value); - + fill_with_image(ima, data); trace::exiting("level::fill"); } @@ -233,25 +214,6 @@ } - // with: Image<J> - - template <typename I, typename J> - inline - void fill(Image& ima_, const Image<J>& data_) - { - trace::entering("level::fill"); - - I& ima = exact(ima_); - const J& data = exact(data_); - mln_precondition(ima.domain() <= data.domain()); - - mln_piter(I) p(ima.domain()); - for_all(p) - ima(p) = data(p); - - trace::exiting("level::fill"); - } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::level Index: mln/level/fill.spe.hh --- mln/level/fill.spe.hh (revision 2087) +++ mln/level/fill.spe.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -43,7 +43,6 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> # include <mln/core/inplace.hh> -# include <mln/level/memset_.hh> # ifndef MLN_INCLUDE_ONLY @@ -57,36 +56,6 @@ namespace impl { - namespace generic - { - template <typename I> - void fill_with_value(I& ima, const mln_value(I)& value); - } - - - // Disjunction. - - - template <typename I> - inline - void fill_with_value(trait::image::speed::any, I& ima, - const mln_value(I)& value) - { - generic::fill_with_value(ima, value); - } - - template <typename I> - inline - void fill_with_value(trait::image::speed::fastest, I& ima, - const mln_value(I)& value) - { - trace::entering("level::impl::fill_with_value"); - - level::memset_(ima, ima.point_at_offset(0), value, ima.ncells()); - - trace::exiting("level::impl::fill_with_value"); - } - } // end of namespace mln::level::impl Index: mln/level/fill_with_value.hh --- mln/level/fill_with_value.hh (revision 0) +++ mln/level/fill_with_value.hh (revision 0) @@ -0,0 +1,211 @@ +// Copyright (C) 2008 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 MLN_LEVEL_FILL_WITH_VALUE_HH +# define MLN_LEVEL_FILL_WITH_VALUE_HH + +/*! \file mln/level/fill_with_value.hh + * + * \brief Fill an image with a value, that is, set all pixel values to + * the given value. + * + * \todo Overload for fastest images. + * \todo Handle all value_storage properties (piecewise, etc.) + * \todo Make memset_ work and use it when appropriate. + * \todo Move specializations in a extra file. + * \toto Activate fill_with_value_cell_wise. + */ + +# include <mln/core/concept/image.hh> +# include <mln/core/inplace.hh> + + +namespace mln +{ + + namespace level + { + + /*! Fill the whole image \p ima with the single value \p v. + * + * \param[in,out] ima The image to be filled. + * \param[in] val The value to assign to all sites. + * + * \pre \p ima has to be initialized. + * + * \todo Optimize when \p ima is large and sizeof(mln_value(I)) > 1. + */ + template <typename I, typename V> + void fill_with_value(Image& ima, const V& val); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename I> + inline + void fill_with_value_site_wise_any(I& ima, const mln_value(I)& val) + { + trace::entering("level::impl::fill_with_value_site_wise_any"); + + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = val; + + trace::exiting("level::impl::fill_with_value_site_wise_any"); + } + + + template <typename I, typename V> + inline + void fill_with_value_site_wise_one_block(I& ima, const V& val) + { + trace::entering("level::impl::fill_with_value_site_wise_one_block"); + + // level::memset_(ima, ima.point_at_index(0), v, ima.nelements()); + const unsigned n = ima.nelements(); + mln_value(I)* ptr = ima.buffer(); + for (unsigned i = 0; i < n; ++i) + *ptr++ = val; + + trace::exiting("level::impl::fill_with_value_site_wise_one_block"); + } + + + template <typename I, typename V> + inline + void fill_with_value_cell_wise(I& ima, const V& val) + { + trace::entering("level::impl::fill_with_value_cell_wise"); + + abort(); +// mln_viter(I) v(ima.values()); +// for_all(v) +// v.change_to(val); + + trace::exiting("level::impl::fill_with_value_cell_wise"); + } + + + namespace dispatch + { + + // Cases for "value_browsing == site_wise_only" w.r.t. value_storage. + + template <typename I, typename V> + inline + void fill_with_value_site_wise_(mln::trait::image::value_storage::any, + I& ima, const V& val) + { + fill_with_value_site_wise_any(ima, val); + } + + template <typename I, typename V> + inline + void fill_with_value_site_wise_(mln::trait::image::value_storage::one_block, + I& ima, const V& val) + { + fill_with_value_site_wise_one_block(ima, val); + } + + // Case site_wise -> selector w.r.t. value_storage. + + template <typename I, typename V> + inline + void fill_with_value_site_wise(I& ima, const V& val) + { + fill_with_value_site_wise_(mln_trait_image_value_storage(I)(), + ima, val); + } + + + // Cases w.r.t. value_browsing. + + template <typename I, typename V> + inline + void fill_with_value_(mln::trait::image::value_browsing::site_wise_only, + I& ima, const V& val) + { + fill_with_value_site_wise(ima, val); + } + + template <typename I, typename V> + inline + void fill_with_value_(mln::trait::image::value_browsing::cell_wise, + I& ima, const V& val) + { + fill_with_value_cell_wise(ima, val); + } + + // Selector w.r.t. value_browsing. + + template <typename I, typename V> + inline + void fill_with_value_(I& ima, const V& val) + { + fill_with_value_(mln_trait_image_value_browsing(I)(), + ima, val); + } + + } // end of namespace mln::level::impl::dispatch + + } // end of namespace mln::level::impl + + + + /// Facade. + + template <typename I, typename V> + inline + void fill_with_value(Image& ima, const V& val) + { + trace::entering("level::fill"); + + mlc_is(mln_trait_image_value_io(I), + mln::trait::image::value_io::read_write)::check(); + mlc_converts_to(V, mln_value(I))::check(); + + mln_precondition(exact(ima).has_data()); + + impl::dispatch::fill_with_value_(exact(ima), exact(val)); + + trace::exiting("level::fill"); + } + + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_FILL_WITH_VALUE_HH

16 years, 6 months

***SPAM*** L3 cleanup-2008 2087: Rename the methods of fastest images.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename the methods of fastest images. * mln/core/internal/check/image_fastest.hh (offset_at, offset, point_at_offset: Rename as... (index_of_point, delta_index, point_at_index): ...these. (operator[], ncells): Rename as... (element, nelements): ...these. (size_t): Replace by... (unsigned): ...this to handle indices. * mln/core/image2d.hh: Likewise. (super_): New. (nrows, ncols): New. Layout. * mln/level/paste.spe.hh: Update with new properties. * mln/level/paste.hh: Likewise. * mln/border/get.hh: Likewise. * mln/border/resize.hh: Revamp. * tests/core/image2d.cc: Update. Make tests silent. mln/border/get.hh | 9 + mln/border/resize.hh | 78 +++++++++++++--- mln/core/image2d.hh | 151 ++++++++++++++++++++----------- mln/core/internal/check/image_fastest.hh | 24 ++-- mln/level/paste.hh | 6 - mln/level/paste.spe.hh | 12 +- tests/core/image2d.cc | 18 ++- 7 files changed, 202 insertions(+), 96 deletions(-) Index: tests/core/image2d.cc --- tests/core/image2d.cc (revision 2086) +++ tests/core/image2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -45,18 +45,22 @@ const unsigned nrows = 1; const unsigned ncols = 66; const unsigned border = 4; + const unsigned new_border = 3; image2d<int> f(nrows, ncols, border); + mln_assertion(f.nrows() == nrows); + mln_assertion(f.ncols() == ncols); + { - std::cout << f.id_() << std::endl; + const void* f_id = f.id_(); image2d<int> g; - std::cout << g.id_() << std::endl; + mln_assertion(g.id_() == 0); g = f; - // border::resize (g, 2); - std::cout << g.id_() << std::endl; + border::resize(g, new_border); + mln_assertion(g.id_() == f_id); } - mln_assertion(f.npoints() == geom::nrows(f) * geom::ncols(f)); - mln_assertion(f.ncells() == (nrows + 2 * border) * (ncols + 2 * border)); + mln_assertion(f.nsites() == geom::nrows(f) * geom::ncols(f)); + mln_assertion(f.nelements() == (nrows + 2 * new_border) * (ncols + 2 * new_border)); } Index: mln/core/internal/check/image_fastest.hh --- mln/core/internal/check/image_fastest.hh (revision 2086) +++ mln/core/internal/check/image_fastest.hh (working copy) @@ -64,8 +64,8 @@ * \post p == point_at_offset(result) */ template <typename P> - std::size_t - offset_at(const P& p) const; + unsigned + index_of_point(const P& p) const; protected: image_fastest_(); @@ -93,9 +93,9 @@ typedef mln_fwd_pixter(E) fwd_pixter; typedef mln_bkd_pixter(E) bkd_pixter; - int (E::*m1)(const dpsite&) const = & E::offset; + int (E::*m1)(const dpsite&) const = & E::delta_index; m1 = 0; - site (E::*m2)(unsigned) const = & E::point_at_offset; + site (E::*m2)(unsigned) const = & E::point_at_index; m2 = 0; unsigned (E::*m3)() const = & E::border; m3 = 0; @@ -110,12 +110,12 @@ typedef mln_rvalue(E) rvalue; typedef mln_lvalue(E) lvalue; - rvalue (E::*m6)(unsigned) const = & E::operator[]; + rvalue (E::*m6)(unsigned) const = & E::element; m6 = 0; - lvalue (E::*m7)(unsigned) = & E::operator[]; + lvalue (E::*m7)(unsigned) = & E::element; m7 = 0; - std::size_t (E::*m8)() const = & E::ncells; + unsigned (E::*m8)() const = & E::nelements; m8 = 0; // FIXME: how to check that qixter are defined when W is unknown! @@ -124,16 +124,16 @@ template <typename E, typename B> template <typename P> inline - std::size_t - image_fastest_<E,B>::offset_at(const P& p) const + unsigned + image_fastest_<E,B>::index_of_point(const P& p) const { const E* this_ = & internal::force_exact<E>(*this); mln_precondition(this_->has_data()); mln_precondition(this_->has(p)); - unsigned o = & this_->operator()(p) - this_->buffer(); - mln_postcondition(p == this_->point_at_offset(o)); - return o; + unsigned i = & this_->operator()(p) - this_->buffer(); + mln_postcondition(p == this_->point_at_index(i)); + return i; } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 2086) +++ mln/core/image2d.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -120,8 +121,11 @@ * thickness around data. */ template <typename T> - struct image2d : public internal::image_primary< box2d, image2d<T> > + class image2d : public internal::image_primary< box2d, image2d<T> > { + typedef internal::image_primary< box2d, image2d<T> > super_; + public: + /// Coordinate associated type. typedef int coord; @@ -171,23 +175,15 @@ /// Give the bounding box domain. const box2d& bbox() const; - /// Give the border thickness. - unsigned border() const; - - /// Give the number of cells (points including border ones). - std::size_t ncells() const; - /// Read-only access to the image value located at point \p p. const T& operator()(const point2d& p) const; /// Read-write access to the image value located at point \p p. T& operator()(const point2d& p); - /// Read-only access to the image value located at offset \p o. - const T& operator[](unsigned o) const; - /// Read-write access to the image value located at offset \p o. - T& operator[](unsigned o); + // Specific methods: + // ----------------- /// Read-only access to the image value located at (\p row, \p col). const T& at(int row, int col) const; @@ -195,14 +191,36 @@ /// Read-write access to the image value located at (\p row, \p col). T& at(int row, int col); + /// Give the number of rows. + unsigned nrows() const; + + /// Give the number of columns. + unsigned ncols() const; + + + // As a fastest image: + // ------------------- + + // Give the index of a point. + using super_::index_of_point; + + /// Give the border thickness. + unsigned border() const; + + /// Give the number of elements (points including border ones). + unsigned nelements() const; - /// Fast Image method + /// Read-only access to the image value located at index \p i. + const T& element(unsigned i) const; - /// Give the offset corresponding to the delta-point \p dp. - int offset(const dpoint2d& dp) const; + /// Read-write access to the image value located at index \p i. + T& element(unsigned i); - /// Give the point corresponding to the offset \p o. - point2d point_at_offset(unsigned o) const; + /// Give the delta-index corresponding to the delta-point \p dp. + int delta_index(const dpoint2d& dp) const; + + /// Give the point corresponding to the index \p i. + point2d point_at_index(unsigned i) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -403,24 +421,6 @@ template <typename T> inline - unsigned - image2d<T>::border() const - { - mln_precondition(this->has_data()); - return this->data_->bdr_; - } - - template <typename T> - inline - std::size_t - image2d<T>::ncells() const - { - mln_precondition(this->has_data()); - return this->data_->vb_.nsites(); - } - - template <typename T> - inline bool image2d<T>::has(const point2d& p) const { @@ -446,40 +446,82 @@ return this->data_->array_[p.row()][p.col()]; } + + // Specific methods: + template <typename T> inline const T& - image2d<T>::operator[](unsigned o) const + image2d<T>::at(int row, int col) const { - mln_precondition(o < ncells()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point2d(row, col))); + return this->data_->array_[row][col]; } template <typename T> inline T& - image2d<T>::operator[](unsigned o) + image2d<T>::at(int row, int col) { - mln_precondition(o < ncells()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point2d(row, col))); + return this->data_->array_[row][col]; + } + + template <typename T> + inline + unsigned + image2d<T>::nrows() const + { + mln_precondition(this->has_data()); + return this->data_->b_.len(0); + } + + template <typename T> + inline + unsigned + image2d<T>::ncols() const + { + mln_precondition(this->has_data()); + return this->data_->b_.len(1); + } + + + // As a fastest image: + + template <typename T> + inline + unsigned + image2d<T>::border() const + { + mln_precondition(this->has_data()); + return this->data_->bdr_; + } + + template <typename T> + inline + unsigned + image2d<T>::nelements() const + { + mln_precondition(this->has_data()); + return this->data_->vb_.nsites(); } template <typename T> inline const T& - image2d<T>::at(int row, int col) const + image2d<T>::element(unsigned i) const { - mln_precondition(this->has(make::point2d(row, col))); - return this->data_->array_[row][col]; + mln_precondition(i < nelements()); + return *(this->data_->buffer_ + i); } template <typename T> inline T& - image2d<T>::at(int row, int col) + image2d<T>::element(unsigned i) { - mln_precondition(this->has(make::point2d(row, col))); - return this->data_->array_[row][col]; + mln_precondition(i < nelements()); + return *(this->data_->buffer_ + i); } template <typename T> @@ -503,7 +545,7 @@ template <typename T> inline int - image2d<T>::offset(const dpoint2d& dp) const + image2d<T>::delta_index(const dpoint2d& dp) const { mln_precondition(this->has_data()); int o = dp[0] * this->data_->vb_.len(1) + dp[1]; @@ -513,20 +555,23 @@ template <typename T> inline point2d - image2d<T>::point_at_offset(unsigned o) const + image2d<T>::point_at_index(unsigned i) const { - mln_precondition(o < ncells()); - point2d p = make::point2d(o / this->data_->vb_.len(1) + this->data_->vb_.min_row(), - o % this->data_->vb_.len(1) + this->data_->vb_.min_col()); - mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); + mln_precondition(i < nelements()); + point2d p = make::point2d(i / this->data_->vb_.len(1) + this->data_->vb_.min_row(), + i % this->data_->vb_.len(1) + this->data_->vb_.min_col()); + mln_postcondition(& this->operator()(p) == this->data_->buffer_ + i); return p; } + // Extra. + template <typename T> inline void image2d<T>::resize_(unsigned new_border) { + mln_precondition(this->has_data()); this->data_->reallocate_(new_border); } Index: mln/level/paste.spe.hh --- mln/level/paste.spe.hh (revision 2086) +++ mln/level/paste.spe.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -31,6 +31,8 @@ /*! \file mln/level/paste.spe.hh * * \brief Specializations for mln::level::paste. + * + * \todo Rewrite the dispatch!!! */ # ifndef MLN_LEVEL_PASTE_HH @@ -84,16 +86,16 @@ template <typename I, typename J> inline - void paste_(trait::image::data::any, const I& data, - trait::image::data::any, J& destination) + void paste_(trait::image::value_storage::any, const I& data, + trait::image::value_storage::any, J& destination) { generic::paste_(data, destination); } template <typename I, typename J> inline - void paste_(trait::image::data::raw, const I& data, - trait::image::data::raw, J& destination) + void paste_(trait::image::value_storage::one_block, const I& data, + trait::image::value_storage::one_block, J& destination) { if (sizeof(mln_value(I)) == sizeof(mln_value(J))) paste_lines_(data, destination); Index: mln/level/paste.hh --- mln/level/paste.hh (revision 2086) +++ mln/level/paste.hh (working copy) @@ -108,12 +108,12 @@ const I& data = exact(data_); J& destination = exact(destination_); - mlc_is(mln_trait_image_io(J), trait::image::io::write)::check(); + mlc_is(mln_trait_image_value_io(J), trait::image::value_io::read_write)::check(); mlc_converts_to(mln_value(I), mln_value(J))::check(); mln_precondition(data.domain() <= destination.domain()); - impl::paste_(mln_trait_image_data(I)(), data, - mln_trait_image_data(J)(), destination); + impl::paste_(mln_trait_image_value_storage(I)(), data, + mln_trait_image_value_storage(J)(), destination); trace::exiting("level::paste"); } Index: mln/border/resize.hh --- mln/border/resize.hh (revision 2086) +++ mln/border/resize.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -32,13 +32,15 @@ * * \brief Define a function that resizes the virtual border of an * image. + * + * \todo Use level::fill!!! */ # include <mln/core/concept/image.hh> # include <mln/core/clone.hh> -# include <mln/level/fill.hh> -# include <mln/metal/is.hh> # include <mln/border/get.hh> +// # include <mln/level/fill.hh> +// # include <mln/level/paste.hh> namespace mln @@ -68,12 +70,14 @@ namespace impl { + // Effective resizing. + template <typename I> inline void resize_(trait::image::category::morpher, - const I& ima_, unsigned thickness) + const I& ima, unsigned thickness) { - return resize(*ima_.delegatee_(), thickness); + return resize(*ima.delegatee_(), thickness); } template <typename I> @@ -85,7 +89,62 @@ mln_concrete(I) memo = clone(ima); ima.resize_(thickness); - level::fill(ima, memo); + // level::fill(ima, memo); + // level::paste(memo, ima); + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = memo(p); + } + +// ext_domain: /any/ +// | +// + -- none +// | +// + -- /some/ +// | +// + -- fixed +// | | +// | + -- infinite +// | +// + -- extendable + + template <typename I> + inline + void resize_(trait::image::ext_domain::none, + const I& ima, unsigned thickness) + { + // No-op. + } + + template <typename I> + inline + void resize_(trait::image::ext_domain::fixed, + const I& ima, unsigned thickness) + { + // No-op. + } + + template <typename I> + inline + void resize_(trait::image::ext_domain::extendable, + const I& ima, unsigned thickness) + { + if (border::get(ima) == thickness) + return; // No-op. + resize_(mln_trait_image_category(I)(), + ima, thickness); + mln_postcondition(border::get(ima) == thickness); + } + + + // Selector. + + template <typename I> + inline + void resize_(const I& ima, unsigned thickness) + { + resize_(mln_trait_image_ext_domain(I)(), + ima, thickness); } } // end of namespace mln::border::resize @@ -99,15 +158,10 @@ { trace::entering("border::resize"); - mlc_is(mln_trait_image_border(I), trait::image::border::some)::check(); const I& ima = exact(ima_); mln_precondition(ima.has_data()); - if (border::get(ima) == thickness) - return; // No-op. - // Otherwise: do-it. - impl::resize_(mln_trait_image_category(I)(), - ima, thickness); + impl::resize_(ima, thickness); mln_postcondition(border::get(ima) == thickness); Index: mln/border/get.hh --- mln/border/get.hh (revision 2086) +++ mln/border/get.hh (working copy) @@ -60,7 +60,7 @@ template <typename I> inline - unsigned get_(trait::image::border::some, trait::image::category::primary, + unsigned get_(trait::image::ext_domain::some, trait::image::category::primary, const I& ima) { return ima.border(); @@ -68,7 +68,7 @@ template <typename I> inline - unsigned get_(trait::image::border::some, trait::image::category::morpher, + unsigned get_(trait::image::ext_domain::some, trait::image::category::morpher, const I& ima) { return border::get( *ima.delegatee_() ); @@ -77,7 +77,7 @@ template <typename I> inline - unsigned get_(trait::image::border::none, trait::image::category::any, + unsigned get_(trait::image::ext_domain::none, trait::image::category::any, const I&) { return 0; @@ -95,7 +95,8 @@ trace::entering("border::get"); mln_precondition(exact(ima).has_data()); - unsigned res = border::impl::get_(mln_trait_image_border(I)(), mln_trait_image_category(I)(), + unsigned res = border::impl::get_(mln_trait_image_ext_domain(I)(), + mln_trait_image_category(I)(), exact(ima)); trace::exiting("border::get");

16 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2008