December 2007 - Olena-patches

[Olena] #122: [TRAITS] image_if_base
by Olena 28 May '09

28 May '09

#122: [TRAITS] image_if_base ---------------------+------------------------------------------------------ Reporter: duhamel | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ In source:trunk/milena/mln/core/internal/image_if_base.hh data trait is suspect. For example an image_if from an image1d has always data trait raw ! -- Ticket URL: <https://trac.lrde.org/olena/ticket/122> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 1

1626: Move mathematical morphology-related tests into tests/morpho.
by Roland Levillain 22 Dec '07

22 Dec '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Move mathematical morphology-related tests into tests/morpho. * tests/Makefile.am (SUBDIRS): Add morpho. (morpho_contrast, morpho_dilation, morpho_dilation_max_h) (morpho_erosion, morpho_erosion_min_h, morpho_gradient) (morpho_hit_or_miss, morpho_laplacian, morpho_opening_area) (morpho_thinning): Remove. (morpho_contrast_SOURCES, morpho_dilation_SOURCES) (morpho_dilation_max_h_SOURCES, morpho_erosion_SOURCES) (morpho_erosion_min_h_SOURCES, morpho_gradient_SOURCES) (morpho_hit_or_miss_SOURCES, morpho_laplacian_SOURCES) (morpho_opening_area_SOURCES, morpho_thinning_SOURCES): Remove. * tests/morpho/Makefile.am (check_PROGRAMS): New. (contrast_SOURCES, dilation_SOURCES, dilation_max_h_SOURCES) (erosion_SOURCES, erosion_min_h_SOURCES, gradient_SOURCES) (hit_or_miss_SOURCES, laplacian_SOURCES, opening_area_SOURCES) (thinning_SOURCES): New. (TESTS): New. * tests/morpho/contrast.cc, * tests/morpho/dilation.cc, * tests/morpho/dilation_max_h.cc, * tests/morpho/erosion.cc, * tests/morpho/erosion_min_h.cc, * tests/morpho/gradient.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/laplacian.cc, * tests/morpho/opening_area.cc, * tests/morpho/thinning.cc: Rename and move as... * tests/morpho_contrast.cc, * tests/morpho_dilation.cc, * tests/morpho_dilation_max_h.cc, * tests/morpho_erosion.cc, * tests/morpho_erosion_min_h.cc, * tests/morpho_gradient.cc, * tests/morpho_hit_or_miss.cc, * tests/morpho_laplacian.cc, * tests/morpho_opening_area.cc, * tests/morpho_thinning.cc: ...these. Makefile.am | 21 +-------------------- core/Makefile.am | 2 -- morpho/Makefile.am | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 22 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 1625) +++ tests/Makefile.am (working copy) @@ -17,6 +17,7 @@ labeling \ level \ logical \ + morpho \ norm \ set \ util \ @@ -87,16 +88,6 @@ metal_pow \ metal_unconst \ metal_vec \ - morpho_contrast \ - morpho_dilation \ - morpho_dilation_max_h \ - morpho_erosion \ - morpho_erosion_min_h \ - morpho_gradient \ - morpho_hit_or_miss \ - morpho_laplacian \ - morpho_opening_area \ - morpho_thinning \ \ pixel \ pixter1d \ @@ -200,16 +191,6 @@ metal_pow_SOURCES = metal_pow.cc metal_unconst_SOURCES = metal_unconst.cc metal_vec_SOURCES = metal_vec.cc -morpho_contrast_SOURCES = morpho_contrast.cc -morpho_dilation_SOURCES = morpho_dilation.cc -morpho_dilation_max_h_SOURCES = morpho_dilation_max_h.cc -morpho_erosion_SOURCES = morpho_erosion.cc -morpho_erosion_min_h_SOURCES = morpho_erosion_min_h.cc -morpho_gradient_SOURCES = morpho_gradient.cc -morpho_hit_or_miss_SOURCES = morpho_hit_or_miss.cc -morpho_laplacian_SOURCES = morpho_laplacian.cc -morpho_opening_area_SOURCES = morpho_opening_area.cc -morpho_thinning_SOURCES = morpho_thinning.cc pixel_SOURCES = pixel.cc pixter1d_SOURCES = pixter1d.cc Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 1625) +++ tests/core/Makefile.am (working copy) @@ -41,6 +41,4 @@ p_queue_SOURCES = p_priority_queue_fast.cc p_queue_fast_SOURCES = p_priority_queue_fast.cc - - TESTS = $(check_PROGRAMS) Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 1625) +++ tests/morpho/Makefile.am (working copy) @@ -1,3 +1,28 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + contrast \ + dilation \ + dilation_max_h \ + erosion \ + erosion_min_h \ + gradient \ + hit_or_miss \ + laplacian \ + opening_area \ + thinning + +contrast_SOURCES = contrast.cc +dilation_SOURCES = dilation.cc +dilation_max_h_SOURCES = dilation_max_h.cc +erosion_SOURCES = erosion.cc +erosion_min_h_SOURCES = erosion_min_h.cc +gradient_SOURCES = gradient.cc +hit_or_miss_SOURCES = hit_or_miss.cc +laplacian_SOURCES = laplacian.cc +opening_area_SOURCES = opening_area.cc +thinning_SOURCES = thinning.cc + +TESTS = $(check_PROGRAMS)

1 0

1625: Fix mln::mesh_image.
by Roland Levillain 22 Dec '07

22 Dec '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix mln::mesh_image. * mln/core/mesh_image.hh (internal::data_< mesh_image<P, V> >::mesh_): Turn this attribute into a reference to mesh_p. (init_(tag::image_t, mesh_image<P, V>&, const mesh_image<P, V>&)): New specialization for mesh_image. (mesh_image<P, V>::init_): New method. Use it... (mesh_image<P, V>::mesh_image): ...in this ctor. * mln/core/mesh_p_piter.hh (mesh_p_piter_::to_point) (mesh_p_piter_::to_psite): Don't check the validity of the iterator, as it is incompatible with the current convention on the use of window/neighborhood iterators. * mln/core/mesh_p.hh: Add a FIXME. * mln/draw/mesh.hh (draw::mesh(Image&, const mesh_image<P, V>&, mln_value(I))): Add a third argument to choose the value used to print edges. * tests/core/mesh_image.cc: Adjust. Perform dilation and erosion on graph-based images (i.e., mesh_image objects). mln/core/mesh_image.hh | 59 ++++++++++++++++++++++++++++++++++++++++++++--- mln/core/mesh_p.hh | 3 ++ mln/core/mesh_p_piter.hh | 20 +++++++++++++++ mln/draw/mesh.hh | 18 +++++++++++--- tests/core/mesh_image.cc | 52 +++++++++++++++++++++++++++++++++++------ 5 files changed, 137 insertions(+), 15 deletions(-) Index: mln/core/mesh_image.hh --- mln/core/mesh_image.hh (revision 1624) +++ mln/core/mesh_image.hh (working copy) @@ -58,7 +58,7 @@ data_(mesh_p& mesh, std::vector<V>& val); std::vector<V> val_; - mesh_p mesh_; + mesh_p& mesh_; }; } // end of namespace mln::internal @@ -117,6 +117,9 @@ mesh_image(mesh_p& mesh, std::vector<V>& val); mesh_image(); + /// Initialize an empty image. + void init_(mesh_p& mesh, std::vector<V>& val); + /// Read-only access of pixel value at point site \p p. const V& operator()(const mesh_psite& p) const; @@ -126,6 +129,7 @@ /// Give the set of values of the image. const vset& values() const; + // FIXME: Keep this name? const std::vector<V>& data_values () const; const mesh_p& domain() const; @@ -137,11 +141,39 @@ const P& access_location_link_node2 (const unsigned& i) const; }; - + // Fwd decl. + template <typename P, typename V> + void init_(tag::image_t, + mesh_image<P, V>& target, const mesh_image<P, V>& model); # ifndef MLN_INCLUDE_ONLY + /*-----------------. + | Initialization. | + `-----------------*/ + + template <typename P, typename V> + inline + void init_(tag::image_t, + mesh_image<P, V>& target, const mesh_image<P, V>& model) + { + /* FIXME: Unfortunately, we cannot simply use + + target.init_(model.domain(), model.data_values ()); + + here, since domain() and data_values() return const data, and + init_ expects non mutable data. These constness problems exist + also in mesh_psite (see uses of const_cast<>). Hence the + inelegant use of const_cast<>'s. */ + target.init_(const_cast<mesh_p&> (model.domain()), + const_cast<std::vector<V>&> (model.data_values ())); + } + + /*-------. + | Data. | + `-------*/ + namespace internal { template <typename P, typename V> @@ -154,11 +186,15 @@ } // end of namespace mln::internal + /*---------------. + | Construction. | + `---------------*/ + template <typename P, typename V> inline mesh_image<P, V>::mesh_image(mesh_p& mesh, std::vector<V>& val) { - this->data_ = new internal::data_< mesh_image<P, V> > (mesh, val); + init_(mesh, val); } template <typename P, typename V> @@ -169,6 +205,23 @@ template <typename P, typename V> inline + void + mesh_image<P, V>::init_(mesh_p& mesh, std::vector<V>& val) + { + /* FIXME: We leak memory here: calling init_ twice loses the + previous content pointed by data_. + + We should definitely write down formal guidelines on + initializaion and memory management in general! */ + this->data_ = new internal::data_< mesh_image<P, V> > (mesh, val); + } + + /*---------------. + | Manipulation. | + `---------------*/ + + template <typename P, typename V> + inline const V& mesh_image<P, V>::operator()(const mesh_psite& p) const { Index: mln/core/mesh_p_piter.hh --- mln/core/mesh_p_piter.hh (revision 1624) +++ mln/core/mesh_p_piter.hh (working copy) @@ -174,7 +174,17 @@ const P& mesh_p_piter_::to_point() const { + /* We don't check whether the iterator is valid before returning + the value using + mln_precondition(is_valid()); + + since this method may be called *before* the iterator is + actually initialized. This is the case for instance when this + point iterator (say, P) is used to initialize another iterator + on window or neighborhood (say, Q); most of the time, for_all() + is responsible for the initialization of P, but it takes place + *after* the creation of Q. */ return p_; } @@ -183,7 +193,17 @@ const mesh_psite& mesh_p_piter_::to_psite() const { + /* We don't check whether the iterator is valid before returning + the value using + mln_precondition(is_valid()); + + since this method may be called *before* the iterator is + actually initialized. This is the case for instance when this + point iterator (say, P) is used to initialize another iterator + on window or neighborhood (say, Q); most of the time, for_all() + is responsible for the initialization of P, but it takes place + *after* the creation of Q. */ return psite_; } Index: mln/core/mesh_p.hh --- mln/core/mesh_p.hh (revision 1624) +++ mln/core/mesh_p.hh (working copy) @@ -75,6 +75,9 @@ graph gr_; std::vector loc_; // FIXME: (Roland) Is it really useful/needed? + /* 2007-12-19: It seems so, since mesh_image must implement a method + named bbox(). Now the question is: should each image type have a + bounding box? */ box_ bb_; }; Index: mln/draw/mesh.hh --- mln/draw/mesh.hh (revision 1624) +++ mln/draw/mesh.hh (working copy) @@ -45,6 +45,10 @@ namespace draw { + /* FIXME: `draw::mesh' is not a good name. These functions do not + actually draw the mesh/mesh_image; it *converts* it to a + printable image. These functions should be put elsewhere + (e.g., in debug::). */ /*! Draw an image \p ima from a mesh_p \p m, with value \p node_v * for nodes, value \p link_v for links and 0 for the background. @@ -67,15 +71,20 @@ * \param[in,out] ima The image to be drawn. * \param[in] mesh The mesh_image which contains nodes, links * positions and the values of it. + * \param[in] link_v The value to assign to pixels which contains links, + * defaulting to 1. * */ + // FIXME: The type of the last argument cannot always been + // constructed from `int'! We should remove this last argument. template <typename I, typename P, typename V> void - mesh(Image& ima, const mesh_image<P, V>& mesh); + mesh(Image& ima, const mesh_image<P, V>& mesh, + mln_value(I) link_v = 1); # ifndef MLN_INCLUDE_ONLY - // FIXME: Add assertions on the size of the image: it must be big + // FIXME: Add assertions on the size of the image: it must be large // enough to hold the reprensentation of the graph. template <typename I, typename P> @@ -100,7 +109,8 @@ template <typename I, typename P, typename V> inline void - mesh(Image& ima, const mesh_image<P, V>& mesh) + mesh(Image& ima, const mesh_image<P, V>& mesh, + mln_value(I) link_v) { level::fill(ima, 0); @@ -108,7 +118,7 @@ line (exact(ima), mesh.access_location_link_node1 (i), mesh.access_location_link_node2 (i), - 1); + link_v); for (unsigned i = 0; i < mesh.domain().gr_.nb_node_; ++i) exact(ima)(mesh.domain().loc_[i]) = mesh.data_values ()[i]; Index: tests/core/mesh_image.cc --- tests/core/mesh_image.cc (revision 1624) +++ tests/core/mesh_image.cc (working copy) @@ -25,10 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/mesh_image.cc - * - * \brief Tests on mln::mesh_image. - */ +/// \file tests/core/mesh_image.cc +/// \brief Tests on mln::mesh_image. #include <vector> @@ -37,6 +35,9 @@ #include <mln/core/mesh_elt_window.hh> #include <mln/core/mesh_window_piter.hh> +#include <mln/morpho/dilation.hh> + +#include <mln/draw/mesh.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> @@ -86,9 +87,32 @@ ima_t ima(mesh, values); // Initialize values. debug::iota(ima); - // The printed result does not show the graph, only the values. + // Print the image. + /* FIXME: Unfortunately, displaying mesh images is not easy right + now (2007-12-19). We could use + debug::println(ima); + but there's not specialization working for mesh_image; the one + selected by the compiler is based on a 2-D bbox, and expects the + interface of mesh_image to work with points (not psites). + Moreover, this iplementation only shows *values*, not the graph + itslef. + + An alternative is to use draw::mesh (which, again, is misnamed), + but it doesn't show the values, only the nodes and edges of the + graph. + + The current solution is a mix between draw::mesh and hand-made + iterations. */ + image2d<int> ima_rep(ima.bbox()); + // We use the value 9 in draw::mesh instead of the default (which is + // 1) to represent edges to distinguish it from nodes holding a + // value of 1. + draw::mesh (ima_rep, ima, 9); + debug::println (ima_rep); + + /*------------. | Iterators. | `------------*/ @@ -99,11 +123,11 @@ std::cout << "ima (" << p << ") = " << ima(p) << std::endl; // Manual iterations over the neighborhoods of each point site of IMA. + /* FIXME: In fact, this class should be named + `mesh_elt_neighborhood' (there's no such thing as an elementary + window on a mesh/graph!). */ typedef mesh_elt_window<point2d> win_t; win_t win; - // Reinitialize P, otherwise Q will trigger an assertion about P - // being unable to convert to a valid mesh_piter object. - p.start(); mln_qiter_(win_t) q(win, p); for_all (p) { @@ -112,4 +136,16 @@ for_all (q) std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; } + + /*-------------------------. + | Processing mesh images. | + `-------------------------*/ + + mesh_image<point2d, int> ima_dil = morpho::dilation(ima, win); + draw::mesh(ima_rep, ima_dil, 9); + debug::println(ima_rep); + + mesh_image<point2d, int> ima_ero = morpho::erosion(ima, win); + draw::mesh(ima_rep, ima_ero, 9); + debug::println(ima_rep); }

1 0

milena r1624: Fix for unit tests and moving initialize
by nivaul_s＠lrde.epita.fr 21 Dec '07

21 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-21 Simon Nivault <simon.nivault(a)lrde.epita.fr> Fix for unit tests and moving initialize. * mln/accu/median_alt.hh, * mln/core/image2d.hh, * mln/core/internal/image_base.hh, * mln/level/was.median.hh, * mln/linear/gaussian.hh: Fix. * mln/core/concept/image.hh: Move initialize... * mln/core/initialize.hh: New. ...here. --- accu/median_alt.hh | 2 - core/concept/image.hh | 30 ----------------- core/image2d.hh | 1 core/initialize.hh | 74 ++++++++++++++++++++++++++++++++++++++++++++ core/internal/image_base.hh | 3 - level/was.median.hh | 7 ++++ linear/gaussian.hh | 5 ++ 7 files changed, 88 insertions(+), 34 deletions(-) Index: trunk/milena/mln/core/initialize.hh =================================================================== --- trunk/milena/mln/core/initialize.hh (revision 0) +++ trunk/milena/mln/core/initialize.hh (revision 1624) @@ -0,0 +1,74 @@ +// Copyright (C) 2007 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_CORE_INITIALIZE_HH +# define MLN_CORE_INITIALIZE_HH + +/*! \file mln/core/initialize.hh + * + * \brief Definition of function that initialize an image from another + * one. + */ + +# include <mln/core/concept/image.hh> + +namespace mln +{ + + /*! Initialize the image \p target with data extracted from image \p model. + * + * \param[in, out] target The image to be initialized. + * \param[in] model The image to provide data for the initialization. + * + * \pre (not target.has_data) and model.has_data + */ + template <typename I, typename J> + void initialize(Image& target, const Image<J>& model); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename J> + inline + void initialize(Image& target, const Image<J>& model) + { + trace::entering("core::initialize"); + mln_precondition(! exact(target).has_data()); + mln_precondition(exact(model).has_data()); + + init_(tag::image, exact(target), exact(model)); + + mln_postcondition(exact(target).has_data()); + trace::exiting("core::initialize"); + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_INITIALIZE_HH Index: trunk/milena/mln/core/internal/image_base.hh =================================================================== --- trunk/milena/mln/core/internal/image_base.hh (revision 1623) +++ trunk/milena/mln/core/internal/image_base.hh (revision 1624) @@ -252,7 +252,4 @@ } // end of namespace mln -# include <mln/core/init.hh> - - #endif // ! MLN_CORE_INTERNAL_IMAGE_BASE_HH Index: trunk/milena/mln/core/concept/image.hh =================================================================== --- trunk/milena/mln/core/concept/image.hh (revision 1623) +++ trunk/milena/mln/core/concept/image.hh (revision 1624) @@ -117,19 +117,6 @@ }; - - /*! Initialize the image \p target with data extracted from image \p model. - * - * \param[in, out] target The image to be initialized. - * \param[in] model The image to provide data for the initialization. - * - * \pre (not target.has_data) and model.has_data - */ - template <typename I, typename J> - void initialize(Image& target, const Image<J>& model); - - - # ifndef MLN_INCLUDE_ONLY template <typename E> @@ -181,25 +168,10 @@ m8 = 0; } - template <typename I, typename J> - inline - void initialize(Image& target, const Image<J>& model) - { - trace::entering("core::initialize"); - mln_precondition(! exact(target).has_data()); - mln_precondition(exact(model).has_data()); - - init_(tag::image, exact(target), exact(model)); - - mln_postcondition(exact(target).has_data()); - trace::exiting("core::initialize"); - } - - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln - +# include <mln/core/initialize.hh> #endif // ! MLN_CORE_CONCEPT_IMAGE_HH Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1623) +++ trunk/milena/mln/core/image2d.hh (revision 1624) @@ -36,6 +36,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/box2d.hh> +# include <mln/core/init.hh> # include <mln/border/thickness.hh> # include <mln/value/set.hh> Index: trunk/milena/mln/level/was.median.hh =================================================================== --- trunk/milena/mln/level/was.median.hh (revision 1623) +++ trunk/milena/mln/level/was.median.hh (revision 1624) @@ -35,6 +35,13 @@ # include <mln/geom/shift.hh> # include <mln/core/window2d.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_row.hh> +# include <mln/set/diff.hh> +# include <mln/accu/median.hh> +# include <mln/win/hline2d.hh> namespace mln { Index: trunk/milena/mln/linear/gaussian.hh =================================================================== --- trunk/milena/mln/linear/gaussian.hh (revision 1623) +++ trunk/milena/mln/linear/gaussian.hh (revision 1624) @@ -35,10 +35,13 @@ */ # include <mln/core/concept/image.hh> +# include <mln/core/point2d.hh> # include <mln/level/paste.hh> +# include <mln/geom/ncols.hh> +# include <mln/geom/nrows.hh> # include <vector> - +# include <cmath> namespace mln { Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1623) +++ trunk/milena/mln/accu/median_alt.hh (revision 1624) @@ -71,7 +71,7 @@ protected: - histo_on_set<S> h_; + histo<S> h_; const S& s_; // derived from h_ std::size_t sum_minus_, sum_plus_;

1 0

milena r1623: Clean internal namespace in core
by Guillaume Duhamel 21 Dec '07

21 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-21 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Clean internal namespace in core. * mln/core/a_point_of.hh, * mln/core/cast_image.hh, * mln/core/clone.hh, * mln/core/decorated_image.hh, * mln/core/dpoint.hh, * mln/core/dpoint1d.hh, * mln/core/dpoint2d.hh, * mln/core/dpoint3d.hh, * mln/core/dpoints_piter.hh, * mln/core/dpoints_pixter.hh, * mln/core/exact.hh, * mln/core/fi_adaptor.hh, * mln/core/hexa.hh, * mln/core/image2d.hh, * mln/core/image3d.hh, * mln/core/image_if.hh, * mln/core/image_if_interval.hh, * mln/core/image_if_value.hh, * mln/core/interpolated.hh, * mln/core/mesh_image.hh, * mln/core/mesh_p.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_image.hh, * mln/core/plain.hh, * mln/core/rle_image.hh, * mln/core/safe.hh, * mln/core/sparse_image.hh, * mln/core/sub_image.hh, * mln/core/t_image.hh, * mln/core/tr_image.hh, * mln/core/translate_image.hh: Clean and fix in internal namespace Doxygen comments. --- a_point_of.hh | 4 +++- cast_image.hh | 5 +++-- clone.hh | 3 ++- decorated_image.hh | 10 ++++++---- dpoint.hh | 2 +- dpoint1d.hh | 9 ++++++++- dpoint2d.hh | 9 ++++++++- dpoint3d.hh | 9 ++++++++- fi_adaptor.hh | 2 +- hexa.hh | 2 +- image2d.hh | 2 +- image3d.hh | 2 +- image_if.hh | 3 +-- image_if_interval.hh | 2 +- image_if_value.hh | 4 +--- interpolated.hh | 1 + mesh_image.hh | 1 + mesh_p.hh | 2 +- mono_obased_rle_image.hh | 1 + mono_rle_image.hh | 1 + obased_rle_image.hh | 1 + plain.hh | 1 + rle_image.hh | 1 + safe.hh | 1 + sparse_image.hh | 1 + sub_image.hh | 1 + t_image.hh | 2 +- tr_image.hh | 1 + translate_image.hh | 1 + 29 files changed, 60 insertions(+), 24 deletions(-) Index: trunk/milena/mln/core/dpoint1d.hh =================================================================== --- trunk/milena/mln/core/dpoint1d.hh (revision 1622) +++ trunk/milena/mln/core/dpoint1d.hh (revision 1623) @@ -56,13 +56,20 @@ namespace mln { - // FIXME: Doc! + /*! + * \brief Definition of a shortcut for delta point in 1d. + * \{ + */ + const dpoint1d before = make::dpoint1d( -1 ); const dpoint1d after = make::dpoint1d( +1 ); const dpoint1d ind_dec = before; const dpoint1d ind_inc = after; + /*! \} + */ + } // end of namespace mln Index: trunk/milena/mln/core/dpoint2d.hh =================================================================== --- trunk/milena/mln/core/dpoint2d.hh (revision 1622) +++ trunk/milena/mln/core/dpoint2d.hh (revision 1623) @@ -56,12 +56,19 @@ namespace mln { - // FIXME: Doc! + /*! + * \brief Definition of a shortcut for delta point in 2d. + * \{ + */ const dpoint2d up = make::dpoint2d( -1, 0 ); const dpoint2d down = make::dpoint2d( +1, 0 ); const dpoint2d left = make::dpoint2d( 0, -1 ); const dpoint2d right = make::dpoint2d( 0, +1 ); + /*! + * \} + */ + } // end of namespace mln Index: trunk/milena/mln/core/dpoints_piter.hh =================================================================== Index: trunk/milena/mln/core/dpoint3d.hh =================================================================== --- trunk/milena/mln/core/dpoint3d.hh (revision 1622) +++ trunk/milena/mln/core/dpoint3d.hh (revision 1623) @@ -56,7 +56,10 @@ namespace mln { - // FIXME: Doc! + /*! + * \brief Definition of a shortcut for delta point in 3d. + * \{ + */ const dpoint3d sagittal_dec = make::dpoint3d( 0, 0, -1); const dpoint3d sagittal_inc = make::dpoint3d( 0, 0, +1); const dpoint3d axial_dec = make::dpoint3d( 0, -1, 0); @@ -64,6 +67,10 @@ const dpoint3d coronal_dec = make::dpoint3d(-1, 0, 0); const dpoint3d coronal_inc = make::dpoint3d(+1, 0, 0); + /*! + * \} + */ + } // end of namespace mln Index: trunk/milena/mln/core/decorated_image.hh =================================================================== --- trunk/milena/mln/core/decorated_image.hh (revision 1622) +++ trunk/milena/mln/core/decorated_image.hh (revision 1623) @@ -62,7 +62,7 @@ typedef mln::value::proxy<const E> lvalue; }; - /// \internal + /// \internal Data structure for \c mln::decorated_image<I,D>. template <typename I, typename D> struct data_< decorated_image<I,D> > { @@ -76,8 +76,10 @@ - // FIXME: Doc! - + /*! + * \brief Class of decorated image : FIXME Doc + * + */ template <typename I, typename D> struct decorated_image : public internal::decorated_image_impl_< I, decorated_image<I,D> >, @@ -133,7 +135,7 @@ namespace internal { - // \internal internal::data_< decorated_image<I,S> > + /// \internal internal::data_< decorated_image<I,S> > template <typename I, typename D> inline data_< decorated_image<I,D> >::data_(I& ima, const D& deco) Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1622) +++ trunk/milena/mln/core/translate_image.hh (revision 1623) @@ -49,6 +49,7 @@ namespace internal { + /// \internal Data structure for \c mln::translate_image. template <typename I> struct data_< translate_image > { Index: trunk/milena/mln/core/image_if.hh =================================================================== --- trunk/milena/mln/core/image_if.hh (revision 1622) +++ trunk/milena/mln/core/image_if.hh (revision 1623) @@ -49,11 +49,10 @@ template <typename I, typename F> struct image_if; - /// \internal internal::data_. - namespace internal { + /// \internal Data structure for \c mln::image_if<I,F>. template <typename I, typename F> struct data_< image_if<I,F> > : data_< Super > { Index: trunk/milena/mln/core/exact.hh =================================================================== Index: trunk/milena/mln/core/mesh_p.hh =================================================================== --- trunk/milena/mln/core/mesh_p.hh (revision 1622) +++ trunk/milena/mln/core/mesh_p.hh (revision 1623) @@ -49,7 +49,7 @@ template<typename P> class mesh_p_piter_; template<typename P> - struct mesh_p : public internal::point_set_base_< P, mesh_p > + struct mesh_p : public internal::point_set_base_< mesh_psite, mesh_p > { typedef util::graph<void> graph; Index: trunk/milena/mln/core/dpoints_pixter.hh =================================================================== Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1622) +++ trunk/milena/mln/core/rle_image.hh (revision 1623) @@ -49,6 +49,7 @@ namespace internal { + /// \internal Data structure for \c mln::rle_image<P,T>. template <typename P, typename T> struct data_< rle_image<P,T> > { Index: trunk/milena/mln/core/hexa.hh =================================================================== --- trunk/milena/mln/core/hexa.hh (revision 1622) +++ trunk/milena/mln/core/hexa.hh (revision 1623) @@ -50,7 +50,7 @@ namespace internal { - + /// \internal Data structure for \c mln::hexa. template <typename I> struct data_< hexa > { Index: trunk/milena/mln/core/tr_image.hh =================================================================== --- trunk/milena/mln/core/tr_image.hh (revision 1622) +++ trunk/milena/mln/core/tr_image.hh (revision 1623) @@ -51,6 +51,7 @@ namespace internal { + /// \internal Data structure for \c mln::tr_image<T,I>. template <typename T, typename I> struct data_< tr_image<T,I> > { Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1622) +++ trunk/milena/mln/core/interpolated.hh (revision 1623) @@ -49,6 +49,7 @@ namespace internal { + /// \internal Data structure for \c mln::interpolated. template <typename I> struct data_< interpolated > { Index: trunk/milena/mln/core/image_if_value.hh =================================================================== --- trunk/milena/mln/core/image_if_value.hh (revision 1622) +++ trunk/milena/mln/core/image_if_value.hh (revision 1623) @@ -49,11 +49,9 @@ template <typename I> struct image_if_value; - /// \internal internal::data_. - namespace internal { - + /// \internal Data structure for \c mln::image_if_value. template <typename I> struct data_< image_if_value > : data_< Super > { Index: trunk/milena/mln/core/image_if_interval.hh =================================================================== --- trunk/milena/mln/core/image_if_interval.hh (revision 1622) +++ trunk/milena/mln/core/image_if_interval.hh (revision 1623) @@ -57,10 +57,10 @@ template <typename I> struct image_if_interval; - /// \internal internal::data_. namespace internal { + /// \internal Data structure for \c mln::image_if_interval. template <typename I> struct data_< image_if_interval > : data_< Super > { Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1622) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1623) @@ -49,6 +49,7 @@ namespace internal { + /// \internal Data structure for \c mln::mono_rle_image<P,T>. template <typename P, typename T> struct data_< mono_rle_image<P,T> > { Index: trunk/milena/mln/core/cast_image.hh =================================================================== --- trunk/milena/mln/core/cast_image.hh (revision 1622) +++ trunk/milena/mln/core/cast_image.hh (revision 1623) @@ -50,7 +50,7 @@ namespace internal { - /// \internal + /// \internal Data structure for \c mln::cast_image_<T,I>. template <typename T, typename I> struct data_< cast_image_<T,I> > { @@ -75,7 +75,8 @@ - /*! \brief FIXME + /*! \brief Class of image morpher which takes an image to change its + * data type. * */ template <typename T, typename I> Index: trunk/milena/mln/core/mesh_image.hh =================================================================== --- trunk/milena/mln/core/mesh_image.hh (revision 1622) +++ trunk/milena/mln/core/mesh_image.hh (revision 1623) @@ -51,6 +51,7 @@ namespace internal { + /// \internal Data structure for \c mln::mesh_image<P,V>. template <typename P, typename V> struct data_< mesh_image<P, V> > { Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1622) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1623) @@ -50,6 +50,7 @@ namespace internal { + /// \internal Data structure for \c mln::obased_rle_image<P,T>. template <typename P, typename T> struct data_< obased_rle_image<P,T> > { Index: trunk/milena/mln/core/safe.hh =================================================================== --- trunk/milena/mln/core/safe.hh (revision 1622) +++ trunk/milena/mln/core/safe.hh (revision 1623) @@ -50,6 +50,7 @@ namespace internal { + /// \internal Data structure for \c mln::safe_image. template <typename I> struct data_< safe_image > { Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1622) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1623) @@ -51,6 +51,7 @@ namespace internal { + /// \internal Data structure for \c mln::mono_obased_rle_image<P,T>. template <typename P, typename T> struct data_< mono_obased_rle_image<P,T> > { Index: trunk/milena/mln/core/sub_image.hh =================================================================== --- trunk/milena/mln/core/sub_image.hh (revision 1622) +++ trunk/milena/mln/core/sub_image.hh (revision 1623) @@ -50,6 +50,7 @@ namespace internal { + /// \internal Data structure for \c mln::sub_image<I,S>. template <typename I, typename S> struct data_< sub_image<I,S> > { Index: trunk/milena/mln/core/dpoint.hh =================================================================== --- trunk/milena/mln/core/dpoint.hh (revision 1622) +++ trunk/milena/mln/core/dpoint.hh (revision 1623) @@ -54,7 +54,7 @@ /*! \brief Generic delta-point class. * - * Parameters are \c n the dimension of the space and \c C the + * Parameters are \c M the dimension of the space and \c C the * coordinate type in this space. */ template <typename M, typename C> Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1622) +++ trunk/milena/mln/core/sparse_image.hh (revision 1623) @@ -49,6 +49,7 @@ namespace internal { + /// \internal Data structure for \c mln::sparse_image<P,T>. template <typename P, typename T> struct data_< sparse_image<P,T> > { Index: trunk/milena/mln/core/clone.hh =================================================================== --- trunk/milena/mln/core/clone.hh (revision 1622) +++ trunk/milena/mln/core/clone.hh (revision 1623) @@ -41,7 +41,8 @@ namespace mln { - /*! Clone the image \p ima with the values of the image \p data. + /*! \brief Clone the image \p ima with the values of the image \p + * data. * * \param[in] ima The image to be cloneed. * \result The clone. Index: trunk/milena/mln/core/plain.hh =================================================================== --- trunk/milena/mln/core/plain.hh (revision 1622) +++ trunk/milena/mln/core/plain.hh (revision 1623) @@ -51,6 +51,7 @@ namespace internal { + /// \internal Data structure for \c mln::plain. template <typename I> struct data_< plain > { Index: trunk/milena/mln/core/t_image.hh =================================================================== --- trunk/milena/mln/core/t_image.hh (revision 1622) +++ trunk/milena/mln/core/t_image.hh (revision 1623) @@ -46,7 +46,7 @@ namespace internal { - /// \internal Data held by a mln::t_image. + /// \internal Data structure for \c mln::t_image. template <typename I> struct data_< t_image > { Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1622) +++ trunk/milena/mln/core/image2d.hh (revision 1623) @@ -59,7 +59,7 @@ namespace internal { - /// \internal + /// \internal Data structure for \c mln::image2d<T>. template <typename T> struct data_< image2d<T> > { Index: trunk/milena/mln/core/fi_adaptor.hh =================================================================== --- trunk/milena/mln/core/fi_adaptor.hh (revision 1622) +++ trunk/milena/mln/core/fi_adaptor.hh (revision 1623) @@ -61,7 +61,7 @@ namespace internal { - /// \internal + /// \internal Data structure for \c mln::fi_adaptor. template <typename I> struct data_< fi_adaptor > { Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1622) +++ trunk/milena/mln/core/image3d.hh (revision 1623) @@ -60,7 +60,7 @@ namespace internal { - /// \internal + /// \internal Data structure for \c mln::image3d<T>. template <typename T> struct data_< image3d<T> > { Index: trunk/milena/mln/core/a_point_of.hh =================================================================== --- trunk/milena/mln/core/a_point_of.hh (revision 1622) +++ trunk/milena/mln/core/a_point_of.hh (revision 1623) @@ -39,7 +39,9 @@ namespace mln { - /// Give a point of an image. + /*! + * \brief Give a point of an image. + */ template <typename I> mln_point(I) a_point_of(const Image& ima);

1 0

milena r1622: Some fixes for unit/sanity tests
by nivaul_s＠lrde.epita.fr 20 Dec '07

20 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-20 Simon Nivault <simon.nivault(a)lrde.epita.fr> Some fixes for unit/sanity tests. * mln/accu/median_alt.hh, * mln/accu/v.hh, * mln/arith/min.spe.hh, * mln/arith/revert.spe.hh, * mln/arith/times.spe.hh, * mln/convert/to_rgb.hh, * mln/convert/to_tiles.hh, * mln/convert/to_w_window.hh, * mln/core/dpoints_piter.hh, * mln/core/hexa_piter.hh, * mln/core/interpolated.hh, * mln/core/line_piter.hh, * mln/core/p_runs.hh, * mln/core/runs_psite.hh, * mln/core/t_image.hh, * mln/core/tr_image.hh, * mln/core/tr_mesh.hh, * mln/core/translate_image.hh, * mln/debug/iota.spe.hh, * mln/debug/println.spe.hh, * mln/debug/println_with_border.spe.hh, * mln/fun/v2v/saturate.hh, * mln/geom/seeds2tiling.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/histo/compute.spe.hh, * mln/io/abort.hh, * mln/io/pfm/load.hh, * mln/io/pfm/save.hh, * mln/io/pnm/max_component.hh, * mln/labeling/level.spe.hh, * mln/level/apply.spe.hh, * mln/level/approx/median.hh, * mln/level/assign.spe.hh, * mln/level/fast_median.hh, * mln/level/fill.spe.hh, * mln/level/paste.spe.hh, * mln/level/take.spe.hh, * mln/level/transform.spe.hh, * mln/level/was.median.hh, * mln/linear/gaussian.hh, * mln/logical/and.spe.hh, * mln/logical/and_not.spe.hh, * mln/logical/not.spe.hh, * mln/logical/or.spe.hh, * mln/morpho/dilation_fast.hh, * mln/morpho/erosion.spe.hh, * mln/morpho/erosion_fast.hh, * mln/morpho/thick_miss.hh, * mln/trait/image/props.hh, * mln/util/tree_fast_to_image.hh, * mln/util/tree_to_image.hh, * tests/level/approx/median.cc: Fix * tests/h_vec.cc: Rename as... * tests/core/h_vec.cc: ...this. --- mln/accu/median_alt.hh | 2 mln/accu/v.hh | 1 mln/arith/min.spe.hh | 4 + mln/arith/revert.spe.hh | 4 + mln/arith/times.spe.hh | 4 + mln/convert/to_rgb.hh | 1 mln/convert/to_tiles.hh | 2 mln/convert/to_w_window.hh | 2 mln/core/dpoints_piter.hh | 1 mln/core/hexa_piter.hh | 1 mln/core/interpolated.hh | 2 mln/core/line_piter.hh | 2 mln/core/p_runs.hh | 1 mln/core/runs_psite.hh | 2 mln/core/t_image.hh | 2 mln/core/tr_image.hh | 1 mln/core/tr_mesh.hh | 2 mln/core/translate_image.hh | 1 mln/debug/iota.spe.hh | 4 + mln/debug/println.spe.hh | 4 + mln/debug/println_with_border.spe.hh | 4 + mln/fun/v2v/saturate.hh | 1 mln/geom/seeds2tiling.hh | 1 mln/geom/seeds2tiling_roundness.hh | 1 mln/histo/compute.spe.hh | 4 + mln/io/abort.hh | 2 mln/io/pfm/load.hh | 3 + mln/io/pfm/save.hh | 1 mln/io/pnm/max_component.hh | 3 + mln/labeling/level.spe.hh | 4 + mln/level/apply.spe.hh | 4 + mln/level/approx/median.hh | 8 +-- mln/level/assign.spe.hh | 4 + mln/level/fast_median.hh | 4 + mln/level/fill.spe.hh | 4 + mln/level/paste.spe.hh | 4 + mln/level/take.spe.hh | 4 + mln/level/transform.spe.hh | 4 + mln/level/was.median.hh | 2 mln/linear/gaussian.hh | 1 mln/logical/and.spe.hh | 5 +- mln/logical/and_not.spe.hh | 4 + mln/logical/not.spe.hh | 4 + mln/logical/or.spe.hh | 4 + mln/morpho/dilation_fast.hh | 1 mln/morpho/erosion.spe.hh | 4 + mln/morpho/erosion_fast.hh | 1 mln/morpho/thick_miss.hh | 4 - mln/trait/image/props.hh | 10 ++++ mln/util/tree_fast_to_image.hh | 1 mln/util/tree_to_image.hh | 1 tests/core/h_vec.cc | 73 +++++++++++++++++++++++++++++++++++ tests/level/approx/median.cc | 7 +-- 53 files changed, 207 insertions(+), 18 deletions(-) Index: trunk/milena/tests/h_vec.cc (deleted) =================================================================== Index: trunk/milena/tests/level/approx/median.cc =================================================================== --- trunk/milena/tests/level/approx/median.cc (revision 1621) +++ trunk/milena/tests/level/approx/median.cc (revision 1622) @@ -52,9 +52,10 @@ win::octagon2d oct(13); border::thickness = 52; - image2d<int_u8> - lena = io::pgm::load("../../../img/lena.pgm"), - out(lena.domain()); + image2d<int_u8> lena; + + io::pgm::load(lena, "../../../img/lena.pgm"); + image2d<int_u8> out(lena.domain()); // level::approx::median(lena, rect, out); level::approx::median(lena, oct, out); Index: trunk/milena/tests/core/h_vec.cc =================================================================== --- trunk/milena/tests/core/h_vec.cc (revision 0) +++ trunk/milena/tests/core/h_vec.cc (revision 1622) @@ -0,0 +1,73 @@ +// Copyright (C) 2007 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/h_vec.cc + * + * \brief Tests on mln::h_vec. + */ + +#include <mln/core/h_vec.hh> +#include <mln/core/point3d.hh> + +using namespace mln; + + +void run_in_3d(const metal::vec<3, int>&) +{ +} + +void run_in_3d_h(const h_vec<3, int>&) +{ +} + + +void foo(const mln::h_vec<3,float>&) +{ +} + + +int main() +{ + + metal::vec<3, int> x; + h_vec<3, int> w = x.to_h_vec(); + + typedef h_vec<3, int> p3d; + p3d p; + run_in_3d(p.to_vec()); + + point3d k; + run_in_3d(k); + run_in_3d_h(k.to_h_vec()); + + { + metal::vec<3,float> v; + h_vec<3,float> w(v.to_h_vec()); + w = v.to_h_vec(); + foo(v.to_h_vec()); + } +} Index: trunk/milena/mln/trait/image/props.hh =================================================================== --- trunk/milena/mln/trait/image/props.hh (revision 1621) +++ trunk/milena/mln/trait/image/props.hh (revision 1622) @@ -34,6 +34,7 @@ */ # include <string> +# include <mln/trait/undef.hh> # include <mln/trait/value/kind.hh> @@ -206,9 +207,18 @@ /// \{ // Fwd decl. (used by trait::image::space_from_point). + namespace grid + { + struct tick; + struct square; + struct hexa; + struct cube; + } + template <typename M, typename C> struct point_; typedef point_<grid::tick, int> point1d; typedef point_<grid::square, int> point2d; + typedef point_<grid::hexa, int> point2d_h; typedef point_<grid::cube, int> point3d; namespace trait Index: trunk/milena/mln/debug/iota.spe.hh =================================================================== --- trunk/milena/mln/debug/iota.spe.hh (revision 1621) +++ trunk/milena/mln/debug/iota.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::debug::iota. */ +# ifndef MLN_DEBUG_IOTA_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_DEBUG_IOTA_HH + # include <mln/core/concept/image.hh> Index: trunk/milena/mln/debug/println_with_border.spe.hh =================================================================== --- trunk/milena/mln/debug/println_with_border.spe.hh (revision 1621) +++ trunk/milena/mln/debug/println_with_border.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::debug::println_with_border. */ +# ifndef MLN_DEBUG_PRINTLN_WITH_BORDER_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_DEBUG_PRINTLN_WITH_BORDER_HH + # include <mln/core/concept/image.hh> # include <mln/core/concept/window.hh> # include <mln/debug/format.hh> Index: trunk/milena/mln/debug/println.spe.hh =================================================================== --- trunk/milena/mln/debug/println.spe.hh (revision 1621) +++ trunk/milena/mln/debug/println.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::debug::println. */ +# ifndef MLN_DEBUG_PRINTLN_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_DEBUG_PRINTLN_HH + # include <mln/core/concept/image.hh> # include <mln/core/concept/window.hh> # include <mln/debug/format.hh> Index: trunk/milena/mln/histo/compute.spe.hh =================================================================== --- trunk/milena/mln/histo/compute.spe.hh (revision 1621) +++ trunk/milena/mln/histo/compute.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations of histogram computation. */ +# ifndef MLN_HISTO_COMPUTE_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_HISTO_COMPUTE_HH + # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/core/dpoints_piter.hh =================================================================== --- trunk/milena/mln/core/dpoints_piter.hh (revision 1621) +++ trunk/milena/mln/core/dpoints_piter.hh (revision 1622) @@ -34,6 +34,7 @@ * iterators. */ +# include <vector> # include <mln/core/internal/point_iterator_base.hh> # include <mln/core/concept/point_site.hh> Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1621) +++ trunk/milena/mln/core/translate_image.hh (revision 1622) @@ -37,6 +37,7 @@ # include <mln/core/internal/image_identity.hh> # include <mln/core/box2d.hh> +# include <mln/core/line_piter.hh> namespace mln Index: trunk/milena/mln/core/tr_image.hh =================================================================== --- trunk/milena/mln/core/tr_image.hh (revision 1621) +++ trunk/milena/mln/core/tr_image.hh (revision 1622) @@ -39,6 +39,7 @@ # include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> +# include <mln/value/set.hh> namespace mln Index: trunk/milena/mln/core/hexa_piter.hh =================================================================== --- trunk/milena/mln/core/hexa_piter.hh (revision 1621) +++ trunk/milena/mln/core/hexa_piter.hh (revision 1622) @@ -36,6 +36,7 @@ # include <mln/core/internal/piter_adaptor.hh> # include <mln/core/box2d.hh> +# include <mln/core/box2d_h.hh> # include <mln/core/inplace.hh> namespace mln Index: trunk/milena/mln/core/line_piter.hh =================================================================== --- trunk/milena/mln/core/line_piter.hh (revision 1621) +++ trunk/milena/mln/core/line_piter.hh (revision 1622) @@ -36,7 +36,7 @@ */ # include <mln/core/internal/point_iterator_base.hh> - +# include <mln/core/box.hh> namespace mln { Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1621) +++ trunk/milena/mln/core/interpolated.hh (revision 1622) @@ -38,7 +38,7 @@ # include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> - +# include <mln/value/set.hh> namespace mln { Index: trunk/milena/mln/core/runs_psite.hh =================================================================== --- trunk/milena/mln/core/runs_psite.hh (revision 1621) +++ trunk/milena/mln/core/runs_psite.hh (revision 1622) @@ -34,7 +34,6 @@ */ # include <mln/core/concept/point_site.hh> -# include <mln/core/p_runs.hh> namespace mln @@ -188,5 +187,6 @@ } // end of namespace mln +# include <mln/core/p_runs.hh> #endif // ! MLN_CORE_INTERNAL_RUNS_PSITE_HH Index: trunk/milena/mln/core/tr_mesh.hh =================================================================== --- trunk/milena/mln/core/tr_mesh.hh (revision 1621) +++ trunk/milena/mln/core/tr_mesh.hh (revision 1622) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/mesh.hh> -# include <mln/core/bool.hh> +# include <mln/metal/bool.hh> namespace mln Index: trunk/milena/mln/core/t_image.hh =================================================================== --- trunk/milena/mln/core/t_image.hh (revision 1621) +++ trunk/milena/mln/core/t_image.hh (revision 1622) @@ -35,7 +35,7 @@ # include <mln/core/internal/image_morpher.hh> # include <mln/core/box.hh> - +# include <mln/value/set.hh> namespace mln { Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 1621) +++ trunk/milena/mln/core/p_runs.hh (revision 1622) @@ -52,7 +52,6 @@ template <typename P> struct p_runs_fwd_piter_; template <typename P> struct p_runs_bkd_piter_; - /*! \brief p_runs_ class represent a point set used in run_image_ class. * * Parameter \c P is the type of the image point. Index: trunk/milena/mln/arith/times.spe.hh =================================================================== --- trunk/milena/mln/arith/times.spe.hh (revision 1621) +++ trunk/milena/mln/arith/times.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_ARITH_TIMES_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_ARITH_TIMES_HH + # include <mln/arith/includes.hh> Index: trunk/milena/mln/arith/min.spe.hh =================================================================== --- trunk/milena/mln/arith/min.spe.hh (revision 1621) +++ trunk/milena/mln/arith/min.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::arith::min. */ +# ifndef MLN_ARITH_MIN_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_ARITH_MIN_HH + # include <mln/core/concept/image.hh> # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/arith/revert.spe.hh =================================================================== --- trunk/milena/mln/arith/revert.spe.hh (revision 1621) +++ trunk/milena/mln/arith/revert.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_ARITH_REVERT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_ARITH_REVERT_HH + # include <mln/core/concept/image.hh> # include <mln/trait/value_.hh> Index: trunk/milena/mln/level/was.median.hh =================================================================== --- trunk/milena/mln/level/was.median.hh (revision 1621) +++ trunk/milena/mln/level/was.median.hh (revision 1622) @@ -33,6 +33,8 @@ * \brief Obsolete routines for median filtering. */ +# include <mln/geom/shift.hh> +# include <mln/core/window2d.hh> namespace mln { Index: trunk/milena/mln/level/transform.spe.hh =================================================================== --- trunk/milena/mln/level/transform.spe.hh (revision 1621) +++ trunk/milena/mln/level/transform.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LEVEL_TRANSFORM_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_TRANSFORM_HH + # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> Index: trunk/milena/mln/level/paste.spe.hh =================================================================== --- trunk/milena/mln/level/paste.spe.hh (revision 1621) +++ trunk/milena/mln/level/paste.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::level::paste. */ +# ifndef MLN_LEVEL_PASTE_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_PASTE_HH + # include <mln/level/memcpy_.hh> Index: trunk/milena/mln/level/fast_median.hh =================================================================== --- trunk/milena/mln/level/fast_median.hh (revision 1621) +++ trunk/milena/mln/level/fast_median.hh (revision 1622) @@ -37,6 +37,10 @@ # include <mln/core/window2d.hh> # include <mln/accu/median.hh> # include <mln/geom/shift.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/max_col.hh> +# include <mln/geom/max_row.hh> # include <mln/set/diff.hh> Index: trunk/milena/mln/level/assign.spe.hh =================================================================== --- trunk/milena/mln/level/assign.spe.hh (revision 1621) +++ trunk/milena/mln/level/assign.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LEVEL_ASSIGN_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_ASSIGN_HH + # include <mln/core/concept/image.hh> Index: trunk/milena/mln/level/take.spe.hh =================================================================== --- trunk/milena/mln/level/take.spe.hh (revision 1621) +++ trunk/milena/mln/level/take.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::level::take. */ +# ifndef MLN_LEVEL_TAKE_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_TAKE_HH + # include <mln/core/concept/accumulator.hh> # include <mln/core/concept/image.hh> Index: trunk/milena/mln/level/approx/median.hh =================================================================== --- trunk/milena/mln/level/approx/median.hh (revision 1621) +++ trunk/milena/mln/level/approx/median.hh (revision 1622) @@ -120,22 +120,22 @@ { clock_t c = clock(); level::median(input, win::diag2d(len), tmp1); - std::cout << float(clock() - c) / CLOCKS_PER_SEC << std::endl; + std::cout << "diag " << float(clock() - c) / CLOCKS_PER_SEC << std::endl; } { clock_t c = clock(); level::median(tmp1, win::backdiag2d(len), tmp2); - std::cout << float(clock() - c) / CLOCKS_PER_SEC << std::endl; + std::cout << "back " << float(clock() - c) / CLOCKS_PER_SEC << std::endl; } { clock_t c = clock(); level::median(tmp2, win::hline2d(len), tmp1); - std::cout << float(clock() - c) / CLOCKS_PER_SEC << std::endl; + std::cout << "hlin " << float(clock() - c) / CLOCKS_PER_SEC << std::endl; } { clock_t c = clock(); level::median(tmp1, win::vline2d(len), output); - std::cout << float(clock() - c) / CLOCKS_PER_SEC << std::endl; + std::cout << "vlin " << float(clock() - c) / CLOCKS_PER_SEC << std::endl; } } Index: trunk/milena/mln/level/apply.spe.hh =================================================================== --- trunk/milena/mln/level/apply.spe.hh (revision 1621) +++ trunk/milena/mln/level/apply.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specializations for mln::level::apply. */ +# ifndef MLN_LEVEL_APPLY_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_APPLY_HH + # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> Index: trunk/milena/mln/level/fill.spe.hh =================================================================== --- trunk/milena/mln/level/fill.spe.hh (revision 1621) +++ trunk/milena/mln/level/fill.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LEVEL_FILL_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LEVEL_FILL_HH + # include <cstring> # include <mln/core/concept/image.hh> Index: trunk/milena/mln/linear/gaussian.hh =================================================================== --- trunk/milena/mln/linear/gaussian.hh (revision 1621) +++ trunk/milena/mln/linear/gaussian.hh (revision 1622) @@ -37,6 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/level/paste.hh> +# include <vector> namespace mln Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1621) +++ trunk/milena/mln/accu/median_alt.hh (revision 1622) @@ -48,7 +48,7 @@ * value set with type \c S. */ template <typename S> - struct median_alt : : public mln::accu::internal::base_< mln_value(S), median_alt<S> > + struct median_alt : public mln::accu::internal::base_< mln_value(S), median_alt<S> > { typedef mln_value(S) argument; Index: trunk/milena/mln/accu/v.hh =================================================================== --- trunk/milena/mln/accu/v.hh (revision 1621) +++ trunk/milena/mln/accu/v.hh (revision 1622) @@ -36,6 +36,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh> +# include <mln/util/pix.hh> namespace mln Index: trunk/milena/mln/convert/to_tiles.hh =================================================================== --- trunk/milena/mln/convert/to_tiles.hh (revision 1621) +++ trunk/milena/mln/convert/to_tiles.hh (revision 1622) @@ -38,6 +38,8 @@ # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> +# include <vector> + namespace mln { Index: trunk/milena/mln/convert/to_rgb.hh =================================================================== --- trunk/milena/mln/convert/to_rgb.hh (revision 1621) +++ trunk/milena/mln/convert/to_rgb.hh (revision 1622) @@ -35,6 +35,7 @@ * \todo Re-write. */ +# include <mln/value/rgb.hh> namespace mln { Index: trunk/milena/mln/convert/to_w_window.hh =================================================================== --- trunk/milena/mln/convert/to_w_window.hh (revision 1621) +++ trunk/milena/mln/convert/to_w_window.hh (revision 1622) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/window.hh> +# include <mln/core/w_window.hh> namespace mln Index: trunk/milena/mln/geom/seeds2tiling_roundness.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1621) +++ trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1622) @@ -36,6 +36,7 @@ # include <map> +# include <mln/core/concept/neighborhood.hh> # include <mln/core/p_priority_queue_fast.hh> # include <mln/core/clone.hh> # include <mln/accu/mean.hh> Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 1621) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1622) @@ -35,6 +35,7 @@ # include <map> +# include <mln/core/concept/neighborhood.hh> # include <mln/core/p_queue.hh> # include <mln/core/clone.hh> # include <mln/accu/mean.hh> Index: trunk/milena/mln/fun/v2v/saturate.hh =================================================================== --- trunk/milena/mln/fun/v2v/saturate.hh (revision 1621) +++ trunk/milena/mln/fun/v2v/saturate.hh (revision 1622) @@ -36,6 +36,7 @@ # include <mln/core/concept/function.hh> # include <mln/metal/converts_to.hh> # include <mln/trait/value_.hh> +# include <mln/value/cast.hh> namespace mln Index: trunk/milena/mln/morpho/erosion_fast.hh =================================================================== --- trunk/milena/mln/morpho/erosion_fast.hh (revision 1621) +++ trunk/milena/mln/morpho/erosion_fast.hh (revision 1622) @@ -37,6 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> +# include <mln/core/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: trunk/milena/mln/morpho/thick_miss.hh =================================================================== --- trunk/milena/mln/morpho/thick_miss.hh (revision 1621) +++ trunk/milena/mln/morpho/thick_miss.hh (revision 1622) @@ -62,8 +62,8 @@ const Window<Wfg>& win_fg, const Window<Wbg>& win_bg) { trace::entering("morpho::thick_miss"); - mln_precondition(exact(output).domain() == exact(input).domain()); - mln_precondition(exact(win_miss).is_centered()); + // FIXME: Fix the following line (win_miss ??) +// mln_precondition(exact(win_miss).is_centered()); mln_precondition(set::inter(exact(win_fg), exact(win_bg)).is_empty()); mln_concrete(I) Index: trunk/milena/mln/morpho/erosion.spe.hh =================================================================== --- trunk/milena/mln/morpho/erosion.spe.hh (revision 1621) +++ trunk/milena/mln/morpho/erosion.spe.hh (revision 1622) @@ -28,6 +28,10 @@ #ifndef MLN_MORPHO_EROSION_SPE_HH # define MLN_MORPHO_EROSION_SPE_HH +# ifndef MLN_MORPHO_EROSION_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_MORPHO_EROSION_HH + # include <mln/win/octagon2d.hh> # include <mln/win/rectangle2d.hh> Index: trunk/milena/mln/morpho/dilation_fast.hh =================================================================== --- trunk/milena/mln/morpho/dilation_fast.hh (revision 1621) +++ trunk/milena/mln/morpho/dilation_fast.hh (revision 1622) @@ -37,6 +37,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/window.hh> +# include <mln/core/dpoint2d.hh> # include <mln/geom/shift.hh> # include <mln/set/diff.hh> Index: trunk/milena/mln/io/pfm/save.hh =================================================================== --- trunk/milena/mln/io/pfm/save.hh (revision 1621) +++ trunk/milena/mln/io/pfm/save.hh (revision 1622) @@ -40,6 +40,7 @@ # include <iostream> # include <fstream> +# include <mln/core/point2d.hh> # include <mln/geom/size2d.hh> # include <mln/metal/equal.hh> # include <mln/metal/bexpr.hh> Index: trunk/milena/mln/io/pfm/load.hh =================================================================== --- trunk/milena/mln/io/pfm/load.hh (revision 1621) +++ trunk/milena/mln/io/pfm/load.hh (revision 1622) @@ -37,6 +37,9 @@ * */ +# include <iostream> +# include <fstream> + # include <mln/core/image2d.hh> # include <mln/value/int_u8.hh> Index: trunk/milena/mln/io/abort.hh =================================================================== --- trunk/milena/mln/io/abort.hh (revision 1621) +++ trunk/milena/mln/io/abort.hh (revision 1622) @@ -36,6 +36,8 @@ * */ +# include <iostream> + namespace mln { Index: trunk/milena/mln/io/pnm/max_component.hh =================================================================== --- trunk/milena/mln/io/pnm/max_component.hh (revision 1621) +++ trunk/milena/mln/io/pnm/max_component.hh (revision 1622) @@ -36,6 +36,9 @@ * value type. */ +# include <mln/value/rgb.hh> +# include <mln/value/int_u.hh> + namespace mln { Index: trunk/milena/mln/logical/or.spe.hh =================================================================== --- trunk/milena/mln/logical/or.spe.hh (revision 1621) +++ trunk/milena/mln/logical/or.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LOGICAL_OR_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LOGICAL_OR_HH + # include <mln/core/concept/image.hh> # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/logical/not.spe.hh =================================================================== --- trunk/milena/mln/logical/not.spe.hh (revision 1621) +++ trunk/milena/mln/logical/not.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LOGICAL_NOT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LOGICAL_NOT_HH + # include <mln/core/concept/image.hh> Index: trunk/milena/mln/logical/and_not.spe.hh =================================================================== --- trunk/milena/mln/logical/and_not.spe.hh (revision 1621) +++ trunk/milena/mln/logical/and_not.spe.hh (revision 1622) @@ -34,6 +34,10 @@ * */ +# ifndef MLN_LOGICAL_AND_NOT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LOGICAL_AND_NOT_HH + # include <mln/core/concept/image.hh> Index: trunk/milena/mln/logical/and.spe.hh =================================================================== --- trunk/milena/mln/logical/and.spe.hh (revision 1621) +++ trunk/milena/mln/logical/and.spe.hh (revision 1622) @@ -34,8 +34,11 @@ * */ -# include <mln/core/concept/image.hh> +# ifndef MLN_LOGICAL_AND_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LOGICAL_AND_HH +# include <mln/core/concept/image.hh> # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1621) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1622) @@ -36,6 +36,7 @@ * */ +# include <mln/core/concept/image.hh> # include <mln/util/tree.hh> # include <mln/core/p_set.hh> Index: trunk/milena/mln/util/tree_fast_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_fast_to_image.hh (revision 1621) +++ trunk/milena/mln/util/tree_fast_to_image.hh (revision 1622) @@ -36,6 +36,7 @@ * */ +# include <mln/core/concept/image.hh> # include <mln/util/tree_fast.hh> # include <mln/core/p_set.hh> # include <list> Index: trunk/milena/mln/labeling/level.spe.hh =================================================================== --- trunk/milena/mln/labeling/level.spe.hh (revision 1621) +++ trunk/milena/mln/labeling/level.spe.hh (revision 1622) @@ -33,6 +33,10 @@ * \brief Specialization for mln::labeling::level. */ +# ifndef MLN_LABELING_LEVEL_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_LABELING_LEVEL_HH + # include <mln/border/adjust.hh> # include <mln/border/fill.hh> # include <mln/value/other.hh>

1 0

milena r1621: Add include in mln/canvas/chamfer.hh
by Guillaume Duhamel 20 Dec '07

20 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-20 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add include in mln/canvas/chamfer.hh. * mln/canvas/chamfer.hh: Add includes. --- chamfer.hh | 3 +++ 1 file changed, 3 insertions(+) Index: trunk/milena/mln/canvas/chamfer.hh =================================================================== --- trunk/milena/mln/canvas/chamfer.hh (revision 1620) +++ trunk/milena/mln/canvas/chamfer.hh (revision 1621) @@ -33,6 +33,9 @@ * \brief Apply chamfer algorithm to a binary image. */ +# include <mln/core/internal/image_morpher.hh> +# include <mln/geom/sym.hh> + namespace mln { namespace canvas

1 0

milena r1620: Rewrite graylevel types
by matt＠lrde.epita.fr 19 Dec '07

19 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-19 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Rewrite graylevel types. * mln/value/gray.hh: Rename as... * mln/value/internal/gray_.hh: ...this. Gray_<n> is a graylevel encoded on n bits. It can represent value greater than pow(2, n). * mln/value/internal/gray_f.hh: New, gray_f is a graylevel encoded on a float. It can represent value greater than 1. * mln/value/glf.hh: New, alias to graylevel_f. * mln/value/graylevel.hh: graylevel<n> is a graylevel encoded on n bits. its interoperability type is gray_<n>. * mln/value/graylevel_f.hh: New. graylevel_f is a graylevel encoded on a float01_f. * tests/value/graylevel.cc: Unit tests on graylevel. * tests/value/graylevel_f.cc: Unit tests on graylevel_f. * tests/value/graylevel_f_full.cc: Full tests on graylevel_f. * tests/value/graylevel_full.cc: Full tests on graylevel. Misc. * mln/trait/value_.hh: (mln_trait_value_nature_) New, (mln_trait_value_quant_) new, (mln_trait_value_kind_) new. * mln/metal/math/max.hh: (mlc_max) New, (mlc_max_int) new. * tests/arith/revert_full.cc: Add a test on int_u8. * mln/accu/count.hh: Add a fixme to add an take without argument. * mln/core/fi_adaptor.hh: Disable a precondition because it doesn't work on rgb values. --- mln/accu/count.hh | 1 mln/core/fi_adaptor.hh | 2 mln/metal/math/max.hh | 2 mln/trait/value_.hh | 3 mln/value/glf.hh | 55 +++ mln/value/graylevel.hh | 178 ++++++----- mln/value/graylevel_f.hh | 299 ++++++++++++++++++ mln/value/internal/gray_.hh | 633 ++++++++++++++++++++++++++++++++++++++++ mln/value/internal/gray_f.hh | 273 +++++++++++++++++ tests/arith/revert_full.cc | 2 tests/value/graylevel.cc | 87 +++++ tests/value/graylevel_f.cc | 61 +++ tests/value/graylevel_f_full.cc | 102 ++++++ tests/value/graylevel_full.cc | 102 ++---- 14 files changed, 1666 insertions(+), 134 deletions(-) Index: trunk/milena/tests/arith/revert_full.cc =================================================================== --- trunk/milena/tests/arith/revert_full.cc (revision 1619) +++ trunk/milena/tests/arith/revert_full.cc (revision 1620) @@ -266,6 +266,8 @@ chk<value::int_s8>(); std::cerr << "on int_s16:" << std::endl; chk<value::int_s16>(); + std::cerr << "on int_u8:" << std::endl; + chk<value::int_u8>(); std::cerr << "on unsigned:" << std::endl; chk<unsigned>(); } Index: trunk/milena/tests/value/graylevel_f.cc =================================================================== --- trunk/milena/tests/value/graylevel_f.cc (revision 0) +++ trunk/milena/tests/value/graylevel_f.cc (revision 1620) @@ -0,0 +1,61 @@ +// Copyright (C) 2007 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/value/graylevel_f.cc + * + * \brief Tests on mln::value::graylevel_f. + */ + +#include <mln/value/graylevel.hh> +#include <mln/value/glf.hh> +#include <mln/literal/all.hh> + + +int main() +{ + using namespace mln; + using value::glf; + + using literal::black; + using literal::medium_gray; + using literal::white; + + + // Literals. + { + glf a = medium_gray; + glf b = medium_gray; + //a == 0.5f; + mln_assertion(0.5f == a.to_enc()); + //a == b; + mln_assertion(b == a); + + a *= 2; + mln_assertion(a == white); + mln_assertion(a.to_enc() == 1.f); + } +} Index: trunk/milena/tests/value/graylevel_full.cc =================================================================== --- trunk/milena/tests/value/graylevel_full.cc (revision 1619) +++ trunk/milena/tests/value/graylevel_full.cc (revision 1620) @@ -32,7 +32,8 @@ * */ -#include <mln/value/graylevel2.hh> +#include <mln/value/gl8.hh> +#include <mln/value/gl16.hh> #include <mln/value/int_u8.hh> #include <mln/literal/black.hh> @@ -68,11 +69,9 @@ gl16 c = d; mln_assertion(c == d); - gl8 e = gray(white); - std::cout << e << std::endl; - std::cout << gray(white) << std::endl; + gl8 e = white; - mln_assertion(gray(e) == gray(white)); + mln_assertion(e == white); gl8 f = 12; gl8 g = f; @@ -87,6 +86,9 @@ gl8 a(white); gl16 b(white); + a = white; + b = white; + mln_assertion(a == b); mln_assertion(a.value() == float(255)); mln_assertion(b.value() == float(65535)); @@ -125,7 +127,7 @@ mln_assertion(b.value() == float(2)); a = b; - mln_assertion(a.value() == float(2 / 257)); + mln_assertion(a.value() == float(2 / 256)); signed char c = 51; a = c; @@ -167,14 +169,18 @@ a = 42; b = 16969; b += a; - std::cout << "b = " << b << std::endl; - std::cout << "res = " << float(42 * 256 + 128 + 16969) << std::endl; - mln_assertion(b.value() == float((42 * 256 + 128 + 16969) )); + mln_assertion(b.value() == float((42 * 256 + 16969) )); + + a = 42; + b = 16969; + b = b + a; + + mln_assertion(b.value() == float((42 * 256 + 16969) )); a = 42; b = 16969; b = a + b; - mln_assertion(b.value() == float((42 * 256 + 128 + 16969) )); + mln_assertion(b.value() == float((42 * 256 + 16969) )); // misc a = 255; @@ -184,10 +190,7 @@ a = 0; b = 65535; - //FIXME for tomorow: this doesn't work. a = a + b; - std::cout << "a = " << a << std::endl; - std::cout << "a + b = " << a + b << std::endl; mln_assertion(a.value() == float(255)); } @@ -211,26 +214,23 @@ b = 5969; a = b; - std::cout << "a.value() = " << int(a.value()) << std::endl; - std::cout << "should be " << (b.value() / 256) << std::endl; { a = 42; - gl8 t; + gl16 t; + t = a - b; t = t + b; - std::cout << t << " == " << a << std::endl; mln_assertion(a == t); } a = 42; a = a - b; - std::cout << int(a.value()) << ":" << floor(42 - b.value() / 256.0) << std::endl; - mln_assertion(a.value() == float((42 - b.value() / 256) )); + mln_assertion(a.value() == (42 * 256 - b.value()) / 256 ); a = 42; b = 9969; a -= b; - mln_assertion(a.value() == float((42 - round(float(b.value()) / 256)) )); + mln_assertion(a.value() == (42 * 256 - b.value()) / 256 ); // gl16 <- gl8 - gl16 @@ -250,6 +250,8 @@ a = a - b; mln_assertion(a.value() == float(255)); + gl8(255) - gl16(65535); + mln_assertion( gl8(255) == gl16(65535) ); a = 255; b = 65535; a = a - b; @@ -257,33 +259,16 @@ // ... { - graylevel<2> a = 2; + graylevel<2> a = 1; graylevel<3> b = 5; graylevel<2> c; graylevel<3> d; - c = a - b; - d = a - b; + c = b - a; + d = b - a; mln_assertion(c == d); } - { - - // ... - gl8 a = 42; - gl16 b = 5969; - gl8 p; - p = b; - gl8 q; - gl8 r; - - q = a - p; - r = a - b; - std::cout << int(q.value()) << " " << int(r.value()) << std::endl; - mln_assertion(q == r); - - } - } // Multiplication @@ -294,35 +279,36 @@ // gl8 <- gl8 * gl8 a = 8; a *= a; - std::cout << a << std::endl; - mln_assertion(a.value() == 42); + mln_assertion(a.value() == 64); - a = 21; + a = 7; a = a * a; - mln_assertion(a.value() == 42); + mln_assertion(a.value() == 49); // gl8 <- gl8 * gl16 a = 10; - b = 5969; + b = 20; a = a * b; - mln_assertion(a.value() == float((10 * b.value() / 256) )); + mln_assertion(a.value() == float((10 * 256* b.value())/256)); a = 10; - b = 16969; + b = 16; a *= b; - mln_assertion(a.value() == float((10 * b.value() / 256) )); + mln_assertion(a.value() == float((10 * 256* b.value())/256)); + + mln_assertion((gl8(12) * gl16(12345)).to_enc() == float((12 * 256* 12345))); // gl16 <- gl8 * gl16 a = 10; - b = 5969; + b = 24; b *= a; - mln_assertion(b.value() == float((10 * 256 * 5969) )); + mln_assertion(b.value() == float((10 * 256 * 24) )); a = 10; - b = 5969; + b = 24; b = a * b; - mln_assertion(b.value() == float((10 * 256 * 5969) )); + mln_assertion(b.value() == float((10 * 256 * 24) )); // misc a = 255; @@ -337,8 +323,8 @@ // ... { - graylevel<2> a = 2; - graylevel<3> b = 5; + graylevel<2> a = 1; + graylevel<3> b = 2; graylevel<2> c; graylevel<3> d; @@ -351,7 +337,7 @@ // ... gl8 a = 7; - gl16 b = 5969; + gl16 b = 596; gl8 p; p = b; @@ -360,11 +346,9 @@ gl8 r; q = a * p; - r = a * b; - std::cout << int(q.value()) << " " << int(r.value()) << std::endl; - mln_assertion(q == r); - + r = a * b / 256; } } + // FIXME : division } Index: trunk/milena/tests/value/graylevel_f_full.cc =================================================================== --- trunk/milena/tests/value/graylevel_f_full.cc (revision 0) +++ trunk/milena/tests/value/graylevel_f_full.cc (revision 1620) @@ -0,0 +1,102 @@ +// Copyright (C) 2006, 2007 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/value/graylevel_f_full.cc + * + * \brief Full tests on mln::value::graylevel_f. + */ + +#include <mln/value/graylevel.hh> +#include <mln/value/glf.hh> +#include <mln/value/gl8.hh> +#include <mln/value/gl16.hh> +#include <mln/literal/all.hh> + + +int main() +{ + using namespace mln; + using value::glf; + using value::gl8; + using value::gl16; + using value::graylevel; + + using literal::black; + using literal::medium_gray; + using literal::white; + + // Constructions + { + glf a; + + glf b = 0.42; + mln_assertion(b.value() == 0.42f); + + glf c = 0.42; + mln_assertion(c.value() == 0.42f); + + glf d = c; + mln_assertion(d.value() == 0.42f); + + glf e = 0; + mln_assertion(e.value() == 0.f); + + graylevel<24> f = mlc_pow_int(2, 24) - 1; + glf g = f; + mln_assertion(g.value() == 1.f); + + graylevel<24> h = 0; + glf i = h; + mln_assertion(i.value() == 0.f); + } + + // Literals + { + glf a(white); + mln_assertion(a == white); + mln_assertion(a.value() == 1.f); + glf d = white; + mln_assertion(d == white); + mln_assertion(d.value() == 1.f); + + glf b(black); + mln_assertion(b == black); + mln_assertion(b.value() == 0.f); + glf e = black; + mln_assertion(e == black); + mln_assertion(e.value() == 0.f); + + glf c(medium_gray); + mln_assertion(c == medium_gray); + mln_assertion(c.value() == 0.5f); + glf f = medium_gray; + mln_assertion(f == medium_gray); + mln_assertion(f.value() == 0.5f); + } + + // FIXME : addition, multiplication, division. +} Index: trunk/milena/tests/value/graylevel.cc =================================================================== --- trunk/milena/tests/value/graylevel.cc (revision 0) +++ trunk/milena/tests/value/graylevel.cc (revision 1620) @@ -0,0 +1,87 @@ +// Copyright (C) 2007 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/value/graylevel.cc + * + * \brief Tests on mln::value::graylevel. Tests operations between + * graylevel of different encodings. + * + */ + +#include <mln/value/gl8.hh> +#include <mln/value/gl16.hh> +#include <mln/value/int_u8.hh> + +#include <mln/literal/black.hh> +#include <mln/literal/white.hh> + + + +int main() +{ + using namespace mln::value; + + using mln::literal::white; + using mln::literal::black; + + gl8 a(white); + gl8 b(white); + + a = b; + mln_assertion(a == b); + + { + gl8 a(10); + gl8 b(10); + + gl8 c = a + b; + } + { + gl8 a(white); + gl8 b(white); + gl8 c; + c = (a + b) / 2; + + mln_assertion(c == white); + mln_assertion(c.value() == 255); + + c = a; + mln_assertion(c == white); + + c = (a * 2) / 2; + mln_assertion(c == white); + + c = c / 6; + } + + { + gl8 c = white; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + } + +} Index: trunk/milena/mln/trait/value_.hh =================================================================== --- trunk/milena/mln/trait/value_.hh (revision 1619) +++ trunk/milena/mln/trait/value_.hh (revision 1620) @@ -45,8 +45,11 @@ # define mln_trait_value_nature(V) typename mln::trait::value_< V >::nature +# define mln_trait_value_nature_(V) mln::trait::value_< V >::nature # define mln_trait_value_kind(V) typename mln::trait::value_< V >::kind +# define mln_trait_value_kind_(V) mln::trait::value_< V >::kind # define mln_trait_value_quant(V) typename mln::trait::value_< V >::quant +# define mln_trait_value_quant_(V) mln::trait::value_< V >::quant # define mln_nbits(V) mln::trait::value_< V >::nbits Index: trunk/milena/mln/core/fi_adaptor.hh =================================================================== --- trunk/milena/mln/core/fi_adaptor.hh (revision 1619) +++ trunk/milena/mln/core/fi_adaptor.hh (revision 1620) @@ -244,7 +244,7 @@ data_< fi_adaptor >::sync_with_adaptee_() { mln_precondition(fi_ima_.isValid()); - mln_precondition(fi_ima_.getBitsPerPixel() == 8 * sizeof(mln_value(I))); + //FIXME: doesnt work for rgb: mln_precondition(fi_ima_.getBitsPerPixel() == 8 * sizeof(mln_value(I))); deallocate_(); b_ = make::box2d(fi_ima_.getHeight(), Index: trunk/milena/mln/metal/math/max.hh =================================================================== --- trunk/milena/mln/metal/math/max.hh (revision 1619) +++ trunk/milena/mln/metal/math/max.hh (revision 1620) @@ -36,6 +36,8 @@ # include <mln/metal/bool.hh> # include <mln/metal/int.hh> +# define mlc_max(X, Y) typename mln::metal::math::max< X, Y >::ret +# define mlc_max_int(x, y) mln::metal::math::max_int< x, y >::value namespace mln { Index: trunk/milena/mln/accu/count.hh =================================================================== --- trunk/milena/mln/accu/count.hh (revision 1619) +++ trunk/milena/mln/accu/count.hh (revision 1620) @@ -58,6 +58,7 @@ count_(); void init(); + // FIXME : should we add a take() without argument? void take(const argument&); void take(const count_<T>& other); Index: trunk/milena/mln/value/gray.hh (deleted) =================================================================== Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1619) +++ trunk/milena/mln/value/graylevel.hh (revision 1620) @@ -39,11 +39,12 @@ # include <mln/core/contract.hh> # include <mln/metal/math/pow.hh> +# include <mln/metal/math/max.hh> # include <mln/metal/bexpr.hh> # include <mln/literal/ops.hh> # include <mln/value/int_u.hh> -# include <mln/value/gray.hh> +# include <mln/value/internal/gray_.hh> # include <mln/trait/value_.hh> @@ -60,8 +61,9 @@ } namespace value { + /// \{ Fwd decls. - class gray; + class gray_; template <unsigned n> struct graylevel; struct float01_f; /// \} @@ -71,36 +73,38 @@ namespace trait { - // FIXME: Change into - // - for op::plus: mln::value::graylevel<1 + (n > m ? n : m)> - // - for op::times: mln::value::graylevel<n + m> - // - ... template < unsigned n, unsigned m > struct set_precise_binary_< op::plus, mln::value::graylevel<n>, mln::value::graylevel<m> > { - typedef mln::value::gray ret; + typedef mln::value::internal::gray_< mlc_max_int(n, m) > ret; }; template < unsigned n, unsigned m > struct set_precise_binary_< op::minus, mln::value::graylevel<n>, mln::value::graylevel<m> > { - typedef mln::value::gray ret; + typedef mln::value::internal::gray_< mlc_max_int(m, n) > ret; }; template < unsigned n, unsigned m > struct set_precise_binary_< op::times, mln::value::graylevel<n>, mln::value::graylevel<m> > { - typedef mln::value::gray ret; + typedef mln::value::internal::gray_<mlc_max_int(m, n)> ret; }; + template < unsigned n, unsigned m > + struct set_precise_binary_< op::div, mln::value::graylevel<n>, mln::value::graylevel<m> > + { + // FIXME : correct? + typedef mln::value::internal::gray_< mlc_max_int(m, n) > ret; + }; template < unsigned n, typename I > struct set_binary_< op::times, mln::value::Integer, mln::value::graylevel<n>, mln::value::Integer, I > { - typedef mln::value::gray ret; + typedef mln::value::internal::gray_<n> ret; }; template < typename I, unsigned n > @@ -108,7 +112,7 @@ mln::value::Integer, I, mln::value::Integer, mln::value::graylevel<n> > { - typedef mln::value::gray ret; + typedef mln::value::internal::gray_<n> ret; }; @@ -117,7 +121,7 @@ mln::value::Integer, mln::value::graylevel<n>, mln::value::Floating, F > { - typedef float ret; + typedef mln::value::internal::gray_f ret; }; template < typename F, unsigned n > @@ -125,7 +129,7 @@ mln::value::Floating, F, mln::value::Integer, mln::value::graylevel<n> > { - typedef float ret; + typedef mln::value::internal::gray_f ret; }; @@ -134,7 +138,7 @@ { typedef mln_value_equiv(S) E; typedef mlc_equal(E, float) is_float; // FIXME: Or double... - typedef mlc_if(is_float, float, mln::value::gray) ret; + typedef mlc_if(is_float, float, mln::value::internal::gray_<n>) ret; }; template < unsigned n, typename S > @@ -144,7 +148,6 @@ mln::value::scalar_<S>) ret; }; - // 'graylevel<n>' as a value. template <unsigned n> @@ -178,6 +181,62 @@ { /// General gray-level class on n bits. + + // Return types of the operators +-*/. + + // Operators + - return the interoperability type to allow + // operations like (gl8(255) + gl8(255)) / 2. + - with int and + // float are not allowed. + + // If you really need to act with the value + // of the gray_<n> (the encoding). use the to_enc() method. + // + + // |--------------------------------------------| + // | + || gl | glf |gray_i | int | float | + // |============================================| + // |gl ||gray_i|gray_f |gray_i | X | X | + // |--------------------------------------------| + // |glf || |gray_f |gray_f | X | X | + // |--------------------------------------------| + // |gray|| |gray_i | X | X | + // |--------------------------------------------| + + // |--------------------------------------------| + // | - || gl | glf |gray_i | int | float | + // |============================================| + // |gl ||gray_i|gray_f |gray_i | X | X | + // |--------------------------------------------| + // |glf || |gray_f |gray_f | X | X | + // |--------------------------------------------| + // |gray|| |gray_i | X | X | + // |--------------------------------------------| + + // |--------------------------------------------| + // | * || gl | glf |gray_i | int | float | + // |============================================| + // |gl ||gray_i|gray_f |gray_i |gray_i |gray_f | + // |--------------------------------------------| + // |glf || |gray_f |gray_f |gray_f |gray_f | + // |--------------------------------------------| + // |gray|| |gray_i |gray_i |gray_f | + // |--------------------------------------------| + + // |--------------------------------------------| + // | / || gl | glf |gray_i | int | float | + // |============================================| + // |gl ||gray_i|gray_f |gray_i |gray_i |gray_i | + // |--------------------------------------------| + // |glf || |gray_f |gray_f |gray_f |gray_f | + // |--------------------------------------------| + // |gray|| |gray_i |gray_i |gray_f | + // |--------------------------------------------| + + /// Valid convertions : + // glf -> gl (round) + // gl -> gray_i + // gray_i-> gl + template <unsigned n> struct graylevel : @@ -185,38 +244,30 @@ public internal::value_like_< int_u<n>, // Equivalent. mln_enc(int_u<n>), // Encoding. - gray, // Interoperation. + internal::gray_<n>,// Interoperation. graylevel<n> > // Exact. { /// Constructor without argument. graylevel(); - + /// Copy constructor. + graylevel(const graylevel<n>& rhs); + /// Assigment. + graylevel<n>& operator=(const graylevel<n>& rhs); /// Constructor from int. graylevel(int val); - /// Assigment with int. graylevel<n>& operator=(int val); - - /// Constructor from gray. - graylevel(const gray& rhs); - - /// Assigment with gray. - graylevel<n>& operator=(const gray& rhs); - - - /// Copy constructor. - graylevel(const graylevel<n>& rhs); - - /// Assigment. - graylevel<n>& operator=(const graylevel<n>& rhs); + /// Constructor from graylevel_f. + graylevel(const graylevel_f& rhs); + /// Assigment with graylevel_f. + graylevel<n>& operator=(const graylevel_f& rhs); /// Constructor from any graylevel. template <unsigned m> graylevel(const graylevel<m>& rhs); - /// Assigment with any graylevel. template <unsigned m> graylevel<n>& operator=(const graylevel<m>& rhs); @@ -229,11 +280,12 @@ graylevel(const literal::white_t&); /// \} + /// Assigment with literals. /// \{ - graylevel<n>& operator=(const literal::white_t&); - graylevel<n>& operator=(const literal::medium_gray_t&); graylevel<n>& operator=(const literal::black_t&); + graylevel<n>& operator=(const literal::medium_gray_t&); + graylevel<n>& operator=(const literal::white_t&); /// \} @@ -266,49 +318,46 @@ template <unsigned n> std::ostream& operator<<(std::ostream& ostr, const graylevel<n>& g); - - /// Aliases. - typedef graylevel<8> gl8; - typedef graylevel<16> gl16; - typedef graylevel<32> gl32; - - - + // graylevel<n> + graylevel<m> template <unsigned n, unsigned m> - gray + mln_trait_op_plus(graylevel<n>, graylevel<m>) operator+(const graylevel<n>& lhs, const graylevel<m>& rhs); + // graylevel<n> - graylevel<m> template <unsigned n, unsigned m> - gray + mln_trait_op_minus(graylevel<n>, graylevel<m>) operator-(const graylevel<n>& lhs, const graylevel<m>& rhs); + // graylevel<n> * graylevel<m> template <unsigned n, unsigned m> - gray + mln_trait_op_times(graylevel<n>, graylevel<m>) operator*(const graylevel<n>& lhs, const graylevel<m>& rhs); // With Integer. + // graylevel<n> * Integer template <unsigned n, typename I> - gray + mln_trait_op_times(graylevel<n>, Integer) operator*(const graylevel<n>& lhs, const Integer& rhs); + // Integer * graylevel<n> template <typename I, unsigned n> - gray + mln_trait_op_times(Integer, graylevel<n>) operator*(const Integer& lhs, const graylevel<n>& rhs); // With Floating. + // graylevel<n> * Floating<F> template <unsigned n, typename F> - float + mln_trait_op_times(graylevel<n>, Floating<F>) operator*(const graylevel<n>& lhs, const Floating<F>& rhs); + // Floating<F>, graylevel<n> template <typename F, unsigned n> - float + mln_trait_op_times(Floating<F>, graylevel<n>) operator*(const Floating<F>& lhs, const graylevel<n>& rhs); - - # ifndef MLN_INCLUDE_ONLY // Graylevel<n>. @@ -341,25 +390,6 @@ return *this; } - - template <unsigned n> - inline - graylevel<n>::graylevel(const gray& g) - { - gray tmp = g.to_nbits(n); - this->v_ = tmp.value(); - } - - template <unsigned n> - inline - graylevel<n>& - graylevel<n>::operator=(const gray& g) - { - gray tmp = g.to_nbits(n); - this->v_ = tmp.value(); - return *this; - } - template <unsigned n> inline graylevel<n>::graylevel(const graylevel<n>& rhs) @@ -381,7 +411,7 @@ inline graylevel<n>::graylevel(const graylevel<m>& rhs) { - *this = gray(rhs).to_nbits(n); + *this = internal::gray_<m>(rhs); } template <unsigned n> @@ -390,7 +420,7 @@ graylevel<n>& graylevel<n>::operator=(const graylevel<m>& rhs) { - *this = gray(rhs).to_nbits(n); + *this = internal::gray_<m>(rhs); return *this; } @@ -427,6 +457,7 @@ return *this; } + template <unsigned n> inline graylevel<n>::graylevel(const literal::white_t&) @@ -443,7 +474,6 @@ return *this; } - template <unsigned n> inline unsigned @@ -494,7 +524,7 @@ return ostr << g.value() << "/gl" << n; // FIXME: Be more explicit! } - // The remaining operators are in mln/value/gray.hh. + // The remaining operators are in mln/value/internal/gray_.hh. # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/value/graylevel_f.hh =================================================================== --- trunk/milena/mln/value/graylevel_f.hh (revision 0) +++ trunk/milena/mln/value/graylevel_f.hh (revision 1620) @@ -0,0 +1,299 @@ +// Copyright (C) 2006, 2007 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_VALUE_GRAYLEVEL_F_HH +# define MLN_VALUE_GRAYLEVEL_F_HH + +/*! \file mln/value/graylevel_f.hh + * + * \brief Definition of the mln::value::graylevel_f class. + */ + +# include <iostream> + +# include <mln/value/ops.hh> + +# include <mln/core/contract.hh> +# include <mln/metal/math/pow.hh> +# include <mln/metal/bexpr.hh> +# include <mln/literal/ops.hh> + +# include <mln/value/float01_f.hh> +# include <mln/value/internal/gray_.hh> +# include <mln/trait/value_.hh> + + +namespace mln +{ + + namespace literal + { + /// \{ Fwd decls. + struct black_t; + struct medium_gray_t; + struct white_t; + /// \} + } + namespace value + { + /// \{ Fwd decls. + namespace internal {class gray_f; } + struct graylevel_f; + template <unsigned n> struct graylevel; + struct float01_f; + /// \} + } + + + + namespace trait + { + + + template < template <class, class> class Name> + struct set_precise_binary_< Name, mln::value::graylevel_f, mln::value::graylevel_f > + { + typedef mln::value::internal::gray_f ret; + }; + + template <> + struct set_precise_binary_< op::greater, mln::value::graylevel_f, mln::value::graylevel_f > + { + typedef bool ret; + }; + + template <> + struct set_precise_binary_< op::eq, mln::value::graylevel_f, mln::value::graylevel_f > + { + typedef bool ret; + }; + + /// Forward declaration. + template <typename T> struct value_; + + // 'graylevel_f' as a value. + template <> + struct value_<mln::value::graylevel_f> + { + private: + typedef mln::value::graylevel_f self_; + typedef mln::value::float01_f equiv_; + + public: + + enum { + nbits = mln_nbits(equiv_), + card = 0 + }; + + typedef trait::value::nature::floating nature; + typedef trait::value::kind::gray kind; + typedef mln_trait_value_quant_(equiv_) quant; + + static const equiv_ min() { return 0; } + static const equiv_ max() { return 1; } + static const equiv_ epsilon() { return mln_epsilon(equiv_); } + + typedef float sum; + }; + + } // end of namespace mln::trait + + + + namespace value + { + + /// General gray-level class on n bits. + struct graylevel_f + : + public Floating< graylevel_f >, + + public internal::value_like_< float01_f, // Equivalent. + mln_enc_(float01_f),// Encoding. + internal::gray_f, // Interoperation. + graylevel_f > // Exact. + { + /// Constructor without argument. + graylevel_f(); + /// Copy constructor. + graylevel_f(const graylevel_f& rhs); + /// Assigment. + graylevel_f& operator=(const graylevel_f& rhs); + + + /// Constructor from float. + graylevel_f(float val); + /// Assigment with float. + graylevel_f& operator=(float val); + + /// Constructor from graylevel. + template <unsigned n> + graylevel_f(const graylevel<n>& rhs); + /// Assigment with graylevel. + template <unsigned n> + graylevel_f& operator=(const graylevel<n>& rhs); + + /// Ctors with literals. + /// \{ + graylevel_f(const literal::black_t&); + graylevel_f(const literal::medium_gray_t&); + graylevel_f(const literal::white_t&); + /// \} + + /// Assigment with literals. + /// \{ + graylevel_f& operator=(const literal::black_t&); + graylevel_f& operator=(const literal::medium_gray_t&); + graylevel_f& operator=(const literal::white_t&); + /// \} + + /// Access to std type. + float value() const; + }; + + + // Operators. + + /// Op<<. + std::ostream& operator<<(std::ostream& ostr, const graylevel_f& g); + +# ifndef MLN_INCLUDE_ONLY + + // graylevel_f. + + inline + graylevel_f::graylevel_f() + { + } + + + inline + graylevel_f::graylevel_f(float val) + { + this->v_ = val; + } + + inline + graylevel_f& + graylevel_f::operator=(float val) + { + this->v_ = val; + return *this; + } + + template <unsigned n> + graylevel_f::graylevel_f(const graylevel<n>& rhs) + { + this->v_ = rhs.to_float(); + } + + template <unsigned n> + graylevel_f& + graylevel_f::operator=(const graylevel<n>& rhs) + { + this->v_ = rhs.to_float(); + } + + inline + graylevel_f::graylevel_f(const graylevel_f& rhs) + { + this->v_ = rhs.v_; + } + + inline + graylevel_f& + graylevel_f::operator=(const graylevel_f& rhs) + { + this->v_ = rhs.v_; + return *this; + } + + inline + graylevel_f::graylevel_f(const literal::black_t&) + { + this->v_ = 0.0f; + } + + inline + graylevel_f& + graylevel_f::operator=(const literal::black_t&) + { + this->v_ = 0.0f; + return *this; + } + + inline + graylevel_f::graylevel_f(const literal::medium_gray_t&) + { + this->v_ = 0.5f; + } + + inline + graylevel_f& + graylevel_f::operator=(const literal::medium_gray_t&) + { + this->v_ = 0.5f; + return *this; + } + + inline + graylevel_f::graylevel_f(const literal::white_t&) + { + this->v_ = 1.0f; + } + + inline + graylevel_f& + graylevel_f::operator=(const literal::white_t&) + { + this->v_ = 1.0f; + return *this; + } + + inline + float + graylevel_f::value() const + { + return this->v_; + } + + // Operators. + + inline + std::ostream& operator<<(std::ostream& ostr, const graylevel_f& g) + { + return ostr << g.value() << "/gl_f"; // FIXME: Be more explicit! + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln::value + + } // end of namespace mln + +#endif // ! MLN_VALUE_GRAYLEVEL_F_HH Index: trunk/milena/mln/value/glf.hh =================================================================== --- trunk/milena/mln/value/glf.hh (revision 0) +++ trunk/milena/mln/value/glf.hh (revision 1620) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 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_VALUE_GLF_HH +# define MLN_VALUE_GLF_HH + +/*! \file mln/value/glf.hh + * + * \brief Define the alias value::glf. + */ + +# include <mln/value/graylevel_f.hh> + + +namespace mln +{ + + namespace value + { + + + /// Alias for 8 bit graylevel. + typedef graylevel_f glf; + + + } // end of namespace mln::value + +} // end of namespace mln + + +#endif // ! MLN_VALUE_GLF_HH Index: trunk/milena/mln/value/internal/gray_.hh =================================================================== --- trunk/milena/mln/value/internal/gray_.hh (revision 0) +++ trunk/milena/mln/value/internal/gray_.hh (revision 1620) @@ -0,0 +1,633 @@ +// Copyright (C) 2006, 2007 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_VALUE_INTERNAL_GRAY__HH +# define MLN_VALUE_INTERNAL_GRAY__HH + +/*! \file mln/value/internal/gray_.hh + * + * \brief FIXME. + * + */ + +# include <iostream> +# include <cmath> + +# include <mln/metal/math/max.hh> +# include <mln/metal/math/pow.hh> + +# include <mln/value/graylevel.hh> +# include <mln/value/graylevel_f.hh> +# include <mln/value/concept/integer.hh> + + +namespace mln +{ + + namespace literal + { + /// \{ Fwd decls. + struct black_t; + struct white_t; + /// \} + } + + namespace value + { + /// \{ Fwd decls. + template <unsigned N> class graylevel; + class graylevel_f; + namespace internal { template <unsigned n> class gray_; } + /// \} + } + + + namespace trait + { + + template < template <class, class> class Name, unsigned n, unsigned m> + struct set_precise_binary_< Name, mln::value::internal::gray_<n>, mln::value::internal::gray_<m> > + { + typedef mln::value::internal::gray_< mlc_max_int(n, m) > ret; + }; + + template <unsigned n, unsigned m> + struct set_precise_binary_< op::greater, mln::value::internal::gray_<n>, mln::value::internal::gray_<m> > + { + typedef bool ret; + }; + + template <unsigned n, unsigned m> + struct set_precise_binary_< op::eq, mln::value::internal::gray_<n>, mln::value::internal::gray_<m> > + { + typedef bool ret; + }; + + // 'gray_' as a value. + + template <unsigned n> + struct value_< mln::value::internal::gray_<n> > + { + private: + typedef mln::value::internal::gray_<n> self_; + public: + + enum { + nbits = 8 * (sizeof(unsigned) + sizeof(long)), + card = 0 + }; + + typedef trait::value::nature::integer nature; // FIXME: Or scalar? + typedef trait::value::kind::gray kind; + typedef trait::value::quant::high quant; + + static const self_ min(); + static const self_ max(); + static const self_ epsilon(); + + typedef self_ sum; // FIXME: OK? + }; + + } // end of namespace mln::trait + + + + namespace value + { + + namespace internal + { + + /// \internal General gray-level class where n bits is not know at compile-time. + /// This class is used for exchange between gray-level types purpose. + template <unsigned n> + class gray_ + : + public Integer< gray_<n> >, + + public internal::value_like_< int, // Equivalent. + int, // Encoding. + gray_<n>, // Interoperation. + gray_<n> > // Exact. + + { + public: + + /// Encoding associated type. + typedef int enc; + + /// Equivalent associated type. + typedef int equiv; + + /// Constructor without argument. + gray_(); + /// Constructor with int. + gray_(int val); + + /// \{ Constructors/assignments with literals. + explicit gray_(const literal::white_t&); + explicit gray_(const literal::black_t&); + /// \} + + + /// \{ Constructors/assigments with graylevel. + template <unsigned m> + gray_(const graylevel<m>& val); + template <unsigned m> + gray_<n>& operator=(const graylevel<m>& val); + /// \} + + /// Access to std type. + int value() const; + + /// Return an equivalent gray_ encoded on \p nbits bits. + template <unsigned m> + operator gray_<m>() const; + + /// Convertion to graylevel. + template <unsigned m> + operator graylevel<m>() const; + + /// Convertion to graylevel_f. +// operator graylevel_f() const; + }; + + + // Operators. + + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const gray_<n>& g); + + template <unsigned n, unsigned m> + bool operator==(const gray_<n>& lhs, const gray_<m>& rhs); + template <unsigned n, unsigned m> + bool operator<(const gray_<n>& lhs, const gray_<m>& rhs); + + template <unsigned n, unsigned m> + mln_trait_op_plus(gray_<n>, gray_<m>) + operator+(const gray_<n>& lhs, const gray_<m>& rhs); + + template <unsigned n, unsigned m> + mln_trait_op_minus(gray_<n>, gray_<m>) + operator-(const gray_<n>& lhs, const gray_<m>& rhs); + + template <unsigned n> + gray_<n> operator*(int s, const gray_<n>& rhs); + template <unsigned n> + gray_<n> operator*(const gray_<n>& lhs, int s); + template <unsigned n> + gray_<n> operator/(const gray_<n>& lhs, int s); + + } // end of namespace mln::value::internal + +} // end of namespace mln::value + + + +# ifndef MLN_INCLUDE_ONLY + + namespace value + { + namespace internal + { + + template <unsigned n_src, unsigned n_dest> + inline + long convert(int val) + { + using typename mln::metal::int_; + typedef mlc_max(int_<n_dest - n_src> , int_<n_src - n_dest>) m; + + if (n_dest == n_src) + return val; + else + if (n_dest > n_src) + return val * mlc_pow_int(2, m::value); + else + return val / mlc_pow_int(2, m::value); + } + + // Gray_<N>. + + template <unsigned n> + inline + gray_<n>::gray_() + { + } + + template <unsigned n> + template <unsigned m> + gray_<n>::gray_(const graylevel<m>& g) + { + this->v_ = convert<m, n>(g.value()); + } + + template <unsigned n> + template <unsigned m> + inline + gray_<n>& + gray_<n>::operator=(const graylevel<m>& g) + { + this->v_ = convert<m, n>(g.value()); + return *this; + } + + template <unsigned n> + inline + gray_<n>::gray_(const literal::white_t&) + { + this->v_ = mlc_pow_int(2, n) - 1; + } + + template <unsigned n> + inline + gray_<n>::gray_(const literal::black_t&) + { + this->v_ = 0; + } + + template <unsigned n> + inline + gray_<n>::gray_(int val) + { + this->v_ = val; + } + + template <unsigned n> + inline + int + gray_<n>::value() const + { + return this->v_; + } + + template <unsigned n> + template <unsigned m> + inline + gray_<n>::operator gray_<m>() const + { + return gray_<m>(convert<n, m>(this->v_)); + } + + + template <unsigned n> + template <unsigned m> + inline + gray_<n>::operator graylevel<m>() const + { + graylevel<m> tmp(convert<n, m>(this->v_)); + mln_assertion(tmp.value() < std::pow(2.f, int(m))); + return tmp; + } + + + // Operators. + + template <unsigned n> + inline + std::ostream& operator<<(std::ostream& ostr, const gray_<n>& g) + { + return ostr << g.value() << "g/" << n << "bits"; + } + + template <unsigned n, unsigned m> + inline + bool operator==(const gray_<n>& lhs, const gray_<m>& rhs) + { + if (n == m) + return internal::gray_<mlc_max_int(n, m)>(lhs).value() == + internal::gray_<mlc_max_int(n, m)>(rhs).value(); + if (n > m) + { + gray_<n> down = rhs; + gray_<n> up(down.value() + + mlc_pow_int(2, m)); + return (lhs.value() >= down.value() && lhs.value() < up.value()); + } + else + { + gray_<m> down = lhs; + gray_<m> up(down.value() + + mlc_pow_int(2, n)); + return (rhs.value() >= down.value() && rhs.value() < up.value()); + } + } + + template <unsigned n, unsigned m> + inline + bool operator<(const gray_<n>& lhs, const gray_<m>& rhs) + { + if (m == n) + return lhs.value() < rhs.value(); + if (n > m) + return lhs.value() < gray_<n>(rhs).value(); + else + return gray_<m>(lhs).value() < rhs.value(); + } + + template <unsigned n, unsigned m> + inline + mln_trait_op_plus(gray_<n>, gray_<m>) + operator+(const gray_<n>& lhs, const gray_<m>& rhs) + { + typedef mln_trait_op_plus(gray_<n>, gray_<m>) ret; + if (n > m) + { + ret tmp(ret(lhs).value() + ret(rhs).value()); + return tmp; + } + else + { + ret tmp(ret(lhs).value() + ret(rhs).value()); + return tmp; + } + } + + template <unsigned n, unsigned m> + inline + mln_trait_op_minus(gray_<n>, gray_<m>) + operator-(const gray_<n>& lhs, const gray_<m>& rhs) + { + typedef mln_trait_op_minus(gray_<n>, gray_<m>) ret; + + + if (lhs == rhs) + return ret(0); + if (n == m) + return ret(lhs.value() - rhs.value()); + if (n > m) + { + ret l = rhs; + mln_assertion(lhs.value() >= l.value()); + ret tmp(lhs.value() - l.value()); + return tmp; + } + else + { + ret l = lhs; + mln_assertion(l.value() >= rhs.value()); + ret tmp(l.value() - rhs.value()); + return tmp; + } + } + + template <unsigned n, unsigned m> + inline + mln_trait_op_times(gray_<n>, gray_<m>) + operator*(const gray_<n>& lhs, const gray_<m>& rhs) + { + typedef mln_trait_op_times(gray_<n>, gray_<m>) ret; + + return ret(ret(lhs).value() * ret(rhs).value()); + } + + template <unsigned n> + inline + gray_<n> operator*(int s, const gray_<n>& rhs) + { + gray_<n> tmp(rhs.value() * s); + return tmp; + } + + template <unsigned n> + inline + gray_<n> operator*(const gray_<n>& lhs, int s) + { + gray_<n> tmp(lhs.value() * s); + return tmp; + } + + template <unsigned n> + inline + gray_<n> operator/(const gray_<n>& lhs, int s) + { + mln_precondition(s != 0); + gray_<n> tmp(lhs.value() / s); + return tmp; + } + + } // end of namespace mln::value::internal + + // Graylevel operators. + + // Op gl == Int + + template <typename I, unsigned n> + inline + bool + operator==(const Integer& lhs, const graylevel<n>& rhs) + { + return rhs.value() == exact(lhs); + } + + // Op gl == gl + + template <unsigned n, unsigned m> + inline + bool + operator==(const graylevel<n>& lhs, const graylevel<m>& rhs) + { + return internal::gray_<n>(rhs) == internal::gray_<m>(lhs); + } + + // Op gl + gl + + template <unsigned n, unsigned m> + inline + mln_trait_op_plus(graylevel<n>, graylevel<m>) + operator+(const graylevel<n>& lhs, const graylevel<m>& rhs) + { + return internal::gray_<n>(lhs) + internal::gray_<m>(rhs); + } + + // Op gl - gl + + template <unsigned n, unsigned m> + inline + mln_trait_op_minus(graylevel<n>, graylevel<m>) + operator-(const graylevel<n>& lhs, const graylevel<m>& rhs) + { + return internal::gray_<n>(lhs) - internal::gray_<m>(rhs); + } + + // Op gl * gl + + template <unsigned n, unsigned m> + inline + mln_trait_op_times(graylevel<n>, graylevel<m>) + operator*(const graylevel<n>& lhs, const graylevel<m>& rhs) + { + return internal::gray_<n>(lhs) * internal::gray_<m>(rhs); + } + + // Op symm gl * Int + + template <unsigned n, typename I> + inline + mln_trait_op_times(graylevel<n>, Integer) + operator*(const graylevel<n>& lhs, const Integer& rhs) + { + return internal::gray_<n>(lhs) * int(exact(rhs)); + } + + template <typename I, unsigned n> + inline + mln_trait_op_times(Integer, graylevel<n>) + operator*(const Integer& lhs, const graylevel<n>& rhs) + { + return internal::gray_<n>(rhs) * int(exact(lhs)); + } + + // Op symm gl * Float + + template <unsigned n, typename F> + inline + mln_trait_op_times(graylevel<n>, Floating<F>) + operator*(const graylevel<n>& lhs, const Floating<F>& rhs) + { + return lhs.to_float() * exact(rhs); + } + + template <typename F, unsigned n> + inline + mln_trait_op_times(Floating<F>, graylevel<n>) + operator*(const Floating<F>& lhs, const graylevel<n>& rhs) + { + return rhs.to_float() * exact(lhs); + } + + + + // Op * scalar + + namespace internal + { + + template <typename ret> + struct helper_gray__op_; + + template <unsigned n> + struct helper_gray__op_< gray_<n> > + { + template <unsigned m, typename S> + inline + static gray_<n> times(const graylevel<m>& lhs, const scalar_<S>& rhs) + { + gray_<n> tmp(lhs.value() * rhs.to_equiv()); + return tmp; + } + template <unsigned m, typename S> + inline + static gray_<n> div(const graylevel<m>& lhs, const scalar_<S>& rhs) + { + gray_<n> tmp(lhs.value() / rhs.to_equiv()); + return tmp; + } + }; + + template <> + struct helper_gray__op_< float > + { + template <unsigned n, typename S> + inline + static float times(const graylevel<n>& lhs, const scalar_<S>& rhs) + { + float tmp(lhs.to_float() * float(rhs.to_equiv())); + return tmp; + } + template <unsigned n, typename S> + inline + static float div(const graylevel<n>& lhs, const scalar_<S>& rhs) + { + float tmp(lhs.to_float() / float(rhs.to_equiv())); + return tmp; + } + }; + + } // end of namespace mln::value::internal + + template <unsigned n, typename S> + inline + mln_trait_op_times(graylevel<n>, scalar_<S>) + operator*(const graylevel<n>& lhs, const scalar_<S>& rhs) + { + typedef mln_trait_op_times(graylevel<n>, scalar_<S>) ret; + return internal::helper_gray__op_<ret>::times(lhs, rhs); + } + + template <unsigned n, typename S> + inline + mln_trait_op_div(graylevel<n>, scalar_<S>) + operator/(const graylevel<n>& lhs, const scalar_<S>& rhs) + { + mln_precondition(rhs.to_equiv() != 0); + typedef mln_trait_op_div(graylevel<n>, scalar_<S>) ret; + return internal::helper_gray__op_<ret>::div(lhs, rhs); + } + + } // end of namespace mln::value + + + +namespace trait +{ + + // 'gray_<n>' as a value. + + template <unsigned n> + inline + const mln::value::internal::gray_<n> + value_< mln::value::internal::gray_<n> >::min() + { + return mln::value::internal::gray_<n>(1, 0); + } + + template <unsigned n> + inline + const mln::value::internal::gray_<n> + value_< mln::value::internal::gray_<n> >::max() + { + return mln::value::internal::gray_<n>(1, 1); + } + + template <unsigned n> + inline + const mln::value::internal::gray_<n> + value_< mln::value::internal::gray_<n> >::epsilon() + { + return mln::value::internal::gray_<n>(1, 0); // Means '0'. + } + +} // end of namespace mln::trait + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_INTERNAL_VALUE_GRAY__HH Index: trunk/milena/mln/value/internal/gray_f.hh =================================================================== --- trunk/milena/mln/value/internal/gray_f.hh (revision 0) +++ trunk/milena/mln/value/internal/gray_f.hh (revision 1620) @@ -0,0 +1,273 @@ +// Copyright (C) 2006, 2007 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_VALUE_INTERNAL_GRAY_F_HH +# define MLN_VALUE_INTERNAL_GRAY_F_HH + +/*! \file mln/value/internal/gray_f.hh + * + * \brief Definition of the mln::value::gray_f class. + */ + +# include <iostream> + +# include <mln/value/ops.hh> + +# include <mln/core/contract.hh> +# include <mln/metal/math/pow.hh> +# include <mln/math/two_pow.hh> +# include <mln/metal/bexpr.hh> +# include <mln/literal/ops.hh> + +# include <mln/value/float01_f.hh> +# include <mln/value/gray.hh> +# include <mln/trait/value_.hh> + + +namespace mln +{ + + namespace literal + { + /// \{ Fwd decls. + struct black_t; + struct medium_gray_t; + struct white_t; + /// \} + } + namespace value + { + /// \{ Fwd decls. + class gray; + struct gray_f; + struct float01_f; + /// \} + } + + + + namespace trait + { + + + template < template <class, class> class Name> + struct set_precise_binary_< Name, mln::value::gray_f, mln::value::gray_f > + { + typedef mln::value::gray_f ret; + }; + + struct set_precise_binary_< op::greater, mln::value::gray_f, mln::value::gray_f > + { + typedef bool ret; + }; + + struct set_precise_binary_< op::eq, mln::value::gray_f, mln::value::gray_f > + { + typedef bool ret; + }; + + // Nessecary?? +// template <typename F> +// struct set_binary_< op::eq, +// mln::value::Floating, mln::value::gray_f, +// mln::value::Floating, F > +// { +// typedef bool ret; +// }; + + /// Forward declaration. + template <typename T> struct value_; + + // 'gray_f' as a value. + template <> + struct value_<mln::value::gray_f> + { + private: + typedef mln::value::gray_f self_; + typedef float equiv_; + + public: + + enum { + nbits = mln_nbits(equiv_), + card = 0 + }; + + typedef trait::value::nature::floating nature; + typedef trait::value::kind::gray kind; + typedef mln_trait_value_quant_(equiv_) quant; + + static const equiv_ min() { return 0; } + static const equiv_ max() { return 1; } + static const equiv_ epsilon() { return mln_epsilon(equiv_); } + + typedef float sum; + }; + + } // end of namespace mln::trait + + + + namespace value + { + + namespace internal + { + + /// \internal General gray-level class on n bits. + struct gray_f + : + public Floating< gray_f >, + + public internal::value_like_< float, // Equivalent. + float, // Encoding. + gray_f, // Interoperation. + gray_f > // Exact. + { + /// Constructor without argument. + gray_f(); + + /// \{ Constructors/assigments with gray_f. + gray_f(const gray_f& rhs); + gray_f& operator=(const gray_f& rhs); + /// \} + + /// \{ Constructors/assigments with float. + gray_f(float val); + gray_f& operator=(float val); + /// \} + + /// \{ Constructors/assigments with graylevel_f. + gray_f(const graylevel_f& val); + gray_f& operator=(const graylevel_f& val); + /// \} + + /// Convertion to graylevel<n> + template <unsigned m> + operator graylevel<m>() const; + + /// Convertion to graylevel_f + operator graylevel_f() const; + + /// Access to std type. + float value() const; + }; + + // Operators. + + /// \internal Op<<. + std::ostream& operator<<(std::ostream& ostr, const gray_f& g); + +# ifndef MLN_INCLUDE_ONLY + + // gray_f. + + inline + gray_f::gray_f() + { + } + + inline + gray_f::gray_f(const gray_f& g) + : v_(g.v_) + { + } + + inline + gray_f& + gray_f::operator=(const gray_f& g) + { + this->v_ = g.v_; + return *this; + } + + inline + gray_f::gray_f(float val) + { + this->v_ = val; + } + + inline + gray_f& + gray_f::operator=(float val) + { + this->v_ = val; + return *this; + } + + inline + gray_f& + gray_f::gray_f(const graylevel_f& rhs) + : v_(rhs.v_) + { + } + + inline + gray_f& + gray_f::gray_f& operator=(const graylevel_f& rhs) + { + this->v_ = rhs.v_; + return *this; + } + + template <unsigned m> + inline + gray_f::operator graylevel<m>() const + { + return graylevel<m>(round(this->v_ * (mlc_pow_int(2, m) - 1))); + } + + inline + gray_f::operator graylevel_f() const + { + return graylevel_f(this->v_); + } + + inline + float + gray_f::value() const + { + return this->v_; + } + + // Operators. + + inline + std::ostream& operator<<(std::ostream& ostr, const gray_f& g) + { + return ostr << g.value() << "/gl_f"; // FIXME: Be more explicit! + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::value::internal + + } // end of namespace mln::value + +} // end of namespace mln + +#endif // ! MLN_VALUE_GRAY_F_HH

1 0

milena r1619: Add briefs to fill out user documentation
by Guillaume Duhamel 19 Dec '07

19 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add briefs to fill out user documentation. * mln/accu/bbox.hh, * mln/accu/compute.hh, * mln/accu/count.hh, * mln/accu/histo.hh, * mln/accu/max.hh, * mln/accu/max_h.hh, * mln/accu/mean.hh, * mln/accu/median.hh, * mln/accu/median_alt.hh, * mln/accu/min.hh, * mln/accu/min_h.hh, * mln/accu/min_max.hh, * mln/accu/nil.hh, * mln/accu/p.hh, * mln/accu/pair.hh, * mln/accu/sum.hh, * mln/accu/take.hh, * mln/accu/v.hh, * mln/core/concept/function.hh, * mln/core/mesh_window_piter.hh, * mln/fun/v2v/linear.hh, * mln/trait/promote.hh, * mln/util/ordpair.hh, * mln/value/lut_vec.hh, * mln/value/set.hh: Fix briefs of structures/classes of these files. * doc/Makefile.am: Remove the generation of the TODO list in user documentation. --- doc/Makefile.am | 1 mln/accu/bbox.hh | 2 - mln/accu/compute.hh | 13 +++++++- mln/accu/count.hh | 9 ++++- mln/accu/histo.hh | 4 +- mln/accu/max.hh | 6 ++- mln/accu/max_h.hh | 2 - mln/accu/mean.hh | 7 ++-- mln/accu/median.hh | 4 +- mln/accu/median_alt.hh | 4 +- mln/accu/min.hh | 6 ++- mln/accu/min_h.hh | 4 +- mln/accu/min_max.hh | 2 - mln/accu/nil.hh | 8 +++-- mln/accu/p.hh | 8 +++-- mln/accu/pair.hh | 8 ++--- mln/accu/sum.hh | 6 ++- mln/accu/take.hh | 2 - mln/accu/v.hh | 8 +++-- mln/core/concept/function.hh | 66 +++++++++++++++++++++++++++++++----------- mln/core/mesh_window_piter.hh | 9 +++-- mln/fun/v2v/linear.hh | 5 +-- mln/trait/promote.hh | 8 +++-- mln/util/ordpair.hh | 9 +++-- mln/value/lut_vec.hh | 2 - mln/value/set.hh | 4 +- 26 files changed, 139 insertions(+), 68 deletions(-) Index: trunk/milena/doc/Makefile.am =================================================================== --- trunk/milena/doc/Makefile.am (revision 1618) +++ trunk/milena/doc/Makefile.am (revision 1619) @@ -32,6 +32,7 @@ -e 's,HIDE_FRIEND_COMPOUNDS = NO,HIDE_FRIEND_COMPOUNDS = YES,g' \ -e 's,HIDE_IN_BODY_DOCS = NO,HIDE_IN_BODY_DOCS = YES,g' \ -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ + -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' EXTRA_DIST = Doxyfile.in Index: trunk/milena/mln/trait/promote.hh =================================================================== --- trunk/milena/mln/trait/promote.hh (revision 1618) +++ trunk/milena/mln/trait/promote.hh (revision 1619) @@ -61,9 +61,11 @@ }; - /// Default case when one type is involved twice: the promotion - /// type is the same as the input type (so actually there is no - /// promotion). + /*! + * \brief Default case when one type is involved twice: the + * promotion type is the same as the input type (so actually there + * is no promotion). + */ template <typename T> struct set_binary_< promote, Object, T, Object, T > { Index: trunk/milena/mln/core/mesh_window_piter.hh =================================================================== --- trunk/milena/mln/core/mesh_window_piter.hh (revision 1618) +++ trunk/milena/mln/core/mesh_window_piter.hh (revision 1619) @@ -28,9 +28,12 @@ #ifndef MLN_CORE_MESH_WINDOW_PITER_HH # define MLN_CORE_MESH_WINDOW_PITER_HH -// FIXME: Doc. - -// FIXME: Shall we rename `piter' as `qiter'? +/*! + * \file mln/core/mesh_window_piter.hh + * + * \brief Definition of point iterator of mesh window. + * + */ # include <mln/core/concept/point_iterator.hh> # include <mln/core/mesh_p.hh> Index: trunk/milena/mln/core/concept/function.hh =================================================================== --- trunk/milena/mln/core/concept/function.hh (revision 1618) +++ trunk/milena/mln/core/concept/function.hh (revision 1619) @@ -41,6 +41,7 @@ /// \{ /// Fwd decls. + template <typename E> struct Function; template <typename E> struct Function_v2v; template <typename E> struct Function_i2v; @@ -85,8 +86,12 @@ template <> struct Function_v2v<void> { typedef Function<void> super; }; - /// Base class for implementation of function-objects from value to - /// value. + /*! + * \brief Base class for implementation of function-objects from + * value to value. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_v2v : public Function<E> { @@ -102,8 +107,13 @@ template <> struct Function_i2v<void> { typedef Function_v2v<void> super; }; - /// Base class for implementation of function-objects from index to - /// value. + + /*! + * \brief Base class for implementation of function-objects from + * index to value. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_i2v : public Function_v2v<E> { @@ -119,8 +129,12 @@ template <> struct Function_p2v<void> { typedef Function_v2v<void> super; }; - /// Base class for implementation of function-objects from point to - /// value. + /*! + * \brief Base class for implementation of function-objects from point to + * value. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_p2v : public virtual Function_v2v<E> { @@ -136,8 +150,12 @@ template <> struct Function_v2b<void> { typedef Function_v2v<void> super; }; - /// Base class for implementation of function-objects from value to - /// bool. + /*! + * \brief Base class for implementation of function-objects from value to + * bool. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_v2b : public virtual Function_v2v<E> { @@ -154,8 +172,12 @@ template <> struct Function_p2b<void> { typedef Function_p2v<void> super; }; // FIXME - /// Base class for implementation of function-objects from point to - /// bool. + /*! + * \brief Base class for implementation of function-objects from point to + * bool. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_p2b : public Function_p2v<E>, public Function_v2b<E> @@ -173,8 +195,12 @@ template <> struct Function_p2p<void> { typedef Function_p2v<void> super; }; // FIXME - /// Base class for implementation of function-objects from point to - /// point. + /*! + * \brief Base class for implementation of function-objects from point to + * point. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_p2p : public Function_p2v<E> { @@ -190,8 +216,12 @@ template <> struct Function_x2x<void> { typedef Function_v2v<void> super; }; // FIXME - /// Base class for implementation of function-objects from vector to - /// vector. + /*! + * \brief Base class for implementation of function-objects from vector to + * vector. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Function_x2x : public Function_v2v<E> { @@ -203,8 +233,12 @@ // Vector <-> Vector. - /// Base class for implementation of bijective function-objects from - /// vector to vector. + /*! + * \brief Base class for implementation of bijective function-objects from + * vector to vector. + * + * The parameter \a E is the exact type. + */ template <typename E> struct Bijection_x2x : public Function_x2x< E > { Index: trunk/milena/mln/accu/nil.hh =================================================================== --- trunk/milena/mln/accu/nil.hh (revision 1618) +++ trunk/milena/mln/accu/nil.hh (revision 1619) @@ -47,7 +47,8 @@ namespace accu { - /*! Define an accumulator that does nothing. + /*! + * \brief Define an accumulator that does nothing. */ template <typename T> struct nil_ : public mln::accu::internal::base_< util::ignore , nil_<T> > @@ -66,8 +67,9 @@ }; - - // FIXME: Doc! + /*! + * \brief Meta accumulator for nil. + */ struct nil : public Meta_Accumulator< nil > { template <typename V> Index: trunk/milena/mln/accu/min.hh =================================================================== --- trunk/milena/mln/accu/min.hh (revision 1618) +++ trunk/milena/mln/accu/min.hh (revision 1619) @@ -46,7 +46,7 @@ { - /*! Generic min accumulator class. + /*! \brief Generic min accumulator class. * * The parameter \c T is the type of values. */ @@ -74,7 +74,9 @@ template <typename I> struct min_< util::pix >; - // FIXME: Doc! + /*! + * \brief Meta accumulator for min. + */ struct min : public Meta_Accumulator< min > { template <typename T> Index: trunk/milena/mln/accu/take.hh =================================================================== --- trunk/milena/mln/accu/take.hh (revision 1618) +++ trunk/milena/mln/accu/take.hh (revision 1619) @@ -44,7 +44,7 @@ namespace accu { - /*! Make an accumulator take the pixels of the image \p input. + /*! \brief Make an accumulator take the pixels of the image \p input. * * \param[in] input The input image. * \param[in,out] a The accumulator. Index: trunk/milena/mln/accu/max.hh =================================================================== --- trunk/milena/mln/accu/max.hh (revision 1618) +++ trunk/milena/mln/accu/max.hh (revision 1619) @@ -46,7 +46,7 @@ { - /*! Generic max accumulator class. + /*! \brief Generic max accumulator class. * * The parameter \c T is the type of values. */ @@ -74,7 +74,9 @@ template <typename I> struct max_< util::pix >; - // FIXME: Doc! + /*! + * \brief Meta accumulator for max. + */ struct max : public Meta_Accumulator< max > { template <typename T> Index: trunk/milena/mln/accu/histo.hh =================================================================== --- trunk/milena/mln/accu/histo.hh (revision 1618) +++ trunk/milena/mln/accu/histo.hh (revision 1619) @@ -50,7 +50,8 @@ { - /*! Generic histogram class over a value set with type \c S. + /*! + * \brief Generic histogram class over a value set with type \c S. */ template <typename S> struct histo : public mln::accu::internal::base_< const std::vector<std::size_t>& , histo<S> > @@ -83,7 +84,6 @@ std::size_t sum_; }; - template <typename S> std::ostream& operator<<(std::ostream& ostr, const histo<S>& h); Index: trunk/milena/mln/accu/min_max.hh =================================================================== --- trunk/milena/mln/accu/min_max.hh (revision 1618) +++ trunk/milena/mln/accu/min_max.hh (revision 1619) @@ -50,7 +50,7 @@ namespace accu { - /*! Generic min and max accumulator class. + /*! \brief Generic min and max accumulator class. * * The parameter \c V is the type of values. */ Index: trunk/milena/mln/accu/count.hh =================================================================== --- trunk/milena/mln/accu/count.hh (revision 1618) +++ trunk/milena/mln/accu/count.hh (revision 1619) @@ -44,7 +44,10 @@ { - /*! Generic counter accumulator class. + /*! + * \brief Generic counter accumulator class. + * + * The parameter \a T is the type to be count. */ template <typename T> struct count_ : public mln::accu::internal::base_< std::size_t , count_<T> > @@ -67,7 +70,9 @@ }; - // FIXME: Doc! + /*! + * \brief Meta accumulator for count. + */ struct count : public Meta_Accumulator< count > { template <typename T> Index: trunk/milena/mln/accu/bbox.hh =================================================================== --- trunk/milena/mln/accu/bbox.hh (revision 1618) +++ trunk/milena/mln/accu/bbox.hh (revision 1619) @@ -44,7 +44,7 @@ { - /*! Generic bbox accumulator class. + /*! \brief Generic bbox accumulator class. * * The parameter \c P is the type of points. */ Index: trunk/milena/mln/accu/min_h.hh =================================================================== --- trunk/milena/mln/accu/min_h.hh (revision 1618) +++ trunk/milena/mln/accu/min_h.hh (revision 1619) @@ -44,8 +44,8 @@ { - /*! Generic min function based on histogram over a value set with - * type \c S. + /*! \brief Generic min function based on histogram over a value + * set with type \c S. */ template <typename S> struct min_h : public mln::accu::internal::base_< mln_value(S) , min_h<S> > Index: trunk/milena/mln/accu/pair.hh =================================================================== --- trunk/milena/mln/accu/pair.hh (revision 1618) +++ trunk/milena/mln/accu/pair.hh (revision 1619) @@ -49,7 +49,7 @@ { - /*! Generic pair of accumulators. + /*! \brief Generic pair of accumulators. * * The parameter \c T is the type of values. * @@ -81,9 +81,9 @@ A2 a2_; }; - - - // FIXME: Doc! + /*! + * \brief Meta accumulator for pair. + */ template <typename A1, typename A2> struct pair : public Meta_Accumulator< pair<A1,A2> > { Index: trunk/milena/mln/accu/max_h.hh =================================================================== --- trunk/milena/mln/accu/max_h.hh (revision 1618) +++ trunk/milena/mln/accu/max_h.hh (revision 1619) @@ -44,7 +44,7 @@ { - /*! Generic max function based on histogram over a value set with + /*! \brief Generic max function based on histogram over a value set with * type \c S. */ template <typename S> Index: trunk/milena/mln/accu/median.hh =================================================================== --- trunk/milena/mln/accu/median.hh (revision 1618) +++ trunk/milena/mln/accu/median.hh (revision 1619) @@ -44,8 +44,8 @@ { - /*! Generic median function based on histogram over a value set - * with type \c S. + /*! \brief Generic median function based on histogram over a value + * set with type \c S. */ template <typename S> struct median : public mln::accu::internal::base_< mln_value(S), median<S> > Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1618) +++ trunk/milena/mln/accu/median_alt.hh (revision 1619) @@ -44,8 +44,8 @@ { - /*! Generic median_alt function based on histogram over a value set - * with type \c S. + /*! \brief Generic median_alt function based on histogram over a + * value set with type \c S. */ template <typename S> struct median_alt : : public mln::accu::internal::base_< mln_value(S), median_alt<S> > Index: trunk/milena/mln/accu/p.hh =================================================================== --- trunk/milena/mln/accu/p.hh (revision 1618) +++ trunk/milena/mln/accu/p.hh (revision 1619) @@ -46,7 +46,8 @@ { - /*! Generic p of accumulators. + /*! + * \brief Generic p of accumulators. * * The parameter \c V is the type of values. */ @@ -72,8 +73,9 @@ }; - - // FIXME: Doc! + /*! + * \brief Meta accumulator for p. + */ template <typename mA> struct p : public Meta_Accumulator< p<mA> > { Index: trunk/milena/mln/accu/sum.hh =================================================================== --- trunk/milena/mln/accu/sum.hh (revision 1618) +++ trunk/milena/mln/accu/sum.hh (revision 1619) @@ -48,7 +48,7 @@ { - /*! Generic sum accumulator class. + /*! \brief Generic sum accumulator class. * * Parameter \c T is the type of values that we sum. Parameter \c * S is the type to store the value sum; the default type of @@ -78,7 +78,9 @@ struct sum_< util::pix, S >; - // FIXME: Doc! + /*! + * \brief Meta accumulator for sum. + */ struct sum : public Meta_Accumulator< sum > { template <typename T, typename S = mln_sum(T)> Index: trunk/milena/mln/accu/v.hh =================================================================== --- trunk/milena/mln/accu/v.hh (revision 1618) +++ trunk/milena/mln/accu/v.hh (revision 1619) @@ -45,7 +45,8 @@ { - /*! Generic v of accumulators. + /*! + * \brief Generic val of accumulators. */ template <typename A> struct val_ : public mln::accu::internal::base_< mln_result(A) , val_<A> > @@ -80,8 +81,9 @@ }; - - // FIXME: Doc! + /*! + * \brief Meta accumulator for val. + */ template <typename mA> struct val : public Meta_Accumulator< val<mA> > { Index: trunk/milena/mln/accu/compute.hh =================================================================== --- trunk/milena/mln/accu/compute.hh (revision 1618) +++ trunk/milena/mln/accu/compute.hh (revision 1619) @@ -46,7 +46,7 @@ namespace accu { - /*! Make an accumulator compute the pixels of the image \p input. + /*! \brief Make an accumulator compute the pixels of the image \p input. * * \param[in] input The input image. * @@ -61,7 +61,16 @@ compute(const Image& input); - // FIXME: Doc! + /*! \brief Make an accumulator compute the pixels of the image \p input. + * + * \param[in] input The input image. + * + * This routine runs: \n + * a.take(make::pix(input, p)); + * on all pixels on the images. + * + * \warning This routine does not perform a.init(). + */ template <typename A, typename I> mln_accu_with(A, util::pix)::result compute(const Image& input); Index: trunk/milena/mln/accu/mean.hh =================================================================== --- trunk/milena/mln/accu/mean.hh (revision 1618) +++ trunk/milena/mln/accu/mean.hh (revision 1619) @@ -47,7 +47,7 @@ { - /*! Generic mean accumulator class. + /*! \brief Generic mean accumulator class. * * Parameter \c T is the type of values that we sum. Parameter \c * S is the type to store the sum of values; the default type of @@ -83,8 +83,9 @@ struct mean_< util::pix, S,M >; - - // FIXME: Doc! + /*! + * \brief Meta accumulator for mean. + */ struct mean : public Meta_Accumulator< mean > { template < typename T, Index: trunk/milena/mln/value/lut_vec.hh =================================================================== --- trunk/milena/mln/value/lut_vec.hh (revision 1618) +++ trunk/milena/mln/value/lut_vec.hh (revision 1619) @@ -51,7 +51,7 @@ template <typename S> struct bkd_viter_; - /*! Class that defines FIXME + /*! \brief Class that defines FIXME * * \warning This is a multi-set!!! * FIXME Index: trunk/milena/mln/value/set.hh =================================================================== --- trunk/milena/mln/value/set.hh (revision 1618) +++ trunk/milena/mln/value/set.hh (revision 1619) @@ -46,10 +46,12 @@ namespace internal { + /// \internal template <typename T, typename E, bool is_lowq = false> struct set_selector_ // no inheritance {}; + /// \internal template <typename T, typename E> struct set_selector_< T, E, true > // lowq so iterable : @@ -60,7 +62,7 @@ - /*! Class that defines the set of values of type \c T. + /*! \brief Class that defines the set of values of type \c T. * * This is the exhaustive set of values obtainable from type \c T. */ Index: trunk/milena/mln/fun/v2v/linear.hh =================================================================== --- trunk/milena/mln/fun/v2v/linear.hh (revision 1618) +++ trunk/milena/mln/fun/v2v/linear.hh (revision 1619) @@ -45,10 +45,9 @@ namespace v2v { - /*! Linear function. - * + /*! + *\brief Linear function. * f(v) = a * v + b. - * * \c V is the type of input values; \c T is the type used to * compute the result; \c R is the result type. * Index: trunk/milena/mln/util/ordpair.hh =================================================================== --- trunk/milena/mln/util/ordpair.hh (revision 1618) +++ trunk/milena/mln/util/ordpair.hh (revision 1619) @@ -42,9 +42,12 @@ namespace util { - /// Ordered pair structure s.a. this->first <= this->second; - /// ordered pairs are partially ordered using lexicographical - /// ordering. + /*! + * \brief Ordered pair structure s.a. this->first <= this->second; + * ordered pairs are partially ordered using lexicographical + * ordering. + * + */ template <typename T> struct ordpair_ : public mln::Object< ordpair_<T> > {

1 0

Re: [Olena-patches] milena r1614: Add main page for Doxygen documentation
by Tsuna 19 Dec '07

19 Dec '07

On 2007-12-17, Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> wrote: > Index: trunk/milena/mln/core/concept/object.hh >=================================================================== > --- trunk/milena/mln/core/concept/object.hh (revision 1613) > +++ trunk/milena/mln/core/concept/object.hh (revision 1614) > @@ -46,6 +46,84 @@ > # include <mln/metal/ret.hh> > > > +/*! \mainpage Documentation of milena > + * > + * \section intro_sec Introduction > + * > + * This is the documentation of milena. > + * > + * \section tools_subsec Tools required. > + * FIXME. > + * > + * \section mln_sec Overview of milena. > + * > + * <UL> > + * <LI> \ref mln > + * <LI> \ref mln::accu > + * <LI> \ref mln::arith > + * <LI> \ref mln::border > + * <LI> \ref mln::canvas > + * <LI> \ref mln::convert > + * <LI> \ref mln::debug > + * <LI> \ref mln::display > + * <LI> \ref mln::draw > + * <LI> \ref mln::estim > + * <LI> \ref mln::fun > + * <LI> \ref mln::geom > + * <LI> \ref mln::histo > + * <LI> \ref mln::io > + * <LI> \ref mln::labeling > + * <LI> \ref mln::level > + * <LI> \ref mln::linear > + * <LI> \ref mln::literal > + * <LI> \ref mln::logical > + * <LI> \ref mln::make > + * <LI> \ref mln::math > + * <LI> \ref mln::metal > + * <LI> \ref mln::morpho > + * <LI> \ref mln::norm > + * <LI> \ref mln::pw > + * <LI> \ref mln::set > + * <LI> \ref mln::tag > + * <LI> \ref mln::test > + * <LI> \ref mln::trace > + * <LI> \ref mln::trait > + * <LI> \ref mln::util > + * <LI> \ref mln::value > + * <LI> \ref mln::win > + * > + * \section copyright Copyright and License. > + * Copyright (C) 2007 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. > + * Il est préférable de garder le copyright header plus haut. > + * 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. > + * > + */ > + Tiens j'avais jamais remarqué qu'Olena utilisait une exception dans la licence GPL. Je vois pas l'intérêt de mettre tout le code en GPL + exception et pas en LGPL. -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "I think Git is definitely in the running /EPITA\ Promo 2008.CSI/ACU/YAKA to be the dominate version control system." -- Bob Proulx

2 1

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena
by Olena 19 Dec '07

19 Dec '07

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: nivault Type: task | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by nivault): * status: assigned => new * owner: anonymous => nivault -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

milena r1618: Reduce warnings for Doxygen
by Guillaume Duhamel 18 Dec '07

18 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena $ make user-doc 2> err.log $ cat err.log | wc -l 131 ChangeLog: 2007-12-18 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Reduce warnings for Doxygen. * doc/examples/labeling_algo.cc, * mln/core/mesh_image.hh, * mln/core/mesh_psite.hh, * mln/debug/iota.hh, * mln/geom/seeds2tiling.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/morpho/top_hat.hh, * mln/pw/image.hh, * mln/util/tree.hh, * mln/util/tree_to_image.hh, * tests/fun/v2v/norm.cc: Fix some Doxygen warnings for these files. --- doc/examples/labeling_algo.cc | 2 +- mln/core/mesh_image.hh | 2 +- mln/core/mesh_psite.hh | 7 +++++-- mln/debug/iota.hh | 2 +- mln/geom/seeds2tiling.hh | 4 ++-- mln/geom/seeds2tiling_roundness.hh | 4 ++-- mln/pw/image.hh | 2 +- mln/util/tree.hh | 3 ++- mln/util/tree_to_image.hh | 6 +++--- tests/fun/v2v/norm.cc | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) Index: trunk/milena/tests/fun/v2v/norm.cc =================================================================== --- trunk/milena/tests/fun/v2v/norm.cc (revision 1617) +++ trunk/milena/tests/fun/v2v/norm.cc (revision 1618) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l1.hh +/*! \file tests/fun/v2v/norm.cc * * \brief Test the norm functors. */ Index: trunk/milena/doc/examples/labeling_algo.cc =================================================================== --- trunk/milena/doc/examples/labeling_algo.cc (revision 1617) +++ trunk/milena/doc/examples/labeling_algo.cc (revision 1618) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_algo.cc +/*! \file doc/examples/labeling_algo.cc * * \brief Test on mln::geom::seeds2tiling. */ Index: trunk/milena/mln/debug/iota.hh =================================================================== --- trunk/milena/mln/debug/iota.hh (revision 1617) +++ trunk/milena/mln/debug/iota.hh (revision 1618) @@ -47,7 +47,7 @@ /*! Fill the image \p input with successive values. * - * \param[in,out] destination The image in which values are + * \param[in,out] input The image in which values are * assigned. */ template <typename I> Index: trunk/milena/mln/core/mesh_psite.hh =================================================================== --- trunk/milena/mln/core/mesh_psite.hh (revision 1617) +++ trunk/milena/mln/core/mesh_psite.hh (revision 1618) @@ -45,8 +45,11 @@ template<typename P> class mesh_p; - // FIXME: Doc! - // FIXME: Fix access to member. + /*! + * \brief Point site associate to mesh_image. + * + * \todo Fix access to member. + */ template<typename P> class mesh_psite : public Point_Site< mesh_psite > { Index: trunk/milena/mln/core/mesh_image.hh =================================================================== --- trunk/milena/mln/core/mesh_image.hh (revision 1617) +++ trunk/milena/mln/core/mesh_image.hh (revision 1618) @@ -86,7 +86,7 @@ } // end of namespace mln::trait - /*! \brief FIXME + /*! \brief Kind of image based on graph structure. * */ template <typename P, typename V> Index: trunk/milena/mln/pw/image.hh =================================================================== --- trunk/milena/mln/pw/image.hh (revision 1617) +++ trunk/milena/mln/pw/image.hh (revision 1618) @@ -168,7 +168,7 @@ namespace internal { - + /// \internal template <typename F, typename S> inline data_< pw::image<F,S> >::data_(const F& f, const S& ps) Index: trunk/milena/mln/geom/seeds2tiling_roundness.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1617) +++ trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1618) @@ -53,12 +53,12 @@ /*! Take a labeled image \p ima_ with seeds and extend them until * creating tiles nore roundness that the primary version. * - * \param[in,out] ima The labeled image with seed. + * \param[in,out] ima_ The labeled image with seed. * \param[in] win_w The weight window using by geom::chamfer to compute distance. * \param[in] max Unsigned using by geom::chamfer to compute distance. * \param[in] nbh The neighborhood to use on this algorithm. * - * \pre \p ima has to be initialized. + * \pre \p ima_ has to be initialized. * */ template <typename I, typename N> Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 1617) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1618) @@ -50,10 +50,10 @@ /*! Take a labeled image \p ima_ with seeds and extend them * until creating tiles. * - * \param[in,out] ima The labeled image with seed. + * \param[in,out] ima_ The labeled image with seed. * \param[in] nbh The neighborhood to use on this algorithm. * - * \pre \p ima has to be initialized. + * \pre \p ima_ has to be initialized. * */ template <typename I, typename N> Index: trunk/milena/mln/morpho/top_hat.hh =================================================================== Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1617) +++ trunk/milena/mln/util/tree.hh (revision 1618) @@ -130,7 +130,7 @@ /*! \brief Bind \p node to the current node and become its * parent. * - * \param[in] node The new parent node. + * \param[in] parent The new parent node. * */ void set_parent(node<T>* parent); @@ -144,6 +144,7 @@ * node as root. * * \param[in] ostr The output stream. + * \param[in] level The deep level * */ void print(std::ostream& ostr, int level = 0); Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1617) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1618) @@ -45,7 +45,7 @@ namespace util { - /*! Convert a tree into an image. + /*! \brief Convert a tree into an image. * * \param[in] tree The tree to convert. * \param[out] output_ The image containing tree informations. @@ -57,7 +57,7 @@ /*! Display a tree. * - * \param[in] ima The domain of output image. + * \param[in] ima_ The domain of output image. * \param[in] tree The tree to display. * */ @@ -68,7 +68,7 @@ /*! Display an arborescence from \p node. * - * \param[in] ima The domain of output image. + * \param[in] ima_ The domain of output image. * \param[in] node The root node to display. * */

1 0

milena r1617: Review queue in core and fix some warnings in tests directory
by Guillaume Duhamel 18 Dec '07

18 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-18 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review queue in core and fix some warnings in tests directory. Review queue files. * mln/core/p_priority_queue.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/p_priority_queue_fast_with_array.hh, * mln/core/p_queue_fast.hh: Review queue. Update tests. * tests/core/mesh_elt_window.cc, * tests/core/mesh_image.cc, * tests/debug/iota.cc, * tests/debug/println.cc, * tests/debug/println_with_border.cc, * tests/io/fits/fits.cc, * tests/io/pbm/pbm.cc, * tests/io/pgm/pgm.cc, * tests/io/pgm/pgm16.cc, * tests/io/pgm/pgm19.cc, * tests/io/pgm/pgm27.cc, * tests/io/ppm/ppm.cc, * tests/io/ppm/ppm16.cc, * tests/io/ppm/ppm23.cc, * tests/norm/l1.cc, * tests/norm/l2.cc, * tests/norm/linfty.cc, * tests/value/macros.hh, * tests/value/rgb_full.cc, * tests/core/t_image.cc: Fix doxygen warnings. Move tests. * tests/core_p_priority_queue.cc: Remove ... * tests/core/p_priority_queue.cc: ... replace here. * tests/core_p_priority_queue_fast.cc: Remove ... * tests/core/p_priority_queue_fast.cc: ... replace here. * tests/core_p_priority_queue_fast_with_array.cc: Remove ... * tests/core/p_priority_queue_fast_with_array.cc: ... replace here. * tests/core_p_queue.cc: Remove ... * tests/core/p_queue.cc: ... replace here. * tests/core_p_queue_fast.cc: Remove ... * tests/core/p_queue_fast.cc: ... replace here. * tests/canvas/Makefile.am, * tests/core/Makefile.am: Update Makefile for these tests. --- mln/core/p_priority_queue.hh | 4 mln/core/p_priority_queue_fast.hh | 4 mln/core/p_priority_queue_fast_with_array.hh | 4 mln/core/p_queue_fast.hh | 2 tests/canvas/Makefile.am | 6 + tests/core/Makefile.am | 14 +++ tests/core/mesh_elt_window.cc | 2 tests/core/mesh_image.cc | 2 tests/core/p_priority_queue.cc | 98 +++++++++++++++++++++++ tests/core/p_priority_queue_fast.cc | 98 +++++++++++++++++++++++ tests/core/p_priority_queue_fast_with_array.cc | 105 +++++++++++++++++++++++++ tests/core/p_queue.cc | 57 +++++++++++++ tests/core/p_queue_fast.cc | 57 +++++++++++++ tests/core/t_image.cc | 2 tests/debug/iota.cc | 2 tests/debug/println.cc | 2 tests/debug/println_with_border.cc | 2 tests/io/fits/fits.cc | 2 tests/io/pbm/pbm.cc | 2 tests/io/pgm/pgm.cc | 2 tests/io/pgm/pgm16.cc | 2 tests/io/pgm/pgm19.cc | 2 tests/io/pgm/pgm27.cc | 2 tests/io/ppm/ppm.cc | 2 tests/io/ppm/ppm16.cc | 2 tests/io/ppm/ppm23.cc | 2 tests/norm/l1.cc | 2 tests/norm/l2.cc | 2 tests/norm/linfty.cc | 2 tests/value/macros.hh | 2 tests/value/rgb_full.cc | 2 31 files changed, 457 insertions(+), 32 deletions(-) Index: trunk/milena/tests/core_p_queue.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue_fast.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue_fast_with_array.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_queue_fast.cc (deleted) =================================================================== Index: trunk/milena/tests/debug/iota.cc =================================================================== --- trunk/milena/tests/debug/iota.cc (revision 1616) +++ trunk/milena/tests/debug/iota.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_iota.cc +/*! \file tests/debug/iota.cc * * \brief Tests on mln::debug::iota. */ Index: trunk/milena/tests/debug/println_with_border.cc =================================================================== --- trunk/milena/tests/debug/println_with_border.cc (revision 1616) +++ trunk/milena/tests/debug/println_with_border.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_println_with_border.cc +/*! \file tests/debug/println_with_border.cc * * \brief Test on mln::debug::println_with_border. */ Index: trunk/milena/tests/debug/println.cc =================================================================== --- trunk/milena/tests/debug/println.cc (revision 1616) +++ trunk/milena/tests/debug/println.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_println.cc +/*! \file tests/debug/println.cc * * \brief Test on mln::debug::println. */ Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 1616) +++ trunk/milena/tests/value/rgb_full.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value/rgb.cc +/*! \file tests/value/rgb_full.cc * * \brief Tests on mln::value::rgb. */ Index: trunk/milena/tests/value/macros.hh =================================================================== --- trunk/milena/tests/value/macros.hh (revision 1616) +++ trunk/milena/tests/value/macros.hh (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_macros.hh +/*! \file tests/value/macros.hh * * \brief Utilities to tests value types. */ Index: trunk/milena/tests/canvas/Makefile.am =================================================================== --- trunk/milena/tests/canvas/Makefile.am (revision 1616) +++ trunk/milena/tests/canvas/Makefile.am (revision 1617) @@ -3,3 +3,9 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = browsing + +check_PROGRAMS = \ + chamfer + +chamfer_SOURCES = chamfer.cc + Index: trunk/milena/tests/core/mesh_image.cc =================================================================== --- trunk/milena/tests/core/mesh_image.cc (revision 1616) +++ trunk/milena/tests/core/mesh_image.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mesh_image.cc +/*! \file tests/core/mesh_image.cc * * \brief Tests on mln::mesh_image. */ Index: trunk/milena/tests/core/p_queue.cc =================================================================== --- trunk/milena/tests/core/p_queue.cc (revision 0) +++ trunk/milena/tests/core/p_queue.cc (revision 1617) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 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/core/p_queue.cc + * + * \brief Tests on mln::p_queue. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_queue.hh> + + + +int main() +{ + using namespace mln; + + p_queue<point2d> q; + q + .push(make::point2d(6, 9)) + .push(make::point2d(5, 1)) + .push(make::point2d(4, 2)); + mln_assertion(q.npoints() == 3); + + std::cout << q.bbox() << std::endl; + std::cout << q << std::endl; + + q.pop(); + mln_assertion(q.npoints() == 2); + point2d p = q.front(); + mln_assertion(q.npoints() == 2); + mln_assertion(p == make::point2d(5, 1)); +} Index: trunk/milena/tests/core/p_priority_queue.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue.cc (revision 1617) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 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/core/p_priority_queue.cc + * + * \brief Tests on mln::p_priority_queue. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue.hh> + +int main () +{ + using namespace mln; + + p_priority_queue<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/t_image.cc =================================================================== --- trunk/milena/tests/core/t_image.cc (revision 1616) +++ trunk/milena/tests/core/t_image.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/t_image.cc +/*! \file tests/core/t_image.cc * * \brief Tests on mln::t_image. */ Index: trunk/milena/tests/core/p_priority_queue_fast_with_array.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 1617) @@ -0,0 +1,105 @@ +// Copyright (C) 2007 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/core/p_priority_queue_fast_with_array.cc + * + * \brief Tests on mln::p_priority_queue_fast_with_array. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue_fast_with_array.hh> + +int main () +{ + using namespace mln; + + p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 1); + + q.push_force (p1, 3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 2); + + q.push_force (p2, 5); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 3); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/p_queue_fast.cc =================================================================== --- trunk/milena/tests/core/p_queue_fast.cc (revision 0) +++ trunk/milena/tests/core/p_queue_fast.cc (revision 1617) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 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/core/p_queue_fast.cc + * + * \brief Tests on mln::p_queue_fast. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_queue_fast.hh> + + + +int main() +{ + using namespace mln; + + p_queue_fast<point2d> q; + q + .push(make::point2d(6, 9)) + .push(make::point2d(5, 1)) + .push(make::point2d(4, 2)); + mln_assertion(q.npoints() == 3); + + std::cout << q.bbox() << std::endl; + std::cout << q << std::endl; + + q.pop(); + mln_assertion(q.npoints() == 2); + point2d p = q.front(); + mln_assertion(q.npoints() == 2); + mln_assertion(p == make::point2d(5, 1)); +} Index: trunk/milena/tests/core/p_priority_queue_fast.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue_fast.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue_fast.cc (revision 1617) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 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/core/p_priority_queue_fast.cc + * + * \brief Tests on mln::p_priority_queue_fast. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue_fast.hh> + +int main () +{ + using namespace mln; + + mln::p_priority_queue_fast<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1616) +++ trunk/milena/tests/core/Makefile.am (revision 1617) @@ -15,7 +15,12 @@ p_runs \ rle_image \ sparse_image \ - t_image + t_image \ + p_priority_queue \ + p_priority_queue_fast \ + p_priority_queue_fast_with_array \ + p_queue \ + p_queue_fast category_SOURCES = category.cc clone_SOURCES = clone.cc @@ -30,5 +35,12 @@ rle_image_SOURCES = rle_image.cc sparse_image_SOURCES = sparse_image.cc t_image_SOURCES = t_image.cc +p_priority_queue_SOURCES = p_priority_queue.cc +p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc +p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc +p_queue_SOURCES = p_priority_queue_fast.cc +p_queue_fast_SOURCES = p_priority_queue_fast.cc + + TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/core/mesh_elt_window.cc =================================================================== --- trunk/milena/tests/core/mesh_elt_window.cc (revision 1616) +++ trunk/milena/tests/core/mesh_elt_window.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mesh_elt_window.cc +/*! \file tests/core/mesh_elt_window.cc * * \brief Tests on mln::win::mesh_elt_window. */ Index: trunk/milena/tests/io/pgm/pgm27.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm27.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm27.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm27.cc +/*! \file tests/io/pgm/pgm27.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm19.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm19.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm19.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm19.cc +/*! \file tests/io/pgm/pgm19.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm.cc +/*! \file tests/io/pgm/pgm.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm16.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm16.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm16.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm16.cc +/*! \file tests/io/pgm/pgm16.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/fits/fits.cc =================================================================== --- trunk/milena/tests/io/fits/fits.cc (revision 1616) +++ trunk/milena/tests/io/fits/fits.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fits_load.cc +/*! \file tests/io/fits/fits.cc * * \brief Test on mln::io::fits::load. */ Index: trunk/milena/tests/io/ppm/ppm.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm.cc +/*! \file tests/io/ppm/ppm.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/ppm/ppm23.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm23.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm23.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm23.cc +/*! \file tests/io/ppm/ppm23.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/ppm/ppm16.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm16.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm16.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm16.cc +/*! \file tests/io/ppm/ppm16.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/pbm/pbm.cc =================================================================== --- trunk/milena/tests/io/pbm/pbm.cc (revision 1616) +++ trunk/milena/tests/io/pbm/pbm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pbm.cc +/*! \file tests/io/pbm/pbm.cc * * \brief Test on mln::io::pbm::. */ Index: trunk/milena/tests/norm/l1.cc =================================================================== --- trunk/milena/tests/norm/l1.cc (revision 1616) +++ trunk/milena/tests/norm/l1.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l1.hh +/*! \file tests/norm/l1.cc * * \brief Test the L1-norm. */ Index: trunk/milena/tests/norm/l2.cc =================================================================== --- trunk/milena/tests/norm/l2.cc (revision 1616) +++ trunk/milena/tests/norm/l2.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l2.hh +/*! \file tests/norm/l2.cc * * \brief Test the L2-norm. */ Index: trunk/milena/tests/norm/linfty.cc =================================================================== --- trunk/milena/tests/norm/linfty.cc (revision 1616) +++ trunk/milena/tests/norm/linfty.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/linfty.hh +/*! \file tests/norm/linfty.cc * * \brief Test the L-infinity-norm. */ Index: trunk/milena/mln/core/p_priority_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point fast queue class (based on std::map and p_queue_fast). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_priority_queue.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point priority queue class (based on p_queue and std::map). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_priority_queue_fast_with_array.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point queue class (based on std::vector and p_queue_fast). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_queue_fast.hh (revision 1616) +++ trunk/milena/mln/core/p_queue_fast.hh (revision 1617) @@ -57,8 +57,6 @@ * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple.

1 0

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena
by Olena 18 Dec '07

18 Dec '07

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: anonymous Type: task | Status: assigned Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by anonymous): * status: new => assigned * owner: Olena Team => anonymous -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

milena ba883be: Add a missing include
by Benoit Sigoure 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln Git branch: master (HEAD: 0ef3c80) ChangeLog: 2007-12-17 Benoit Sigoure <tsuna(a)lrde.epita.fr> Add a missing include. * milena/mln/accu/max.hh: Here. --- milena/ChangeLog | 5 +++++ milena/mln/accu/max.hh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 87b2ed6..b5381ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Add a missing include. + * milena/mln/accu/max.hh: Here. + 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review chamfer and labeling in canvas. diff --git a/milena/mln/accu/max.hh b/milena/mln/accu/max.hh index 22b13be..3d57c12 100644 --- a/milena/mln/accu/max.hh +++ b/milena/mln/accu/max.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/meta_accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "Jesus saves, but only Buddha /EPITA\ Promo 2008.CSI/ACU/YAKA makes incremental backups"

1 0

milena r1615: Review chamfer and labeling in canvas
by Guillaume Duhamel 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review chamfer and labeling in canvas. * mln/canvas/chamfer.hh, * mln/canvas/labeling.hh: Review this files split declaration and implementation, fix typo. Tests. * tests/chamfer.cc: Remove ... * tests/canvas/chamfer.cc: ... replace it and modify tests. --- mln/canvas/chamfer.hh | 29 +++++++-- mln/canvas/labeling.hh | 151 +++++++++++++++++++++++++++++++++--------------- tests/canvas/chamfer.cc | 128 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+), 52 deletions(-) Index: trunk/milena/tests/chamfer.cc (deleted) =================================================================== Index: trunk/milena/tests/canvas/chamfer.cc =================================================================== --- trunk/milena/tests/canvas/chamfer.cc (revision 0) +++ trunk/milena/tests/canvas/chamfer.cc (revision 1615) @@ -0,0 +1,128 @@ +// Copyright (C) 2007 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/canvas/chamfer.cc + * + * \brief Tests on mln::geom::chamfer. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if_value.hh> +#include <mln/core/inplace.hh> + +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> +#include <mln/core/w_window2d_int.hh> +#include <mln/core/w_window2d_float.hh> +#include <mln/core/image_if_interval.hh> + +#include <mln/make/win_chamfer.hh> +#include <mln/geom/chamfer.hh> +#include <mln/level/compare.hh> + + +int main() +{ + using namespace mln; + unsigned max = 51; + + image2d<bool> ima(9, 9); + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + unsigned r[9][9] = + { + {16, 14, 12, 10, 8, 10, 12, 14, 16}, + {14, 12, 10, 8, 6, 8, 10, 12, 14}, + {12, 10, 8, 6, 4, 6, 8, 10, 12}, + {10, 8, 6, 4, 2, 4, 6, 8, 10}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + {10, 8, 6, 4, 2, 4, 6, 8, 10}, + {12, 10, 8, 6, 4, 6, 8, 10, 12}, + {14, 12, 10, 8, 6, 8, 10, 12, 14}, + {16, 14, 12, 10, 8, 10, 12, 14, 16} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + } + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 3> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + + unsigned r[9][9] = + { + {12, 11, 10, 9, 8, 9, 10, 11, 12}, + {11, 9, 8, 7, 6, 7, 8, 9, 11}, + {10, 8, 6, 5, 4, 5, 6, 8, 10}, + { 9, 7, 5, 3, 2, 3, 5, 7, 9}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + { 9, 7, 5, 3, 2, 3, 5, 7, 9}, + {10, 8, 6, 5, 4, 5, 6, 8, 10}, + {11, 9, 8, 7, 6, 7, 8, 9, 11}, + {12, 11, 10, 9, 8, 9, 10, 11, 12} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + } + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_5x5_int<4, 6, 9> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + image2d<unsigned>::fwd_piter p(out.domain()); + for_all(p) + out(p) = out(p) / 2; + + unsigned r[9][9] = + { + {12, 10, 9, 8, 8, 8, 9, 10, 12}, + {10, 9, 7, 6, 6, 6, 7, 9, 10}, + { 9, 7, 6, 4, 4, 4, 6, 7, 9}, + { 8, 6, 4, 3, 2, 3, 4, 6, 8}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + { 8, 6, 4, 3, 2, 3, 4, 6, 8}, + { 9, 7, 6, 4, 4, 4, 6, 7, 9}, + {10, 9, 7, 6, 6, 6, 7, 9, 10}, + {12, 10, 9, 8, 8, 8, 9, 10, 12} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + + } + +} Index: trunk/milena/mln/canvas/chamfer.hh =================================================================== --- trunk/milena/mln/canvas/chamfer.hh (revision 1614) +++ trunk/milena/mln/canvas/chamfer.hh (revision 1615) @@ -38,23 +38,40 @@ namespace canvas { + /*! + * \brief Compute chamfer distance. + * + */ template <typename F> struct chamfer { - F& f; - typedef typename F::I I; typedef typename F::W W; typedef mln_point(I) point; - chamfer(F& f) + F& f; + + chamfer(F& f); + + void run(); + }; + +# ifndef MLN_INCLUDE_ONLY + + template<typename F> + inline + chamfer<F>::chamfer(F& f) : f(f) { run(); } - void run() + template<typename F> + inline + void + chamfer<F>::run() { + /// Init. { f.init(); @@ -86,9 +103,9 @@ f.output(p) = f.output(q) + q.w(); f.status = true; } - } - }; + +# endif // ! MLN_INCLUDE_ONLY } // end of mln::canvas Index: trunk/milena/mln/canvas/labeling.hh =================================================================== --- trunk/milena/mln/canvas/labeling.hh (revision 1614) +++ trunk/milena/mln/canvas/labeling.hh (revision 1615) @@ -71,7 +71,69 @@ bool status; // Ctor. - labeling(F& f) + labeling(F& f); + + void init(); + + void pass_1(); + + void pass_2(); + + + // Auxiliary methods. + + void make_set(const point& p); + + bool is_root(const point& p) const; + + point find_root(const point& x); + + void do_union(const point& n, const point& p); + + }; + + + template <typename F> + struct labeling_fastest + { + // Functor. + F& f; + + typedef typename F::I I; + typedef typename F::N N; + typedef typename F::L L; + + // Auxiliary data. + mln_ch_value(I, unsigned) parent; + + // Output. + mln_ch_value(I, L) output; + L nlabels; + bool status; + + // Ctor. + labeling_fastest(F& f); + + void init(); + + void pass_1(); + + void pass_2(); + + // Auxiliary methods. + + bool is_root(unsigned p) const; + + unsigned find_root(unsigned x); + + void do_union(unsigned n, unsigned p); + + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + labeling<F>::labeling(F& f) : f(f) { trace::entering("canvas::labeling"); @@ -84,8 +146,9 @@ trace::exiting("canvas::labeling"); } - - void init() + template <typename F> + void + labeling<F>::init() { initialize(deja_vu, f.input); mln::level::fill(deja_vu, false); @@ -95,7 +158,9 @@ nlabels = 0; } - void pass_1() + template <typename F> + void + labeling<F>::pass_1() { mln_fwd_piter(S) p(f.s); mln_niter(N) n(f.nbh, p); @@ -112,7 +177,9 @@ } } - void pass_2() + template <typename F> + void + labeling<F>::pass_2() { mln_bkd_piter(S) p(f.s); for_all(p) if (f.handles(p)) @@ -135,21 +202,24 @@ status = true; } - - // Auxiliary methods. - - void make_set(const point& p) + template <typename F> + void + labeling<F>::make_set(const point& p) { parent(p) = p; f.init_attr(p); } - bool is_root(const point& p) const + template <typename F> + bool + labeling<F>::is_root(const point& p) const { return parent(p) == p; } - point find_root(const point& x) + template <typename F> + typename labeling<F>::point + labeling<F>::find_root(const point& x) { if (parent(x) == x) return x; @@ -157,7 +227,9 @@ return parent(x) = find_root(parent(x)); } - void do_union(const point& n, const point& p) + template <typename F> + void + labeling<F>::do_union(const point& n, const point& p) { point r = find_root(n); if (r != p) @@ -167,31 +239,8 @@ } } - }; - - - - template <typename F> - struct labeling_fastest - { - // Functor. - F& f; - - typedef typename F::I I; - typedef typename F::N N; - typedef typename F::L L; - - // Auxiliary data. - mln_ch_value(I, unsigned) parent; - - // Output. - mln_ch_value(I, L) output; - L nlabels; - bool status; - - // Ctor. - labeling_fastest(F& f) + labeling_fastest<F>::labeling_fastest(F& f) : f(f) { trace::entering("canvas::labeling_fastest"); @@ -204,8 +253,9 @@ trace::exiting("canvas::labeling_fastest"); } - - void init() + template <typename F> + void + labeling_fastest<F>::init() { initialize(parent, f.input); for (unsigned p = 0; p < parent.ncells(); ++p) @@ -215,7 +265,9 @@ nlabels = 0; } - void pass_1() + template <typename F> + void + labeling_fastest<F>::pass_1() { mln_bkd_pixter(const I) p(f.input); @@ -234,7 +286,9 @@ } } - void pass_2() + template <typename F> + void + labeling_fastest<F>::pass_2() { mln_fwd_pixter(const I) p(f.input); @@ -258,14 +312,16 @@ status = true; } - // Auxiliary methods. - - bool is_root(unsigned p) const + template <typename F> + bool + labeling_fastest<F>::is_root(unsigned p) const { return parent[p] == p; } - unsigned find_root(unsigned x) + template <typename F> + unsigned + labeling_fastest<F>::find_root(unsigned x) { if (parent[x] == x) return x; @@ -273,7 +329,9 @@ return parent[x] = find_root(parent[x]); } - void do_union(unsigned n, unsigned p) + template <typename F> + void + labeling_fastest<F>::do_union(unsigned n, unsigned p) { unsigned r = find_root(n); if (r != p) @@ -283,7 +341,8 @@ } } - }; + +# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::canvas

1 0

milena r1614: Add main page for Doxygen documentation
by Guillaume Duhamel 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add main page for Doxygen documentation. * mln/convert/all.hh, * mln/level/all.hh, * mln/level/paste.hh, * tests/level/paste_full.cc: Fix typo. * mln/core/concept/object.hh: Add main page for Doxygen. --- mln/convert/all.hh | 2 - mln/core/concept/object.hh | 78 +++++++++++++++++++++++++++++++++++++++++++++ mln/level/all.hh | 2 - mln/level/paste.hh | 4 +- tests/level/paste_full.cc | 3 + 5 files changed, 86 insertions(+), 3 deletions(-) Index: trunk/milena/tests/level/paste_full.cc =================================================================== --- trunk/milena/tests/level/paste_full.cc (revision 1613) +++ trunk/milena/tests/level/paste_full.cc (revision 1614) @@ -142,6 +142,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image1d in (cols); // image_if<image1d, f_box1d_t> input(in, f_b1); @@ -173,6 +174,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image2d in (rows, cols); // image_if<image2d, f_box2d_t> input(in, f_b2); @@ -204,6 +206,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image3d in (slis, rows, cols); // image_if<image3d, f_box3d_t> input(in, f_b3); Index: trunk/milena/mln/core/concept/object.hh =================================================================== --- trunk/milena/mln/core/concept/object.hh (revision 1613) +++ trunk/milena/mln/core/concept/object.hh (revision 1614) @@ -46,6 +46,84 @@ # include <mln/metal/ret.hh> +/*! \mainpage Documentation of milena + * + * \section intro_sec Introduction + * + * This is the documentation of milena. + * + * \section tools_subsec Tools required. + * FIXME. + * + * \section mln_sec Overview of milena. + * + * <UL> + * <LI> \ref mln + * <LI> \ref mln::accu + * <LI> \ref mln::arith + * <LI> \ref mln::border + * <LI> \ref mln::canvas + * <LI> \ref mln::convert + * <LI> \ref mln::debug + * <LI> \ref mln::display + * <LI> \ref mln::draw + * <LI> \ref mln::estim + * <LI> \ref mln::fun + * <LI> \ref mln::geom + * <LI> \ref mln::histo + * <LI> \ref mln::io + * <LI> \ref mln::labeling + * <LI> \ref mln::level + * <LI> \ref mln::linear + * <LI> \ref mln::literal + * <LI> \ref mln::logical + * <LI> \ref mln::make + * <LI> \ref mln::math + * <LI> \ref mln::metal + * <LI> \ref mln::morpho + * <LI> \ref mln::norm + * <LI> \ref mln::pw + * <LI> \ref mln::set + * <LI> \ref mln::tag + * <LI> \ref mln::test + * <LI> \ref mln::trace + * <LI> \ref mln::trait + * <LI> \ref mln::util + * <LI> \ref mln::value + * <LI> \ref mln::win + * + * \section copyright Copyright and License. + * Copyright (C) 2007 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. + * + */ + + + /*! \namespace mln * \brief The namespace mln corresponds to the Milena (mini-Olena) project. * Index: trunk/milena/mln/level/all.hh =================================================================== --- trunk/milena/mln/level/all.hh (revision 1613) +++ trunk/milena/mln/level/all.hh (revision 1614) @@ -31,6 +31,7 @@ /*! \file mln/level/all.hh * * \brief File that includes all level-related routines. + * */ @@ -66,7 +67,6 @@ # include <mln/level/memset_.hh> # include <mln/level/naive/all.hh> # include <mln/level/paste.hh> -# include <mln/level/paste.spe.hh> # include <mln/level/saturate.hh> # include <mln/level/sort_points.hh> # include <mln/level/stretch.hh> Index: trunk/milena/mln/level/paste.hh =================================================================== --- trunk/milena/mln/level/paste.hh (revision 1613) +++ trunk/milena/mln/level/paste.hh (revision 1614) @@ -31,6 +31,7 @@ /*! \file mln/level/paste.hh * * \brief Paste the contents of an image into another one. + * */ # include <mln/core/concept/image.hh> @@ -48,7 +49,8 @@ namespace level { - /*! Paste the contents of image \p data into the image \p + /*! + * \brief Paste the contents of image \p data into the image \p * destination. * * \param[in] data The input image providing pixels values. Index: trunk/milena/mln/convert/all.hh =================================================================== --- trunk/milena/mln/convert/all.hh (revision 1613) +++ trunk/milena/mln/convert/all.hh (revision 1614) @@ -36,7 +36,7 @@ namespace mln { - /// \internal Namespace of convertion routines. + /// Namespace of convertion routines. namespace convert {} }

1 0

milena r1613: Fix typo
by nivaul_s＠lrde.epita.fr 14 Dec '07

14 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-14 Simon Nivault <simon.nivault(a)lrde.epita.fr> Fix typo. * mln/core/interpolated.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh, * mln/util/lazy_set.hh, * tests/core/mono_rle_image.cc, * tests/fun/x2x/composed.cc, * tests/fun/x2x/rotation.cc, * tests/fun/x2x/translation.cc: Fix. --- mln/core/interpolated.hh | 2 +- mln/core/mono_obased_rle_encode.hh | 5 +++-- mln/core/mono_obased_rle_image.hh | 15 +++++++-------- mln/core/mono_rle_encode.hh | 1 + mln/core/mono_rle_image.hh | 10 +++++----- mln/core/obased_rle_encode.hh | 1 + mln/core/obased_rle_image.hh | 10 +++++----- mln/core/rle_encode.hh | 1 + mln/core/rle_image.hh | 8 ++++---- mln/core/sparse_encode.hh | 1 + mln/core/sparse_image.hh | 10 +++++----- mln/util/lazy_set.hh | 18 +----------------- tests/core/mono_rle_image.cc | 2 +- tests/fun/x2x/composed.cc | 2 +- tests/fun/x2x/rotation.cc | 2 +- tests/fun/x2x/translation.cc | 2 +- 16 files changed, 39 insertions(+), 51 deletions(-) Index: trunk/milena/tests/fun/x2x/translation.cc =================================================================== --- trunk/milena/tests/fun/x2x/translation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/translation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_translation.cc +/*! \file tests/fun/x2x/translation.cc * * \brief Tests on mln::fun::x2x::translation. */ Index: trunk/milena/tests/fun/x2x/rotation.cc =================================================================== --- trunk/milena/tests/fun/x2x/rotation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/rotation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_rotation.cc +/*! \file tests/fun/x2x/rotation.cc * * \brief Tests on mln::fun::x2x::rotation. */ Index: trunk/milena/tests/fun/x2x/composed.cc =================================================================== --- trunk/milena/tests/fun/x2x/composed.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/composed.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_composed.cc +/*! \file tests/fun/x2x/composed.cc * * \brief Tests on mln::fun::x2x::composed. */ Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 1612) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mono_rle_iimage.cc +/*! \file tests/core/mono_rle_image.cc * * \brief Test on mln::labeling::blobs. */ Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a mono_rle_image ** ** @param input has to respect the Image concept + ** @param val specify the value which has to be considered ** ** @return mono_rle_image */ Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1612) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a sparse_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return sparse_image */ Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1612) +++ trunk/milena/mln/core/rle_image.hh (revision 1613) @@ -122,10 +122,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::rvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::lvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1612) +++ trunk/milena/mln/core/interpolated.hh (revision 1613) @@ -59,7 +59,7 @@ } // end of namespace mln::internal - /*! \brief FIXME + /*! \brief Morpher that makes underlaying image being accessed with floating coordinate. * */ template <typename I> Index: trunk/milena/mln/core/obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a obased_rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return obased_rle_image */ Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief Mono RLE image. + /*! \brief Monochrome RLE image. * * RLE image with only one colour. * @@ -123,10 +123,10 @@ void insert(const p_run& pr); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -211,7 +211,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::rvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) const + mono_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); return this->data_->value_; @@ -220,7 +220,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::lvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + mono_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->value_; Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1613) @@ -103,7 +103,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects. * * * Parameter \c P is the type of the image points. @@ -132,10 +132,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -237,7 +237,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::rvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -247,7 +247,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::lvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/mono_obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1613) @@ -39,11 +39,12 @@ { /*! - ** encode an image class to a mono_obased_rle_image + ** Encode an image class to a mono_obased_rle_image. ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** - ** @return mono_obased_rle_image + ** @return mono_obased_rle_image. */ template <typename I> mono_obased_rle_image<mln_point(I), mln_value(I)> Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1613) @@ -98,7 +98,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects based on mln::mono_rle_image. * * * Parameter \c P is the type of the image points. @@ -127,10 +127,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + const T operator()(const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + T& operator()(const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -224,9 +224,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::rvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) - const + const T + mono_obased_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; @@ -234,8 +233,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::lvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) + T& + mono_obased_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1612) +++ trunk/milena/mln/core/sparse_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief SPARSE image. + /*! \brief RLE image with different value in runs. * * * Parameter \c P is the type of the image points. @@ -122,10 +122,10 @@ void insert(const p_run& pr, const std::vector<T>& value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::rvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::lvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()][site.p_in_run()]; Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return rle_image */ Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 1612) +++ trunk/milena/mln/util/lazy_set.hh (revision 1613) @@ -28,7 +28,7 @@ #ifndef MLN_UTIL_LAZY_SET_HH # define MLN_UTIL_LAZY_SET_HH -/*! \file mln/core/internal/lazy_set.hh +/*! \file mln/util/lazy_set.hh * * \brief Definition of mln::lazy_set_ for internal use only. */ @@ -201,22 +201,6 @@ }; - /*! \brief Print a set \p s into the output stream \p - * ostr. - * - * \param[in,out] ostr An output stream. - * \param[in] s A set. - * - * \return The modified output stream \p ostr. - * - * \relates mln::internal::lazy_set_ - */ - // FIXME : ambiguous with point_set operator << - // template <typename E> - // std::ostream& operator<<(std::ostream& ostr, const lazy_set_<E>& s); - - - # ifndef MLN_INCLUDE_ONLY template <typename E>

1 0

Re: [Olena-patches] [Olena] #78: Enable Trac notifications (by e-mail)
by Olena 13 Dec '07

13 Dec '07

#78: Enable Trac notifications (by e-mail) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: closed Priority: critical | Milestone: Olena 1.0ß Component: Olena | Version: 1.0 Resolution: fixed | Keywords: Trac -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Done on Dec. 13, along with other Trac notification set-ups. Drop me (Roland) a line if it doesn't work as expected. -- Ticket URL: <https://trac.lrde.org/olena/ticket/78#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

Re: [Olena-patches] [Olena] #70: Complete the definition of the legend of the synthetic progression views for the release of Olena 1.0ß
by Olena 13 Dec '07

13 Dec '07

#70: Complete the definition of the legend of the synthetic progression views for the release of Olena 1.0ß -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: closed Priority: critical | Milestone: Olena 1.0ß Component: other | Version: 1.0 Resolution: fixed | Keywords: Trac -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Done two weeks before in these revisions of these Wiki pages: * https://trac.lrde.org/olena/wiki/Olena/Release1.0beta?version=29 * https://trac.lrde.org/olena/wiki/Olena/Release1.0beta/DetailedView?version=… -- Ticket URL: <https://trac.lrde.org/olena/ticket/70#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

milena r1612: Clean handle of generation of documentation
by Guillaume Duhamel 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena The generation of documentation is split in two part: user and internal. For the user documentation a directory user is created with the subdirectory html, which contains all namespace without internal and impl. Idem for internal documentation in the directory internal with all namespace. In milena/doc: make user-doc -> generation of user documentation. make internal-doc -> generation of internal documentation. make doc has the same enhancement of make internal-doc. ChangeLog: 2007-12-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Clean handle of generation of documentation. * doc/Makefile.am: New handle of generation of documentation, Doxyfile_user and Doxyfile_internal files are the template for Doxygen. They are generated from Doxygen.in * doc/Doxyfile_user.in: Remove (useless now). --- Doxyfile.in | 2 +- Makefile.am | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) Index: trunk/milena/doc/Doxyfile_user.in (deleted) =================================================================== Index: trunk/milena/doc/Doxyfile.in =================================================================== --- trunk/milena/doc/Doxyfile.in (revision 1611) +++ trunk/milena/doc/Doxyfile.in (revision 1612) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- PROJECT_NAME = "Milena (@PACKAGE_NAME@)" PROJECT_NUMBER = "@PACKAGE_VERSION@ @ID@" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = ./internal/ CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES Index: trunk/milena/doc/Makefile.am =================================================================== --- trunk/milena/doc/Makefile.am (revision 1611) +++ trunk/milena/doc/Makefile.am (revision 1612) @@ -10,10 +10,10 @@ html-local: Doxyfile - $(DOXYGEN) + $(DOXYGEN) $(srcdir)/Doxyfile_internal -html_user: Doxyfile_user - $(DOXYGEN) +html_user:: Doxyfile + $(DOXYGEN) $(srcdir)/Doxyfile_user edit = sed -e "s|@ID@|$$Id|" \ @@ -22,21 +22,32 @@ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' -EXTRA_DIST = Doxyfile.in \ - Doxyfile_user.in -CLEANFILES = Doxyfile +edit_user = sed -e 's,OUTPUT_DIRECTORY = ./internal/,OUTPUT_DIRECTORY = ./user/,g' \ + -e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \ + -e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \ + -e 's,EXTRACT_STATIC = YES,EXTRACT_STATIC = NO,g' \ + -e 's,EXTRACT_LOCAL_CLASSES = YES,EXTRACT_LOCAL_CLASSES = NO,g' \ + -e 's,HIDE_UNDOC_MEMBERS = NO,HIDE_UNDOC_MEMBERS = YES,g' \ + -e 's,HIDE_UNDOC_CLASSES = NO,HIDE_UNDOC_CLASSES = YES,g' \ + -e 's,HIDE_FRIEND_COMPOUNDS = NO,HIDE_FRIEND_COMPOUNDS = YES,g' \ + -e 's,HIDE_IN_BODY_DOCS = NO,HIDE_IN_BODY_DOCS = YES,g' \ + -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ + -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' + +EXTRA_DIST = Doxyfile.in + +CLEANFILES = Doxyfile_internal \ + Doxyfile_user + # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. # Moreover, this file is updated whenever ChangeLog is touched: using # sed instead of configure saves us a lot of time. Doxyfile: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile.in Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \ - $(edit) $(srcdir)/Doxyfile.in >Doxyfile - -Doxyfile_user: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile_user.in - Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \ - $(edit) $(srcdir)/Doxyfile_user.in >Doxyfile + $(edit) $(srcdir)/Doxyfile.in >Doxyfile_internal; \ + $(edit_user) $(srcdir)/Doxyfile_internal >Doxyfile_user clean-local: - rm -rf html latex user + rm -rf internal user

1 0

milena r1610: Update documentation for internal namespace
by Guillaume Duhamel 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update documentation for internal namespace. * mln/histo/all.hh, * mln/labeling/all.hh, * mln/metal/all.hh, * mln/morpho/all.hh, * mln/morpho/closing.hh, * mln/norm/all.hh, * mln/trait/all.hh, * mln/util/all.hh, * mln/util/pix.hh: Update doc for internal namespace. --- histo/all.hh | 8 +++++++- labeling/all.hh | 8 +++++++- metal/all.hh | 3 +++ morpho/all.hh | 18 ++++++++++++------ norm/all.hh | 7 ++++++- trait/all.hh | 13 ++++++++++++- util/all.hh | 7 ++++++- util/pix.hh | 1 + 8 files changed, 54 insertions(+), 11 deletions(-) Index: trunk/milena/mln/trait/all.hh =================================================================== --- trunk/milena/mln/trait/all.hh (revision 1609) +++ trunk/milena/mln/trait/all.hh (revision 1610) @@ -41,7 +41,18 @@ /// Namespace where traits are defined. namespace trait - {} + { + + /// \internal Image namespace of trait namespace. + namespace image {} + + /// \internal Implementation namespace of trait namespace. + namespace impl {} + + /// \internal Internal namespace of trait namespace. + namespace internal {} + + } } // end of namespace mln Index: trunk/milena/mln/histo/all.hh =================================================================== --- trunk/milena/mln/histo/all.hh (revision 1609) +++ trunk/milena/mln/histo/all.hh (revision 1610) @@ -41,7 +41,13 @@ namespace histo { /// \internal Implementation namespace of histo namespace. - namespace impl {} + namespace impl { + + /// \internal Generic implementation namespace of histo namespace. + namespace generic {} + + } + } } Index: trunk/milena/mln/metal/all.hh =================================================================== --- trunk/milena/mln/metal/all.hh (revision 1609) +++ trunk/milena/mln/metal/all.hh (revision 1610) @@ -42,6 +42,9 @@ /// \internal Implementation namespace of metal namespace. namespace impl {} + /// \internal Internal namespace of metal namespace. + namespace internal {} + } } // end of namespace mln Index: trunk/milena/mln/morpho/closing.hh =================================================================== Index: trunk/milena/mln/morpho/all.hh =================================================================== --- trunk/milena/mln/morpho/all.hh (revision 1609) +++ trunk/milena/mln/morpho/all.hh (revision 1610) @@ -41,18 +41,24 @@ namespace morpho { - /// \internal Namespace of morphological image processing routines - /// implementation details. + /*! + * \internal Namespace of morphological image processing routines + * implementation details. + * + */ namespace impl { - /// \internal Namespace of morphological image processing routines - /// generic implementations. + /*! + * \internal Namespace of morphological image processing routines + * implementation generic implementations. + * + */ namespace generic - { - } + {} } + } } Index: trunk/milena/mln/norm/all.hh =================================================================== --- trunk/milena/mln/norm/all.hh (revision 1609) +++ trunk/milena/mln/norm/all.hh (revision 1610) @@ -38,7 +38,12 @@ { /// Namespace of norms. - namespace norm {} + namespace norm { + + /// \internal Implementation namespace of norm namespace. + namespace impl {} + + } } Index: trunk/milena/mln/util/pix.hh =================================================================== --- trunk/milena/mln/util/pix.hh (revision 1609) +++ trunk/milena/mln/util/pix.hh (revision 1610) @@ -39,6 +39,7 @@ namespace mln { + /// \brief Select namespace (FIXME doc). namespace select { Index: trunk/milena/mln/util/all.hh =================================================================== --- trunk/milena/mln/util/all.hh (revision 1609) +++ trunk/milena/mln/util/all.hh (revision 1610) @@ -38,7 +38,12 @@ { /// Namespace of tools using for more complex algorithm. - namespace util {} + namespace util { + + /// \internal Implementation namespace of util namespace. + namespace impl {} + + } } Index: trunk/milena/mln/labeling/all.hh =================================================================== --- trunk/milena/mln/labeling/all.hh (revision 1609) +++ trunk/milena/mln/labeling/all.hh (revision 1610) @@ -41,7 +41,13 @@ namespace labeling { /// \internal Implementation namespace of labeling namespace. - namespace impl {} + namespace impl { + + /// \internal Generic implementation namespace of labeling namespace. + namespace generic {} + + } + } }

1 0

milena r1609:
by nivaul_s＠lrde.epita.fr 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> . * mln/core/internal/run_image.hh: Add `has' and `point_at' method. * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_image.hh, * mln/core/p_runs.hh, * mln/core/rle_image.hh, * mln/core/sparse_image.hh: Use the new methods above. * tests/core/p_runs.cc: Fix test. --- mln/core/internal/run_image.hh | 40 ++++++++++++++++++++++++++++++++++++++ mln/core/mono_obased_rle_image.hh | 6 +---- mln/core/mono_rle_image.hh | 15 ++++++-------- mln/core/obased_rle_image.hh | 6 +---- mln/core/p_runs.hh | 13 +++++------- mln/core/rle_image.hh | 6 +---- mln/core/sparse_image.hh | 8 +------ tests/core/p_runs.cc | 5 ++-- 8 files changed, 64 insertions(+), 35 deletions(-) Index: trunk/milena/tests/core/p_runs.cc =================================================================== --- trunk/milena/tests/core/p_runs.cc (revision 1608) +++ trunk/milena/tests/core/p_runs.cc (revision 1609) @@ -58,6 +58,7 @@ // Pset test p_runs_<point2d> ps; + p_runs_<point2d> ps2; ps.insert(p_run<point2d>(p, 7)); mln_assertion(ps.npoints() == 7); @@ -71,10 +72,10 @@ // Psite declaration runs_psite<point2d> site(ps, 5, 0); - runs_psite<point2d> site2(ps, 6, 1); + runs_psite<point2d> site2(ps, 5, 1); mln_assertion(ps.has(site)); - mln_assertion(!ps.has(site2)); + mln_assertion(!ps2.has(site2)); parc(ps); Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1608) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1609) @@ -71,6 +71,21 @@ * actually an lighter image. So it improves compression. */ void finalize(); + + /*! \brief Give the point represented by the point-site. + * + * Use the coordinate of the psite to see what point it corresponds + * with the domain of the image. + * + * \return The corresponding point. + */ + P point_at(const runs_psite& ps) const; + + /*! \brief Tell if the image has the given point site. + * + * \return True if the image has the point site, else false. + */ + bool has(const runs_psite& ps) const; }; # ifndef MLN_INCLUDE_ONLY @@ -98,6 +113,31 @@ exact(this)->data_->finalize(); } + template <typename T, typename P, typename E> + inline + P + run_image_<T, P, E>::point_at(const runs_psite& ps) const + { + const E* ima = exact(this); + mln_precondition(ps.p_of_run() < ima->data_->domain_.nruns()); + mln_precondition(ps.p_in_run() < ima->data_->domain_[ps.p_of_run()].length()); + return ima->data_->domain_[ps.p_of_run()][ps.p_in_run()]; + } + + template <typename T, typename P, typename E> + inline + bool + run_image_<T, P, E>::has(const runs_psite& ps) const + { + const E* ima = exact(this); + if (!ima->has_data()) + return false; + else + return (ps.p_of_run() < ima->data_->domain_.nruns() + && ps.p_in_run() < ima->data_->domain_[ps.p_of_run()].length() + && ima->data_->domain_[ps.p_of_run()][ps.p_in_run()] == ps); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace internal Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1608) +++ trunk/milena/mln/core/rle_image.hh (revision 1609) @@ -212,8 +212,7 @@ rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) const { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->values_.size()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } @@ -222,8 +221,7 @@ typename rle_image<P, T>::lvalue rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->values_.size()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1608) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1609) @@ -211,27 +211,26 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::rvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) - const + mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) const { - mln_precondition(site.p_of_run() < this->data_->domain_.nruns()); + mln_precondition(this->has(site)); return this->data_->value_; } template <typename P, typename T> inline - typename mono_rle_image<P, T>::rvalue - mono_rle_image<P, T>::get_value() const + typename mono_rle_image<P, T>::lvalue + mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) { + mln_precondition(this->has(site)); return this->data_->value_; } template <typename P, typename T> inline - typename mono_rle_image<P, T>::lvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + typename mono_rle_image<P, T>::rvalue + mono_rle_image<P, T>::get_value() const { - mln_precondition(site.p_of_run() < this->data_->domain_.nruns()); return this->data_->value_; } Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1608) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1609) @@ -240,8 +240,7 @@ obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) const { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->domain_.nruns()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } @@ -250,8 +249,7 @@ typename obased_rle_image<P, T>::lvalue obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->domain_.nruns()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1608) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1609) @@ -228,8 +228,7 @@ mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) const { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->domain_.nruns()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } @@ -238,8 +237,7 @@ typename mono_obased_rle_image<P, T>::lvalue mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->domain_.nruns()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; } Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1608) +++ trunk/milena/mln/core/sparse_image.hh (revision 1609) @@ -212,9 +212,7 @@ sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) const { - mln_precondition(this->has_data()); - mln_precondition(site.p_of_run() < this->data_->values_.size()); - mln_precondition(site.p_in_run() < this->data_->values_[site.p_of_run()].size()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()][site.p_in_run()]; } @@ -223,9 +221,7 @@ typename sparse_image<P, T>::lvalue sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) { - mln_precondition(this->has_data() && - site.p_of_run() < this->data_->values_.size() && - site.p_in_run() < this->data_->values_[site.p_of_run()].size()); + mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()][site.p_in_run()]; } Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 1608) +++ trunk/milena/mln/core/p_runs.hh (revision 1609) @@ -70,7 +70,7 @@ p_runs_(); /// Test is \p p belongs to this point set. - bool has(const runs_psite& p) const; + bool has(const runs_psite& ps) const; /// Give the exact bounding box. const box_& bbox() const; @@ -123,13 +123,12 @@ template <typename P> inline bool - p_runs_::has(const runs_psite& p) const + p_runs_::has(const runs_psite& ps) const { - for (unsigned i = 0; i < con_.nelements(); ++i) - { - if (con_[i].first() == p.range_start_() && con_[i].length() > p.p_in_run()) - return true; - } + if (ps.p_of_run() < nruns() + && ps.p_in_run() < con_[ps.p_of_run()].length()) + return (ps == con_[ps.p_of_run()][ps.p_in_run()]); + else return false; }

1 0

1608: Add labeling in tests.
by Thierry Geraud 12 Dec '07

12 Dec '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add labeling in tests. * tests/Makefile.am (SUBDIRS): Add labeling. * img/tiny.pgm: New. img/tiny.pgm | 4 ++++ tests/Makefile.am | 11 +---------- 2 files changed, 5 insertions(+), 10 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 1607) +++ tests/Makefile.am (working copy) @@ -14,6 +14,7 @@ fun \ geom \ histo \ + labeling \ level \ logical \ norm \ @@ -69,11 +70,6 @@ image_if_value \ interpolated \ \ - labeling_algo \ - labeling_estimate \ - labeling_foreground \ - labeling_level_fast \ - labeling_regional_maxima \ level_sort_points \ linear_convolve \ linear_gaussian \ @@ -187,11 +183,6 @@ image_if_value_SOURCES = image_if_value.cc interpolated_SOURCES = interpolated.cc -labeling_algo_SOURCES = labeling_algo.cc -labeling_estimate_SOURCES = labeling_estimate.cc -labeling_foreground_SOURCES = labeling_foreground.cc -labeling_level_fast_SOURCES = labeling_level_fast.cc -labeling_regional_maxima_SOURCES = labeling_regional_maxima.cc level_sort_points_SOURCES = level_sort_points.cc linear_convolve_SOURCES = linear_convolve.cc linear_gaussian_SOURCES = linear_gaussian.cc Index: img/tiny.pgm --- img/tiny.pgm (revision 0) +++ img/tiny.pgm (revision 0) @@ -0,0 +1,4 @@ +P5 +16 16 +255 +hsz¤wZeq~w§`2{bnxz²¾}v9Jjapt|µÈÁrKDoavz¬´»¶·²Gura{x~«¼®qSrasnMK·j=t¡ndrqF?~°KEgilS@_mJ_XlYEQfzNy¡ÄYdR\aK|]S¶ÒT\SrM9b?\ÂÇ`RKgL5W zb°qqI;W[@i¤À¢_rH6LFMy¼¤onY~D@JAb±jpXR \ No newline at end of file

1 0

milena r1607: Fix bug for saturate
by Guillaume Duhamel 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix bug for saturate. * mln/fun/v2v/saturate.hh: Fix needs_update in mutable. --- saturate.hh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Index: trunk/milena/mln/fun/v2v/saturate.hh =================================================================== --- trunk/milena/mln/fun/v2v/saturate.hh (revision 1606) +++ trunk/milena/mln/fun/v2v/saturate.hh (revision 1607) @@ -62,7 +62,7 @@ protected: V min_, max_; - bool needs_update_; + mutable bool needs_update_; }; @@ -101,7 +101,6 @@ { min_W = mln::value::cast<W>(min_); max_W = mln::value::cast<W>(max_); - // FIXME needs_update_ = false; }

1 0

milena r1606: Add generation of user documentation
by Guillaume Duhamel 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add generation of user documentation. Update creation of documentation. * doc/Doxyfile.in, * doc/Makefile.am: Update for generation of internal or user documentation. * doc/Doxyfile_user.in: New template file for generate the user documentation. Update source for distinction between the user and developper documentation. * mln/accu/all.hh, * mln/accu/internal/base.hh, * mln/arith/all.hh, * mln/border/all.hh, * mln/canvas/all.hh, * mln/convert/all.hh, * mln/core/cast_image.hh, * mln/core/concept/object.hh, * mln/core/decorated_image.hh, * mln/core/dpoint.hh, * mln/core/fi_adaptor.hh, * mln/core/image1d.hh, * mln/core/image2d.hh, * mln/core/image3d.hh, * mln/core/image_if.hh, * mln/core/image_if_interval.hh, * mln/core/image_if_value.hh, * mln/core/internal/box_impl.hh, * mln/core/internal/check/image_all.hh, * mln/core/internal/check/image_fastest.hh, * mln/core/internal/coord_impl.hh, * mln/core/internal/dpoints_base.hh, * mln/core/internal/fixme.hh, * mln/core/internal/force_exact.hh, * mln/core/internal/image_base.hh, * mln/core/internal/image_domain_morpher.hh, * mln/core/internal/image_identity.hh, * mln/core/internal/image_if_base.hh, * mln/core/internal/image_morpher.hh, * mln/core/internal/image_primary.hh, * mln/core/internal/image_value_morpher.hh, * mln/core/internal/piter_adaptor.hh, * mln/core/internal/pixel_impl.hh, * mln/core/internal/pixel_iterator_base.hh, * mln/core/internal/point_iterator_base.hh, * mln/core/internal/point_set_base.hh, * mln/core/internal/run_image.hh, * mln/core/internal/set_of.hh, * mln/core/t_image.hh, * mln/debug/all.hh, * mln/display/all.hh, * mln/fun/all.hh, * mln/fun/x2x/all.hh, * mln/fun/x2x/composed.hh, * mln/geom/all.hh, * mln/geom/chamfer.hh, * mln/histo/all.hh, * mln/io/all.hh, * mln/io/pbm/all.hh, * mln/io/pfm/all.hh, * mln/io/pnm/all.hh, * mln/labeling/all.hh, * mln/level/all.hh, * mln/level/approx/all.hh, * mln/level/naive/all.hh, * mln/level/naive/median.hh, * mln/linear/all.hh, * mln/logical/all.hh, * mln/metal/all.hh, * mln/metal/math/all.hh, * mln/morpho/all.hh, * mln/morpho/minus.hh, * mln/morpho/plus.hh, * mln/pw/image.hh, * mln/test/all.hh, * mln/value/all.hh, * mln/value/float01_.hh, * mln/value/graylevel.hh, * mln/value/internal/convert.hh, * mln/value/internal/encoding.hh, * mln/value/internal/iterable_set.hh, * mln/value/internal/value_like.hh, * mln/value/label.hh, * mln/value/stack.hh: Update (add command internal in Doxygen comment). --- doc/Doxyfile.in | 1054 ------------------------------ doc/Doxyfile_user.in | 252 +++++++ doc/Makefile.am | 21 mln/accu/all.hh | 4 mln/accu/internal/base.hh | 3 mln/arith/all.hh | 4 mln/border/all.hh | 4 mln/canvas/all.hh | 2 mln/convert/all.hh | 2 mln/core/cast_image.hh | 2 mln/core/concept/object.hh | 6 mln/core/decorated_image.hh | 8 mln/core/fi_adaptor.hh | 1 mln/core/image1d.hh | 4 mln/core/image2d.hh | 3 mln/core/image3d.hh | 1 mln/core/image_if.hh | 8 mln/core/image_if_interval.hh | 7 mln/core/image_if_value.hh | 6 mln/core/internal/box_impl.hh | 16 mln/core/internal/check/image_all.hh | 4 mln/core/internal/check/image_fastest.hh | 3 mln/core/internal/coord_impl.hh | 32 mln/core/internal/dpoints_base.hh | 4 mln/core/internal/fixme.hh | 3 mln/core/internal/force_exact.hh | 17 mln/core/internal/image_base.hh | 13 mln/core/internal/image_domain_morpher.hh | 4 mln/core/internal/image_identity.hh | 4 mln/core/internal/image_if_base.hh | 12 mln/core/internal/image_morpher.hh | 7 mln/core/internal/image_primary.hh | 3 mln/core/internal/image_value_morpher.hh | 4 mln/core/internal/piter_adaptor.hh | 3 mln/core/internal/pixel_impl.hh | 6 mln/core/internal/pixel_iterator_base.hh | 2 mln/core/internal/point_iterator_base.hh | 4 mln/core/internal/point_set_base.hh | 4 mln/core/internal/run_image.hh | 3 mln/core/internal/set_of.hh | 10 mln/core/t_image.hh | 2 mln/debug/all.hh | 2 mln/display/all.hh | 4 mln/fun/all.hh | 2 mln/fun/x2x/all.hh | 2 mln/fun/x2x/composed.hh | 17 mln/geom/all.hh | 2 mln/geom/chamfer.hh | 4 mln/histo/all.hh | 2 mln/io/all.hh | 2 mln/io/pbm/all.hh | 4 mln/io/pfm/all.hh | 4 mln/io/pnm/all.hh | 2 mln/labeling/all.hh | 2 mln/level/all.hh | 4 mln/level/approx/all.hh | 12 mln/level/naive/all.hh | 4 mln/level/naive/median.hh | 2 mln/linear/all.hh | 4 mln/logical/all.hh | 4 mln/metal/all.hh | 2 mln/metal/math/all.hh | 2 mln/morpho/all.hh | 14 mln/morpho/minus.hh | 15 mln/morpho/plus.hh | 15 mln/pw/image.hh | 2 mln/test/all.hh | 2 mln/value/all.hh | 2 mln/value/float01_.hh | 1 mln/value/graylevel.hh | 4 mln/value/internal/convert.hh | 3 mln/value/internal/encoding.hh | 2 mln/value/internal/iterable_set.hh | 3 mln/value/internal/value_like.hh | 16 mln/value/label.hh | 1 mln/value/stack.hh | 2 76 files changed, 442 insertions(+), 1275 deletions(-) Index: trunk/milena/doc/Doxyfile_user.in =================================================================== --- trunk/milena/doc/Doxyfile_user.in (revision 0) +++ trunk/milena/doc/Doxyfile_user.in (revision 1606) @@ -0,0 +1,252 @@ +# Doxyfile 1.5.1 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +PROJECT_NAME = "Milena (@PACKAGE_NAME@)" +PROJECT_NUMBER = "@PACKAGE_VERSION@ @ID@ User Doc" +OUTPUT_DIRECTORY = ./user/ +CREATE_SUBDIRS = YES +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = YES +INLINE_INHERITED_MEMB = YES +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = @top_srcdir@/milena \ + @top_builddir@/milena +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +BUILTIN_STL_SUPPORT = YES +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = NO +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES +HIDE_FRIEND_COMPOUNDS = YES +HIDE_IN_BODY_DOCS = YES +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = YES +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = YES +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = @top_srcdir@/milena \ + @top_builddir@/milena +FILE_PATTERNS = *.cc \ + *.hh \ + *.hxx \ + *.hcc +RECURSIVE = YES +EXCLUDE = @top_srcdir@/milena/sandbox +EXCLUDE_SYMLINKS = YES +EXCLUDE_PATTERNS = *spe.hh +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = YES +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = YES +USE_PDFLATEX = YES +LATEX_BATCHMODE = YES +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" \ + "mln_piter(T)=typename T::piter" \ + "mln_fwd_piter(T)=typename T::fwd_piter" \ + "mln_bkd_piter(T)=typename T::bkd_piter" \ + "mln_qiter(T)=typename T::qiter" \ + "mln_fwd_qiter(T)=typename T::fwd_qiter" \ + "mln_bkd_qiter(T)=typename T::bkd_qiter" \ + "mln_niter(T)=typename T::niter" \ + "mln_fwd_niter(T)=typename T::fwd_niter" \ + "mln_bkd_niter(T)=typename T::bkd_niter" \ + "mln_viter(T)=typename T::viter" \ + "mln_fwd_viter(T)=typename T::fwd_viter" \ + "mln_bkd_viter(T)=typename T::bkd_viter" \ + "mln_result(T)=typename T::result" \ + "mln_enc(T)=typename T::enc" \ + "mln_value(T)=typename T::value" \ + "mln_qlf_value(T)=typename T::qlf_value" \ + "mln_pset(T)=typename T::pset" \ + "mln_sum(T)=typename mln::value::props<T>::sum" \ + "mln_vset(T)=typename T::vset" \ + "mln_rvalue(T)=typename T::rvalue" \ + "mln_lvalue(T)=typename T::lvalue" \ + "mln_mesh(T)=typename T::mesh" \ + "mln_coord(T)=typename T::coord" \ + "mln_point(T)=typename T::point" \ + "mln_dpoint(T)=typename T::dpoint" +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = YES +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = YES +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_DEPTH = 1000 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO Index: trunk/milena/doc/Doxyfile.in =================================================================== --- trunk/milena/doc/Doxyfile.in (revision 1605) +++ trunk/milena/doc/Doxyfile.in (revision 1606) @@ -1,1048 +1,191 @@ -# Doxyfile 1.5.2 -*- Makefile -*- - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# Doxyfile 1.5.1 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the -# config file that follow. The default is UTF-8 which is also the -# encoding used for all text before the first occurrence of this -# tag. Doxygen uses libiconv (or the iconv built into libc) for the -# transcoding. See http://www.gnu.org/software/libiconv for the list -# of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - PROJECT_NAME = "Milena (@PACKAGE_NAME@)" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - PROJECT_NUMBER = "@PACKAGE_VERSION@ @ID@" - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - OUTPUT_DIRECTORY = . - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - CREATE_SUBDIRS = YES - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. - OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will -# prepend the brief description of a member or function before the -# detailed description. Note: if both HIDE_UNDOC_MEMBERS and -# BRIEF_MEMBER_DESC are set to NO, the brief descriptions will be -# completely suppressed. - REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - ALWAYS_DETAILED_SEC = YES - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - INLINE_INHERITED_MEMB = YES - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - STRIP_FROM_PATH = @top_srcdir@/milena \ @top_builddir@/milena - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - JAVADOC_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of -# Java sources only. Doxygen will then generate output that is more -# tailored for Java. For instance, namespaces will be presented as -# packages, qualified scopes will look different, etc. - OPTIMIZE_OUTPUT_JAVA = NO - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do -# not want to include (a tag file for) the STL sources as input, then -# you should set this tag to YES in order to let doxygen match -# functions declarations and definitions whose arguments contain STL -# classes (e.g. func(std::string); v.s. func(std::string) {}). This -# also make the inheritance and collaboration diagrams that involve -# STL classes more complete and accurate. - BUILTIN_STL_SUPPORT = YES - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - SUBGROUPING = YES - #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - EXTRACT_LOCAL_METHODS = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - +INTERNAL_DOCS = YES CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - SORT_BRIEF_DOCS = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple -# directories then setting the SHOW_DIRECTORIES tag to YES will show -# the directory hierarchy in the documentation. The default is NO. - SHOW_DIRECTORIES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or -# script that doxygen should invoke to get the current version for -# each file (typically from the version control system). Doxygen will -# invoke the program by executing (via popen()) the command <command> -# <input-file>, where <command> is the value of the -# FILE_VERSION_FILTER tag, and <input-file> is the name of an input -# file provided by doxygen. Whatever the program writes to standard -# output is used as the file version. See the manual for examples. - FILE_VERSION_FILTER = - #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - WARN_LOGFILE = - #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories -# that contain documented source files. You may enter file names like -# "myfile.cpp" or directories like "/usr/src/myproject". Separate the -# files or directories with spaces. - INPUT = @top_srcdir@/milena \ @top_builddir@/milena - -# This tag can be used to specify the character encoding of the source -# files that doxygen parses. Internally doxygen uses the UTF-8 -# encoding, which is also the default input encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible -# encodings. - -INPUT_ENCODING = ISO-8859-1 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py - FILE_PATTERNS = *.cc \ *.hh \ *.hxx \ *.hcc - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - EXCLUDE = @top_srcdir@/milena/sandbox - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - EXCLUDE_SYMLINKS = YES - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - EXCLUDE_PATTERNS = *spe.hh - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol -# names (namespaces, classes, functions, etc.) that should be excluded -# from the output. The symbol name can be a fully qualified name, a -# word, or if the wildcard * is used, a substring. Examples: -# ANamespace, AClass, AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - FILTER_SOURCE_FILES = NO - #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files -# will be generated. Documented entities will be cross-referenced with -# these sources. Note: To get rid of all source code in the generated -# output, make sure also VERBATIM_HEADERS is set to NO. - SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. - REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html) You -# will need version 4.8.6 or higher. - USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - VERBATIM_HEADERS = YES - #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - IGNORE_PREFIX = - #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - GENERATE_TREEVIEW = YES - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - TREEVIEW_WIDTH = 250 - #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - LATEX_BATCHMODE = YES - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - LATEX_HIDE_INDICES = NO - #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - RTF_EXTENSIONS_FILE = - #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - MAN_LINKS = NO - #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - XML_PROGRAMLISTING = YES - #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - GENERATE_AUTOGEN_DEF = NO - #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - PERLMOD_MAKEVAR_PREFIX = - #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - EXPAND_ONLY_PREDEF = YES - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = \ - "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" \ +PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" \ "mln_piter(T)=typename T::piter" \ "mln_fwd_piter(T)=typename T::fwd_piter" \ "mln_bkd_piter(T)=typename T::bkd_piter" \ @@ -1068,231 +211,42 @@ "mln_coord(T)=typename T::coord" \ "mln_point(T)=typename T::point" \ "mln_dpoint(T)=typename T::dpoint" - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES -# then this tag can be used to specify a list of macro names that -# should be expanded. The macro definition that is found in the -# sources will be used. Use the PREDEFINED tag if you want to use a -# different macro definition. - EXPAND_AS_DEFINED = - - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - SKIP_FUNCTION_MACROS = YES - #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using -# the \msc command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert -# it in the documentation. The MSCGEN_PATH tag allows you to specify -# the directory where the mscgen tool resides. If left empty the tool -# is assumed to be found in the default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - HAVE_DOT = YES - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - TEMPLATE_RELATIONS = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. - CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen will always -# show the root nodes and its direct children regardless of this setting. - -DOT_GRAPH_MAX_NODES = 50 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). - +MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - DOT_CLEANUP = YES - #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - SEARCHENGINE = NO Index: trunk/milena/doc/Makefile.am =================================================================== --- trunk/milena/doc/Makefile.am (revision 1605) +++ trunk/milena/doc/Makefile.am (revision 1606) @@ -1,19 +1,29 @@ DOXYGEN = doxygen -.PHONY: doc html +.PHONY: doc user-doc internal-doc html html_user doc: html +internal-doc: html + +user-doc: html_user + + html-local: Doxyfile $(DOXYGEN) +html_user: Doxyfile_user + $(DOXYGEN) + + edit = sed -e "s|@ID@|$$Id|" \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ -e 's,@top_builddir\@,$(top_builddir),g' \ -e 's,@top_srcdir\@,$(top_srcdir),g' -EXTRA_DIST = Doxyfile.in +EXTRA_DIST = Doxyfile.in \ + Doxyfile_user.in CLEANFILES = Doxyfile # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. @@ -23,5 +33,10 @@ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \ $(edit) $(srcdir)/Doxyfile.in >Doxyfile +Doxyfile_user: $(top_srcdir)/ChangeLog $(srcdir)/Doxyfile_user.in + Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog`; \ + $(edit) $(srcdir)/Doxyfile_user.in >Doxyfile + clean-local: - rm -rf html latex + rm -rf html latex user + Index: trunk/milena/mln/histo/all.hh =================================================================== --- trunk/milena/mln/histo/all.hh (revision 1605) +++ trunk/milena/mln/histo/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of histograms. namespace histo { - /// Implementation namespace of histo namespace. + /// \internal Implementation namespace of histo namespace. namespace impl {} } Index: trunk/milena/mln/debug/all.hh =================================================================== --- trunk/milena/mln/debug/all.hh (revision 1605) +++ trunk/milena/mln/debug/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of routines that help to debug. namespace debug { - /// Implementation namespace of debug namespace. + /// \internal Implementation namespace of debug namespace. namespace impl {} } Index: trunk/milena/mln/core/decorated_image.hh =================================================================== --- trunk/milena/mln/core/decorated_image.hh (revision 1605) +++ trunk/milena/mln/core/decorated_image.hh (revision 1606) @@ -47,6 +47,7 @@ namespace internal { + /// \internal template <typename I, typename E> struct decorated_image_impl_ { @@ -54,12 +55,14 @@ void write_(const mln_psite(I)& p, const mln_value(I)& v); }; + /// \internal template <typename I, typename E> struct decorated_image_impl_< const I, E > { typedef mln::value::proxy<const E> lvalue; }; + /// \internal template <typename I, typename D> struct data_< decorated_image<I,D> > { @@ -130,8 +133,7 @@ namespace internal { - // internal::data_< decorated_image<I,S> > - + // \internal internal::data_< decorated_image<I,S> > template <typename I, typename D> inline data_< decorated_image<I,D> >::data_(I& ima, const D& deco) @@ -170,7 +172,7 @@ namespace internal { - + /// \internal template <typename I, typename E> inline void Index: trunk/milena/mln/core/image_if.hh =================================================================== --- trunk/milena/mln/core/image_if.hh (revision 1605) +++ trunk/milena/mln/core/image_if.hh (revision 1606) @@ -49,7 +49,7 @@ template <typename I, typename F> struct image_if; - // internal::data_. + /// \internal internal::data_. namespace internal { @@ -120,20 +120,20 @@ /// ima | f creates an image_if with the image ima and the function /// f. - /// {{{ template <typename I, typename F> image_if<I,F> operator | (Image& ima, const Function_p2b<F>& f); + /// ima | f creates an image_if with the image ima and the function + /// f. template <typename I, typename F> image_if<const I,F> operator | (const Image& ima, const Function_p2b<F>& f); - /// }}} # ifndef MLN_INCLUDE_ONLY - // internal::data_ + /// \internal internal::data_ namespace internal { Index: trunk/milena/mln/core/internal/force_exact.hh =================================================================== --- trunk/milena/mln/core/internal/force_exact.hh (revision 1605) +++ trunk/milena/mln/core/internal/force_exact.hh (revision 1606) @@ -32,7 +32,6 @@ * * \brief Definition of a violent cast for internal use only. * - * \internal */ @@ -43,16 +42,12 @@ namespace internal { - /*! \brief Violent cast. - * - * \internal - * - * This cast is an alternative to the mln::exact cast. It is used - * for objects than do not derive from mln::Object. - * - * \warning Do not to use this cast! - * - * \see mln::exact + /*! \internal Violent cast. + * This cast is an alternative to the mln::exact cast. + * It is used for objects than do not derive from + * mln::Object. + * Warning Do not to use this cast! + * see mln::exact */ template <typename E, typename T> E& force_exact(const T& ref) Index: trunk/milena/mln/core/internal/pixel_iterator_base.hh =================================================================== --- trunk/milena/mln/core/internal/pixel_iterator_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/pixel_iterator_base.hh (revision 1606) @@ -45,7 +45,7 @@ { - /*! \brief A base class for pixel iterators. + /*! \internal A base class for pixel iterators. * */ template <typename I, typename E> Index: trunk/milena/mln/core/internal/image_primary.hh =================================================================== --- trunk/milena/mln/core/internal/image_primary.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_primary.hh (revision 1606) @@ -43,9 +43,8 @@ { - /*! \brief A base class for primary images. + /*! \internal A base class for primary images. * - * \internal */ template <typename S, typename E> struct image_primary_ : public image_base_<S, E> Index: trunk/milena/mln/core/internal/coord_impl.hh =================================================================== --- trunk/milena/mln/core/internal/coord_impl.hh (revision 1605) +++ trunk/milena/mln/core/internal/coord_impl.hh (revision 1606) @@ -42,16 +42,18 @@ namespace internal { - // coord_impl - /*! \brief Implementation class to equip generalized points with + /// \internal coord_impl + + + /* \internal Implementation class to equip generalized points with * explicit access to their coordinates. * - * \internal */ template <unsigned n, typename C, typename E> struct coord_impl_; + /// \internal template <typename C, typename E> struct coord_impl_<1, C, E> { @@ -61,6 +63,7 @@ }; + /// \internal template <typename C, typename E> struct coord_impl_<2, C, E> { @@ -68,6 +71,7 @@ C col() const; }; + /// \internal template <typename C, typename E> struct coord_impl_<3, C, E> { @@ -77,11 +81,13 @@ }; - // mutable_coord_impl + // \internal mutable_coord_impl + /// \internal template <unsigned n, typename C, typename E> struct mutable_coord_impl_; + /// \internal template <typename C, typename E> struct mutable_coord_impl_<1, C, E> { @@ -89,6 +95,7 @@ C& ind(); }; + /// \internal template <typename C, typename E> struct mutable_coord_impl_<2, C, E> { @@ -98,6 +105,7 @@ C& col(); }; + /// \internal template <typename C, typename E> struct mutable_coord_impl_<3, C, E> { @@ -112,9 +120,9 @@ # ifndef MLN_INCLUDE_ONLY - // coord_impl + // \internal coord_impl - // 1 + // \internal 1 template <typename C, typename E> inline @@ -123,7 +131,7 @@ return internal::force_exact<E>(*this)[0]; } - // 2 + // \internal 2 template <typename C, typename E> inline @@ -139,7 +147,7 @@ return internal::force_exact<E>(*this)[1]; } - // 3 + // \internal 3 template <typename C, typename E> inline @@ -163,9 +171,9 @@ } - // mutable_coord_impl + // \internal mutable_coord_impl - // 1 + // \internal 1 template <typename C, typename E> inline @@ -181,7 +189,7 @@ return internal::force_exact<E>(*this)[0]; } - // 2 + // \internal 2 template <typename C, typename E> inline @@ -211,7 +219,7 @@ return internal::force_exact<E>(*this)[1]; } - // 3 + // \internal 3 template <typename C, typename E> inline Index: trunk/milena/mln/core/internal/image_if_base.hh =================================================================== --- trunk/milena/mln/core/internal/image_if_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_if_base.hh (revision 1606) @@ -46,10 +46,10 @@ namespace internal { - // Fwd decl. + // \internal Fwd decl. template <typename I, typename F, typename E> struct image_if_base_; - // data_. + // \internal data_. template <typename I, typename F, typename E> struct data_< image_if_base_<I,F,E> > @@ -95,7 +95,7 @@ namespace internal { - /*! \brief An base image class for image_if_'something. + /*! \internal An base image class for image_if_'something. * */ template <typename I, typename F, typename E> @@ -123,7 +123,7 @@ # ifndef MLN_INCLUDE_ONLY -// // init_ +// // \internal init_ // template <typename I, typename F, typename E> // void init_(tag::function_t, F& f, const image_if_base_<I,F,E>& model) @@ -141,7 +141,7 @@ // target.init_(ima, f); // } - // internal::data_< image_if_base_<I,S> > + // \internal internal::data_< image_if_base_<I,S> > template <typename I, typename F, typename E> inline @@ -151,7 +151,7 @@ { } - // image_if_base_<I,F,E> + // \internal image_if_base_<I,F,E> template <typename I, typename F, typename E> inline Index: trunk/milena/mln/core/internal/image_identity.hh =================================================================== --- trunk/milena/mln/core/internal/image_identity.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_identity.hh (revision 1606) @@ -43,11 +43,9 @@ { - /*! \brief A base class for image morphers w.r.t. identity. - * + /*! \internal A base class for image morphers w.r.t. identity. * Parameter \p S is a point set type. * - * \internal */ template <typename I, typename S, typename E> class image_identity_ : public image_morpher_<I, S, E> Index: trunk/milena/mln/core/internal/point_iterator_base.hh =================================================================== --- trunk/milena/mln/core/internal/point_iterator_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/point_iterator_base.hh (revision 1606) @@ -44,11 +44,9 @@ { - /*! \brief A base class for point iterators. - * + /*! \internal A base class for point iterators. * Parameter \c P is a point site type. * - * \internal */ template <typename P, typename E> struct point_iterator_base_ : public Point_Iterator<E> Index: trunk/milena/mln/core/internal/piter_adaptor.hh =================================================================== --- trunk/milena/mln/core/internal/piter_adaptor.hh (revision 1605) +++ trunk/milena/mln/core/internal/piter_adaptor.hh (revision 1606) @@ -43,8 +43,7 @@ namespace internal { - /*! \brief A base class for point iterator adaptors. - * + /*! \internal A base class for point iterator adaptors. * Parameter \c Pi is the type of the point iterator adaptee; * parameter E is the exact type. */ Index: trunk/milena/mln/core/internal/point_set_base.hh =================================================================== --- trunk/milena/mln/core/internal/point_set_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/point_set_base.hh (revision 1606) @@ -43,11 +43,9 @@ namespace internal { - /*! \brief A base class for point set classes. - * + /*! \internal A base class for point set classes. * \p P is a point site type. * - * \internal */ template <typename P, typename E> struct point_set_base_ : public Point_Set<E> Index: trunk/milena/mln/core/internal/pixel_impl.hh =================================================================== --- trunk/milena/mln/core/internal/pixel_impl.hh (revision 1605) +++ trunk/milena/mln/core/internal/pixel_impl.hh (revision 1606) @@ -43,10 +43,9 @@ namespace internal { - /*! \brief Implementation class to equip generalized pixel + /*! \internal Implementation class to equip generalized pixel * classes based on mutable images. * - * \internal */ template <typename I, typename E> class pixel_impl_ @@ -96,10 +95,9 @@ }; - /*! \brief Implementation class to equip generalized pixel + /*! \internal Implementation class to equip generalized pixel * classes based on constant images. * - * \internal */ template <typename I, typename E> class pixel_impl_< const I, E > Index: trunk/milena/mln/core/internal/image_domain_morpher.hh =================================================================== --- trunk/milena/mln/core/internal/image_domain_morpher.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_domain_morpher.hh (revision 1606) @@ -43,11 +43,9 @@ { - /*! \brief A base class for image morphers w.r.t. domain. - * + /*! \internal A base class for image morphers w.r.t. domain. * Parameter \p S is a point set type. * - * \internal */ template <typename I, typename S, typename E> class image_domain_morpher_ : public image_morpher_<I, S, E> Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1605) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1606) @@ -43,8 +43,7 @@ namespace internal { - /*! \brief Factorization class for run_image. - * + /*! \internal Factorization class for run_image. * Parameter \c T is the type of the image value. * Parameter \c P is the type of the image point. * Parameter \c E is the Exact type of the image. Index: trunk/milena/mln/core/internal/fixme.hh =================================================================== --- trunk/milena/mln/core/internal/fixme.hh (revision 1605) +++ trunk/milena/mln/core/internal/fixme.hh (revision 1606) @@ -40,10 +40,9 @@ namespace internal { - /*! \brief A FIXME class to make explicit in code that a type is + /*! \internal A FIXME class to make explicit in code that a type is * not yet implemented. * - * \internal */ struct fixme {}; Index: trunk/milena/mln/core/internal/box_impl.hh =================================================================== --- trunk/milena/mln/core/internal/box_impl.hh (revision 1605) +++ trunk/milena/mln/core/internal/box_impl.hh (revision 1606) @@ -43,16 +43,16 @@ namespace internal { - // box_impl + // \internal box_impl - /*! \brief Implementation class to equip objects having a bounding + /*! \internal Implementation class to equip objects having a bounding * box. * - * \internal */ template <unsigned n, typename C, typename E> struct box_impl_; + /// \internal template <typename C, typename E> // FIXME: Add an extra param to replace 'unsigned'. struct box_impl_<3, C, E> { @@ -84,6 +84,7 @@ C max_col() const; }; + /// \internal template <typename C, typename E> // FIXME: Add an extra param to replace 'unsigned'. struct box_impl_<2, C, E> { @@ -106,6 +107,7 @@ C max_col() const; }; + /// \internal template <typename C, typename E> // FIXME: Add an extra param to replace 'unsigned'. struct box_impl_<1, C, E> { @@ -122,9 +124,9 @@ # ifndef MLN_INCLUDE_ONLY - // box_impl + // \internal box_impl - // 3 + // \internal 3 template <typename C, typename E> inline @@ -190,7 +192,7 @@ } - // 2 + // \internal 2 template <typename C, typename E> inline @@ -234,7 +236,7 @@ return internal::force_exact<E>(*this).bbox().pmax()[1]; } - // 1 + // \internal 1 template <typename C, typename E> inline Index: trunk/milena/mln/core/internal/dpoints_base.hh =================================================================== --- trunk/milena/mln/core/internal/dpoints_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/dpoints_base.hh (revision 1606) @@ -44,8 +44,8 @@ namespace internal { - - /*! \brief FIXME. + /*! \internal FIXME. + * */ template <typename D, typename E> class dpoints_base_ : protected internal::set_of_<D> Index: trunk/milena/mln/core/internal/image_value_morpher.hh =================================================================== --- trunk/milena/mln/core/internal/image_value_morpher.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_value_morpher.hh (revision 1606) @@ -43,11 +43,9 @@ { - /*! \brief A base class for image morphers w.r.t. value. - * + /*! \internal A base class for image morphers w.r.t. value. * Parameter \p S is a point set type. * - * \internal */ template <typename I, typename E> class image_value_morpher_ : public image_morpher_<I, mln_pset(I), E> Index: trunk/milena/mln/core/internal/image_base.hh =================================================================== --- trunk/milena/mln/core/internal/image_base.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_base.hh (revision 1606) @@ -48,12 +48,12 @@ namespace internal { - /// Class of image internal data. + /// \internal Class of image internal data. + /// FIXME: Say more about it! + template <typename I> struct data_; - // FIXME: Say more about it! - } // end of namespace mln::internal @@ -61,10 +61,9 @@ namespace internal { - /*! \brief Return the lvalue type when an image with type \c I is + /*! \internal Return the lvalue type when an image with type \c I is * morphed. * - * \internal */ template <typename I> struct morpher_lvalue_ @@ -88,11 +87,9 @@ }; - /*! \brief A base class for images. - * + /*! \internal A base class for images. * Parameter \p S is a point set type. * - * \internal */ template <typename S, typename E> struct image_base_ Index: trunk/milena/mln/core/internal/image_morpher.hh =================================================================== --- trunk/milena/mln/core/internal/image_morpher.hh (revision 1605) +++ trunk/milena/mln/core/internal/image_morpher.hh (revision 1606) @@ -44,11 +44,9 @@ namespace internal { - /*! \brief A base class for images that are morphers. + /*! \internal A base class for images that are morphers. Parameter + * \c I is the underlying-morphed image type. * - * Parameter \c I is the underlying-morphed image type. - * - * \internal */ template <typename I, typename S, typename E> class image_morpher_ : public image_base_<S, E> @@ -94,6 +92,7 @@ // FIXME: Lines above have been inactivated because they are either // prioritary or ambiguous. + /// \internal template <typename Subject, typename T, typename J> void init_(Subject s, T& target, const Image<J>& model); Index: trunk/milena/mln/core/internal/set_of.hh =================================================================== --- trunk/milena/mln/core/internal/set_of.hh (revision 1605) +++ trunk/milena/mln/core/internal/set_of.hh (revision 1606) @@ -47,17 +47,11 @@ namespace internal { - /*! \brief An "efficient" mathematical set class. - * - * \internal - * + /*! \internal An "efficient" mathematical set class. * This set class is designed to store a mathematical set and to * present it to the user as a linear array (std::vector). - * * Elements are stored by copy. Implementation is lazy. - * * \invariant \a v_.size() == s_.size() - * * The parameter \c E is the element type, which shall not be * const-qualified. * @@ -171,7 +165,7 @@ }; - /*! \brief Print a set \p s into the output stream \p + /*! \internal Print a set \p s into the output stream \p * ostr. * * \param[in,out] ostr An output stream. Index: trunk/milena/mln/core/internal/check/image_all.hh =================================================================== --- trunk/milena/mln/core/internal/check/image_all.hh (revision 1605) +++ trunk/milena/mln/core/internal/check/image_all.hh (revision 1606) @@ -44,17 +44,17 @@ namespace internal { - /*! Namespace of all image-related internal checks. + /*! \internal Namespace of all image-related internal checks. */ namespace check { + /// \internal template <typename E> struct image_all_ : public image_fastest_< E, typename mlc_equal(mln_trait_image_speed(E), trait::image::speed::fastest)::eval > - // , ... { }; Index: trunk/milena/mln/core/internal/check/image_fastest.hh =================================================================== --- trunk/milena/mln/core/internal/check/image_fastest.hh (revision 1605) +++ trunk/milena/mln/core/internal/check/image_fastest.hh (revision 1606) @@ -46,7 +46,7 @@ namespace check { - /*! \brief FIXME + /*! \internal FIXME */ template < typename E, typename B = metal::true_ > struct image_fastest_ @@ -70,6 +70,7 @@ }; + /// \internal template <typename E> struct image_fastest_< E, metal::false_ > { Index: trunk/milena/mln/core/image_if_value.hh =================================================================== --- trunk/milena/mln/core/image_if_value.hh (revision 1605) +++ trunk/milena/mln/core/image_if_value.hh (revision 1606) @@ -49,7 +49,7 @@ template <typename I> struct image_if_value; - // internal::data_. + /// \internal internal::data_. namespace internal { @@ -126,15 +126,15 @@ /// ima | v creates an image_if_value with the image ima and the /// value v. - /// {{{ template <typename I> image_if_value operator | (Image& ima, const mln_value(I)& v); + /// ima | v creates an image_if_value with the image ima and the + /// value v. template <typename I> image_if_value<const I> operator | (const Image& ima, const mln_value(I)& v); - /// }}} # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/core/image_if_interval.hh =================================================================== --- trunk/milena/mln/core/image_if_interval.hh (revision 1605) +++ trunk/milena/mln/core/image_if_interval.hh (revision 1606) @@ -57,8 +57,7 @@ template <typename I> struct image_if_interval; - // internal::data_. - + /// \internal internal::data_. namespace internal { @@ -111,15 +110,15 @@ /// ima | vv creates an image_if_interval with the image ima and the /// interval vv. - /// {{{ template <typename I> image_if_interval operator | (Image& ima, const value::interval_<mln_value(I)>& vv); + /// ima | vv creates an image_if_interval with the image ima and the + /// interval vv. template <typename I> image_if_interval<const I> operator | (const Image& ima, const value::interval_<mln_value(I)>& vv); - /// }}} Index: trunk/milena/mln/core/cast_image.hh =================================================================== --- trunk/milena/mln/core/cast_image.hh (revision 1605) +++ trunk/milena/mln/core/cast_image.hh (revision 1606) @@ -50,7 +50,7 @@ namespace internal { - + /// \internal template <typename T, typename I> struct data_< cast_image_<T,I> > { Index: trunk/milena/mln/core/dpoint.hh =================================================================== Index: trunk/milena/mln/core/concept/object.hh =================================================================== --- trunk/milena/mln/core/concept/object.hh (revision 1605) +++ trunk/milena/mln/core/concept/object.hh (revision 1606) @@ -61,13 +61,13 @@ */ namespace mln { - /// Implementation namespace of mln namespace. + /// \internal Implementation namespace of mln namespace. namespace impl {} - /// Internal namespace of mln namespace. + /// \internal Internal namespace of mln namespace. namespace internal { - /// FIXME : doc + /// \internal FIXME : doc namespace check {} } Index: trunk/milena/mln/core/t_image.hh =================================================================== --- trunk/milena/mln/core/t_image.hh (revision 1605) +++ trunk/milena/mln/core/t_image.hh (revision 1606) @@ -46,7 +46,7 @@ namespace internal { - /// Data held by a mln::t_image. + /// \internal Data held by a mln::t_image. template <typename I> struct data_< t_image > { Index: trunk/milena/mln/core/image1d.hh =================================================================== --- trunk/milena/mln/core/image1d.hh (revision 1605) +++ trunk/milena/mln/core/image1d.hh (revision 1606) @@ -59,7 +59,7 @@ namespace internal { - /// Data structure for \c mln::image1d<T>. + /// \internal Data structure for \c mln::image1d<T>. template <typename T> struct data_< image1d<T> > { @@ -239,7 +239,7 @@ target.init_(b, bdr); } - // internal::data_< image1d<T> > + // \internal internal::data_< image1d<T> > namespace internal { Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1605) +++ trunk/milena/mln/core/image2d.hh (revision 1606) @@ -56,9 +56,10 @@ template <typename T> struct image2d; - namespace internal { + + /// \internal template <typename T> struct data_< image2d<T> > { Index: trunk/milena/mln/core/fi_adaptor.hh =================================================================== --- trunk/milena/mln/core/fi_adaptor.hh (revision 1605) +++ trunk/milena/mln/core/fi_adaptor.hh (revision 1606) @@ -61,6 +61,7 @@ namespace internal { + /// \internal template <typename I> struct data_< fi_adaptor > { Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1605) +++ trunk/milena/mln/core/image3d.hh (revision 1606) @@ -60,6 +60,7 @@ namespace internal { + /// \internal template <typename T> struct data_< image3d<T> > { Index: trunk/milena/mln/metal/math/all.hh =================================================================== --- trunk/milena/mln/metal/math/all.hh (revision 1605) +++ trunk/milena/mln/metal/math/all.hh (revision 1606) @@ -43,7 +43,7 @@ /// Namespace of static mathematical functions. namespace math { - /// Implementation namespace of metal::math namespace. + /// \internal Implementation namespace of metal::math namespace. namespace impl {} } Index: trunk/milena/mln/metal/all.hh =================================================================== --- trunk/milena/mln/metal/all.hh (revision 1605) +++ trunk/milena/mln/metal/all.hh (revision 1606) @@ -39,7 +39,7 @@ /// Namespace of meta-programming tools. namespace metal { - /// Implementation namespace of metal namespace. + /// \internal Implementation namespace of metal namespace. namespace impl {} } Index: trunk/milena/mln/arith/all.hh =================================================================== --- trunk/milena/mln/arith/all.hh (revision 1605) +++ trunk/milena/mln/arith/all.hh (revision 1606) @@ -40,10 +40,10 @@ /// Namespace of arithmetic. namespace arith { - /// Implementation namespace of arith namespace. + /// \internal Implementation namespace of arith namespace. namespace impl { - /// Generic implementation namespace of arith namespace. + /// \internal Generic implementation namespace of arith namespace. namespace generic { } Index: trunk/milena/mln/level/naive/all.hh =================================================================== --- trunk/milena/mln/level/naive/all.hh (revision 1605) +++ trunk/milena/mln/level/naive/all.hh (revision 1606) @@ -42,11 +42,11 @@ namespace level { - /// Namespace of image processing routines related to pixel levels + /// \brief Namespace of image processing routines related to pixel levels /// with naive approach. namespace naive { - /// Implementation namespace of level::naive namespace. + /// \internal Implementation namespace of level::naive namespace. namespace impl {} } Index: trunk/milena/mln/level/naive/median.hh =================================================================== --- trunk/milena/mln/level/naive/median.hh (revision 1605) +++ trunk/milena/mln/level/naive/median.hh (revision 1606) @@ -91,7 +91,7 @@ } - } // end of namespace mln::level::impl + } // end of namespace mln::level::naive::impl Index: trunk/milena/mln/level/all.hh =================================================================== --- trunk/milena/mln/level/all.hh (revision 1605) +++ trunk/milena/mln/level/all.hh (revision 1606) @@ -41,10 +41,10 @@ namespace level { - /// Implementation namespace of level namespace. + /// \internal Implementation namespace of level namespace. namespace impl { - /// Generic implementation namespace of level namespace. + /// \internal Generic implementation namespace of level namespace. namespace generic {} } Index: trunk/milena/mln/level/approx/all.hh =================================================================== --- trunk/milena/mln/level/approx/all.hh (revision 1605) +++ trunk/milena/mln/level/approx/all.hh (revision 1606) @@ -38,22 +38,18 @@ namespace mln { - namespace level { - /*! \namespace approx - * - * \brief Namespace of image processing routines related to pixel - * levels with approximation. - */ + /// \brief Namespace of image processing routines related to pixel + /// levels with approximation. namespace approx { - /// Implementation namespace of level::approx namespace. + /// \internal Implementation namespace of level::approx namespace. namespace impl {} } - } // end of namespace level + } // end of namespace mln::level } // end of namespace mln Index: trunk/milena/mln/linear/all.hh =================================================================== --- trunk/milena/mln/linear/all.hh (revision 1605) +++ trunk/milena/mln/linear/all.hh (revision 1606) @@ -41,7 +41,7 @@ namespace linear { - /// Namespace of linear image processing routines implementation details. + /// \internal Namespace of linear image processing routines implementation details. namespace impl { } @@ -50,7 +50,7 @@ namespace local { - /// Namespace of local linear routines implementation details. + /// \internal Namespace of local linear routines implementation details. namespace impl { } Index: trunk/milena/mln/accu/all.hh =================================================================== --- trunk/milena/mln/accu/all.hh (revision 1605) +++ trunk/milena/mln/accu/all.hh (revision 1606) @@ -44,9 +44,9 @@ /// Namespace of accumulators. namespace accu { - /// Implementation namespace of accumulator namespace. + /// \internal Implementation namespace of accumulator namespace. namespace impl {} - /// Internal namespace of accumulators. + /// \internal Internal namespace of accumulators. namespace internal {} } Index: trunk/milena/mln/accu/internal/base.hh =================================================================== --- trunk/milena/mln/accu/internal/base.hh (revision 1605) +++ trunk/milena/mln/accu/internal/base.hh (revision 1606) @@ -48,8 +48,7 @@ namespace internal { - /*! Generic min accumulator class. - * + /*! \internal Generic min accumulator class. * Base class for implementation of accumulator classes. */ template <typename R, typename E> Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1605) +++ trunk/milena/mln/value/graylevel.hh (revision 1606) @@ -248,10 +248,10 @@ namespace internal { - // Fwd decl; + // \internal Fwd decl; template <typename T> struct convert_; - // convert for graylevel + // \internal convert for graylevel template <unsigned n> struct convert_< graylevel<n> > { Index: trunk/milena/mln/value/float01_.hh =================================================================== --- trunk/milena/mln/value/float01_.hh (revision 1605) +++ trunk/milena/mln/value/float01_.hh (revision 1606) @@ -118,6 +118,7 @@ namespace internal { + /// \internal template <unsigned n> struct convert_< float01_<n> > { Index: trunk/milena/mln/value/all.hh =================================================================== --- trunk/milena/mln/value/all.hh (revision 1605) +++ trunk/milena/mln/value/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of materials related to pixel value types. namespace value { - /// Implementation namespace of value namespace. + /// \internal Implementation namespace of value namespace. namespace impl {} } Index: trunk/milena/mln/value/internal/iterable_set.hh =================================================================== --- trunk/milena/mln/value/internal/iterable_set.hh (revision 1605) +++ trunk/milena/mln/value/internal/iterable_set.hh (revision 1606) @@ -53,8 +53,7 @@ namespace internal { - /*! Class that defines the set of values of type \c T. - * + /*! \internal Class that defines the set of values of type \c T. * This is the exhaustive iterable_set of values obtainable from type \c T. */ template <typename T, typename E> Index: trunk/milena/mln/value/internal/encoding.hh =================================================================== --- trunk/milena/mln/value/internal/encoding.hh (revision 1605) +++ trunk/milena/mln/value/internal/encoding.hh (revision 1606) @@ -40,9 +40,11 @@ namespace value { + /// \internal namespace internal { + template <unsigned n> struct encoding_unsigned_; template <> struct encoding_unsigned_<8> { typedef unsigned char ret; }; Index: trunk/milena/mln/value/internal/value_like.hh =================================================================== --- trunk/milena/mln/value/internal/value_like.hh (revision 1605) +++ trunk/milena/mln/value/internal/value_like.hh (revision 1606) @@ -48,13 +48,9 @@ namespace internal { - /*! \brief Base class for value classes defined over another - * type. - * - * \internal - * - * Parameters are \c V the equivalent value type and \c E the - * exact value type. + /*! \internal Base class for value classes defined over another + * type. Parameters are \c V the equivalent value type and + * \c E the exact value type. */ template < typename V, // Equivalent. typename C, // Encoding. @@ -89,19 +85,17 @@ }; - /*! \brief General definition of the "equal to" operator between + /*! \internal General definition of the "equal to" operator between * value-like types. * - * \relates value_like_ */ template <typename V, typename C, typename N, typename E> bool operator==(const value_like_<V,C,N,E>& lhs, const value_like_<V,C,N,E>& rhs); - /*! \brief General definition of the "less than" operator + /*! \internal General definition of the "less than" operator * between value-like types. * - * \relates value_like_ */ template <typename V, typename C, typename N, typename E> bool operator<(const value_like_<V,C,N,E>& lhs, const value_like_<V,C,N,E>& rhs); Index: trunk/milena/mln/value/internal/convert.hh =================================================================== --- trunk/milena/mln/value/internal/convert.hh (revision 1605) +++ trunk/milena/mln/value/internal/convert.hh (revision 1606) @@ -44,7 +44,7 @@ namespace internal { - + /// \internal template <typename T> struct convert_ { @@ -54,6 +54,7 @@ static unsigned index_of_value(const T& v); }; + /// \internal template <> struct convert_<bool> { Index: trunk/milena/mln/value/stack.hh =================================================================== --- trunk/milena/mln/value/stack.hh (revision 1605) +++ trunk/milena/mln/value/stack.hh (revision 1606) @@ -50,7 +50,7 @@ { - /*! \brief data structure for stack_image. + /*! \internal data structure for stack_image. * */ template <unsigned n, typename I> Index: trunk/milena/mln/value/label.hh =================================================================== --- trunk/milena/mln/value/label.hh (revision 1605) +++ trunk/milena/mln/value/label.hh (revision 1606) @@ -127,6 +127,7 @@ namespace internal { + /// \internal template <unsigned n> struct convert_< label<n> > { Index: trunk/milena/mln/border/all.hh =================================================================== --- trunk/milena/mln/border/all.hh (revision 1605) +++ trunk/milena/mln/border/all.hh (revision 1606) @@ -40,10 +40,10 @@ /// Namespace of routines related to image virtual (outer) border. namespace border { - /// Implementation namespace of border namespace. + /// \internal Implementation namespace of border namespace. namespace impl { - /// Generic implementation namespace of border namespace. + /// \internal Generic implementation namespace of border namespace. namespace generic {} } Index: trunk/milena/mln/test/all.hh =================================================================== --- trunk/milena/mln/test/all.hh (revision 1605) +++ trunk/milena/mln/test/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of image processing routines related to pixel tests. namespace test { - /// Implementation namespace of test namespace. + /// \internal Implementation namespace of test namespace. namespace impl {} } Index: trunk/milena/mln/convert/all.hh =================================================================== --- trunk/milena/mln/convert/all.hh (revision 1605) +++ trunk/milena/mln/convert/all.hh (revision 1606) @@ -36,7 +36,7 @@ namespace mln { - /// Namespace of convertion routines. + /// \internal Namespace of convertion routines. namespace convert {} } Index: trunk/milena/mln/pw/image.hh =================================================================== --- trunk/milena/mln/pw/image.hh (revision 1605) +++ trunk/milena/mln/pw/image.hh (revision 1606) @@ -59,7 +59,7 @@ namespace internal { - /// Data structure for mln::pw::image + /// \internal Data structure for mln::pw::image template <typename F, typename S> struct data_< mln::pw::image<F,S> > { Index: trunk/milena/mln/geom/chamfer.hh =================================================================== --- trunk/milena/mln/geom/chamfer.hh (revision 1605) +++ trunk/milena/mln/geom/chamfer.hh (revision 1606) @@ -59,7 +59,7 @@ namespace impl { - // Functors. + // \internal Functors. template <typename I_, typename W_> struct chamfer_t @@ -94,7 +94,7 @@ {} }; - // Routines. + /// \internal Routines. template <typename I, typename W> inline Index: trunk/milena/mln/geom/all.hh =================================================================== --- trunk/milena/mln/geom/all.hh (revision 1605) +++ trunk/milena/mln/geom/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of all things related to geometry. namespace geom { - /// Implementation namespace of geom namespace. + /// \internal Implementation namespace of geom namespace. namespace impl {} } Index: trunk/milena/mln/fun/x2x/all.hh =================================================================== --- trunk/milena/mln/fun/x2x/all.hh (revision 1605) +++ trunk/milena/mln/fun/x2x/all.hh (revision 1606) @@ -44,7 +44,7 @@ namespace x2x { - /// Internal namespace of functions form vector to vector. + /// \internal Internal namespace of functions form vector to vector. namespace internal { } Index: trunk/milena/mln/fun/x2x/composed.hh =================================================================== --- trunk/milena/mln/fun/x2x/composed.hh (revision 1605) +++ trunk/milena/mln/fun/x2x/composed.hh (revision 1606) @@ -56,11 +56,12 @@ namespace internal { + /// \internal template <typename F, typename G, typename E, bool is_bij> struct helper_composed_; - /// Helper for describing a bijective composition. + /// \internal Helper for describing a bijective composition. template <typename F, typename G, typename E> struct helper_composed_< F, G, E, true> : public fun::internal::x2x_linear_impl_<mln_result(F), E >, @@ -93,7 +94,7 @@ G g_; }; - /// Helper for describing a non bijective composition. + /// \internal Helper for describing a non bijective composition. template <typename F, typename G, typename E> struct helper_composed_< F, G, E, false> : public fun::internal::x2x_linear_impl_<mln_result(F), E >, @@ -174,7 +175,7 @@ namespace internal { - // Implementation of the bijective version. + // \internal Implementation of the bijective version. template <typename F, typename G, typename E> inline @@ -191,6 +192,7 @@ this->m_ = f_.mat() * g_.mat(); } + /// \internal template <typename F, typename G, typename E> inline typename helper_composed_<F,G,E,true>::invert @@ -199,7 +201,7 @@ return compose(g_.inv(), f_.inv()); } - + /// \internal template <typename F, typename G, typename E> inline void @@ -209,6 +211,7 @@ this->m_ = this->f_.mat() * this->g_.mat(); } + /// \internal template <typename F, typename G, typename E> inline void @@ -218,14 +221,14 @@ this->m_ = this->f_.mat() * this->g_.mat(); } - // Implementation of the non bijective version. - + // \internal Implementation of the non bijective version. template <typename F, typename G, typename E> inline helper_composed_<F,G,E,false>::helper_composed_() { } + /// \internal template <typename F, typename G, typename E> inline helper_composed_<F,G,E,false>::helper_composed_(const F& f, const G& g) @@ -235,6 +238,7 @@ this->m_ = f_.mat() * g_.mat(); } + /// \internal template <typename F, typename G, typename E> inline void @@ -244,6 +248,7 @@ this->m_ = this->f_.mat() * this->g_.mat(); } + /// \internal template <typename F, typename G, typename E> inline void Index: trunk/milena/mln/fun/all.hh =================================================================== --- trunk/milena/mln/fun/all.hh (revision 1605) +++ trunk/milena/mln/fun/all.hh (revision 1606) @@ -41,7 +41,7 @@ namespace fun { - /// Internal namespace of functions. + /// \internal Internal namespace of functions. namespace internal { } Index: trunk/milena/mln/morpho/plus.hh =================================================================== --- trunk/milena/mln/morpho/plus.hh (revision 1605) +++ trunk/milena/mln/morpho/plus.hh (revision 1606) @@ -53,14 +53,6 @@ mln_concrete(I) plus(const Image& lhs, const Image<J>& rhs); -// /*! Morphological plus, inplace version: either a "logical or" (if -// * morpho on sets) or an "arithmetical plus" (if morpho on -// * functions). -// */ -// template <typename I, typename J> -// void plus_inplace(Image& lhs, const Image<J>& rhs); - - # ifndef MLN_INCLUDE_ONLY namespace impl @@ -105,13 +97,6 @@ return output; } -// template <typename I, typename J> -// void plus_inplace(Image& lhs, const Image<J>& rhs) -// { -// mln_precondition(exact(rhs).domain() == exact(lhs).domain()); -// morpho::plus(lhs, rhs, lhs); // Calls the previous version. -// } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho Index: trunk/milena/mln/morpho/minus.hh =================================================================== --- trunk/milena/mln/morpho/minus.hh (revision 1605) +++ trunk/milena/mln/morpho/minus.hh (revision 1606) @@ -53,14 +53,6 @@ mln_concrete(I) minus(const Image& lhs, const Image<J>& rhs); -// /*! Morphological minus, inplace version: either a logical "and -// * not" (if morpho on sets) or an arithmetical minus (if morpho -// * on functions). -// */ -// template <typename I, typename J> -// void minus_inplace(Image& lhs, const Image<J>& rhs); - - # ifndef MLN_INCLUDE_ONLY namespace impl @@ -106,13 +98,6 @@ return output; } -// template <typename I, typename J> -// void minus_inplace(Image& lhs, const Image<J>& rhs) -// { -// mln_precondition(exact(rhs).domain() == exact(lhs).domain()); -// morpho::minus(lhs, rhs, lhs); // Calls the previous version. -// } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho Index: trunk/milena/mln/morpho/all.hh =================================================================== --- trunk/milena/mln/morpho/all.hh (revision 1605) +++ trunk/milena/mln/morpho/all.hh (revision 1606) @@ -41,19 +41,13 @@ namespace morpho { - /*! \namespace impl - * - * \brief Namespace of morphological image processing routines - * implementation details. - */ + /// \internal Namespace of morphological image processing routines + /// implementation details. namespace impl { - /*! \namespace generic - * - * \brief Namespace of morphological image processing routines - * generic implementations. - */ + /// \internal Namespace of morphological image processing routines + /// generic implementations. namespace generic { } Index: trunk/milena/mln/display/all.hh =================================================================== --- trunk/milena/mln/display/all.hh (revision 1605) +++ trunk/milena/mln/display/all.hh (revision 1606) @@ -40,10 +40,10 @@ /// Namespace of routines that help to display images. namespace display { - /// Implementation namespace of display namespace. + /// \internal Implementation namespace of display namespace. namespace impl { - /// Generic implementation namespace of display namespace. + /// \internal Generic implementation namespace of display namespace. namespace generic {} } Index: trunk/milena/mln/io/pfm/all.hh =================================================================== --- trunk/milena/mln/io/pfm/all.hh (revision 1605) +++ trunk/milena/mln/io/pfm/all.hh (revision 1606) @@ -42,10 +42,10 @@ /// Namespace of pfm input/output handling. namespace pfm { - /// Implementation namespace of pfm namespace. + /// \internal Implementation namespace of pfm namespace. namespace impl {} - /// Internal namespace of pfm namespace. + /// \internal Internal namespace of pfm namespace. namespace internal {} } } Index: trunk/milena/mln/io/all.hh =================================================================== --- trunk/milena/mln/io/all.hh (revision 1605) +++ trunk/milena/mln/io/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of input/output handling. namespace io { - /// Internal namespace of io namespace. + /// \internal Internal namespace of io namespace. namespace internal {} } Index: trunk/milena/mln/io/pnm/all.hh =================================================================== --- trunk/milena/mln/io/pnm/all.hh (revision 1605) +++ trunk/milena/mln/io/pnm/all.hh (revision 1606) @@ -42,7 +42,7 @@ /// Namespace of pnm input/output handling. namespace pnm { - /// Namespace of pnm's implementation details. + /// \internal Namespace of pnm's implementation details. namespace impl {} } } Index: trunk/milena/mln/io/pbm/all.hh =================================================================== --- trunk/milena/mln/io/pbm/all.hh (revision 1605) +++ trunk/milena/mln/io/pbm/all.hh (revision 1606) @@ -42,10 +42,10 @@ /// Namespace of pbm input/output handling. namespace pbm { - /// Namespace of pbm's implementation details. + /// \internal Namespace of pbm's implementation details. namespace impl {} - /// Internal namespace of pbm namespace. + /// \internal Internal namespace of pbm namespace. namespace internal {} } } Index: trunk/milena/mln/logical/all.hh =================================================================== --- trunk/milena/mln/logical/all.hh (revision 1605) +++ trunk/milena/mln/logical/all.hh (revision 1606) @@ -40,10 +40,10 @@ /// Namespace of logic. namespace logical { - /// Implementation namespace of logical namespace. + /// \internal Implementation namespace of logical namespace. namespace impl { - /// Generic implementation namespace of logical namespace. + /// \internal Generic implementation namespace of logical namespace. namespace generic {} } Index: trunk/milena/mln/canvas/all.hh =================================================================== --- trunk/milena/mln/canvas/all.hh (revision 1605) +++ trunk/milena/mln/canvas/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of canvas. namespace canvas { - /// Implementation namespace of canvas namespace. + /// \internal Implementation namespace of canvas namespace. namespace impl {} } Index: trunk/milena/mln/labeling/all.hh =================================================================== --- trunk/milena/mln/labeling/all.hh (revision 1605) +++ trunk/milena/mln/labeling/all.hh (revision 1606) @@ -40,7 +40,7 @@ /// Namespace of labeling routines. namespace labeling { - /// Implementation namespace of labeling namespace. + /// \internal Implementation namespace of labeling namespace. namespace impl {} }

1 0

milena r1605: Add traits for rgb. Fix the test rgb_full
by Matthieu Garrigues 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add traits for rgb. Fix the test rgb_full. * mln/value/rgb.hh: Add traits : rgb<n> + rgb<n> -> rgb<n> rgb<n> - rgb<n> -> rgb<n> rgb<n> * scalar_ -> rgb<n> rgb<n> / scalar_ -> rgb<n> rgb<n> * int_u -> rgb<n> rgb<n> / int_u -> rgb<n> * tests/value/rgb_full.cc: Fix the macro test_interop_sc, add a FIXME for operators *,/ on (rgb<n>, float). --- mln/value/rgb.hh | 142 +++++++++++++++++++++++++++++++++++++++--------- tests/value/rgb_full.cc | 9 +-- 2 files changed, 119 insertions(+), 32 deletions(-) Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 1604) +++ trunk/milena/tests/value/rgb_full.cc (revision 1605) @@ -107,10 +107,6 @@ sym_compare_assert(j, ==, V2); \ \ i = V1; \ - i OP##= i; \ - sym_compare_assert(i, ==, compute_rgb(T1,V1, OP, V1)); \ - \ - i = V1; \ j = V2; \ i OP##= j; \ sym_compare_assert(i, ==, compute_rgb_sc(T1, V1, OP, V2)); \ @@ -143,8 +139,9 @@ test_interop_sc(rgb8, unsigned, *, rgb8(4,5,6), 4); test_interop_sc(rgb8, unsigned, /, rgb8(40,50,60), 10); - test_interop_sc(rgb8, float, *, rgb8(4,5,6), 4); - test_interop_sc(rgb8, float, /, rgb8(40,50,60), 10); + // FIXME : operators *,/ are ambiguous for (rgb8, float)... + // test_interop_sc(rgb8, float, *, rgb8(4,5,6), 4); + // test_interop_sc(rgb8, float, /, rgb8(40,50,60), 10); test_interop_sc(rgb8, char, *, rgb8(4,5,6), 4); test_interop_sc(rgb8, char, /, rgb8(40,50,60), 10); Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1604) +++ trunk/milena/mln/value/rgb.hh (revision 1605) @@ -65,6 +65,65 @@ namespace trait { + template < unsigned n > + struct set_precise_binary_< op::plus, mln::value::rgb<n>, mln::value::rgb<n> > + { + typedef mln::value::rgb<n> ret; + }; + + template < unsigned n > + struct set_precise_binary_< op::minus, mln::value::rgb<n>, mln::value::rgb<n> > + { + typedef mln::value::rgb<n> ret; + }; + + template < unsigned n, typename S > + struct set_precise_binary_< op::times, mln::value::rgb<n>, mln::value::scalar_<S> > + { + typedef mln::value::rgb<n> ret; + }; + + template < unsigned n, typename S > + struct set_precise_binary_< op::div, mln::value::rgb<n>, mln::value::scalar_<S> > + { + typedef mln::value::rgb<n> ret; + }; + + + // FIXME : Is there any way more generic? a way to factor + // set_precise_binary_< op::div, mln::value::rgb<n>, mln::value::scalar_<S> > + // and + // set_precise_binary_< op::div, mln::value::rgb<n>, mln::value::int_u<m> > + // as for op::times. + + template < unsigned n, unsigned m > + struct set_precise_binary_< op::times, mln::value::rgb<n>, mln::value::int_u<m> > + { + typedef mln::value::rgb<n> ret; + }; + + template < unsigned n, unsigned m > + struct set_precise_binary_< op::div, mln::value::rgb<n>, mln::value::int_u<m> > + { + typedef mln::value::rgb<n> ret; + }; + + +// template < unsigned n, typename I > +// struct set_binary_< op::times, +// mln::value::Vectorial, mln::value::rgb<n>, +// mln::value::Integer, I > +// { +// typedef mln::value::rgb<n> ret; +// }; + +// template < unsigned n, typename S > +// struct set_binary_< op::times, +// mln::value::Scalar, S, +// mln::value::Vectorial, mln::value::rgb<n> > +// { +// typedef mln::value::rgb<n> ret; +// }; template <unsigned n> struct value_< mln::value::rgb<n> > @@ -140,22 +199,6 @@ /// Zero value. static const rgb<n> zero; - - - // FIXME: Cannot work for i negative; move operators outside the class; add traits! - - - /// Addition. - rgb<n> operator+(const rgb<n>& rhs) const; - - /// Substraction. - rgb<n> operator-(const rgb<n>& rhs) const; - - /// Multiplication. - rgb<n> operator*(int i) const; - - /// Division. - rgb<n> operator/(int i) const; }; @@ -174,6 +217,35 @@ std::istream& operator>>(std::istream& istr, rgb<n>& c); + // FIXME: Cannot work for i negative; add traits! + + /// Addition. + template <unsigned n> + rgb<n> + operator+(const rgb<n>& lhs, const rgb<n>& rhs); + + /// Substraction. + template <unsigned n> + rgb<n> + operator-(const rgb<n>& lhs, const rgb<n>& rhs); + + /// Multiplication. + template <unsigned n, typename S> + inline + rgb<n> + operator*(const rgb<n>& lhs, const mln::value::scalar_<S>& s); + + template <unsigned n, typename S> + inline + rgb<n> + operator*(const rgb<n>& lhs, const mln::value::scalar_<S>& s); + + /// Division. + template <unsigned n, typename S> + inline + rgb<n> + operator/(const rgb<n>& lhs, const mln::value::scalar_<S>& s); + # ifndef MLN_INCLUDE_ONLY template <unsigned n> @@ -280,39 +352,57 @@ template <unsigned n> inline rgb<n> - rgb<n>::operator-(const rgb<n>& rhs) const + operator-(const rgb<n>& lhs, const rgb<n>& rhs) { - rgb<n> tmp(this->v_ - rhs.v_); + rgb<n> tmp(lhs.to_equiv() - rhs.to_equiv()); return tmp; } template <unsigned n> inline rgb<n> - rgb<n>::operator+(const rgb<n>& rhs) const + operator+(const rgb<n>& lhs, const rgb<n>& rhs) { - rgb<n> tmp(this->v_ + rhs.v_); + rgb<n> tmp(lhs.to_equiv() + rhs.to_equiv()); return tmp; } - template <unsigned n> +// template <unsigned n> +// inline +// rgb<n> +// operator*(const rgb<n>& lhs, int i) +// { +// rgb<n> tmp(lhs.to_equiv() * i); +// return tmp; +// } + + template <unsigned n, typename S> inline rgb<n> - rgb<n>::operator*(int i) const + operator*(const rgb<n>& lhs, const mln::value::scalar_<S>& s) { - rgb<n> tmp(this->v_ * i); + rgb<n> tmp(lhs.to_equiv() * s.to_equiv()); return tmp; } - template <unsigned n> + template <unsigned n, typename S> inline rgb<n> - rgb<n>::operator/(int i) const + operator/(const rgb<n>& lhs, const mln::value::scalar_<S>& s) { - rgb<n> tmp(this->v_ / i); + rgb<n> tmp(lhs.to_equiv() / s.to_equiv()); return tmp; } +// template <unsigned n> +// inline +// rgb<n> +// operator/(const rgb<n>& lhs, int i) +// { +// rgb<n> tmp(lhs.to_equiv() / i); +// return tmp; +// } + template <unsigned n> inline std::ostream& operator<<(std::ostream& ostr, const rgb<n>& v)

1 0

milena r1604: gl16 and gl8 headers
by Matthieu Garrigues 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> gl16 and gl8 headers. * mln/value/gl8.hh: New, Definition of a graylevel 8 bits. * mln/value/gl16.hh: New, Definition of a graylevel 16 bits. --- gl16.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gl8.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) Index: trunk/milena/mln/value/gl8.hh =================================================================== --- trunk/milena/mln/value/gl8.hh (revision 0) +++ trunk/milena/mln/value/gl8.hh (revision 1604) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 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_VALUE_GL8_HH +# define MLN_VALUE_GL8_HH + +/*! \file mln/value/gl8.hh + * + * \brief Define the alias value::gl8. + */ + +# include <mln/value/graylevel.hh> + + +namespace mln +{ + + namespace value + { + + + /// Alias for 8 bit graylevel. + typedef graylevel<8> gl8; + + + } // end of namespace mln::value + +} // end of namespace mln + + +#endif // ! MLN_VALUE_GL8_HH Index: trunk/milena/mln/value/gl16.hh =================================================================== --- trunk/milena/mln/value/gl16.hh (revision 0) +++ trunk/milena/mln/value/gl16.hh (revision 1604) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 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_VALUE_GL16_HH +# define MLN_VALUE_GL16_HH + +/*! \file mln/value/gl16.hh + * + * \brief Define the alias value::gl16. + */ + +# include <mln/value/graylevel.hh> + + +namespace mln +{ + + namespace value + { + + + /// Alias for 16 bit graylevel. + typedef graylevel<16> gl16; + + + } // end of namespace mln::value + +} // end of namespace mln + + +#endif // ! MLN_VALUE_GL16_HH

1 0

1603: More on general-purpose graph-based images.
by Roland Levillain 12 Dec '07

12 Dec '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> More on general-purpose graph-based images, improperly called mesh-based images. * mln/util/graph.hh: Migrate C-styled constructs to C++ ones. (graph::nodes, graph::edges): New typedefs. Use them... (nodes_, edges_): ...here. * mln/core/mesh_p.hh (graph): New typedef. Use it... (gr_): ...here. Aesthetic changes. * mln/core/mesh_psite.hh (m_ptr_): Turn this non-const pointer on mesh_p into... (mesh_): ...a const reference on mesh_p. (mesh_psite::mesh_psite(unsigned, mesh_p*)): Adjust ctor and swap the arguments of this ctor to get... (mesh_psite::mesh_psite(const mesh_p&, unsigned)): ...this much natural signature. (mesh_psite::mesh_psite(const self_& rhs)): New copy ctor. (operator= (const self_& rhs)): New assignment operator. * mln/core/mesh_p_piter.hh: Adjust forward declarations. (psite, point): New typedefs. (update_, to_psite, operator psite): New methods. (loc_): Remove attribute. (psite_set_, psite_): New attributes. (mesh_p_piter_::mesh_p_piter_): Adjust ctor. (is_valid invalidate, start, next_): Adjust methods. * mln/core/mesh_image.hh (mln::trait::image_< mesh_image<P, V> >): New traits. (operator()(const mesh_psite& p) const) (operator()(const mesh_psite& p)): Catch up with the new interface of mln::mesh_psite. * mln/trait/image/props.hh (mln::trait::image::space_from_point): New function on types mapping points types to the corresponding images space trait. * mln/core/mesh_elt_window.hh, * mln/core/mesh_window_piter.hh: New files. * mln/draw/mesh.hh, * mln/trait/images.hh: Add a FIXME. * mln/core/box_piter.hh, * tests/value/Makefile.am: Typos. * tests/core/mesh_image.cc: New tests * tests/core/mesh_elt_window.cc: New file. * tests/core/Makefile.am (check_PROGRAMS): Add mesh_elt_window and mesh_image. (mesh_elt_window_SOURCES, mesh_image_SOURCES): New. * tests/draw/mesh.cc: Revamp this test. * TODO: Update. TODO | 3 mln/core/box_piter.hh | 6 - mln/core/mesh_elt_window.hh | 169 +++++++++++++++++++++++++++++++++ mln/core/mesh_image.hh | 38 ++++++- mln/core/mesh_p.hh | 15 +- mln/core/mesh_p_piter.hh | 92 ++++++++++++++---- mln/core/mesh_psite.hh | 56 ++++++++--- mln/core/mesh_window_piter.hh | 211 ++++++++++++++++++++++++++++++++++++++++++ mln/draw/mesh.hh | 3 mln/trait/image/props.hh | 41 ++++++++ mln/trait/images.hh | 3 mln/util/graph.hh | 37 +++---- tests/core/Makefile.am | 4 tests/core/mesh_elt_window.cc | 82 ++++++++++++++++ tests/core/mesh_image.cc | 115 ++++++++++++++++++++++ tests/draw/mesh.cc | 101 +++++++++++++++++--- tests/value/Makefile.am | 10 + 17 files changed, 904 insertions(+), 82 deletions(-) Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 1602) +++ tests/value/Makefile.am (working copy) @@ -2,6 +2,10 @@ include $(top_srcdir)/milena/tests/tests.mk +## FIXME: To be added to milena/tests/tests.mk. +full-check: check +## ... + SUBDIRS = \ concept \ builtin @@ -24,7 +28,7 @@ scalar \ set -# FIXME: activate when make check_full will work. +# FIXME: Enable when make check_full works. # check_full_PROGRAMS = \ # rgb_full @@ -45,9 +49,9 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc -# FIXME: activate when make check_full will work. +# FIXME: Enable when make check_full works. # rgb_full_SOURCES = rgb_full.cc TESTS = $(check_PROGRAMS) -# FIXME: activate when make check_full will work. +# FIXME: Enable when make check_full works. # TESTS_FULL = $(check_full_PROGRAMS) Index: tests/core/mesh_image.cc --- tests/core/mesh_image.cc (revision 0) +++ tests/core/mesh_image.cc (revision 0) @@ -0,0 +1,115 @@ +// Copyright (C) 2007 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/mesh_image.cc + * + * \brief Tests on mln::mesh_image. + */ + +#include <vector> + +#include <mln/core/point2d.hh> +#include <mln/core/mesh_image.hh> +#include <mln/core/mesh_elt_window.hh> +#include <mln/core/mesh_window_piter.hh> + +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + + +int main() +{ + using namespace mln; + + /*--------. + | Graph. | + `--------*/ + + // Points associated to nodes. + std::vector<point2d> points; + points.push_back(make::point2d(0,0)); // Point associated to node 0. + points.push_back(make::point2d(2,2)); // Point associated to node 1. + points.push_back(make::point2d(0,4)); // Point associated to node 2. + points.push_back(make::point2d(4,3)); // Point associated to node 3. + points.push_back(make::point2d(4,4)); // Point associated to node 4. + + // Edges. + util::graph<void> g; + // Populate the graph with nodes. + for (unsigned i = 0; i < points.size(); ++i) + g.add_node (); + // Populate the graph with edges. + g.add_edge(0, 1); + g.add_edge(1, 2); + g.add_edge(1, 3); + g.add_edge(3, 4); + g.add_edge(4, 2); + + /*-------. + | Mesh. | + `-------*/ + + mesh_p<point2d> mesh(g, points); + + /*-------------. + | Mesh image. | + `-------------*/ + + // Values ("empty" vector). + std::vector<int> values(5); + // Mesh image. + typedef mesh_image<point2d, int> ima_t; + ima_t ima(mesh, values); + // Initialize values. + debug::iota(ima); + // The printed result does not show the graph, only the values. + debug::println(ima); + + /*------------. + | Iterators. | + `------------*/ + + // Manual iteration over the domain of IMA. + mln_piter_(ima_t) p(ima.domain()); + for_all (p) + std::cout << "ima (" < win_t; + win_t win; + // Reinitialize P, otherwise Q will trigger an assertion about P + // being unable to convert to a valid mesh_piter object. + p.start(); + mln_qiter_(win_t) q(win, p); + for_all (p) + { + std::cout << "neighbors of " << p << " (" << ima(p) << "), " + << "including the site itself:" << std::endl; + for_all (q) + std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; + } +} Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 1602) +++ tests/core/Makefile.am (working copy) @@ -7,6 +7,8 @@ clone \ exact \ initialize \ + mesh_elt_window \ + mesh_image \ mono_obased_rle_image \ mono_rle_image \ obased_rle_image \ @@ -19,6 +21,8 @@ clone_SOURCES = clone.cc exact_SOURCES = exact.cc initialize_SOURCES = initialize.cc +mesh_elt_window_SOURCES = mesh_elt_window.cc +mesh_image_SOURCES = mesh_image.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc Index: tests/core/mesh_elt_window.cc --- tests/core/mesh_elt_window.cc (revision 0) +++ tests/core/mesh_elt_window.cc (revision 0) @@ -0,0 +1,82 @@ +// Copyright (C) 2007 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/mesh_elt_window.cc + * + * \brief Tests on mln::win::mesh_elt_window. + */ + +#include <vector> + +#include <mln/core/point2d.hh> +#include <mln/core/mesh_elt_window.hh> + +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + + +int main() +{ + using namespace mln; + + typedef point2d p_t; + + /*--------. + | Graph. | + `--------*/ + + // Points associated to nodes. + std::vector<p_t> points; + points.push_back(make::point2d(0,0)); // Point associated to node 0. + points.push_back(make::point2d(2,2)); // Point associated to node 1. + points.push_back(make::point2d(0,4)); // Point associated to node 2. + points.push_back(make::point2d(4,3)); // Point associated to node 3. + points.push_back(make::point2d(4,4)); // Point associated to node 4. + + // Edges. + mln::util::graph<void> g; + // Populate the graph with nodes. + for (unsigned i = 0; i < points.size(); ++i) + g.add_node (); + // Populate the graph with edges. + g.add_edge(0, 1); + g.add_edge(1, 2); + g.add_edge(1, 3); + g.add_edge(3, 4); + g.add_edge(4, 2); + + /*------------------. + | Mesh and window. | + `------------------*/ + + // Mesh psite set. + mesh_p<p_t> mesh(g, points); + // Mesh point site. + mesh_psite<p_t> psite(mesh, 0); + // ``Sliding'' window (in fact, neighborhood) of a psite of MESH. + mesh_elt_window<p_t> win; +} Index: tests/draw/mesh.cc --- tests/draw/mesh.cc (revision 1602) +++ tests/draw/mesh.cc (working copy) @@ -28,8 +28,14 @@ /*! \file tests/draw/mesh.cc * * \brief Tests on mln::draw::mesh. + * + * Build a graph, convert it to an image, and compare it with a + * reference images. */ +#include <vector> +#include <utility> + #include <mln/core/image2d.hh> #include <mln/core/point2d.hh> #include <mln/debug/println.hh> @@ -40,34 +46,99 @@ #include <mln/core/mesh_image.hh> #include <mln/level/compare.hh> + +/// Set of 2-D points. +typedef std::vector< mln::point2d > points_type; +/// Set of edges expressed using the identifiers of their adjecent nodes. +typedef std::vector< std::pair<int,int> > edges_type; + +using namespace mln; + +// FIXME: We might want to extract NROWS and NCOLS from REF instead of +// getting them from the caller. +void +test (points_type& points, const edges_type& edges, + unsigned nrows, unsigned ncols, const mln::image2d<int>& ref) +{ + // Graph. + util::graph<void> g; + // Populate the graph with nodes. + for (unsigned i = 0; i < points.size(); ++i) + g.add_node (); + // Populate the graph with edges. + for (edges_type::const_iterator i = edges.begin(); i != edges.end(); ++i) + g.add_edge (i->first, i->second); + // Check its consistency. + g.consistency (); + + mln::mesh_p<point2d> m(g, points); + + image2d<int> ima(nrows, ncols); + // FIXME: `draw::mesh' is not a good name. This function doesn't + // actually draw the mesh; it *converts* it to a printable image. + draw::mesh (ima, m, 2, 1); + mln_assertion (ima == ref); +} + int -main (void) +main () { - using namespace mln; + /*---------. + | Test 1. | + `---------*/ + { + // Reference image. int vs[3][3] = { {2, 0, 0}, {0, 1, 0}, {0, 0, 2} }; - image2d<int> ref (make::image2d(vs)); - util::graph<void> g; + // Points associated to nodes. + points_type points; + points.push_back (make::point2d (0,0)); // Point associated to node 0. + points.push_back (make::point2d (2,2)); // Point associated to node 1. + + // Edges. + edges_type edges; + edges.push_back (std::make_pair (0, 1)); - g.add_node (); - g.add_node (); - g.add_edge (0, 1); - g.consistency (); + test (points, edges, 3, 3, ref); + } - std::vector<point2d> v; - v.push_back (make::point2d (0,0)); - v.push_back (make::point2d (2,2)); - mesh_p<point2d> m(g, v); + /*---------. + | Test 2. | + `---------*/ - image2d<int> ima (3, 3); - draw::mesh (ima, m, 2, 1); + { + int vs[5][5] = { + {2, 0, 0, 0, 2}, + {0, 1, 0, 1, 1}, + {0, 0, 2, 0, 1}, + {0, 0, 0, 1, 1}, + {0, 0, 0, 2, 2}, + }; + image2d<int> ref (make::image2d(vs)); - mln_assertion (ima == ref); + // Points associated to nodes. + points_type points; + points.push_back (make::point2d (0,0)); // Point associated to node 0. + points.push_back (make::point2d (2,2)); // Point associated to node 1. + points.push_back (make::point2d (0,4)); // Point associated to node 2. + points.push_back (make::point2d (4,3)); // Point associated to node 3. + points.push_back (make::point2d (4,4)); // Point associated to node 4. + + // Edges. + edges_type edges; + edges.push_back (std::make_pair (0, 1)); + edges.push_back (std::make_pair (1, 2)); + edges.push_back (std::make_pair (1, 3)); + edges.push_back (std::make_pair (3, 4)); + edges.push_back (std::make_pair (4, 2)); + + test (points, edges, 5, 5, ref); + } } Index: TODO --- TODO (revision 1602) +++ TODO (working copy) @@ -1,3 +1,4 @@ + -*- outline -*- @@ -34,6 +35,8 @@ value::other (for use in labeling) ... +** Roland +R�importer les algos de LPE depuis Olena 0.11 et Olena proto-1.0. Index: mln/trait/image/props.hh --- mln/trait/image/props.hh (revision 1602) +++ mln/trait/image/props.hh (working copy) @@ -198,6 +198,47 @@ } // end of namespace mln::trait + + + // FIXME: To be moved elsewhere? + + /// Compute the image::space trait from a point type. + /// \{ + + // Fwd decl. (used by trait::image::space_from_point). + template <typename M, typename C> struct point_; + typedef point_<grid::tick, int> point1d; + typedef point_<grid::square, int> point2d; + typedef point_<grid::cube, int> point3d; + + namespace trait + { + namespace image + { + + /// Function mapping a point type to the corresponding space trait. + /// \{ + template <typename P> + struct space_from_point + { typedef undef ret; }; + + template <> + struct space_from_point<point1d> + { typedef trait::image::space::one_d ret; }; + + template <> + struct space_from_point<point2d> + { typedef trait::image::space::two_d ret; }; + + template <> + struct space_from_point<point3d> + { typedef trait::image::space::three_d ret; }; + /// \} + + } // end of namespace mln::trait::image + + } // end of namespace mln::trait + } // end of namespace mln Index: mln/trait/images.hh --- mln/trait/images.hh (revision 1602) +++ mln/trait/images.hh (working copy) @@ -100,11 +100,9 @@ namespace value { template <unsigned n, typename I> struct stack_image; } - namespace trait { - template <typename I> struct undefined_image_ { @@ -119,6 +117,7 @@ // related to I::pset typedef undef access; // random, browsing + // FIXME: Wouldn't it be nicer to use metal::int_<DIM>? typedef undef space; // one_d, two_d, three_d typedef undef size; // huge or regular typedef undef support; // irregular, aligned < regular Index: mln/core/mesh_psite.hh --- mln/core/mesh_psite.hh (revision 1602) +++ mln/core/mesh_psite.hh (working copy) @@ -35,6 +35,8 @@ * \todo Clean-up! */ +# include <mln/core/mesh_p.hh> + namespace mln { @@ -44,43 +46,73 @@ // FIXME: Doc! + // FIXME: Fix access to member. template<typename P> - struct mesh_psite : public Point_Site< mesh_psite > + class mesh_psite : public Point_Site< mesh_psite > { + typedef mesh_psite self_; + + public: typedef mln_mesh(P) mesh; enum { dim = P::dim }; typedef P point; typedef mln_dpoint(P) dpoint; typedef mln_coord(P) coord; - mesh_psite(unsigned i, mesh_p* m_ptr); + /// Construction and assignment. + /// \{ + mesh_psite(const mesh_p& mesh_, unsigned i); + mesh_psite(const self_& rhs); + self_& operator= (const self_& rhs); + /// \} operator P() const; - const point& to_point() const; - coord operator[](unsigned i) const; + // FIXME: These shouldn't be public. + const mesh_p& mesh_; unsigned i_; - - mesh_p* m_ptr_; }; # ifndef MLN_INCLUDE_ONLY template<typename P> inline - mesh_psite::mesh_psite(unsigned i, mesh_p* m_ptr) - : i_(i) , - m_ptr_(m_ptr) + mesh_psite::mesh_psite(const mesh_p& mesh, unsigned i) + : mesh_(mesh), + i_(i) + { + } + + template<typename P> + inline + mesh_psite::mesh_psite(const mesh_psite& rhs) + : mesh_(rhs.mesh_), + i_(rhs.i_) + { + } + + template<typename P> + inline + mesh_psite& + mesh_psite::operator= (const mesh_psite& rhs) { + if (&rhs == this) + return *this; + // FIXME: Could we get rid of this cast? + const_cast< mesh_p& >(mesh_) = rhs.mesh_; + i_ = rhs.i_; + return *this; } template<typename P> inline mesh_psite::operator P() const { - return m_ptr_->loc_[i_]; + // FIXME: This is quite unsafe: we should check that i_ is a valid + // index before dereferencing loc_ to ensure clear error messages. + return mesh_.loc_[i_]; } template<typename P> @@ -88,7 +120,9 @@ const P& mesh_psite::to_point() const { - return m_ptr_->loc_[i_]; + // FIXME: This is quite unsafe: we should check that i_ is a valid + // index before dereferencing loc_ to ensure clear error messages. + return mesh_.loc_[i_]; } template<typename P> Index: mln/core/mesh_p.hh --- mln/core/mesh_p.hh (revision 1602) +++ mln/core/mesh_p.hh (working copy) @@ -35,6 +35,9 @@ # include <mln/core/mesh_psite.hh> # include <mln/core/mesh_p_piter.hh> +// FIXME: Rename as mesh_p_set? We shall definitely write a coding +// style somewhere. + /*! \file mln/core/mesh_p.hh * * \brief Definition of an point set based on graph. @@ -48,8 +51,10 @@ template<typename P> struct mesh_p : public internal::point_set_base_< P, mesh_p > { - mesh_p (util::graph<void>& gr, - std::vector& loc); + typedef util::graph<void> graph; + + /// Construct a mesh psite set from a graph and an array of locations. + mesh_p (graph& gr, std::vector& loc); /// Point_Site associated type. typedef mesh_psite psite; @@ -67,8 +72,9 @@ bool has(const psite& p) const; - util::graph<void> gr_; + graph gr_; std::vector loc_; + // FIXME: (Roland) Is it really useful/needed? box_ bb_; }; @@ -76,8 +82,7 @@ template<typename P> inline - mesh_p::mesh_p (util::graph<void>& gr, - std::vector& loc) + mesh_p::mesh_p (util::graph<void>& gr, std::vector& loc) : gr_ (gr), loc_ (loc) { Index: mln/core/mesh_p_piter.hh --- mln/core/mesh_p_piter.hh (revision 1602) +++ mln/core/mesh_p_piter.hh (working copy) @@ -30,6 +30,7 @@ # include <mln/core/internal/point_iterator_base.hh> # include <mln/core/mesh_p.hh> +# include <mln/core/mesh_psite.hh> /*! \file mln/core/mesh_p_piter.hh * @@ -38,8 +39,12 @@ namespace mln { + // Fwd decls. + template<typename P> class mesh_p; + template<typename P> class mesh_psite; - template<typename P> class mesh_p_piter_; + + // FIXME: Why `mesh_p_piter_' and not `mesh_p_piter' (without `_')? template<typename P> class mesh_p_piter_ : public internal::point_iterator_base_< P, mesh_p_piter_ > @@ -51,11 +56,10 @@ // Make definitions from super class available. enum { dim = super_::dim }; + typedef mesh_psite psite; + typedef P point; - mesh_p_piter_(const mesh_p& s); - - /// Reference to the corresponding point. - const P& to_point() const; + mesh_p_piter_(const mesh_p& psite_set); /// Read-only access to the \p i-th coordinate. mln_coord(P) operator[](unsigned i) const; @@ -72,13 +76,26 @@ /// Go to the next point. void next_(); + /// Update the internal data of the iterator. + void update_(); + + /// Reference to the corresponding point. + const point& to_point () const; + + /// Reference to the corresponding point site. + const psite& to_psite () const; + /// Convert the iterator into a point. - operator P() const; + operator point() const; + + /// Convert the iterator into a mesh psite. + operator psite() const; protected: - const std::vector& loc_; + const mesh_p& psite_set_; unsigned i_; P p_; + psite psite_; }; @@ -87,22 +104,18 @@ template<typename P> inline - mesh_p_piter_::mesh_p_piter_(const mesh_p& s) - : loc_(s.loc_) + mesh_p_piter_::mesh_p_piter_(const mesh_p& psite_set) + : psite_set_(psite_set), + p_(), + // Initialize psite_ to a dummy value. + psite_(psite_set, psite_set_.loc_.size()) { + // Invalidate i_. invalidate(); } template<typename P> inline - const P& - mesh_p_piter_::to_point() const - { - return p_; - } - - template<typename P> - inline mln_coord(P) mesh_p_piter_::operator[](unsigned i) const { @@ -114,7 +127,7 @@ bool mesh_p_piter_::is_valid() const { - return i_ != loc_.size(); + return i_ != psite_set_.loc_.size(); } template<typename P> @@ -122,7 +135,7 @@ void mesh_p_piter_::invalidate() { - i_ = loc_.size(); + i_ = psite_set_.loc_.size(); } template<typename P> @@ -132,7 +145,7 @@ { i_ = 0; if (is_valid()) - p_ = loc_[i_]; + update_(); } template<typename P> @@ -142,7 +155,36 @@ { ++i_; if (is_valid()) - p_ = loc_[i_]; + update_(); + } + + template<typename P> + inline + void + mesh_p_piter_::update_() + { + // Update p_. + p_ = psite_set_.loc_[i_]; + // Update psite_. + psite_ = mesh_psite(psite_set_, i_); + } + + template<typename P> + inline + const P& + mesh_p_piter_::to_point() const + { + mln_precondition(is_valid()); + return p_; + } + + template<typename P> + inline + const mesh_psite& + mesh_p_piter_::to_psite() const + { + mln_precondition(is_valid()); + return psite_; } template<typename P> @@ -153,6 +195,14 @@ return p_; } + template<typename P> + inline + mesh_p_piter_::operator mesh_psite() const + { + mln_precondition(is_valid()); + return psite_; + } + # endif // ! MLN_INCLUDE_ONLY } // end of mln Index: mln/core/mesh_window_piter.hh --- mln/core/mesh_window_piter.hh (revision 0) +++ mln/core/mesh_window_piter.hh (revision 0) @@ -0,0 +1,211 @@ +// Copyright (C) 2007 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_CORE_MESH_WINDOW_PITER_HH +# define MLN_CORE_MESH_WINDOW_PITER_HH + +// FIXME: Doc. + +// FIXME: Shall we rename `piter' as `qiter'? + +# include <mln/core/concept/point_iterator.hh> +# include <mln/core/mesh_p.hh> +# include <mln/core/mesh_psite.hh> + + +namespace mln +{ + // Fwd decls. + template <typename P> class mesh_p; + template <typename P> class mesh_psite; + + + template <typename P> + class mesh_window_fwd_piter : + public Point_Iterator< mesh_window_fwd_piter > // or Iterator<...>? + { + typedef mesh_window_fwd_piter self_; + typedef Point_Iterator< self_ > super_; + + public: + typedef mesh_psite psite; + + enum { dim = P::dim }; + typedef mesh_p mesh; + + typedef P point; + // FIXME: Dummy typedef. + typedef void dpoint; + typedef mln_coord(P) coord; + + public: + template <typename W, typename Pref> + mesh_window_fwd_piter(const W& win, + const Point_Site<Pref>& p_ref); + + bool is_valid() const; + void invalidate(); + void start(); + + void next_(); + bool adjacent_or_equal_to_p_ref_() const; + + // FIXME: In fact, this method should be named `to_psite', since + // it return as mln::mesh_psite object, not a P object. + const point& to_point() const; + operator psite () const; + coord operator[](unsigned i) const; + + private: + /// The ``central'' point of the window. + const psite& p_ref_; + + /// An internal iterator on the set of nodes of the underlying graph. + unsigned i_; + }; + + // FIXME: mesh_window_bkd_piter. + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: Currently, argument win is ignored. + template <typename P> + template <typename W, typename Pref> + mesh_window_fwd_piter::mesh_window_fwd_piter(const W& /* win */, + const Point_Site<Pref>& p_ref) + : p_ref_(exact(p_ref).to_psite()) + { + // Invalidate i_. + invalidate(); + } + + template <typename P> + bool + mesh_window_fwd_piter::is_valid() const + { + // FIXME: We depend too much on the implementation of util::graph + // here. The util::graph should provide the service to abstract + // these manipulations. + return i_ >= 0 && i_ < p_ref_.mesh_.gr_.nb_node_; + } + + template <typename P> + void + mesh_window_fwd_piter::invalidate() + { + i_ = p_ref_.mesh_.gr_.nb_node_; + } + + template <typename P> + void + mesh_window_fwd_piter::start() + { + i_ = 0; + if (!adjacent_or_equal_to_p_ref_()) + next_(); + } + + template <typename P> + void + mesh_window_fwd_piter::next_() + { + // FIXME: This is inefficient. The graph structure should be able + // to produce the set of adjacent nodes fast. Boost Graphs + // probably provides adequates structures to get fecth these + // neighbors in constant time. + do + ++i_; + while (is_valid() && !adjacent_or_equal_to_p_ref_()); + } + + template <typename P> + bool + mesh_window_fwd_piter::adjacent_or_equal_to_p_ref_() const + { + // FIXME: Likewise, this is inefficient. + + // Check wether the iterator points to P_REF_. + if (i_ == p_ref_.i_) + return true; + + typedef std::list<unsigned> adjacency_type; + + // Check whether the iterator is among the neighbors of P_REF_. + { + // Paranoid assertion. + assert (p_ref_.i_ >= 0 && + p_ref_.i_ < p_ref_.mesh_.gr_.nodes_.size ()); + const adjacency_type& p_ref_neighbs = + p_ref_.mesh_.gr_.nodes_[p_ref_.i_]->links; + adjacency_type::const_iterator j = + std::find (p_ref_neighbs.begin(), p_ref_neighbs.end(), i_); + if (j != p_ref_neighbs.end()) + return true; + } + + // Check whether P_REF_ is among the neighbors of the iterator. + { + assert (is_valid ()); + const adjacency_type& i_neighbs = p_ref_.mesh_.gr_.nodes_[i_]->links; + adjacency_type::const_iterator k = + std::find (i_neighbs.begin(), i_neighbs.end(), p_ref_.i_); + if (k != i_neighbs.end()) + return true; + } + + // Otherwise, the iterator is not adjacent to P_REF_. + return false; + } + + template <typename P> + const P& + mesh_window_fwd_piter::to_point() const + { + return p_ref_.mesh_.loc_[i_]; + } + + template <typename P> + mesh_window_fwd_piter::operator mesh_psite () const + { + return mesh_psite(p_ref_.mesh_, i_); + } + + template <typename P> + inline + mln_coord(P) + mesh_window_fwd_piter::operator[](unsigned i) const + { + assert(i < dim); + return to_point()[i]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_MESH_WINDOW_PITER_HH Index: mln/core/mesh_elt_window.hh --- mln/core/mesh_elt_window.hh (revision 0) +++ mln/core/mesh_elt_window.hh (revision 0) @@ -0,0 +1,169 @@ +// Copyright (C) 2007 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_WIN_MESH_ELT_WINDOW_HH +# define MLN_WIN_MESH_ELT_WINDOW_HH + +/*! \file mln/core/mesh_elt_window.hh + * + * \brief Definition of the elementary neighborhood (wrongly + * -- but purposefully -- named "window" here, for consistency + * reasons) on a mesh (a graph, in fact). + * + * \todo Make naming coherent: we have window (without '_') but + * point_, neighb_, etc. + */ + +# include <mln/core/concept/window.hh> +# include <mln/core/mesh_psite.hh> +# include <mln/core/mesh_window_piter.hh> + + +namespace mln +{ + // Fwd decls. + template <typename P> class mesh_window_fwd_piter; + template <typename P> class mesh_window_bkd_piter; + + + /*! \brief Elementary window on mesh class. + * + * FIXME: Doc. + */ + template <typename P> + class mesh_elt_window : public Window< mesh_elt_window > + { + typedef mesh_elt_window self_; + + public: + /// Associated types. + /// \{ + /// The type of point stored into the window. + // FIXME: Is this right, if we consider that this window stores + // psites, not points? + typedef P point; + + // FIXME: This is a dummy value. This is yet another evidence + // that mesh_elt_window shall not be a Window, and therefore be + // renamed as mesh_elt_neighb, or better: elt_graph_neighb. + typedef void dpoint; + + /*! \brief Point_Iterator type to browse the points of a generic window + * w.r.t. the ordering of delta-points. + */ + typedef mesh_window_fwd_piter fwd_qiter; + + /*! \brief Point_Iterator type to browse the points of a generic window + * w.r.t. the reverse ordering of delta-points. + */ + typedef mesh_window_bkd_piter bkd_qiter; + + /// The default qiter type. + typedef fwd_qiter qiter; + /// \} + + /// Construct an elementary mesh window centered on \a psite. + mesh_elt_window(/*const mesh_psite& psite*/); + + // FIXME: The following methods make no sense for a + // general-purpose neighborhood. Anyway, we provide + // implementations for them for this first draft of graph + // neighborhood. + bool is_empty() const; + bool is_centered() const; + bool is_symmetric() const; + unsigned delta() const; + self_& sym(); + + // protected: + // const mesh_psite& psite_; + }; + + + // FIXME: Add an operator<< on ostreams ? + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + mesh_elt_window::mesh_elt_window(/*const mesh_psite& psite*/) + // : psite_(psite) + { + } + + template <typename P> + inline + bool + mesh_elt_window::is_empty() const + { + // FIXME: Dummy value. + return false; + } + + template <typename P> + inline + bool + mesh_elt_window::is_centered() const + { + // FIXME: Dummy value. + return false; + } + + template <typename P> + inline + bool + mesh_elt_window::is_symmetric() const + { + // FIXME: Dummy value. + return false; + } + + template <typename P> + inline + unsigned + mesh_elt_window::delta() const + { + // FIXME: Dummy value. + return 0; + } + + template <typename P> + inline + mesh_elt_window& + mesh_elt_window::sym() + { + // FIXME: Dummy value. + return *this; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_WIN_MESH_ELT_WINDOW_HH Index: mln/core/box_piter.hh --- mln/core/box_piter.hh (revision 1602) +++ mln/core/box_piter.hh (working copy) @@ -62,7 +62,7 @@ */ box_fwd_piter_(const box_& b); - /// Convertion to point. + /// Conversion to point. operator P() const; /// Reference to the corresponding point. @@ -112,7 +112,7 @@ */ box_bkd_piter_(const box_& b); - /// Convertion to point. + /// Conversion to point. operator P() const; /// Reference to the corresponding point. @@ -164,7 +164,7 @@ */ box_bounds_piter_(const box_& b); - /// Convertion to point. + /// Conversion to point. operator P() const; /// Reference to the corresponding point. Index: mln/core/mesh_image.hh --- mln/core/mesh_image.hh (revision 1602) +++ mln/core/mesh_image.hh (working copy) @@ -30,13 +30,16 @@ /*! \file mln/core/mesh_image.hh * - * \brief Definition of an graph-based image. + * \brief Definition of a graph-based image. */ -# include <mln/core/internal/image_identity.hh> +# include <mln/trait/images.hh> + +# include <mln/core/internal/image_primary.hh> # include <mln/metal/vec.hh> # include <mln/core/mesh_p.hh> # include <mln/core/mesh_psite.hh> +# include <mln/value/set.hh> # include <vector> namespace mln @@ -59,11 +62,36 @@ } // end of namespace mln::internal + + namespace trait + { + + template <typename P, typename V> + struct image_< mesh_image<P, V> > : default_image_< V, mesh_image<P, V> > + { + typedef trait::image::category::primary category; + + // FIXME: Is that right? + typedef trait::image::access::random access; + typedef typename trait::image::space_from_point::ret space; + typedef trait::image::size::regular size; + typedef trait::image::support::irregular support; + + typedef trait::image::border::none border; + typedef trait::image::data::stored data; + typedef trait::image::io::read_write io; + // FIXME: Is that right? + typedef trait::image::speed::fast speed; + }; + + } // end of namespace mln::trait + /*! \brief FIXME * */ template <typename P, typename V> - struct mesh_image : public internal::image_primary_< mesh_p, mesh_image<P, V> > + struct mesh_image : + public internal::image_primary_< mesh_p, mesh_image<P, V> > { typedef mln::internal::image_base_< mesh_p, mesh_image<P, V> > super_; @@ -143,7 +171,7 @@ const V& mesh_image<P, V>::operator()(const mesh_psite& p) const { - mln_precondition(p.m_ptr_ == & this->data_->mesh_); + mln_precondition(&p.mesh_ == &this->data_->mesh_); mln_precondition(p.i_ < this->data_->val_.size()); return this->data_->val_[p.i_]; } @@ -153,7 +181,7 @@ V& mesh_image<P, V>::operator()(const mesh_psite& p) { - mln_precondition(p.m_ptr_ == & this->data_->mesh_); + mln_precondition(&p.mesh_ == &this->data_->mesh_); mln_precondition(p.i_ < this->data_->val_.size()); return this->data_->val_[p.i_]; } Index: mln/draw/mesh.hh --- mln/draw/mesh.hh (revision 1602) +++ mln/draw/mesh.hh (working copy) @@ -75,6 +75,9 @@ # ifndef MLN_INCLUDE_ONLY + // FIXME: Add assertions on the size of the image: it must be big + // enough to hold the reprensentation of the graph. + template <typename I, typename P> inline void Index: mln/util/graph.hh --- mln/util/graph.hh (revision 1602) +++ mln/util/graph.hh (working copy) @@ -40,6 +40,9 @@ * \brief Definition of a graph. */ +// FIXME: Rename `s_node' to `node'. +// FIXME: Rename `s_edge' to `edge'. +// FIXME: Rename `links' to `edges'. namespace mln { @@ -53,6 +56,7 @@ struct s_node { T data; + // FIXME: Rename to `out_edges'. std::vector<unsigned> links; }; @@ -63,6 +67,7 @@ template<> struct s_node<void> { + // FIXME: Rename to `out_edges'. std::list<unsigned> links; }; @@ -88,21 +93,21 @@ unsigned node2; }; - /*! \brief Generic graph using s_node and s_edge. - * - */ + /// \brief Generic graph structure using s_node and s_edge. + /* FIXME: We don't mention anywhere whether this graph structure + handles directed or undirected graphs! */ template<typename N, typename E = void> struct graph { - /*! \brief Constructor. - * - */ + /// The type of the set of nodes. + typedef std::vector< s_node<N>* > nodes; + /// The type of the set of edges. + typedef std::vector< s_edge<E>* > edges; + graph (); - /*! \brief Add a void node. - * - */ - void add_node (void); + /*! \brief Add a void node. */ + void add_node (); /*! \brief Add a void edge between \p n1 and \p n2. @@ -112,7 +117,6 @@ * * \pre n1 < nb_node_. * \pre n2 < nb_node_. - * */ void add_edge (unsigned n1, unsigned n2); @@ -123,7 +127,6 @@ * * \pre nodes_.size () == nb_node_. * \pre links_.size () == nb_link_. - * */ void consistency () const; @@ -131,7 +134,6 @@ /*! \brief Print on \p ostr the graph. * * \param[in] ostr The output stream. - * */ void print_debug (std::ostream& ostr) const; @@ -144,12 +146,13 @@ unsigned nb_link_; /// The vector where is stocked the pointers of nodes. - std::vector<struct s_node<N>*> nodes_; + nodes nodes_; /// The vector where is stocked the pointers of links. - std::vector<struct s_edge<E>*> links_; + edges links_; }; + # ifndef MLN_INCLUDE_ONLY template<typename N, typename E> @@ -165,7 +168,7 @@ template<typename N, typename E> inline void - graph<N, E>::add_node (void) + graph<N, E>::add_node () { struct s_node<N>* n = new struct s_node<N>; @@ -183,7 +186,7 @@ struct s_edge<E>* edge; - edge = new struct s_edge<E>; + edge = new s_edge<E>; edge->node1 = n1; edge->node2 = n2; links_.push_back (edge);

1 0

milena r1602: Replace the point in run_psite by the p_runs reference
by nivaul_s＠lrde.epita.fr 12 Dec '07

12 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> Replace the point in run_psite by the p_runs reference. * mln/core/runs_psite.hh: Replace the point by the p_runs. * mln/core/p_run_piter.hh, * mln/core/internal/run_image.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_image.hh, * mln/core/p_runs.hh, * mln/core/rle_image.hh, * mln/core/sparse_image.hh, * tests/core/p_runs.cc: Propagate Changes. * tests/core/mono_obased_rle_image.cc, * tests/core/mono_rle_image.cc, * tests/core/obased_rle_image.cc, * tests/core/rle_image.cc, * tests/core/sparse_image.cc: Use the renamed image small.pgm. --- mln/core/internal/run_image.hh | 11 ----- mln/core/mono_obased_rle_image.hh | 8 +-- mln/core/mono_rle_image.hh | 4 - mln/core/obased_rle_image.hh | 8 +-- mln/core/p_run_piter.hh | 53 +++++++++++++++++++++--- mln/core/p_runs.hh | 41 ++++++++---------- mln/core/rle_image.hh | 8 +-- mln/core/runs_psite.hh | 78 ++++++++++++------------------------ mln/core/sparse_image.hh | 12 ++--- tests/core/mono_obased_rle_image.cc | 2 tests/core/mono_rle_image.cc | 2 tests/core/obased_rle_image.cc | 2 tests/core/p_runs.cc | 28 ++++-------- tests/core/rle_image.cc | 2 tests/core/sparse_image.cc | 2 15 files changed, 126 insertions(+), 135 deletions(-) Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 1601) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1602) @@ -62,7 +62,7 @@ using value::int_u8; image2d<int_u8> lena; - io::pgm::load(lena, "../../img/tiny.pgm"); + io::pgm::load(lena, "../../img/small.pgm"); image2d<int_u8> cmp(lena.domain()); unsigned n; Index: trunk/milena/tests/core/sparse_image.cc =================================================================== --- trunk/milena/tests/core/sparse_image.cc (revision 1601) +++ trunk/milena/tests/core/sparse_image.cc (revision 1602) @@ -58,7 +58,7 @@ using value::int_u8; image2d<int_u8> lena; - io::pgm::load(lena, "../../img/tiny.pgm"); + io::pgm::load(lena, "../../img/small.pgm"); image2d<int_u8> cmp(lena.domain()); unsigned n; Index: trunk/milena/tests/core/obased_rle_image.cc =================================================================== --- trunk/milena/tests/core/obased_rle_image.cc (revision 1601) +++ trunk/milena/tests/core/obased_rle_image.cc (revision 1602) @@ -58,7 +58,7 @@ using value::int_u8; image2d<int_u8> lena; - io::pgm::load(lena, "../../img/tiny.pgm"); + io::pgm::load(lena, "../../img/small.pgm"); image2d<int_u8> cmp(lena.domain()); unsigned n; Index: trunk/milena/tests/core/rle_image.cc =================================================================== --- trunk/milena/tests/core/rle_image.cc (revision 1601) +++ trunk/milena/tests/core/rle_image.cc (revision 1602) @@ -58,7 +58,7 @@ using value::int_u8; image2d<int_u8> lena; - io::pgm::load(lena, "../../img/tiny.pgm"); + io::pgm::load(lena, "../../img/small.pgm"); image2d<int_u8> cmp(lena.domain()); unsigned n; Index: trunk/milena/tests/core/p_runs.cc =================================================================== --- trunk/milena/tests/core/p_runs.cc (revision 1601) +++ trunk/milena/tests/core/p_runs.cc (revision 1602) @@ -56,10 +56,6 @@ q = make::point2d(18, 42); r = make::point2d(50, 76); - // Psite declaration - runs_psite<point2d> site(p, 5, 0); - runs_psite<point2d> site2(r, 40, 0); - // Pset test p_runs_<point2d> ps; @@ -69,23 +65,17 @@ ps.insert(p_run<point2d>(q, 5)); mln_assertion(ps.npoints() == 12); + ps.insert(p_run<point2d>(r, 2)); + + ps.insert(p_run<point2d>(make::point2d(17,40), 6)); + + // Psite declaration + runs_psite<point2d> site(ps, 5, 0); + runs_psite<point2d> site2(ps, 6, 1); + mln_assertion(ps.has(site)); mln_assertion(!ps.has(site2)); - ps.insert(p_run<point2d>(r, 2)); - mln_assertion(!ps.has(site2)); - ps.insert(p_run<point2d>(make::point2d(17,40), 6)); - mln_fwd_piter_(p_runs_<point2d>) ppf(ps); - for_all(ppf) - { - std::cout << ppf << std::endl; - } - std::cout << std::endl; - mln_bkd_piter_(p_runs_<point2d>) ppb(ps); - for_all(ppb) - { - std::cout << ppb << std::endl; - } - // parc(ps); + parc(ps); } Index: trunk/milena/tests/core/mono_obased_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_obased_rle_image.cc (revision 1601) +++ trunk/milena/tests/core/mono_obased_rle_image.cc (revision 1602) @@ -58,7 +58,7 @@ using value::int_u8; image2d<int_u8> lena; - io::pgm::load(lena, "../../img/tiny.pgm"); + io::pgm::load(lena, "../../img/small.pgm"); image2d<int_u8> cmp(lena.domain()); unsigned n; Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1601) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1602) @@ -87,17 +87,6 @@ float run_image_<T, P, E>::compression() const { - std::cout << float(exact(this)->data_->size_mem()) - << " / ( " - << float (sizeof(T)) - << " * " - << float (exact(this)->data_->domain_.bbox().npoints()) - << " )" - << std::endl; - std::cout << exact(this)->data_->domain_.bbox().pmin() - << " " - << exact(this)->data_->domain_.bbox().pmax() - << std::endl; return float(exact(this)->data_->size_mem()) / float (sizeof(T) * exact(this)->data_->domain_.bbox().npoints()); } Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1601) +++ trunk/milena/mln/core/rle_image.hh (revision 1602) @@ -213,8 +213,8 @@ const { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->values_.size()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->values_.size()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> @@ -223,8 +223,8 @@ rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->values_.size()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->values_.size()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1601) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1602) @@ -214,7 +214,7 @@ mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) const { - mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); + mln_precondition(site.p_of_run() < this->data_->domain_.nruns()); return this->data_->value_; } @@ -231,7 +231,7 @@ typename mono_rle_image<P, T>::lvalue mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) { - mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); + mln_precondition(site.p_of_run() < this->data_->domain_.nruns()); return this->data_->value_; } Index: trunk/milena/mln/core/runs_psite.hh =================================================================== --- trunk/milena/mln/core/runs_psite.hh (revision 1601) +++ trunk/milena/mln/core/runs_psite.hh (revision 1602) @@ -34,6 +34,7 @@ */ # include <mln/core/concept/point_site.hh> +# include <mln/core/p_runs.hh> namespace mln @@ -56,9 +57,7 @@ typedef mln_dpoint(P) dpoint; typedef mln_coord(P) coord; - runs_psite(); - runs_psite(const p_runs_& pr, const P& p); - runs_psite(P point, unsigned index, unsigned pset_pos); + runs_psite(const p_runs_& pr, unsigned in_run, unsigned of_run); operator P () const; @@ -69,16 +68,16 @@ const P& range_start_() const; /// Return the position of this psite in the point set. - unsigned pset_pos_() const; + unsigned p_of_run() const; /// Return the position of this psite in the point set. - unsigned& pset_pos_(); + unsigned& p_of_run(); /// Return the position of this psite in the current range. - unsigned index_() const; + unsigned p_in_run() const; /// Return the position of this psite in the current range. - unsigned& index_(); + unsigned& p_in_run(); /// Reference to the corresponding point. const P& to_point() const; @@ -89,13 +88,13 @@ protected: /// Start of the psite range. - P p_; + const p_runs_& pr_; /// Position in the psite range. - unsigned range_index_; + unsigned p_in_run_; /// Position of the psite in the point set. - unsigned pset_position_; + unsigned p_of_run_; }; @@ -103,37 +102,20 @@ template <typename P> inline - runs_psite::runs_psite(const p_runs_& pr, const P& p) - { - unsigned i = 0; - while (i < pr.nruns() && p >= pr[i].first()) - ++i; - mln_assertion(i != 0); - - range_index_ = p[P::dim - 1] - pr[i - 1].first()[P::dim - 1]; - - mln_assertion(pr[i - 1].npoints() > range_index_); - - pset_position_ = i - 1; - p_ = pr[pset_position_].first(); - } - - template <typename P> - inline - runs_psite::runs_psite(P point, unsigned index, unsigned pset_pos) : - p_(point), - range_index_(index), - pset_position_(pset_pos) + runs_psite::runs_psite(const p_runs_& pr, unsigned in_run, unsigned of_run) + : pr_(pr), + p_in_run_(in_run), + p_of_run_(of_run) { + mln_precondition(of_run < pr.nruns()); + mln_precondition(in_run < pr[of_run].length()); } template <typename P> inline runs_psite::operator P() const { - P p = p_; - p[dim - 1] += range_index_; - return p; + return pr_[p_of_run_][p_in_run_]; } template <typename P> @@ -141,7 +123,7 @@ const P& runs_psite::range_start_() const { - return p_; + return pr_[p_of_run_].first(); } template <typename P> @@ -149,39 +131,39 @@ P& runs_psite::range_start_() { - return p_; + return pr_[p_of_run_].first(); } template <typename P> inline unsigned - runs_psite::pset_pos_() const + runs_psite::p_of_run() const { - return pset_position_; + return p_of_run_; } template <typename P> inline unsigned& - runs_psite::pset_pos_() + runs_psite::p_of_run() { - return pset_position_; + return p_of_run_; } template <typename P> inline unsigned - runs_psite::index_() const + runs_psite::p_in_run() const { - return range_index_; + return p_in_run_; } template <typename P> inline unsigned& - runs_psite::index_() + runs_psite::p_in_run() { - return range_index_; + return p_in_run_; } template <typename P> @@ -189,8 +171,7 @@ const P& runs_psite::to_point() const { - static P p = p_; - p[dim - 1] += range_index_; + static P p = pr_[p_of_run_][p_in_run_]; return p; } @@ -200,10 +181,7 @@ runs_psite::operator[](unsigned i) const { mln_precondition(i < dim); - if (i == dim - 1) - return p_[i] + range_index_; - else - return p_[i]; + return pr_[p_of_run_][p_in_run_][i]; } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1601) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1602) @@ -241,8 +241,8 @@ const { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->domain_.nruns()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> @@ -251,8 +251,8 @@ obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->domain_.nruns()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> Index: trunk/milena/mln/core/p_run_piter.hh =================================================================== --- trunk/milena/mln/core/p_run_piter.hh (revision 1601) +++ trunk/milena/mln/core/p_run_piter.hh (revision 1602) @@ -79,12 +79,16 @@ /// Go to the next point. void next_(); + /// Get the index of the point in the run. + unsigned ind() const; + /// Convert the iterator into a point. operator P() const; protected: const p_run* run_; bool is_valid_; + unsigned i_; P p_; }; @@ -130,12 +134,16 @@ /// Go to the next point. void next_(); + /// Get the index of the point in the run. + unsigned ind() const; + /// Convert the iterator into a point. operator P() const; protected: const p_run* run_; bool is_valid_; + unsigned i_; P p_; }; @@ -148,16 +156,17 @@ template <typename P> inline p_run_fwd_piter_::p_run_fwd_piter_() - : run_ (0) + : run_ (0), + is_valid_(false) { } template <typename P> inline p_run_fwd_piter_::p_run_fwd_piter_(const p_run& pr) - : run_(&pr) + : run_(&pr), + is_valid_(false) { - invalidate(); } template <typename P> @@ -166,7 +175,7 @@ p_run_fwd_piter_::assign_run(const p_run& pr) { run_ = &pr; - invalidate(); + is_valid_ = false; } template <typename P> @@ -175,6 +184,7 @@ p_run_fwd_piter_::to_point() const { mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_; } @@ -185,6 +195,7 @@ { mln_precondition(i < dim); mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_[i]; } @@ -210,6 +221,7 @@ p_run_fwd_piter_::start() { p_ = run_->first(); + i_ = 0; is_valid_ = true; } @@ -218,15 +230,27 @@ void p_run_fwd_piter_::next_() { + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); p_[dim - 1]++; + ++i_; is_valid_ = p_[dim - 1] - run_->first()[dim - 1] < (signed)run_->length(); } template <typename P> inline + unsigned + p_run_fwd_piter_::ind() const + { + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); + return i_; + } + + template <typename P> + inline p_run_fwd_piter_::operator P() const { mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_; } @@ -243,9 +267,9 @@ template <typename P> inline p_run_bkd_piter_::p_run_bkd_piter_(const p_run& pr) - : run_(&pr) + : run_(&pr), + is_valid_(false) { - invalidate(); } template <typename P> @@ -254,7 +278,7 @@ p_run_bkd_piter_::assign_run(const p_run& pr) { run_ = &pr; - invalidate(); + is_valid_ = false; } template <typename P> @@ -263,6 +287,7 @@ p_run_bkd_piter_::to_point() const { mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_; } @@ -273,6 +298,7 @@ { mln_precondition(i < dim); mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_[i]; } @@ -298,6 +324,7 @@ p_run_bkd_piter_::start() { p_ = (*run_)[run_->length() - 1]; + i_ = run_->length() - 1; is_valid_ = true; } @@ -306,15 +333,27 @@ void p_run_bkd_piter_::next_() { + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); p_[dim - 1]--; + --i_; is_valid_ = p_[dim - 1] - run_->first()[dim - 1] >= 0; } template <typename P> inline + unsigned + p_run_bkd_piter_::ind() const + { + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); + return i_; + } + + template <typename P> + inline p_run_bkd_piter_::operator P() const { mln_precondition(is_valid()); + mln_assertion(p_[P::dim - 1] - run_->first()[P::dim - 1] == signed(i_)); return p_; } Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1601) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1602) @@ -229,8 +229,8 @@ const { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->domain_.nruns()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> @@ -239,8 +239,8 @@ mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->values_[site.pset_pos_()]; + site.p_of_run() < this->data_->domain_.nruns()); + return this->data_->values_[site.p_of_run()]; } template <typename P, typename T> Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1601) +++ trunk/milena/mln/core/sparse_image.hh (revision 1602) @@ -213,9 +213,9 @@ const { mln_precondition(this->has_data()); - mln_precondition(site.pset_pos_() < this->data_->values_.size()); - mln_precondition(site.index_() < this->data_->values_[site.pset_pos_()].size()); - return this->data_->values_[site.pset_pos_()][site.index_()]; + mln_precondition(site.p_of_run() < this->data_->values_.size()); + mln_precondition(site.p_in_run() < this->data_->values_[site.p_of_run()].size()); + return this->data_->values_[site.p_of_run()][site.p_in_run()]; } template <typename P, typename T> @@ -224,9 +224,9 @@ sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) { mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->values_.size() && - site.index_() < this->data_->values_[site.pset_pos_()].size()); - return this->data_->values_[site.pset_pos_()][site.index_()]; + site.p_of_run() < this->data_->values_.size() && + site.p_in_run() < this->data_->values_[site.p_of_run()].size()); + return this->data_->values_[site.p_of_run()][site.p_in_run()]; } template <typename P, typename T> Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 1601) +++ trunk/milena/mln/core/p_runs.hh (revision 1602) @@ -127,7 +127,7 @@ { for (unsigned i = 0; i < con_.nelements(); ++i) { - if (con_[i].first() == p.range_start_() && con_[i].length() > p.index_()) + if (con_[i].first() == p.range_start_() && con_[i].length() > p.p_in_run()) return true; } return false; @@ -262,9 +262,6 @@ { public: - /// Convertion into a point-site. - operator runs_psite () const; - /// Convertion into a point. operator P () const; @@ -296,12 +293,6 @@ } template <typename P, typename E> - p_runs_piter_<P, E>::operator runs_psite () const - { - return runs_psite(con_, p_); - } - - template <typename P, typename E> inline p_runs_piter_<P, E>::operator P () const { @@ -353,6 +344,9 @@ /// Go to the next point. void next_(); + /// Convertion into a point-site. + operator runs_psite () const; + protected: unsigned i_; @@ -417,20 +411,12 @@ return; } this->p_ = it_; + } - -// mln_precondition(this->is_valid()); -// ++(this->site_.index_()); - -// if (this->site_.index_() >= it_->second) -// { -// ++it_; -// ++this->site_.pset_pos_(); -// this->site_.range_start_() = it_->first; -// this->site_.index_() = 0; -// } -// this->p_ = this->site_.range_start_(); -// this->p_[0] += this->site_.index_(); + template <typename P> + p_runs_fwd_piter_::operator runs_psite () const + { + return runs_psite(this->con_, it_.ind(), i_); } # endif // ! MLN_INCLUDE_ONLY @@ -460,6 +446,9 @@ /// Go to the next point. void next_(); + /// Convertion into a point-site. + operator runs_psite () const; + protected: unsigned i_; @@ -527,6 +516,12 @@ this->p_ = it_; } + template <typename P> + p_runs_bkd_piter_::operator runs_psite () const + { + return runs_psite(this->con_, it_.ind(), i_); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

1 0

milena r1601: Update tests for level and border and fix typo
by Guillaume Duhamel 07 Dec '07

07 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-07 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update tests for level and border and fix typo. * tests/border/duplicate_full.cc, * tests/border/fill.cc, * tests/border/fill_full.cc, * tests/border/mirror_full.cc: Update 1d version. * tests/display/color_pretty.cc, * tests/level/abs_full.cc, * tests/level/sort_points_full.cc, * tests/logical/and_not_full.cc, * tests/logical/not_full.cc: Update and fix typo. * mln/trait/value/kind.hh: Fix typo. --- mln/trait/value/kind.hh | 3 tests/border/duplicate_full.cc | 168 ++++++++++++++++++++++++------------- tests/border/fill.cc | 2 tests/border/fill_full.cc | 24 ++--- tests/border/mirror_full.cc | 178 +++++++++++++++++++++++++--------------- tests/display/color_pretty.cc | 2 tests/level/abs_full.cc | 2 tests/level/sort_points_full.cc | 2 tests/logical/and_not_full.cc | 2 tests/logical/not_full.cc | 4 10 files changed, 245 insertions(+), 142 deletions(-) Index: trunk/milena/tests/level/abs_full.cc =================================================================== --- trunk/milena/tests/level/abs_full.cc (revision 1600) +++ trunk/milena/tests/level/abs_full.cc (revision 1601) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level/abs.cc +/*! \file tests/level/abs_full.cc * * \brief Tests on mln::level::abs. */ Index: trunk/milena/tests/level/sort_points_full.cc =================================================================== --- trunk/milena/tests/level/sort_points_full.cc (revision 1600) +++ trunk/milena/tests/level/sort_points_full.cc (revision 1601) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level/sort_points.cc +/*! \file tests/level/sort_points_full.cc * * \brief Tests on mln::level::sort_points. */ Index: trunk/milena/tests/display/color_pretty.cc =================================================================== --- trunk/milena/tests/display/color_pretty.cc (revision 1600) +++ trunk/milena/tests/display/color_pretty.cc (revision 1601) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/color_pretty.cc +/*! \file tests/display/color_pretty.cc * * \brief Tests on mln::display::color::pretty. */ Index: trunk/milena/tests/border/duplicate_full.cc =================================================================== --- trunk/milena/tests/border/duplicate_full.cc (revision 1600) +++ trunk/milena/tests/border/duplicate_full.cc (revision 1601) @@ -30,34 +30,115 @@ * \brief Tests on mln::border::duplicate. */ +#include <mln/core/image1d.hh> #include <mln/core/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/duplicate.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_s8.hh> +namespace mln +{ + + template <typename T> + void chck1d(int cols, int border, T ref[]) + { + int c = cols + 2 * border; + + image1d<T> ima(cols, border); + debug::iota(ima); + border::duplicate(ima); + + for (int i = 0; i < c; ++i) + mln_assertion(ima[i] == ref[i]); + } + + template <typename T> + void chck2d(int rows, int cols, int border, T ref[]) + { + int r = rows + 2 * border; + int c = cols + 2 * border; + + image2d<T> ima(rows, cols, border); + debug::iota(ima); + border::duplicate(ima); + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == ref[i]); + } + +} -using namespace mln; int main (void) { + using namespace mln; + + std::cerr << "Tests border::duplicate:" << std::endl; + { - (std::cerr << "Test border::mirror on int with border = 3 ... ").flush (); + std::cerr << " in 1d :" << std::endl; - typedef int T; + { + (std::cerr << " on int_u8 with border = 3 ... ").flush (); + + typedef value::int_u8 T; int border = 3; - int row = 4; - int col = 5; + int cols = 2; + T ref[8] = {1, 1, 1, 1, 2, 2, 2, 2}; - int r = row + 2 * border; - int c = col + 2 * border; + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } - image2d<T> ima(row, col, border); - debug::iota (ima); - border::duplicate (ima); + { + (std::cerr << " on int with border = 2 ... ").flush (); + + typedef int T; + int border = 2; + int cols = 3; + T ref[7] = {1, 1, 1, 2, 3, 3, 3}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } - T vs[110] = + { + (std::cerr << " on int_s8 with border = 1 ... ").flush (); + + typedef value::int_s8 T; + int border = 1; + int cols = 2; + T ref[4] = {1, 1, 2, 2}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << " on int with border = 0 ... ").flush (); + typedef int T; + int border = 0; + int cols = 4; + T ref[4] = {1, 2, 3, 4}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } + } // end of 1d + + + { + std::cerr << " in 2d :" << std::endl; + + { + (std::cerr << " on int with border = 3 ... ").flush (); + typedef int T; + int border = 3; + int rows = 4; + int cols = 5; + T ref[110] = { 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, 1, 1, 1, 1, 2, 3, 4, 5, 5, 5, 5, @@ -71,27 +152,17 @@ 16, 16, 16, 16, 17, 18, 19, 20, 20, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } { - (std::cerr << "Test border::mirror on int_u8 with border = 2 ... ").flush (); - + (std::cerr << " on int_u8 with border = 3 ... ").flush (); typedef value::int_u8 T; int border = 2; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<T> ima(row, col, border); - debug::iota (ima); - border::duplicate (ima); - - T vs[72] = + int rows = 4; + int cols = 5; + T ref[72] = { 1, 1, 1, 2, 3, 4, 5, 5, 5, 1, 1, 1, 2, 3, 4, 5, 5, 5, @@ -103,27 +174,17 @@ 16, 16, 16, 17, 18, 19, 20, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } { - (std::cerr << "Test border::mirror on int_s8 with border = 1 ... ").flush (); - + (std::cerr << " on int_s8 with border = 1 ... ").flush (); typedef value::int_s8 T; int border = 1; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<T> ima(row, col, border); - debug::iota (ima); - border::duplicate (ima); - - T vs[49] = + int rows = 4; + int cols = 5; + T ref[49] = { 1, 1, 2, 3, 4, 5, 5, 1, 1, 2, 3, 4, 5, 5, @@ -133,28 +194,17 @@ 16, 16, 17, 18, 19, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } - { - (std::cerr << "Test border::mirror on int with border = 0 ... ").flush (); - + (std::cerr << " on int with border = 0 ... ").flush (); typedef int T; int border = 0; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<T> ima(row, col, border); - debug::iota (ima); - border::duplicate (ima); - - T vs[20] = + int rows = 4; + int cols = 5; + T ref[20] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, @@ -162,10 +212,10 @@ 16, 17, 18, 19, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } + } // end of 2d } Index: trunk/milena/tests/border/mirror_full.cc =================================================================== --- trunk/milena/tests/border/mirror_full.cc (revision 1600) +++ trunk/milena/tests/border/mirror_full.cc (revision 1601) @@ -37,28 +37,110 @@ #include <mln/value/int_u8.hh> #include <mln/value/int_s8.hh> -using namespace mln; + +namespace mln +{ + + template <typename T> + void chck1d (int cols, int border, T ref[]) + { + int c = cols + 2 * border; + + image1d<T> ima(cols, border); + debug::iota(ima); + border::mirror(ima); + + for (int i = 0; i < c; ++i) + mln_assertion(ima[i] == ref[i]); + } + + template <typename T> + void chck2d (int rows, int cols, int border, T ref[]) + { + int r = rows + 2 * border; + int c = cols + 2 * border; + + image2d<T> ima(rows, cols, border); + debug::iota(ima); + border::mirror(ima); + + for (int i = 0; i < c * r; ++i) + mln_assertion(ima[i] == ref[i]); + } + +} + int main (void) { + using namespace mln; + + + std::cerr << "Tests border::mirror:" << std::endl; + + { + std::cerr << " in 1d :" << std::endl; { - (std::cerr << "Test border::mirror on int with border = 3 ... ").flush (); + (std::cerr << " on int_u8 with border = 3 ... ").flush (); - typedef int T; + typedef value::int_u8 T; int border = 3; - int row = 4; - int col = 5; + int cols = 2; + T ref[8] = {2, 2, 1, 1, 2, 2, 1, 1}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } - int r = row + 2 * border; - int c = col + 2 * border; + { + (std::cerr << " on int with border = 2 ... ").flush (); - image2d<T> ima(row, col, border); - debug::iota (ima); - border::mirror (ima); + typedef int T; + int border = 2; + int cols = 3; + T ref[7] = {2, 1, 1, 2, 3, 3, 2}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << " on int_s8 with border = 1 ... ").flush (); + + typedef value::int_s8 T; + int border = 1; + int cols = 2; + T ref[4] = {1, 1, 2, 2}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } + + { + (std::cerr << " on int with border = 0 ... ").flush (); + typedef int T; + int border = 0; + int cols = 4; + T ref[4] = {1, 2, 3, 4}; + + chck1d(cols, border, ref); + std::cerr << "OK" << std::endl; + } + + } // end of 1d - T vs[110] = + { + std::cerr << " in 2d :" << std::endl; + + { + (std::cerr << " on int with border = 3 ... ").flush (); + typedef int T; + int border = 3; + int rows = 4; + int cols = 5; + T ref[110] = { 1, 1, 1, 11, 12, 13, 14, 15, 5, 5, 5, 1, 1, 1, 6, 7, 8, 9, 10, 5, 5, 5, @@ -72,28 +154,17 @@ 16, 16, 16, 6, 7, 8, 9, 10, 20, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); - + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } { - (std::cerr << "Test border::mirror on int_s8 with border = 2 ... ").flush (); - - typedef value::int_s8 T; + (std::cerr << " on int_u8 with border = 3 ... ").flush (); + typedef value::int_u8 T; int border = 2; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<T> ima(row, col, border); - debug::iota (ima); - border::mirror (ima); - - T vs[72] = + int rows = 4; + int cols = 5; + T ref[72] = { 1, 1, 6, 7, 8, 9, 10, 5, 5, 1, 1, 1, 2, 3, 4, 5, 5, 5, @@ -105,28 +176,17 @@ 16, 16, 11, 12, 13, 14, 15, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); - + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } { - (std::cerr << "Test border::mirror on int_u8 with border = 1 ... ").flush (); - - typedef value::int_u8 T; + (std::cerr << " on int_s8 with border = 1 ... ").flush (); + typedef value::int_s8 T; int border = 1; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<T> ima(row, col, border); - debug::iota (ima); - border::mirror (ima); - - T vs[49] = + int rows = 4; + int cols = 5; + T ref[49] = { 1, 1, 2, 3, 4, 5, 5, 1, 1, 2, 3, 4, 5, 5, @@ -136,27 +196,17 @@ 16, 16, 17, 18, 19, 20, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); - + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } { - (std::cerr << "Test border::mirror on int with border = 0 ... ").flush (); - + (std::cerr << " on int with border = 0 ... ").flush (); + typedef int T; int border = 0; - int row = 4; - int col = 5; - - int r = row + 2 * border; - int c = col + 2 * border; - - image2d<int> ima(row, col, border); - debug::iota (ima); - border::mirror (ima); - - int vs[20] = + int rows = 4; + int cols = 5; + T ref[20] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, @@ -164,10 +214,10 @@ 16, 17, 18, 19, 20 }; - for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == vs[i]); - + chck2d(rows, cols, border, ref); std::cerr << "OK" << std::endl; } + } // end of 2d + } Index: trunk/milena/tests/border/fill_full.cc =================================================================== --- trunk/milena/tests/border/fill_full.cc (revision 1600) +++ trunk/milena/tests/border/fill_full.cc (revision 1601) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill/test_border_fill_image2d_1.cc +/*! \file tests/border/fill_full.cc * * \brief Tests on mln::border::fill. */ @@ -133,8 +133,10 @@ { int limits = 10; + std::cerr << "Tests border::fill:" << std::endl; + { - std::cerr << "Tests border::fill on int:" << std::endl; + std::cerr << " on int:" << std::endl; typedef int T; T value = (T) -1; @@ -160,7 +162,7 @@ } { - std::cerr << "Tests border::fill on unsigned:" << std::endl; + std::cerr << " on unsigned:" << std::endl; typedef unsigned T; T value = (T) -1; @@ -186,7 +188,7 @@ } { - std::cerr << "Tests border::fill on int_u8 ... " << std::endl; + std::cerr << " on int_u8:" << std::endl; typedef value::int_u8 T; T value = 255; @@ -212,7 +214,7 @@ } { - std::cerr << "Tests border::fill on int_u16 ... " << std::endl; + std::cerr << " on int_u16:" << std::endl; typedef value::int_u16 T; T value = 65535; @@ -238,7 +240,7 @@ } { - std::cerr << "Tests border::fill on int_s8 ... " << std::endl; + std::cerr << " on int_s8:" << std::endl; typedef value::int_s8 T; T value = 127; @@ -264,7 +266,7 @@ } { - std::cerr << "Tests border::fill on int_s16 ... " << std::endl; + std::cerr << " on int_s16:" << std::endl; typedef value::int_s16 T; T value = 32767; @@ -290,7 +292,7 @@ } { - std::cerr << "Tests border::fill on rgb8 ... " << std::endl; + std::cerr << " on rgb8:" << std::endl; typedef value::rgb8 T; T value = T(255, 255, 255); @@ -316,7 +318,7 @@ } { - std::cerr << "Tests border::fill on rgb16:" << std::endl; + std::cerr << " on rgb16:" << std::endl; typedef value::rgb16 T; T value = T(65535, 65535, 65535); @@ -343,7 +345,7 @@ { - std::cerr << "Tests border::fill on float01_8:" << std::endl; + std::cerr << " on float01_8:" << std::endl; typedef value::float01_8 T; T value = T(0.9999); @@ -369,7 +371,7 @@ } { - std::cerr << "Tests border::fill on float01_16:" << std::endl; + std::cerr << " on float01_16:" << std::endl; typedef value::float01_16 T; T value = T(0.9999); Index: trunk/milena/tests/border/fill.cc =================================================================== --- trunk/milena/tests/border/fill.cc (revision 1600) +++ trunk/milena/tests/border/fill.cc (revision 1601) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_fill/test_border_fill_image2d_1.cc +/*! \file tests/border/fill.cc * * \brief Tests on mln::border::fill. */ Index: trunk/milena/tests/logical/not_full.cc =================================================================== --- trunk/milena/tests/logical/not_full.cc (revision 1600) +++ trunk/milena/tests/logical/not_full.cc (revision 1601) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/logical/and_full.cc +/*! \file tests/logical/not_full.cc * - * \brief Tests on mln::logical::and. + * \brief Tests on mln::logical::not. */ #include <mln/core/image1d.hh> Index: trunk/milena/tests/logical/and_not_full.cc =================================================================== --- trunk/milena/tests/logical/and_not_full.cc (revision 1600) +++ trunk/milena/tests/logical/and_not_full.cc (revision 1601) @@ -27,7 +27,7 @@ /*! \file tests/logical/and_not_full.cc * - * \brief Tests on mln::logical::and. + * \brief Tests on mln::logical::and_not. */ #include <mln/core/image1d.hh> Index: trunk/milena/mln/trait/value/kind.hh =================================================================== --- trunk/milena/mln/trait/value/kind.hh (revision 1600) +++ trunk/milena/mln/trait/value/kind.hh (revision 1601) @@ -56,13 +56,14 @@ struct logic : label { std::string name() const { return "kind::logic"; } }; struct binary : logic { std::string name() const { return "kind::binary"; } }; + /* // FIXME: Why not? // label logic // \ / \ // \ nary_logic \ // \ / \ \ // binary ternary fuzzy - + */ struct data : any { std::string name() const { return "kind::data"; } }; };

1 0

milena r1600: The set of a lazy_set can be cleared
by nivaul_s＠lrde.epita.fr 07 Dec '07

07 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-07 Simon Nivault <simon.nivault(a)lrde.epita.fr> The set of a lazy_set can be cleared. * mln/util/lazy_set.hh: The set can be cleared. * tests/util/Makefile.am, * tests/util/lazy_set.cc: New test. * mln/core/internal/run_image.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/p_runs.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh: Use new lazy_set features. --- mln/core/internal/run_image.hh | 34 +++++++++++++++++ mln/core/mono_obased_rle_encode.hh | 1 mln/core/mono_obased_rle_image.hh | 14 +++++++ mln/core/mono_rle_encode.hh | 1 mln/core/mono_rle_image.hh | 11 +++++ mln/core/obased_rle_encode.hh | 1 mln/core/obased_rle_image.hh | 11 +++++ mln/core/p_runs.hh | 17 ++++++++ mln/core/rle_encode.hh | 1 mln/core/rle_image.hh | 11 +++++ mln/core/sparse_encode.hh | 5 -- mln/core/sparse_image.hh | 11 +++++ mln/util/lazy_set.hh | 71 +++++++++++++++++++++++++++++++++++-- tests/util/Makefile.am | 2 + tests/util/lazy_set.cc | 64 +++++++++++++++++++++++++++++++++ 15 files changed, 248 insertions(+), 7 deletions(-) Index: trunk/milena/tests/util/Makefile.am =================================================================== --- trunk/milena/tests/util/Makefile.am (revision 1599) +++ trunk/milena/tests/util/Makefile.am (revision 1600) @@ -8,6 +8,7 @@ branch_iter_ind \ eat \ graph \ + lazy_set \ ordpair \ tree \ tree_fast \ @@ -19,6 +20,7 @@ branch_iter_ind_SOURCES = branch_iter_ind.cc eat_SOURCES = eat.cc graph_SOURCES = graph.cc +lazy_set_SOURCES = lazy_set.cc ordpair_SOURCES = ordpair.cc tree_SOURCES = tree.cc tree_fast_SOURCES = tree_fast.cc Index: trunk/milena/tests/util/lazy_set.cc =================================================================== --- trunk/milena/tests/util/lazy_set.cc (revision 0) +++ trunk/milena/tests/util/lazy_set.cc (revision 1600) @@ -0,0 +1,64 @@ +// Copyright (C) 2007 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/util/lazy_set.cc + * + * \brief test of mln::util::lazy_set + * + */ + +#include <iostream> + +#include <mln/util/lazy_set.hh> + +int main () +{ + using namespace mln; + + util::lazy_set_<int> s1; + util::lazy_set_<int> s2; + + s1.insert(3); + s1.insert(-2); + s1.insert(9); + s1.insert(0); + s2.insert(3); + s2.insert(-2); + s2.insert(9); + s2.insert(0); + + mln_assertion(s1.nelements() == 4); + s2.set_const_mode(true); + mln_assertion(s2.nelements() == 4); + + for (unsigned i = 0; i < s1.nelements(); ++i) + { + std::cout << s1[i] << " = " << s2[i] << std::endl; + mln_assertion(s1[i] == s2[i]); + } +} Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1599) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1600) @@ -98,6 +98,7 @@ rstart = p; } } + output.finalize(); return output; } Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1599) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1600) @@ -88,30 +88,27 @@ { ++len; rstart = p; - std::cout << "New run " << p << ": *"; rvalue.push_back(ima(p)); } else if ((!ignore_zero || ima(p) != literal::zero) && on_the_same_line(rstart, mln_point(I)(p), len)) { - std::cout << "*"; ++len; rvalue.push_back(ima(p)); } else { - std::cout << std::endl; output.insert(p_run(rstart, len), rvalue); rvalue.clear(); if ((len = (!ignore_zero || ima(p) != literal::zero))) { rstart = p; - std::cout << "New run " << p << ": "; rvalue.push_back(ima(p)); } } } + output.finalize(); return output; } Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1599) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1600) @@ -56,7 +56,22 @@ run_image_(); public: + /*! \brief Give the rate of compression. + * + * Give the rate of space gained by coding an image in this + * format. A rate of 1 means there is no compression. Less than + * 1 means we have gained space. + * + * \return The rate of compression. + */ float compression() const; + + /*! \brief Finalize the construction. + * + * For internal use, this method has to be called to have + * actually an lighter image. So it improves compression. + */ + void finalize(); }; # ifndef MLN_INCLUDE_ONLY @@ -72,10 +87,29 @@ float run_image_<T, P, E>::compression() const { + std::cout << float(exact(this)->data_->size_mem()) + << " / ( " + << float (sizeof(T)) + << " * " + << float (exact(this)->data_->domain_.bbox().npoints()) + << " )" + << std::endl; + std::cout << exact(this)->data_->domain_.bbox().pmin() + << " " + << exact(this)->data_->domain_.bbox().pmax() + << std::endl; return float(exact(this)->data_->size_mem()) / float (sizeof(T) * exact(this)->data_->domain_.bbox().npoints()); } + template <typename T, typename P, typename E> + inline + void + run_image_<T, P, E>::finalize() + { + exact(this)->data_->finalize(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace internal Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1599) +++ trunk/milena/mln/core/rle_image.hh (revision 1600) @@ -62,6 +62,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + + /// Finalize the domain (internal use). + void finalize(); }; } // end of namespace mln::internal @@ -157,6 +160,14 @@ return sizeof(T) * values_.size() + domain_.size_mem(); } + template <typename P, typename T> + inline + void + data_< rle_image<P,T> >::finalize() + { + domain_.finalize(); + } + } // end of namespace mln::internal template <typename P, typename T> Index: trunk/milena/mln/core/obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/obased_rle_encode.hh (revision 1599) +++ trunk/milena/mln/core/obased_rle_encode.hh (revision 1600) @@ -110,6 +110,7 @@ } } } + output.finalize(); return output; } Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1599) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1600) @@ -62,6 +62,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + + /// Finalize the domain (internal use). + void finalize(); }; } // end of namespace mln::internal @@ -162,6 +165,14 @@ return sizeof(T) + domain_.size_mem(); } + template <typename P, typename T> + inline + void + data_< mono_rle_image<P,T> >::finalize() + { + domain_.finalize(); + } + } // end of namespace mln::internal template <typename P, typename T> Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1599) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1600) @@ -72,6 +72,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + + /// Finalize the domain (internal use). + void finalize(); }; } // end of namespace mln::internal @@ -179,6 +182,14 @@ + (sizeof(unsigned) + sizeof(T)) * domain_.nruns(); } + template <typename P, typename T> + inline + void + data_< obased_rle_image<P,T> >::finalize() + { + domain_.finalize(); + } + } // end of namespace mln::internal template <typename P, typename T> Index: trunk/milena/mln/core/mono_obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1599) +++ trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1600) @@ -110,6 +110,7 @@ } } } + output.finalize(); return output; } Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1599) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1600) @@ -67,6 +67,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + + /// Finalize the domain (internal use). + void finalize(); }; } // end of namespace mln::internal @@ -166,6 +169,17 @@ return domain_.size_mem() * 2 + sizeof(T) * (values_.size() + ima_.size()); } + template <typename P, typename T> + inline + void + data_< mono_obased_rle_image<P,T> >::finalize() + { + domain_.finalize(); + for (typename std::vector< mono_rle_image<P, T> >::iterator it = ima_.begin(); + it != ima_.end(); ++it) + it->finalize(); + } + } // end of namespace mln::internal template <typename P, typename T> Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1599) +++ trunk/milena/mln/core/rle_encode.hh (revision 1600) @@ -103,6 +103,7 @@ } } } + output.finalize(); return output; } Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1599) +++ trunk/milena/mln/core/sparse_image.hh (revision 1600) @@ -62,6 +62,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + + /// Finalize the domain (internal use). + void finalize(); }; } // end of namespace mln::internal @@ -157,6 +160,14 @@ return sizeof(T) * domain_.npoints() + domain_.size_mem(); } + template <typename P, typename T> + inline + void + data_< sparse_image<P,T> >::finalize() + { + domain_.finalize(); + } + } // end of namespace mln::internal template <typename P, typename T> Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 1599) +++ trunk/milena/mln/core/p_runs.hh (revision 1600) @@ -93,6 +93,9 @@ /// Return the size of the data in memory. unsigned size_mem() const; + /// Finalize the lazy_set (internal use) + void finalize(); + // /// Return the container of the pset (internal use only). // const container& con() const; @@ -225,9 +228,21 @@ unsigned p_runs_::size_mem() const { - return nruns() * 2 * (sizeof(P) + sizeof(unsigned)); + if (con_.get_mode()) + return nruns() * (sizeof(P) + sizeof(unsigned)); + else + return 2 * nruns() * (sizeof(P) + sizeof(unsigned)); } + template <typename P> + inline + void + p_runs_::finalize() + { + con_.set_const_mode(true); + } + + // template <typename P> // const typename p_runs_::container& // p_runs_::con() const Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 1599) +++ trunk/milena/mln/util/lazy_set.hh (revision 1600) @@ -39,6 +39,7 @@ # include <algorithm> # include <mln/core/internal/force_exact.hh> +# include <mln/core/contract.hh> namespace mln @@ -136,6 +137,8 @@ * * All elements contained in the set are destroyed so the set is * emptied. + * The lazy set can be cleared even if it is in const mode + * and then it is set in non-const mode. * * \post is_empty() == true */ @@ -153,6 +156,21 @@ /// Constructor without arguments. lazy_set_(); + /*! \brief Set the mode of the lazy_set + * + * The lazy set can have two modes : + * - const : The lazy set is as light as a vector but you cannot + * modify it + * - non-const : The lazy set use a std::set to have lazy manipulation + * + * \param[in] mode True for const mode, false for non-const. + * + */ + void set_const_mode(bool mode); + + /// Get the mode of the lazy set. + bool get_mode() const; + private: /*! \brief Array of elements. @@ -177,6 +195,9 @@ /// Tell if \a v_ needs to be updated. mutable bool needs_update_; + + /// Tell what the lazy set mode is. + bool mode_; }; @@ -203,6 +224,7 @@ lazy_set_<E>::lazy_set_() { needs_update_ = false; + mode_ = false; } template <typename E> @@ -210,6 +232,7 @@ lazy_set_<E>& lazy_set_<E>::insert(const E& elt) { + mln_assertion(!mode_); s_.insert(elt); if (needs_update_ == false) needs_update_ = true; @@ -221,6 +244,7 @@ lazy_set_<E>& lazy_set_<E>::remove(const E& elt) { + mln_assertion(!mode_); // FIXME : doesn't compile std::remove(s_.begin(), s_.end(), elt); if (needs_update_ == false) @@ -233,7 +257,9 @@ const E& lazy_set_<E>::element(unsigned i) const { - assert(i < s_.size()); + assert((!mode_ && i < s_.size()) + || i < v_.size()); + if (!mode_) if (needs_update_) update_(); return v_[i]; @@ -252,7 +278,10 @@ unsigned lazy_set_<E>::nelements() const { + if (!mode_) return s_.size(); + else + return v_.size(); } template <typename E> @@ -260,7 +289,10 @@ bool lazy_set_<E>::has(const E& elt) const { + if (!mode_) return s_.find(elt) != s_.end(); + else + return v_.find(elt) != v_.end(); } template <typename E> @@ -279,6 +311,7 @@ v_.clear(); s_.clear(); needs_update_ = false; + mode_ = false; mln_postcondition(is_empty()); } @@ -287,6 +320,7 @@ const std::vector<E>& lazy_set_<E>::vect() const { + if (!mode_) if (needs_update_) update_(); return v_; @@ -295,9 +329,42 @@ template <typename E> inline void + lazy_set_<E>::set_const_mode(bool mode) + { + if (mode != mode_) + { + if (mode) + { + if (needs_update_) + update_(); + s_.clear(); + } + else + { + mln_assertion(s_.size() == 0); + for (typename std::vector<E>::iterator it = v_.begin(); + it != v_.end(); it++) + s_.insert(*it); + needs_update_ = false; + } + mode_ = mode; + } + } + + template <typename E> + inline + bool + lazy_set_<E>::get_mode() const + { + return mode_; + } + + template <typename E> + inline + void lazy_set_<E>::update_() const { - mln_precondition(needs_update_); + mln_precondition(needs_update_ && !mode_); v_.clear(); std::copy(s_.begin(), s_.end(), std::back_inserter(v_)); // no s_.clear() here:

1 0

1599: Clean up 'labeling' and fix pbm i/o.
by Thierry Geraud 07 Dec '07

07 Dec '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Clean up 'labeling' and fix pbm i/o. * doc/examples: New directory. * tests/labeling_blobs.cc: Rename as... * tests/labeling/blobs.cc: ...this. * tests/labeling_algo.cc: Rename as... * doc/examples/labeling_algo.cc: ...this. * tests/labeling_level_fast.cc: Rename as... * tests/labeling/level.cc: ...this. * tests/labeling_regional_maxima.cc: Rename as... * tests/labeling/regional_maxima.cc: ...this. * tests/labeling_foreground.cc: Rename as... * tests/labeling/foreground.cc: ...this. * tests/labeling_estimate.cc: Remove; meaningless. * mln/labeling/estimate.hh: Rename as... * sandbox/geraud/estimate.hh: ...this. * tests/labeling/background.cc: New. * tests/labeling/flat_zones.cc: New. * tests/labeling/regional_minima.cc: New. * tests/labeling/Makefile.am: Update. * mln/canvas/labeling.hh, * mln/labeling/blobs.hh, * mln/labeling/flat_zones.hh, * mln/labeling/level.hh, * mln/labeling/regional_minima.hh, * mln/labeling/foreground.hh, * mln/labeling/regional_maxima.hh, * mln/labeling/background.hh: Clean up. * mln/labeling/all.hh: Update. * mln/labeling/base.hh: Remove. * mln/labeling/level.spe.hh: New. * tests/value/rgb8.cc: Add comment. * mln/trait/value/kind.hh: Add comment about tags' hierarchy. * mln/core/internal/set_of.hh (element): Fix precondition. * mln/value/rgb.hh (operator metal::vec): New; experimental. * mln/fun/v2v/saturate.hh: Uncomment. * mln/io/pbm/save.hh (save_), * mln/io/pbm/load.hh (load_ascii, load_raw_2d): Swap 0 and 1. * img/tiny.pgm: Rename as... * img/small.pgm: ...this. * img/tiny.pgm: New 16x16 lena reduction. * img/README: New. img/README | 8 + mln/canvas/labeling.hh | 116 +++++++++++++++---------- mln/core/internal/set_of.hh | 2 mln/fun/v2v/saturate.hh | 2 mln/io/pbm/load.hh | 5 - mln/io/pbm/save.hh | 2 mln/labeling/all.hh | 2 mln/labeling/background.hh | 19 +++- mln/labeling/blobs.hh | 54 ++++++++--- mln/labeling/flat_zones.hh | 103 +++++++++++++++------- mln/labeling/foreground.hh | 15 +++ mln/labeling/level.hh | 145 ++++++++++++------------------- mln/labeling/level.spe.hh | 175 ++++++++++++++++++++++++++++++++++++++ mln/labeling/regional_maxima.hh | 103 +++++++++++++++------- mln/labeling/regional_minima.hh | 105 +++++++++++++++------- mln/trait/value/kind.hh | 7 + mln/value/rgb.hh | 2 sandbox/geraud/estimate.hh | 39 +++++--- tests/labeling/Makefile.am | 19 ++++ tests/labeling/background.cc | 48 ++++++++++ tests/labeling/blobs.cc | 40 +------- tests/labeling/flat_zones.cc | 65 ++++++++++++++ tests/labeling/foreground.cc | 36 +------ tests/labeling/level.cc | 34 +++---- tests/labeling/regional_maxima.cc | 17 +-- tests/labeling/regional_minima.cc | 52 +++++++++++ tests/value/rgb8.cc | 5 + 27 files changed, 861 insertions(+), 359 deletions(-) Index: tests/value/rgb8.cc --- tests/value/rgb8.cc (revision 1598) +++ tests/value/rgb8.cc (working copy) @@ -50,6 +50,11 @@ v.blue() = 2; rgb8 c(0, 1, 2); + // FIXME: Do not compile because we lack ops! + // mln_sum_(rgb8) sum; + // sum + c; + // c = c + c; + std::cout << c << std::endl; std::cout << v << std::endl; Index: tests/labeling/regional_maxima.cc --- tests/labeling/regional_maxima.cc (revision 1528) +++ tests/labeling/regional_maxima.cc (working copy) @@ -25,18 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_regional_maxima.cc +/*! \file tests/labeling/regional_maxima.cc * * \brief Test on mln::labeling::regional_maxima. */ #include <mln/core/image2d.hh> -#include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> - +#include <mln/core/neighb2d.hh> #include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> - #include <mln/labeling/regional_maxima.hh> @@ -45,13 +42,9 @@ using namespace mln; using value::int_u8; - image2d<int_u8> - lena = io::pgm::load("../img/lena.pgm"), - out(lena.domain()); + image2d<int_u8> lena = io::pgm::load<int_u8>("../../img/tiny.pgm"); unsigned n; - labeling::regional_maxima(lena, c4(), out, n); - mln_assertion(n = 255); - - io::pgm::save(out, "out.pgm"); + labeling::regional_maxima(lena, c4(), n); + mln_assertion(n = 25); } Index: tests/labeling/background.cc --- tests/labeling/background.cc (revision 0) +++ tests/labeling/background.cc (revision 0) @@ -0,0 +1,48 @@ +// Copyright (C) 2007 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/labeling/background.cc + * + * \brief Test on mln::labeling::background. + */ + +#include <mln/core/image2d.hh> +#include <mln/io/pbm/load.hh> +#include <mln/core/neighb2d.hh> +#include <mln/labeling/background.hh> +#include <mln/logical/not.hh> + + +int main() +{ + using namespace mln; + + image2d<bool> pic = io::pbm::load("../../img/picasso.pbm"); + unsigned n; + labeling::background(logical::not_(pic), c4(), n); + mln_assertion(n = 33); +} Index: tests/labeling/blobs.cc --- tests/labeling/blobs.cc (revision 1528) +++ tests/labeling/blobs.cc (working copy) @@ -25,51 +25,23 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_blob.cc +/*! \file tests/labeling/blobs.cc * - * \brief Test on mln::labeling::blob. + * \brief Test on mln::labeling::blobs. */ #include <mln/core/image2d.hh> -#include <mln/core/cast_image.hh> +#include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> -#include <mln/value/int_u8.hh> -#include <mln/pw/all.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> #include <mln/labeling/blobs.hh> -#include <mln/level/transform.hh> - - -struct fold_t : public mln::Function_v2v< fold_t > -{ - typedef mln::value::int_u8 result; - result operator()(unsigned i) const { return i = 0 ? 0 : i % 255 + 1; } -}; - int main() { using namespace mln; - using value::int_u8; - - image2d<int_u8> lena = io::pgm::load("../img/tiny.pgm"); + image2d<bool> pic = io::pbm::load("../../img/picasso.pbm"); unsigned n; - io::pgm::save(cast_image<int_u8>( labeling::blobs((pw::value(lena) > pw::cst(127u)) | lena.domain(), - c4(), n) ), - "out.pgm"); - mln_assertion(n = 14); - -// image2d<int_u8> -// lena = io::pgm::load("../img/lena.pgm"), -// out; -// unsigned n; -// image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(127u)) | lena.domain(), -// c8(), n); -// mln_assertion(n = 528); -// io::pgm::save( level::transform(labels, fold_t()), -// "out.pgm" ); + labeling::blobs(pic, c4(), n); + mln_assertion(n = 33); } Index: tests/labeling/flat_zones.cc --- tests/labeling/flat_zones.cc (revision 0) +++ tests/labeling/flat_zones.cc (revision 0) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 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/labeling/flat_zones.cc + * + * \brief Test on mln::labeling::flat_zones. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/core/neighb2d.hh> +#include <mln/labeling/flat_zones.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/pw/all.hh> + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena = io::pgm::load<int_u8>("../../img/tiny.pgm"); + + unsigned n; + image2d<unsigned> labels = labeling::flat_zones(lena, c4(), n); + mln_assertion(n = 247); + + { + unsigned n_ = 0; + for (unsigned i = 0; i <= 255; ++i) + { + unsigned n_i; + labeling::blobs((pw::value(lena) = pw::cst(i)) | lena.domain(), + c4(), n_i); + n_ += n_i; + } + mln_assertion(n_ = n); + } +} Index: tests/labeling/Makefile.am --- tests/labeling/Makefile.am (revision 1598) +++ tests/labeling/Makefile.am (working copy) @@ -1,3 +1,22 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + background \ + blobs \ + flat_zones \ + foreground \ + level \ + regional_maxima \ + regional_minima + +background_SOURCES = background.cc +blobs_SOURCES = blobs.cc +flat_zones_SOURCES = flat_zones.cc +foreground_SOURCES = foreground.cc +level_SOURCES = level.cc +regional_maxima_SOURCES = regional_maxima.cc +regional_minima_SOURCES = regional_minima.cc + +TESTS = $(check_PROGRAMS) Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 1528) +++ tests/labeling/level.cc (working copy) @@ -25,21 +25,23 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_level_fast.cc +/*! \file tests/labeling/level.cc * * \brief Test on mln::labeling::level. */ #include <mln/core/image2d.hh> -#include <mln/core/image1d.hh> #include <mln/core/neighb2d.hh> #include <mln/value/int_u8.hh> -#include <mln/pw/all.hh> - #include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> + +#include <mln/accu/count.hh> +#include <mln/accu/compute.hh> #include <mln/labeling/level.hh> -#include <mln/debug/iota.hh> +#include <mln/level/paste.hh> +#include <mln/pw/all.hh> +#include <mln/core/image_if.hh> + #include <mln/debug/println.hh> @@ -48,15 +50,15 @@ using namespace mln; using value::int_u8; - image2d<value::int_u8> i1(5, 5); - debug::iota(i1); - i1(point2d(0, 2)) = i1(point2d(1, 2)) = i1(point2d(1, 3)) = i1(point2d(2, 3)) = i1(point2d(2, 4)) = 2; - i1(point2d(2, 0)) = i1(point2d(3, 0)) = 2; - debug::println(i1); - - unsigned n; - image2d<unsigned> out = labeling::level(i1, 2, c4(), n); + image2d<int_u8> lena = io::pgm::load<int_u8>("../../img/tiny.pgm"); + image2d<bool> lvl(lena.domain()); - std::cout << "n = " << n << std::endl; - debug::println(out); + unsigned n, npixels = 0; + for (unsigned l = 0; l <= 255; ++l) + { + image2d<unsigned> labels = labeling::level(lena, l, c4(), n); + unsigned npix = accu::compute< accu::count >(labels | (pw::value(labels) != pw::cst(0))); + npixels += npix; + } + mln_assertion(npixels = lena.npoints()); } Index: tests/labeling/foreground.cc --- tests/labeling/foreground.cc (revision 1528) +++ tests/labeling/foreground.cc (working copy) @@ -25,49 +25,23 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_foreground.cc +/*! \file tests/labeling/foreground.cc * * \brief Test on mln::labeling::foreground. */ #include <mln/core/image2d.hh> +#include <mln/io/pbm/load.hh> #include <mln/core/neighb2d.hh> -#include <mln/value/int_u8.hh> -#include <mln/pw/all.hh> -#include <mln/core/cast_image.hh> - -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> #include <mln/labeling/foreground.hh> -#include <mln/level/transform.hh> - - -struct fold_t : public mln::Function_v2v< fold_t > -{ - typedef mln::value::int_u8 result; - result operator()(unsigned i) const { return i = 0 ? 0 : i % 255 + 1; } -}; int main() { using namespace mln; - using value::int_u8; - image2d<int_u8> lena = io::pgm::load("../img/tiny.pgm"); + image2d<bool> pic = io::pbm::load("../../img/picasso.pbm"); unsigned n; - io::pgm::save(cast_image<int_u8>( labeling::foreground((pw::value(lena) > pw::cst(127u)) | lena.domain(), - c4(), n) ), - "out.pgm"); - mln_assertion(n = 14); - -// image2d<int_u8> -// lena = io::pgm::load("../img/lena.pgm"), -// out; -// unsigned n; -// image2d<unsigned> labels = labeling::foreground((pw::value(lena) > pw::cst(127u)) | lena.domain(), -// c8(), n); -// mln_assertion(n = 528); -// io::pgm::save( level::transform(labels, fold_t()), -// "out.pgm" ); + labeling::foreground(pic, c4(), n); + mln_assertion(n = 33); } Index: tests/labeling/regional_minima.cc --- tests/labeling/regional_minima.cc (revision 0) +++ tests/labeling/regional_minima.cc (revision 0) @@ -0,0 +1,52 @@ +// Copyright (C) 2007 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/labeling/regional_minima.cc + * + * \brief Test on mln::labeling::regional_minima. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/core/neighb2d.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/labeling/regional_minima.hh> + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena = io::pgm::load<int_u8>("../../img/tiny.pgm"); + + unsigned n; + labeling::regional_minima((pw::cst(255) - pw::value(lena)) | lena.domain(), + c4(), n); + mln_assertion(n = 25); +} Index: mln/trait/value/kind.hh --- mln/trait/value/kind.hh (revision 1598) +++ mln/trait/value/kind.hh (working copy) @@ -56,6 +56,13 @@ struct logic : label { std::string name() const { return "kind::logic"; } }; struct binary : logic { std::string name() const { return "kind::binary"; } }; + // FIXME: Why not? + // label logic + // \ / \ + // \ nary_logic \ + // \ / \ \ + // binary ternary fuzzy + struct data : any { std::string name() const { return "kind::data"; } }; }; Index: mln/core/internal/set_of.hh --- mln/core/internal/set_of.hh (revision 1598) +++ mln/core/internal/set_of.hh (working copy) @@ -224,9 +224,9 @@ const E& set_of_<E>::element(unsigned i) const { - assert(i < v_.size()); if (needs_update_) update_(); + mln_precondition(i < v_.size()); return v_[i]; } Index: mln/value/rgb.hh --- mln/value/rgb.hh (revision 1598) +++ mln/value/rgb.hh (working copy) @@ -125,6 +125,8 @@ rgb<n>(const metal::vec<3, unsigned>& rhs); rgb<n>(const metal::vec<3, int_u<n> >& rhs); + operator metal::vec<3, float>() const { return this->v_; } + /// \{ Constructors with literals. rgb<n>(const literal::white_t&); rgb<n>(const literal::black_t&); Index: mln/fun/v2v/saturate.hh --- mln/fun/v2v/saturate.hh (revision 1598) +++ mln/fun/v2v/saturate.hh (working copy) @@ -102,7 +102,7 @@ min_W = mln::value::cast<W>(min_); max_W = mln::value::cast<W>(max_); // FIXME -// needs_update_ = false; + needs_update_ = false; } // FIXME: Below we need something more powerful that mlc_converts_to Index: mln/io/pbm/save.hh --- mln/io/pbm/save.hh (revision 1598) +++ mln/io/pbm/save.hh (working copy) @@ -95,7 +95,7 @@ for_all(p) { c <<= 1; - c += (ima(p) = true ? 1 : 0); // FIXME: Swap. + c += (ima(p) = true ? 0 : 1); // In pbm, '0' means 'white' so 'object', thus 'true'! if (++col >= ncols) { c <<= (8 - stride - 1); Index: mln/io/pbm/load.hh --- mln/io/pbm/load.hh (revision 1598) +++ mln/io/pbm/load.hh (working copy) @@ -87,7 +87,8 @@ { unsigned value; file >> value; - ima(p) = value; + mln_assertion(value = 0 || value = 1); + ima(p) = (value = 0); // In pbm, '0' means 'white' so 'object', thus 'true'! // FIXME: Test alt code below. // file >> ima(p); } @@ -116,7 +117,7 @@ { if (i % 8 = 0) file.read((char*)(&c), 1); - ima(p) = c & 128; + ima(p) = !(c & 128); c *= 2; ++i; } Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 1598) +++ mln/canvas/labeling.hh (working copy) @@ -34,9 +34,9 @@ * image. */ +# include <mln/core/concept/image.hh> # include <mln/level/fill.hh> -# include <mln/level/sort_points.hh> -# include <mln/convert/to_window.hh> +# include <mln/convert/to_window.hh> // FIXME: to_upper_window namespace mln @@ -50,35 +50,52 @@ template <typename F> struct labeling { + // Functor. F& f; typedef typename F::I I; typedef typename F::N N; - typedef typename F::O O; + typedef typename F::L L; typedef typename F::S S; - typedef mln_point(I) point; - // aux: - mln_ch_value(O, bool) deja_vu; - mln_ch_value(O, point) parent; + // Local type. + typedef mln_psite(I) point; + // Auxiliary data. + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, point) parent; + + // Output. + mln_ch_value(I, L) output; + L nlabels; + bool status; + + // Ctor. labeling(F& f) : f(f) { - run(); + trace::entering("canvas::labeling"); + + init(); + f.init(); // Client initialization. + pass_1(); + pass_2(); + + trace::exiting("canvas::labeling"); } - void run() - { - // init + + void init() { initialize(deja_vu, f.input); mln::level::fill(deja_vu, false); initialize(parent, f.input); - f.nlabels = 0; - f.init(); + initialize(output, f.input); + mln::level::fill(output, 0); // FIXME: Use literal::zero. + nlabels = 0; } - // first pass + + void pass_1() { mln_fwd_piter(S) p(f.s); mln_niter(N) n(f.nbh, p); @@ -95,7 +112,7 @@ } } - // second pass + void pass_2() { mln_bkd_piter(S) p(f.s); for_all(p) if (f.handles(p)) @@ -104,21 +121,22 @@ { if (f.labels(p)) { - if (f.nlabels = mln_max(mln_value(O))) + if (nlabels = mln_max(L)) { - f.status = false; + status = false; return; } - f.output(p) = ++f.nlabels; + output(p) = ++nlabels; } } else - f.output(p) = f.output(parent(p)); + output(p) = output(parent(p)); } - f.status = true; + status = true; } - } // end of run() + + // Auxiliary methods. void make_set(const point& p) { @@ -152,41 +170,52 @@ }; - // FIXME: Fast version. template <typename F> - struct labeling_fast + struct labeling_fastest { + // Functor. F& f; typedef typename F::I I; typedef typename F::N N; - typedef typename F::O O; + typedef typename F::L L; + + // Auxiliary data. + mln_ch_value(I, unsigned) parent; - // aux: - mln_ch_value(O, unsigned) parent; + // Output. + mln_ch_value(I, L) output; + L nlabels; + bool status; - labeling_fast(F& f) + // Ctor. + labeling_fastest(F& f) : f(f) { - run(); + trace::entering("canvas::labeling_fastest"); + + init(); + f.init(); // Client initialization. + pass_1(); + pass_2(); + + trace::exiting("canvas::labeling_fastest"); } - void run() - { - // init + void init() { initialize(parent, f.input); - f.nlabels = 0; - f.init(); - // make_set for all points: for (unsigned p = 0; p < parent.ncells(); ++p) - parent[p] = p; + parent[p] = p; // make_set + initialize(output, f.input); + mln::level::fill(output, 0); // FIXME: Use literal::zero. + nlabels = 0; } - // first pass + void pass_1() { mln_bkd_pixter(const I) p(f.input); @@ -205,30 +234,31 @@ } } - // second pass + void pass_2() { mln_fwd_pixter(const I) p(f.input); + for_all(p) if (f.handles(p)) { if (is_root(p)) { if (f.labels(p)) { - if (f.nlabels = mln_max(mln_value(O))) + if (nlabels = mln_max(L)) { - f.status = false; + status = false; return; } - f.output[p] = ++f.nlabels; + output[p] = ++nlabels; } } else - f.output[p] = f.output[parent[p]]; + output[p] = output[parent[p]]; } - f.status = true; + status = true; } - } // end of run() + // Auxiliary methods. bool is_root(unsigned p) const { Index: mln/labeling/blobs.hh --- mln/labeling/blobs.hh (revision 1598) +++ mln/labeling/blobs.hh (working copy) @@ -30,8 +30,8 @@ /*! \file mln/labeling/blobs.hh * - * \brief Connected component labeling of the image objects at a given - * blobs. + * \brief Connected component labeling of the binary objects of a binary + * image using a queue-based algorithm. */ # include <mln/core/concept/image.hh> @@ -55,6 +55,8 @@ * \param[out] nlabels The number of labels. * \return The label image. * + * \pre The input image has to be binary (checked at compile-time). + * * A fast queue is used so that the algorithm is not recursive and * can handle large binary objects (blobs). */ @@ -69,22 +71,13 @@ namespace impl { - // ... - - } // end of namespace mln::labeling::impl - - - // Facade. + namespace generic + { template <typename I, typename N> - inline mln_ch_value(I, unsigned) - blobs(const Image& input_, const Neighborhood<N>& nbh_, unsigned& nlabels) + blobs_(const I& input, const N& nbh, unsigned& nlabels) { - const I& input = exact(input_); - const N& nbh = exact(nbh_); - mln_precondition(input.has_data()); - typedef mln_psite(I) P; P cur; @@ -125,6 +118,39 @@ return output; } + } // end of namespace mln::labeling::impl::generic + + + template <typename I, typename N> + mln_ch_value(I, unsigned) + blobs_(const I& input, const N& nbh, unsigned& nlabels) + { + // The only implementation is the generic one. + return generic::blobs_(input, nbh, nlabels); + } + + } // end of namespace mln::labeling::impl + + + // Facade. + + template <typename I, typename N> + inline + mln_ch_value(I, unsigned) + blobs(const Image& input_, const Neighborhood<N>& nbh_, unsigned& nlabels) + { + trace::entering("labeling::blobs"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.has_data()); + + mln_ch_value(I, unsigned) output = impl::blobs_(input, nbh, nlabels); + + trace::exiting("labeling::blobs"); + return output; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::labeling Index: mln/labeling/flat_zones.hh --- mln/labeling/flat_zones.hh (revision 1598) +++ mln/labeling/flat_zones.hh (working copy) @@ -33,7 +33,9 @@ * \brief Connected component labeling of the flat zones of an image. */ -# include <mln/labeling/base.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> namespace mln @@ -46,15 +48,14 @@ * * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. - * \param[out] output The label image. * \param[out] nlabels The number of labels. - * - * \return The number of labels. + * \return The label image. */ - template <typename I, typename N, typename O> - bool flat_zones(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, - unsigned& nlabels); + template <typename I, typename N, typename L> + mln_ch_value(I, L) + flat_zones(const Image& input, const Neighborhood<N>& nbh, + L& nlabels); + # ifndef MLN_INCLUDE_ONLY @@ -62,47 +63,87 @@ namespace impl { - template <typename I_, typename N_, typename O_> - struct flat_zones_ : base_<I_,N_,O_> + // Flat zone functor for the labeling canvas. + + template <typename I_, typename N_, typename L_> + struct flat_zones_functor { - typedef mln_point(I_) P; + typedef mln_psite(I_) P; // requirements from mln::canvas::labeling: - typedef mln_pset(I_) S; + typedef I_ I; + typedef N_ N; + typedef L_ L; + typedef mln_pset(I) S; + + const I& input; + const N& nbh; const S& s; - mln_value(O) nlabels; - bool status; - inline - bool equiv(const P& n, const P&) const { return input(n) = input(p); } + bool handles(const P&) const { return true; } + bool equiv(const P& n, const P& p) const { return input(n) = input(p); } + + void init() {} + bool labels(const P&) const { return true; } + void do_no_union(const P&, const P&) {} + void init_attr(const P&) {} + void merge_attr(const P&, const P&) {} // end of requirements - inline - flat_zones_(const I_& input, const N_& nbh, O_& output) - : base_<I_,N_,O_>(input, nbh, output), + flat_zones_functor(const I_& input, const N_& nbh) + : input(input), + nbh(nbh), s(input.domain()) {} }; + + // Generic implementation. + + namespace generic + { + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + flat_zones_(const I& input, const N& nbh, L& nlabels) + { + trace::entering("labeling::impl::generic::flat_zones_"); + + typedef flat_zones_functor<I,N,L> F; + F f(input, nbh); + canvas::labeling<F> run(f); + nlabels = run.nlabels; + + trace::exiting("labeling::impl::generic::flat_zones_"); + return run.output; + } + + } // end of namespace mln::labeling::impl::generic + + } // end of namespace mln::labeling::impl + // Facade. - template <typename I, typename N, typename O> - inline - bool flat_zones(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, - unsigned& nlabels) - { - mln_precondition(exact(output).domain() = exact(input).domain()); - typedef impl::flat_zones_<I,N,O> F; - F f(exact(input), exact(nbh), exact(output)); - canvas::labeling<F> run(f); - nlabels = f.nlabels; - return f.status; + template <typename I, typename N, typename L> + mln_ch_value(I, L) + flat_zones(const Image& input_, const Neighborhood<N>& nbh_, + L& nlabels) + { + trace::entering("labeling::flat_zones"); + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.has_data()); + + // Calls the only (generic) impl. + mln_ch_value(I, L) output = impl::generic::flat_zones_(input, nbh, nlabels); + + trace::exiting("labeling::flat_zones"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/labeling/level.hh --- mln/labeling/level.hh (revision 1598) +++ mln/labeling/level.hh (working copy) @@ -35,10 +35,12 @@ */ # include <mln/core/concept/image.hh> -# include <mln/labeling/base.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> # include <mln/level/fill.hh> -# include <mln/border/adjust.hh> -# include <mln/value/other.hh> + +// The 'fastest' specialization is in: +# include <mln/labeling/level.spe.hh> @@ -57,10 +59,11 @@ * \param[out] nlabels The number of labels. * \return The label image. */ - template <typename I, typename N> - mln_ch_value(I, unsigned) + template <typename I, typename N, typename L> + mln_ch_value(I, L) level(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, - unsigned& nlabels); + L& nlabels); + # ifndef MLN_INCLUDE_ONLY @@ -68,125 +71,91 @@ namespace impl { - // Functors. + // Generic functor. - template <typename I_, typename N_, typename O_> - struct level_t : base_<I_,N_,O_> + template <typename I_, typename N_, typename L_> + struct level_functor { - typedef mln_point(I_) P; + typedef mln_psite(I_) P; // requirements from mln::canvas::labeling: - typedef mln_pset(I_) S; + typedef I_ I; + typedef N_ N; + typedef L_ L; + typedef mln_pset(I) S; + + const I& input; + const N& nbh; const S& s; - inline - void init() { mln::level::fill(this->output, 0); } // FIXME: use literal::zero - inline bool handles(const P& p) const { return input(p) = val; } - inline bool equiv(const P& n, const P&) const { return input(n) = val; } + void init() {} + bool labels(const P&) const { return true; } + void do_no_union(const P&, const P&) {} + void init_attr(const P&) {} + void merge_attr(const P&, const P&) {} + // end of requirements const mln_value(I_)& val; - inline - level_t(const I_& input, const mln_value(I_)& val, const N_& nbh, O_& output) - : base_<I_,N_,O_>(input, nbh, output), + level_functor(const I_& input, const mln_value(I_)& val, const N_& nbh) + : input(input), + nbh(nbh), s(input.domain()), val(val) {} }; - // Routines. - template <typename I, typename N> - inline - mln_ch_value(I, unsigned) - level_(trait::image::speed::any, const I& input, - const mln_value(I)& val, const Neighborhood<N>& nbh, - unsigned& nlabels) - { - typedef mln_ch_value(I, unsigned) O; - O output; - initialize(output, input); + // Generic implementation. - typedef impl::level_t<I,N,O> F; - F f(input, val, exact(nbh), output); - canvas::labeling<F> run(f); - - nlabels = f.nlabels; - // FIXME: Handle f.status - return output; - } - - // FIXME: Add fast versions. - - template <typename I_, typename N_, typename O_> - struct level_fast_t : labeling::impl::base_fast_<I_,N_,O_> + namespace generic { - typedef mln_point(I_) P; - - // typedef mln_pset(I_) S; - // const S& s; - - inline - void init() { mln::level::fill(this->output, 0); } - inline - bool handles(unsigned p) const { return this->input[p] = val; } - inline - bool equiv(unsigned n, unsigned) const { return this->input[n] = val; } - - const mln_value(I_)& val; - inline - level_fast_t(const I_& input, const mln_value(I_)& val, const N_& nbh, O_& output) - : labeling::impl::base_fast_<I_,N_,O_>(input, nbh, output), - // s(input.domain()), - val(val) - {} - }; + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_(const I& input, const mln_value(I)& val, const N& nbh, + L& nlabels) + { + trace::entering("labeling::impl::generic::level_"); + typedef level_functor<I,N,L> F; + F f(input, val, nbh); + canvas::labeling<F> run(f); - template <typename I, typename N> - inline - mln_ch_value(I, unsigned) - level_(trait::image::speed::fastest, const I& input, - const mln_value(I)& val, const Neighborhood<N>& nbh, - unsigned& nlabels) - { - typedef mln_ch_value(I, unsigned) O; - typedef level_fast_t<I,N,O> F; - - border::adjust(input, exact(nbh).delta()); - O output; - initialize(output, input); - mln_assertion(output.border() = input.border()); + nlabels = run.nlabels; + // FIXME: Handle run.status - F f(input, val, exact(nbh), output); - canvas::labeling_fast<F> run(f); + trace::exiting("labeling::impl::generic::level_"); + return run.output; + } - // FIXME: Handle f.status + } // end of namespace mln::labeling::impl::generic - nlabels = f.nlabels; - return output; - } } // end of namespace mln::labeling::impl + // Facade. - template <typename I, typename N> - inline - mln_ch_value(I, unsigned) + template <typename I, typename N, typename L> + mln_ch_value(I, L) level(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, - unsigned& nlabels) + L& nlabels) { + trace::entering("labeling::level"); mln_precondition(exact(input).has_data()); - return impl::level_(mln_trait_image_speed(I)(), exact(input), - val, nbh, nlabels); + + mln_ch_value(I, L) output = impl::level_(mln_trait_image_speed(I)(), + exact(input), val, exact(nbh), nlabels); + + trace::exiting("labeling::level"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/labeling/all.hh --- mln/labeling/all.hh (revision 1598) +++ mln/labeling/all.hh (working copy) @@ -47,7 +47,7 @@ } # include <mln/labeling/background.hh> -# include <mln/labeling/base.hh> +# include <mln/labeling/blobs.hh> # include <mln/labeling/estimate.hh> # include <mln/labeling/flat_zones.hh> # include <mln/labeling/foreground.hh> Index: mln/labeling/regional_minima.hh --- mln/labeling/regional_minima.hh (revision 1598) +++ mln/labeling/regional_minima.hh (working copy) @@ -34,7 +34,10 @@ * image. */ -# include <mln/labeling/base.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> +# include <mln/level/fill.hh> # include <mln/level/sort_points.hh> @@ -49,14 +52,14 @@ * * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. - * \param[out] output The label image. - * \param[out] nlabels The number of labels. + * \param[out] nlabels The number of labeled regions. + * \return The label image. * - * \return The number of labels. */ - template <typename I, typename N, typename O> - bool regional_minima(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, unsigned& nlabels); + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_minima(const Image& input, const Neighborhood<N>& nbh, + L& nlabels); @@ -65,58 +68,92 @@ namespace impl { - template <typename I_, typename N_, typename O_> - struct regional_minima_ : base_<I_,N_,O_> + // Generic functor. + + template <typename I_, typename N_, typename L_> + struct regional_minima_functor { - typedef mln_point(I_) P; + typedef mln_psite(I_) P; // requirements from mln::canvas::labeling: + typedef I_ I; + typedef N_ N; + typedef L_ L; typedef p_array S; + + const I& input; + const N& nbh; S s; - inline - void init() { mln::level::fill(this->output, 0); - level::fill(attr, true); } - inline + void init() { level::fill(attr, true); } + bool handles(const P&) const { return true; } bool labels(const P& p) const { return attr(p); } - inline bool equiv(const P& n, const P& p) const { return input(n) = input(p); } - inline void do_no_union(const P& n, const P& p) { mln_invariant(input(n) < input(p)); attr(p) = false; } - inline + void init_attr(const P&) {} void merge_attr(const P& r, const P& p) { attr(p) = attr(p) && attr(r); } // end of requirements - mln_ch_value(O_, bool) attr; + mln_ch_value(I, bool) attr; - inline - regional_minima_(const I_& input, const N_& nbh, O_& output) - : base_<I_,N_,O_>(input, nbh, output), - s(level::sort_points_increasing(input)), - attr(output.domain()) + regional_minima_functor(const I_& input, const N_& nbh) + : input(input), + nbh(nbh), + s(level::sort_points_increasing(input)), // FIXME: sort_psites_increasing + attr(input.domain()) { } }; + + // Generic implementation. + + namespace generic + { + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_minima_(const I& input, const N& nbh, + L& nlabels) + { + trace::entering("labeling::impl::generic::regional_minima_"); + + typedef impl::regional_minima_functor<I,N,L> F; + F f(input, nbh); + canvas::labeling<F> run(f); + nlabels = run.nlabels; + + trace::exiting("labeling::impl::generic::regional_minima_"); + return run.output; + } + + } // end of namespace mln::labeling::impl::generic + + } // end of namespace mln::labeling::impl + // Facade. - template <typename I, typename N, typename O> - inline - bool regional_minima(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, unsigned& nlabels) - { - mln_precondition(exact(output).domain() = exact(input).domain()); - typedef impl::regional_minima_<I,N,O> F; - F f(exact(input), exact(nbh), exact(output)); - canvas::labeling<F> run(f); - nlabels = f.nlabels; - return f.status; + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_minima(const Image& input_, const Neighborhood<N>& nbh_, + L& nlabels) + { + trace::entering("labeling::regional_minima"); + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.has_data()); + + // Calls the only (generic) impl. + mln_ch_value(I, L) output = impl::generic::regional_minima_(input, nbh, nlabels); + + trace::exiting("labeling::regional_minima"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/labeling/foreground.hh --- mln/labeling/foreground.hh (revision 1598) +++ mln/labeling/foreground.hh (working copy) @@ -50,6 +50,13 @@ * \param[in] nbh The neighborhood to consider. * \param[out] nlabels The number of labels. * \return The label image. + * + * \pre The input image has to be binary (checked at compile-time). + * + * This routine actually calls mln::labeling::level with the level + * value set to \c true. + * + * \see mln::labeling::level */ template <typename I, typename N> mln_ch_value(I, unsigned) @@ -65,8 +72,14 @@ foreground(const Image& input, const Neighborhood<N>& nbh, unsigned& nlabels) { + trace::entering("labeling::foreground"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); mln_precondition(exact(input).has_data()); - return labeling::level(input, true, nbh, nlabels); + + mln_ch_value(I, unsigned) output = labeling::level(input, true, nbh, nlabels); + + trace::exiting("labeling::foreground"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/labeling/regional_maxima.hh --- mln/labeling/regional_maxima.hh (revision 1598) +++ mln/labeling/regional_maxima.hh (working copy) @@ -34,7 +34,10 @@ * image. */ -# include <mln/labeling/base.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> +# include <mln/level/fill.hh> # include <mln/level/sort_points.hh> @@ -49,14 +52,14 @@ * * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. - * \param[out] output The label image. * \param[out] nlabels The number of labeled regions. + * \return The label image. * - * \return The number of labels. */ - template <typename I, typename N, typename O> - bool regional_maxima(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, unsigned& nlabels); + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_maxima(const Image& input, const Neighborhood<N>& nbh, + L& nlabels); @@ -65,58 +68,92 @@ namespace impl { - template <typename I_, typename N_, typename O_> - struct regional_maxima_ : base_<I_,N_,O_> + // Generic functor. + + template <typename I_, typename N_, typename L_> + struct regional_maxima_functor { - typedef mln_point(I_) P; + typedef mln_psite(I_) P; // requirements from mln::canvas::labeling: + typedef I_ I; + typedef N_ N; + typedef L_ L; typedef p_array S; + + const I& input; + const N& nbh; S s; - inline - void init() { mln::level::fill(this->output, 0); - level::fill(attr, true); } - inline + void init() { level::fill(attr, true); } + bool handles(const P&) const { return true; } bool labels(const P& p) const { return attr(p); } - inline bool equiv(const P& n, const P& p) const { return input(n) = input(p); } - inline void do_no_union(const P& n, const P& p) { mln_invariant(input(n) > input(p)); attr(p) = false; } - inline + void init_attr(const P&) {} void merge_attr(const P& r, const P& p) { attr(p) = attr(p) && attr(r); } // end of requirements - mln_ch_value(O_, bool) attr; + mln_ch_value(I, bool) attr; - inline - regional_maxima_(const I_& input, const N_& nbh, O_& output) - : base_<I_,N_,O_>(input, nbh, output), - s(level::sort_points_decreasing(input)), - attr(output.domain()) + regional_maxima_functor(const I_& input, const N_& nbh) + : input(input), + nbh(nbh), + s(level::sort_points_decreasing(input)), // FIXME: sort_psites_decreasing + attr(input.domain()) { } }; + + // Generic implementation. + + namespace generic + { + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_maxima_(const I& input, const N& nbh, + L& nlabels) + { + trace::entering("labeling::impl::generic::regional_maxima_"); + + typedef impl::regional_maxima_functor<I,N,L> F; + F f(input, nbh); + canvas::labeling<F> run(f); + nlabels = run.nlabels; + + trace::exiting("labeling::impl::generic::regional_maxima_"); + return run.output; + } + + } // end of namespace mln::labeling::impl::generic + + } // end of namespace mln::labeling::impl + // Facade. - template <typename I, typename N, typename O> - inline - bool regional_maxima(const Image& input, const Neighborhood<N>& nbh, - Image<O>& output, unsigned& nlabels) - { - mln_precondition(exact(output).domain() = exact(input).domain()); - typedef impl::regional_maxima_<I,N,O> F; - F f(exact(input), exact(nbh), exact(output)); - canvas::labeling<F> run(f); - nlabels = f.nlabels; - return f.status; + template <typename I, typename N, typename L> + mln_ch_value(I, L) + regional_maxima(const Image& input_, const Neighborhood<N>& nbh_, + L& nlabels) + { + trace::entering("labeling::regional_maxima"); + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.has_data()); + + // Calls the only (generic) impl. + mln_ch_value(I, L) output = impl::generic::regional_maxima_(input, nbh, nlabels); + + trace::exiting("labeling::regional_maxima"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/labeling/level.spe.hh --- mln/labeling/level.spe.hh (revision 0) +++ mln/labeling/level.spe.hh (revision 0) @@ -0,0 +1,175 @@ +// Copyright (C) 2007 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_LABELING_LEVEL_SPE_HH +# define MLN_LABELING_LEVEL_SPE_HH + +/*! \file mln/labeling/level.spe.hh + * + * \brief Specialization for mln::labeling::level. + */ + +# include <mln/border/adjust.hh> +# include <mln/border/fill.hh> +# include <mln/value/other.hh> + + + +namespace mln +{ + + namespace labeling + { + + /*! Connected component labeling of the image objects at a given + * level. + * + * \param[in] input The input image. + * \param[in] val The level to consider for the labeling. + * \param[in] nbh The neighborhood. + * \param[out] nlabels The number of labels. + * \return The label image. + */ + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + L& nlabels); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + // Fwd decl of the Generic version. + + namespace generic + { + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_(const I& input, const mln_value(I)& val, const N& nbh, + L& nlabels); + + } // end of namespace mln::labeling::impl::generic + + + + // Fastest functor. + + template <typename I_, typename N_, typename L_> + struct level_fastest_functor + { + // requirements from mln::canvas::labeling: + + typedef I_ I; + typedef N_ N; + typedef L_ L; + typedef mln_pset(I) S; + + const I& input; + const N& nbh; + const S& s; + + bool handles(unsigned p) const { return input[p] = val; } + bool equiv(unsigned n, unsigned) const { return input[n] = val; } + + void init() {} + bool labels(unsigned) const { return true; } + void do_no_union(unsigned, unsigned) {} + void init_attr(unsigned) {} + void merge_attr(unsigned, unsigned) {} + + // end of requirements + + const mln_value(I_)& val; + + level_fastest_functor(const I_& input, const mln_value(I_)& val, const N_& nbh) + : input(input), + nbh(nbh), + s(input.domain()), + val(val) + {} + }; + + + // Fastest routine. + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_fastest_(const I& input, const mln_value(I)& val, const N& nbh, + L& nlabels) + { + trace::entering("labeling::impl::level_fastest_"); + + border::adjust(input, nbh.delta()); + border::fill(input, value::other(val)); + + typedef level_fastest_functor<I,N,L> F; + F f(input, val, nbh); + canvas::labeling_fastest<F> run(f); + + nlabels = run.nlabels; + // FIXME: Handle run.status + + trace::exiting("labeling::impl::level_fastest_"); + return run.output; + } + + + // Disjunction between "fastest" and "not fastest". + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_(trait::image::speed::any, + const I& input, const mln_value(I)& val, const N& nbh, + L& nlabels) + { + return generic::level_(input, val, nbh, nlabels); + } + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_(trait::image::speed::fastest, + const I& input, const mln_value(I)& val, const N& nbh, + L& nlabels) + { + return level_fastest_(input, val, nbh, nlabels); + } + + + } // end of namespace mln::labeling::impl + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + + +#endif // ! MLN_LABELING_LEVEL_SPE_HH Index: mln/labeling/background.hh --- mln/labeling/background.hh (revision 1598) +++ mln/labeling/background.hh (working copy) @@ -43,13 +43,20 @@ namespace labeling { - /*! Connected component labeling of the background in a binary - * image. + /*! Connected component labeling of the background part in a + * binary image. * * \param[in] input The input image. * \param[in] nbh The neighborhood to consider. * \param[out] nlabels The number of labels. * \return The label image. + * + * \pre The input image has to be binary (checked at compile-time). + * + * This routine actually calls mln::labeling::level with the level + * value set to \c false. + * + * \see mln::labeling::level */ template <typename I, typename N> mln_ch_value(I, unsigned) @@ -65,8 +72,14 @@ background(const Image& input, const Neighborhood<N>& nbh, unsigned& nlabels) { + trace::entering("labeling::background"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); mln_precondition(exact(input).has_data()); - return labeling::level(input, false, nbh, nlabels); + + mln_ch_value(I, unsigned) output = labeling::level(input, false, nbh, nlabels); + + trace::exiting("labeling::background"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: img/README --- img/README (revision 0) +++ img/README (revision 0) @@ -0,0 +1,8 @@ + -*- outline -*- + +* tiny.pgm + +lena 16x16, graylevel / 8bit + +it was obtained by running the command: +convert -geometry 3.125% lena.pgm tiny.pgm Index: sandbox/geraud/estimate.hh --- sandbox/geraud/estimate.hh (revision 1593) +++ sandbox/geraud/estimate.hh (working copy) @@ -33,8 +33,13 @@ * \brief Compute the estimate pixel value. */ -# include <mln/core/image_if_value.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> + # include <mln/accu/compute.hh> +// # include <mln/core/image_if_value.hh> + namespace mln @@ -43,28 +48,36 @@ namespace labeling { - /*! \brief FIXME: Compute an estimate over the pixels of image \p - * input with value \p val. + /*! \brief Label a binary image and compute some estimations over + * the components. * * \param[in] input The image. - * \param[in] val value. - * \result The estimate value. + * + * The free parameter \c A is a type of accumulator. + * + * FIXME: Not yet impled. */ template <typename A, typename I> - mln_accu_with(A, util::pix)::result - estimate(const Image& input, const mln_value(I)& val); + void + estimate(const Image& input); # ifndef MLN_INCLUDE_ONLY template <typename A, typename I> - inline - mln_accu_with(A, util::pix)::result - estimate(const Image& input, const mln_value(I)& val) + void + estimate(const Image& input) { -// void* v = (input | val); -// return 0; - return accu::compute<A>(input | val); + trace::entering("labeling::estimate"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); + mln_precondition(exact(input).has_data()); + + std::cerr << "Sorry: mln::labeling::estimate is not yet implemented!" << std::endl; + + // FIXME: Was: + // mln_accu_with(A, util::pix)::result res = accu::compute<A>(input | val); + + trace::exiting("labeling::estimate"); } # endif // ! MLN_INCLUDE_ONLY

1 0

milena r1598: Add 1d version for border::mirror
by Guillaume Duhamel 06 Dec '07

06 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-06 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add 1d version for border::mirror. * mln/border/mirror.hh: Add 1d version for this algorithm. Update tests * tests/border/mirror.cc, * tests/border/mirror_full.cc: Fix typo and add test for this. --- mln/border/mirror.hh | 72 ++++++++++++++++++++++++++++++++------------ tests/border/mirror.cc | 22 ++++++++++++- tests/border/mirror_full.cc | 4 +- 3 files changed, 75 insertions(+), 23 deletions(-) Index: trunk/milena/tests/border/mirror_full.cc =================================================================== --- trunk/milena/tests/border/mirror_full.cc (revision 1597) +++ trunk/milena/tests/border/mirror_full.cc (revision 1598) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border/duplicate_full.cc +/*! \file tests/border/mirror_full.cc * - * \brief Tests on mln::border::duplicate. + * \brief Tests on mln::border::mirror. */ #include <mln/core/image1d.hh> Index: trunk/milena/tests/border/mirror.cc =================================================================== --- trunk/milena/tests/border/mirror.cc (revision 1597) +++ trunk/milena/tests/border/mirror.cc (revision 1598) @@ -25,20 +25,38 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/border_duplicate/test_border_duplicate_image2d_1.cc +/*! \file tests/border/mirror.cc * - * \brief Tests on mln::border::duplicate. + * \brief Tests on mln::border::mirror. */ +#include <mln/core/image1d.hh> #include <mln/core/image2d.hh> #include <mln/debug/iota.hh> #include <mln/border/mirror.hh> +#include <mln/debug/println_with_border.hh> + using namespace mln; int main (void) { + { + image1d<int> im(2, 3); + debug::iota(im); + border::mirror(im); + mln_assertion(im[0] == 2); + mln_assertion(im[1] == 2); + mln_assertion(im[2] == 1); + mln_assertion(im[3] == 1); + mln_assertion(im[4] == 2); + mln_assertion(im[5] == 2); + mln_assertion(im[6] == 1); + mln_assertion(im[7] == 1); + } + + image2d<int> ima(2, 3, 2); debug::iota(ima); Index: trunk/milena/mln/border/mirror.hh =================================================================== --- trunk/milena/mln/border/mirror.hh (revision 1597) +++ trunk/milena/mln/border/mirror.hh (revision 1598) @@ -34,6 +34,10 @@ * mirroring effect. */ +# include <mln/core/image1d.hh> +# include <mln/core/image2d.hh> +# include <mln/core/image3d.hh> + # include <mln/core/concept/image.hh> # include <mln/core/internal/fixme.hh> # include <mln/core/internal/fixme.hh> @@ -41,7 +45,7 @@ # include <mln/geom/max_row.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_col.hh> - +# include <mln/geom/ninds.hh> namespace mln { @@ -56,7 +60,7 @@ * * \pre \p ima has to be initialized. * - * \todo Implement 1d and 3d version + optimize with memset if possible. + * \todo Implement 3d version + optimize with memset if possible. */ template <typename I> void mirror(const Image& ima); @@ -69,16 +73,51 @@ template <typename I> inline - void mirror_1d_(const I& ima) + void mirror_(const box1d&, const I& ima) { - mln::internal::fixme(); + trace::entering("border::impl::mirror_"); + + std::size_t border = ima.border (); + std::size_t nbinds = geom::ninds(ima); + std::size_t min; + + if (border > nbinds) + min = nbinds; + else + min = border; + + /// left border + { + std::size_t i = 0; + for (; i < min; ++i) + const_cast<I&>(ima)[border - 1 - i] = ima(point1d(i)); + + for (; i < border; ++i) + const_cast<I&>(ima)[border - 1 - i] = ima(point1d(min - 1)); + } + + /// right border + { + std::size_t i = 0, + j = nbinds - 1; + for (; + i < min; + ++i, --j) + const_cast<I&>(ima)[border + nbinds + i] = ima(point1d(j)); + ++j; + for (; + i < border; + ++i) + const_cast<I&>(ima)[border + nbinds + i] = ima(point1d(j)); + } + trace::exiting("border::impl::mirror_"); } template <typename I> inline - void mirror_2d_(const I& ima) + void mirror_(const box2d&, const I& ima) { - trace::entering("border::impl::mirror_2d_"); + trace::entering("border::impl::mirror_"); std::size_t border = ima.border (); std::size_t nbrows = geom::max_row(ima) - geom::min_row(ima); @@ -87,24 +126,24 @@ std::size_t start = real_nbcols * border + border; std::size_t s = start; - // duplicate top left corner + // mirror top left corner for (std::size_t i = 0; i < border; ++i) for (std::size_t j = 0; j < border; ++j) const_cast<I&>(ima)[i * ((nbcols + 1) + 2 * border) + j] = ima[s]; - // duplicate top left corner + // mirror top left corner s = start + nbcols; for (std::size_t i = 0; i < border; ++i) for (std::size_t j = 1; j <= border; ++j) const_cast<I&>(ima)[i * ((nbcols + 1) + 2 * border) + (nbcols + border + j)] = ima[s]; - // duplicate bottom left corner + // mirror bottom left corner s = start + (nbrows * real_nbcols); for (std::size_t i = 1; i <= border; ++i) for (std::size_t j = 1; j <= border; ++j) const_cast<I&>(ima)[s - i + (j * (real_nbcols))] = ima[s]; - // duplicate bottom right corner + // mirror bottom right corner s = start + (nbrows * real_nbcols) + nbcols; for (std::size_t i = 1; i <= border; ++i) for (std::size_t j = 1; j <= border; ++j) @@ -134,18 +173,18 @@ for (std::size_t j = 1; j <= border; ++j) const_cast<I&>(ima)[s + i + (j * real_nbcols)] = ima[s + i - ((j - 1)* real_nbcols)]; - trace::exiting("border::impl::mirror_2d_"); + trace::exiting("border::impl::mirror_"); } template <typename I> inline - void mirror_3d_(const I& ima) + void mirror_(const box3d&, const I& ima) { mln::internal::fixme(); } - } // end of namespace mln::border::mirror + } // end of namespace mln::border::impl template <typename I> @@ -164,12 +203,7 @@ if (!ima.border ()) return; - if (P::dim == 1) - impl::mirror_1d_(ima); - if (P::dim == 2) - impl::mirror_2d_(ima); - if (P::dim == 3) - impl::mirror_3d_(ima); + impl::mirror_(ima.bbox(), ima); trace::exiting("border::mirror"); }

1 0

milena r1597: Fix doxygen header of value tests
by Matthieu Garrigues 06 Dec '07

06 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-06 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix doxygen header of value tests. * bool.cc, * builtin.cc, * equiv.cc, * float01.cc, * float01_bis.cc, * float01_f.cc, * int_s.cc, * int_s16.cc, * int_u8.cc, * interop.cc, * label.cc, * quat.cc, * rgb8.cc, * rgb_full.cc, * scalar.cc, * set.cc: Fix doxygen headers. * Makefile.am: Disable check_full_PROGRAMS to pass ./bootstrap. * graylevel.cc: Rename as... * graylevel_full.cc: ...this. --- Makefile.am | 11 + bool.cc | 2 builtin.cc | 2 equiv.cc | 2 float01.cc | 2 float01_bis.cc | 27 +-- float01_f.cc | 2 graylevel_full.cc | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ int_s.cc | 2 int_s16.cc | 2 int_u8.cc | 2 interop.cc | 2 label.cc | 2 quat.cc | 2 rgb8.cc | 2 rgb_full.cc | 3 scalar.cc | 2 set.cc | 2 18 files changed, 404 insertions(+), 35 deletions(-) Index: trunk/milena/tests/value/graylevel.cc (deleted) =================================================================== Index: trunk/milena/tests/value/set.cc =================================================================== --- trunk/milena/tests/value/set.cc (revision 1596) +++ trunk/milena/tests/value/set.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_set.cc +/*! \file tests/value/set.cc * * \brief Tests on mln::value::set_<T>. */ Index: trunk/milena/tests/value/bool.cc =================================================================== --- trunk/milena/tests/value/bool.cc (revision 1596) +++ trunk/milena/tests/value/bool.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_bool.cc +/*! \file tests/value/bool.cc * * \brief Tests on mln::value::set. */ Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 1596) +++ trunk/milena/tests/value/rgb_full.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_rgb.cc +/*! \file tests/value/rgb.cc * * \brief Tests on mln::value::rgb. */ @@ -55,6 +55,7 @@ V1.green() OP V2 , \ V1.blue() OP V2 \ ) + // Interop between 2 rgbs. #define test_interop(T1, T2, OP, V1, V2) \ { \ Index: trunk/milena/tests/value/rgb8.cc =================================================================== --- trunk/milena/tests/value/rgb8.cc (revision 1596) +++ trunk/milena/tests/value/rgb8.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_rgb8.cc +/*! \file tests/value/rgb8.cc * * \brief Tests on mln::value::rgb8. */ Index: trunk/milena/tests/value/float01_bis.cc =================================================================== --- trunk/milena/tests/value/float01_bis.cc (revision 1596) +++ trunk/milena/tests/value/float01_bis.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_float01_bis.cc +/*! \file tests/value/float01_bis.cc * * \brief Tests on mln::value::float01. */ @@ -38,21 +38,16 @@ { using namespace mln::value; -// float01_8 a; + float01_8 a; - std::cout << "a = " << std::endl; - std::cout << "testsetestest\n"<< std::endl; + gl8 a = white; + gl16 b = white; + assert((a == b) == true); + gl8 c = (a + b) / 2; + assert(c == white); + c = a; + assert(c == white); -// gl8 a = white; -// gl16 b = white; -// assert((a == b) == true); -// gl8 c = (a + b) / 2; -// assert(c == white); -// c = a; -// assert(c == white); - -// c = (a * 2) / 2; -// assert(c == white); - - std::cout << "testsetestest\n"<< std::endl; + c = (a * 2) / 2; + assert(c == white); } Index: trunk/milena/tests/value/scalar.cc =================================================================== --- trunk/milena/tests/value/scalar.cc (revision 1596) +++ trunk/milena/tests/value/scalar.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_scalar.cc +/*! \file tests/value/scalar.cc * * \brief Tests on mln::value::scalar. */ Index: trunk/milena/tests/value/int_u8.cc =================================================================== --- trunk/milena/tests/value/int_u8.cc (revision 1596) +++ trunk/milena/tests/value/int_u8.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_int_u8.cc +/*! \file tests/value/int_u8.cc * * \brief Tests on mln::value::int_u8. */ Index: trunk/milena/tests/value/float01.cc =================================================================== --- trunk/milena/tests/value/float01.cc (revision 1596) +++ trunk/milena/tests/value/float01.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_float01.cc +/*! \file tests/value/float01.cc * * \brief Tests on mln::value::float01. */ Index: trunk/milena/tests/value/builtin.cc =================================================================== --- trunk/milena/tests/value/builtin.cc (revision 1596) +++ trunk/milena/tests/value/builtin.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_builtin.cc +/*! \file tests/value/builtin.cc * * \brief Tests on mln::trait::op with a builtin. */ Index: trunk/milena/tests/value/quat.cc =================================================================== --- trunk/milena/tests/value/quat.cc (revision 1596) +++ trunk/milena/tests/value/quat.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_quat.cc +/*! \file tests/value/quat.cc * * \brief Tests on mln::value::quat. */ Index: trunk/milena/tests/value/float01_f.cc =================================================================== --- trunk/milena/tests/value/float01_f.cc (revision 1596) +++ trunk/milena/tests/value/float01_f.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_float01_f.cc +/*! \file tests/value/float01_f.cc * * \brief Tests on mln::value::float01_f. */ Index: trunk/milena/tests/value/graylevel_full.cc =================================================================== --- trunk/milena/tests/value/graylevel_full.cc (revision 0) +++ trunk/milena/tests/value/graylevel_full.cc (revision 1597) @@ -0,0 +1,370 @@ +// Copyright (C) 2007 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/value/graylevel_full.cc + * + * \brief Tests on mln::value::graylevel. Tests operations between + * graylevel of different encodings. + * + */ + +#include <mln/value/graylevel2.hh> +#include <mln/value/int_u8.hh> + +#include <mln/literal/black.hh> +#include <mln/literal/white.hh> + + + +int main() +{ + using namespace mln::value; + + using mln::literal::white; + using mln::literal::black; + + gl8 a = 255; + gl8 b = 255; + + // Constructions + { + gl8 x; + + gl8 a = 12; + gl8 b(12); + mln_assertion(a == b); + + { + gl16 c = 2335; + gl8 d = c; + mln_assertion(c == d); + } + + gl8 d = 250; + gl16 c = d; + mln_assertion(c == d); + + gl8 e = gray(white); + std::cout << e << std::endl; + std::cout << gray(white) << std::endl; + + mln_assertion(gray(e) == gray(white)); + + gl8 f = 12; + gl8 g = f; + gl8 h(f); + + mln_assertion(f == g); + mln_assertion(h == g); + } + + // Literals + { + gl8 a(white); + gl16 b(white); + + mln_assertion(a == b); + mln_assertion(a.value() == float(255)); + mln_assertion(b.value() == float(65535)); + mln_assertion(a == white); + mln_assertion(b == white); + + gl8 c(white); + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + + a = black; + b = black; + + mln_assertion(a == b); + mln_assertion(a.value() == float(0)); + mln_assertion(b.value() == float(0)); + } + + // Assigment + { + gl8 a; + gl16 b; + + a = white; + mln_assertion(a == white); + mln_assertion(a.value() == float(255)); + + a = 23; + mln_assertion(a != white); + mln_assertion(a != black); + mln_assertion(a.value() == float(23)); + + b = 2; + mln_assertion(b != white); + mln_assertion(b != black); + mln_assertion(b.value() == float(2)); + + a = b; + mln_assertion(a.value() == float(2 / 257)); + + signed char c = 51; + a = c; + mln_assertion(a.value() == float(51)); + + // bounds + a = 255; + mln_assertion(a.value() == float(255)); + a = 0; + mln_assertion(a.value() == float(0)); + } + + // Addition + { + gl8 a; + gl16 b; + + // gl8 <- gl8 + gl8 + a = 42; + a += a; + mln_assertion(a.value() == float(84)); + + a = 42; + a = a + a; + mln_assertion(a.value() == float(84)); + + // gl8 <- gl8 + gl16 + a = 42; + b = 16969; + a = a + b; + mln_assertion(a.value() == float((42 + b.value() / 257) )); + a = 42; + b = 16969; + a += b; + mln_assertion(a.value() == float((42 + b.value() / 256) )); + + + // gl16 <- gl8 + gl16 + a = 42; + b = 16969; + b += a; + std::cout << "b = " << b << std::endl; + std::cout << "res = " << float(42 * 256 + 128 + 16969) << std::endl; + mln_assertion(b.value() == float((42 * 256 + 128 + 16969) )); + + a = 42; + b = 16969; + b = a + b; + mln_assertion(b.value() == float((42 * 256 + 128 + 16969) )); + + // misc + a = 255; + b = 0; + a = a + b; + mln_assertion(a.value() == float(255)); + + a = 0; + b = 65535; + //FIXME for tomorow: this doesn't work. + a = a + b; + std::cout << "a = " << a << std::endl; + std::cout << "a + b = " << a + b << std::endl; + mln_assertion(a.value() == float(255)); + } + + + // Soustraction + { + gl8 a; + gl16 b; + + // gl8 <- gl8 - gl8 + a = 42; + a -= a; + mln_assertion(a == black); + + a = 42; + a = a - a; + mln_assertion(a == black); + + // gl8 <- gl8 - gl16 + a = 42; + b = 5969; + + a = b; + std::cout << "a.value() = " << int(a.value()) << std::endl; + std::cout << "should be " << (b.value() / 256) << std::endl; + + { + a = 42; + gl8 t; + t = a - b; + t = t + b; + std::cout << t << " == " << a << std::endl; + mln_assertion(a == t); + } + + a = 42; + a = a - b; + std::cout << int(a.value()) << ":" << floor(42 - b.value() / 256.0) << std::endl; + mln_assertion(a.value() == float((42 - b.value() / 256) )); + a = 42; + b = 9969; + a -= b; + mln_assertion(a.value() == float((42 - round(float(b.value()) / 256)) )); + + + // gl16 <- gl8 - gl16 + a = 100; + b = 30969; + b -= a; + mln_assertion(b.value() == float(30969 - 100 * 256)); + + a = 100; + b = 20969; + b = a - b; + mln_assertion(b.value() == float((100 * 256 - 20969) )); + + // misc + a = 255; + b = 0; + a = a - b; + mln_assertion(a.value() == float(255)); + + a = 255; + b = 65535; + a = a - b; + mln_assertion(a.value() == float(0)); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a - b; + d = a - b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 42; + gl16 b = 5969; + gl8 p; + p = b; + gl8 q; + gl8 r; + + q = a - p; + r = a - b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } + + // Multiplication + { + gl8 a; + gl16 b; + + // gl8 <- gl8 * gl8 + a = 8; + a *= a; + std::cout << a << std::endl; + mln_assertion(a.value() == 42); + + a = 21; + a = a * a; + mln_assertion(a.value() == 42); + + // gl8 <- gl8 * gl16 + a = 10; + b = 5969; + a = a * b; + mln_assertion(a.value() == float((10 * b.value() / 256) )); + + a = 10; + b = 16969; + a *= b; + mln_assertion(a.value() == float((10 * b.value() / 256) )); + + + // gl16 <- gl8 * gl16 + a = 10; + b = 5969; + b *= a; + mln_assertion(b.value() == float((10 * 256 * 5969) )); + + a = 10; + b = 5969; + b = a * b; + mln_assertion(b.value() == float((10 * 256 * 5969) )); + + // misc + a = 255; + b = 0; + a = a * b; + mln_assertion(a == black); + + a = 0; + b = 65535; + a = a * b; + mln_assertion(a == black); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a * b; + d = a * b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 7; + gl16 b = 5969; + + gl8 p; + p = b; + + gl8 q; + gl8 r; + + q = a * p; + r = a * b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } +} Index: trunk/milena/tests/value/int_s.cc =================================================================== --- trunk/milena/tests/value/int_s.cc (revision 1596) +++ trunk/milena/tests/value/int_s.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_int_s.cc +/*! \file tests/value/int_s.cc * * \brief Tests on mln::value::int_s. */ Index: trunk/milena/tests/value/label.cc =================================================================== --- trunk/milena/tests/value/label.cc (revision 1596) +++ trunk/milena/tests/value/label.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_label.cc +/*! \file tests/value/label.cc * * \brief Tests on mln::value::label. */ Index: trunk/milena/tests/value/interop.cc =================================================================== --- trunk/milena/tests/value/interop.cc (revision 1596) +++ trunk/milena/tests/value/interop.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_interop.cc +/*! \file tests/value/interop.cc * * \brief Tests interoperability on mln::value::*. */ Index: trunk/milena/tests/value/int_s16.cc =================================================================== --- trunk/milena/tests/value/int_s16.cc (revision 1596) +++ trunk/milena/tests/value/int_s16.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_int_s16.cc +/*! \file tests/value/int_s16.cc * * \brief Tests on mln::value::int_s16. */ Index: trunk/milena/tests/value/Makefile.am =================================================================== --- trunk/milena/tests/value/Makefile.am (revision 1596) +++ trunk/milena/tests/value/Makefile.am (revision 1597) @@ -24,8 +24,9 @@ scalar \ set -check_full_PROGRAMS = \ - rgb_full +# FIXME: activate when make check_full will work. +# check_full_PROGRAMS = \ +# rgb_full bool_SOURCES = bool.cc builtin_SOURCES = builtin.cc @@ -44,7 +45,9 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc -rgb_full_SOURCES = rgb_full.cc +# FIXME: activate when make check_full will work. +# rgb_full_SOURCES = rgb_full.cc TESTS = $(check_PROGRAMS) -TESTS_FULL = $(check_full_PROGRAMS) +# FIXME: activate when make check_full will work. +# TESTS_FULL = $(check_full_PROGRAMS) Index: trunk/milena/tests/value/equiv.cc =================================================================== --- trunk/milena/tests/value/equiv.cc (revision 1596) +++ trunk/milena/tests/value/equiv.cc (revision 1597) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_equiv.cc +/*! \file tests/value/equiv.cc * * \brief Tests on mln::value::equiv. *

1 0

milena r1596: Add new full tests for level subdirectory
by Guillaume Duhamel 06 Dec '07

06 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-06 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add new full tests for level subdirectory. * tests/level/apply_full.cc, * tests/level/paste_full.cc, * tests/level/saturate_full.cc, * tests/level/sort_points_full.cc, * tests/level/stretch_full.cc, * tests/level/transform_full.cc: New full tests for level. * mln/fun/v2v/saturate.hh: Fix bug but need to review. * mln/level/paste.spe.hh: Add comment. --- mln/fun/v2v/saturate.hh | 14 + mln/level/paste.spe.hh | 1 tests/level/apply_full.cc | 172 +++++++++++++++++++++ tests/level/paste_full.cc | 280 +++++++++++++++++++++++++++++++++++ tests/level/saturate_full.cc | 241 ++++++++++++++++++++++++++++++ tests/level/sort_points_full.cc | 318 ++++++++++++++++++++++++++++++++++++++++ tests/level/stretch_full.cc | 174 +++++++++++++++++++++ tests/level/transform_full.cc | 165 ++++++++++++++++++++ 8 files changed, 1363 insertions(+), 2 deletions(-) Index: trunk/milena/tests/level/transform_full.cc =================================================================== --- trunk/milena/tests/level/transform_full.cc (revision 0) +++ trunk/milena/tests/level/transform_full.cc (revision 1596) @@ -0,0 +1,165 @@ +// Copyright (C) 2007 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/transform_full.cc + * + * \brief Tests on mln::level::transform + */ + +#include <cmath> + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/literal/origin.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + +#include <mln/level/fill.hh> +#include <mln/level/transform.hh> + +#include <mln/debug/iota.hh> + +#include <mln/arith/plus.hh> + + + + +struct mysqrt : mln::Function_v2v<mysqrt> +{ + typedef unsigned short result; + result operator()(int c) const + { + return result(c % 42); + } +}; + + +namespace mln +{ + template <typename I> + void + chck(const Image& ref_) + { + const I& ref = exact(ref_); + + I out (ref.domain()); + { + level::transform(ref, mysqrt(), out); + mln_piter(I) p (ref.domain ()); + for_all(p) + mln_assertion ((mln_value(I))(ref(p) % 42) == out(p) ); + } + } + + template <typename V> + void + chk() + { + unsigned sli = 4; + unsigned row = 16; + unsigned col = 64; + + + (std::cerr << "in 1d ... ").flush (); + { + typedef image1d<V> I; + typedef sub_image<I, box1d> J; + + for (unsigned i = 1; i < col; ++i) + { + I ima(i); + debug::iota(ima); + chck (ima); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + typedef image2d<V> I; + + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I ima(j, i); + debug::iota(ima); + chck (ima); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + typedef image3d<V> I; + + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I ima(k, j, i); + debug::iota(ima); + chck (ima); + } + } + std::cerr << "OK" << std::endl; + } + +} + + + + + +int main() +{ + using namespace mln; + + std::cerr << "Tests level::transform:" << std::endl; + std::cerr << "on int:" << std::endl; + chk<int>(); + std::cerr << "on unsigned:" << std::endl; + chk<unsigned>(); + std::cerr << "on int_u8:" << std::endl; + chk<value::int_u8>(); + std::cerr << "on int_u16:" << std::endl; + chk<value::int_u16>(); + std::cerr << "on int_s8:" << std::endl; + chk<value::int_s8>(); + std::cerr << "on int_s16:" << std::endl; + chk<value::int_s16>(); +} + Index: trunk/milena/tests/level/apply_full.cc =================================================================== --- trunk/milena/tests/level/apply_full.cc (revision 0) +++ trunk/milena/tests/level/apply_full.cc (revision 1596) @@ -0,0 +1,172 @@ +// Copyright (C) 2007 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/apply_full.cc + * + * \brief Tests on mln::level::apply. + */ + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/core/clone.hh> +#include <mln/level/apply.hh> +#include <mln/debug/iota.hh> + +#include <mln/debug/println.hh> + +struct qrde : mln::Function_v2v<qrde> +{ + typedef unsigned short result; + result operator()(int c) const + { + return result(c % 42); + } +}; + + +namespace mln +{ + template <typename I> + void + chck(I& ref) + { + I out = clone (ref); + + mln_piter(I) p (ref.domain ()); + + { + level::apply(out, qrde()); + + for_all(p) + mln_assertion((mln_value(I))(ref(p) % 42) == out(p)); + } + + } + + template <typename I> + void + chk1d(unsigned cols) + { + image1d ima (cols); + debug::iota (ima); + chck(ima); + } + + template <typename I> + void + chk2d(unsigned rows, + unsigned cols) + { + image2d ima (rows, cols); + debug::iota (ima); + chck(ima); + } + + template <typename I> + void + chk3d(unsigned slis, + unsigned rows, + unsigned cols) + { + image3d ima (slis, rows, cols); + debug::iota (ima); + chck(ima); + } + +} + + +int main() +{ + using namespace mln; + + unsigned slis_start = 1; + unsigned slis_end = 3; + + unsigned rows_start = 1; + unsigned rows_end = 8; + + unsigned cols_start = 2; + unsigned cols_end = 256; + + + std::cerr << "Tests level::apply" << std::endl; + + (std::cerr << "in 1d ... ").flush (); + { + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk1d<int>(i); + chk1d<unsigned>(i); + chk1d<value::int_u8>(i); + chk1d<value::int_u16>(i); + chk1d<value::int_s8>(i); + chk1d<value::int_s16>(i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + for (unsigned h = rows_start; h < rows_end; ++h) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk2d<int>(h, i); + chk2d<unsigned>(h, i); + chk2d<value::int_u8>(h, i); + chk2d<value::int_u16>(h, i); + chk2d<value::int_s8>(h, i); + chk2d<value::int_s16>(h, i); + } + } + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 3d ... ").flush (); + { + for (unsigned g = slis_start; g < slis_end; ++g) + for (unsigned h = rows_start; h < rows_end; ++h) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk3d<int>(g, h, i); + chk3d<unsigned>(g, h, i); + chk3d<value::int_u8>(g, h, i); + chk3d<value::int_u16>(g, h, i); + chk3d<value::int_s8>(g, h, i); + chk3d<value::int_s16>(g, h, i); + } + } + std::cerr << "OK" << std::endl; +} Index: trunk/milena/tests/level/paste_full.cc =================================================================== --- trunk/milena/tests/level/paste_full.cc (revision 0) +++ trunk/milena/tests/level/paste_full.cc (revision 1596) @@ -0,0 +1,280 @@ +// Copyright (C) 2007 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/paste_full.cc + * + * \brief Tests on mln::level::paste. + */ + + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/literal/origin.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/debug/iota.hh> + +#include <mln/level/saturate.hh> +#include <mln/level/paste.hh> + + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + + +namespace mln +{ + template <typename I, typename J> + void + chck(Image& input_, Image<J>& output_) + { + typedef mln_value(I) T; + typedef mln_value(J) V; + unsigned max_i = mln_max (T); + unsigned max_j = mln_max (V); + I& input = exact(input_); + J& output = exact(output_); + + if (max_i > max_j) + level::saturate_inplace(input, 0, (T)max_j); + + level::paste(input, output); + + mln_piter(I) p (input.domain ()); + for_all(p) + mln_assertion ((V)(input(p)) == output(p)); + } + + template <typename I, typename J> + void + chk1d(unsigned cols) + { + box1d b1(literal::origin, point1d(1)); + f_box1d_t f_b1(b1); + + { + image1d input (cols); + debug::iota(input); + image1d<J> output (cols); + chck(input, output); + } + + { + image1d in (cols); + sub_image<image1d, box1d> input (in, b1); + debug::iota(input); + image1d<J> output (cols); + chck(input, output); + } + +// { +// image1d in (cols); +// image_if<image1d, f_box1d_t> input(in, f_b1); +// debug::iota(input); +// image1d<J> output (cols); +// chck(input, output); +// } + } + + template <typename I, typename J> + void + chk2d(unsigned rows, unsigned cols) + { + box2d b2(literal::origin, point2d(1, 1)); + f_box2d_t f_b2(b2); + + { + image2d input (rows, cols); + debug::iota(input); + image2d<J> output (rows, cols); + chck(input, output); + } + + { + image2d in (rows, cols); + sub_image<image2d, box2d> input (in, b2); + debug::iota(input); + image2d<J> output (rows, cols); + chck(input, output); + } + +// { +// image2d in (rows, cols); +// image_if<image2d, f_box2d_t> input(in, f_b2); +// debug::iota(input); +// image2d<J> output (rows, cols); +// chck(input, output); +// } + } + + template <typename I, typename J> + void + chk3d(unsigned slis, unsigned rows, unsigned cols) + { + box3d b3(literal::origin, point3d(1, 1, 1)); + f_box3d_t f_b3(b3); + + { + image3d input (slis, rows, cols); + debug::iota(input); + image3d<J> output (slis, rows, cols); + chck(input, output); + } + + { + image3d in (slis, rows, cols); + sub_image<image3d, box3d> input (in, b3); + debug::iota(input); + image3d<J> output (slis, rows, cols); + chck(input, output); + } + +// { +// image3d in (slis, rows, cols); +// image_if<image3d, f_box3d_t> input(in, f_b3); +// debug::iota(input); +// image3d<J> output (slis, rows, cols); +// chck(input, output); +// } + } + + + template <typename I, typename J> + void + chk(unsigned slis, unsigned rows, unsigned cols) + { + (std::cerr << " in 1d ... ").flush (); + { + for (unsigned i = 2; i < cols; ++i) + chk1d<I, J>(i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 2d ... ").flush (); + { + for (unsigned j = 2; j < rows; ++j) + for (unsigned i = 2; i < cols; ++i) + chk2d<I, J>(j, i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 3d ... ").flush (); + { + for (unsigned k = 2; k < slis; ++k) + for (unsigned j = 2; j < rows; ++j) + for (unsigned i = 2; i < cols; ++i) + chk3d<I, J>(k, j, i); + } + std::cerr << "OK" << std::endl; + } + + template <typename I> + void + ch(unsigned slis, unsigned rows, unsigned cols) + { + std::cerr << " into int:" << std::endl; + chk<I, int>(slis, rows, cols); + std::cerr << " into unsigned:" << std::endl; + chk<I, unsigned>(slis, rows, cols); + std::cerr << " into int_u8:" << std::endl; + chk<I, value::int_u8>(slis, rows, cols); + std::cerr << " into int_u16:" << std::endl; + chk<I, value::int_u16>(slis, rows, cols); + std::cerr << " into int_s8:" << std::endl; + chk<I, value::int_s8>(slis, rows, cols); + std::cerr << " into int_s16:" << std::endl; + chk<I, value::int_s16>(slis, rows, cols); + } +} + + +int main() +{ + using namespace mln; + + unsigned slis = 4; + unsigned rows = 4; + unsigned cols = 16; + + std::cerr << "Tests level::paste:" << std::endl; + std::cerr << "on int:" << std::endl; + ch<int>(slis, rows, cols); + std::cerr << "on unsigned:" << std::endl; + ch<unsigned>(slis, rows, cols); +} + Index: trunk/milena/tests/level/stretch_full.cc =================================================================== --- trunk/milena/tests/level/stretch_full.cc (revision 0) +++ trunk/milena/tests/level/stretch_full.cc (revision 1596) @@ -0,0 +1,174 @@ +// Copyright (C) 2007 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/stretch_full.cc + * + * \brief Tests on mln::level::stretch. + */ + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/debug/iota.hh> + +#include <mln/level/saturate.hh> +#include <mln/level/stretch.hh> + + + +namespace mln +{ + template <typename I, typename J> + void + chck(Image& input_, Image<J>& output_) + { + typedef mln_value(I) T; + typedef mln_value(J) V; + unsigned max_i = mln_max (T); + unsigned max_j = mln_max (V); + I& input = exact(input_); + J& output = exact(output_); + + level::stretch(input, output); + + // FIXME : How test that? + } + + template <typename I, typename J> + void + chk1d(unsigned cols) + { + { + image1d input (cols); + debug::iota(input); + image1d<J> output (cols); + chck(input, output); + } + + } + + template <typename I, typename J> + void + chk2d(unsigned rows, unsigned cols) + { + + { + image2d input (rows, cols); + debug::iota(input); + image2d<J> output (rows, cols); + chck(input, output); + } + + } + + template <typename I, typename J> + void + chk3d(unsigned slis, unsigned rows, unsigned cols) + { + + { + image3d input (slis, rows, cols); + debug::iota(input); + image3d<J> output (slis, rows, cols); + chck(input, output); + } + + } + + + template <typename I, typename J> + void + chk(unsigned slis, unsigned rows, unsigned cols) + { + (std::cerr << " in 1d ... ").flush (); + { + for (unsigned i = 2; i < cols; ++i) + chk1d<I, J>(i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 2d ... ").flush (); + { + for (unsigned j = 2; j < rows; ++j) + for (unsigned i = 2; i < cols; ++i) + chk2d<I, J>(j, i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 3d ... ").flush (); + { + for (unsigned k = 2; k < slis; ++k) + for (unsigned j = 2; j < rows; ++j) + for (unsigned i = 2; i < cols; ++i) + chk3d<I, J>(k, j, i); + } + std::cerr << "OK" << std::endl; + } + + template <typename I> + void + ch(unsigned slis, unsigned rows, unsigned cols) + { + std::cerr << " into int_u8:" << std::endl; + chk<I, value::int_u8>(slis, rows, cols); + std::cerr << " into int_u16:" << std::endl; + chk<I, value::int_u16>(slis, rows, cols); + } +} + + +int main() +{ + using namespace mln; + + unsigned slis = 4; + unsigned rows = 4; + unsigned cols = 16; + + std::cerr << "Tests level::stretch:" << std::endl; + std::cerr << "on int:" << std::endl; + ch<int>(slis, rows, cols); + std::cerr << "on unsigned:" << std::endl; + ch<unsigned>(slis, rows, cols); + std::cerr << "on int_u8:" << std::endl; + ch<value::int_u8>(slis, rows, cols); + std::cerr << "on int_u16:" << std::endl; + ch<value::int_u16>(slis, rows, cols); + std::cerr << "on int_s8:" << std::endl; + ch<value::int_s8>(slis, rows, cols); + std::cerr << "on int_s16:" << std::endl; + ch<value::int_s16>(slis, rows, cols); +} Index: trunk/milena/tests/level/sort_points_full.cc =================================================================== --- trunk/milena/tests/level/sort_points_full.cc (revision 0) +++ trunk/milena/tests/level/sort_points_full.cc (revision 1596) @@ -0,0 +1,318 @@ +// Copyright (C) 2007 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/sort_points.cc + * + * \brief Tests on mln::level::sort_points. + */ + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/literal/origin.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + +#include <mln/core/p_array.hh> +#include <mln/debug/iota.hh> + +#include <mln/level/saturate.hh> +#include <mln/level/paste.hh> +#include <mln/level/sort_points.hh> + + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + + +namespace mln +{ + template <typename I, typename J> + void + chck(Image& input_, p_array<J>& array_inc_ref, p_array<J>& array_dec_ref) + { + I& input = exact(input_); + + p_array<J> array_inc = level::sort_points_increasing(input); + p_array<J> array_dec = level::sort_points_decreasing(input); + + mln_assertion(array_inc == array_inc_ref); + mln_assertion(array_dec == array_dec_ref); + } + + template <typename I> + void + chk1d(int cols) + { + box1d b1(literal::origin, point1d(1)); + f_box1d_t f_b1(b1); + + { + image1d input (cols); + debug::iota(input); + + p_array<point1d> array_inc_ref; + p_array<point1d> array_dec_ref; + + for (int i = 0; i < cols; ++i) + array_inc_ref.append(point1d(i)); + + for (int i = cols - 1; i >= 0; --i) + array_dec_ref.append(point1d(i)); + + chck(input, array_inc_ref, array_dec_ref); + } + + p_array<point1d> array_inc_ref; + p_array<point1d> array_dec_ref; + + for (int i = 0; i < 2; ++i) + array_inc_ref.append(point1d(i)); + + for (int i = 1; i >= 0; --i) + array_dec_ref.append(point1d(i)); + + { + image1d in (cols); + sub_image<image1d, box1d> input (in, b1); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + + { + image1d in (cols); + image_if<image1d, f_box1d_t> input(in, f_b1); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + } + + template <typename I> + void + chk2d(int rows, int cols) + { + box2d b2(literal::origin, point2d(1, 1)); + f_box2d_t f_b2(b2); + + { + image2d input (rows, cols); + debug::iota(input); + + p_array<point2d> array_inc_ref; + p_array<point2d> array_dec_ref; + + for (int j = 0; j < rows; ++j) + for (int i = 0; i < cols; ++i) + array_inc_ref.append(point2d(j, i)); + + for (int j = rows - 1; j >= 0; --j) + for (int i = cols - 1; i >= 0; --i) + array_dec_ref.append(point2d(j, i)); + + chck(input, array_inc_ref, array_dec_ref); + } + + p_array<point2d> array_inc_ref; + p_array<point2d> array_dec_ref; + + for (int j = 0; j < 2; ++j) + for (int i = 0; i < 2; ++i) + array_inc_ref.append(point2d(j, i)); + + for (int j = 1; j >= 0; --j) + for (int i = 1; i >= 0; --i) + array_dec_ref.append(point2d(j, i)); + + { + image2d in (rows, cols); + sub_image<image2d, box2d> input (in, b2); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + + { + image2d in (rows, cols); + image_if<image2d, f_box2d_t> input(in, f_b2); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + } + + template <typename I> + void + chk3d(int slis, int rows, int cols) + { + box3d b3(literal::origin, point3d(1, 1, 1)); + f_box3d_t f_b3(b3); + + { + image3d input (slis, rows, cols); + debug::iota(input); + + p_array<point3d> array_inc_ref; + p_array<point3d> array_dec_ref; + + for (int k = 0; k < slis; ++k) + for (int j = 0; j < rows; ++j) + for (int i = 0; i < cols; ++i) + array_inc_ref.append(point3d(k, j, i)); + + for (int k = slis - 1; k >= 0; --k) + for (int j = rows - 1; j >= 0; --j) + for (int i = cols - 1; i >= 0; --i) + array_dec_ref.append(point3d(k, j, i)); + + chck(input, array_inc_ref, array_dec_ref); + } + + p_array<point3d> array_inc_ref; + p_array<point3d> array_dec_ref; + + for (int k = 0; k < 2; ++k) + for (int j = 0; j < 2; ++j) + for (int i = 0; i < 2; ++i) + array_inc_ref.append(point3d(k, j, i)); + + for (int k = 1; k >= 0; --k) + for (int j = 1; j >= 0; --j) + for (int i = 1; i >= 0; --i) + array_dec_ref.append(point3d(k, j, i)); + + { + image3d in (slis, rows, cols); + sub_image<image3d, box3d> input (in, b3); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + + { + image3d in (slis, rows, cols); + image_if<image3d, f_box3d_t> input(in, f_b3); + debug::iota(input); + chck(input, array_inc_ref, array_dec_ref); + } + + } + + + template <typename I> + void + chk(int slis, int rows, int cols) + { + (std::cerr << " in 1d ... ").flush (); + { + for (int i = 2; i < cols; ++i) + chk1d(i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 2d ... ").flush (); + { + for (int j = 2; j < rows; ++j) + for (int i = 2; i < cols; ++i) + chk2d(j, i); + } + std::cerr << "OK" << std::endl; + + (std::cerr << " in 3d ... ").flush (); + { + for (int k = 2; k < slis; ++k) + for (int j = 2; j < rows; ++j) + for (int i = 2; i < cols; ++i) + chk3d(k, j, i); + } + std::cerr << "OK" << std::endl; + } + +} + + +int main() +{ + using namespace mln; + + int slis = 8; + int rows = 8; + int cols = 8; + + std::cerr << "Tests level::sort_points:" << std::endl; + std::cerr << "in int:" << std::endl; + chk<int>(slis, rows, cols); + std::cerr << "in unsigned:" << std::endl; + chk<unsigned>(slis, rows, cols); + std::cerr << "in int_u16:" << std::endl; + chk<value::int_u16>(slis, rows, cols); + std::cerr << "in int_s16:" << std::endl; + chk<value::int_s16>(slis, rows, cols); +} Index: trunk/milena/tests/level/saturate_full.cc =================================================================== --- trunk/milena/tests/level/saturate_full.cc (revision 0) +++ trunk/milena/tests/level/saturate_full.cc (revision 1596) @@ -0,0 +1,241 @@ +// Copyright (C) 2007 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/saturate_full.cc + * + * \brief Tests on mln::level::saturate. + */ + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/core/clone.hh> +#include <mln/level/saturate.hh> +#include <mln/debug/iota.hh> + +#include <mln/debug/println.hh> + + +namespace mln +{ + template <typename I, typename J> + void + chck(I& ref, J& out, mln_value(I) min, mln_value(I) max) + { + mln_value(J) min2 = min; + mln_value(J) max2 = max; + + mln_piter(I) p (ref.domain ()); + + { + level::saturate(ref, min, max, out); + + for_all(p) + { + if (ref(p) <= min) + { + mln_assertion(out(p) == min2); + continue; + } + if (ref(p) >= max) + { + mln_assertion(out(p) == max2); + continue; + } + mln_assertion(ref(p) == (mln_value(I)) out(p)); + } + } + + { + level::saturate_inplace(ref, min, max); + + for_all(p) + { + mln_assertion(ref(p) == (mln_value(I)) out(p)); + } + } + } + + template <typename I, typename J> + void + chk1d(unsigned cols, + int min, + int max) + { + image1d ima (cols); + image1d<J> out (cols); + debug::iota (ima); + chck(ima, out, min, max); + } + + template <typename I, typename J> + void + chk2d(unsigned rows, + unsigned cols, + int min, + int max) + { + image2d ima (rows, cols); + image2d<J> out (rows, cols); + debug::iota (ima); + chck(ima, out, min, max); + } + + template <typename I, typename J> + void + chk3d(unsigned slis, + unsigned rows, + unsigned cols, + int min, + int max) + { + image3d ima (slis, rows, cols); + image3d<J> out (slis, rows, cols); + debug::iota (ima); + chck(ima, out, min, max); + } + +} + + +int main() +{ + using namespace mln; + + unsigned slis_start = 1; + unsigned slis_end = 3; + + unsigned rows_start = 1; + unsigned rows_end = 5; + + unsigned cols_start = 2; + unsigned cols_end = 6; + + + std::cerr << "Tests level::saturate" << std::endl; + + (std::cerr << "in 1d ... ").flush (); + { + for (unsigned i = cols_start; i < cols_end; ++i) + for (unsigned j = 1; j < i; ++j) + for (unsigned k = j + 1; k <= i; ++k) + { + chk1d<int, int>(i, j, k); + chk1d<unsigned, unsigned>(i, j, k); + chk1d<int, unsigned>(i, j, k); + chk1d<unsigned, int>(i, j, k); + + chk1d<value::int_u8, value::int_u8>(i, j, k); + chk1d<value::int_u16, value::int_u16>(i, j, k); + chk1d<value::int_s8, value::int_s8>(i, j, k); + chk1d<value::int_s16, value::int_s16>(i, j, k); + + chk1d<unsigned, value::int_u8>(i, j, k); + chk1d<unsigned, value::int_u16>(i, j, k); + chk1d<int, value::int_s8>(i, j, k); + chk1d<int, value::int_s16>(i, j, k); + + chk1d<value::int_u8, unsigned>(i, j, k); + chk1d<value::int_u16, unsigned>(i, j, k); + chk1d<value::int_s8, int>(i, j, k); + chk1d<value::int_s16, int>(i, j, k); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + for (unsigned h = rows_start; h < rows_end; ++h) + for (unsigned i = cols_start; i < cols_end; ++i) + for (unsigned j = 1; j < i; ++j) + for (unsigned k = j + 1; k <= i; ++k) + { + chk2d<int, int>(h, i, j, k); + chk2d<unsigned, unsigned>(h, i, j, k); + chk2d<int, unsigned>(h, i, j, k); + chk2d<unsigned, int>(h, i, j, k); + + chk2d<value::int_u8, value::int_u8>(h, i, j, k); + chk2d<value::int_u16, value::int_u16>(h, i, j, k); + chk2d<value::int_s8, value::int_s8>(h, i, j, k); + chk2d<value::int_s16, value::int_s16>(h, i, j, k); + + chk2d<unsigned, value::int_u8>(h, i, j, k); + chk2d<unsigned, value::int_u16>(h, i, j, k); + chk2d<int, value::int_s8>(h, i, j, k); + chk2d<int, value::int_s16>(h, i, j, k); + + chk2d<value::int_u8, unsigned>(h, i, j, k); + chk2d<value::int_u16, unsigned>(h, i, j, k); + chk2d<value::int_s8, int>(h, i, j, k); + chk2d<value::int_s16, int>(h, i, j, k); + } + } + std::cerr << "OK" << std::endl; + + + (std::cerr << "in 3d ... ").flush (); + { + for (unsigned g = slis_start; g < slis_end; ++g) + for (unsigned h = rows_start; h < rows_end; ++h) + for (unsigned i = cols_start; i < cols_end; ++i) + for (unsigned j = 1; j < i; ++j) + for (unsigned k = j + 1; k <= i; ++k) + { + chk3d<int, int>(g, h, i, j, k); + chk3d<unsigned, unsigned>(g, h, i, j, k); + chk3d<int, unsigned>(g, h, i, j, k); + chk3d<unsigned, int>(g, h, i, j, k); + + chk3d<value::int_u8, value::int_u8>(g, h, i, j, k); + chk3d<value::int_u16, value::int_u16>(g, h, i, j, k); + chk3d<value::int_s8, value::int_s8>(g, h, i, j, k); + chk3d<value::int_s16, value::int_s16>(g, h, i, j, k); + + chk3d<unsigned, value::int_u8>(g, h, i, j, k); + chk3d<unsigned, value::int_u16>(g, h, i, j, k); + chk3d<int, value::int_s8>(g, h, i, j, k); + chk3d<int, value::int_s16>(g, h, i, j, k); + + chk3d<value::int_u8, unsigned>(g, h, i, j, k); + chk3d<value::int_u16, unsigned>(g, h, i, j, k); + chk3d<value::int_s8, int>(g, h, i, j, k); + chk3d<value::int_s16, int>(g, h, i, j, k); + } + } + std::cerr << "OK" << std::endl; + + +} Index: trunk/milena/mln/level/paste.spe.hh =================================================================== --- trunk/milena/mln/level/paste.spe.hh (revision 1595) +++ trunk/milena/mln/level/paste.spe.hh (revision 1596) @@ -65,6 +65,7 @@ // FIXME: For linear data images, we should get the len for each line... typename I::line_piter p(data.domain()); // FIXME: Alias mln_line_piter! + // mln_line_piter(I) p(data.domain()); for_all(p) memcpy_(inplace(make::pixel(destination, p)), make::pixel(data, p), Index: trunk/milena/mln/fun/v2v/saturate.hh =================================================================== --- trunk/milena/mln/fun/v2v/saturate.hh (revision 1595) +++ trunk/milena/mln/fun/v2v/saturate.hh (revision 1596) @@ -62,6 +62,7 @@ protected: V min_, max_; + bool needs_update_; }; @@ -73,6 +74,7 @@ : min_(mln_min(V)), max_(mln_max(V)) { + needs_update_ = true; } template <typename V> @@ -82,6 +84,7 @@ max_(max) { mln_precondition(max > min); + needs_update_ = true; } template <typename V> @@ -92,8 +95,15 @@ { // FIXME: Check that W is a larger type than V; otherwise // alt code. - static const W min_W = mln::value::cast<W>(min_); - static const W max_W = mln::value::cast<W>(max_); + + static W min_W, max_W; + if (needs_update_) + { + min_W = mln::value::cast<W>(min_); + max_W = mln::value::cast<W>(max_); + // FIXME +// needs_update_ = false; + } // FIXME: Below we need something more powerful that mlc_converts_to // for instance, with W=int_s<10u> and V=int_u<8u>, it does not

1 0

milena r1595: Add sparse image and test
by nivaul_s＠lrde.epita.fr 06 Dec '07

06 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-06 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add sparse image and test. * mln/core/sparse_encode.hh: Rewrite. * mln/core/sparse_image.hh: Rewrite. * tests/core/Makefile.am: Add test. * tests/core/sparse_image.cc: New. --- mln/core/sparse_encode.hh | 81 ++++++++++++++++++++++++++----------------- mln/core/sparse_image.hh | 83 +++++++++++++++++++++++++++++++++------------ tests/core/Makefile.am | 2 + tests/core/sparse_image.cc | 76 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+), 53 deletions(-) Index: trunk/milena/tests/core/sparse_image.cc =================================================================== --- trunk/milena/tests/core/sparse_image.cc (revision 0) +++ trunk/milena/tests/core/sparse_image.cc (revision 1595) @@ -0,0 +1,76 @@ +// Copyright (C) 2007 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/core/sparse_image.cc + * + * \brief Test on mln::sparse_image.hh. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/transform.hh> +#include <mln/level/paste.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/core/sparse_encode.hh> + +struct fold_t : public mln::Function_v2v< fold_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 0 ? 0 : (i - 1) % 255 + 1; } +}; + + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, "../../img/tiny.pgm"); + image2d<int_u8> cmp(lena.domain()); + + unsigned n; + image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), + c4(), n); + + sparse_image<point2d, int_u8> sparse = sparse_encode(level::transform(labels, fold_t())); + + std::cout << n << ", compression :" << sparse.compression() << std::endl; + + level::fill(cmp, literal::zero); + level::paste(sparse, cmp); + + mln_assertion(cmp == level::transform(labels, fold_t())); +} Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1594) +++ trunk/milena/tests/core/Makefile.am (revision 1595) @@ -12,6 +12,7 @@ obased_rle_image \ p_runs \ rle_image \ + sparse_image \ t_image category_SOURCES = category.cc @@ -23,6 +24,7 @@ obased_rle_image_SOURCES = obased_rle_image.cc p_runs_SOURCES = p_runs.cc rle_image_SOURCES = rle_image.cc +sparse_image_SOURCES = sparse_image.cc t_image_SOURCES = t_image.cc TESTS = $(check_PROGRAMS) Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1594) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1595) @@ -30,71 +30,88 @@ /*! \file mln/core/sparse_encode.hh * - * \brief FIXME. + * \brief Definintion of function which encodes an image in sparse_image. */ # include <mln/core/sparse_image.hh> -# include <vector> namespace mln { /*! - ** encode a generic image to a sparse image format + ** encode an image class to a sparse_image ** - ** @param input an Image + ** @param input has to respect the Image concept ** - ** @return a sparse image + ** @return sparse_image */ template <typename I> sparse_image<mln_point(I), mln_value(I)> - sparse_encode(const Image& input); + sparse_encode(const Image& input, bool ignore_zero = true); # ifndef MLN_INCLUDE_ONLY + /*! + ** test if Point p1 and p2 are on the same line + */ + template <typename P> + inline + bool + on_the_same_line(const P& p1, const P& p2, int len) + { + const unsigned dim = P::dim; + bool same_line = true; + + for (unsigned n = 0; same_line && n < dim - 1; ++n) + same_line = (p1[n] == p2[n]); + return same_line && p1[dim - 1] + len == p2[dim - 1]; + } template <typename I> inline sparse_image<mln_point(I), mln_value(I)> - sparse_encode(const Image& input) + sparse_encode(const Image& input, bool ignore_zero) { + typedef mln_point(I) P; + sparse_image<mln_point(I), mln_value(I)> output; + const I& ima = exact(input); mln_piter(I) p(exact(input).domain()); - unsigned len = 1; - // old point first dim coordinate - typename I::coord old = 1; - // range pointstart + unsigned len = 0; mln_point(I) rstart; - // range value - std::vector<mln_value(I)> values; - - p.start(); - if (not p.is_valid()) - return output; + std::vector< mln_value(I) > rvalue; + rvalue.clear(); - rstart = p; - - old = p[0]; - values.push_back(exact(input)(p)); - p.next_(); - while (p.is_valid()) + for_all(p) + if (!ignore_zero || ima(p) != literal::zero || len) { - if (p[0] - 1 == old) + if (len == 0) { ++len; - values.push_back(exact(input)(p)); + rstart = p; + std::cout << "New run " << p << ": *"; + rvalue.push_back(ima(p)); } else + if ((!ignore_zero || ima(p) != literal::zero) && + on_the_same_line(rstart, mln_point(I)(p), len)) + { + std::cout << "*"; + ++len; + rvalue.push_back(ima(p)); + } + else + { + std::cout << std::endl; + output.insert(p_run(rstart, len), rvalue); + rvalue.clear(); + if ((len = (!ignore_zero || ima(p) != literal::zero))) { - output.insert(rstart, len, values); rstart = p; - len = 1; - values.clear(); - values.push_back(exact(input)(p)); + std::cout << "New run " << p << ": "; + rvalue.push_back(ima(p)); + } } - old = p[0]; - p.next_(); } - output.insert(rstart, len, values); return output; } Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1594) +++ trunk/milena/mln/core/sparse_image.hh (revision 1595) @@ -30,12 +30,12 @@ /*! \file mln/core/sparse_image.hh * - * \brief Definition of mln::sparse_image + * \brief Definition of an image with sparse encoding. */ # include <mln/core/internal/run_image.hh> -# include <mln/core/internal/run_pset.hh> -# include <mln/core/internal/run_psite.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -45,6 +45,7 @@ // Fwd decl. template <typename P, typename T> struct sparse_image; + namespace internal { @@ -55,13 +56,41 @@ /// Image values. std::vector< std::vector<T> > values_; + /// domain of the image - run_pset_ domain_; + p_runs_ domain_; + + /// Return the size of the data in memory. + unsigned size_mem() const; }; } // end of namespace mln::internal - /*! \brief Sparse image. + + namespace trait + { + + template <typename P, typename T> + struct image_< sparse_image<P,T> > : default_image_< T, sparse_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + + + /*! \brief SPARSE image. * * * Parameter \c P is the type of the image points. @@ -69,15 +98,16 @@ * This image is not point wise accessible. */ template <typename P, typename T> - class sparse_image : public internal::run_image_< P, sparse_image<P, T> > + class sparse_image : public internal::run_image_< T, P, sparse_image<P, T> > { public: typedef T value; typedef T& lvalue; typedef const T rvalue; - typedef internal::run_psite psite; + typedef runs_psite psite; typedef mln::value::set<T> vset; - typedef internal::run_pset_ pset; + typedef p_runs_ pset; + /// Skeleton. typedef sparse_image< tag::psite_, tag::value_<T> > skeleton; @@ -86,13 +116,13 @@ sparse_image(); /// Add a new range to the image. - void insert(const P& p, unsigned len, const std::vector<T>& value); + void insert(const p_run& pr, const std::vector<T>& value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& p) const; + rvalue operator() (const psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& p); + lvalue operator() (const psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -102,8 +132,10 @@ /// Give the definition domain. const pset& domain() const; + }; + # ifndef MLN_INCLUDE_ONLY namespace internal @@ -117,12 +149,21 @@ { } + template <typename P, typename T> + inline + unsigned + data_< sparse_image<P,T> >::size_mem() const + { + return sizeof(T) * domain_.npoints() + domain_.size_mem(); + } + } // end of namespace mln::internal template <typename P, typename T> inline sparse_image<P, T>::sparse_image() { + this->data_ = new internal::data_< sparse_image<P,T> >(); } template <typename P, typename T> @@ -144,32 +185,32 @@ template <typename P, typename T> inline void - sparse_image<P, T>::insert(const P& p, unsigned len, - const std::vector<T>& value) + sparse_image<P, T>::insert(const p_run& pr, const std::vector<T>& value) { if (!this->has_data()) this->data_ = new internal::data_< sparse_image<P,T> >(); - this->data_->domain_.insert(p, len); + mln_assertion(this->data_->values_.size() == 0 || + pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); + this->data_->domain_.insert(pr); this->data_->values_.push_back(value); } template <typename P, typename T> inline typename sparse_image<P, T>::rvalue - sparse_image<P, T>::operator() - (const typename sparse_image<P, T>::psite& site) const + sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + const { - mln_precondition(this->has_data() && - site.pset_pos_() < this->data_->values_.size() && - site.index_() < this->data_->values_[site.pset_pos_()].size()); + mln_precondition(this->has_data()); + mln_precondition(site.pset_pos_() < this->data_->values_.size()); + mln_precondition(site.index_() < this->data_->values_[site.pset_pos_()].size()); return this->data_->values_[site.pset_pos_()][site.index_()]; } template <typename P, typename T> inline typename sparse_image<P, T>::lvalue - sparse_image<P, T>::operator() - (const typename sparse_image<P,T>::psite& site) + sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) { mln_precondition(this->has_data() && site.pset_pos_() < this->data_->values_.size() &&

1 0

milena r1594: Add mono object based rle image and add test
by nivaul_s＠lrde.epita.fr 05 Dec '07

05 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-05 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add mono object based rle image and add test. * mln/core/mono_obased_rle_encode.hh: New. * mln/core/mono_obased_rle_image.hh: New. * mln/core/mono_rle_encode.hh: Fix. * mln/core/mono_rle_image.hh: Add get_value() method. * mln/core/obased_rle_image.hh: Add vector of value for easier acces to the image. * tests/core/Makefile.am: Add test. * tests/core/mono_obased_rle_image.cc: New. --- mln/core/mono_obased_rle_encode.hh | 120 ++++++++++++++++ mln/core/mono_obased_rle_image.hh | 255 ++++++++++++++++++++++++++++++++++++ mln/core/mono_rle_encode.hh | 5 mln/core/mono_rle_image.hh | 19 ++ mln/core/obased_rle_image.hh | 36 +---- tests/core/Makefile.am | 2 tests/core/mono_obased_rle_image.cc | 78 +++++++++++ 7 files changed, 483 insertions(+), 32 deletions(-) Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1593) +++ trunk/milena/tests/core/Makefile.am (revision 1594) @@ -7,6 +7,7 @@ clone \ exact \ initialize \ + mono_obased_rle_image \ mono_rle_image \ obased_rle_image \ p_runs \ @@ -17,6 +18,7 @@ clone_SOURCES = clone.cc exact_SOURCES = exact.cc initialize_SOURCES = initialize.cc +mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc p_runs_SOURCES = p_runs.cc Index: trunk/milena/tests/core/mono_obased_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_obased_rle_image.cc (revision 0) +++ trunk/milena/tests/core/mono_obased_rle_image.cc (revision 1594) @@ -0,0 +1,78 @@ +// Copyright (C) 2007 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/core/mono_obased_rle_image.cc + * + * \brief Test on mln::mono_obased_rle_image.hh. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/transform.hh> +#include <mln/level/paste.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/core/mono_obased_rle_encode.hh> + +struct fold_t : public mln::Function_v2v< fold_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 0 ? 0 : (i - 1) % 255 + 1; } +}; + + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, "../../img/tiny.pgm"); + image2d<int_u8> cmp(lena.domain()); + + unsigned n; + image2d<unsigned> + labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), + c4(), n); + + mono_obased_rle_image<point2d, int_u8> + rle = mono_obased_rle_encode(level::transform(labels, fold_t())); + + std::cout << n << ", compression :" << rle.compression() << std::endl; + + level::fill(cmp, literal::zero); + level::paste(rle, cmp); + + mln_assertion(cmp == level::transform(labels, fold_t())); +} Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1593) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1594) @@ -94,11 +94,8 @@ else { output.insert(p_run(rstart, len)); - if ((len = (!ignore_zero || ima(p) != literal::zero))) - { + if ((len = (ima(p) == val))) rstart = p; - rvalue = ima(p); - } } } return output; Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1593) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1594) @@ -55,7 +55,7 @@ data_(const T& val); /// Image value. - T value; + T value_; /// domain of the image p_runs_ domain_; @@ -128,6 +128,9 @@ /// Test if this image has been initialized. bool has_data() const; + /// Give the uniq value of the image. + rvalue get_value() const; + /// Give the set of values of the image. const vset& values() const; @@ -147,7 +150,7 @@ template <typename P, typename T> inline data_< mono_rle_image<P,T> >::data_(const T& val) - : value(val) + : value_(val) { } @@ -201,7 +204,15 @@ const { mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->value; + return this->data_->value_; + } + + template <typename P, typename T> + inline + typename mono_rle_image<P, T>::rvalue + mono_rle_image<P, T>::get_value() const + { + return this->data_->value_; } template <typename P, typename T> @@ -210,7 +221,7 @@ mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) { mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); - return this->data_->value; + return this->data_->value_; } template <typename P, typename T> Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1593) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1594) @@ -62,6 +62,9 @@ std::vector< accu::bbox > bbox_; /// Value of Objects. + std::vector<T> v_obj_; + + /// Image values. std::vector<T> values_; /// domain of the image @@ -163,7 +166,7 @@ bbox_(values.size()) { std::copy(values.begin(), values.end(), - std::back_inserter(this->values_)); + std::back_inserter(this->v_obj_)); } template <typename P, typename T> @@ -173,7 +176,7 @@ { return domain_.size_mem() + bbox_.size() * (sizeof(T) + sizeof(box_) + sizeof(std::vector<unsigned>)) - + sizeof(unsigned) * domain_.nruns(); + + (sizeof(unsigned) + sizeof(T)) * domain_.nruns(); } } // end of namespace mln::internal @@ -206,14 +209,15 @@ void obased_rle_image<P, T>::insert(const p_run& pr, T value) { - mln_assertion(this->data_->values_.size() == 0 || this->data_->domain_.nruns() == 0 || + mln_assertion(this->data_->v_obj_.size() == 0 || this->data_->domain_.nruns() == 0 || pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); this->data_->domain_.insert(pr); + this->data_->values_.push_back(value); unsigned i; - for (i = 0; i < this->data_->values_.size() - && this->data_->values_[i] != value; ++i) + for (i = 0; i < this->data_->v_obj_.size() + && this->data_->v_obj_[i] != value; ++i) ; - mln_assertion(i != this->data_->values_.size()); + mln_assertion(i != this->data_->v_obj_.size()); this->data_->obj_[i].push_back(this->data_->domain_.nruns() - 1); this->data_->bbox_[i].take(pr.bbox().pmin()); this->data_->bbox_[i].take(pr.bbox().pmax()); @@ -227,15 +231,7 @@ { mln_precondition(this->has_data() && site.pset_pos_() < this->data_->domain_.nruns()); - for (unsigned i = 0; i < this->data_->obj_.size(); ++i) - { - for (typename std::vector<unsigned>::const_iterator it = this->data_->obj_[i].begin(); - it != this->data_->obj_[i].end(); it++) - if (*it == site.pset_pos_()) - return this->data_->values_[i]; - } - mln_assertion(false); - return this->data_->values_[0]; + return this->data_->values_[site.pset_pos_()]; } template <typename P, typename T> @@ -245,15 +241,7 @@ { mln_precondition(this->has_data() && site.pset_pos_() < this->data_->domain_.nruns()); - for (unsigned i = 0; i < this->data_->obj_.size(); ++i) - { - for (typename std::vector<unsigned>::const_iterator it = this->data_->obj_[i].begin(); - it != this->data_->obj_[i].end(); it++) - if (*it == site.pset_pos_()) - return this->data_->values_[i]; - } - mln_assertion(false); - return this->data_->values_[0]; + return this->data_->values_[site.pset_pos_()]; } template <typename P, typename T> Index: trunk/milena/mln/core/mono_obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 0) +++ trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1594) @@ -0,0 +1,120 @@ +// Copyright (C) 2007 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_CORE_MONO_OBASED_RLE_ENCODE_HH +# define MLN_CORE_MONO_OBASED_RLE_ENCODE_HH + +/*! \file mln/core/mono_obased_rle_encode.hh + * + * \brief Definintion of function which encodes an image in mono_obased_rle_image. + */ + +# include <mln/core/mono_obased_rle_image.hh> + +namespace mln +{ + + /*! + ** encode an image class to a mono_obased_rle_image + ** + ** @param input has to respect the Image concept + ** + ** @return mono_obased_rle_image + */ + template <typename I> + mono_obased_rle_image<mln_point(I), mln_value(I)> + mono_obased_rle_encode(const Image& input, bool ignore_zero = true); + +# ifndef MLN_INCLUDE_ONLY + /*! + ** test if Point p1 and p2 are on the same line + */ + template <typename P> + inline + bool + on_the_same_line(const P& p1, const P& p2) + { + const unsigned dim = P::dim; + bool same_line = true; + + for (unsigned n = 0; same_line && n < dim - 1; ++n) + same_line = (p1[n] == p2[n]); + return same_line; + } + + template <typename I> + inline + mono_obased_rle_image<mln_point(I), mln_value(I)> + mono_obased_rle_encode(const Image& input, bool ignore_zero) + { + typedef mln_point(I) P; + + const I& ima = exact(input); + mln_piter(I) p (exact(input).domain()); + unsigned len = 0; + mln_point(I) rstart; + mln_value(I) rvalue; + std::set< mln_value(I) > sv; + + for_all(p) + { + if (!ignore_zero || ima(p) != literal::zero) + sv.insert(ima(p)); + } + + mono_obased_rle_image<mln_point(I), mln_value(I)> output(sv); + for_all(p) + if (!ignore_zero || ima(p) != literal::zero || len) + { + if (len == 0) + { + ++len; + rstart = p; + rvalue = ima(p); + } + else + if (rvalue == ima(p) + && on_the_same_line(rstart, mln_point(I)(p))) + ++len; + else + { + output.insert(p_run(rstart, len), rvalue); + if ((len = (!ignore_zero || ima(p) != literal::zero))) + { + rstart = p; + rvalue = ima(p); + } + } + } + return output; + } + +#endif // ! MLN_INCLUDE_ONLY + +} + +#endif // ! MLN_CORE_MONO_OBASED_RLE_ENCODE_HH Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 0) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1594) @@ -0,0 +1,255 @@ +// Copyright (C) 2007 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_CORE_MONO_OBASED_RLE_IMAGE_HH +# define MLN_CORE_MONO_OBASED_RLE_IMAGE_HH + +/*! \file mln/core/mono_obased_rle_image.hh + * + * \brief Definition of an image with rle encoding. + */ + +# include <mln/core/internal/run_image.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> +# include <mln/core/box.hh> +# include <mln/value/set.hh> +# include <mln/core/mono_rle_image.hh> +# include <vector> + +namespace mln +{ + + // Fwd decl. + template <typename P, typename T> struct mono_obased_rle_image; + + + namespace internal + { + + template <typename P, typename T> + struct data_< mono_obased_rle_image<P,T> > + { + data_(const std::set<T>& values); + + /// Objects. + std::vector< mono_rle_image<P, T> > ima_; + + /// Image value. + std::vector<T> values_; + + /// domain of the image + p_runs_ domain_; + + /// Return the size of the data in memory. + unsigned size_mem() const; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename P, typename T> + struct image_< mono_obased_rle_image<P,T> > : default_image_< T, mono_obased_rle_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + + + /*! \brief RLE image. + * + * + * Parameter \c P is the type of the image points. + * Parameter \c T is the type of the pixel values. + * This image is not point wise accessible. + */ + template <typename P, typename T> + class mono_obased_rle_image : public internal::run_image_< T, P, mono_obased_rle_image<P, T> > + { + public: + typedef T value; + typedef T& lvalue; + typedef const T rvalue; + typedef runs_psite psite; + typedef mln::value::set<T> vset; + typedef p_runs_ pset; + + + /// Skeleton. + typedef mono_obased_rle_image< tag::psite_, tag::value_<T> > skeleton; + + + mono_obased_rle_image(const std::set<T>& values); + + /// Add a new range to the image. + void insert(const p_run& pr, T value); + + /// Read-only access to the image value located at point \p p. + rvalue operator() (const psite& site) const; + + /// Read-write access to the image value located at point \p p. + lvalue operator() (const psite& site); + + /// Test if this image has been initialized. + bool has_data() const; + + /// Give the set of values of the image. + const vset& values() const; + + /// Give the definition domain. + const pset& domain() const; + + /// Give the index vector of the i-th object. + const mono_rle_image<P, T>& object(unsigned i) const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< mono_obased_rle_image<P,T> > + + template <typename P, typename T> + inline + data_< mono_obased_rle_image<P,T> >::data_(const std::set<T>& values) + : ima_(values.begin(), values.end()) + { + } + + template <typename P, typename T> + inline + unsigned + data_< mono_obased_rle_image<P,T> >::size_mem() const + { + return domain_.size_mem() * 2 + sizeof(T) * (values_.size() + ima_.size()); + } + + } // end of namespace mln::internal + + template <typename P, typename T> + inline + mono_obased_rle_image<P, T>::mono_obased_rle_image(const std::set<T>& values) + { + this->data_ = new internal::data_< mono_obased_rle_image<P,T> >(values); + } + + template <typename P, typename T> + inline + bool + mono_obased_rle_image<P, T>::has_data() const + { + return this->data_->ima_.size() != 0; + } + + template <typename P, typename T> + inline + const typename mono_obased_rle_image<P, T>::vset& + mono_obased_rle_image<P, T>::values() const + { + return vset::the(); + } + + template <typename P, typename T> + inline + void + mono_obased_rle_image<P, T>::insert(const p_run& pr, T value) + { + mln_assertion(this->data_->values_.size() == 0 || this->data_->domain_.nruns() == 0 || + pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); + this->data_->domain_.insert(pr); + this->data_->values_.push_back(value); + unsigned i; + for (i = 0; i < this->data_->ima_.size() + && this->data_->ima_[i].get_value() != value; ++i) + ; + mln_assertion(i != this->data_->ima_.size()); + this->data_->ima_[i].insert(pr); + } + + template <typename P, typename T> + inline + typename mono_obased_rle_image<P, T>::rvalue + mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) + const + { + mln_precondition(this->has_data() && + site.pset_pos_() < this->data_->domain_.nruns()); + return this->data_->values_[site.pset_pos_()]; + } + + template <typename P, typename T> + inline + typename mono_obased_rle_image<P, T>::lvalue + mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) + { + mln_precondition(this->has_data() && + site.pset_pos_() < this->data_->domain_.nruns()); + return this->data_->values_[site.pset_pos_()]; + } + + template <typename P, typename T> + inline + const typename mono_obased_rle_image<P, T>::pset& + mono_obased_rle_image<P, T>::domain() const + { + return this->data_->domain_; + } + + template <typename P, typename T> + inline + const mono_rle_image<P, T>& + mono_obased_rle_image<P, T>::object(unsigned i) const + { + mln_assertion(i < this->data_->ima_.size()); + return this->data_->ima_[i]; + } + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln + + +#endif // ! MLN_CORE_MONO_OBASED_RLE_IMAGE_HH

1 0

milena r1593: New full tests for level
by Guillaume Duhamel 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> New full tests for level. * tests/level/assign_full.cc, * tests/level/compare_full.cc, * tests/level/compute_full.cc: New full tests. --- assign_full.cc | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++ compare_full.cc | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++ compute_full.cc | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 803 insertions(+) Index: trunk/milena/tests/level/compute_full.cc =================================================================== --- trunk/milena/tests/level/compute_full.cc (revision 0) +++ trunk/milena/tests/level/compute_full.cc (revision 1593) @@ -0,0 +1,280 @@ +// Copyright (C) 2007 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/compute_full.cc + * + * \brief Tests on mln::level::compute. + */ + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/accu/min.hh> +#include <mln/accu/max.hh> +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> +#include <mln/level/compute.hh> + + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + +namespace mln +{ + template <typename I> + void + chk1d(unsigned cols) + { + box1d b1(literal::origin, point1d(1)); + + image1d ima (cols); + debug::iota (ima); + I real_min = 1; + I real_min2 = 1; + I real_max = (I)(cols % (unsigned) mln_max(I)); + I real_max2 = 2; + if (cols >= (unsigned)mln_max(I)) + { + real_min = 0; + real_max = mln_max(I) - 1; + } + + + { + accu::min_ acu_min; + accu::max_ acu_max; + + I min = level::compute(ima, acu_min); + I max = level::compute(ima, acu_max); + mln_assertion(min == real_min); + mln_assertion(max == real_max); + } + + { + sub_image<image1d, box1d> sub_ima (ima, b1); + + accu::min_ acu_min; + accu::max_ acu_max; + + I min = level::compute(sub_ima, acu_min); + I max = level::compute(sub_ima, acu_max); + mln_assertion(min == real_min2); + mln_assertion(max == real_max2); + } + + { + f_box1d_t f_b(b1); + image_if<image1d, f_box1d_t> if_ima(ima, f_b); + + accu::min_ acu_min; + accu::max_ acu_max; + + I min = level::compute(if_ima, acu_min); + I max = level::compute(if_ima, acu_max); + mln_assertion(min == real_min2); + mln_assertion(max == real_max2); + } + } + + template <typename I> + void + chk2d(unsigned rows, unsigned cols) + { + box2d b2(literal::origin, point2d(1, 1)); + + image2d ima (rows, cols); + debug::iota (ima); + I real_min = 1; + I real_min2 = 1; + I real_max; + if (rows * cols >= (unsigned)mln_max(I)) + { + real_min = 0; + real_max = mln_max(I) - 1; + } + else + { + real_max = (I)(rows * cols); + if ((cols == (unsigned)mln_max(I) - 2) || + (cols == (unsigned)mln_max(I) - 1)) + real_min2 = 0; + } + + { + accu::min_ acu_min; + accu::max_ acu_max; + + I min = level::compute(ima, acu_min); + I max = level::compute(ima, acu_max); + + mln_assertion(min == real_min); + mln_assertion(max == real_max); + } + + } + + template <typename I> + void + chk3d(unsigned slis, unsigned rows, unsigned cols) + { + box3d b3(literal::origin, point3d(1, 1, 1)); + + image3d ima (slis, rows, cols); + debug::iota (ima); + I real_min = 1; + I real_min2 = 1; + I real_max; + if (slis * rows * cols >= (unsigned)mln_max(I)) + { + real_min = 0; + real_max = mln_max(I) - 1; + } + else + real_max = (I)(slis * rows * cols); + { + accu::min_ acu_min; + accu::max_ acu_max; + + I min = level::compute(ima, acu_min); + I max = level::compute(ima, acu_max); + + mln_assertion(min == real_min); + mln_assertion(max == real_max); + } + + } +} + + +int main() +{ + using namespace mln; + + unsigned slis_start = 2; + unsigned slis_end = 3; + + unsigned rows_start = 2; + unsigned rows_end = 16; + + unsigned cols_start = 2; + unsigned cols_end = 256; + + + std::cerr << "Tests level::compute:" << std::endl; + + (std::cerr << "in 1d ... ").flush (); + { + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk1d<int>(i); + chk1d<unsigned>(i); + chk1d<value::int_u8>(i); + chk1d<value::int_u16>(i); + chk1d<value::int_s8>(i); + chk1d<value::int_s16>(i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk2d<int>(j, i); + chk2d<unsigned>(j, i); + chk2d<value::int_u8>(j, i); + chk2d<value::int_u16>(j, i); + chk2d<value::int_s8>(j, i); + chk2d<value::int_s16>(j, i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + for (unsigned k = slis_start; k < slis_end; ++k) + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk3d<int>(k, j, i); + chk3d<unsigned>(k, j, i); + chk3d<value::int_u8>(k, j, i); + chk3d<value::int_u16>(k, j, i); + chk3d<value::int_s8>(k, j, i); + } + } + std::cerr << "OK" << std::endl; +} Index: trunk/milena/tests/level/assign_full.cc =================================================================== --- trunk/milena/tests/level/assign_full.cc (revision 0) +++ trunk/milena/tests/level/assign_full.cc (revision 1593) @@ -0,0 +1,263 @@ +// Copyright (C) 2007 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/assign_full.cc + * + * \brief Tests on mln::level::assign. + */ + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + + +#include <mln/core/clone.hh> +#include <mln/level/assign.hh> +#include <mln/level/compare.hh> +#include <mln/debug/iota.hh> + +#include <mln/debug/println.hh> + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + +namespace mln +{ + template <typename I, typename J> + void + chck(I& lhs, J& rhs) + { + level::assign(lhs, rhs); + mln_piter (I) p (lhs.domain ()); + for_all (p) + mln_assertion (lhs(p) == (mln_value(I))rhs(p)); + + } + + template <typename I, typename J> + void + chk1d(unsigned cols) + { + image1d lhs (cols); + image1d<J> rhs (cols); + debug::iota (rhs); + chck(lhs, rhs); + + level::fill(lhs, 0); + box1d b1(literal::origin, point1d(1)); + sub_image<image1d, box1d> sub_lhs (lhs, b1); + sub_image<image1d<J>, box1d> sub_rhs (rhs, b1); + chck(sub_lhs, sub_rhs); + + level::fill(lhs, 0); + f_box1d_t f_b(b1); + image_if<image1d, f_box1d_t> if_lhs(lhs, f_b); + image_if<image1d<J>, f_box1d_t> if_rhs(rhs, f_b); + chck(if_lhs, if_rhs); + } + + template <typename I, typename J> + void + chk2d(unsigned rows, unsigned cols) + { + image2d lhs (rows, cols); + image2d<J> rhs (rows, cols); + debug::iota (rhs); + chck(lhs, rhs); + + level::fill(lhs, 0); + box2d b2(literal::origin, point2d(1, 1)); + sub_image<image2d, box2d> sub_lhs (lhs, b2); + sub_image<image2d<J>, box2d> sub_rhs (rhs, b2); + chck(sub_lhs, sub_rhs); + + level::fill(lhs, 0); + f_box2d_t f_b(b2); + image_if<image2d, f_box2d_t> if_lhs(lhs, f_b); + image_if<image2d<J>, f_box2d_t> if_rhs(rhs, f_b); + chck(if_lhs, if_rhs); + } + + template <typename I, typename J> + void + chk3d(unsigned slis, unsigned rows, unsigned cols) + { + image3d lhs (slis, rows, cols); + image3d<J> rhs (slis, rows, cols); + debug::iota (rhs); + chck(lhs, rhs); + + level::fill(lhs, 0); + box3d b3(literal::origin, point3d(1, 1, 1)); + sub_image<image3d, box3d> sub_lhs (lhs, b3); + sub_image<image3d<J>, box3d> sub_rhs (rhs, b3); + chck(sub_lhs, sub_rhs); + + level::fill(lhs, 0); + f_box3d_t f_b(b3); + image_if<image3d, f_box3d_t> if_lhs(lhs, f_b); + image_if<image3d<J>, f_box3d_t> if_rhs(rhs, f_b); + chck(if_lhs, if_rhs); + } +} + + +int main() +{ + using namespace mln; + + unsigned slis_start = 1; + unsigned slis_end = 4; + + unsigned rows_start = 1; + unsigned rows_end = 16; + + unsigned cols_start = 1; + unsigned cols_end = 32; + + + std::cerr << "Tests level::assign" << std::endl; + + (std::cerr << "in 1d ... ").flush (); + { + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk1d<int, int>(i); + chk1d<unsigned, unsigned>(i); + chk1d<int, unsigned>(i); + chk1d<unsigned, int>(i); + + chk1d<value::int_u8, value::int_u8>(i); + chk1d<value::int_u16, value::int_u16>(i); + chk1d<value::int_s8, value::int_s8>(i); + chk1d<value::int_s16, value::int_s16>(i); + + chk1d<unsigned, value::int_u8>(i); + chk1d<unsigned, value::int_u16>(i); + chk1d<int, value::int_s8>(i); + chk1d<int, value::int_s16>(i); + + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk2d<int, int>(j, i); + chk2d<unsigned, unsigned>(j, i); + chk2d<int, unsigned>(j, i); + chk2d<unsigned, int>(j, i); + + chk2d<value::int_u8, value::int_u8>(j, i); + chk2d<value::int_u16, value::int_u16>(j, i); + chk2d<value::int_s8, value::int_s8>(j, i); + chk2d<value::int_s16, value::int_s16>(j, i); + + chk2d<unsigned, value::int_u8>(j, i); + chk2d<unsigned, value::int_u16>(j, i); + chk2d<int, value::int_s8>(j, i); + chk2d<int, value::int_s16>(j, i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + for (unsigned k = slis_start; k < slis_end; ++k) + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk3d<int, int>(k, j, i); + chk3d<unsigned, unsigned>(k, j, i); + chk3d<int, unsigned>(k, j, i); + chk3d<unsigned, int>(k, j, i); + + chk3d<value::int_u8, value::int_u8>(k, j, i); + chk3d<value::int_u16, value::int_u16>(k, j, i); + chk3d<value::int_s8, value::int_s8>(k, j, i); + chk3d<value::int_s16, value::int_s16>(k, j, i); + + chk3d<unsigned, value::int_u8>(k, j, i); + chk3d<unsigned, value::int_u16>(k, j, i); + chk3d<int, value::int_s8>(k, j, i); + chk3d<int, value::int_s16>(k, j, i); + } + } + std::cerr << "OK" << std::endl; +} Index: trunk/milena/tests/level/compare_full.cc =================================================================== --- trunk/milena/tests/level/compare_full.cc (revision 0) +++ trunk/milena/tests/level/compare_full.cc (revision 1593) @@ -0,0 +1,260 @@ +// Copyright (C) 2007 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/compare_full.cc + * + * \brief Tests on mln::level::compare. + */ + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + +#include <mln/level/compare.hh> + +#include <mln/debug/iota.hh> + +#include <mln/arith/plus.hh> +#include <mln/arith/minus.hh> + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + +namespace mln +{ + template<typename I, typename J> + void + test_less(I& lhs, J& rhs) + { + mln_assertion(! (lhs == rhs)); + mln_assertion( (lhs <= rhs)); + mln_assertion( (lhs < rhs)); + mln_assertion(! (lhs >= rhs)); + mln_assertion(! (lhs > rhs)); + + mln_assertion(! (rhs == lhs)); + mln_assertion(! (rhs <= lhs)); + mln_assertion(! (rhs < lhs)); + mln_assertion( (rhs >= lhs)); + mln_assertion( (rhs > lhs)); + } + + template<typename I, typename J> + void + test_more(I& lhs, J& rhs) + { + mln_assertion(! (lhs == rhs)); + mln_assertion( (lhs <= rhs)); + mln_assertion( (lhs < rhs)); + mln_assertion(! (lhs >= rhs)); + mln_assertion(! (lhs > rhs)); + + mln_assertion(! (rhs == lhs)); + mln_assertion(! (rhs <= lhs)); + mln_assertion(! (rhs < lhs)); + mln_assertion( (rhs >= lhs)); + mln_assertion( (rhs > lhs)); + } + + template<typename I, typename J> + void + test_equal(I& lhs, J& rhs) + { + mln_assertion( (lhs == rhs)); + mln_assertion( (lhs <= rhs)); + mln_assertion(! (lhs < rhs)); + mln_assertion( (lhs >= rhs)); + mln_assertion(! (lhs > rhs)); + + mln_assertion( (rhs == lhs)); + mln_assertion( (rhs <= lhs)); + mln_assertion(! (rhs < lhs)); + mln_assertion( (rhs >= lhs)); + mln_assertion(! (rhs > lhs)); + } + + template <typename I> + void + chk1d(unsigned cols) + { + image1d lhs (cols); + image1d rhs (cols); + debug::iota (lhs); + debug::iota (rhs); + + test_equal(lhs, rhs); + image1d<int> lhs2 = lhs + 0; + image1d<int> rhs2 = rhs + 1; + test_less(lhs2, rhs2); + image1d<int> lhs3 = lhs - 1; + image1d<int> rhs3 = rhs + 0; + test_more(lhs3, rhs3); + } + + template <typename I> + void + chk2d(unsigned rows, unsigned cols) + { + image2d lhs (rows, cols); + image2d rhs (rows, cols); + debug::iota (lhs); + debug::iota (rhs); + + test_equal(lhs, rhs); + image2d<int> lhs2 = lhs + 0; + image2d<int> rhs2 = rhs + 1; + test_less(lhs2, rhs2); + image2d<int> lhs3 = lhs - 1; + image2d<int> rhs3 = rhs + 0; + test_more(lhs3, rhs3); + } + + template <typename I> + void + chk3d(unsigned slis, unsigned rows, unsigned cols) + { + image3d lhs (slis, rows, cols); + image3d rhs (slis, rows, cols); + debug::iota (lhs); + debug::iota (rhs); + + test_equal(lhs, rhs); + image3d<int> lhs2 = lhs + 0; + image3d<int> rhs2 = rhs + 1; + test_less(lhs2, rhs2); + image3d<int> lhs3 = lhs - 1; + image3d<int> rhs3 = rhs + 0; + test_more(lhs3, rhs3); + } +} + + + + +int main() +{ + using namespace mln; + + unsigned slis_start = 1; + unsigned slis_end = 3; + + unsigned rows_start = 1; + unsigned rows_end = 16; + + unsigned cols_start = 1; + unsigned cols_end = 32; + + std::cerr << "Tests level::compare" << std::endl; + + (std::cerr << "in 1d ... ").flush (); + { + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk1d<int>(i); + chk1d<unsigned>(i); + chk1d<value::int_u8>(i); + chk1d<value::int_u16>(i); + chk1d<value::int_s8>(i); + chk1d<value::int_s16>(i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk2d<int>(j, i); + chk2d<unsigned>(j, i); + chk2d<value::int_u8>(j, i); + chk2d<value::int_u16>(j, i); + chk2d<value::int_s8>(j, i); + chk2d<value::int_s16>(j, i); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + for (unsigned k = slis_start; k < slis_end; ++k) + for (unsigned j = rows_start; j < rows_end; ++j) + for (unsigned i = cols_start; i < cols_end; ++i) + { + chk3d<int>(k, j, i); + chk3d<unsigned>(k, j, i); + chk3d<value::int_u8>(k, j, i); + chk3d<value::int_u16>(k, j, i); + chk3d<value::int_s8>(k, j, i); + chk3d<value::int_s16>(k, j, i); + } + } + std::cerr << "OK" << std::endl; +}

1 0

milena r1592: Fix compile in graylevel
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix compile in graylevel. * mln/value/graylevel.hh: Add a fwd declaration of convert_. --- graylevel.hh | 2 ++ 1 file changed, 2 insertions(+) Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1591) +++ trunk/milena/mln/value/graylevel.hh (revision 1592) @@ -248,6 +248,8 @@ namespace internal { + // Fwd decl; + template <typename T> struct convert_; // convert for graylevel template <unsigned n>

1 0

milena r1591: Update fits Makefile
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Update fits Makefile. * tests/io/fits/Makefile.am: Compile the fits test only when CFITSIO is available (thanks to cfitsio.m4). --- Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: trunk/milena/tests/io/fits/Makefile.am =================================================================== --- trunk/milena/tests/io/fits/Makefile.am (revision 1590) +++ trunk/milena/tests/io/fits/Makefile.am (revision 1591) @@ -2,9 +2,14 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = \ - fits +check_PROGRAMS = +if CFITSIO + check_PROGRAMS += fits fits_SOURCES = fits.cc + fits_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIO_CPPFLAGS) + fits_LDFLAGS = $(AM_LDFLAGS) $(CFITSIO_LDFLAGS) + +endif TESTS = $(check_PROGRAMS)

1 0

r1590: Improve support for the cfitsio library
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Improve support for the cfitsio library. * build-aux/cfitsio.m4: New. Provide the Autoconf macro OLN_WITH_FREEIMAGEPLUS. Inspired by Olena 0.11's macros AC_WITH_CXX_ZLIB and AC_WITH_CXX_FFTW. This macro is used... * configure.ac: ...here. --- build-aux/cfitsio.m4 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++++ 2 files changed, 52 insertions(+) Index: trunk/configure.ac =================================================================== --- trunk/configure.ac (revision 1589) +++ trunk/configure.ac (revision 1590) @@ -54,6 +54,10 @@ OLN_WITH_FREEIMAGEPLUS AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) +# Cfitsio library. +OLN_WITH_CFITSIO +AM_CONDITIONAL([CFITSIO], [test x$oln_have_cfitsio = xyes]) + ## --------------- ## ## Configuration. ## Index: trunk/build-aux/cfitsio.m4 =================================================================== --- trunk/build-aux/cfitsio.m4 (revision 0) +++ trunk/build-aux/cfitsio.m4 (revision 1590) @@ -0,0 +1,48 @@ +# -*- Autoconf -*- + +# OLN_WITH_CFITSIO +# ---------------------- +# Checks whether the Cfitsio library is available from C++ +# programs. +# +# This macro sets CFITSIO_CXXFLAGS and CFITSIO_LDFLAGS if +# the library is found and its functions available from C++. +AC_DEFUN([OLN_WITH_CFITSIO], +[dnl + AC_REQUIRE([AC_PROG_CXX]) + AC_LANG_PUSH([C++]) + + AC_ARG_WITH([cfitsio], + [AC_HELP_STRING([--with-cfitsio@<:@=DIR@:>@], + [using FreeImage (DIR = prefix for FreeImage installation)])]) + CFITSIO_CXXFLAGS='' + CFITSIO_LDFLAGS='' + if test "x$with_cfitsio" != xno; then + if test -n "$with_cfitsio"; then + CFITSIO_CXXFLAGS="-I${with_cfitsio}/include" + CFITSIO_LDFLAGS="-L${with_cfitsio}/lib" + fi + oln_save_CXXFLAGS=$CXXFLAGS + oln_save_LDFLAGS=$LDFLAGS + CXXFLAGS="$CXXFLAGS $CFITSIO_CXXFLAGS" + LDFLAGS="$LDFLAGS $CFITSIO_LDFLAGS" + oln_have_cfitsio=no + AC_CHECK_HEADER([fitsio.h], + [AC_CHECK_LIB([cfitsio], + [main], + [oln_have_cfitsio=yes + CFITSIO_LDFLAGS="$CFITSIO_LDFLAGS -lcfitsio" + AC_DEFINE([HAVE_CFITSIO], 1, + [Define to 1 if we can use FreeImage]) + ] + )] + ) + CXXFLAGS=$oln_save_CXXFLAGS + LDFLAGS=$oln_save_LDFLAGS + TOOLS_LDFLAGS="$TOOLS_LDFLAGS $CFITSIO_LDFLAGS" + fi + AC_SUBST([CFITSIO_CXXFLAGS]) + AC_SUBST([CFITSIO_LDFLAGS]) + + AC_LANG_POP([C++]) +])

1 0

milena r1589: Add object based rle image and his test
by nivaul_s＠lrde.epita.fr 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add object based rle image and his test. * mln/core/obased_rle_encode.hh: New. * mln/core/obased_rle_image.hh: New. * tests/core/Makefile.am: Add following test. * tests/core/obased_rle_image.cc: New. * mln/core/internal/run_image.hh: Fix compression routine. * mln/core/mono_rle_encode.hh: Fix. * mln/core/rle_encode.hh: Fix. * tests/core/mono_rle_image.cc, * tests/core/rle_image.cc: Display compression. --- mln/core/internal/run_image.hh | 2 mln/core/mono_rle_encode.hh | 6 mln/core/obased_rle_encode.hh | 120 ++++++++++++++++ mln/core/obased_rle_image.hh | 292 +++++++++++++++++++++++++++++++++++++++++ mln/core/rle_encode.hh | 6 tests/core/Makefile.am | 2 tests/core/mono_rle_image.cc | 3 tests/core/obased_rle_image.cc | 78 ++++++++++ tests/core/rle_image.cc | 3 9 files changed, 507 insertions(+), 5 deletions(-) Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 1588) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1589) @@ -68,10 +68,11 @@ unsigned n; image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), c4(), n); - std::cout << n << std::endl; mono_rle_image<point2d, int_u8> rle = mono_rle_encode(level::transform(labels, fold_t()), 2); + std::cout << n << ", compression :" << rle.compression() << std::endl; + level::fill(cmp, literal::zero); level::paste(rle, cmp); Index: trunk/milena/tests/core/obased_rle_image.cc =================================================================== --- trunk/milena/tests/core/obased_rle_image.cc (revision 0) +++ trunk/milena/tests/core/obased_rle_image.cc (revision 1589) @@ -0,0 +1,78 @@ +// Copyright (C) 2007 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/core/obased_rle_image.cc + * + * \brief Test on mln::obased_rle_image.hh. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/transform.hh> +#include <mln/level/paste.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/core/obased_rle_encode.hh> + +struct fold_t : public mln::Function_v2v< fold_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 0 ? 0 : (i - 1) % 255 + 1; } +}; + + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, "../../img/tiny.pgm"); + image2d<int_u8> cmp(lena.domain()); + + unsigned n; + image2d<unsigned> + labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), + c4(), n); + + obased_rle_image<point2d, int_u8> + rle = obased_rle_encode(level::transform(labels, fold_t())); + + std::cout << n << ", compression :" << rle.compression() << std::endl; + + level::fill(cmp, literal::zero); + level::paste(rle, cmp); + + mln_assertion(cmp == level::transform(labels, fold_t())); +} Index: trunk/milena/tests/core/rle_image.cc =================================================================== --- trunk/milena/tests/core/rle_image.cc (revision 1588) +++ trunk/milena/tests/core/rle_image.cc (revision 1589) @@ -64,10 +64,11 @@ unsigned n; image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), c4(), n); - std::cout << n << std::endl; rle_image<point2d, int_u8> rle = rle_encode(level::transform(labels, fold_t())); + std::cout << n << ", compression :" << rle.compression() << std::endl; + level::fill(cmp, literal::zero); level::paste(rle, cmp); Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1588) +++ trunk/milena/tests/core/Makefile.am (revision 1589) @@ -8,6 +8,7 @@ exact \ initialize \ mono_rle_image \ + obased_rle_image \ p_runs \ rle_image \ t_image @@ -17,6 +18,7 @@ exact_SOURCES = exact.cc initialize_SOURCES = initialize.cc mono_rle_image_SOURCES = mono_rle_image.cc +obased_rle_image_SOURCES = obased_rle_image.cc p_runs_SOURCES = p_runs.cc rle_image_SOURCES = rle_image.cc t_image_SOURCES = t_image.cc Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1588) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1589) @@ -94,7 +94,11 @@ else { output.insert(p_run(rstart, len)); - len = 0; + if ((len = (!ignore_zero || ima(p) != literal::zero))) + { + rstart = p; + rvalue = ima(p); + } } } return output; Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1588) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1589) @@ -73,7 +73,7 @@ run_image_<T, P, E>::compression() const { return float(exact(this)->data_->size_mem()) / - float (sizeof(T) * exact(this)->data_->domain_->bbox().npoints()); + float (sizeof(T) * exact(this)->data_->domain_.bbox().npoints()); } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/core/obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/obased_rle_encode.hh (revision 0) +++ trunk/milena/mln/core/obased_rle_encode.hh (revision 1589) @@ -0,0 +1,120 @@ +// Copyright (C) 2007 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_CORE_OBASED_RLE_ENCODE_HH +# define MLN_CORE_OBASED_RLE_ENCODE_HH + +/*! \file mln/core/obased_rle_encode.hh + * + * \brief Definintion of function which encodes an image in obased_rle_image. + */ + +# include <mln/core/obased_rle_image.hh> + +namespace mln +{ + + /*! + ** encode an image class to a obased_rle_image + ** + ** @param input has to respect the Image concept + ** + ** @return obased_rle_image + */ + template <typename I> + obased_rle_image<mln_point(I), mln_value(I)> + obased_rle_encode(const Image& input, bool ignore_zero = true); + +# ifndef MLN_INCLUDE_ONLY + /*! + ** test if Point p1 and p2 are on the same line + */ + template <typename P> + inline + bool + on_the_same_line(const P& p1, const P& p2) + { + const unsigned dim = P::dim; + bool same_line = true; + + for (unsigned n = 0; same_line && n < dim - 1; ++n) + same_line = (p1[n] == p2[n]); + return same_line; + } + + template <typename I> + inline + obased_rle_image<mln_point(I), mln_value(I)> + obased_rle_encode(const Image& input, bool ignore_zero) + { + typedef mln_point(I) P; + + const I& ima = exact(input); + mln_piter(I) p (exact(input).domain()); + unsigned len = 0; + mln_point(I) rstart; + mln_value(I) rvalue; + std::set< mln_value(I) > sv; + + for_all(p) + { + if (!ignore_zero || ima(p) != literal::zero) + sv.insert(ima(p)); + } + + obased_rle_image<mln_point(I), mln_value(I)> output(sv); + for_all(p) + if (!ignore_zero || ima(p) != literal::zero || len) + { + if (len == 0) + { + ++len; + rstart = p; + rvalue = ima(p); + } + else + if (rvalue == ima(p) + && on_the_same_line(rstart, mln_point(I)(p))) + ++len; + else + { + output.insert(p_run(rstart, len), rvalue); + if ((len = (!ignore_zero || ima(p) != literal::zero))) + { + rstart = p; + rvalue = ima(p); + } + } + } + return output; + } + +#endif // ! MLN_INCLUDE_ONLY + +} + +#endif // ! MLN_CORE_OBASED_RLE_ENCODE_HH Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 0) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1589) @@ -0,0 +1,292 @@ +// Copyright (C) 2007 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_CORE_OBASED_RLE_IMAGE_HH +# define MLN_CORE_OBASED_RLE_IMAGE_HH + +/*! \file mln/core/obased_rle_image.hh + * + * \brief Definition of an image with rle encoding. + */ + +# include <mln/core/internal/run_image.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> +# include <mln/core/box.hh> +# include <mln/value/set.hh> +# include <vector> + +namespace mln +{ + + // Fwd decl. + template <typename P, typename T> struct obased_rle_image; + + + namespace internal + { + + template <typename P, typename T> + struct data_< obased_rle_image<P,T> > + { + data_(const std::set<T>& values); + + /// Objects. + std::vector< std::vector<unsigned> > obj_; + + /// Bounding boxes of the objects. + std::vector< accu::bbox > bbox_; + + /// Value of Objects. + std::vector<T> values_; + + /// domain of the image + p_runs_ domain_; + + /// Return the size of the data in memory. + unsigned size_mem() const; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename P, typename T> + struct image_< obased_rle_image<P,T> > : default_image_< T, obased_rle_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + + + /*! \brief RLE image. + * + * + * Parameter \c P is the type of the image points. + * Parameter \c T is the type of the pixel values. + * This image is not point wise accessible. + */ + template <typename P, typename T> + class obased_rle_image : public internal::run_image_< T, P, obased_rle_image<P, T> > + { + public: + typedef T value; + typedef T& lvalue; + typedef const T rvalue; + typedef runs_psite psite; + typedef mln::value::set<T> vset; + typedef p_runs_ pset; + + + /// Skeleton. + typedef obased_rle_image< tag::psite_, tag::value_<T> > skeleton; + + + obased_rle_image(const std::set<T>& values); + + /// Add a new range to the image. + void insert(const p_run& pr, T value); + + /// Read-only access to the image value located at point \p p. + rvalue operator() (const psite& site) const; + + /// Read-write access to the image value located at point \p p. + lvalue operator() (const psite& site); + + /// Test if this image has been initialized. + bool has_data() const; + + /// Give the set of values of the image. + const vset& values() const; + + /// Give the definition domain. + const pset& domain() const; + + /// Give the index vector of the i-th object. + const std::vector<unsigned>& object(unsigned i) const; + + /// Give the bounding box of the i-th object. + const box_& bbox_of_run(unsigned i) const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< obased_rle_image<P,T> > + + template <typename P, typename T> + inline + data_< obased_rle_image<P,T> >::data_(const std::set<T>& values) + : obj_(values.size()), + bbox_(values.size()) + { + std::copy(values.begin(), values.end(), + std::back_inserter(this->values_)); + } + + template <typename P, typename T> + inline + unsigned + data_< obased_rle_image<P,T> >::size_mem() const + { + return domain_.size_mem() + bbox_.size() + * (sizeof(T) + sizeof(box_) + sizeof(std::vector<unsigned>)) + + sizeof(unsigned) * domain_.nruns(); + } + + } // end of namespace mln::internal + + template <typename P, typename T> + inline + obased_rle_image<P, T>::obased_rle_image(const std::set<T>& values) + { + this->data_ = new internal::data_< obased_rle_image<P,T> >(values); + } + + template <typename P, typename T> + inline + bool + obased_rle_image<P, T>::has_data() const + { + return this->data_->values_.size() != 0; + } + + template <typename P, typename T> + inline + const typename obased_rle_image<P, T>::vset& + obased_rle_image<P, T>::values() const + { + return vset::the(); + } + + template <typename P, typename T> + inline + void + obased_rle_image<P, T>::insert(const p_run& pr, T value) + { + mln_assertion(this->data_->values_.size() == 0 || this->data_->domain_.nruns() == 0 || + pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); + this->data_->domain_.insert(pr); + unsigned i; + for (i = 0; i < this->data_->values_.size() + && this->data_->values_[i] != value; ++i) + ; + mln_assertion(i != this->data_->values_.size()); + this->data_->obj_[i].push_back(this->data_->domain_.nruns() - 1); + this->data_->bbox_[i].take(pr.bbox().pmin()); + this->data_->bbox_[i].take(pr.bbox().pmax()); + } + + template <typename P, typename T> + inline + typename obased_rle_image<P, T>::rvalue + obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + const + { + mln_precondition(this->has_data() && + site.pset_pos_() < this->data_->domain_.nruns()); + for (unsigned i = 0; i < this->data_->obj_.size(); ++i) + { + for (typename std::vector<unsigned>::const_iterator it = this->data_->obj_[i].begin(); + it != this->data_->obj_[i].end(); it++) + if (*it == site.pset_pos_()) + return this->data_->values_[i]; + } + mln_assertion(false); + return this->data_->values_[0]; + } + + template <typename P, typename T> + inline + typename obased_rle_image<P, T>::lvalue + obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + { + mln_precondition(this->has_data() && + site.pset_pos_() < this->data_->domain_.nruns()); + for (unsigned i = 0; i < this->data_->obj_.size(); ++i) + { + for (typename std::vector<unsigned>::const_iterator it = this->data_->obj_[i].begin(); + it != this->data_->obj_[i].end(); it++) + if (*it == site.pset_pos_()) + return this->data_->values_[i]; + } + mln_assertion(false); + return this->data_->values_[0]; + } + + template <typename P, typename T> + inline + const typename obased_rle_image<P, T>::pset& + obased_rle_image<P, T>::domain() const + { + return this->data_->domain_; + } + + template <typename P, typename T> + inline + const std::vector<unsigned>& + obased_rle_image<P, T>::object(unsigned i) const + { + mln_assertion(i < this->data_->obj_.size()); + return this->data_->obj_[i]; + } + + template <typename P, typename T> + inline + const box_& + obased_rle_image<P, T>::bbox_of_run(unsigned i) const + { + mln_assertion(i < this->data_->bbox_.size()); + return this->data_->bbox_[i]; + } + + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln + + +#endif // ! MLN_CORE_OBASED_RLE_IMAGE_HH Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1588) +++ trunk/milena/mln/core/rle_encode.hh (revision 1589) @@ -96,7 +96,11 @@ else { output.insert(p_run(rstart, len), rvalue); - len = 0; + if ((len = (!ignore_zero || ima(p) != literal::zero))) + { + rstart = p; + rvalue = ima(p); + } } } return output;

1 0

milena r1588: Complete rgb_full test
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Complete rgb_full test. * tests/value/rgb_full.cc: tests interoperability with more types. --- rgb_full.cc | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 1587) +++ trunk/milena/tests/value/rgb_full.cc (revision 1588) @@ -40,58 +40,58 @@ \ mln_assertion(V1 OP V2); -#define compute_rgb(V1, OP, V2) \ +#define compute_rgb(T, V1, OP, V2) \ \ - rgb8( \ + T( \ V1.red() OP V2.red() , \ V1.green() OP V2.green() , \ V1.blue() OP V2.blue() \ ) -#define compute_rgb_sc(V1, OP, V2) \ +#define compute_rgb_sc(T, V1, OP, V2) \ \ - rgb8( \ + T( \ V1.red() OP V2 , \ V1.green() OP V2 , \ V1.blue() OP V2 \ ) - +// Interop between 2 rgbs. #define test_interop(T1, T2, OP, V1, V2) \ { \ T1 i = V1; \ T2 j = V2; \ \ i = i OP j; \ - sym_compare_assert(i, ==, compute_rgb(V1, OP, V2)); \ + sym_compare_assert(i, ==, compute_rgb(T1, V1, OP, V2)); \ sym_compare_assert(j, ==, V2); \ \ i = V1; \ j = V2; \ \ j = i OP j; \ - sym_compare_assert(j, ==, compute_rgb(V1, OP, V2)); \ + sym_compare_assert(j, ==, compute_rgb(T1,V1, OP, V2)); \ sym_compare_assert(i, ==, V1); \ \ i = V1; \ i OP##= i; \ - sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ + sym_compare_assert(i, ==, compute_rgb(T1,V1, OP, V1)); \ \ i = V1; \ j = V2; \ i OP##= j; \ - sym_compare_assert(i, ==, compute_rgb(V1, OP, V2)); \ + sym_compare_assert(i, ==, compute_rgb(T1,V1, OP, V2)); \ \ j OP##= j; \ - sym_compare_assert(j, ==, compute_rgb(V2, OP, V2)); \ + sym_compare_assert(j, ==, compute_rgb(T1,V2, OP, V2)); \ \ i = V1; \ j = V2; \ j OP##= i; \ - sym_compare_assert(j, ==, compute_rgb(V2, OP, V1)); \ + sym_compare_assert(j, ==, compute_rgb(T1,V2, OP, V1)); \ \ i = V1; \ i OP##= i; \ - sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ + sym_compare_assert(i, ==, compute_rgb(T1,V1, OP, V1)); \ } @@ -102,17 +102,17 @@ T2 j = V2; \ \ i = i OP j; \ - sym_compare_assert(i, ==, compute_rgb_sc(V1, OP, V2)); \ + sym_compare_assert(i, ==, compute_rgb_sc(T1,V1, OP, V2)); \ sym_compare_assert(j, ==, V2); \ \ i = V1; \ i OP##= i; \ - sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ + sym_compare_assert(i, ==, compute_rgb(T1,V1, OP, V1)); \ \ i = V1; \ j = V2; \ i OP##= j; \ - sym_compare_assert(i, ==, compute_rgb_sc(V1, OP, V2)); \ + sym_compare_assert(i, ==, compute_rgb_sc(T1, V1, OP, V2)); \ } int main() @@ -121,17 +121,37 @@ using value::rgb; using value::rgb8; using value::int_u8; + using value::int_u; using literal::blue; using literal::white; { test_interop(rgb8, rgb8, +, rgb8(4,5,6), rgb8(1,2,3)); - test_interop(rgb8, rgb8, -, rgb8(4,5,6), rgb8(1,2,3)) + test_interop(rgb8, rgb8, -, rgb8(4,5,6), rgb8(1,2,3)); + + test_interop(rgb<10>, rgb<10>, +, rgb<10>(4,5,6), rgb<10>(1,2,3)); + test_interop(rgb<10>, rgb<10>, -, rgb<10>(4,5,6), rgb<10>(1,2,3)); + + test_interop(rgb<16>, rgb<16>, +, rgb<16>(4,5,6), rgb<16>(1,2,3)); + test_interop(rgb<16>, rgb<16>, -, rgb<16>(4,5,6), rgb<16>(1,2,3)); + test_interop_sc(rgb8, int, *, rgb8(4,5,6), 4); test_interop_sc(rgb8, int, /, rgb8(40,50,60), 10); + test_interop_sc(rgb8, unsigned, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, unsigned, /, rgb8(40,50,60), 10); + + test_interop_sc(rgb8, float, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, float, /, rgb8(40,50,60), 10); + + test_interop_sc(rgb8, char, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, char, /, rgb8(40,50,60), 10); + test_interop_sc(rgb8, int_u8, *, rgb8(4,5,6), 4); test_interop_sc(rgb8, int_u8, /, rgb8(40,50,60), 10); + + test_interop_sc(rgb8, int_u<7>, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, int_u<7>, /, rgb8(40,50,60), 10); } }

1 0

milena r1587: Work on values
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Work on values. * mln/value/rgb.hh: (rgb<n>(const metal::vec<3, unsigned>& rhs)) New. * tests/value/Makefile.am: Add rgb_full test. * tests/value/int_u8.cc: Update include. * tests/value_macros.hh: Rename as... * tests/value/macros.hh: ...this. * tests/value/rgb_full.cc: Test all operator of rgb, an interop with int and int_u8. --- mln/value/rgb.hh | 8 ++ tests/value/Makefile.am | 6 ++ tests/value/int_u8.cc | 2 tests/value/macros.hh | 104 ++++++++++++++++++++++++++++++++++++ tests/value/rgb_full.cc | 137 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 256 insertions(+), 1 deletion(-) Index: trunk/milena/tests/value_macros.hh (deleted) =================================================================== Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 0) +++ trunk/milena/tests/value/rgb_full.cc (revision 1587) @@ -0,0 +1,137 @@ +// Copyright (C) 2007 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/value_rgb.cc + * + * \brief Tests on mln::value::rgb. + */ + +#include <mln/value/rgb.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/int_u8.hh> +#include <mln/literal/all.hh> + + +#define sym_compare_assert(V1, OP, V2) \ + \ + mln_assertion(V1 OP V2); + +#define compute_rgb(V1, OP, V2) \ + \ + rgb8( \ + V1.red() OP V2.red() , \ + V1.green() OP V2.green() , \ + V1.blue() OP V2.blue() \ + ) + +#define compute_rgb_sc(V1, OP, V2) \ + \ + rgb8( \ + V1.red() OP V2 , \ + V1.green() OP V2 , \ + V1.blue() OP V2 \ + ) + +#define test_interop(T1, T2, OP, V1, V2) \ +{ \ + T1 i = V1; \ + T2 j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, compute_rgb(V1, OP, V2)); \ + sym_compare_assert(j, ==, V2); \ + \ + i = V1; \ + j = V2; \ + \ + j = i OP j; \ + sym_compare_assert(j, ==, compute_rgb(V1, OP, V2)); \ + sym_compare_assert(i, ==, V1); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ + sym_compare_assert(i, ==, compute_rgb(V1, OP, V2)); \ + \ + j OP##= j; \ + sym_compare_assert(j, ==, compute_rgb(V2, OP, V2)); \ + \ + i = V1; \ + j = V2; \ + j OP##= i; \ + sym_compare_assert(j, ==, compute_rgb(V2, OP, V1)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ +} + + +// T1 is rgb, T2 is scalar +#define test_interop_sc(T1, T2, OP, V1, V2) \ +{ \ + T1 i = V1; \ + T2 j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, compute_rgb_sc(V1, OP, V2)); \ + sym_compare_assert(j, ==, V2); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, compute_rgb(V1, OP, V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ + sym_compare_assert(i, ==, compute_rgb_sc(V1, OP, V2)); \ +} + +int main() +{ + using namespace mln; + using value::rgb; + using value::rgb8; + using value::int_u8; + + using literal::blue; + using literal::white; + + { + test_interop(rgb8, rgb8, +, rgb8(4,5,6), rgb8(1,2,3)); + test_interop(rgb8, rgb8, -, rgb8(4,5,6), rgb8(1,2,3)) + test_interop_sc(rgb8, int, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, int, /, rgb8(40,50,60), 10); + + test_interop_sc(rgb8, int_u8, *, rgb8(4,5,6), 4); + test_interop_sc(rgb8, int_u8, /, rgb8(40,50,60), 10); + } +} Index: trunk/milena/tests/value/macros.hh =================================================================== --- trunk/milena/tests/value/macros.hh (revision 0) +++ trunk/milena/tests/value/macros.hh (revision 1587) @@ -0,0 +1,104 @@ +// Copyright (C) 2007 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/value_macros.hh + * + * \brief Utilities to tests value types. + */ + +#define sym_compare_assert(V1, OP, V2) \ + \ + mln_assertion(V1 OP V2); \ + mln_assertion(-V1 OP -V2); \ + mln_assertion(V2 OP V1); \ + mln_assertion(-V2 OP -V1); + +#define asym_compare_assert(V1, OP, V2) \ + \ + mln_assertion(V1 OP V2); \ + mln_assertion(!(-V1 OP -V2)); \ + mln_assertion(-V2 OP -V1); \ + mln_assertion(!(V2 OP V1)); + +// For unsigned types, V1 > V2 if op is minus +#define test_interop(T1, T2, OP, V1, V2) \ + \ +{ \ + T1 i = V1; \ + T2 j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + sym_compare_assert(j, ==, float(V2)); \ + \ + i = V1; \ + j = V2; \ + \ + j = i OP j; \ + sym_compare_assert(j, ==, float(V1 OP V2)); \ + sym_compare_assert(i, ==, float(V1)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(V1 OP V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + \ + j OP##= j; \ + sym_compare_assert(j, ==, float(V2 OP V2)); \ + \ + i = V1; \ + j = V2; \ + j OP##= i; \ + sym_compare_assert(j, ==, float(V2 OP V1)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(((V1 OP V1)))); \ +} + +#define test_operator(T, OP, V1, V2) \ + \ +{ \ + T i = V1; \ + T j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + sym_compare_assert(j, ==, float(V2)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(V1 OP V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ +} Index: trunk/milena/tests/value/int_u8.cc =================================================================== --- trunk/milena/tests/value/int_u8.cc (revision 1586) +++ trunk/milena/tests/value/int_u8.cc (revision 1587) @@ -31,7 +31,7 @@ */ #include <mln/value/int_u8.hh> -#include <tests/value_macros.hh> +#include <tests/value/macros.hh> int main() Index: trunk/milena/tests/value/Makefile.am =================================================================== --- trunk/milena/tests/value/Makefile.am (revision 1586) +++ trunk/milena/tests/value/Makefile.am (revision 1587) @@ -24,6 +24,9 @@ scalar \ set +check_full_PROGRAMS = \ + rgb_full + bool_SOURCES = bool.cc builtin_SOURCES = builtin.cc equiv_SOURCES = equiv.cc @@ -41,4 +44,7 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc +rgb_full_SOURCES = rgb_full.cc + TESTS = $(check_PROGRAMS) +TESTS_FULL = $(check_full_PROGRAMS) Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1586) +++ trunk/milena/mln/value/rgb.hh (revision 1587) @@ -122,6 +122,7 @@ /// Constructor from a metal::vec. rgb<n>(const metal::vec<3, int>& rhs); + rgb<n>(const metal::vec<3, unsigned>& rhs); rgb<n>(const metal::vec<3, int_u<n> >& rhs); /// \{ Constructors with literals. @@ -188,6 +189,13 @@ template <unsigned n> inline + rgb<n>::rgb(const metal::vec<3, unsigned>& v) + { + this->v_ = v; + } + + template <unsigned n> + inline rgb<n>::rgb(const metal::vec<3, int_u<n> >& v) { this->v_ = v;

1 0

milena r1586: Move the tests of mln/value
by Matthieu Garrigues 04 Dec '07

04 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Move the tests of mln/value. * tests/Makefile.am: Move the value tests... * tests/value/Makefile.am: ...here. * tests/value_bool.cc: Rename as... * tests/value/bool.cc: ...this. * tests/value_builtin.cc: Rename as... * tests/value/builtin.cc: ...this. * tests/value_equiv.cc: Rename as... * tests/value/equiv.cc: ...this. * tests/value_float01.cc: Rename as... * tests/value/float01.cc: ...this. * tests/value_float01_bis.cc: Rename as... * tests/value/float01_bis.cc: ...this. * tests/value_float01_f.cc: Rename as... * tests/value/float01_f.cc: ...this. * tests/value_graylevel.cc: Rename as... * tests/value/graylevel.cc: ...this. * tests/value_int_s.cc: Rename as... * tests/value/int_s.cc: ...this. * tests/value_int_s16.cc: Rename as... * tests/value/int_s16.cc: ...this. * tests/value_int_u8.cc: Rename as... * tests/value/int_u8.cc: ...this. * tests/value_interop.cc: Rename as... * tests/value/interop.cc: ...this. * tests/value_label.cc: Rename as... * tests/value/label.cc: ...this. * tests/value_quat.cc: Rename as... * tests/value/quat.cc: ...this. * tests/value_rgb8.cc: Rename as... * tests/value/rgb8.cc: ...this. * tests/value_scalar.cc: Rename as... * tests/value/scalar.cc: ...this. * tests/value_set.cc: Rename as... * tests/value/set.cc: ...this. --- Makefile.am | 27 --- value/Makefile.am | 41 +++++ value/bool.cc | 45 +++++ value/builtin.cc | 120 +++++++++++++++ value/equiv.cc | 58 +++++++ value/float01.cc | 150 +++++++++++++++++++ value/float01_bis.cc | 58 +++++++ value/float01_f.cc | 43 +++++ value/graylevel.cc | 396 +++++++++++++++++++++++++++++++++++++++++++++++++++ value/int_s.cc | 51 ++++++ value/int_s16.cc | 213 +++++++++++++++++++++++++++ value/int_u8.cc | 197 +++++++++++++++++++++++++ value/interop.cc | 114 ++++++++++++++ value/label.cc | 49 ++++++ value/quat.cc | 72 +++++++++ value/rgb8.cc | 71 +++++++++ value/scalar.cc | 94 ++++++++++++ value/set.cc | 65 ++++++++ 18 files changed, 1838 insertions(+), 26 deletions(-) Index: trunk/milena/tests/value_scalar.cc (deleted) =================================================================== Index: trunk/milena/tests/value_quat.cc (deleted) =================================================================== Index: trunk/milena/tests/value_interop.cc (deleted) =================================================================== Index: trunk/milena/tests/value_equiv.cc (deleted) =================================================================== Index: trunk/milena/tests/value_set.cc (deleted) =================================================================== Index: trunk/milena/tests/value_float01_bis.cc (deleted) =================================================================== Index: trunk/milena/tests/value_float01_f.cc (deleted) =================================================================== Index: trunk/milena/tests/value_builtin.cc (deleted) =================================================================== Index: trunk/milena/tests/value_label.cc (deleted) =================================================================== Index: trunk/milena/tests/value_int_s.cc (deleted) =================================================================== Index: trunk/milena/tests/value_rgb8.cc (deleted) =================================================================== Index: trunk/milena/tests/value_int_u8.cc (deleted) =================================================================== Index: trunk/milena/tests/value_float01.cc (deleted) =================================================================== Index: trunk/milena/tests/value_int_s16.cc (deleted) =================================================================== Index: trunk/milena/tests/value_graylevel.cc (deleted) =================================================================== Index: trunk/milena/tests/value_bool.cc (deleted) =================================================================== Index: trunk/milena/tests/value/set.cc =================================================================== --- trunk/milena/tests/value/set.cc (revision 0) +++ trunk/milena/tests/value/set.cc (revision 1586) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 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/value_set.cc + * + * \brief Tests on mln::value::set_<T>. + */ + +#include <mln/value/int_u8.hh> +#include <mln/value/set.hh> + + + +template <typename T> +void test() +{ + typedef mln::value::set<T> S; + S s; + + mln_fwd_viter(S) v(s); + for_all(v) + std::cout << v << ' '; + std::cout << std::endl; + + mln_bkd_viter(S) w(s); + for_all(w) + std::cout << w << ' '; + std::cout << std::endl; +} + + + +int main() +{ + using namespace mln; + + test<bool>(); +// test<unsigned char>(); +// test<unsigned short>(); +// test<value::int_u8>(); +} Index: trunk/milena/tests/value/bool.cc =================================================================== --- trunk/milena/tests/value/bool.cc (revision 0) +++ trunk/milena/tests/value/bool.cc (revision 1586) @@ -0,0 +1,45 @@ +// Copyright (C) 2007 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/value_bool.cc + * + * \brief Tests on mln::value::set. + */ + +#include <mln/trait/value_.hh> +#include <mln/value/set.hh> + + +int main() +{ + using namespace mln; + + mln_assertion(mln_card(bool) == 2); + + value::set<bool> B; + std::cout << B << std::endl; +} Index: trunk/milena/tests/value/rgb8.cc =================================================================== --- trunk/milena/tests/value/rgb8.cc (revision 0) +++ trunk/milena/tests/value/rgb8.cc (revision 1586) @@ -0,0 +1,71 @@ +// Copyright (C) 2007 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/value_rgb8.cc + * + * \brief Tests on mln::value::rgb8. + */ + +#include <mln/value/rgb8.hh> +#include <mln/literal/all.hh> + + +int main() +{ + using namespace mln; + using value::rgb8; + using value::rgb; + + using literal::blue; + using literal::white; + + { + rgb8 v; + v.red() = 0; + v.green() = 1; + v.blue() = 2; + rgb8 c(0, 1, 2); + + std::cout << c << std::endl; + std::cout << v << std::endl; + + mln_assertion(c == c); + mln_assertion(c == v); + v.green() = 255; + std::cout << v << std::endl; + + mln_assertion(v != c); + + rgb<20> b = blue; + std::cout < w = white; + std::cout << w << std::endl; + + mln_assertion(b != w); + } +} Index: trunk/milena/tests/value/float01_bis.cc =================================================================== --- trunk/milena/tests/value/float01_bis.cc (revision 0) +++ trunk/milena/tests/value/float01_bis.cc (revision 1586) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 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/value_float01_bis.cc + * + * \brief Tests on mln::value::float01. + */ + +#include <iostream> +#include <mln/value/float01_8.hh> +#include <mln/value/float01_16.hh> + +int main() +{ + using namespace mln::value; + +// float01_8 a; + + std::cout << "a = " << std::endl; + std::cout << "testsetestest\n"<< std::endl; + +// gl8 a = white; +// gl16 b = white; +// assert((a == b) == true); +// gl8 c = (a + b) / 2; +// assert(c == white); +// c = a; +// assert(c == white); + +// c = (a * 2) / 2; +// assert(c == white); + + std::cout << "testsetestest\n"<< std::endl; +} Index: trunk/milena/tests/value/scalar.cc =================================================================== --- trunk/milena/tests/value/scalar.cc (revision 0) +++ trunk/milena/tests/value/scalar.cc (revision 1586) @@ -0,0 +1,94 @@ +// Copyright (C) 2007 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/value_scalar.cc + * + * \brief Tests on mln::value::scalar. + */ + +#include <iostream> + +#include <mln/value/scalar.hh> +#include <mln/value/int_u8.hh> + + +template <typename T> +void foo(const T& t) +{ + std::cout << mln::value::scalar(t) << std::endl; +} + +namespace mln +{ + namespace trait + { +// template <typename O1, typename O2> +// struct set_binary_< op::less, Object,O1, Object,O2 > { typedef bool ret; }; + +// template < typename Vl, typename Vr > +// struct set_binary_< op::less, mln::value::Scalar, Vl, mln::value::Scalar, Vr > +// { +// typedef double ret; +// }; + +// template <typename B, typename O> +// struct set_binary_< op::less, +// mln::value::Integer, B, +// mln::value::Scalar, O > +// { +// typedef bool ret; +// }; + + } +} + + +int main() +{ + using namespace mln; + +// int i = 51; +// foo(i); +// foo( value::scalar(i) ); + + + { + bool b; + value::int_u8 i, j; + + b = 1 > value::scalar(j); + + b = value::scalar(j) < value::scalar(j); + +// mln_trait_op_less_(value::scalar_< value::int_u8 >, value::scalar_< value::int_u8 >) tmp; +// void* v = tmp; + +// mln_trait_op_less_(int, value::scalar_< value::int_u8 >) tmp; +// void* v = tmp; + } + +} Index: trunk/milena/tests/value/int_u8.cc =================================================================== --- trunk/milena/tests/value/int_u8.cc (revision 0) +++ trunk/milena/tests/value/int_u8.cc (revision 1586) @@ -0,0 +1,197 @@ +// Copyright (C) 2007 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/value_int_u8.cc + * + * \brief Tests on mln::value::int_u8. + */ + +#include <mln/value/int_u8.hh> +#include <tests/value_macros.hh> + + +int main() +{ + using namespace mln; + using value::int_u8; + + int_u8 i = 3, j; + + { + int k = 0; + k += value::scalar(k); + } + + // Assignment. + { + i = 51; + sym_compare_assert(i, ==, 51); + + i = 51u; + sym_compare_assert(i, ==, 51); + + signed char c = 51; + i = c; + sym_compare_assert(i, ==, 51); + + j = i; + sym_compare_assert(j, ==, 51); + + i = 3; + sym_compare_assert(3.0f, ==, i); + sym_compare_assert(i, !=, 2.99f); + + // Error at run-time as expected :-) + // i = 256; + // i = -1; + // i = 255, ++i; + } + + + // Comparaison + { + int_u8 i = 42; + int_u8 j = 51; + + asym_compare_assert(i, <, j); + asym_compare_assert(j, >, i); + asym_compare_assert(i, <, 12345.f); + asym_compare_assert(12345.f, >, i); + + sym_compare_assert(i, !=, j); + sym_compare_assert(i, ==, 42.f); + sym_compare_assert(42.f, ==, i); + sym_compare_assert(i, !=, 69.f); + sym_compare_assert(69.f, !=, i); + + } + + // Addition. + { + test_operator(int_u8, +, 5, 1); + test_interop(int_u8, int, +, 5, -1); + test_interop(int_u8, char, +, 4, 2); + test_interop(int_u8, unsigned char, +, 4, 2); + + int_u8 i = 234; + + i++; + sym_compare_assert(i, ==, 235.f); + + ++i; + sym_compare_assert(i, ==, 236.f); + + i = +i; + sym_compare_assert(i, ==, 236.f); + + } + + // Soustraction + { + test_operator(int_u8, -, 100, 5); + test_interop(int_u8, int, -, 100, 5); + test_interop(int_u8, char, -, 100, 5); + test_interop(int_u8, unsigned char, -, 5, 5); + + int_u8 c = 255; + c -= c; + + sym_compare_assert(c, ==, 0.f); + + int_u8 i = 236; + + i--; + sym_compare_assert(i, ==, 235.f); + + --i; + sym_compare_assert(i, ==, 234.f); + + sym_compare_assert(-i, ==, -234.f); + + sym_compare_assert(i * -2, !=, 0.f); + std::cout << (i) << " * -2 = " + << (i * -2) << ' ' + << (-2 * i) << ' ' + << (-2 * int(i)) + << std::endl; + } + + // Multiplication + { + test_operator(int_u8, *, 5, 1); + test_interop(int_u8, int, *, 5, 1); + test_interop(int_u8, char, *, 4, 2); + test_interop(int_u8, unsigned char, *, 4, 2); + + int_u8 c = 255; + + c *= 0; + sym_compare_assert(c, ==, 0.f); + + i *= 2; + int k; k *= i; + + unsigned char d = 0; + i *= d; + sym_compare_assert(i, ==, 0.f); + + // Error at run-time as expected :-) + // i = 128; + // i *= 2; + + } + + // Division + { + test_operator(int_u8, /, 5, 1); + test_interop(int_u8, int, /, 5, 1); + test_interop(int_u8, char, /, 4, 2); + test_interop(int_u8, unsigned char, /, 4, 2); + + int_u8 c = 200; + + c /= 1; + sym_compare_assert(c, ==, 200.f); + c /= 2; + sym_compare_assert(c, ==, 100.f); + + int_u8 d = 2; + c /= 2; + sym_compare_assert(c, ==, 50.f); + + } + + + // Modulo + { + test_operator(int_u8, %, 5, 10); + test_interop(int_u8, int, %, 5, 10); + test_interop(int_u8, char, %, 4, 20); + test_interop(int_u8, unsigned char, %, 4, 20); + } + +} Index: trunk/milena/tests/value/float01.cc =================================================================== --- trunk/milena/tests/value/float01.cc (revision 0) +++ trunk/milena/tests/value/float01.cc (revision 1586) @@ -0,0 +1,150 @@ +// Copyright (C) 2007 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/value_float01.cc + * + * \brief Tests on mln::value::float01. + */ + +#include <iostream> + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + +#include <mln/value/float01_8.hh> +#include <mln/value/float01_16.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/transform.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/win/rectangle2d.hh> +#include <mln/level/median.hh> +#include <mln/level/compare.hh> + + +using namespace mln; +using namespace mln::value; +using mln::value::int_u8; + +float fi(int) { return 0.5; } +int ii(int) { return 1; } + +float fd(double) { return 0.5; } +int id(double) { return 1; } + + +struct tofloat01 : mln::Function_v2v<tofloat01> +{ + + typedef float01_<16> result; + result operator()(int_u8 v) const + { + result ret(double(v) / (mln_max(int_u8))); + // std::cout << v << "-> " << ret << std::endl; + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef int_u8 result; + result operator()(float01_<16> v) const + { + result ret = int(v.value() * 255); + //std::cout << v << "-> " << ret << std::endl; + return ret; + } +}; + +int main() +{ + win::rectangle2d rect(51, 51); + border::thickness = 52; + + float01_8 a(0.5); + float01_16 b(0.5); + + assert(approx_equal(b,a)); + + std::cout << b << std::endl; + b = b + 0.2; + std::cout << b << std::endl; + b = b - 0.2; + std::cout << b << std::endl; + b = b * 1.5; + std::cout << b << std::endl; + b = b / 4.6; + std::cout << b << std::endl; + + b = b / 3; + std::cout << b << std::endl; + b = b * 1; + std::cout << b << std::endl; + + a = fi(a); + a = ii(a); + a = fd(a); + a = id(a); + + b = a; + a = b; + b = 0.34; + std::cout < + lena = io::pgm::load<int_u8>("../img/lena.pgm"), + ref(lena.domain()); + + image2d<float01_16> out(lena.domain()); + image2d<float01_16> tmp(lena.domain()); + + level::transform(lena, tofloat01(), tmp); + + level::median(tmp, rect, out); + level::median(lena, rect, ref); + + + level::transform(out, to8bits(), lena); + + io::pgm::save(lena, "out.pgm"); + io::pgm::save(ref, "ref.pgm"); + mln_assertion(lena == ref); + //debug::println(out); + } + + +} Index: trunk/milena/tests/value/builtin.cc =================================================================== --- trunk/milena/tests/value/builtin.cc (revision 0) +++ trunk/milena/tests/value/builtin.cc (revision 1586) @@ -0,0 +1,120 @@ +// Copyright (C) 2007 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/value_builtin.cc + * + * \brief Tests on mln::trait::op with a builtin. + */ + +#include <iostream> + +#include <mln/value/scalar.hh> +#include <mln/value/int_u8.hh> + + +namespace mln +{ + namespace trait + { + + namespace op + { + + template <typename T> + struct test; + + template <typename L, typename R> + struct test_2; + + } + + // unary + + template < typename S > + struct set_unary_< op::test, mln::value::Scalar, S > + { + typedef double ret; + }; + +// template <typename I> +// struct set_unary_< op::test, +// mln::value::Integer, I > +// { +// typedef float ret; +// }; + +// template <typename I> +// struct set_unary_< op::test, +// mln::value::Built_In, I > +// { +// typedef bool ret; +// }; + + + // binary + + template < typename S1, typename S2 > + struct set_binary_< op::test_2, + mln::value::Scalar, S1, + mln::value::Scalar, S2 > + { + typedef double ret; + }; + +// template < typename I, typename S > +// struct set_binary_< op::test_2, +// mln::value::Integer, I, +// mln::value::Scalar, S > +// { +// typedef float ret; +// }; + +// template < typename B, typename S > +// struct set_binary_< op::test_2, +// mln::value::Built_In, B, +// mln::value::Scalar, S > +// { +// typedef bool ret; +// }; + + } +} + + +int main() +{ + using namespace mln; + + { + mln::trait::solve_binary< trait::op::test_2, int, value::scalar_< value::int_u8 > >::ret tmp; + double& d = tmp; + } + { + mln::trait::solve_unary< trait::op::test, int >::ret tmp; + double& d = tmp; + } +} Index: trunk/milena/tests/value/quat.cc =================================================================== --- trunk/milena/tests/value/quat.cc (revision 0) +++ trunk/milena/tests/value/quat.cc (revision 1586) @@ -0,0 +1,72 @@ +// Copyright (C) 2007 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/value_quat.cc + * + * \brief Tests on mln::value::quat. + */ + +#include <iostream> + +#include <mln/value/quat.hh> + + +int main() +{ + using namespace mln; + + value::quat q1(3.f, 4.f, 1.6f, 0.5f); + value::quat q2(1.2, make::vec(3, 6, 4)); + value::quat q3(make::vec(1.3, 3., -6., 4.)); + + std::cout << q1 << std::endl; + std::cout << q2 << std::endl; + std::cout << q3 << std::endl; + + std::cout << q1.s() << std::endl; + + q1.s() = 2.6; + std::cout << q1 << std::endl; + + std::cout << q1.v() << std::endl; + + q2.v() = make::vec(1.4, 5.9, 3.1); + std::cout << q2 << std::endl; + + std::cout << q2 * q3 << std::endl; + + mln_assertion(! q3.is_unit()); + q3.set_unit(); + std::cout << q3 << std::endl; + mln_assertion(q3.is_unit()); + + std::cout << q2.conj() << std::endl; + std::cout << q2.inv() << std::endl; + std::cout << norm::l2(q2.to_vec()) << ' ' << norm::l2(q2.inv().to_vec()) << std::endl; + std::cout << q2.inv().inv() << std::endl; + +} Index: trunk/milena/tests/value/float01_f.cc =================================================================== --- trunk/milena/tests/value/float01_f.cc (revision 0) +++ trunk/milena/tests/value/float01_f.cc (revision 1586) @@ -0,0 +1,43 @@ +// Copyright (C) 2007 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/value_float01_f.cc + * + * \brief Tests on mln::value::float01_f. + */ + +#include <iostream> +#include <mln/value/float01_f.hh> + +int main() +{ + using mln::value::float01_f; + + float01_f x = 0.5; + std::cout << x + 21.25 << std::endl; + x = x + 34; +} Index: trunk/milena/tests/value/int_s.cc =================================================================== --- trunk/milena/tests/value/int_s.cc (revision 0) +++ trunk/milena/tests/value/int_s.cc (revision 1586) @@ -0,0 +1,51 @@ +// Copyright (C) 2007 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/value_int_s.cc + * + * \brief Tests on mln::value::int_s. + */ + +#include <mln/value/int_s.hh> +#include <mln/value/int_u.hh> + + +int main() +{ + using namespace mln; + using value::int_s; + + { + int_s<7> i = 3; + i = 2; + mln_assertion(i == 2); + mln_assertion(i != 3); + + mln_assertion(-i == -2); + mln_assertion(-3 * i == -6); + } +} Index: trunk/milena/tests/value/label.cc =================================================================== --- trunk/milena/tests/value/label.cc (revision 0) +++ trunk/milena/tests/value/label.cc (revision 1586) @@ -0,0 +1,49 @@ +// Copyright (C) 2007 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/value_label.cc + * + * \brief Tests on mln::value::label. + */ + +#include <mln/value/int_u8.hh> +#include <mln/value/label.hh> + + + +int main() +{ + using namespace mln; + using value::int_u8; + using value::label; + + int_u8 i = 51; + label<8> l = 50; + ++l; + mln_assertion(l == l); + mln_assertion(i == l.to_enc()); +} Index: trunk/milena/tests/value/interop.cc =================================================================== --- trunk/milena/tests/value/interop.cc (revision 0) +++ trunk/milena/tests/value/interop.cc (revision 1586) @@ -0,0 +1,114 @@ +// Copyright (C) 2007 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/value_interop.cc + * + * \brief Tests interoperability on mln::value::*. + */ + +#include <mln/value/int_u8.hh> +#include <mln/value/int_s8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/float01_8.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + using value::int_u16; + using value::float01_8; + + + // Tests on int_u<n> alone. + { + int_u8 i; + i = 51; + i *= 2; + } + + using value::int_s8; + + +// { +// // Operations on int_u<n> +// int_u8 i = 128; +// int_u16 j = 42; +// int_s8 k = 42; +// float01_8 x; + +// (j = j + i) = i + j; +// mln_assertion(j == (128 + 42)); + +// (k = j - i) = i - j; +// mln_assertion(k == (-42)); + +// j = 2; +// (j = j * i) = i * j; +// mln_assertion(j == (2 * 128)); + +// (x = (j / i) / ((j / i) + 0.1)) +// = (i / j) / ((i / j) + 0.1); + +// // std::cout < and int / float +// int_u16 j = 42; +// int_s8 k = 42; +// float x; + +// // int +// (k = j - 123) = 123 - j; +// (j = j + 123) = 123 + j; +// (j = j * 4) = 4 * j; + +// (j = j / 4) = 4 / j; + +// // float +// x = (j / 4.5 * 3.4 + 3.5 - 5.6) / 0.0234; +// } + + +// { +// // Operations on int_u<n> and float01_8 +// int_u16 j = 42; +// float01_8 x = 0.456; + +// x = x / j; +// mln_assertion(x < 0 && x < 1); + +// x = x * j; +// mln_assertion(x < 0 && x < 1); + +// x = x * j; +// mln_assertion(x < 0 && x < 1); +// } + +} Index: trunk/milena/tests/value/int_s16.cc =================================================================== --- trunk/milena/tests/value/int_s16.cc (revision 0) +++ trunk/milena/tests/value/int_s16.cc (revision 1586) @@ -0,0 +1,213 @@ +// Copyright (C) 2007 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/value_int_s16.cc + * + * \brief Tests on mln::value::int_s16. + */ + +#include <mln/value/int_s16.hh> + +#define test_operator(T, OP, V1, V2) \ + \ +{ \ + T i = V1; \ + T j = V2; \ + \ + i = i OP j; \ + mln_assertion(i == (V1 OP V2)); \ + mln_assertion(j == V2); \ + \ + i OP##= i; \ + mln_assertion(i == (((V1 OP V2) OP (V1 OP V2)))); \ +} + +#define test_interop(T1, T2, OP, V1, V2) \ + \ +{ \ + T1 i = V1; \ + T2 j = V2; \ + \ + i = i OP j; \ + mln_assertion(i == (V1 OP V2)); \ + mln_assertion(j == V2); \ + \ + i OP##= i; \ + mln_assertion(i == (((V1 OP V2) OP (V1 OP V2)))); \ +} + + +// test_operator + +int main() +{ + using namespace mln; + using value::int_s16; + + int_s16 i = 3, j; + + // Assignment. + { + i = 51; + mln_assertion(i == 51); + + i = 51u; + mln_assertion(i == 51); + + signed char c = 51; + i = c; + mln_assertion(i == 51); + + j = i; + mln_assertion(j == 51); + + i = 3; + mln_assertion(3.0f == i); + mln_assertion(i != 2.99f); + + // Error at run-time as expected :-) + // i = 256; + // i = -1; + // i = 255, ++i; + } + + + // Comparaison + { + int_s16 i = 42; + int_s16 j = 51; + + mln_assertion(i < j); + mln_assertion(j > i); + mln_assertion(i < 12345); + mln_assertion(12345 > i); + + mln_assertion(i != j); + mln_assertion(i == 42); + mln_assertion(42 == i); + mln_assertion(i != 69); + mln_assertion(69 != i); + + } + + // Addition. + { + test_operator(int_s16, +, -5, 1); + test_interop(int_s16, int, +, 5, -1); + test_interop(int_s16, char, +, -4, 2); + test_interop(int_s16, unsigned char, +, 4, 2); + + int_s16 i = 234; + + i++; + mln_assertion(i == 235); + + ++i; + mln_assertion(i == 236); + + i = +i; + mln_assertion(i == 236); + + } + + // Soustraction + { + test_operator(int_s16, -, 100, 5); + test_interop(int_s16, int, -, 100, 5); + test_interop(int_s16, char, -, 100, 5); + test_interop(int_s16, unsigned char, -, 100, 5); + + int_s16 c = 255; + c -= c; + + mln_assertion(c == 0); + + int_s16 i = 236; + + i--; + mln_assertion(i == 235); + + --i; + mln_assertion(i == 234); + + mln_assertion(-i == -234); + } + + // Multiplication + { + test_operator(int_s16, *, 5, 1); + test_interop(int_s16, int, *, 5, 1); + test_interop(int_s16, char, *, 4, 2); + test_interop(int_s16, unsigned char, *, 4, 2); + + int_s16 c = 255; + + c *= 0; + mln_assertion(c == 0); + + i *= 2; + int k; k *= i; + + unsigned char d = 0; + i *= d; + mln_assertion(i == 0); + + // Error at run-time as expected :-) + // i = 128; + // i *= 2; + + } + + // Division + { + test_operator(int_s16, /, 5, 1); + test_interop(int_s16, int, /, 5, 1); + test_interop(int_s16, char, /, 4, 2); + test_interop(int_s16, unsigned char, /, 4, 2); + + int_s16 c = 200; + + c /= 1; + mln_assertion(c == 200); + c /= 2; + mln_assertion(c == 100); + + int_s16 d = 2; + c /= 2; + mln_assertion(c == 50); + + } + + + // Modulo + { + test_operator(int_s16, %, 5, 10); + test_interop(int_s16, int, %, 5, 10); + test_interop(int_s16, char, %, 4, 20); + test_interop(int_s16, unsigned char, %, 4, 20); + } +} Index: trunk/milena/tests/value/Makefile.am =================================================================== --- trunk/milena/tests/value/Makefile.am (revision 1585) +++ trunk/milena/tests/value/Makefile.am (revision 1586) @@ -1,3 +1,44 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = \ + concept \ + builtin + +check_PROGRAMS = \ + bool \ + builtin \ + equiv \ + float01_bis \ + float01 \ + float01_f \ + graylevel \ + interop \ + int_s16 \ + int_s \ + int_u8 \ + label \ + quat \ + rgb8 \ + scalar \ + set + +bool_SOURCES = bool.cc +builtin_SOURCES = builtin.cc +equiv_SOURCES = equiv.cc +float01_bis_SOURCES = float01_bis.cc +float01_SOURCES = float01.cc +float01_f_SOURCES = float01_f.cc +graylevel_SOURCES = graylevel.cc +interop_SOURCES = interop.cc +int_s16_SOURCES = int_s16.cc +int_s_SOURCES = int_s.cc +int_u8_SOURCES = int_u8.cc +label_SOURCES = label.cc +quat_SOURCES = quat.cc +rgb8_SOURCES = rgb8.cc +scalar_SOURCES = scalar.cc +set_SOURCES = set.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/value/equiv.cc =================================================================== --- trunk/milena/tests/value/equiv.cc (revision 0) +++ trunk/milena/tests/value/equiv.cc (revision 1586) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 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/value_equiv.cc + * + * \brief Tests on mln::value::equiv. + * + * \todo Rename "::to_equiv()" as "::to_equiv_()". + */ + +#include <mln/value/int_u8.hh> +#include <mln/value/equiv.hh> + + +int main() +{ + using namespace mln; + + value::int_u8 i = 51; + + { + const unsigned& u = i.to_equiv(); + mln_assertion(u == 51); + } + { + const unsigned& u = value::equiv(i); + mln_assertion(u == 51); + } + { + const unsigned& u = value::equiv( value::scalar(i) ); + mln_assertion(u == 51); + } + +} Index: trunk/milena/tests/value/graylevel.cc =================================================================== --- trunk/milena/tests/value/graylevel.cc (revision 0) +++ trunk/milena/tests/value/graylevel.cc (revision 1586) @@ -0,0 +1,396 @@ +// Copyright (C) 2007 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/value_graylevel.cc + * + * \brief Tests on mln::value::graylevel. Tests operations between + * graylevel of different encodings. + * + */ + +#include <mln/value/graylevel.hh> +#include <mln/value/int_u8.hh> + +#include <mln/literal/black.hh> +#include <mln/literal/white.hh> + + + +int main() +{ + using namespace mln::value; + + using mln::literal::white; + using mln::literal::black; + + gl8 a = 255; + gl8 b = 255; + + // Constructions + { + gl8 x; + + gl8 a = 12; + gl8 b(12); + mln_assertion(a == b); + +// gl16 c = 2335; +// gl8 d = c; +// mln_assertion(c == d); + + gl8 d = 250; + gl16 c = d; + mln_assertion(c == d); + + gl8 e = gray(white); + mln_assertion(e == white); + + gl8 f = 12; + gl8 g = f; + gl8 h(f); + + mln_assertion(f == g); + mln_assertion(h == g); + } + + // Literals + { + gl8 a(white); + gl16 b(white); + + mln_assertion(a == b); + mln_assertion(a.value() == float(255)); + mln_assertion(b.value() == float(65535)); + mln_assertion(a == white); + mln_assertion(b == white); + + gl8 c = (gl16(white) + white) / 2; + std::cout << "gl8 c = (white + white) / 2; => c.value() == " + << int(c.value()) << std::endl; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + + c = (gl8(white) + white) / 2; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + + c = (gray(white) + white) / 2; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + + a = black; + b = black; + + mln_assertion(a == b); + mln_assertion(a.value() == float(0)); + mln_assertion(b.value() == float(0)); + +// c = (black + black) / 2; +// mln_assertion(c == black); +// mln_assertion(c.value() == float(0)); + } + + // Assigment + { + gl8 a; + gl16 b; + + a = white; + mln_assertion(a == white); + mln_assertion(a.value() == float(255)); + + a = 23; + mln_assertion(a != white); + mln_assertion(a != black); + mln_assertion(a.value() == float(23)); + + b = 2; + mln_assertion(b != white); + mln_assertion(b != black); + mln_assertion(b.value() == float(2)); + + a = b; + mln_assertion(a.value() == float(2 / 257)); + + signed char c = 51; + a = c; + mln_assertion(a.value() == float(51)); + + // bounds + a = 255; + mln_assertion(a.value() == float(255)); + a = 0; + mln_assertion(a.value() == float(0)); + } + + // Addition + { + gl8 a; + gl16 b; + + // gl8 <- gl8 + gl8 + a = 42; + a += a; + mln_assertion(a.value() == float(84)); + + a = 42; + a = a + a; + mln_assertion(a.value() == float(84)); + + // gl8 <- gl8 + gl16 + a = 42; + b = 16969; + a = a + b; + mln_assertion(a.value() == float((42 + b.value() / 257) )); + a = 42; + b = 16969; + a += b; + mln_assertion(a.value() == float((42 + b.value() / 257) )); + + + // gl16 <- gl8 + gl16 + a = 42; + b = 16969; + b += a; + mln_assertion(b.value() == float((42 * 257 + 16969) )); + + a = 42; + b = 16969; + b = a + b; + mln_assertion(b.value() == float((42 * 257 + 16969) )); + + // misc + a = 255; + b = 0; + a = a + b; + mln_assertion(a.value() == float(255)); + + a = 0; + b = 65535; + a = a + b; + mln_assertion(a.value() == float(255)); + } + + + // Soustraction + { + gl8 a; + gl16 b; + + // gl8 <- gl8 - gl8 + a = 42; + a -= a; + mln_assertion(a == black); + + a = 42; + a = a - a; + mln_assertion(a == black); + + // gl8 <- gl8 - gl16 + a = 42; + b = 5969; + + a = b; + std::cout << "a.value() = " << int(a.value()) << std::endl; + std::cout << "should be " << (b.value() / 256) << std::endl; + + a = 42; + a = a - b; + std::cout << int(a.value()) << ":" << (42 - b.value() / 256) << std::endl; + mln_assertion(a.value() == float((42 - b.value() / 256) )); + a = 42; + b = 16969; + a -= b; + mln_assertion(a.value() == float((42 - b.value() / 257) )); + + + // gl16 <- gl8 - gl16 + a = 100; + b = 16969; + b -= a; + mln_assertion(b.value() == float((100 * 257 - 16969) )); + + a = 100; + b = 16969; + b = a - b; + mln_assertion(b.value() == float((100 * 257 - 16969) )); + + // misc + a = 255; + b = 0; + a = a - b; + mln_assertion(a.value() == float(255)); + + a = 0; + b = 65535; + a = a - b; + mln_assertion(a.value() == float(255)); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a - b; + d = a - b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 42; + gl16 b = 5969; + gl8 p; + p = b; + gl8 q; + gl8 r; + + q = a - p; + r = a - b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } + + // Multiplication + { + gl8 a; + gl16 b; + + // gl8 <- gl8 * gl8 + a = 21; + a *= a; + mln_assertion(a.value() == 42); + + a = 21; + a = a * a; + mln_assertion(a.value() == 42); + + // gl8 <- gl8 * gl16 + a = 10; + b = 5969; + a = a * b; + mln_assertion(a.value() == float((10 * b.value() / 257) )); + + a = 10; + b = 16969; + a *= b; + mln_assertion(a.value() == float((10 * b.value() / 257) )); + + + // gl16 <- gl8 * gl16 + a = 10; + b = 5969; + b *= a; + mln_assertion(b.value() == float((10 * 257 * 5969) )); + + a = 10; + b = 5969; + b = a * b; + mln_assertion(b.value() == float((10 * 257 * 5969) )); + + // misc + a = 255; + b = 0; + a = a * b; + mln_assertion(a == black); + + a = 0; + b = 65535; + a = a * b; + mln_assertion(a == black); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a * b; + d = a * b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 7; + gl16 b = 5969; + + gl8 p; + p = b; + + gl8 q; + gl8 r; + + q = a * p; + r = a * b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } + + + // Not exhaustive + + // gl8 a(white); + // gl16 b(white); + // mln_assertion(a == b); + // // mln_assertion(-a == -b); + + // mln_assertion(a.value() != b.value()); + + // { + // gl8 c = (a + b) / 2; + // mln_assertion(c == white); + // mln_assertion(c.value() == 255); + + // c = a; + // mln_assertion(c == white); + + // c = (a * 2) / 2; + // mln_assertion(c == white); + + // c = c / 6; + // } + + // { + // gl8 c = (white + white) / 2; + // mln_assertion(c == white); + // mln_assertion(c.value() == float(255)); + // } + + // gray g(black); +} Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1585) +++ trunk/milena/tests/Makefile.am (revision 1586) @@ -19,6 +19,7 @@ norm \ set \ util \ + value \ win check_PROGRAMS = \ @@ -131,19 +132,6 @@ trait_value \ translate_image \ \ - value_float01_bis \ - value_float01 \ - value_float01_f \ - value_graylevel \ - value_interop \ - value_int_s16 \ - value_int_s \ - value_int_u8 \ - value_label \ - value_quat \ - value_rgb8 \ - value_scalar \ - value_set \ vec \ \ window1d \ @@ -262,19 +250,6 @@ trait_value_SOURCES = trait_value.cc translate_image_SOURCES = translate_image.cc -value_float01_bis_SOURCES = value_float01_bis.cc -value_float01_SOURCES = value_float01.cc -value_float01_f_SOURCES = value_float01_f.cc -value_graylevel_SOURCES = value_graylevel.cc -value_interop_SOURCES = value_interop.cc -value_int_s16_SOURCES = value_int_s16.cc -value_int_s_SOURCES = value_int_s.cc -value_int_u8_SOURCES = value_int_u8.cc -value_label_SOURCES = value_label.cc -value_quat_SOURCES = value_quat.cc -value_rgb8_SOURCES = value_rgb8.cc -value_scalar_SOURCES = value_scalar.cc -value_set_SOURCES = value_set.cc vec_SOURCES = vec.cc window1d_SOURCES = window1d.cc

1 0

milena r1585: Fix Makefiles
by Matthieu Garrigues 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix Makefiles. * tests/Makefile.am: Add geom directory. * tests/accu/Makefile.am: Add new tests to the makefile. * tests/geom/Makefile.am: Likewise. * tests/accu/min.cc: Remove debug. * tests/accu/pair.cc: Finish the test. * tests/fi_adaptor.cc: Add documentation. --- Makefile.am | 2 ++ accu/Makefile.am | 24 +++++++++++++++++++++++- accu/min.cc | 3 +-- accu/pair.cc | 17 +++++------------ fi_adaptor.cc | 30 +++++++++++++++++++++--------- geom/Makefile.am | 41 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 93 insertions(+), 24 deletions(-) Index: trunk/milena/tests/accu/pair.cc =================================================================== --- trunk/milena/tests/accu/pair.cc (revision 1584) +++ trunk/milena/tests/accu/pair.cc (revision 1585) @@ -33,6 +33,8 @@ #include <mln/core/image2d.hh> #include <mln/value/int_u8.hh> +#include <mln/accu/pair.hh> +#include <mln/accu/max.hh> #include <mln/accu/mean.hh> int main() @@ -40,7 +42,7 @@ using namespace mln; { - accu::pair_<accu::mean<int>, accu::max<int> > mean; + accu::pair_<accu::mean_<int>, accu::max_<int> > mean; mean.take(10); mean.take(9); @@ -54,16 +56,7 @@ mean.take(1); mean.take(0); - mln_assertion(mean.to_result() == 5); - } - - { - mln_accu_with_(accu::mean, int) mean; - - mean.take(10); - mean.take(8); - mean.take(0); - - mln_assertion(mean.to_result() == 6); + mln_assertion(mean.to_result().first == 5); + mln_assertion(mean.to_result().second == 10); } } Index: trunk/milena/tests/accu/min.cc =================================================================== --- trunk/milena/tests/accu/min.cc (revision 1584) +++ trunk/milena/tests/accu/min.cc (revision 1585) @@ -54,8 +54,7 @@ // accu::compute< accu::min >(ima); - std::cout << accu::compute< accu::val<accu::min> >(ima) - << std::endl; + mln_assertion(accu::compute< accu::val<accu::min> >(ima) == 1); // std::cout << accu::compute< accu::min >(ima) // << std::endl; Index: trunk/milena/tests/accu/Makefile.am =================================================================== --- trunk/milena/tests/accu/Makefile.am (revision 1584) +++ trunk/milena/tests/accu/Makefile.am (revision 1585) @@ -4,11 +4,33 @@ check_PROGRAMS = \ all \ +bbox \ +compute \ +count \ +histo \ +max \ +max_h \ +mean \ +median \ min \ - nil +min_h \ +min_max \ +nil \ +pair all_SOURCES = all.cc +bbox_SOURCES = bbox.cc +compute_SOURCES = compute.cc +count_SOURCES = count.cc +histo_SOURCES = histo.cc +max_SOURCES = max.cc +max_h_SOURCES = max_h.cc +mean_SOURCES = mean.cc +median_SOURCES = median.cc min_SOURCES = min.cc +min_h_SOURCES = min_h.cc +min_max_SOURCES = min_max.cc nil_SOURCES = nil.cc +pair_SOURCES = pair.cc TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/geom/Makefile.am =================================================================== --- trunk/milena/tests/geom/Makefile.am (revision 1584) +++ trunk/milena/tests/geom/Makefile.am (revision 1585) @@ -1,3 +1,44 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ +bbox \ +max_col \ +max_ind \ +max_row \ +max_sli \ +min_col \ +min_ind \ +min_row \ +min_sli \ +ncols \ +ninds \ +nrows \ +nslis \ +pmin_pmax \ +seed2tiling \ +seed2tiling_roundness \ +shift \ +sym + +bbox_SOURCES = bbox.cc +max_col_SOURCES = max_col.cc +max_ind_SOURCES = max_ind.cc +max_row_SOURCES = max_row.cc +max_sli_SOURCES = max_sli.cc +min_col_SOURCES = min_col.cc +min_ind_SOURCES = min_ind.cc +min_row_SOURCES = min_row.cc +min_sli_SOURCES = min_sli.cc +ncols_SOURCES = ncols.cc +ninds_SOURCES = ninds.cc +nrows_SOURCES = nrows.cc +nslis_SOURCES = nslis.cc +pmin_pmax_SOURCES = pmin_pmax.cc +seed2tiling_SOURCES = seed2tiling.cc +seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc +shift_SOURCES = shift.cc +sym_SOURCES = sym.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1584) +++ trunk/milena/tests/Makefile.am (revision 1585) @@ -12,6 +12,7 @@ debug \ draw \ fun \ + geom \ histo \ level \ logical \ @@ -289,6 +290,7 @@ fi_adaptor_SOURCES = fi_adaptor.cc fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) + endif TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/fi_adaptor.cc =================================================================== --- trunk/milena/tests/fi_adaptor.cc (revision 1584) +++ trunk/milena/tests/fi_adaptor.cc (revision 1585) @@ -48,19 +48,29 @@ using namespace mln; +using namespace mln::value; + int main() { using typename value::int_u8; using typename value::rgb8; - // FIXME: Is this necessary? See FreeImagePlus' documentation. - FreeImage_Initialise(); + { + // FIXME: + // Under Linux or under any *nix OS (i.e. under Unix or MacOSX), you need to call + // FreeImage_Initialise at the beginning of your main function and you need to call + // FreeImage_DeInitialise at the end of this main function (this is not needed when + // using FreeImage as a .SO). + + //FreeImage_Initialise(); win::rectangle2d rect(51, 51); - fi_adaptor< image2d<int_u8> > adaptor; + fi_adaptor< image2d< int_u<8> > > adaptor; adaptor.load("../img/lena.pgm"); + display::save (adaptor); + display::show (adaptor, "xv"); image2d<int_u8> ima(adaptor.domain()); @@ -72,12 +82,14 @@ display::show (adaptor, "xv"); // FIXME: Likewise. - /* A comment here (probably coming from an example of FreeImagePlus' - documentation) used to say: - - call this ONLY when linking with FreeImage as a static library - + /* Check if this statement holds in our case. Maybe we need to involve Libtool in to handle FreeImagePlus properly. */ - FreeImage_DeInitialise(); + //FreeImage_DeInitialise(); + } + + { + + } + }

1 0

milena r1584: New full tests for level subdirectory
by Guillaume Duhamel 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> New full tests for level subdirectory. New tests. * tests/level/abs_full.cc, * tests/level/fill_full.cc: New full tests for level. Update. * tests/level/fill.cc: Remove useless header. --- abs_full.cc | 186 ++++++++++++++++++++++++++++ fill.cc | 1 fill_full.cc | 379 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 565 insertions(+), 1 deletion(-) Index: trunk/milena/tests/level/fill_full.cc =================================================================== --- trunk/milena/tests/level/fill_full.cc (revision 0) +++ trunk/milena/tests/level/fill_full.cc (revision 1584) @@ -0,0 +1,379 @@ +// Copyright (C) 2007 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_full.cc + * + * \brief Tests on mln::level::fill + */ + + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/literal/origin.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/rgb16.hh> + + +#include <mln/debug/iota.hh> + +#include <mln/level/fill.hh> + +#include <mln/fun/p2v/iota.hh> + + + + + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + + +namespace mln +{ + template <typename I> + void + chck(Image& ima_, const mln_value(I) v) + { + I& ima = exact(ima_); + + level::fill(ima, v); + + { + mln_piter(I) p (ima.domain ()); + for_all(p) + mln_assertion (ima(p) == v); + } + } + + template <typename V> + void + chk(const V max) + { + box1d b1(literal::origin, point1d(1)); + box2d b2(literal::origin, point2d(1,1)); + box3d b3(literal::origin, point3d(1,1,1)); + f_box1d_t f_b1(b1); + f_box2d_t f_b2(b2); + f_box3d_t f_b3(b3); + unsigned sli = 2; + unsigned row = 3; + unsigned col = 16; + + + (std::cerr << "in 1d ... ").flush (); + { + typedef image1d<V> I; + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + { + I ima(i); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + typedef image2d<V> I; + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I ima(j, i); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + typedef image3d<V> I; + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I ima(k, j, i); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + + + (std::cerr << "in subimage 1d ... ").flush (); + { + typedef image1d<V> I; + typedef sub_image<I, box1d> J; + + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + { + I image(i); + J ima(image, b1); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in subimage 2d ... ").flush (); + { + typedef image2d<V> I; + typedef sub_image<I, box2d> J; + + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I image(j, i); + J ima(image, b2); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in subimage 3d ... ").flush (); + { + typedef image3d<V> I; + typedef sub_image<I, box3d> J; + + + for (V v = 0; v < max; ++v) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I image(k, j, i); + J ima(image, b3); + chck (ima, v); + } + } + std::cerr << "OK" << std::endl; + } + + template <typename V> + void + chk_rgb(const unsigned min, const unsigned max) + { + box1d b1(literal::origin, point1d(1)); + box2d b2(literal::origin, point2d(1,1)); + box3d b3(literal::origin, point3d(1,1,1)); + f_box1d_t f_b1(b1); + f_box2d_t f_b2(b2); + f_box3d_t f_b3(b3); + unsigned sli = 2; + unsigned row = 3; + unsigned col = 16; + + + (std::cerr << "in 1d ... ").flush (); + { + typedef image1d<V> I; + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + { + I ima(i); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + typedef image2d<V> I; + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I ima(j, i); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + typedef image3d<V> I; + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I ima(k, j, i); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + + + (std::cerr << "in subimage 1d ... ").flush (); + { + typedef image1d<V> I; + typedef sub_image<I, box1d> J; + + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + { + I image(i); + J ima(image, b1); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in subimage 2d ... ").flush (); + { + typedef image2d<V> I; + typedef sub_image<I, box2d> J; + + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I image(j, i); + J ima(image, b2); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in subimage 3d ... ").flush (); + { + typedef image3d<V> I; + typedef sub_image<I, box3d> J; + + + for (unsigned r = min; r < max; ++r) + for (unsigned g = min; g < max; ++g) + for (unsigned b = min; b < max; ++b) + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I image(k, j, i); + J ima(image, b3); + chck (ima, V(r,g,b)); + } + } + std::cerr << "OK" << std::endl; + } + +} + + +int main() +{ + using namespace mln; + + std::cerr << "Tests level::fill:" << std::endl; + std::cerr << "on int:" << std::endl; + chk<int>(1000); + std::cerr << "on unsigned:" << std::endl; + chk<unsigned>(1000); + std::cerr << "on int_u8:" << std::endl; + chk<value::int_u8>(16); + std::cerr << "on int_u16:" << std::endl; + chk<value::int_u16>(1000); + std::cerr << "on int_s8:" << std::endl; + chk<value::int_s8>(16); + std::cerr << "on int_s16:" << std::endl; + chk<value::int_s16>(1000); + std::cerr << "on rgb8:" << std::endl; + chk_rgb<value::rgb8>(140, 150); + std::cerr << "on rgb16:" << std::endl; + chk_rgb<value::rgb16>(60000, 60015); +} Index: trunk/milena/tests/level/fill.cc =================================================================== --- trunk/milena/tests/level/fill.cc (revision 1583) +++ trunk/milena/tests/level/fill.cc (revision 1584) @@ -31,7 +31,6 @@ */ #include <mln/core/image2d.hh> -#include <mln/core/sub_image.hh> #include <mln/level/fill.hh> int main() Index: trunk/milena/tests/level/abs_full.cc =================================================================== --- trunk/milena/tests/level/abs_full.cc (revision 0) +++ trunk/milena/tests/level/abs_full.cc (revision 1584) @@ -0,0 +1,186 @@ +// Copyright (C) 2007 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/abs.cc + * + * \brief Tests on mln::level::abs. + */ + + +#include <mln/core/image1d.hh> +#include <mln/core/image2d.hh> +#include <mln/core/image3d.hh> +#include <mln/core/sub_image.hh> + +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/literal/origin.hh> + +#include <mln/value/int_s8.hh> +#include <mln/value/int_s16.hh> + + +#include <mln/debug/iota.hh> + +#include <mln/arith/times.hh> +#include <mln/level/abs.hh> + + + + +struct f_box1d_t : mln::Function_p2b< f_box1d_t > +{ + f_box1d_t(const mln::box1d& b) + : b_(b) + { + } + mln::box1d b_; + bool operator()(const mln::point1d& p) const + { + return b_.has(p); + } +}; + +struct f_box2d_t : mln::Function_p2b< f_box2d_t > +{ + f_box2d_t(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + +struct f_box3d_t : mln::Function_p2b< f_box3d_t > +{ + f_box3d_t(const mln::box3d& b) + : b_(b) + { + } + mln::box3d b_; + bool operator()(const mln::point3d& p) const + { + return b_.has(p); + } +}; + + + +namespace mln +{ + template <typename I> + void + chck(const Image& ref_) + { + const I& ref = exact(ref_); + I out (ref.domain ()); + + level::abs(ref, out); + mln_piter(I) p (ref.domain ()); + for_all(p) + if (ref(p) > 0) + mln_assertion (ref(p) == out(p)); + else + mln_assertion (ref(p) == -out(p)); + } + + template <typename V> + void + chk(unsigned sli, unsigned row, unsigned col) + { + box1d b1(literal::origin, point1d(1)); + box2d b2(literal::origin, point2d(1,1)); + box3d b3(literal::origin, point3d(1,1,1)); + f_box1d_t f_b1(b1); + f_box2d_t f_b2(b2); + f_box3d_t f_b3(b3); + + (std::cerr << "in 1d ... ").flush (); + { + typedef image1d<V> I; + + for (unsigned i = 1; i < col; ++i) + { + I ima(i); + debug::iota(ima); + chck (ima * -1); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 2d ... ").flush (); + { + typedef image2d<V> I; + + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + { + I ima(j, i); + debug::iota(ima); + chck (ima * -1); + } + } + std::cerr << "OK" << std::endl; + + (std::cerr << "in 3d ... ").flush (); + { + typedef image3d<V> I; + + for (unsigned i = 1; i < col; ++i) + for (unsigned j = 1; j < row; ++j) + for (unsigned k = 1; k < sli; ++k) + { + I ima(k, j, i); + debug::iota(ima); + chck (ima * -1); + } + } + std::cerr << "OK" << std::endl; + } +} + + + + + +int main() +{ + using namespace mln; + + std::cerr << "Tests level::abs:" << std::endl; + std::cerr << "on int:" << std::endl; + chk<int>(4, 16, 64); + std::cerr << "on int_s8:" << std::endl; + chk<value::int_s8>(2, 2, 2); + std::cerr << "on int_s16:" << std::endl; + chk<value::int_s16>(4, 16, 64); +} +

1 0

milena r1582: Complete the macros in Meta Accumlator
by Matthieu Garrigues 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Complete the macros in Meta Accumlator. * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, mln_accu_result_) New. --- 0 files changed

2 1

milena r1583: Generate mono_rle_image and add his test
by nivaul_s＠lrde.epita.fr 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Simon Nivault <simon.nivault(a)lrde.epita.fr> Generate mono_rle_image and add his test. * mln/core/mono_rle_encode.hh: New. * mln/core/mono_rle_image.hh: New. * tests/core/mono_rle_image.cc: New. * tests/core/Makefile.am: Add test. * tests/core/rle_image.cc: Fix typo. --- mln/core/mono_rle_encode.hh | 107 ++++++++++++++++++++ mln/core/mono_rle_image.hh | 230 +++++++++++++++++++++++++++++++++++++++++++ tests/core/Makefile.am | 2 tests/core/mono_rle_image.cc | 79 ++++++++++++++ tests/core/rle_image.cc | 4 5 files changed, 420 insertions(+), 2 deletions(-) Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 0) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1583) @@ -0,0 +1,79 @@ +// Copyright (C) 2007 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/mono_rle_iimage.cc + * + * \brief Test on mln::labeling::blobs. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/transform.hh> +#include <mln/level/paste.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/core/mono_rle_encode.hh> + +struct fold_t : public mln::Function_v2v< fold_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 0 ? 0 : (i - 1) % 255 + 1; } +}; + +struct only_two_t : public mln::Function_v2v< only_two_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 2 ? 2 : 0; } +}; + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, "../../img/tiny.pgm"); + image2d<int_u8> cmp(lena.domain()); + + unsigned n; + image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), + c4(), n); + std::cout << n << std::endl; + + mono_rle_image<point2d, int_u8> rle = mono_rle_encode(level::transform(labels, fold_t()), 2); + + level::fill(cmp, literal::zero); + level::paste(rle, cmp); + + mln_assertion(cmp == level::transform(labels, only_two_t())); +} Index: trunk/milena/tests/core/rle_image.cc =================================================================== --- trunk/milena/tests/core/rle_image.cc (revision 1582) +++ trunk/milena/tests/core/rle_image.cc (revision 1583) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling/blobs.cc +/*! \file tests/core/rle_image.cc * - * \brief Test on mln::labeling::blobs. + * \brief Test on mln::rle_image.hh. */ #include <mln/core/image2d.hh> Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1582) +++ trunk/milena/tests/core/Makefile.am (revision 1583) @@ -7,6 +7,7 @@ clone \ exact \ initialize \ + mono_rle_image \ p_runs \ rle_image \ t_image @@ -15,6 +16,7 @@ clone_SOURCES = clone.cc exact_SOURCES = exact.cc initialize_SOURCES = initialize.cc +mono_rle_image_SOURCES = mono_rle_image.cc p_runs_SOURCES = p_runs.cc rle_image_SOURCES = rle_image.cc t_image_SOURCES = t_image.cc Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 0) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1583) @@ -0,0 +1,107 @@ +// Copyright (C) 2007 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_CORE_MONO_RLE_ENCODE_HH +# define MLN_CORE_MONO_RLE_ENCODE_HH + +/*! \file mln/core/mono_rle_encode.hh + * + * \brief Definintion of function which encodes an image in mono_rle_image. + */ + +# include <mln/core/mono_rle_image.hh> + +namespace mln +{ + + /*! + ** encode an image class to a mono_rle_image + ** + ** @param input has to respect the Image concept + ** + ** @return mono_rle_image + */ + template <typename I> + mono_rle_image<mln_point(I), mln_value(I)> + mono_rle_encode(const Image& input, mln_value(I) val); + +# ifndef MLN_INCLUDE_ONLY + /*! + ** test if Point p1 and p2 are on the same line + */ + template <typename P> + inline + bool + on_the_same_line(const P& p1, const P& p2) + { + const unsigned dim = P::dim; + bool same_line = true; + + for (unsigned n = 0; same_line && n < dim - 1; ++n) + same_line = (p1[n] == p2[n]); + return same_line; + } + + template <typename I> + inline + mono_rle_image<mln_point(I), mln_value(I)> + mono_rle_encode(const Image& input, mln_value(I) val) + { + typedef mln_point(I) P; + + mono_rle_image<mln_point(I), mln_value(I)> output(val); + const I& ima = exact(input); + mln_piter(I) p (exact(input).domain()); + unsigned len = 0; + mln_point(I) rstart; + + for_all(p) + if (ima(p) == val || len) + { + if (len == 0) + { + ++len; + rstart = p; + } + else + if (val == ima(p) + && on_the_same_line(rstart, mln_point(I)(p))) + ++len; + else + { + output.insert(p_run(rstart, len)); + len = 0; + } + } + return output; + } + +#endif // ! MLN_INCLUDE_ONLY + +} + +#endif // ! MLN_CORE_MONO_RLE_ENCODE_HH Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 0) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1583) @@ -0,0 +1,230 @@ +// Copyright (C) 2007 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_CORE_MONO_RLE_IMAGE_HH +# define MLN_CORE_MONO_RLE_IMAGE_HH + +/*! \file mln/core/mono_rle_image.hh + * + * \brief Definition of an image with rle encoding. + */ + +# include <mln/core/internal/run_image.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> +# include <mln/value/set.hh> +# include <vector> + +namespace mln +{ + + // Fwd decl. + template <typename P, typename T> struct mono_rle_image; + + + namespace internal + { + + template <typename P, typename T> + struct data_< mono_rle_image<P,T> > + { + data_(const T& val); + + /// Image value. + T value; + + /// domain of the image + p_runs_ domain_; + + /// Return the size of the data in memory. + unsigned size_mem() const; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename P, typename T> + struct image_< mono_rle_image<P,T> > : default_image_< T, mono_rle_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + + + /*! \brief Mono RLE image. + * + * RLE image with only one colour. + * + * Parameter \c P is the type of the image points. + * Parameter \c T is the type of the pixel values. + * This image is not point wise accessible. + */ + template <typename P, typename T> + class mono_rle_image : public internal::run_image_< T, P, mono_rle_image<P, T> > + { + public: + typedef T value; + typedef T& lvalue; + typedef const T rvalue; + typedef runs_psite psite; + typedef mln::value::set<T> vset; + typedef p_runs_ pset; + + + /// Skeleton. + typedef mono_rle_image< tag::psite_, tag::value_<T> > skeleton; + + + mono_rle_image(const T& val); + + /// Add a new range to the image. + void insert(const p_run& pr); + + /// Read-only access to the image value located at point \p p. + rvalue operator() (const psite& site) const; + + /// Read-write access to the image value located at point \p p. + lvalue operator() (const psite& site); + + /// Test if this image has been initialized. + bool has_data() const; + + /// Give the set of values of the image. + const vset& values() const; + + /// Give the definition domain. + const pset& domain() const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< mono_rle_image<I,S> > + + template <typename P, typename T> + inline + data_< mono_rle_image<P,T> >::data_(const T& val) + : value(val) + { + } + + template <typename P, typename T> + inline + unsigned + data_< mono_rle_image<P,T> >::size_mem() const + { + return sizeof(T) + domain_.size_mem(); + } + + } // end of namespace mln::internal + + template <typename P, typename T> + inline + mono_rle_image<P, T>::mono_rle_image(const T& val) + { + this->data_ = new internal::data_< mono_rle_image<P,T> >(val); + } + + template <typename P, typename T> + inline + bool + mono_rle_image<P, T>::has_data() const + { + return true; + } + + template <typename P, typename T> + inline + const typename mono_rle_image<P, T>::vset& + mono_rle_image<P, T>::values() const + { + return vset::the(); + } + + template <typename P, typename T> + inline + void + mono_rle_image<P, T>::insert(const p_run& pr) + { + if (this->data_->domain_.nruns() != 0) + mln_assertion(pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); + this->data_->domain_.insert(pr); + } + + template <typename P, typename T> + inline + typename mono_rle_image<P, T>::rvalue + mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + const + { + mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); + return this->data_->value; + } + + template <typename P, typename T> + inline + typename mono_rle_image<P, T>::lvalue + mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + { + mln_precondition(site.pset_pos_() < this->data_->domain_.nruns()); + return this->data_->value; + } + + template <typename P, typename T> + inline + const typename mono_rle_image<P, T>::pset& + mono_rle_image<P, T>::domain() const + { + return this->data_->domain_; + } + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln + + +#endif // ! MLN_CORE_MONO_RLE_IMAGE_HH

1 0

milena r1580: Add tests for mln/accu
by Matthieu Garrigues 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add tests for mln/accu. * tests/accu/bbox.cc: New. * tests/accu/compute.cc: New. * tests/accu/count.cc: New. * tests/accu/histo.cc: New. * tests/accu/max.cc: New. * tests/accu/max_h.cc: New. * tests/accu/mean.cc: New. * tests/accu/median.cc: New. * tests/accu/min_h.cc: New. * tests/accu/min_max.cc: New. * tests/accu/pair.cc: New. --- bbox.cc | 50 +++++++++++++++++++++++++++++++++++++++++++ compute.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++ count.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++ histo.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ max.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ max_h.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ mean.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ median.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ min_h.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ min_max.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pair.cc | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 691 insertions(+) Index: trunk/milena/tests/accu/pair.cc =================================================================== --- trunk/milena/tests/accu/pair.cc (revision 0) +++ trunk/milena/tests/accu/pair.cc (revision 1580) @@ -0,0 +1,69 @@ +// Copyright (C) 2007 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/accu/mean.cc + * + * \brief Tests on mln::accu::mean. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> + +#include <mln/accu/mean.hh> + +int main() +{ + using namespace mln; + + { + accu::pair_<accu::mean<int>, accu::max<int> > mean; + + mean.take(10); + mean.take(9); + mean.take(8); + mean.take(7); + mean.take(6); + mean.take(5); + mean.take(4); + mean.take(3); + mean.take(2); + mean.take(1); + mean.take(0); + + mln_assertion(mean.to_result() == 5); + } + + { + mln_accu_with_(accu::mean, int) mean; + + mean.take(10); + mean.take(8); + mean.take(0); + + mln_assertion(mean.to_result() == 6); + } +} Index: trunk/milena/tests/accu/compute.cc =================================================================== --- trunk/milena/tests/accu/compute.cc (revision 0) +++ trunk/milena/tests/accu/compute.cc (revision 1580) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 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/accu/compute.cc + * + * \brief Tests on mln::accu::compute. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> + +#include <mln/accu/compute.hh> +#include <mln/level/compute.hh> + +#include <mln/accu/min.hh> + +int main() +{ + using namespace mln; + using typename value::int_u8; + + // FIXME : make this test compile +// int_u8 vs[3][3] = { {9,8,7}, +// {6,5,4}, +// {3,2,1} }; + +// image2d<int_u8> ima = make::image2d(vs); +// int a = accu::compute<accu::min>(ima); + +// std::cout << a << std::endl; +} Index: trunk/milena/tests/accu/max_h.cc =================================================================== --- trunk/milena/tests/accu/max_h.cc (revision 0) +++ trunk/milena/tests/accu/max_h.cc (revision 1580) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 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/accu/max_h.cc + * + * \brief Tests on mln::accu::max_h. + */ + +#include <mln/value/int_u8.hh> +#include <mln/accu/max_h.hh> + + +int main() +{ + using namespace mln; + using namespace mln::value; + + accu::max_h< set<int_u8> > a; + + a.take(1); + a.take(1); + a.take(1); + + a.take(2); + a.take(2); + a.take(2); + a.take(2); + a.take(2); + a.take(2); + + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + mln_assertion(a.to_result() == 234); +} Index: trunk/milena/tests/accu/median.cc =================================================================== --- trunk/milena/tests/accu/median.cc (revision 0) +++ trunk/milena/tests/accu/median.cc (revision 1580) @@ -0,0 +1,69 @@ +// Copyright (C) 2007 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/accu/median.cc + * + * \brief Tests on mln::accu::median. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> + +#include <mln/accu/median.hh> + +int main() +{ + using namespace mln; + + { + accu::median< value::set<value::int_u8> > med; + + med.take(10); + med.take(9); + med.take(8); + med.take(7); + med.take(6); + med.take(5); + med.take(4); + med.take(3); + med.take(2); + med.take(1); + med.take(0); + + mln_assertion(med.to_result() == 5); + } + + { + accu::median< value::set<value::int_u8> > med; + + med.take(10); + med.take(7); + med.take(0); + + mln_assertion(med.to_result() == 7); + } +} Index: trunk/milena/tests/accu/mean.cc =================================================================== --- trunk/milena/tests/accu/mean.cc (revision 0) +++ trunk/milena/tests/accu/mean.cc (revision 1580) @@ -0,0 +1,69 @@ +// Copyright (C) 2007 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/accu/mean.cc + * + * \brief Tests on mln::accu::mean. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> + +#include <mln/accu/mean.hh> + +int main() +{ + using namespace mln; + + { + mln_accu_with_(accu::mean, int) mean; + + mean.take(10); + mean.take(9); + mean.take(8); + mean.take(7); + mean.take(6); + mean.take(5); + mean.take(4); + mean.take(3); + mean.take(2); + mean.take(1); + mean.take(0); + + mln_assertion(mean.to_result() == 5); + } + + { + mln_accu_with_(accu::mean, int) mean; + + mean.take(10); + mean.take(8); + mean.take(0); + + mln_assertion(mean.to_result() == 6); + } +} Index: trunk/milena/tests/accu/max.cc =================================================================== --- trunk/milena/tests/accu/max.cc (revision 0) +++ trunk/milena/tests/accu/max.cc (revision 1580) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 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/accu/max.cc + * + * \brief Tests on mln::accu::max. + */ + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> + +#include <mln/accu/nil.hh> +#include <mln/accu/max.hh> +#include <mln/accu/p.hh> +#include <mln/accu/v.hh> +#include <mln/accu/compute.hh> + +#include <mln/level/compute.hh> + + +int main() +{ + using namespace mln; + image2d<int> ima(3, 3); + debug::iota(ima); + mln_assertion(level::compute< accu::max >(ima) == 9); + mln_assertion(level::compute< accu::max_<int> >(ima) == 9); + + accu::compute< accu::nil >(ima); // No-op. + + // FIXME : what's the difference between + // accu::compute< accu::max >(ima); + + mln_assertion( accu::compute< accu::val<accu::max> >(ima) == 9); + +// std::cout << accu::compute< accu::max >(ima) +// << std::endl; +} Index: trunk/milena/tests/accu/histo.cc =================================================================== --- trunk/milena/tests/accu/histo.cc (revision 0) +++ trunk/milena/tests/accu/histo.cc (revision 1580) @@ -0,0 +1,70 @@ +// Copyright (C) 2007 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/accu/histo.cc + * + * \brief Tests on mln::accu::histo. + */ + +#include <mln/value/int_u8.hh> + +#include <mln/accu/histo.hh> + + +int main() +{ + using namespace mln; + using namespace mln::value; + + accu::histo< set<int_u8> > a; + + a.take(1); + a.take(1); + a.take(1); + + + a.take(2); + a.take(2); + a.take(2); + + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + + mln_assertion(a[1] == 3); + mln_assertion(a[2] == 3); + mln_assertion(a[234] == 6); + + a.untake(234); + mln_assertion(a[234] == 5); + + // Abort + // a.untake(235); +} Index: trunk/milena/tests/accu/min_max.cc =================================================================== --- trunk/milena/tests/accu/min_max.cc (revision 0) +++ trunk/milena/tests/accu/min_max.cc (revision 1580) @@ -0,0 +1,69 @@ +// Copyright (C) 2007 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/accu/min_max.cc + * + * \brief Tests on mln::accu::min_max. + */ + +// FIXME : This test doesn't compile without this include. +#include <mln/value/builtin/integers.hh> + +#include <mln/accu/min_max.hh> + +int main() +{ + using namespace mln; + + { + mln_accu_with_(accu::min_max, int) accu; + + accu.take(7); + + mln_assertion(accu.to_result().first == 7); + mln_assertion(accu.to_result().second == 7); + } + + { + mln_accu_with_(accu::min_max, int) accu; + + accu.take(10); + accu.take(9); + accu.take(8); + accu.take(7); + accu.take(6); + accu.take(5); + accu.take(4); + accu.take(3); + accu.take(2); + accu.take(1); + accu.take(0); + + mln_assertion(accu.to_result().first == 0); + mln_assertion(accu.to_result().second == 10); + } +} Index: trunk/milena/tests/accu/count.cc =================================================================== --- trunk/milena/tests/accu/count.cc (revision 0) +++ trunk/milena/tests/accu/count.cc (revision 1580) @@ -0,0 +1,54 @@ +// Copyright (C) 2007 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/accu/count.cc + * + * \brief Tests on mln::accu::count. + */ + +#include <mln/value/int_u8.hh> + +#include <mln/accu/count.hh> + + +int main() +{ + using namespace mln; + + { + accu::count_<value::int_u8> accu; + mln_assertion(accu.to_result() == 0); + } + + { + accu::count_<value::int_u8> accu; + for (int i = 0; i < 200; i++) + accu.take(i); + mln_assertion(accu.to_result() == 200); + } + +} Index: trunk/milena/tests/accu/min_h.cc =================================================================== --- trunk/milena/tests/accu/min_h.cc (revision 0) +++ trunk/milena/tests/accu/min_h.cc (revision 1580) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 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/accu/min_h.cc + * + * \brief Tests on mln::accu::min_h. + */ + +#include <mln/value/int_u8.hh> +#include <mln/accu/min_h.hh> + + +int main() +{ + using namespace mln; + using namespace mln::value; + + accu::min_h< set<int_u8> > a; + + a.take(42); + a.take(42); + a.take(42); + + a.take(200); + a.take(200); + a.take(200); + a.take(200); + a.take(200); + a.take(200); + + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + a.take(234); + mln_assertion(a.to_result() == 42); +} Index: trunk/milena/tests/accu/bbox.cc =================================================================== --- trunk/milena/tests/accu/bbox.cc (revision 0) +++ trunk/milena/tests/accu/bbox.cc (revision 1580) @@ -0,0 +1,50 @@ +// Copyright (C) 2007 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/accu/nil.cc + * + * \brief Tests on mln::accu::nil. + */ + + +#include <mln/core/point2d.hh> +#include <mln/core/box2d.hh> + +#include <mln/accu/bbox.hh> + +int main() +{ + using namespace mln; + accu::bbox<point2d> accu; + + accu.take_as_init(make::point2d(0,0)); + accu.take(make::point2d(0,5)); + accu.take(make::point2d(5,0)); + accu.take(make::point2d(5,5)); + + mln_assertion(accu.to_result() == make::box2d(0,0,5,5)); +}

1 0

milena r1579: Review the mln/geom directory
by Matthieu Garrigues 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Review the mln/geom directory. * mln/geom/bbox.hh: Active a precondition. * mln/geom/chamfer.hh: Add documentation. --- bbox.hh | 3 ++- chamfer.hh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Index: trunk/milena/mln/geom/bbox.hh =================================================================== --- trunk/milena/mln/geom/bbox.hh (revision 1578) +++ trunk/milena/mln/geom/bbox.hh (revision 1579) @@ -35,6 +35,7 @@ */ # include <mln/core/concept/image.hh> +# include <mln/core/concept/point_set.hh> # include <mln/core/concept/box.hh> # include <mln/core/concept/window.hh> # include <mln/core/concept/weighted_window.hh> @@ -125,7 +126,7 @@ { mln_precondition(exact(pset).npoints() != 0); box_<mln_point(S)> tmp = impl::bbox_(exact(pset)); - // FIXME: mln_postcondition(tmp <= pset.bbox()); + mln_postcondition(tmp <= exact(pset).bbox()); return tmp; } Index: trunk/milena/mln/geom/chamfer.hh =================================================================== --- trunk/milena/mln/geom/chamfer.hh (revision 1578) +++ trunk/milena/mln/geom/chamfer.hh (revision 1579) @@ -47,7 +47,7 @@ namespace geom { - + /// Apply chamfer algorithm to a binary image. template <typename I, typename W> mln_ch_value( I, unsigned ) chamfer(const Image& input_, const W& w_win_,

1 0

milena r1578: Fix warnings in io
by Matthieu Garrigues 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix warnings in io. * mln/io/abort.hh: Fix a compile error. * mln/io/pnm/save_header.hh: Fix a 'unused parameter.' warning. --- abort.hh | 2 +- pnm/save_header.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: trunk/milena/mln/io/abort.hh =================================================================== --- trunk/milena/mln/io/abort.hh (revision 1577) +++ trunk/milena/mln/io/abort.hh (revision 1578) @@ -45,7 +45,7 @@ namespace internal { /// The way to abort when an error occur in io processing. - void abort() + void abort(); # ifndef MLN_INCLUDE_ONLY Index: trunk/milena/mln/io/pnm/save_header.hh =================================================================== --- trunk/milena/mln/io/pnm/save_header.hh (revision 1577) +++ trunk/milena/mln/io/pnm/save_header.hh (revision 1578) @@ -64,7 +64,7 @@ } inline - void save_max_val(bool&, std::ofstream& file) + void save_max_val(bool&, std::ofstream&) { }

1 0

milena r1577: Creation of rle_image and test
by nivaul_s＠lrde.epita.fr 03 Dec '07

03 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-03 Simon Nivault <simon.nivault(a)lrde.epita.fr> Creation of rle_image and test. * mln/core/internal/run_image.hh: Factorize compression code. * mln/core/p_runs.hh: Fix and add size_mem(). * mln/core/rle_encode.hh: Rewrite algo and add feature for taking zero into account or not. * mln/core/rle_image.hh: Add traits and Fixes. * mln/core/runs_psite.hh: Fix and remove a FIXME. * mln/level/transform.hh: Fix call of transform. * mln/util/lazy_set.hh: Fix and add Doc. * tests/core/Makefile.am: Add test. * tests/core/rle_image.cc: New. --- mln/core/internal/run_image.hh | 28 ++++++++++----- mln/core/p_runs.hh | 15 +++++++- mln/core/rle_encode.hh | 47 ++++++++++++------------- mln/core/rle_image.hh | 54 ++++++++++++++++++++++++----- mln/core/runs_psite.hh | 6 +-- mln/level/transform.hh | 2 - mln/util/lazy_set.hh | 4 +- tests/core/Makefile.am | 2 + tests/core/rle_image.cc | 75 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 183 insertions(+), 50 deletions(-) Index: trunk/milena/tests/core/rle_image.cc =================================================================== --- trunk/milena/tests/core/rle_image.cc (revision 0) +++ trunk/milena/tests/core/rle_image.cc (revision 1577) @@ -0,0 +1,75 @@ +// Copyright (C) 2007 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/labeling/blobs.cc + * + * \brief Test on mln::labeling::blobs. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/pw/all.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/level/transform.hh> +#include <mln/level/paste.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/core/rle_encode.hh> + +struct fold_t : public mln::Function_v2v< fold_t > +{ + typedef mln::value::int_u8 result; + result operator()(unsigned i) const { return i == 0 ? 0 : (i - 1) % 255 + 1; } +}; + + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, "../../img/tiny.pgm"); + image2d<int_u8> cmp(lena.domain()); + + unsigned n; + image2d<unsigned> labels = labeling::blobs((pw::value(lena) > pw::cst(172u)) | lena.domain(), + c4(), n); + std::cout << n << std::endl; + + rle_image<point2d, int_u8> rle = rle_encode(level::transform(labels, fold_t())); + + level::fill(cmp, literal::zero); + level::paste(rle, cmp); + + mln_assertion(cmp == level::transform(labels, fold_t())); +} Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1576) +++ trunk/milena/tests/core/Makefile.am (revision 1577) @@ -8,6 +8,7 @@ exact \ initialize \ p_runs \ + rle_image \ t_image category_SOURCES = category.cc @@ -15,6 +16,7 @@ exact_SOURCES = exact.cc initialize_SOURCES = initialize.cc p_runs_SOURCES = p_runs.cc +rle_image_SOURCES = rle_image.cc t_image_SOURCES = t_image.cc TESTS = $(check_PROGRAMS) Index: trunk/milena/mln/core/internal/run_image.hh =================================================================== --- trunk/milena/mln/core/internal/run_image.hh (revision 1576) +++ trunk/milena/mln/core/internal/run_image.hh (revision 1577) @@ -33,10 +33,9 @@ * \brief Definition of mln::internal::run_image_ class for internal use only */ -# include <mln/core/internal/image_base.hh> -# include <mln/core/internal/run_pset.hh> -# include <mln/core/internal/run_psite.hh> -# include <mln/value/set.hh> +# include <mln/core/internal/image_primary.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> namespace mln { @@ -46,22 +45,35 @@ /*! \brief Factorization class for run_image. * + * Parameter \c T is the type of the image value. * Parameter \c P is the type of the image point. * Parameter \c E is the Exact type of the image. */ - template <typename P, typename E> - class run_image_ : public internal::image_primary_< internal::run_pset_, E > + template <typename T, typename P, typename E> + class run_image_ : public internal::image_primary_< p_runs_, E > { protected: run_image_(); + + public: + float compression() const; }; # ifndef MLN_INCLUDE_ONLY - template <typename P, typename E> + template <typename T, typename P, typename E> + inline + run_image_<T, P, E>::run_image_() + { + } + + template <typename T, typename P, typename E> inline - run_image_<P, E>::run_image_() + float + run_image_<T, P, E>::compression() const { + return float(exact(this)->data_->size_mem()) / + float (sizeof(T) * exact(this)->data_->domain_->bbox().npoints()); } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1576) +++ trunk/milena/mln/core/rle_image.hh (revision 1577) @@ -34,8 +34,8 @@ */ # include <mln/core/internal/run_image.hh> -# include <mln/core/internal/run_pset.hh> -# include <mln/core/internal/run_psite.hh> +# include <mln/core/p_runs.hh> +# include <mln/core/runs_psite.hh> # include <mln/value/set.hh> # include <vector> @@ -58,12 +58,37 @@ std::vector<T> values_; /// domain of the image - run_pset_ domain_; + p_runs_ domain_; + + /// Return the size of the data in memory. + unsigned size_mem() const; }; } // end of namespace mln::internal + namespace trait + { + + template <typename P, typename T> + struct image_< rle_image<P,T> > : default_image_< T, rle_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + /*! \brief RLE image. * @@ -73,15 +98,15 @@ * This image is not point wise accessible. */ template <typename P, typename T> - class rle_image : public internal::run_image_< P, rle_image<P, T> > + class rle_image : public internal::run_image_< T, P, rle_image<P, T> > { public: typedef T value; typedef T& lvalue; typedef const T rvalue; - typedef internal::run_psite psite; + typedef runs_psite psite; typedef mln::value::set<T> vset; - typedef internal::run_pset_ pset; + typedef p_runs_ pset; /// Skeleton. @@ -91,7 +116,7 @@ rle_image(); /// Add a new range to the image. - void insert(const P& p, unsigned len, T value); + void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. rvalue operator() (const psite& site) const; @@ -124,12 +149,21 @@ { } + template <typename P, typename T> + inline + unsigned + data_< rle_image<P,T> >::size_mem() const + { + return sizeof(T) * values_.size() + domain_.size_mem(); + } + } // end of namespace mln::internal template <typename P, typename T> inline rle_image<P, T>::rle_image() { + this->data_ = new internal::data_< rle_image<P,T> >(); } template <typename P, typename T> @@ -151,11 +185,13 @@ template <typename P, typename T> inline void - rle_image<P, T>::insert(const P& p, unsigned len, T value) + rle_image<P, T>::insert(const p_run& pr, T value) { if (!this->has_data()) this->data_ = new internal::data_< rle_image<P,T> >(); - this->data_->domain_.insert(p, len); + mln_assertion(this->data_->values_.size() == 0 || + pr.first() > this->data_->domain_[this->data_->domain_.nruns() - 1].first()); + this->data_->domain_.insert(pr); this->data_->values_.push_back(value); } Index: trunk/milena/mln/core/runs_psite.hh =================================================================== --- trunk/milena/mln/core/runs_psite.hh (revision 1576) +++ trunk/milena/mln/core/runs_psite.hh (revision 1577) @@ -89,7 +89,7 @@ protected: /// Start of the psite range. - P p_; // FIXME: Rename as p_ (like everywhere else!) + P p_; /// Position in the psite range. unsigned range_index_; @@ -106,11 +106,11 @@ runs_psite::runs_psite(const p_runs_& pr, const P& p) { unsigned i = 0; - while (i < pr.nruns() && p < pr[i].first()) + while (i < pr.nruns() && p >= pr[i].first()) ++i; mln_assertion(i != 0); - range_index_ = p[P::dim - 1] - pr[i].first()[P::dim - 1]; + range_index_ = p[P::dim - 1] - pr[i - 1].first()[P::dim - 1]; mln_assertion(pr[i - 1].npoints() > range_index_); Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1576) +++ trunk/milena/mln/core/rle_encode.hh (revision 1577) @@ -33,8 +33,7 @@ * \brief Definintion of function which encodes an image in rle_image. */ -# include <mln/core/sparse_image.hh> -# include <vector> +# include <mln/core/rle_image.hh> namespace mln { @@ -48,7 +47,7 @@ */ template <typename I> rle_image<mln_point(I), mln_value(I)> - rle_encode(const Image& input); + rle_encode(const Image& input, bool ignore_zero = true); # ifndef MLN_INCLUDE_ONLY /*! @@ -59,10 +58,10 @@ bool on_the_same_line(const P& p1, const P& p2) { - unsigned dim = P::dim; + const unsigned dim = P::dim; bool same_line = true; - for (int n = dim - 1; same_line and n > 0; --n) + for (unsigned n = 0; same_line && n < dim - 1; ++n) same_line = (p1[n] == p2[n]); return same_line; } @@ -70,38 +69,36 @@ template <typename I> inline rle_image<mln_point(I), mln_value(I)> - rle_encode(const Image& input) + rle_encode(const Image& input, bool ignore_zero) { + typedef mln_point(I) P; + rle_image<mln_point(I), mln_value(I)> output; + const I& ima = exact(input); mln_piter(I) p (exact(input).domain()); - unsigned len = 1; - /// range point start + unsigned len = 0; mln_point(I) rstart; - /// range value mln_value(I) rvalue; - p.start(); - if (!p.is_valid()) - return output; - - rstart = p; - rvalue = exact(input)(p); - p.next_(); - while (p.is_valid()) + for_all(p) + if (!ignore_zero || ima(p) != literal::zero || len) + { + if (len == 0) { - if (rvalue == exact(input)(p) and - on_the_same_line(rstart, mln_point(I)(p))) + ++len; + rstart = p; + rvalue = ima(p); + } + else + if (rvalue == ima(p) + && on_the_same_line(rstart, mln_point(I)(p))) ++len; else { - output.insert(rstart, len, rvalue); - len = 1; - rstart = p; - rvalue = exact(input)(p); + output.insert(p_run(rstart, len), rvalue); + len = 0; } - p.next_(); } - output.insert(rstart, len, rvalue); return output; } Index: trunk/milena/mln/core/p_runs.hh =================================================================== --- trunk/milena/mln/core/p_runs.hh (revision 1576) +++ trunk/milena/mln/core/p_runs.hh (revision 1577) @@ -90,6 +90,9 @@ /// Return the i-th run of the list of runs const p_run& operator[](unsigned i) const; + /// Return the size of the data in memory. + unsigned size_mem() const; + // /// Return the container of the pset (internal use only). // const container& con() const; @@ -162,7 +165,7 @@ break; if (equal) mln_assertion(prec->first()[P::dim - 1] + (signed)prec->length() - < pr.first()[P::dim - 1]); + <= pr.first()[P::dim - 1]); } if (iter != con_.vect().end()) @@ -173,7 +176,7 @@ break; if (equal) mln_assertion(pr.first()[P::dim - 1] + (signed)pr.length() - < iter->first()[P::dim - 1]); + <= iter->first()[P::dim - 1]); } con_.insert(pr); @@ -217,6 +220,14 @@ return con_[i]; } + template <typename P> + inline + unsigned + p_runs_::size_mem() const + { + return nruns() * 2 * (sizeof(P) + sizeof(unsigned)); + } + // template <typename P> // const typename p_runs_::container& // p_runs_::con() const Index: trunk/milena/mln/level/transform.hh =================================================================== --- trunk/milena/mln/level/transform.hh (revision 1576) +++ trunk/milena/mln/level/transform.hh (revision 1577) @@ -129,7 +129,7 @@ mln_precondition(exact(input).has_data()); mln_ch_value(I, mln_result(F)) output; initialize(output, input); - transform_(input, f, output); + transform(input, f, output); trace::exiting("level::transform"); return output; Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 1576) +++ trunk/milena/mln/util/lazy_set.hh (revision 1577) @@ -171,7 +171,7 @@ /*! \brief Update \a v_ from \a s_. * - * FIXME: explain. + * Make the vector contains the same element than the sorted set.. */ void update_() const; @@ -233,7 +233,7 @@ const E& lazy_set_<E>::element(unsigned i) const { - assert(i < v_.size()); + assert(i < s_.size()); if (needs_update_) update_(); return v_[i];

1 0