- Olena-patches

r2185: Fixes to install the gimp plugin
by Matthieu Garrigues 05 Sep '08

05 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2008-09-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fixes to install the gimp plugin. * nivault/plugin-gimp/autogen.sh: s/main.c/main.cc * nivault/plugin-gimp/configure.ac: move install dir to home to install it without administrator rights (dirty) * nivault/plugin-gimp/src/main.cc: Change place in the gimp menu. --- autogen.sh | 2 +- configure.ac | 3 ++- src/main.cc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/nivault/plugin-gimp/configure.ac =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/configure.ac (revision 2184) +++ trunk/milena/sandbox/nivault/plugin-gimp/configure.ac (revision 2185) @@ -59,7 +59,8 @@ AC_SUBST(GIMP_CFLAGS) AC_SUBST(GIMP_LIBS) -GIMP_LIBDIR=`$PKG_CONFIG --variable=gimplibdir gimp-2.0` +#GIMP_LIBDIR=`$PKG_CONFIG --variable=gimplibdir gimp-2.0` +GIMP_LIBDIR=`echo ~/.gimp-2.4` AC_SUBST(GIMP_LIBDIR) Index: trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 2184) +++ trunk/milena/sandbox/nivault/plugin-gimp/src/main.cc (revision 2185) @@ -84,7 +84,7 @@ G_N_ELEMENTS (args), 0, args, NULL); - gimp_plugin_menu_register (PROCEDURE_NAME, "<Image>/Tools/"); + gimp_plugin_menu_register (PROCEDURE_NAME, "<Image>/Filters/Milena"); } static void Index: trunk/milena/sandbox/nivault/plugin-gimp/autogen.sh =================================================================== --- trunk/milena/sandbox/nivault/plugin-gimp/autogen.sh (revision 2184) +++ trunk/milena/sandbox/nivault/plugin-gimp/autogen.sh (revision 2185) @@ -10,7 +10,7 @@ PROJECT="GIMP Plug-In Template" TEST_TYPE=-f -FILE=src/main.c +FILE=src/main.cc AUTOCONF_REQUIRED_VERSION=2.54 AUTOMAKE_REQUIRED_VERSION=1.6

1 0

cleanup-2008 2184: Augment tutorial example for Z.
by Thierry Geraud 05 Sep '08

05 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment tutorial example for Z. * milena/doc/tutorial/examples/for_Z.cc: Augment. * milena/mln/debug/println.spe.hh (has): Replace ima.has by ima.domain.has so that we do not print the domain extension. * milena/mln/core/site_set/p_if.hh (pset, pset_): Rename as... (s, s_): ...these; more consistent with the other code. * milena/mln/core/image/image_if.hh (todo): Fix typo. * milena/mln/core/internal/image_domain_morpher.hh (operator()): Fix missing preconditions. * milena/mln/value/rgb.hh (operator<<): Remove spaces. * milena/mln/geom/bbox.hh (bbox): Add overload for images. doc/tutorial/examples/for_Z.cc | 120 +++++++++++++++++++++++++++++- mln/core/image/image_if.hh | 2 mln/core/internal/image_domain_morpher.hh | 6 + mln/core/site_set/p_if.hh | 34 ++++---- mln/debug/println.spe.hh | 4 - mln/geom/bbox.hh | 13 +++ mln/value/rgb.hh | 10 +- 7 files changed, 161 insertions(+), 28 deletions(-) Index: milena/doc/tutorial/examples/for_Z.cc --- milena/doc/tutorial/examples/for_Z.cc (revision 2183) +++ milena/doc/tutorial/examples/for_Z.cc (working copy) @@ -1,12 +1,24 @@ # include <mln/core/image/image2d.hh> + # include <mln/core/image/image_if.hh> +# include <mln/core/image/sub_image.hh> + +# include <mln/core/site_set/p_vaccess.hh> +# include <mln/convert/from_to.hh> +# include <mln/core/alias/p_runs2d.hh> + # include <mln/core/alias/neighb2d.hh> +# include <mln/core/var.hh> # include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> +# include <mln/literal/colors.hh> # include <mln/pw/all.hh> # include <mln/convert/to_fun.hh> # include <mln/debug/println.hh> # include <mln/labeling/blobs.hh> +# include <mln/level/fill.hh> +# include <mln/geom/bbox.hh> namespace mln @@ -82,10 +94,37 @@ } + +namespace my +{ + + template <typename I> + void fill(I& ima, mln_value(I) v) + { + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = v; + } + + template <typename I, typename J> + void paste(const I& data, J& dest) + { + mln_piter(I) p(data.domain()); + for_all(p) + dest(p) = data(p); + } + +} // end of namespace my + + + + + int main() { using namespace mln; using value::int_u8; + using value::rgb8; bool vals[6][5] = { @@ -103,6 +142,83 @@ image2d<int_u8> lab = labeling::blobs(ima, c4(), nlabels); debug::println(lab); - debug::println(lab | (pw::value(lab) != 0u)); - debug::println(lab | row_oddity); + + mln_VAR(lab_0, lab | (pw::value(lab) != 0u)); + debug::println(lab_0); + + +// box2d b3 = geom::bbox(lab | (pw::value(lab) == 3u)); +// std::cout << b3 << std::endl +// << std::endl; + +// // mln_VAR(lab3, lab | b3); +// // debug::println(lab3); +// // std::cout << lab3.domain() << std::endl +// // << std::endl; + + +// { +// std::cout << "(ima | sub_D) | pred" << std::endl << std::endl; + +// mln_VAR(pred, pw::value(lab) == 3u); + +// std::cout << (lab | b3).domain() << std::endl; +// debug::println(lab | b3); + +// std::cout << ((lab | b3) | pred).domain() << std::endl; +// debug::println((lab | b3) | pred); +// } + + +// // il existe une difference entre: +// // +// // - ima | sub_D ou le sub_D DOIT etre inclus dans ima.domain +// // et +// // - ima / sub_D qui reste a ecrire... +// // ou dans ce cas, on aurait (ima / sub_D).domain() == sub_D | f:p->b = ima.domain().has(p) + + +// { +// std::cout << "(ima | pred) | sub_D" << std::endl << std::endl; + +// mln_VAR(pred, pw::value(lab) == 3u); + +// // OK :-) +// std::cout << (lab | pred).domain() << std::endl; +// debug::println(lab | pred); + +// // KO :-) +// // Cf. commentaire plus haut +// // ici l'erreur est que b3 n'est pas un sous-domaine de celui de "lab | pred"... +// /* +// std::cout << ((lab | pred) | b3).domain() << std::endl; +// debug::println((lab | pred) | b3); +// */ +// } + + +// debug::println(lab | row_oddity); + +// my::fill(lab_0, 9); +// debug::println(lab_0); +// debug::println(lab); + + +// image2d<rgb8> cool(ima.domain()); +// level::fill(cool, literal::black); + +// level::fill( inplace(cool | (pw::value(lab) == 1u)), +// literal::red ); + +// debug::println(cool); + + + { + p_vaccess< int_u8, p_runs2d > s; + convert::from_to(lab_0, s); + std::cout << s << std::endl; + std::cout << s(3) << std::endl; + std::cout << s(3).bbox() << std::endl; + } + } Index: milena/mln/debug/println.spe.hh --- milena/mln/debug/println.spe.hh (revision 2183) +++ milena/mln/debug/println.spe.hh (working copy) @@ -129,7 +129,7 @@ for_all(p) { - if (input.has(p)) + if (input.domain().has(p)) std::cout << format(input(p)) << " "; else std::cout << " "; @@ -173,7 +173,7 @@ for (int i = max_row; i >= row; --i) std::cout << ' '; for (col = b.min_col(); col <= max_col; ++col) - if (input.has(p)) + if (input.domain().has(p)) std::cout << format(input(p)) << ' '; else std::cout << " "; Index: milena/mln/core/site_set/p_if.hh --- milena/mln/core/site_set/p_if.hh (revision 2183) +++ milena/mln/core/site_set/p_if.hh (working copy) @@ -30,9 +30,9 @@ /*! \file mln/core/site_set/p_if.hh * - * \brief Definition of the restriction of a point set w.r.t. a predicate. + * \brief Definition of the restriction of a site set w.r.t. a predicate. * - * \todo Change pset_ attribute type to S*. + * \todo Change s_ attribute type to S*. */ # include <mln/core/internal/site_set_base.hh> @@ -62,21 +62,21 @@ } // end of namespace trait - /*! \brief Restrict a point set \p pset to points that verify \p f. + /*! \brief Restrict a site set \p s to points that verify \p f. * - * \param[in] pset A point set. + * \param[in] s A site set. * \param[in] f A function from point to Boolean. * \return A subset of points. */ template <typename S, typename F> p_if<S, F> - operator | (const Site_Set<S>& pset, const Function_p2b<F>& f); + operator | (const Site_Set<S>& s, const Function_p2b<F>& f); /*! \brief Generic subset class. * - * Parameter \c S is a point set type; parameter F is a function + * Parameter \c S is a site set type; parameter F is a function * from point to Boolean. */ template <typename S, typename F> @@ -103,8 +103,8 @@ typedef fwd_piter piter; - /// Constructor with a point set \p pset and a predicate \p f. - p_if(const S& pset, const F& f); + /// Constructor with a site set \p s and a predicate \p f. + p_if(const S& s, const F& f); /// Constructor without argument. p_if(); @@ -132,7 +132,7 @@ protected: - S pset_; + S s_; F f_; }; @@ -144,9 +144,9 @@ template <typename S, typename F> inline p_if<S, F> - operator | (const Site_Set<S>& pset, const Function_p2b<F>& f) + operator | (const Site_Set<S>& s, const Function_p2b<F>& f) { - p_if<S, F> tmp(exact(pset), exact(f)); + p_if<S, F> tmp(exact(s), exact(f)); return tmp; } @@ -158,7 +158,7 @@ bool p_if<S,F>::has(const psite& p) const { - return pset_.has(p) && f_(p); + return s_.has(p) && f_(p) == true; } template <typename S, typename F> @@ -166,7 +166,7 @@ bool p_if<S,F>::is_valid() const { - return pset_.is_valid(); + return s_.is_valid(); } template <typename S, typename F> @@ -174,7 +174,7 @@ const S& p_if<S,F>::overset() const { - return pset_; + return s_; } template <typename S, typename F> @@ -187,8 +187,8 @@ template <typename S, typename F> inline - p_if<S,F>::p_if(const S& pset, const F& f) - : pset_(pset), + p_if<S,F>::p_if(const S& s, const F& f) + : s_(s), f_(f) { } @@ -212,7 +212,7 @@ std::size_t p_if<S,F>::memory_size() const { - return pset_.memory_size() + sizeof(f_); + return s_.memory_size() + sizeof(f_); } # endif // ! MLN_INCLUDE_ONLY Index: milena/mln/core/image/image_if.hh --- milena/mln/core/image/image_if.hh (revision 2183) +++ milena/mln/core/image/image_if.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of a image which domain is restricted by a * function. * - * \todo Relax Function_p2v into Function_v2v. + * \todo Relax Function_p2b into Function_v2b. */ # include <mln/core/internal/image_domain_morpher.hh> Index: milena/mln/core/internal/image_domain_morpher.hh --- milena/mln/core/internal/image_domain_morpher.hh (revision 2183) +++ milena/mln/core/internal/image_domain_morpher.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -102,6 +102,8 @@ image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); + mln_precondition(exact(this)->has(p)); + mln_precondition(this->delegatee_()->has(p)); return this->delegatee_()->operator()(p); } @@ -111,6 +113,8 @@ image_domain_morpher<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); + mln_precondition(exact(this)->has(p)); + mln_precondition(this->delegatee_()->has(p)); return this->delegatee_()->operator()(p); } Index: milena/mln/value/rgb.hh --- milena/mln/value/rgb.hh (revision 2183) +++ milena/mln/value/rgb.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -479,10 +479,10 @@ inline std::ostream& operator<<(std::ostream& ostr, const rgb<n>& v) { - return ostr << "(" << debug::format(v.red()) - << ", " << debug::format(v.green()) - << ", " << debug::format(v.blue()) - << ")"; + return ostr << '(' << debug::format(v.red()) + << ',' << debug::format(v.green()) + << ',' << debug::format(v.blue()) + << ')'; } template <unsigned n> Index: milena/mln/geom/bbox.hh --- milena/mln/geom/bbox.hh (revision 2183) +++ milena/mln/geom/bbox.hh (working copy) @@ -53,6 +53,11 @@ box<mln_site(S)> bbox(const Site_Set<S>& pset); + /// Compute the precise bounding box of a point set \p pset. + template <typename I> + box<mln_site(I)> bbox(const Image& ima); + + # ifndef MLN_INCLUDE_ONLY namespace impl @@ -110,6 +115,14 @@ return b; } + template <typename I> + box<mln_site(I)> bbox(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.has_data()); + return geom::bbox(ima.domain()); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::geom

1 0

cleanup-2008 2183: Add a tutorial example for Z.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a tutorial example for Z. * doc/tutorial/examples/for_Z.cc: New. * mln/trait/op/lor.hh: New. * mln/trait/op/all.hh: Update. * mln/value/ops.hh: Add some doc. * mln/value/builtin/ops.hh: Make op== and op!= commute when a builtin is involved: "bi == obj" is rewritten into "obj == scalar(bi)". doc/tutorial/examples/for_Z.cc | 108 +++++++++++++++++++++++++++++++++++++++++ mln/trait/op/all.hh | 2 mln/trait/op/lor.hh | 18 +++--- mln/value/builtin/ops.hh | 6 +- mln/value/ops.hh | 3 + 5 files changed, 126 insertions(+), 11 deletions(-) Index: doc/tutorial/examples/for_Z.cc --- doc/tutorial/examples/for_Z.cc (revision 0) +++ doc/tutorial/examples/for_Z.cc (revision 0) @@ -0,0 +1,108 @@ +# include <mln/core/image/image2d.hh> +# include <mln/core/image/image_if.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/value/int_u8.hh> + +# include <mln/pw/all.hh> +# include <mln/convert/to_fun.hh> +# include <mln/debug/println.hh> +# include <mln/labeling/blobs.hh> + + +namespace mln +{ + + namespace trait + { + +// template <template <class, class> class Op, +// typename F, typename S> +// struct set_binary_< Op, mln::Function_v2v, F, mln::value::Scalar, S > +// { +// typedef Op< F, pw::cst_<mln_value_equiv(S)> > Op_; +// typedef typename Op_::ret ret; +// }; + + template <template <class, class> class Op, + typename F, + typename R, typename A> + struct set_precise_binary_< Op, F, R (*)(A) > + { + typedef Op< F, fun::C<R (*)(A)> > Op_; + typedef typename Op_::ret ret; + }; + + template <typename F, typename S> + struct set_binary_< op::eq, mln::Function_v2v, F, mln::value::Scalar, S > + { + typedef mln_trait_op_eq(F, pw::cst_<mln_value_equiv(S)>) ret; + }; + + + // const Image | Function_v2v + +// template <typename I, typename F> +// struct set_binary_< op::lor, mln::Image, /* FIXME: const */ I, mln::Function_v2v, F > +// { +// typedef image_if<const I, F> ret; +// }; + + } // end of namespace mln::trait + + + template <typename F, typename S> + mln_trait_op_eq(F,S) + operator == (const Function_v2v<F>& fun, const value::Scalar<S>& s) + { + return exact(fun) == pw::cst( value::equiv(s) ); + } + + + template <typename I, typename R, typename A> + image_if< const I, fun::C<R(*)(A)> > + operator | (const Image& ima, R (*f)(A) ) + { + return exact(ima) | convert::to_fun(f); + } + + +// template <typename O, typename R, typename A> +// mln_trait_op_lor(const O, fun::C<R(*)(A)>) +// operator | (const Object<O>& lhs, R (*rhs)(A) ) +// { +// return exact(lhs) | convert::to_fun(rhs); +// } + +} // end of namespace mln + + +bool row_oddity(mln::point2d p) +{ + return p.row() % 2; +} + + +int main() +{ + using namespace mln; + using value::int_u8; + + + bool vals[6][5] = { + {0, 1, 1, 0, 0}, + {0, 1, 1, 0, 0}, + {0, 0, 0, 0, 0}, + {1, 1, 0, 1, 0}, + {1, 0, 1, 1, 1}, + {1, 0, 0, 0, 0} + }; + image2d<bool> ima = make::image2d(vals); + debug::println(ima); + + int_u8 nlabels; + image2d<int_u8> lab = labeling::blobs(ima, c4(), nlabels); + debug::println(lab); + + debug::println(lab | (pw::value(lab) != 0u)); + debug::println(lab | row_oddity); +} Index: mln/trait/op/lor.hh --- mln/trait/op/lor.hh (revision 2182) +++ mln/trait/op/lor.hh (working copy) @@ -25,19 +25,21 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_TRAIT_OP_OR_HH -# define MLN_TRAIT_OP_OR_HH +#ifndef MLN_TRAIT_OP_LOR_HH +# define MLN_TRAIT_OP_LOR_HH -/*! \file mln/trait/op/or.hh +/*! \file mln/trait/op/lor.hh * - * \brief Declaration of the "binary or" operator trait. + * \brief Declaration of the "binary logical or" operator trait. + * + * \todo Add land (for logical and). */ # include <mln/trait/op/decl.hh> -# define mln_trait_op_or(L, R) typename mln::trait::op::or_< L , R >::ret -# define mln_trait_op_or_(L, R) mln::trait::op::or_< L , R >::ret +# define mln_trait_op_lor(L, R) typename mln::trait::op::lor< L , R >::ret +# define mln_trait_op_lor_(L, R) mln::trait::op::lor< L , R >::ret @@ -51,7 +53,7 @@ { template <typename L, typename R> - struct or_ : public solve_binary<or_, L, R> + struct lor : public solve_binary<lor, L, R> { }; @@ -65,4 +67,4 @@ # include <mln/trait/solve.hh> -#endif // ! MLN_TRAIT_OP_OR_HH +#endif // ! MLN_TRAIT_OP_LOR_HH Index: mln/trait/op/all.hh --- mln/trait/op/all.hh (revision 2182) +++ mln/trait/op/all.hh (working copy) @@ -74,6 +74,8 @@ # include <mln/trait/op/or.hh> # include <mln/trait/op/xor.hh> +# include <mln/trait/op/lor.hh> + # include <mln/trait/op/not.hh> // Ordering. Index: mln/value/ops.hh --- mln/value/ops.hh (revision 2182) +++ mln/value/ops.hh (working copy) @@ -157,6 +157,9 @@ operator % (const value::Scalar<Vl>& lhs, const value::Scalar<Vr>& rhs); + // Swap arguments so that "scalar_ OP Object" is "Object OP + // scalar_". As a consequence, the user only has to define what + // happens with a scalar as a rhs. template <typename S, typename O> mln_trait_op_plus(O, value::scalar_<S>) Index: mln/value/builtin/ops.hh --- mln/value/builtin/ops.hh (revision 2182) +++ mln/value/builtin/ops.hh (working copy) @@ -121,7 +121,7 @@ operator Symb (const Object<O>& lhs, const Builtin & rhs); \ \ template <typename O> \ - mln_trait_op_##Name (value::scalar_< Builtin >, O) \ + mln_trait_op_##Name (O, value::scalar_< Builtin >) \ operator Symb (const Builtin & lhs, const Object<O>& rhs); \ \ struct m_a_c_r_o__e_n_d__w_i_t_h__s_e_m_i_c_o_l_u_m_n @@ -136,10 +136,10 @@ } \ \ template <typename O> \ - mln_trait_op_##Name (value::scalar_< Builtin >, O) \ + mln_trait_op_##Name (O, value::scalar_< Builtin >) \ operator Symb (const Builtin & lhs, const Object<O>& rhs) \ { \ - return value::scalar(lhs) Symb exact(rhs); \ + return exact(rhs) Symb value::scalar(lhs); \ } \ \ struct m_a_c_r_o__e_n_d__w_i_t_h__s_e_m_i_c_o_l_u_m_n

1 0

2182: Start working on image virtual transformation.
by Ugo Jardonnet 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Start working on image virtual transformation. * jardonnet/virtual: New. * jardonnet/virtual/access.hh (access): Virtual access to image. It also contains image interpolation routines. * jardonnet/virtual/access.cc: Test file. * jardonnet/virtual/Makefile: New. Makefile | 2 + access.cc | 36 +++++++++++++++++++ access.hh | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) Index: jardonnet/virtual/access.hh --- jardonnet/virtual/access.hh (revision 0) +++ jardonnet/virtual/access.hh (revision 0) @@ -0,0 +1,112 @@ +#ifndef _ACCESS_HH +# define _ACCESS_HH + +# include <mln/core/image1d.hh> +# include <mln/core/image2d.hh> +# include <mln/math/round.hh> + +namespace mln +{ + + namespace interpolation + { + + struct nearest_neighbor + { + + template <typename I, typename V> + mln_value(I) + operator()(const I& img, const V& v) const + { + mln_point(I) p = algebra::to_point<mln_point(I)>(v); + return img(p); + } + + }; + + struct linear + { + template <typename I, typename C> + mln_value(I) + operator()(const I& img, + const algebra::vec<1,C>& v) const + { + // looking for img(x); + double x = v[0]; + + // p1 + double xa = mln_point(I)::coord(v[0]); + double ya = img(point1d(xa)); + + // x makes sens in img + if (x == xa) + return img(xa); + + // p2 + double xb = mln_point(I)::coord(v[0] + 0.49999); + double yb = img(point1d(xb)); + + // Taylor-young + return ya + (x - xa) * (yb - ya) / (xb - xa); + } + }; + + + struct bilinear + { + template <typename I, typename V> + mln_value(I) + operator()(const I& img, const V& v) const + { + // q12----r2----q22 + // | | | + // | x | + // | | | + // q11----r1----q21 + + // looking for img(P(x,y)) + double x = v[0]; + double y = v[1]; + + double x1 = mln_point(I)::coord(v[0]); + double x2 = mln_point(I)::coord(v[0]+ 4.9999); + double y1 = mln_point(I)::coord(v[1]); + double y2 = mln_point(I)::coord(v[1]+ 4.9999); + + point2d q11 = point2d(x1, y1); + point2d q12 = point2d(x1, y2); + point2d q21 = point2d(x2, y1); + point2d q22 = point2d(x2, y2); + + // linear interpolation #1 + mln_value(I) img_r1 = img(q11) * (x2 - x) / (x2 - x1) + + img(q21) * (x - x1) / (x2 - x1); + + // linear interpolation #2 + mln_value(I) img_r2 = img(q12) * (x2 - x) / (x2 - x1) + + img(q22) * (x - x1) / (x2 - x1); + + // interpolating in y direction + return img_r1 * (y2 - y) / (y2 -y1) + + img_r2 * (y - y1) /(y2 - y1); + } + }; + } + + namespace access + { + + template <typename I, typename T, typename F> + mln_value(I) + access(const I& img, const mln_point(I)& p, + const T& trans, const F& interp) + { + return interp(img, (trans.inv())(p)); + } + + } + +} + +#endif /* _ACCESS_HH */ + Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 0) +++ jardonnet/virtual/access.cc (revision 0) @@ -0,0 +1,36 @@ + +#include <iostream> +#include "access.hh" +#include <mln/core/image2d.hh> +#include <mln/fun/x2x/all.hh> +#include <mln/debug/iota.hh> +#include <mln/algebra/vec.hh> + +int main() +{ + using namespace mln; + image2d<int> img(50,50); + point2d p(5,5); + algebra::vec<2,float> v = make::vec(3,4); + fun::x2x::translation<2,float> t(v); + interpolation::nearest_neighbor nn; + + debug::iota(img); + + for (int i = 0; i < 50; i++) + { + for (int j = 0; j < 50; j++) + std::cout << img(point2d(i,j)); + std::cout << std::endl; + } + + std::cout << std::endl; + + for (int i = 3; i < 53; i++) + { + for (int j = 4; j < 54; j++) + std::cout << + access::access(img, point2d(i,j), t, nn); + std::cout << std::endl; + } +} Index: jardonnet/virtual/Makefile --- jardonnet/virtual/Makefile (revision 0) +++ jardonnet/virtual/Makefile (revision 0) @@ -0,0 +1,2 @@ +all: + g++ access.cc -I../../.. \ No newline at end of file

1 0

cleanup-2008 2181: Fix merging errors.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix merging errors. * mln/core/site_set/p_array.hh (bb_needs_update_): Remove. * mln/core/site_set/p_if.hh (include): Fix missing dir. * mln/core/image/safe.hh (operator()): Fix warning. * mln/core/image/flat_image.hh (p): Fix warning. * mln/fun/ops.hh: Fix double ctors. * mln/algebra/h_vec.hh (namespace): Fix self incl. * mln/algebra/vec.hh (namespace): Fix fwd decl. Misc. * doc/tutorial/examples/p_vaccess.cc, * mln/core/site_set/p_priority.hh, * mln/core/site_set/p_key.hh (eiter): Prefer using a macro. doc/tutorial/examples/p_vaccess.cc | 2 +- mln/algebra/h_vec.hh | 32 ++++++++++++++------------------ mln/algebra/vec.hh | 4 ++-- mln/core/image/flat_image.hh | 4 ++-- mln/core/image/safe.hh | 2 +- mln/core/site_set/p_array.hh | 4 +--- mln/core/site_set/p_if.hh | 2 +- mln/core/site_set/p_key.hh | 2 +- mln/core/site_set/p_priority.hh | 13 ++++++++----- mln/fun/ops.hh | 8 -------- 10 files changed, 31 insertions(+), 42 deletions(-) Index: doc/tutorial/examples/p_vaccess.cc --- doc/tutorial/examples/p_vaccess.cc (revision 2180) +++ doc/tutorial/examples/p_vaccess.cc (working copy) @@ -100,7 +100,7 @@ for (unsigned l = 0; l <= nlabels; ++l) { std::cout << "arr(" << l << ") = "; - mln_iter_(util::set<p_run2d>) r(arr(l).set_hook_()); + util::set<p_run2d>::eiter r(arr(l).set_hook_()); for_all(r) std::cout << r << ' '; std::cout << std::endl; Index: mln/core/site_set/p_array.hh --- mln/core/site_set/p_array.hh (revision 2180) +++ mln/core/site_set/p_array.hh (working copy) @@ -324,15 +324,13 @@ template <typename P> inline p_array::p_array() - : bb_needs_update_(false) { } template <typename P> inline p_array::p_array(const std::vector& vect) - : vect_(vect), - bb_needs_update_(true) + : vect_(vect) { } Index: mln/core/site_set/p_priority.hh --- mln/core/site_set/p_priority.hh (revision 2180) +++ mln/core/site_set/p_priority.hh (working copy) @@ -75,7 +75,6 @@ p_priority<P,Q> > { typedef p_priority<P,Q> self_; - typedef util::set set_; public: /// Element associated type. @@ -86,10 +85,14 @@ typedef p_double_psite<self_, Q> psite; /// Forward Site_Iterator associated type. - typedef p_double_piter<self_, typename set_::bkd_iter, mln_fwd_piter(Q)> fwd_piter; + typedef p_double_piter< self_, + mln_bkd_eiter(util::set), + mln_fwd_piter(Q) > fwd_piter; /// Backward Site_Iterator associated type. - typedef p_double_piter<self_, typename set_::fwd_iter, mln_bkd_piter(Q)> bkd_piter; + typedef p_double_piter< self_, + mln_fwd_eiter(util::set), + mln_bkd_piter(Q) > bkd_piter; /// Site_Iterator associated type. typedef fwd_piter piter; @@ -387,7 +390,7 @@ // Containers p_ and q_ are not consistent in size! return false; - typename util::set::iter p(p_); + mln_eiter(util::set) p(p_); for_all(p) if (q_.find(p) == q_.end()) // We have an empty queue (with priority p)! @@ -409,7 +412,7 @@ std::ostream& operator<<(std::ostream& ostr, const p_priority<P,Q>& pq) { ostr << '{'; - typename util::set::bkd_iter p(pq.priorities()); + mln_bkd_eiter(util::set) p(pq.priorities()); for_all(p) { ostr << ' ' << p << ':'; Index: mln/core/site_set/p_key.hh --- mln/core/site_set/p_key.hh (revision 2180) +++ mln/core/site_set/p_key.hh (working copy) @@ -634,7 +634,7 @@ std::ostream& operator<<(std::ostream& ostr, const p_key<K,P>& pk) { ostr << '{'; - typename util::set<K>::fwd_iter k(pk.keys()); + mln_fwd_eiter(util::set<K>) k(pk.keys()); for_all(k) { ostr << ' ' << k << ':'; Index: mln/core/site_set/p_if.hh --- mln/core/site_set/p_if.hh (revision 2180) +++ mln/core/site_set/p_if.hh (working copy) @@ -221,7 +221,7 @@ -# include <mln/core/p_if_piter.hh> +# include <mln/core/site_set/p_if_piter.hh> Index: mln/core/image/safe.hh --- mln/core/image/safe.hh (revision 2180) +++ mln/core/image/safe.hh (working copy) @@ -165,7 +165,7 @@ template <typename I> inline - typename safe_image::lvalue + mln_morpher_lvalue(I) safe_image::operator()(const mln_psite(I)& p) { mln_precondition(this->has_data()); Index: mln/core/image/flat_image.hh --- mln/core/image/flat_image.hh (revision 2180) +++ mln/core/image/flat_image.hh (working copy) @@ -233,7 +233,7 @@ template <typename T, typename S> inline const T& - flat_image<T,S>::operator()(const mln_psite(S)& p) const + flat_image<T,S>::operator()(const mln_psite(S)&) const { mln_precondition(this->has_data()); return this->data_->val_; @@ -242,7 +242,7 @@ template <typename T, typename S> inline const T& - flat_image<T,S>::operator()(const mln_psite(S)& p) + flat_image<T,S>::operator()(const mln_psite(S)&) { mln_precondition(this->has_data()); return this->data_->val_; Index: mln/fun/ops.hh --- mln/fun/ops.hh (revision 2180) +++ mln/fun/ops.hh (working copy) @@ -60,10 +60,6 @@ { \ } \ \ - Name##_##Out##_expr_() \ - { \ - } \ - \ template <typename P> \ result operator()(const P& p) const \ { \ @@ -120,10 +116,6 @@ { \ } \ \ - Name##_##Out##_expr_() \ - { \ - } \ - \ template <typename P> \ result operator()(const P& p) const \ { \ Index: mln/algebra/h_vec.hh --- mln/algebra/h_vec.hh (revision 2180) +++ mln/algebra/h_vec.hh (working copy) @@ -141,24 +141,6 @@ return *this; } - namespace algebra - { - - // Immersion of a vector in its homogeneous space. - template <unsigned n, typename T> - inline - h_vec<n, T> vec<n,T>::to_h_vec() const - { - h_vec<n, T> tmp; - for (unsigned i = 0; i < n; ++i) - tmp[i] = this->data_[i]; - tmp[n] = literal::one; - return tmp; - } - - } // end of namespace mln::algebra - - template <unsigned d, typename C> inline vec<d,C> h_vec<d,C>::to_vec() const @@ -172,6 +154,20 @@ return tmp; } + // Immersion of a vector in its homogeneous space. + + template <unsigned n, typename T> + inline + h_vec<n, T> + vec<n,T>::to_h_vec() const + { + h_vec<n, T> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = this->data_[i]; + tmp[n] = literal::one; + return tmp; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::algebra Index: mln/algebra/vec.hh --- mln/algebra/vec.hh (revision 2180) +++ mln/algebra/vec.hh (working copy) @@ -53,14 +53,14 @@ namespace mln { - // Fwd decls. + // Forward declarations. namespace algebra { template <unsigned n, typename T> class vec; + template <unsigned d, typename C> struct h_vec; } namespace literal { struct zero_t; } - template <unsigned d, typename C> struct h_vec;

1 0

cleanup-2008 2180: Move test files from core/ to sub-directories.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move test files from core/ to sub-directories. * tests/core/alias, * tests/core/image * tests/core/other, * tests/core/routine, * tests/core/site_set: New directories. * tests/core/bgraph_image.cc, * tests/core/box1d.cc, * tests/core/box2d.cc, * tests/core/box3d.cc, * tests/core/cast_image.cc, * tests/core/category.cc, * tests/core/clock_neighb2d.cc, * tests/core/clock_test.cc, * tests/core/clone.cc, * tests/core/complex.cc, * tests/core/complex_image.cc, * tests/core/decorated_image.cc, * tests/core/dpoint1d.cc, * tests/core/dpoint2d.cc, * tests/core/dpoint3d.cc, * tests/core/dpoints_pixter.cc, * tests/core/exact.cc, * tests/core/fi_adaptor.cc, * tests/core/graph_elt_neighborhood.cc, * tests/core/graph_elt_window.cc, * tests/core/graph_image.cc, * tests/core/graph_image_wst.cc, * tests/core/hexa.cc, * tests/core/image1d.cc, * tests/core/image2d.cc, * tests/core/image2d_h.cc, * tests/core/image3d.cc, * tests/core/image_if.cc, * tests/core/image_if_interval.cc, * tests/core/image_if_value.cc, * tests/core/initialize.cc, * tests/core/interpolated.cc, * tests/core/line_graph_elt_neighborhood.cc, * tests/core/line_graph_elt_window.cc, * tests/core/line_graph_image.cc, * tests/core/line_piter.cc, * tests/core/mono_obased_rle_image.cc, * tests/core/mono_rle_image.cc, * tests/core/neighb.cc, * tests/core/obased_rle_image.cc, * tests/core/p_array.cc, * tests/core/p_bgraph.cc, * tests/core/p_image2d.cc, * tests/core/p_priority_queue.cc, * tests/core/p_priority_queue_fast.cc, * tests/core/p_priority_queue_fast_with_array.cc, * tests/core/p_queue.cc, * tests/core/p_queue_fast.cc, * tests/core/p_runs.cc, * tests/core/p_set.cc, * tests/core/pixel.cc, * tests/core/pixter1d.cc, * tests/core/pixter1d_more.cc, * tests/core/pixter2d.cc, * tests/core/pixter2d_more.cc, * tests/core/pixter3d.cc, * tests/core/pixter3d_more.cc, * tests/core/plain.cc, * tests/core/point1d.cc, * tests/core/point2d.cc, * tests/core/point3d.cc, * tests/core/point_set_compatibility.cc, * tests/core/pset_array.cc, * tests/core/pset_if.cc, * tests/core/rle_image.cc, * tests/core/safe_image.cc, * tests/core/sparse_image.cc, * tests/core/sub_image.cc, * tests/core/t_image.cc, * tests/core/tr_image.cc, * tests/core/translate_image.cc, * tests/core/value_enc_image.cc, * tests/core/w_window1d_int.cc, * tests/core/w_window2d_int.cc, * tests/core/w_window3d_int.cc, * tests/core/window1d.cc, * tests/core/window2d.cc, * tests/core/window3d.cc: Rename... * tests/core/alias/box1d.cc, * tests/core/alias/box2d.cc, * tests/core/alias/box3d.cc, * tests/core/alias/dpoint1d.cc, * tests/core/alias/dpoint2d.cc, * tests/core/alias/dpoint3d.cc, * tests/core/alias/point1d.cc, * tests/core/alias/point2d.cc, * tests/core/alias/point3d.cc, * tests/core/alias/w_window1d_int.cc, * tests/core/alias/w_window2d_int.cc, * tests/core/alias/w_window3d_int.cc, * tests/core/alias/window1d.cc, * tests/core/alias/window2d.cc, * tests/core/alias/window3d.cc: ...as these and... * tests/core/image/bgraph_image.cc, * tests/core/image/cast_image.cc, * tests/core/image/complex_image.cc, * tests/core/image/decorated_image.cc, * tests/core/image/fi_adaptor.cc, * tests/core/image/graph_image.cc, * tests/core/image/graph_image_wst.cc, * tests/core/image/hexa.cc, * tests/core/image/image1d.cc, * tests/core/image/image2d.cc, * tests/core/image/image2d_h.cc, * tests/core/image/image3d.cc, * tests/core/image/image_if.cc, * tests/core/image/image_if_interval.cc, * tests/core/image/image_if_value.cc, * tests/core/image/interpolated.cc, * tests/core/image/line_graph_image.cc, * tests/core/image/mono_obased_rle_image.cc, * tests/core/image/mono_rle_image.cc, * tests/core/image/obased_rle_image.cc, * tests/core/image/plain.cc, * tests/core/image/rle_image.cc, * tests/core/image/safe_image.cc, * tests/core/image/sparse_image.cc, * tests/core/image/sub_image.cc, * tests/core/image/t_image.cc, * tests/core/image/tr_image.cc, * tests/core/image/translate_image.cc, * tests/core/image/value_enc_image.cc: ...as these and... * tests/core/other/category.cc, * tests/core/other/clock_neighb2d.cc, * tests/core/other/clock_test.cc, * tests/core/other/complex.cc, * tests/core/other/dpoints_pixter.cc, * tests/core/other/graph_elt_neighborhood.cc, * tests/core/other/graph_elt_window.cc, * tests/core/other/line_graph_elt_neighborhood.cc, * tests/core/other/line_graph_elt_window.cc, * tests/core/other/line_piter.cc, * tests/core/other/neighb.cc, * tests/core/other/pixel.cc, * tests/core/other/pixter1d.cc, * tests/core/other/pixter1d_more.cc, * tests/core/other/pixter2d.cc, * tests/core/other/pixter2d_more.cc, * tests/core/other/pixter3d.cc, * tests/core/other/pixter3d_more.cc, * tests/core/other/point_set_compatibility.cc: ...as these and... * tests/core/routine/clone.cc, * tests/core/routine/exact.cc, * tests/core/routine/initialize.cc: ...as these and... * tests/core/site_set/p_array.cc, * tests/core/site_set/p_bgraph.cc, * tests/core/site_set/p_image2d.cc, * tests/core/site_set/p_priority_queue.cc, * tests/core/site_set/p_priority_queue_fast.cc, * tests/core/site_set/p_priority_queue_fast_with_array.cc, * tests/core/site_set/p_queue.cc, * tests/core/site_set/p_queue_fast.cc, * tests/core/site_set/p_runs.cc, * tests/core/site_set/p_set.cc, * tests/core/site_set/pset_array.cc, * tests/core/site_set/pset_if.cc: ...these. * tests/core/alias/Makefile.am, * tests/core/image/Makefile.am, * tests/core/other/Makefile.am, * tests/core/routine/Makefile.am, * tests/core/site_set/Makefile.am: New. * tests/core/Makefile.am: Update. * tests/core/h_vec.cc: Rename as... * tests/algebra/h_vec.cc: ...this. Update. * tests/algebra/Makefile.am: Update. algebra/Makefile.am | 2 core/Makefile.am | 192 ---------------------- core/alias/Makefile.am | 38 ++++ core/alias/box1d.cc | 2 core/alias/box2d.cc | 2 core/alias/box3d.cc | 2 core/alias/dpoint1d.cc | 2 core/alias/dpoint2d.cc | 2 core/alias/dpoint3d.cc | 2 core/alias/point1d.cc | 2 core/alias/point2d.cc | 2 core/alias/point3d.cc | 2 core/alias/w_window1d_int.cc | 2 core/alias/w_window2d_int.cc | 2 core/alias/w_window3d_int.cc | 2 core/alias/window1d.cc | 2 core/alias/window2d.cc | 2 core/alias/window3d.cc | 2 core/image/Makefile.am | 72 ++++++++ core/image/bgraph_image.cc | 2 core/image/cast_image.cc | 2 core/image/complex_image.cc | 2 core/image/decorated_image.cc | 2 core/image/fi_adaptor.cc | 2 core/image/graph_image.cc | 2 core/image/graph_image_wst.cc | 2 core/image/hexa.cc | 2 core/image/image1d.cc | 2 core/image/image2d.cc | 2 core/image/image2d_h.cc | 2 core/image/image3d.cc | 2 core/image/image_if.cc | 2 core/image/image_if_interval.cc | 2 core/image/image_if_value.cc | 2 core/image/interpolated.cc | 2 core/image/line_graph_image.cc | 2 core/image/mono_obased_rle_image.cc | 2 core/image/mono_rle_image.cc | 2 core/image/obased_rle_image.cc | 2 core/image/plain.cc | 2 core/image/rle_image.cc | 2 core/image/safe_image.cc | 2 core/image/sparse_image.cc | 2 core/image/sub_image.cc | 2 core/image/t_image.cc | 2 core/image/translate_image.cc | 2 core/image/value_enc_image.cc | 2 core/other/Makefile.am | 46 +++++ core/other/category.cc | 2 core/other/complex.cc | 2 core/other/graph_elt_neighborhood.cc | 2 core/other/graph_elt_window.cc | 2 core/other/line_graph_elt_neighborhood.cc | 2 core/other/line_graph_elt_window.cc | 2 core/other/line_piter.cc | 2 core/other/neighb.cc | 2 core/other/pixel.cc | 2 core/other/pixter1d.cc | 2 core/other/pixter1d_more.cc | 2 core/other/pixter2d.cc | 2 core/other/pixter2d_more.cc | 2 core/other/pixter3d.cc | 2 core/other/pixter3d_more.cc | 2 core/other/point_set_compatibility.cc | 2 core/routine/Makefile.am | 14 + core/routine/clone.cc | 2 core/routine/exact.cc | 2 core/routine/initialize.cc | 2 core/site_set/Makefile.am | 32 +++ core/site_set/p_array.cc | 2 core/site_set/p_bgraph.cc | 2 core/site_set/p_image2d.cc | 2 core/site_set/p_priority_queue.cc | 2 core/site_set/p_priority_queue_fast.cc | 2 core/site_set/p_priority_queue_fast_with_array.cc | 2 core/site_set/p_queue.cc | 2 core/site_set/p_queue_fast.cc | 2 core/site_set/p_runs.cc | 2 core/site_set/p_set.cc | 2 core/site_set/pset_if.cc | 2 80 files changed, 283 insertions(+), 259 deletions(-) Index: tests/core/image/sub_image.cc --- tests/core/image/sub_image.cc (revision 0) +++ tests/core/image/sub_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/sub_image.cc +/*! \file tests/core/image/sub_image.cc * * \brief Tests on mln::sub_image. */ Index: tests/core/image/image_if_value.cc --- tests/core/image/image_if_value.cc (revision 0) +++ tests/core/image/image_if_value.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image_if_value.cc +/*! \file tests/core/image/image_if_value.cc * * \brief Tests on mln::image_if_value. */ Index: tests/core/image/decorated_image.cc --- tests/core/image/decorated_image.cc (revision 0) +++ tests/core/image/decorated_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/decorated_image.cc +/// \file tests/core/image/decorated_image.cc /// \brief Tests on mln::decorated_image. #include <mln/core/image/image2d.hh> Index: tests/core/image/cast_image.cc --- tests/core/image/cast_image.cc (revision 0) +++ tests/core/image/cast_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/cast_image.cc +/*! \file tests/core/image/cast_image.cc * * \brief Tests on mln::cast_image. */ Index: tests/core/image/sparse_image.cc --- tests/core/image/sparse_image.cc (revision 0) +++ tests/core/image/sparse_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/sparse_image.cc +/*! \file tests/core/image/sparse_image.cc * * \brief Test on mln::sparse_image.hh. */ Index: tests/core/image/translate_image.cc --- tests/core/image/translate_image.cc (revision 0) +++ tests/core/image/translate_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/translate_image.cc +/*! \file tests/core/image/translate_image.cc * * \brief Tests on mln::core::translate_image.hh. */ Index: tests/core/image/graph_image_wst.cc --- tests/core/image/graph_image_wst.cc (revision 0) +++ tests/core/image/graph_image_wst.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/graph_image_wst.cc +/// \file tests/core/image/graph_image_wst.cc /// \brief Tests on the Watershed Transform on a mln::graph_image. #include <vector> Index: tests/core/image/image_if.cc --- tests/core/image/image_if.cc (revision 0) +++ tests/core/image/image_if.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image_if.cc +/*! \file tests/core/image/image_if.cc * * \brief Tests on mln::image_if. */ Index: tests/core/image/obased_rle_image.cc --- tests/core/image/obased_rle_image.cc (revision 0) +++ tests/core/image/obased_rle_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/obased_rle_image.cc +/*! \file tests/core/image/obased_rle_image.cc * * \brief Test on mln::obased_rle_image.hh. */ Index: tests/core/image/plain.cc --- tests/core/image/plain.cc (revision 0) +++ tests/core/image/plain.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/plain.cc +/*! \file tests/core/image/plain.cc * * \brief Test on mln::plain. */ Index: tests/core/image/value_enc_image.cc --- tests/core/image/value_enc_image.cc (revision 0) +++ tests/core/image/value_enc_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/rle_image.cc +/*! \file tests/core/image/rle_image.cc * * \brief Test on mln::core::value_enc_image.hh. */ Index: tests/core/image/graph_image.cc --- tests/core/image/graph_image.cc (revision 0) +++ tests/core/image/graph_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/graph_image.cc +/// \file tests/core/image/graph_image.cc /// \brief Tests on mln::graph_image. #include <vector> Index: tests/core/image/image_if_interval.cc --- tests/core/image/image_if_interval.cc (revision 0) +++ tests/core/image/image_if_interval.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image_if_interval.cc +/*! \file tests/core/image/image_if_interval.cc * * \brief Tests on mln::image_if_interval. */ Index: tests/core/image/bgraph_image.cc --- tests/core/image/bgraph_image.cc (revision 0) +++ tests/core/image/bgraph_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/bgraph_image.cc +/// \file tests/core/image/bgraph_image.cc /// \brief Tests on mln::bgraph_image. #include <vector> Index: tests/core/image/t_image.cc --- tests/core/image/t_image.cc (revision 0) +++ tests/core/image/t_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/t_image.cc +/*! \file tests/core/image/t_image.cc * * \brief Tests on mln::t_image. */ Index: tests/core/image/image1d.cc --- tests/core/image/image1d.cc (revision 0) +++ tests/core/image/image1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image1d.cc +/*! \file tests/core/image/image1d.cc * * \brief Tests on mln::image1d. */ Index: tests/core/image/image2d.cc --- tests/core/image/image2d.cc (revision 0) +++ tests/core/image/image2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image2d.cc +/*! \file tests/core/image/image2d.cc * * \brief Tests on mln::image2d. */ Index: tests/core/image/fi_adaptor.cc --- tests/core/image/fi_adaptor.cc (revision 0) +++ tests/core/image/fi_adaptor.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/fi_adaptor.cc +/// \file tests/core/image/fi_adaptor.cc /// \brief Test on mln::fi_adaptor. #include <mln/core/image/fi_adaptor.hh> Index: tests/core/image/image3d.cc --- tests/core/image/image3d.cc (revision 0) +++ tests/core/image/image3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image3d.cc +/*! \file tests/core/image/image3d.cc * * \brief Tests on mln::image3d. */ Index: tests/core/image/complex_image.cc --- tests/core/image/complex_image.cc (revision 0) +++ tests/core/image/complex_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/complex_image.cc +/// \file tests/core/image/complex_image.cc /// \brief Test of mln::complex_image. #include <iostream> Index: tests/core/image/line_graph_image.cc --- tests/core/image/line_graph_image.cc (revision 0) +++ tests/core/image/line_graph_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/graph_image.cc +/// \file tests/core/image/graph_image.cc /// \brief Tests on mln::graph_image. #include <vector> Index: tests/core/image/mono_rle_image.cc --- tests/core/image/mono_rle_image.cc (revision 0) +++ tests/core/image/mono_rle_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/mono_rle_image.cc +/*! \file tests/core/image/mono_rle_image.cc * * \brief Test on mln::labeling::blobs. */ Index: tests/core/image/image2d_h.cc --- tests/core/image/image2d_h.cc (revision 0) +++ tests/core/image/image2d_h.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/image2d_h.cc +/*! \file tests/core/image/image2d_h.cc * * \brief Tests on mln::image2d_h */ Index: tests/core/image/safe_image.cc --- tests/core/image/safe_image.cc (revision 0) +++ tests/core/image/safe_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/safe_image.cc +/*! \file tests/core/image/safe_image.cc * * \brief Tests on mln::safe_image. */ Index: tests/core/image/rle_image.cc --- tests/core/image/rle_image.cc (revision 0) +++ tests/core/image/rle_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/rle_image.cc +/*! \file tests/core/image/rle_image.cc * * \brief Test on mln::rle_image.hh. */ Index: tests/core/image/hexa.cc --- tests/core/image/hexa.cc (revision 0) +++ tests/core/image/hexa.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/hexa.cc +/*! \file tests/core/image/hexa.cc * * \brief Tests on mln::hexa */ Index: tests/core/image/Makefile.am --- tests/core/image/Makefile.am (revision 0) +++ tests/core/image/Makefile.am (revision 0) @@ -0,0 +1,72 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + bgraph_image \ + cast_image \ + complex_image \ + decorated_image \ + graph_image \ + graph_image_wst \ + hexa \ + image1d \ + image2d \ + image2d_h \ + image3d \ + image_if \ + image_if_interval \ + image_if_value \ + interpolated \ + line_graph_image \ + mono_obased_rle_image \ + mono_rle_image \ + obased_rle_image \ + plain \ + rle_image \ + safe_image \ + sparse_image \ + sub_image \ + t_image \ + tr_image \ + translate_image \ + value_enc_image + +bgraph_image_SOURCES = bgraph_image.cc +cast_image_SOURCES = cast_image.cc +complex_image_SOURCES = complex_image.cc +decorated_image_SOURCES = decorated_image.cc +graph_image_SOURCES = graph_image.cc +graph_image_wst_SOURCES = graph_image_wst.cc +hexa_SOURCES = hexa.cc +image1d_SOURCES = image1d.cc +image2d_SOURCES = image2d.cc +image2d_h_SOURCES = image2d_h.cc +image3d_SOURCES = image3d.cc +image_if_SOURCES = image_if.cc +image_if_interval_SOURCES = image_if_interval.cc +image_if_value_SOURCES = image_if_value.cc +interpolated_SOURCES = interpolated.cc +line_graph_image_SOURCES = line_graph_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 +plain_SOURCES = plain.cc +rle_image_SOURCES = rle_image.cc +safe_image_SOURCES = safe_image.cc +sparse_image_SOURCES = sparse_image.cc +sub_image_SOURCES = sub_image.cc +t_image_SOURCES = t_image.cc +tr_image_SOURCES = tr_image.cc +translate_image_SOURCES = translate_image.cc +value_enc_image_SOURCES = value_enc_image.cc + +# Tests depending on the FreeImagePlus library. +if FREEIMAGEPLUS + check_PROGRAMS += fi_adaptor + 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: tests/core/image/mono_obased_rle_image.cc --- tests/core/image/mono_obased_rle_image.cc (revision 0) +++ tests/core/image/mono_obased_rle_image.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/mono_obased_rle_image.cc +/*! \file tests/core/image/mono_obased_rle_image.cc * * \brief Test on mln::mono_obased_rle_image.hh. */ Index: tests/core/image/interpolated.cc --- tests/core/image/interpolated.cc (revision 0) +++ tests/core/image/interpolated.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/interpolated.cc +/*! \file tests/core/image/interpolated.cc * * \brief Tests on mln::interpolated. */ Index: tests/core/site_set/p_array.cc --- tests/core/site_set/p_array.cc (revision 0) +++ tests/core/site_set/p_array.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_array.cc +/*! \file tests/core/site_set/p_array.cc * * \brief Tests on mln::p_array. */ Index: tests/core/site_set/p_queue_fast.cc --- tests/core/site_set/p_queue_fast.cc (revision 0) +++ tests/core/site_set/p_queue_fast.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_queue_fast.cc +/*! \file tests/core/site_set/p_queue_fast.cc * * \brief Tests on mln::p_queue_fast. */ Index: tests/core/site_set/p_priority_queue_fast.cc --- tests/core/site_set/p_priority_queue_fast.cc (revision 0) +++ tests/core/site_set/p_priority_queue_fast.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_fast.cc +/*! \file tests/core/site_set/p_priority_fast.cc * * \brief Tests on mln::p_priority_fast. */ Index: tests/core/site_set/p_bgraph.cc --- tests/core/site_set/p_bgraph.cc (revision 0) +++ tests/core/site_set/p_bgraph.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/p_bgraph.cc +/// \file tests/core/site_set/p_bgraph.cc /// \brief Tests on mln::p_bgraph (the psite based on boost-graph). #include <mln/core/site_set/p_bgraph.hh> Index: tests/core/site_set/p_queue.cc --- tests/core/site_set/p_queue.cc (revision 0) +++ tests/core/site_set/p_queue.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_queue.cc +/*! \file tests/core/site_set/p_queue.cc * * \brief Tests on mln::p_queue. */ Index: tests/core/site_set/p_priority_queue.cc --- tests/core/site_set/p_priority_queue.cc (revision 0) +++ tests/core/site_set/p_priority_queue.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority.cc +/*! \file tests/core/site_set/p_priority.cc * * \brief Tests on mln::p_priority. */ Index: tests/core/site_set/Makefile.am --- tests/core/site_set/Makefile.am (revision 0) +++ tests/core/site_set/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + p_array \ + p_bgraph \ + p_image2d \ + p_priority_queue \ + p_priority_queue_fast \ + p_priority_queue_fast_with_array \ + p_queue \ + p_queue_fast \ + p_runs \ + p_set \ + pset_array \ + pset_if + +p_array_SOURCES = p_array.cc +p_bgraph_SOURCES = p_bgraph.cc +p_image2d_SOURCES = p_image2d.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 +p_runs_SOURCES = p_runs.cc +p_set_SOURCES = p_set.cc +pset_array_SOURCES = pset_array.cc +pset_if_SOURCES = pset_if.cc + +TESTS = $(check_PROGRAMS) Index: tests/core/site_set/p_runs.cc --- tests/core/site_set/p_runs.cc (revision 0) +++ tests/core/site_set/p_runs.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_runs.cc +/*! \file tests/core/site_set/p_runs.cc * * \brief Test on mln::p_runs_ and related tools. */ Index: tests/core/site_set/p_image2d.cc --- tests/core/site_set/p_image2d.cc (revision 0) +++ tests/core/site_set/p_image2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_image2d.cc +/*! \file tests/core/site_set/p_image2d.cc * * \brief Tests on mln::p_image2d. */ Index: tests/core/site_set/pset_if.cc --- tests/core/site_set/pset_if.cc (revision 0) +++ tests/core/site_set/pset_if.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_if.cc +/*! \file tests/core/site_set/p_if.cc * * \brief Tests on mln::p_if. */ Index: tests/core/site_set/p_priority_queue_fast_with_array.cc --- tests/core/site_set/p_priority_queue_fast_with_array.cc (revision 0) +++ tests/core/site_set/p_priority_queue_fast_with_array.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_fast_with_array.cc +/*! \file tests/core/site_set/p_priority_fast_with_array.cc * * \brief Tests on mln::p_priority_fast_with_array. */ Index: tests/core/site_set/p_set.cc --- tests/core/site_set/p_set.cc (revision 0) +++ tests/core/site_set/p_set.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_set.cc +/*! \file tests/core/site_set/p_set.cc * * \brief Tests on mln::p_set. */ Index: tests/core/other/neighb.cc --- tests/core/other/neighb.cc (revision 0) +++ tests/core/other/neighb.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/neighb.cc +/// \file tests/core/other/neighb.cc /// \brief Tests on mln::neighb<D> specializations. #include <mln/core/alias/neighb1d.hh> Index: tests/core/other/graph_elt_window.cc --- tests/core/other/graph_elt_window.cc (revision 0) +++ tests/core/other/graph_elt_window.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/graph_elt_window.cc +/// \file tests/core/other/graph_elt_window.cc /// \brief Tests on mln::graph_elt_window. #include <iostream> Index: tests/core/other/graph_elt_neighborhood.cc --- tests/core/other/graph_elt_neighborhood.cc (revision 0) +++ tests/core/other/graph_elt_neighborhood.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/graph_elt_neighborhood.cc +/// \file tests/core/other/graph_elt_neighborhood.cc /// \brief Tests on mln::graph_elt_neighborhood. #include <iostream> Index: tests/core/other/point_set_compatibility.cc --- tests/core/other/point_set_compatibility.cc (revision 0) +++ tests/core/other/point_set_compatibility.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/point_set_compatibility.cc +/// \file tests/core/other/point_set_compatibility.cc /// \brief Tests on the compatibility of some point sites with some /// point sets (and their iterators). Index: tests/core/other/pixter1d.cc --- tests/core/other/pixter1d.cc (revision 0) +++ tests/core/other/pixter1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/pixter1d.cc +/// \file tests/core/other/pixter1d.cc /// \brief Tests on 1-D image pixters. #include <mln/core/image/image1d.hh> Index: tests/core/other/pixter2d.cc --- tests/core/other/pixter2d.cc (revision 0) +++ tests/core/other/pixter2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/pixter2d.cc +/// \file tests/core/other/pixter2d.cc /// \brief Tests on 2-D image pixters. #include <mln/core/image/image2d.hh> Index: tests/core/other/pixter3d.cc --- tests/core/other/pixter3d.cc (revision 0) +++ tests/core/other/pixter3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/pixter3d.cc +/// \file tests/core/other/pixter3d.cc /// \brief Tests on 3-D image pixters. #include <mln/core/image/image3d.hh> Index: tests/core/other/line_graph_elt_window.cc --- tests/core/other/line_graph_elt_window.cc (revision 0) +++ tests/core/other/line_graph_elt_window.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/line_graph_elt_window.cc +/// \file tests/core/other/line_graph_elt_window.cc /// \brief Tests on mln::line_graph_elt_window. #include <vector> Index: tests/core/other/line_graph_elt_neighborhood.cc --- tests/core/other/line_graph_elt_neighborhood.cc (revision 0) +++ tests/core/other/line_graph_elt_neighborhood.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/line_graph_elt_neighborhood.cc +/// \file tests/core/other/line_graph_elt_neighborhood.cc /// \brief Tests on mln::line_graph_elt_neighborhood. #include <vector> Index: tests/core/other/complex.cc --- tests/core/other/complex.cc (revision 0) +++ tests/core/other/complex.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/complex.cc +/// \file tests/core/other/complex.cc /// \brief Test of mln::complex. #include <iostream> Index: tests/core/other/category.cc --- tests/core/other/category.cc (revision 0) +++ tests/core/other/category.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/category.cc +/*! \file tests/core/other/category.cc * * \brief Tests on mln::category. */ Index: tests/core/other/pixel.cc --- tests/core/other/pixel.cc (revision 0) +++ tests/core/other/pixel.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pixel.cc +/*! \file tests/core/other/pixel.cc * * \brief Tests on mln::pixel. */ Index: tests/core/other/pixter1d_more.cc --- tests/core/other/pixter1d_more.cc (revision 0) +++ tests/core/other/pixter1d_more.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pixter1d.cc +/*! \file tests/core/other/pixter1d.cc * * \brief Tests on mln::fwd_pixter1d. */ Index: tests/core/other/pixter2d_more.cc --- tests/core/other/pixter2d_more.cc (revision 0) +++ tests/core/other/pixter2d_more.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pixter2d.cc +/*! \file tests/core/other/pixter2d.cc * * \brief Tests on mln::fwd_pixter2d. */ Index: tests/core/other/pixter3d_more.cc --- tests/core/other/pixter3d_more.cc (revision 0) +++ tests/core/other/pixter3d_more.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pixter3d.cc +/*! \file tests/core/other/pixter3d.cc * * \brief Tests on mln::fwd_pixter3d. */ Index: tests/core/other/Makefile.am --- tests/core/other/Makefile.am (revision 0) +++ tests/core/other/Makefile.am (revision 0) @@ -0,0 +1,46 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + category \ + clock_neighb2d \ + clock_test \ + complex \ + dpoints_pixter \ + graph_elt_neighborhood \ + graph_elt_window \ + line_graph_elt_neighborhood \ + line_graph_elt_window \ + line_piter \ + neighb \ + pixel \ + pixter1d \ + pixter1d_more \ + pixter2d \ + pixter2d_more \ + pixter3d \ + pixter3d_more \ + point_set_compatibility + +category_SOURCES = category.cc +clock_neighb2d_SOURCES = clock_neighb2d.cc +clock_test_SOURCES = clock_test.cc +complex_SOURCES = complex.cc +dpoints_pixter_SOURCES = dpoints_pixter.cc +graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc +graph_elt_window_SOURCES = graph_elt_window.cc +line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc +line_graph_elt_window_SOURCES = line_graph_elt_window.cc +line_piter_SOURCES = line_piter.cc +neighb_SOURCES = neighb.cc +pixel_SOURCES = pixel.cc +pixter1d_SOURCES = pixter1d.cc +pixter1d_more_SOURCES = pixter1d_more.cc +pixter2d_SOURCES = pixter2d.cc +pixter2d_more_SOURCES = pixter2d_more.cc +pixter3d_SOURCES = pixter3d.cc +pixter3d_more_SOURCES = pixter3d_more.cc +point_set_compatibility_SOURCES = point_set_compatibility.cc + +TESTS = $(check_PROGRAMS) Index: tests/core/other/line_piter.cc --- tests/core/other/line_piter.cc (revision 0) +++ tests/core/other/line_piter.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/line_piter.cc +/*! \file tests/core/other/line_piter.cc * * \brief Tests on mln::line_piter. */ Index: tests/core/routine/clone.cc --- tests/core/routine/clone.cc (revision 0) +++ tests/core/routine/clone.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/clone.cc +/*! \file tests/core/routine/clone.cc * * \brief Tests on mln::clone. */ Index: tests/core/routine/initialize.cc --- tests/core/routine/initialize.cc (revision 0) +++ tests/core/routine/initialize.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/initialize.cc +/*! \file tests/core/routine/initialize.cc * * \brief Tests on mln::initialize. */ Index: tests/core/routine/exact.cc --- tests/core/routine/exact.cc (revision 0) +++ tests/core/routine/exact.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/exact.cc +/*! \file tests/core/routine/exact.cc * * \brief Tests on mln::exact. */ Index: tests/core/routine/Makefile.am --- tests/core/routine/Makefile.am (revision 0) +++ tests/core/routine/Makefile.am (revision 0) @@ -0,0 +1,14 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + clone \ + exact \ + initialize + +clone_SOURCES = clone.cc +exact_SOURCES = exact.cc +initialize_SOURCES = initialize.cc + +TESTS = $(check_PROGRAMS) Index: tests/core/alias/w_window1d_int.cc --- tests/core/alias/w_window1d_int.cc (revision 0) +++ tests/core/alias/w_window1d_int.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/w_window1d_int.cc +/// \file tests/core/alias/w_window1d_int.cc /// \brief Tests on mln::w_window1d_int. #include <mln/core/alias/w_window1d_int.hh> Index: tests/core/alias/window1d.cc --- tests/core/alias/window1d.cc (revision 0) +++ tests/core/alias/window1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/window1d.cc +/*! \file tests/core/alias/window1d.cc * * \brief Tests on mln::window1d. */ Index: tests/core/alias/w_window2d_int.cc --- tests/core/alias/w_window2d_int.cc (revision 0) +++ tests/core/alias/w_window2d_int.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/w_window2d_int.cc +/*! \file tests/core/alias/w_window2d_int.cc * * \brief Tests on mln::w_window2d_int. */ Index: tests/core/alias/window2d.cc --- tests/core/alias/window2d.cc (revision 0) +++ tests/core/alias/window2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/window2d.cc +/*! \file tests/core/alias/window2d.cc * * \brief Tests on mln::window2d. */ Index: tests/core/alias/w_window3d_int.cc --- tests/core/alias/w_window3d_int.cc (revision 0) +++ tests/core/alias/w_window3d_int.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/w_window3d_int.cc +/*! \file tests/core/alias/w_window3d_int.cc * * \brief Tests on mln::w_window3d_int. */ Index: tests/core/alias/window3d.cc --- tests/core/alias/window3d.cc (revision 0) +++ tests/core/alias/window3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/window3d.cc +/*! \file tests/core/alias/window3d.cc * * \brief Tests on mln::window3d. */ Index: tests/core/alias/box1d.cc --- tests/core/alias/box1d.cc (revision 0) +++ tests/core/alias/box1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/box1d.cc +/*! \file tests/core/alias/box1d.cc * * \brief Tests on mln::box1d. */ Index: tests/core/alias/point1d.cc --- tests/core/alias/point1d.cc (revision 0) +++ tests/core/alias/point1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/point1d.cc +/*! \file tests/core/alias/point1d.cc * * \brief Tests on mln::point1d. */ Index: tests/core/alias/box2d.cc --- tests/core/alias/box2d.cc (revision 0) +++ tests/core/alias/box2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/box2d.cc +/*! \file tests/core/alias/box2d.cc * * \brief Tests on mln::box2d. */ Index: tests/core/alias/point2d.cc --- tests/core/alias/point2d.cc (revision 0) +++ tests/core/alias/point2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/point2d.cc +/*! \file tests/core/alias/point2d.cc * * \brief Tests on mln::point2d. */ Index: tests/core/alias/box3d.cc --- tests/core/alias/box3d.cc (revision 0) +++ tests/core/alias/box3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/box3d.cc +/*! \file tests/core/alias/box3d.cc * * \brief Tests on mln::box3d. */ Index: tests/core/alias/point3d.cc --- tests/core/alias/point3d.cc (revision 0) +++ tests/core/alias/point3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/point3d.cc +/*! \file tests/core/alias/point3d.cc * * \brief Tests on mln::point3d. */ Index: tests/core/alias/dpoint1d.cc --- tests/core/alias/dpoint1d.cc (revision 0) +++ tests/core/alias/dpoint1d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/dpoint1d.cc +/*! \file tests/core/alias/dpoint1d.cc * * \brief Tests on mln::dpoint1d. */ Index: tests/core/alias/dpoint2d.cc --- tests/core/alias/dpoint2d.cc (revision 0) +++ tests/core/alias/dpoint2d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/dpoint2d.cc +/*! \file tests/core/alias/dpoint2d.cc * * \brief Tests on mln::dpoint2d. */ Index: tests/core/alias/dpoint3d.cc --- tests/core/alias/dpoint3d.cc (revision 0) +++ tests/core/alias/dpoint3d.cc (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/dpoint3d.cc +/*! \file tests/core/alias/dpoint3d.cc * * \brief Tests on mln::dpoint3d. */ Index: tests/core/alias/Makefile.am --- tests/core/alias/Makefile.am (revision 0) +++ tests/core/alias/Makefile.am (revision 0) @@ -0,0 +1,38 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ +box1d \ +box2d \ +box3d \ +dpoint1d \ +dpoint2d \ +dpoint3d \ +point1d \ +point2d \ +point3d \ +w_window1d_int \ +w_window2d_int \ +w_window3d_int \ +window1d \ +window2d \ +window3d + +box1d_SOURCES = box1d.cc +box2d_SOURCES = box2d.cc +box3d_SOURCES = box3d.cc +dpoint1d_SOURCES = dpoint1d.cc +dpoint2d_SOURCES = dpoint2d.cc +dpoint3d_SOURCES = dpoint3d.cc +point1d_SOURCES = point1d.cc +point2d_SOURCES = point2d.cc +point3d_SOURCES = point3d.cc +w_window1d_int_SOURCES = w_window1d_int.cc +w_window2d_int_SOURCES = w_window2d_int.cc +w_window3d_int_SOURCES = w_window3d_int.cc +window1d_SOURCES = window1d.cc +window2d_SOURCES = window2d.cc +window3d_SOURCES = window3d.cc + +TESTS = $(check_PROGRAMS) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 2179) +++ tests/core/Makefile.am (working copy) @@ -2,189 +2,9 @@ include $(top_srcdir)/milena/tests/tests.mk -check_PROGRAMS = \ - box1d \ - box2d \ - box3d \ - \ - cast_image \ - category \ - clock_neighb2d \ - clock_test \ - clone \ - complex \ - complex_image \ - \ - decorated_image \ - dpoint1d \ - dpoint2d \ - dpoint3d \ - dpoints_pixter \ - \ - exact \ - \ - h_vec \ - hexa \ - \ - image1d \ - image2d \ - image2d_h \ - image3d \ - image_if \ - image_if_interval \ - image_if_value \ - initialize \ - interpolated \ - \ - graph_elt_neighborhood \ - graph_elt_window \ - graph_image \ - \ - line_graph_elt_neighborhood \ - line_graph_elt_window \ - line_graph_image \ - line_piter \ - \ - mono_obased_rle_image \ - mono_rle_image \ - \ - neighb \ - \ - obased_rle_image \ - \ - p_priority_queue \ - p_priority_queue_fast \ - p_priority_queue_fast_with_array \ - p_queue \ - p_queue_fast \ - p_runs \ - p_set \ - pixel \ - pixter1d \ - pixter1d_more \ - pixter2d \ - pixter2d_more \ - pixter3d \ - pixter3d_more \ - plain \ - point1d \ - point2d \ - point3d \ - point_set_compatibility \ - pset_array \ - pset_if \ - \ - rle_image \ - \ - safe_image \ - sparse_image \ - sub_image \ - \ - t_image \ - tr_image \ - translate_image \ - \ - window1d \ - window2d \ - window3d \ - w_window1d_int \ - w_window2d_int \ - w_window3d_int - -box1d_SOURCES = box1d.cc -box2d_SOURCES = box2d.cc -box3d_SOURCES = box3d.cc - -cast_image_SOURCES = cast_image.cc -category_SOURCES = category.cc -clock_neighb2d_SOURCES = clock_neighb2d.cc -clock_test_SOURCES = clock_test.cc -clone_SOURCES = clone.cc -complex_SOURCES = complex.cc -complex_image_SOURCES = complex_image.cc - -decorated_image_SOURCES = decorated_image.cc -dpoint1d_SOURCES = dpoint1d.cc -dpoint2d_SOURCES = dpoint2d.cc -dpoint3d_SOURCES = dpoint3d.cc -dpoints_pixter_SOURCES = dpoints_pixter.cc - -exact_SOURCES = exact.cc - -h_vec_SOURCES = h_vec.cc -hexa_SOURCES = hexa.cc - -image1d_SOURCES = image1d.cc -image2d_SOURCES = image2d.cc -image2d_h_SOURCES = image2d_h.cc -image3d_SOURCES = image3d.cc -image_if_SOURCES = image_if.cc -image_if_interval_SOURCES = image_if_interval.cc -image_if_value_SOURCES = image_if_value.cc -initialize_SOURCES = initialize.cc -interpolated_SOURCES = interpolated.cc - -graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc -graph_elt_window_SOURCES = graph_elt_window.cc -graph_image_SOURCES = graph_image.cc - -line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc -line_graph_elt_window_SOURCES = line_graph_elt_window.cc -line_graph_image_SOURCES = line_graph_image.cc -line_piter_SOURCES = line_piter.cc - -mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc -mono_rle_image_SOURCES = mono_rle_image.cc - -neighb_SOURCES = neighb.cc - -obased_rle_image_SOURCES = obased_rle_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 -p_runs_SOURCES = p_runs.cc -p_set_SOURCES = p_set.cc -pixel_SOURCES = pixel.cc -pixter1d_SOURCES = pixter1d.cc -pixter1d_more_SOURCES = pixter1d_more.cc -pixter2d_SOURCES = pixter2d.cc -pixter2d_more_SOURCES = pixter2d_more.cc -pixter3d_SOURCES = pixter3d.cc -pixter3d_more_SOURCES = pixter3d_more.cc -plain_SOURCES = plain.cc -point1d_SOURCES = point1d.cc -point2d_SOURCES = point2d.cc -point3d_SOURCES = point3d.cc -point_set_compatibility_SOURCES = point_set_compatibility.cc -pset_array_SOURCES = pset_array.cc -pset_if_SOURCES = pset_if.cc - -rle_image_SOURCES = rle_image.cc - -safe_image_SOURCES = safe_image.cc -sparse_image_SOURCES = sparse_image.cc -sub_image_SOURCES = sub_image.cc - -t_image_SOURCES = t_image.cc -tr_image_SOURCES = tr_image.cc -translate_image_SOURCES = translate_image.cc - -window1d_SOURCES = window1d.cc -window2d_SOURCES = window2d.cc -window3d_SOURCES = window3d.cc -w_window1d_int_SOURCES = w_window1d_int.cc -w_window2d_int_SOURCES = w_window2d_int.cc -w_window3d_int_SOURCES = w_window3d_int.cc - -# Tests depending on the FreeImagePlus library. -if FREEIMAGEPLUS - check_PROGRAMS += fi_adaptor - fi_adaptor_SOURCES = fi_adaptor.cc - fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) - fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) -endif - -TESTS = $(check_PROGRAMS) +SUBDIRS = \ + alias \ + image \ + other \ + routine \ + site_set Index: tests/algebra/Makefile.am --- tests/algebra/Makefile.am (revision 2179) +++ tests/algebra/Makefile.am (working copy) @@ -3,11 +3,13 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + h_vec \ mat \ mat2 \ vec \ vec2 +h_vec_SOURCES = h_vec.cc mat_SOURCES = mat.cc mat2_SOURCES = mat2.cc vec_SOURCES = vec.cc

1 0

cleanup-2008 2179: Remove two useless files from mln/core/.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Remove two useless files from mln/core/. * mln/core/dp_array.hh: Remove. * sandbox/garrigues/fllt/fllt_simple.cc (dp_array): Replace by util::array. * mln/core/point_pair.hh: Remove. This class is only used by a single file (sandbox/pellegrin/set/core/p_line_graph.hh). The latter file is a sandbox try and is now obsolete. fllt_simple.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2178) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -38,7 +38,7 @@ #include <mln/core/image/cast_image.hh> #include <mln/core/site_set/p_queue_fast.hh> -#include <mln/core/dp_array.hh> +#include <mln/util/array.hh> #include <mln/value/int_u8.hh> @@ -149,9 +149,9 @@ { // C6 neigboohood. //static std::vector<dpoint2d> nbhs[2]; - static dp_array<dpoint2d> nbhs[2]; + static util::array<dpoint2d> nbhs[2]; - static inline const dp_array<dpoint2d>& get(point2d p) + static inline const util::array<dpoint2d>& get(point2d p) { static bool toto = false; @@ -176,7 +176,7 @@ return nbhs[abs(p[1] % 2)]; } }; - dp_array<dpoint2d> c6_neighb::nbhs[2]; + util::array<dpoint2d> c6_neighb::nbhs[2]; struct c6_interpixel

1 0

cleanup-2008 2178: Move h_vec and h_mat in mln/ from core/ to algebra/.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move h_vec and h_mat in mln/ from core/ to algebra/. * mln/core/h_vec.hh, * mln/core/h_mat.hh: Rename as... * mln/algebra/h_vec.hh, * mln/algebra/h_mat.hh: ...these. Update. * tests/core/h_vec.cc, * tests/algebra/vec2.cc, * tests/algebra/mat.cc, * mln/core/point.hh, * mln/metal/vec.hh, * mln/fun/x2x/composed.hh, * mln/fun/x2x/translation.hh, * mln/fun/x2x/rotation.hh, * mln/fun/internal/x2x_linear_impl.hh, * mln/algebra/vec.hh: Update. mln/algebra/h_mat.hh | 27 +++++++++++------ mln/algebra/h_vec.hh | 55 ++++++++++++++++++++---------------- mln/algebra/vec.hh | 2 - mln/core/point.hh | 10 +++--- mln/fun/internal/x2x_linear_impl.hh | 8 ++--- mln/fun/x2x/composed.hh | 2 - mln/fun/x2x/rotation.hh | 2 - mln/fun/x2x/translation.hh | 4 +- mln/metal/vec.hh | 2 - tests/algebra/mat.cc | 10 +++--- tests/algebra/vec2.cc | 8 ++--- tests/core/h_vec.cc | 16 +++++----- 12 files changed, 81 insertions(+), 65 deletions(-) Index: tests/core/h_vec.cc --- tests/core/h_vec.cc (revision 2177) +++ tests/core/h_vec.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -27,10 +27,10 @@ /*! \file tests/h_vec.cc * - * \brief Tests on mln::h_vec. + * \brief Tests on mln::algebra::h_vec. */ -#include <mln/core/h_vec.hh> +#include <mln/algebra/h_vec.hh> #include <mln/core/alias/point3d.hh> using namespace mln; @@ -40,12 +40,12 @@ { } -void run_in_3d_h(const h_vec<3, int>&) +void run_in_3d_h(const algebra::h_vec<3, int>&) { } -void foo(const mln::h_vec<3,float>&) +void foo(const mln::algebra::h_vec<3,float>&) { } @@ -54,9 +54,9 @@ { algebra::vec<3, int> x; - h_vec<3, int> w = x.to_h_vec(); + algebra::h_vec<3, int> w = x.to_h_vec(); - typedef h_vec<3, int> p3d; + typedef algebra::h_vec<3, int> p3d; p3d p; run_in_3d(p.to_vec()); @@ -66,7 +66,7 @@ { algebra::vec<3,float> v; - h_vec<3,float> w(v.to_h_vec()); + algebra::h_vec<3,float> w(v.to_h_vec()); w = v.to_h_vec(); foo(v.to_h_vec()); } Index: tests/algebra/vec2.cc --- tests/algebra/vec2.cc (revision 2177) +++ tests/algebra/vec2.cc (working copy) @@ -34,7 +34,7 @@ #include <iostream> #include <mln/fun/i2v/all_to.hh> #include <mln/algebra/vec.hh> -#include <mln/core/h_vec.hh> +#include <mln/algebra/h_vec.hh> @@ -45,10 +45,10 @@ algebra::vec<1,float> v1(all_to(4.)); algebra::vec<2,float> v2 = make::vec(6., 2.8); - h_vec<1,float> hv1; - h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. + algebra::h_vec<1,float> hv1; + algebra::h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. - h_vec<3,float> hv3(all_to(1.5)); + algebra::h_vec<3,float> hv3(all_to(1.5)); hv3 += make::vec(0., 0., 0., 0.5); Index: tests/algebra/mat.cc --- tests/algebra/mat.cc (revision 2177) +++ tests/algebra/mat.cc (working copy) @@ -34,7 +34,7 @@ #include <iostream> #include <mln/fun/i2v/all_to.hh> #include <mln/algebra/mat.hh> -#include <mln/core/h_mat.hh> +#include <mln/algebra/h_mat.hh> @@ -45,9 +45,9 @@ algebra::mat<1,3,float> m1(all_to(4.)); algebra::mat<2,2,float> m2 = algebra::mat<2,2,float>::Id; - h_mat<1,float> hm1(m2); - h_mat<2,float> hm2; - h_mat<3,float> hm3(all_to(1.5)); + algebra::h_mat<1,float> hm1(m2); + algebra::h_mat<2,float> hm2; + algebra::h_mat<3,float> hm3(all_to(1.5)); algebra::mat<4,4,float> m4 = hm3; @@ -59,7 +59,7 @@ std::cout << "hm3 = " << hm3 << ";" << std::endl; { - h_mat<2,float> m, m2; + algebra::h_mat<2,float> m, m2; m = m2; // FIXME: Test *many* => runs ok... } Index: mln/core/point.hh --- mln/core/point.hh (revision 2177) +++ mln/core/point.hh (working copy) @@ -42,7 +42,7 @@ # include <mln/metal/is_not.hh> # include <mln/algebra/vec.hh> # include <mln/metal/converts_to.hh> -# include <mln/core/h_vec.hh> +# include <mln/algebra/h_vec.hh> # include <mln/util/yes.hh> @@ -69,7 +69,7 @@ struct point_to_ { typedef algebra::vec<G::dim, C> metal_vec; - typedef mln::h_vec<G::dim, C> h_vec; + typedef mln::algebra::h_vec<G::dim, C> h_vec; }; } // end of namespace mln::internal @@ -174,7 +174,7 @@ const algebra::vec<G::dim, C>& to_vec() const; /// Transform to point in homogene coordinate system. - h_vec<G::dim, C> to_h_vec() const; + algebra::h_vec<G::dim, C> to_h_vec() const; /// Point with all coordinates set to the maximum value. static const point<G,C>& plus_infty(); @@ -394,9 +394,9 @@ template <typename G, typename C> inline - h_vec<G::dim, C> point<G,C>::to_h_vec() const + algebra::h_vec<G::dim, C> point<G,C>::to_h_vec() const { - h_vec<G::dim, C> tmp; + algebra::h_vec<G::dim, C> tmp; for (unsigned i = 0; i < dim; ++i) tmp[i] = coord_[i]; tmp[G::dim] = 1; Index: mln/metal/vec.hh --- mln/metal/vec.hh (revision 2177) +++ mln/metal/vec.hh (working copy) @@ -191,7 +191,7 @@ // Immersion of the vector into its homogeneous space. - h_vec<n, T> to_h_vec() const; + algebra::h_vec<n, T> to_h_vec() const; const T& operator[](unsigned i) const; Index: mln/fun/x2x/composed.hh --- mln/fun/x2x/composed.hh (revision 2177) +++ mln/fun/x2x/composed.hh (working copy) @@ -38,7 +38,7 @@ # include <mln/algebra/vec.hh> # include <mln/metal/is.hh> # include <mln/metal/bexpr.hh> -# include <mln/core/h_mat.hh> +# include <mln/algebra/h_mat.hh> namespace mln Index: mln/fun/x2x/translation.hh --- mln/fun/x2x/translation.hh (revision 2177) +++ mln/fun/x2x/translation.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/concept/function.hh> # include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/algebra/vec.hh> -# include <mln/core/h_mat.hh> +# include <mln/algebra/h_mat.hh> # include <mln/fun/i2v/all.hh> namespace mln @@ -97,7 +97,7 @@ translation<n,C>::translation(const algebra::vec<n,C>& t) :t_(t) { - this->m_ = h_mat<n,C>::Id; + this->m_ = algebra::h_mat<n,C>::Id; this->update(); } Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 2177) +++ mln/fun/x2x/rotation.hh (working copy) @@ -100,7 +100,7 @@ dir_(dir) { mln_precondition(dir == 2 || n == 3); - this->m_ = h_mat<n,C>::Id; + this->m_ = algebra::h_mat<n,C>::Id; update(); } Index: mln/fun/internal/x2x_linear_impl.hh --- mln/fun/internal/x2x_linear_impl.hh (revision 2177) +++ mln/fun/internal/x2x_linear_impl.hh (working copy) @@ -34,8 +34,8 @@ */ # include <mln/core/concept/function.hh> -# include <mln/core/h_mat.hh> -# include <mln/core/h_vec.hh> +# include <mln/algebra/h_mat.hh> +# include <mln/algebra/h_vec.hh> namespace mln { @@ -54,11 +54,11 @@ typedef V argument; typedef V result; typedef typename V::coord coord; - typedef h_mat<dim, coord> matrix; + typedef algebra::h_mat<dim, coord> matrix; V operator()(const V& x) const { - h_vec<dim, coord> tmp = m_ * x.to_h_vec(); + algebra::h_vec<dim, coord> tmp = m_ * x.to_h_vec(); return tmp.to_vec(); } Index: mln/algebra/h_vec.hh --- mln/algebra/h_vec.hh (revision 2177) +++ mln/algebra/h_vec.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_H_VEC_HH -# define MLN_CORE_H_VEC_HH +#ifndef MLN_ALGEBRA_H_VEC_HH +# define MLN_ALGEBRA_H_VEC_HH -/*! \file mln/core/h_vec.hh +/*! \file mln/algebra/h_vec.hh * * \brief Definition of a vector with homogeneous coordinates. */ @@ -36,12 +36,14 @@ # include <mln/algebra/vec.hh> # include <mln/literal/one.hh> + namespace mln { - // Fwd decl. + // Forward declaration. + namespace algebra { template <unsigned d, typename C> struct h_vec; - + } namespace trait @@ -51,10 +53,10 @@ template < template <class> class Name, unsigned d, typename C > - struct set_precise_unary_< Name, h_vec<d, C> > + struct set_precise_unary_< Name, algebra::h_vec<d, C> > { typedef mln_trait_unary(Name, C) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; // For binary traits. @@ -63,30 +65,35 @@ unsigned d, typename C, typename Q > struct set_precise_binary_< Name, - h_vec<d, C>, h_vec<d, Q> > + algebra::h_vec<d, C>, algebra::h_vec<d, Q> > { typedef mln_trait_binary(Name, C, Q) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; template < template <class, class> class Name, unsigned d, typename C, typename S > struct set_precise_binary_< Name, - h_vec<d, C>, mln::value::scalar_<S> > + algebra::h_vec<d, C>, mln::value::scalar_<S> > { typedef mln_trait_binary(Name, C, S) V; - typedef h_vec<d, V> ret; + typedef algebra::h_vec<d, V> ret; }; } // end of namespace mln::trait + + namespace algebra + { + + /*! \brief N-Dimensional vector with homogeneous coordinates. * */ template <unsigned d, typename C> - struct h_vec : public algebra::vec<d + 1, C> + struct h_vec : public vec<d + 1, C> { /// Dimension is the 'natural' one (3 for 3D), not the one of the vector (dim + 1). enum { dim = d }; @@ -94,12 +101,12 @@ /// Constructor without argument. h_vec(); /// Constructor with the underlying vector. - h_vec(const algebra::vec<d+1, C>& other); + h_vec(const vec<d+1, C>& other); - h_vec& operator=(const algebra::vec<d+1, C>& rhs); + h_vec& operator=(const vec<d+1, C>& rhs); /// Back to the natural (non-homogeneous) space. - algebra::vec<d,C> to_vec() const; + vec<d,C> to_vec() const; }; @@ -119,18 +126,18 @@ template <unsigned d, typename C> inline - h_vec<d,C>::h_vec(const algebra::vec<d+1, C>& other) - : algebra::vec<d+1, C>(other) + h_vec<d,C>::h_vec(const vec<d+1, C>& other) + : vec<d+1, C>(other) { } template <unsigned d, typename C> inline - h_vec<d,C>& h_vec<d,C>::operator=(const algebra::vec<d+1, C>& rhs) + h_vec<d,C>& h_vec<d,C>::operator=(const vec<d+1, C>& rhs) { if (& rhs == this) return *this; - this->algebra::vec<d+1, C>::operator=(rhs); + this->vec<d+1, C>::operator=(rhs); return *this; } @@ -154,12 +161,12 @@ template <unsigned d, typename C> inline - algebra::vec<d,C> h_vec<d,C>::to_vec() const + vec<d,C> h_vec<d,C>::to_vec() const { const C w = this->data_[d]; mln_assertion(w != 0); - algebra::vec<d,C> tmp; + vec<d,C> tmp; for (unsigned i = 0; i < d; ++i) tmp[i] = this->data_[i] / w; return tmp; @@ -167,7 +174,9 @@ # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::algebra + } // end of namespace mln -#endif // ! MLN_CORE_H_VEC_HH +#endif // ! MLN_ALGEBRA_H_VEC_HH Index: mln/algebra/h_mat.hh --- mln/algebra/h_mat.hh (revision 2177) +++ mln/algebra/h_mat.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,12 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_H_MAT_HH -# define MLN_CORE_H_MAT_HH +#ifndef MLN_ALGEBRA_H_MAT_HH +# define MLN_ALGEBRA_H_MAT_HH -/*! \file mln/core/h_mat.hh +/*! \file mln/algebra/h_mat.hh * * \brief Definition of a matrix with homogeneous coordinates. + * + * \todo Add traits. */ # include <mln/algebra/mat.hh> @@ -39,11 +41,14 @@ namespace mln { + namespace algebra + { + /*! \brief N-Dimensional matrix with homogeneous coordinates. * */ template <unsigned d, typename T> - struct h_mat : public algebra::mat<d+1, d+1, T> + struct h_mat : public mat<d+1, d+1, T> { /// Dimension is the 'natural' one (3 for 3D), not the one of the vector (dim + 1) enum { N = d, @@ -53,7 +58,7 @@ /// Constructor without argument. h_mat(); /// Constructor with the underlying matrix. - h_mat(const algebra::mat<d+1, d+1, T>& x); + h_mat(const mat<d+1, d+1, T>& x); }; @@ -62,21 +67,23 @@ template <unsigned d, typename T> inline h_mat<d,T>::h_mat() - : algebra::mat<d+1, d+1, T>(algebra::mat<d+1, d+1, T>::Id) + : mat<d+1, d+1, T>(mat<d+1, d+1, T>::Id) { } template <unsigned d, typename T> inline - h_mat<d,T>::h_mat(const algebra::mat<d+1, d+1, T>& x) - : algebra::mat<d+1, d+1, T>(x) + h_mat<d,T>::h_mat(const mat<d+1, d+1, T>& x) + : mat<d+1, d+1, T>(x) { } # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::algebra + } // end of namespace mln -#endif // ! MLN_CORE_H_MAT_HH +#endif // ! MLN_ALGEBRA_H_MAT_HH Index: mln/algebra/vec.hh --- mln/algebra/vec.hh (revision 2177) +++ mln/algebra/vec.hh (working copy) @@ -197,7 +197,7 @@ // Immersion of the vector into its homogeneous space. - h_vec<n, T> to_h_vec() const; + algebra::h_vec<n, T> to_h_vec() const; const T& operator[](unsigned i) const;

1 0

cleanup-2008 2177: Move some remaining core types in appropriate directories.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Move some remaining core types in appropriate directories. * mln/core/complex_image.hh, * mln/core/lazy_image.hh: Rename as... * mln/core/image/complex_image.hh, * mln/core/image/lazy_image.hh: ...these. * mln/core/p_complex.hh, * mln/core/p_complex_piter.hh, * mln/core/p_faces.hh: Rename as... * mln/core/site_set/p_complex.hh, * mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_faces.hh: ...these. * tests/core/complex_image.cc: Update. mln/core/image/complex_image.hh | 10 +++++----- mln/core/image/lazy_image.hh | 8 ++++---- mln/core/site_set/p_complex.hh | 10 +++++----- mln/core/site_set/p_complex_piter.hh | 10 +++++----- mln/core/site_set/p_faces.hh | 8 ++++---- tests/core/complex_image.cc | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2176) +++ tests/core/complex_image.cc (working copy) @@ -33,8 +33,8 @@ #include <mln/value/int_u8.hh> #include <mln/core/alias/point2d.hh> -#include <mln/core/p_faces.hh> -#include <mln/core/complex_image.hh> +#include <mln/core/site_set/p_faces.hh> +#include <mln/core/image/complex_image.hh> int main() @@ -127,12 +127,12 @@ At least, we could have better error messages, i.e., something like - mln/core/complex_image.hh 267: + mln/core/image/complex_image.hh 267: mln::complex_image<D, P, V>::operator(): Uncompatible p_complex. instead of - mln/core/complex_image.hh:267: + mln/core/image/complex_image.hh:267: typename mln::complex_image<D, P, V>::lvalue mln::complex_image<D, P, V>::operator()(const mln::complex_psite<D, P>&) [with unsigned int D = 2u, Index: mln/core/site_set/p_complex.hh --- mln/core/site_set/p_complex.hh (revision 2176) +++ mln/core/site_set/p_complex.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_COMPLEX_HH -# define MLN_CORE_P_COMPLEX_HH +#ifndef MLN_CORE_SITE_SET_P_COMPLEX_HH +# define MLN_CORE_SITE_SET_P_COMPLEX_HH -/// \file mln/core/p_complex.hh +/// \file mln/core/site_set/p_complex.hh /// \brief Definition of a point set based on a complex. # include <mln/core/internal/point_set_base.hh> @@ -38,7 +38,7 @@ # include <mln/core/complex.hh> # include <mln/core/complex_psite.hh> -# include <mln/core/p_complex_piter.hh> +# include <mln/core/site_set/p_complex_piter.hh> namespace mln @@ -239,4 +239,4 @@ } // end of mln -#endif // MLN_CORE_P_COMPLEX_HH +#endif // MLN_CORE_SITE_SET_P_COMPLEX_HH Index: mln/core/site_set/p_complex_piter.hh --- mln/core/site_set/p_complex_piter.hh (revision 2176) +++ mln/core/site_set/p_complex_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_COMPLEX_PITER_HH -# define MLN_CORE_P_COMPLEX_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH +# define MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH # include <limits> # include <mln/core/internal/point_iterator_base.hh> -# include <mln/core/p_complex.hh> +# include <mln/core/site_set/p_complex.hh> # include <mln/core/complex_psite.hh> -/// \file mln/core/p_complex_piter.hh +/// \file mln/core/site_set/p_complex_piter.hh /// \brief Definition of point iterator on complex-based pset. // Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P> @@ -607,4 +607,4 @@ } // end of mln -#endif // ! MLN_CORE_P_COMPLEX_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH Index: mln/core/site_set/p_faces.hh --- mln/core/site_set/p_faces.hh (revision 2176) +++ mln/core/site_set/p_faces.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_P_FACES_HH -# define MLN_CORE_P_FACES_HH +#ifndef MLN_CORE_SITE_SET_P_FACES_HH +# define MLN_CORE_SITE_SET_P_FACES_HH -/// \file mln/core/p_faces.hh +/// \file mln/core/site_set/p_faces.hh /// \brief Definition of a point set based on the set of n-faces of a /// complex. @@ -206,4 +206,4 @@ } // end of mln -#endif // MLN_CORE_P_FACES_HH +#endif // MLN_CORE_SITE_SET_P_FACES_HH Index: mln/core/image/lazy_image.hh --- mln/core/image/lazy_image.hh (revision 2176) +++ mln/core/image/lazy_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_LAZY_IMAGE_HH -# define MLN_CORE_LAZY_IMAGE_HH +#ifndef MLN_CORE_IMAGE_LAZY_IMAGE_HH +# define MLN_CORE_IMAGE_LAZY_IMAGE_HH -/*! \file mln/core/lazy_image.hh +/*! \file mln/core/image/lazy_image.hh * * \brief Definition of a lazy image. Values are computed on the fly */ @@ -206,4 +206,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_LAZY_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_LAZY_IMAGE_HH Index: mln/core/image/complex_image.hh --- mln/core/image/complex_image.hh (revision 2176) +++ mln/core/image/complex_image.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_COMPLEX_IMAGE_HH -# define MLN_CORE_COMPLEX_IMAGE_HH +#ifndef MLN_CORE_IMAGE_COMPLEX_IMAGE_HH +# define MLN_CORE_IMAGE_COMPLEX_IMAGE_HH -/// \file mln/core/complex_image.hh +/// \file mln/core/image/complex_image.hh /// \brief Definition of a line complex-based image. # include <vector> @@ -37,7 +37,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/metal/vec.hh> -# include <mln/core/p_complex.hh> +# include <mln/core/site_set/p_complex.hh> # include <mln/core/complex_psite.hh> # include <mln/value/set.hh> @@ -298,4 +298,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_COMPLEX_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_COMPLEX_IMAGE_HH

1 0

cleanup-2008 2176: Rename pset_if as p_if and remove Q at end of priority_Q.
by Thierry Geraud 04 Sep '08

04 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename pset_if as p_if and remove Q at end of priority_Q. * mln/core/site_set/pset_if.hh, * mln/core/pset_if_piter.hh: Rename as... * mln/core/site_set/p_if.hh, * mln/core/site_set/p_if_piter.hh: ...these. * mln/core/site_set/p_priority_queue.hh: Rename as... * mln/core/site_set/p_priority.hh: ...this. * tests/core/p_priority_queue.cc, * tests/core/p_priority_queue_fast_with_array.cc, * tests/core/pset_if.cc, * tests/core/p_priority_queue_fast.cc, * tests/convert/to_image.cc, * doc/tutorial/examples/image_if.cc, * doc/tutorial/examples/p_queue.cc, * mln/core/site_set/p_image.hh, * mln/core/image/image_if.hh, * mln/core/internal/image_if_base.hh, * mln/draw/label.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/morpho/meyer_wst.hh, * sandbox/pellegrin/set/test/p_priority_queue_fast.cc, * sandbox/pellegrin/set/test/p_priority_queue.cc, * sandbox/pellegrin/set/test/pset_if.cc, * sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc, * sandbox/pellegrin/set/trait/point_set.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast.hh, * sandbox/pellegrin/set/core/pset_if.hh, * sandbox/pellegrin/set/core/concept/point_set.hh, * sandbox/pellegrin/set/core/p_priority_queue.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/fllt.hh: Update. doc/tutorial/examples/image_if.cc | 2 doc/tutorial/examples/p_queue.cc | 2 mln/core/image/image_if.hh | 10 - mln/core/internal/image_if_base.hh | 10 - mln/core/site_set/p_if.hh | 52 +++++----- mln/core/site_set/p_if_piter.hh | 40 +++---- mln/core/site_set/p_image.hh | 4 mln/draw/label.hh | 2 mln/geom/seeds2tiling_roundness.hh | 4 mln/morpho/meyer_wst.hh | 2 sandbox/garrigues/fllt/fllt.hh | 4 sandbox/garrigues/level_set.hh | 4 sandbox/pellegrin/set/core/concept/point_set.hh | 2 sandbox/pellegrin/set/core/p_priority_queue.hh | 50 ++++----- sandbox/pellegrin/set/core/p_priority_queue_fast.hh | 50 ++++----- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh | 50 ++++----- sandbox/pellegrin/set/core/pset_if.hh | 52 +++++----- sandbox/pellegrin/set/test/p_priority_queue.cc | 8 - sandbox/pellegrin/set/test/p_priority_queue_fast.cc | 8 - sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc | 8 - sandbox/pellegrin/set/test/pset_if.cc | 6 - sandbox/pellegrin/set/trait/point_set.hh | 8 - tests/convert/to_image.cc | 2 tests/core/p_priority_queue.cc | 8 - tests/core/p_priority_queue_fast.cc | 8 - tests/core/p_priority_queue_fast_with_array.cc | 8 - tests/core/pset_if.cc | 6 - 27 files changed, 205 insertions(+), 205 deletions(-) Index: tests/core/p_priority_queue.cc --- tests/core/p_priority_queue.cc (revision 2175) +++ tests/core/p_priority_queue.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue.cc +/*! \file tests/core/p_priority.cc * - * \brief Tests on mln::p_priority_queue. + * \brief Tests on mln::p_priority. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/site_set/p_priority_queue.hh> +#include <mln/core/site_set/p_priority.hh> int main () { using namespace mln; - p_priority_queue<point2d, unsigned> q; + p_priority<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/core/p_priority_queue_fast_with_array.cc --- tests/core/p_priority_queue_fast_with_array.cc (revision 2175) +++ tests/core/p_priority_queue_fast_with_array.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast_with_array.cc +/*! \file tests/core/p_priority_fast_with_array.cc * - * \brief Tests on mln::p_priority_queue_fast_with_array. + * \brief Tests on mln::p_priority_fast_with_array. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast_with_array.hh> +#include <mln/core/p_priority_fast_with_array.hh> int main () { using namespace mln; - p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + p_priority_fast_with_array<point2d, unsigned, 20> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/core/pset_if.cc --- tests/core/pset_if.cc (revision 2175) +++ tests/core/pset_if.cc (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/pset_if.cc +/*! \file tests/core/p_if.cc * - * \brief Tests on mln::pset_if. + * \brief Tests on mln::p_if. */ #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: tests/core/p_priority_queue_fast.cc --- tests/core/p_priority_queue_fast.cc (revision 2175) +++ tests/core/p_priority_queue_fast.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast.cc +/*! \file tests/core/p_priority_fast.cc * - * \brief Tests on mln::p_priority_queue_fast. + * \brief Tests on mln::p_priority_fast. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast.hh> +#include <mln/core/p_priority_fast.hh> int main () { using namespace mln; - mln::p_priority_queue_fast<point2d, unsigned> q; + mln::p_priority_fast<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2175) +++ tests/convert/to_image.cc (working copy) @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/window2d.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/level/compare.hh> Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 2175) +++ doc/tutorial/examples/image_if.cc (working copy) @@ -71,7 +71,7 @@ trait::image::print(ima_); std::cout << std::endl; - typedef pset_if<box2d, fun::p2b::chess_t> S; + typedef p_if<box2d, fun::p2b::chess_t> S; ch_target(mln_fwd_piter_(S)(), ima_.domain()); // mln_VAR(ima_e, extend(ima_, pw::value(ima))); Index: doc/tutorial/examples/p_queue.cc --- doc/tutorial/examples/p_queue.cc (revision 2175) +++ doc/tutorial/examples/p_queue.cc (working copy) @@ -4,7 +4,7 @@ # include <mln/debug/println.hh> # include <mln/level/fill.hh> -# include <mln/core/site_set/p_priority_queue.hh> +# include <mln/core/site_set/p_priority.hh> Index: mln/core/site_set/p_image.hh --- mln/core/site_set/p_image.hh (revision 2175) +++ mln/core/site_set/p_image.hh (working copy) @@ -37,7 +37,7 @@ * \todo Add an init method (deferred initialization). */ -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> @@ -76,7 +76,7 @@ public: /// Equivalent site_set type. - typedef pset_if<S_, F_> S; + typedef p_if<S_, F_> S; /// Conversion towards the equivalent site set. operator S() const; Index: mln/core/site_set/p_if.hh --- mln/core/site_set/p_if.hh (revision 2175) +++ mln/core/site_set/p_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_HH -# define MLN_CORE_SITE_SET_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_P_IF_HH +# define MLN_CORE_SITE_SET_P_IF_HH -/*! \file mln/core/site_set/pset_if.hh +/*! \file mln/core/site_set/p_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. * @@ -43,15 +43,15 @@ { // Fwd decls. - template <typename S, typename F> struct pset_if; - template <typename Pi, typename S, typename F> struct pset_if_piter_; + template <typename S, typename F> struct p_if; + template <typename Pi, typename S, typename F> struct p_if_piter_; namespace trait { template <typename S, typename F> - struct site_set_< pset_if<S,F> > + struct site_set_< p_if<S,F> > { typedef trait::site_set::nsites::unknown nsites; typedef trait::site_set::bbox::unknown bbox; @@ -69,7 +69,7 @@ * \return A subset of points. */ template <typename S, typename F> - pset_if<S, F> + p_if<S, F> operator | (const Site_Set<S>& pset, const Function_p2b<F>& f); @@ -80,9 +80,9 @@ * from point to Boolean. */ template <typename S, typename F> - class pset_if : public internal::site_set_base_< mln_psite(S), pset_if<S,F> > + class p_if : public internal::site_set_base_< mln_psite(S), p_if<S,F> > { - typedef pset_if<S,F> self_; + typedef p_if<S,F> self_; typedef internal::site_set_base_<mln_psite(S), self_> super_; public: @@ -94,20 +94,20 @@ typedef mln_psite(S) psite; /// Forward Site_Iterator associated type. - typedef pset_if_piter_<mln_fwd_piter(S), S, F> fwd_piter; + typedef p_if_piter_<mln_fwd_piter(S), S, F> fwd_piter; /// Backward Site_Iterator associated type. - typedef pset_if_piter_<mln_bkd_piter(S), S, F> bkd_piter; + typedef p_if_piter_<mln_bkd_piter(S), S, F> bkd_piter; /// Site_Iterator associated type. typedef fwd_piter piter; /// Constructor with a point set \p pset and a predicate \p f. - pset_if(const S& pset, const F& f); + p_if(const S& pset, const F& f); /// Constructor without argument. - pset_if(); + p_if(); /// Test if this site set is valid. @@ -143,20 +143,20 @@ template <typename S, typename F> inline - pset_if<S, F> + p_if<S, F> operator | (const Site_Set<S>& pset, const Function_p2b<F>& f) { - pset_if<S, F> tmp(exact(pset), exact(f)); + p_if<S, F> tmp(exact(pset), exact(f)); return tmp; } - // pset_if<S,F> + // p_if<S,F> template <typename S, typename F> inline bool - pset_if<S,F>::has(const psite& p) const + p_if<S,F>::has(const psite& p) const { return pset_.has(p) && f_(p); } @@ -164,7 +164,7 @@ template <typename S, typename F> inline bool - pset_if<S,F>::is_valid() const + p_if<S,F>::is_valid() const { return pset_.is_valid(); } @@ -172,7 +172,7 @@ template <typename S, typename F> inline const S& - pset_if<S,F>::overset() const + p_if<S,F>::overset() const { return pset_; } @@ -180,14 +180,14 @@ template <typename S, typename F> inline bool - pset_if<S,F>::pred(const psite& p) const + p_if<S,F>::pred(const psite& p) const { return f_(p); } template <typename S, typename F> inline - pset_if<S,F>::pset_if(const S& pset, const F& f) + p_if<S,F>::p_if(const S& pset, const F& f) : pset_(pset), f_(f) { @@ -195,14 +195,14 @@ template <typename S, typename F> inline - pset_if<S,F>::pset_if() + p_if<S,F>::p_if() { } template <typename S, typename F> inline const F& - pset_if<S,F>::predicate() const + p_if<S,F>::predicate() const { return f_; } @@ -210,7 +210,7 @@ template <typename S, typename F> inline std::size_t - pset_if<S,F>::memory_size() const + p_if<S,F>::memory_size() const { return pset_.memory_size() + sizeof(f_); } @@ -221,8 +221,8 @@ -# include <mln/core/pset_if_piter.hh> +# include <mln/core/p_if_piter.hh> -#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_HH Index: mln/core/site_set/p_if_piter.hh --- mln/core/site_set/p_if_piter.hh (revision 2175) +++ mln/core/site_set/p_if_piter.hh (working copy) @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_PITER_HH -# define MLN_CORE_SITE_SET_PSET_IF_PITER_HH +#ifndef MLN_CORE_SITE_SET_P_IF_PITER_HH +# define MLN_CORE_SITE_SET_P_IF_PITER_HH -/*! \file mln/core/pset_if_piter.hh +/*! \file mln/core/p_if_piter.hh * - * \brief Definition of iterators on pset_if<S,F>. + * \brief Definition of iterators on p_if<S,F>. */ # include <mln/core/internal/piter_adaptor.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> namespace mln @@ -46,19 +46,19 @@ * Parameter \c S is a site set type; parameter F is a function * from point to Boolean. * - * \see mln::pset_if + * \see mln::p_if */ template <typename Pi, typename S, typename F> - struct pset_if_piter_ + struct p_if_piter_ : public internal::piter_adaptor_< Pi, // Adaptee. - pset_if<S,F>, // Site_Set. - pset_if_piter_<Pi,S,F> > // Exact. + p_if<S,F>, // Site_Set. + p_if_piter_<Pi,S,F> > // Exact. { /// Constructor without argument. - pset_if_piter_(); + p_if_piter_(); /// Constructor from a site set. - pset_if_piter_(const pset_if<S,F>& s); + p_if_piter_(const p_if<S,F>& s); /// Start an iteration. void start_(); @@ -67,11 +67,11 @@ void next_(); /// Change the set site targeted by pi_. - void pi_change_target_(const pset_if<S,F>& s); + void pi_change_target_(const p_if<S,F>& s); private: - typedef pset_if_piter_<Pi,S,F> self_; - typedef internal::piter_adaptor_<Pi, pset_if<S,F>, self_> super_; + typedef p_if_piter_<Pi,S,F> self_; + typedef internal::piter_adaptor_<Pi, p_if<S,F>, self_> super_; protected: using super_::s_; @@ -84,13 +84,13 @@ template <typename Pi, typename S, typename F> inline - pset_if_piter_<Pi,S,F>::pset_if_piter_() + p_if_piter_<Pi,S,F>::p_if_piter_() { } template <typename Pi, typename S, typename F> inline - pset_if_piter_<Pi,S,F>::pset_if_piter_(const pset_if<S,F>& s) + p_if_piter_<Pi,S,F>::p_if_piter_(const p_if<S,F>& s) { this->change_target(s); } @@ -98,7 +98,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::start_() + p_if_piter_<Pi,S,F>::start_() { pi_.start(); while (pi_.is_valid() && ! s_->pred(pi_)) @@ -108,7 +108,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::next_() + p_if_piter_<Pi,S,F>::next_() { do pi_.next(); @@ -118,7 +118,7 @@ template <typename Pi, typename S, typename F> inline void - pset_if_piter_<Pi,S,F>::pi_change_target_(const pset_if<S,F>& s) + p_if_piter_<Pi,S,F>::pi_change_target_(const p_if<S,F>& s) { pi_.change_target(s.overset()); } @@ -128,4 +128,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SITE_SET_PSET_IF_PITER_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_PITER_HH Index: mln/core/image/image_if.hh --- mln/core/image/image_if.hh (revision 2175) +++ mln/core/image/image_if.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/pw/all.hh> @@ -58,7 +58,7 @@ data(I& ima, const F& f); I ima_; - pset_if<mln_pset(I), F> pset_; + p_if<mln_pset(I), F> pset_; }; } // end of namespace mln::internal @@ -90,7 +90,7 @@ */ template <typename I, typename F> struct image_if : public internal::image_domain_morpher< I, - pset_if<mln_pset(I), F>, + p_if<mln_pset(I), F>, image_if<I, F> > { /// Skeleton. @@ -105,7 +105,7 @@ void init_(I& ima, const F& f); /// Give the definition domain. - const pset_if<mln_pset(I), F>& domain() const; + const p_if<mln_pset(I), F>& domain() const; /// Const promotion via conversion. operator image_if<const I, F>() const; @@ -193,7 +193,7 @@ template <typename I, typename F> inline - const pset_if<mln_pset(I), F>& + const p_if<mln_pset(I), F>& image_if<I,F>::domain() const { mln_precondition(this->has_data()); Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 2175) +++ mln/core/internal/image_if_base.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/image_domain_morpher.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/pw/all.hh> # include <mln/value/interval.hh> @@ -57,7 +57,7 @@ data_(I& ima, const F& f); I ima_; - pset_if<mln_pset(I), F> pset_; + p_if<mln_pset(I), F> pset_; }; } // end of namespace mln::internal @@ -99,11 +99,11 @@ * */ template <typename I, typename F, typename E> - struct image_if_base_ : public internal::image_domain_morpher< I, pset_if<mln_pset(I),F>, E > + struct image_if_base_ : public internal::image_domain_morpher< I, p_if<mln_pset(I),F>, E > { /// Give the definition domain. - const pset_if<mln_pset(I), F>& domain() const; + const p_if<mln_pset(I), F>& domain() const; void init_(I& ima, const F& f); @@ -186,7 +186,7 @@ template <typename I, typename F, typename E> inline - const pset_if<mln_pset(I), F>& + const p_if<mln_pset(I), F>& image_if_base_<I,F,E>::domain() const { return this->data_->pset_; Index: mln/draw/label.hh --- mln/draw/label.hh (revision 2175) +++ mln/draw/label.hh (working copy) @@ -77,7 +77,7 @@ { typedef mln_value(I) V; typedef mln_ch_value(I, value::rgb8) O; - typedef const mln::pset_if<mln_pset(I), mln::fun::eq_p2b_expr_<mln::pw::value_, mln::pw::cst_<V> > > F; + typedef const mln::p_if<mln_pset(I), mln::fun::eq_p2b_expr_<mln::pw::value_, mln::pw::cst_<V> > > F; I in = exact(input); mln_precondition(in.has_data()); Index: mln/geom/seeds2tiling_roundness.hh --- mln/geom/seeds2tiling_roundness.hh (revision 2175) +++ mln/geom/seeds2tiling_roundness.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_priority_queue_fast.hh> +# include <mln/core/p_priority_fast.hh> # include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> @@ -86,7 +86,7 @@ I& ima = exact(ima_); image2d<unsigned> dist = geom::chamfer(ima, w_win, max); I out = clone(ima_); - p_priority_queue_fast<mln_psite(I), unsigned> q; + p_priority_fast<mln_psite(I), unsigned> q; // Init. { Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2175) +++ mln/morpho/meyer_wst.hh (working copy) @@ -120,7 +120,7 @@ // Ordered queue. /* FIXME: Milena probably already provides an ordered queue - facility via the mln::p_priority_queue class. Try to use it + facility via the mln::p_priority class. Try to use it instead, and get rid of mln/util/greater_psite.hh. */ typedef std::priority_queue< psite, std::vector<psite>, util::greater_psite > Index: sandbox/pellegrin/set/test/p_priority_queue_fast.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue_fast.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast.cc +/*! \file tests/core/p_priority_fast.cc * - * \brief Tests on mln::p_priority_queue_fast. + * \brief Tests on mln::p_priority_fast. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast.hh> +#include <mln/core/p_priority_fast.hh> int main () { using namespace mln; - mln::p_priority_queue_fast<point2d, unsigned> q; + mln::p_priority_fast<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/test/p_priority_queue.cc --- sandbox/pellegrin/set/test/p_priority_queue.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue.cc +/*! \file tests/core/p_priority.cc * - * \brief Tests on mln::p_priority_queue. + * \brief Tests on mln::p_priority. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/site_set/p_priority_queue.hh> +#include <mln/core/site_set/p_priority.hh> int main () { using namespace mln; - p_priority_queue<point2d, unsigned> q; + p_priority<point2d, unsigned> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/test/pset_if.cc --- sandbox/pellegrin/set/test/pset_if.cc (revision 2175) +++ sandbox/pellegrin/set/test/pset_if.cc (working copy) @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core_pset_if.cc +/*! \file tests/core_p_if.cc * - * \brief Tests on mln::pset_if. + * \brief Tests on mln::p_if. */ #include <mln/core/image/image2d.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/site_set/pset_if.hh> +#include <mln/core/site_set/p_if.hh> #include <mln/fun/p2b/chess.hh> #include <mln/convert/to_image.hh> #include <mln/convert/to_p_set.hh> Index: sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc --- sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (revision 2175) +++ sandbox/pellegrin/set/test/p_priority_queue_fast_with_array.cc (working copy) @@ -25,19 +25,19 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/p_priority_queue_fast_with_array.cc +/*! \file tests/core/p_priority_fast_with_array.cc * - * \brief Tests on mln::p_priority_queue_fast_with_array. + * \brief Tests on mln::p_priority_fast_with_array. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_queue_fast_with_array.hh> +#include <mln/core/p_priority_fast_with_array.hh> int main () { using namespace mln; - p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + p_priority_fast_with_array<point2d, unsigned, 20> q; point2d p1 (6, 9); point2d p2 (5, 1); point2d p3 (4, 2); Index: sandbox/pellegrin/set/trait/point_set.hh --- sandbox/pellegrin/set/trait/point_set.hh (revision 2175) +++ sandbox/pellegrin/set/trait/point_set.hh (working copy) @@ -47,15 +47,15 @@ template <typename P> struct p_bgraph; template <typename P> struct p_graph; template <typename P> struct p_line_graph; - template <typename P, typename T> struct p_priority_queue; - template <typename P, typename T> struct p_priority_queue_fast; - template <typename P, typename T, unsigned S> struct p_priority_queue_fast_with_array; + template <typename P, typename T> struct p_priority; + template <typename P, typename T> struct p_priority_fast; + template <typename P, typename T, unsigned S> struct p_priority_fast_with_array; template <typename P> struct p_queue; template <typename P> struct p_queue_fast; template <typename P> struct p_run; template <typename P> struct p_runs_; template <typename P> struct p_set; - template <typename S, typename F> struct pset_if; + template <typename S, typename F> struct p_if; namespace trait { Index: sandbox/pellegrin/set/core/p_priority_queue_fast.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue_fast.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_HH -/*! \file mln/core/p_priority_queue_fast.hh +/*! \file mln/core/p_priority_fast.hh * * \brief Definition of a point set class based on p_queue_fast with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T> struct p_priority_queue_fast; + template <typename P, typename T> struct p_priority_fast; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T> - struct point_set_< p_priority_queue_fast<P, T> > - : public default_point_set_< p_priority_queue_fast<P, T> > + struct point_set_< p_priority_fast<P, T> > + : public default_point_set_< p_priority_fast<P, T> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::fast has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class p_priority_queue_fast : public internal::point_set_base_< P, p_priority_queue_fast<P, T> > + class p_priority_fast : public internal::point_set_base_< P, p_priority_fast<P, T> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_ bkd_piter; /// Constructor. - p_priority_queue_fast(); + p_priority_fast(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue_fast<P, T>& push_force(const P& p, T prio = 0); + p_priority_fast<P, T>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue_fast<P, T>& push(const P& p, T prio = 0); + p_priority_fast<P, T>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>::p_priority_queue_fast() + p_priority_fast<P, T>::p_priority_fast() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -160,7 +160,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::vect_update_() const + p_priority_fast<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -176,7 +176,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::bb_update_() const + p_priority_fast<P, T>::bb_update_() const { bb_.init(); @@ -192,7 +192,7 @@ template <typename P, typename T> inline bool - p_priority_queue_fast<P, T>::has(const P& p) const + p_priority_fast<P, T>::has(const P& p) const { typename std::map<T, p_queue_fast >::const_iterator it = q_.begin (); @@ -205,7 +205,7 @@ template <typename P, typename T> inline bool - p_priority_queue_fast<P, T>::is_empty() const + p_priority_fast<P, T>::is_empty() const { typename std::map<T, p_queue_fast >::const_iterator it = q_.begin (); @@ -218,7 +218,7 @@ template <typename P, typename T> inline size_t - p_priority_queue_fast<P, T>::npoints() const + p_priority_fast<P, T>::npoints() const { unsigned res = 0; @@ -233,7 +233,7 @@ template <typename P, typename T> inline const box_& - p_priority_queue_fast<P, T>::bbox() const + p_priority_fast<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -243,8 +243,8 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>& - p_priority_queue_fast<P, T>::push_force(const P& p, T prio) + p_priority_fast<P, T>& + p_priority_fast<P, T>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -257,8 +257,8 @@ template <typename P, typename T> inline - p_priority_queue_fast<P, T>& - p_priority_queue_fast<P, T>::push(const P& p, T prio) + p_priority_fast<P, T>& + p_priority_fast<P, T>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -269,7 +269,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::pop() + p_priority_fast<P, T>::pop() { typename std::map<T, p_queue_fast >::reverse_iterator it = q_.rbegin (); @@ -287,7 +287,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::front() const + p_priority_fast<P, T>::front() const { mln_precondition(! q_.empty()); @@ -302,7 +302,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::pop_front() + p_priority_fast<P, T>::pop_front() { const P& res = this->front(); @@ -313,7 +313,7 @@ template <typename P, typename T> inline void - p_priority_queue_fast<P, T>::clear() + p_priority_fast<P, T>::clear() { typename std::map<T, p_queue_fast >::iterator it = q_.begin (); @@ -327,7 +327,7 @@ template <typename P, typename T> inline const std::vector& - p_priority_queue_fast<P, T>::vect() const + p_priority_fast<P, T>::vect() const { if (vect_needs_update_) vect_update_(); @@ -337,7 +337,7 @@ template <typename P, typename T> inline const P& - p_priority_queue_fast<P, T>::operator[](unsigned i) const + p_priority_fast<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); Index: sandbox/pellegrin/set/core/pset_if.hh --- sandbox/pellegrin/set/core/pset_if.hh (revision 2175) +++ sandbox/pellegrin/set/core/pset_if.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_PSET_IF_HH -# define MLN_CORE_SITE_SET_PSET_IF_HH +#ifndef MLN_CORE_SITE_SET_P_IF_HH +# define MLN_CORE_SITE_SET_P_IF_HH -/*! \file mln/core/site_set/pset_if.hh +/*! \file mln/core/site_set/p_if.hh * * \brief Definition of the restriction of a point set w.r.t. a predicate. */ @@ -42,15 +42,15 @@ { // Fwd decls. - template <typename S, typename F> struct pset_if; - template <typename S, typename F> struct pset_if_fwd_piter_; - template <typename S, typename F> struct pset_if_bkd_piter_; + template <typename S, typename F> struct p_if; + template <typename S, typename F> struct p_if_fwd_piter_; + template <typename S, typename F> struct p_if_bkd_piter_; namespace trait { template <typename S, typename F> - struct point_set_< pset_if<S, F> > : public default_point_set_< pset_if<S, F> > + struct point_set_< p_if<S, F> > : public default_point_set_< p_if<S, F> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::slow has_speed; @@ -65,7 +65,7 @@ * \return A subset of points. */ template <typename S, typename F> - pset_if<S, F> + p_if<S, F> operator | (const Point_Set<S>& pset, const Function_p2b<F>& f); @@ -76,26 +76,26 @@ * from point to Boolean. */ template <typename S, typename F> - class pset_if : public internal::point_set_base_< mln_psite(S), pset_if<S,F> > + class p_if : public internal::point_set_base_< mln_psite(S), p_if<S,F> > { - typedef pset_if<S,F> self_; + typedef p_if<S,F> self_; typedef internal::point_set_base_<mln_psite(S), self_> super_; public: typedef mln_psite(super_) psite; /// Forward Site_Iterator associated type. - typedef pset_if_fwd_piter_<S,F> fwd_piter; + typedef p_if_fwd_piter_<S,F> fwd_piter; /// Backward Site_Iterator associated type. typedef mln::internal::fixme bkd_piter; /// Constructor with a point set \p pset and a predicate \p f. - pset_if(const S& pset, const F& f); + p_if(const S& pset, const F& f); /// Constructor without argument. - pset_if(); + p_if(); /// Test if \p p belongs to the subset. @@ -129,20 +129,20 @@ template <typename S, typename F> inline - pset_if<S, F> + p_if<S, F> operator | (const Point_Set<S>& pset, const Function_p2b<F>& f) { - pset_if<S, F> tmp(exact(pset), exact(f)); + p_if<S, F> tmp(exact(pset), exact(f)); return tmp; } - // pset_if<S,F> + // p_if<S,F> template <typename S, typename F> inline bool - pset_if<S,F>::has(const psite& p) const + p_if<S,F>::has(const psite& p) const { return pset_.has(p) && f_(p); } @@ -150,7 +150,7 @@ template <typename S, typename F> inline const box_<mln_point(S)>& - pset_if<S,F>::bbox() const + p_if<S,F>::bbox() const { return pset_.bbox(); } @@ -158,7 +158,7 @@ template <typename S, typename F> inline const S& - pset_if<S,F>::overset() const + p_if<S,F>::overset() const { return pset_; } @@ -166,14 +166,14 @@ template <typename S, typename F> inline bool - pset_if<S,F>::pred(const psite& p) const + p_if<S,F>::pred(const psite& p) const { return f_(p); } template <typename S, typename F> inline - pset_if<S,F>::pset_if(const S& pset, const F& f) + p_if<S,F>::p_if(const S& pset, const F& f) : pset_(pset), f_(f) { @@ -181,14 +181,14 @@ template <typename S, typename F> inline - pset_if<S,F>::pset_if() + p_if<S,F>::p_if() { } template <typename S, typename F> inline const F& - pset_if<S,F>::predicate() const + p_if<S,F>::predicate() const { return f_; } @@ -199,7 +199,7 @@ -# include <mln/core/pset_if_piter.hh> +# include <mln/core/p_if_piter.hh> @@ -210,7 +210,7 @@ template <typename S, typename F> std::size_t - pset_if<S,F>::npoints() const + p_if<S,F>::npoints() const { std::size_t n = 0; fwd_piter p(*this); @@ -224,4 +224,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_SITE_SET_PSET_IF_HH +#endif // ! MLN_CORE_SITE_SET_P_IF_HH Index: sandbox/pellegrin/set/core/concept/point_set.hh --- sandbox/pellegrin/set/core/concept/point_set.hh (revision 2175) +++ sandbox/pellegrin/set/core/concept/point_set.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the concept of mln::Point_Set. * * \todo Think about adding an 'insert' method (not so easy because of - * pset_if...) + * p_if...) */ # include <mln/core/concept/point_site.hh> Index: sandbox/pellegrin/set/core/p_priority_queue.hh --- sandbox/pellegrin/set/core/p_priority_queue.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_HH -/*! \file mln/core/site_set/p_priority_queue.hh +/*! \file mln/core/site_set/p_priority.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T> struct p_priority_queue; + template <typename P, typename T> struct p_priority; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T> - struct point_set_< p_priority_queue<P, T> > - : public default_point_set_< p_priority_queue<P, T> > + struct point_set_< p_priority<P, T> > + : public default_point_set_< p_priority<P, T> > { typedef trait::point_set::arity::unique arity; typedef trait::point_set::has_speed::slow has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class p_priority_queue : public internal::point_set_base_< P, p_priority_queue<P, T> > + class p_priority : public internal::point_set_base_< P, p_priority<P, T> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_ bkd_piter; /// Constructor. - p_priority_queue(); + p_priority(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue<P, T>& push_force(const P& p, T prio = 0); + p_priority<P, T>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue<P, T>& push(const P& p, T prio = 0); + p_priority<P, T>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T> inline - p_priority_queue<P, T>::p_priority_queue() + p_priority<P, T>::p_priority() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -160,7 +160,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::vect_update_() const + p_priority<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -176,7 +176,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::bb_update_() const + p_priority<P, T>::bb_update_() const { bb_.init(); @@ -192,7 +192,7 @@ template <typename P, typename T> inline bool - p_priority_queue<P, T>::has(const P& p) const + p_priority<P, T>::has(const P& p) const { typename std::map<T, p_queue >::const_iterator it = q_.begin (); @@ -205,7 +205,7 @@ template <typename P, typename T> inline bool - p_priority_queue<P, T>::is_empty() const + p_priority<P, T>::is_empty() const { typename std::map<T, p_queue >::const_iterator it = q_.begin (); @@ -218,7 +218,7 @@ template <typename P, typename T> inline size_t - p_priority_queue<P, T>::npoints() const + p_priority<P, T>::npoints() const { unsigned res = 0; @@ -233,7 +233,7 @@ template <typename P, typename T> inline const box_& - p_priority_queue<P, T>::bbox() const + p_priority<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -243,8 +243,8 @@ template <typename P, typename T> inline - p_priority_queue<P, T>& - p_priority_queue<P, T>::push_force(const P& p, T prio) + p_priority<P, T>& + p_priority<P, T>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -257,8 +257,8 @@ template <typename P, typename T> inline - p_priority_queue<P, T>& - p_priority_queue<P, T>::push(const P& p, T prio) + p_priority<P, T>& + p_priority<P, T>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -269,7 +269,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::pop() + p_priority<P, T>::pop() { typename std::map<T, p_queue >::reverse_iterator it = q_.rbegin (); @@ -287,7 +287,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::front() const + p_priority<P, T>::front() const { mln_precondition(! q_.empty()); @@ -302,7 +302,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::pop_front() + p_priority<P, T>::pop_front() { const P& res = this->front(); @@ -313,7 +313,7 @@ template <typename P, typename T> inline void - p_priority_queue<P, T>::clear() + p_priority<P, T>::clear() { typename std::map<T, p_queue >::iterator it = q_.begin (); @@ -327,7 +327,7 @@ template <typename P, typename T> inline const std::vector& - p_priority_queue<P, T>::vect() const + p_priority<P, T>::vect() const { if (vect_needs_update_) vect_update_(); @@ -337,7 +337,7 @@ template <typename P, typename T> inline const P& - p_priority_queue<P, T>::operator[](unsigned i) const + p_priority<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); Index: sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (revision 2175) +++ sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH # define MLN_CORE_SITE_SET_P_PRIORITY_QUEUE_FAST_WITH_ARRAY_HH -/*! \file mln/core/p_priority_queue_fast_with_array.hh +/*! \file mln/core/p_priority_fast_with_array.hh * * \brief Definition of a point set class based on p_queue with * priority features. @@ -51,7 +51,7 @@ { // Fwd decls. - template <typename P, typename T, unsigned S> struct p_priority_queue_fast_with_array; + template <typename P, typename T, unsigned S> struct p_priority_fast_with_array; template <typename P> struct p_array_fwd_piter_; template <typename P> struct p_array_bkd_piter_; @@ -59,8 +59,8 @@ { template <typename P, typename T, unsigned S> - struct point_set_< p_priority_queue_fast_with_array<P, T, S> > - : public default_point_set_< p_priority_queue_fast_with_array<P, T, S> > + struct point_set_< p_priority_fast_with_array<P, T, S> > + : public default_point_set_< p_priority_fast_with_array<P, T, S> > { typedef trait::point_set::arity::multiple arity; typedef trait::point_set::has_speed::fast has_speed; @@ -78,7 +78,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T, unsigned S> - class p_priority_queue_fast_with_array : public internal::point_set_base_< P, p_priority_queue_fast_with_array<P, T, S> > + class p_priority_fast_with_array : public internal::point_set_base_< P, p_priority_fast_with_array<P, T, S> > { public: @@ -89,7 +89,7 @@ typedef p_array_bkd_piter_ bkd_piter; /// Constructor. - p_priority_queue_fast_with_array(); + p_priority_fast_with_array(); /// Test is \p p belongs to this point set. bool has(const P& p) const; @@ -104,10 +104,10 @@ const box_& bbox() const; /// Push force a point \p p in the queue. - p_priority_queue_fast_with_array<P, T, S>& push_force(const P& p, T prio = 0); + p_priority_fast_with_array<P, T, S>& push_force(const P& p, T prio = 0); /// Push a point \p p in the queue. - p_priority_queue_fast_with_array<P, T, S>& push(const P& p, T prio = 0); + p_priority_fast_with_array<P, T, S>& push(const P& p, T prio = 0); /// Pop (remove) the front point \p p from the queue; \p p is the /// least recently inserted point. @@ -151,7 +151,7 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>::p_priority_queue_fast_with_array() + p_priority_fast_with_array<P, T, S>::p_priority_fast_with_array() { vect_needs_update_ = false; bb_needs_update_ = false; @@ -165,7 +165,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::vect_update_() const + p_priority_fast_with_array<P, T, S>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -179,7 +179,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::bb_update_() const + p_priority_fast_with_array<P, T, S>::bb_update_() const { bb_.init(); @@ -193,7 +193,7 @@ template <typename P, typename T, unsigned S> inline bool - p_priority_queue_fast_with_array<P, T, S>::has(const P& p) const + p_priority_fast_with_array<P, T, S>::has(const P& p) const { for (unsigned i = 0; i < S; ++i) if (q_[i].has (p)) @@ -204,7 +204,7 @@ template <typename P, typename T, unsigned S> inline bool - p_priority_queue_fast_with_array<P, T, S>::is_empty() const + p_priority_fast_with_array<P, T, S>::is_empty() const { for (unsigned i = 0; i < S; ++i) if (!q_[i].is_empty ()) @@ -215,7 +215,7 @@ template <typename P, typename T, unsigned S> inline unsigned - p_priority_queue_fast_with_array<P, T, S>::npoints() const + p_priority_fast_with_array<P, T, S>::npoints() const { unsigned res = 0; @@ -229,7 +229,7 @@ template <typename P, typename T, unsigned S> inline const box_& - p_priority_queue_fast_with_array<P, T, S>::bbox() const + p_priority_fast_with_array<P, T, S>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -239,8 +239,8 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>& - p_priority_queue_fast_with_array<P, T, S>::push_force(const P& p, T prio) + p_priority_fast_with_array<P, T, S>& + p_priority_fast_with_array<P, T, S>::push_force(const P& p, T prio) { q_[prio].push_force (p); if (! vect_needs_update_) @@ -254,8 +254,8 @@ template <typename P, typename T, unsigned S> inline - p_priority_queue_fast_with_array<P, T, S>& - p_priority_queue_fast_with_array<P, T, S>::push(const P& p, T prio) + p_priority_fast_with_array<P, T, S>& + p_priority_fast_with_array<P, T, S>::push(const P& p, T prio) { if (! has(p)) return this->push_force(p, prio); @@ -266,7 +266,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::pop() + p_priority_fast_with_array<P, T, S>::pop() { for (unsigned i = S - 1; i != UINT_MAX; --i) if (!q_[i].is_empty ()) @@ -282,7 +282,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::front() const + p_priority_fast_with_array<P, T, S>::front() const { mln_precondition(! is_empty()); @@ -295,7 +295,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::pop_front() + p_priority_fast_with_array<P, T, S>::pop_front() { const P& res = this->front(); @@ -306,7 +306,7 @@ template <typename P, typename T, unsigned S> inline void - p_priority_queue_fast_with_array<P, T, S>::clear() + p_priority_fast_with_array<P, T, S>::clear() { for (unsigned i = 0; i < S; ++i) q_[i].clear (); @@ -318,7 +318,7 @@ template <typename P, typename T, unsigned S> inline const std::vector& - p_priority_queue_fast_with_array<P, T, S>::vect() const + p_priority_fast_with_array<P, T, S>::vect() const { if (vect_needs_update_) vect_update_(); @@ -328,7 +328,7 @@ template <typename P, typename T, unsigned S> inline const P& - p_priority_queue_fast_with_array<P, T, S>::operator[](unsigned n) const + p_priority_fast_with_array<P, T, S>::operator[](unsigned n) const { mln_precondition(n < npoints()); unsigned i = S - 1; Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2175) +++ sandbox/garrigues/level_set.hh (working copy) @@ -46,8 +46,8 @@ # include <mln/core/image/inplace.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/clock_neighb2d.hh> -# include <mln/core/pset_if_piter.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/p_if_piter.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/routine/clone.hh> Index: sandbox/garrigues/fllt/fllt.hh --- sandbox/garrigues/fllt/fllt.hh (revision 2175) +++ sandbox/garrigues/fllt/fllt.hh (working copy) @@ -39,8 +39,8 @@ # include <mln/core/site_set/p_set.hh> # include <mln/core/image/inplace.hh> # include <mln/core/alias/neighb2d.hh> -# include <mln/core/pset_if_piter.hh> -# include <mln/core/site_set/pset_if.hh> +# include <mln/core/p_if_piter.hh> +# include <mln/core/site_set/p_if.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/routine/clone.hh>

1 0