October 2007 - Olena-patches

milena r1334: Add some literals
by Matthieu Garrigues 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add some literals. * mln/literal/all.hh: Add missing includes. * mln/literal/colors.hh: New, red, green and blue literals. * mln/literal/grays.hh: New, medium_gray. * tests/literal_medium_gray.cc: New, a little test. * tests/value_rgb8.cc: Update to use literals. * mln/value/graylevel.hh, * mln/value/rgb.hh: Constructors and assigments to handle literals. --- mln/literal/all.hh | 9 ++-- mln/literal/colors.hh | 77 ++++++++++++++++++++++++++++++++++++++++ mln/literal/grays.hh | 60 +++++++++++++++++++++++++++++++ mln/value/graylevel.hh | 26 ++++++++++++- mln/value/rgb.hh | 81 ++++++++++++++++++++++++++++++------------- tests/literal_medium_gray.cc | 57 ++++++++++++++++++++++++++++++ tests/value_rgb8.cc | 9 +++- 7 files changed, 285 insertions(+), 34 deletions(-) Index: trunk/milena/tests/value_rgb8.cc =================================================================== --- trunk/milena/tests/value_rgb8.cc (revision 1333) +++ trunk/milena/tests/value_rgb8.cc (revision 1334) @@ -32,7 +32,7 @@ #include <mln/value/rgb8.hh> - +#include <mln/literal/all.hh> int main() { @@ -40,6 +40,9 @@ using value::rgb8; using value::rgb; + using literal::blue; + using literal::white; + { rgb8 v; v.red() = 0; @@ -57,10 +60,10 @@ std::cout << v << std::endl; mln_assertion(v != w); - rgb<20> b = rgb<20>::max_blue; + rgb<20> b = blue; std::cout < c = rgb<20>::white; + rgb<20> c = white; std::cout << c << std::endl; } Index: trunk/milena/tests/literal_medium_gray.cc =================================================================== --- trunk/milena/tests/literal_medium_gray.cc (revision 0) +++ trunk/milena/tests/literal_medium_gray.cc (revision 1334) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/literal_medium_gray.cc + * + * \brief Tests on mln::literal::medium_gray. + */ + +#include <mln/literal/grays.hh> +#include <mln/value/graylevel.hh> + + +int main() +{ + using namespace mln; + + using literal::medium_gray; + using value::gl8; + using value::gl16; + + gl8 a; + gl16 b; + + a = medium_gray; + + std::cout << int(a.value()) << std::endl; + + b = a; + std::cout << int(b.value()) << std::endl; + + b = medium_gray; + std::cout << int(b.value()) << std::endl; +} Index: trunk/milena/mln/literal/colors.hh =================================================================== --- trunk/milena/mln/literal/colors.hh (revision 0) +++ trunk/milena/mln/literal/colors.hh (revision 1334) @@ -0,0 +1,77 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_LITERAL_COLORS_HH +# define MLN_LITERAL_COLORS_HH + +/*! \file mln/literal/colors.hh + * \brief Definition of the colors literal. + * + */ + +# include <mln/core/concept/literal.hh> + +namespace mln +{ + + namespace literal + { + + /// Type of literal blue. + struct blue_t : public Literal<blue_t> + { + }; + + /// Type of literal red. + struct red_t : public Literal<red_t> + { + }; + + /// Type of literal green. + struct green_t : public Literal<green_t> + { + }; + + + /// Literal red. + static red_t red = red_t(); + + /// Literal green. + static green_t green = green_t(); + + /// Literal blue. + static blue_t blue = blue_t(); + + } // end of namespace mln::literal + +} // end of namespace mln + +// White and black are color too. +# include <mln/literal/white.hh> +# include <mln/literal/black.hh> + +#endif // ! MLN_LITERAL_COLORS_HH Index: trunk/milena/mln/literal/grays.hh =================================================================== --- trunk/milena/mln/literal/grays.hh (revision 0) +++ trunk/milena/mln/literal/grays.hh (revision 1334) @@ -0,0 +1,60 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_LITERAL_GRAYS_HH +# define MLN_LITERAL_GRAYS_HH + +/*! \file mln/literal/grays.hh + * \brief Definition of the colors literal. + * + */ + +# include <mln/core/concept/literal.hh> + +namespace mln +{ + + namespace literal + { + + /// Type of literal grays. + struct medium_gray_t : public Literal<medium_gray_t> + { + }; + + /// Literal medium_gray. + static medium_gray_t medium_gray = medium_gray_t(); + + } // end of namespace mln::literal + +} // end of namespace mln + +// White and black are grays too. +# include <mln/literal/white.hh> +# include <mln/literal/black.hh> + +#endif // ! MLN_LITERAL_GRAYS_HH Index: trunk/milena/mln/literal/all.hh =================================================================== --- trunk/milena/mln/literal/all.hh (revision 1333) +++ trunk/milena/mln/literal/all.hh (revision 1334) @@ -47,12 +47,11 @@ # include <mln/literal/origin.hh> -// FIXME: Add: -// # include <mln/literal/white.hh> -// # include <mln/literal/black.hh> +# include <mln/literal/white.hh> +# include <mln/literal/black.hh> -// # include <mln/literal/grays.hh> -// # include <mln/literal/colors.hh> +# include <mln/literal/grays.hh> +# include <mln/literal/colors.hh> # include <mln/literal/ops.hh> Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1333) +++ trunk/milena/mln/value/graylevel.hh (revision 1334) @@ -48,8 +48,14 @@ namespace mln { - /// Fwd decl. - namespace literal { struct black_t; struct white_t; } + /// \{ Fwd decls. + namespace literal + { + struct black_t; + struct medium_gray_t; + struct white_t; + } + /// \} namespace value { @@ -76,6 +82,7 @@ /// \{ Ctors with literals. graylevel(const literal::black_t&); + graylevel(const literal::medium_gray_t&); graylevel(const literal::white_t&); /// \} @@ -93,6 +100,7 @@ /// \{ Assigment with literals. graylevel<n>& operator=(const literal::white_t&); + graylevel<n>& operator=(const literal::medium_gray_t&); graylevel<n>& operator=(const literal::black_t&); /// \} }; @@ -168,6 +176,12 @@ } template <unsigned n> + graylevel<n>::graylevel(const literal::medium_gray_t&) + { + this->v_ = metal::math::pow_int<2, n - 1>::value; + } + + template <unsigned n> graylevel<n>::graylevel(const literal::white_t&) { this->v_ = mln_max(mln_enc(int_u<n>)); @@ -209,6 +223,14 @@ template <unsigned n> graylevel<n>& + graylevel<n>::operator=(const literal::medium_gray_t&) + { + this->v_ = metal::math::pow_int<2, n - 1>::value; + return *this; + } + + template <unsigned n> + graylevel<n>& graylevel<n>::operator=(const literal::white_t&) { this->v_ = mln_max(mln_enc(int_u<n>)); Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1333) +++ trunk/milena/mln/value/rgb.hh (revision 1334) @@ -41,6 +41,18 @@ namespace mln { + /// \{ Fwd decls. + namespace literal + { + struct black_t; + struct white_t; + + struct red_t; + struct blue_t; + struct green_t; + } + /// \} + namespace value { @@ -80,6 +92,11 @@ rgb<n>(equiv a); rgb<n>(enc r, enc g, enc b); rgb<n>(enc l); + rgb<n>(const literal::white_t&); + rgb<n>(const literal::black_t&); + rgb<n>(const literal::blue_t&); + rgb<n>(const literal::red_t&); + rgb<n>(const literal::green_t&); /// \} /// \{ Assignments. @@ -90,14 +107,6 @@ /// Zero value. static const rgb<n> zero; - /// \{ Colors. - static const rgb<n> black; - static const rgb<n> max_red; - static const rgb<n> max_green; - static const rgb<n> max_blue; - static const rgb<n> white; - /// \} - /// addition rgb<n> operator+(const rgb<n>& v) const; // FIXME: was: @@ -190,40 +199,64 @@ } template <unsigned n> - rgb<n>& - rgb<n>::operator=(const rgb<n>& v) + rgb<n>::rgb(const literal::white_t&) { - std::memcpy(this->c_, v.c_, 3 * sizeof(enc)); - return *this; + this->c_[0] = mln_max(enc); + this->c_[1] = mln_max(enc); + this->c_[2] = mln_max(enc); } template <unsigned n> - rgb<n>& - rgb<n>::operator=(const enc& v) + rgb<n>::rgb(const literal::black_t&) { - for (int i = 0; i < 3; i++) - this->c_[i] = v; - return *this; + this->c_[0] = 0; + this->c_[1] = 0; + this->c_[2] = 0; } template <unsigned n> - const rgb<n> rgb<n>::zero(0,0,0); + rgb<n>::rgb(const literal::red_t&) + { + this->c_[0] = mln_max(enc); + this->c_[1] = 0; + this->c_[2] = 0; + } template <unsigned n> - const rgb<n> rgb<n>::black(0,0,0); + rgb<n>::rgb(const literal::green_t&) + { + this->c_[0] = 0; + this->c_[1] = mln_max(enc); + this->c_[2] = 0; + } template <unsigned n> - const rgb<n> rgb<n>::max_red(mln_max(enc), 0, 0); + rgb<n>::rgb(const literal::blue_t&) + { + this->c_[0] = 0; + this->c_[1] = 0; + this->c_[2] = mln_max(enc); + } template <unsigned n> - const rgb<n> rgb<n>::max_green(0, mln_max(enc), 0); + rgb<n>& + rgb<n>::operator=(const rgb<n>& v) + { + std::memcpy(this->c_, v.c_, 3 * sizeof(enc)); + return *this; + } template <unsigned n> - const rgb<n> rgb<n>::max_blue(0, 0, mln_max(enc)); + rgb<n>& + rgb<n>::operator=(const enc& v) + { + for (int i = 0; i < 3; i++) + this->c_[i] = v; + return *this; + } template <unsigned n> - const rgb<n> rgb<n>::white(mln_max(enc), mln_max(enc), mln_max(enc)); - + const rgb<n> rgb<n>::zero(0,0,0); template <unsigned n> rgb<n>

1 0

milena r1333: Delete a warning of g++-4.1
by Simon Nivault 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> Delete a warning of g++-4.1. * mln/fun/internal/x2x_linear_impl.hh: Fix. --- x2x_linear_impl.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/milena/mln/fun/internal/x2x_linear_impl.hh =================================================================== --- trunk/milena/mln/fun/internal/x2x_linear_impl.hh (revision 1332) +++ trunk/milena/mln/fun/internal/x2x_linear_impl.hh (revision 1333) @@ -49,7 +49,7 @@ template <typename V, typename E> struct x2x_linear_impl_ { - enum { dim = V::dim }; + static const unsigned dim = V::dim; // To please g++ when comparing dim in metal bexpr. typedef V argument; typedef V result;

1 0

milena r1332: Fix transformation. (it works !)
by Simon Nivault 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> Fix transformation. (it works !). * tests/fun_x2x_composed.cc, * tests/h_vec.cc, * mln/fun/x2x/composed.hh, * mln/fun/x2x/rotation.hh, * mln/fun/x2x/translation.hh, * mln/core/point.hh: Fix to respect homogeneous vector handling. * mln/fun/internal/x2x_impl.hh: Rename as ... * mln/fun/internal/x2x_linear_impl.hh: ...this (operator()) : Take vec and return vec. --- mln/core/point.hh | 2 mln/fun/internal/x2x_linear_impl.hh | 100 ++++++++++++++++++++++++++++++++++++ mln/fun/x2x/composed.hh | 86 +++++++++++++----------------- mln/fun/x2x/rotation.hh | 6 +- mln/fun/x2x/translation.hh | 6 +- tests/fun_x2x_composed.cc | 12 +++- tests/h_vec.cc | 10 +-- 7 files changed, 158 insertions(+), 64 deletions(-) Index: trunk/milena/tests/fun_x2x_composed.cc =================================================================== --- trunk/milena/tests/fun_x2x_composed.cc (revision 1331) +++ trunk/milena/tests/fun_x2x_composed.cc (revision 1332) @@ -51,7 +51,13 @@ metal::vec<3,float> vec1 = make::vec(a, b, c); fun::x2x::translation<3,float> tr(all(1.6)); fun::x2x::rotation<3,float> rot(0.3, 1); - std::cout << vec1 << std::endl; - std::cout << compose(tr, rot)(vec1) << std::endl; - std::cout << compose(rot, tr)(vec1) << std::endl; + + std::cout << "vec : " << vec1 << std::endl; + std::cout << "tr(vec) : " << tr(vec1) << std::endl; + std::cout << "rot(vec) : " << rot(vec1) << std::endl; + std::cout << "tr(rot(vec)) : " << compose(tr, rot)(vec1) << std::endl; + std::cout << "rot(rot_1(vec)) : " << compose(rot, rot.inv())(vec1) << std::endl; + std::cout << "tr(rot(tr(vec))) : " << compose(tr, compose(rot, tr))(vec1) << std::endl; + std::cout << "(rototr_1)(rot(tr(vec)))) : " + << compose(compose(rot, tr).inv(), compose(rot, tr))(vec1) << std::endl; } Index: trunk/milena/tests/h_vec.cc =================================================================== --- trunk/milena/tests/h_vec.cc (revision 1331) +++ trunk/milena/tests/h_vec.cc (revision 1332) @@ -54,11 +54,11 @@ { metal::vec<3, int> x; - h_vec<3, int> w = x; + h_vec<3, int> w = x.to_h_vec(); typedef h_vec<3, int> p3d; p3d p; - run_in_3d(p); + run_in_3d(p.to_vec()); point3d k; run_in_3d(k); @@ -66,8 +66,8 @@ { metal::vec<3,float> v; - h_vec<3,float> w(v); - w = v; - foo(v); + h_vec<3,float> w(v.to_h_vec()); + w = v.to_h_vec(); + foo(v.to_h_vec()); } } Index: trunk/milena/mln/core/point.hh =================================================================== --- trunk/milena/mln/core/point.hh (revision 1331) +++ trunk/milena/mln/core/point.hh (revision 1332) @@ -305,7 +305,7 @@ template <typename M, typename C> point_<M,C>::operator typename internal::point_to_<M, C>::h_vec () const { - return coord_; + return coord_.to_h_vec(); } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/fun/x2x/composed.hh =================================================================== --- trunk/milena/mln/fun/x2x/composed.hh (revision 1331) +++ trunk/milena/mln/fun/x2x/composed.hh (revision 1332) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/function.hh> -# include <mln/fun/internal/x2x_impl.hh> +# include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/metal/vec.hh> # include <mln/metal/is.hh> # include <mln/metal/bexpr.hh> @@ -56,16 +56,16 @@ namespace internal { - template <unsigned n, typename F, typename G, typename E, bool is_bij> + template <typename F, typename G, typename E, bool is_bij> struct helper_composed_; - template <unsigned n, typename F, typename G, typename E> - struct helper_composed_<n, F, G, E, true> - : public fun::internal::x2x_impl_<mln_result(F), E >, + template <typename F, typename G, typename E> + struct helper_composed_< F, G, E, true> + : public fun::internal::x2x_linear_impl_<mln_result(F), E >, public Bijection_x2x<E> { - typedef fun::internal::x2x_impl_<typename F::result, E > super_; + typedef fun::internal::x2x_linear_impl_<typename F::result, E > super_; using super_::dim; @@ -73,28 +73,26 @@ helper_composed_(const F& f, const G& g); using super_::operator(); - metal::vec<n,mln_result(F)> - operator()(const metal::vec<n,mln_result(F)>& v) const; void set_first(const F& f); void set_second(const G& g); + typedef composed<mln_invert(G),mln_invert(F)> invert; + + invert inv() const; + protected: F f_; G g_; - - typedef composed<mln_invert(G),mln_invert(F)> invert; - - invert inv() const; }; - template <unsigned n, typename F, typename G, typename E> - struct helper_composed_<n, F, G, E, false> - : public fun::internal::x2x_impl_<mln_result(F), E >, + template <typename F, typename G, typename E> + struct helper_composed_< F, G, E, false> + : public fun::internal::x2x_linear_impl_<mln_result(F), E >, public Function_x2x<E> { - typedef fun::internal::x2x_impl_<typename F::result, E > super_; + typedef fun::internal::x2x_linear_impl_<typename F::result, E > super_; using super_::dim; @@ -102,8 +100,6 @@ helper_composed_(const F& f, const G& g); using super_::operator(); - metal::vec<n,mln_result(F)> - operator()(const metal::vec<n,mln_result(F)>& v) const; void set_first(const F& f); void set_second(const G& g); @@ -120,7 +116,7 @@ template <typename F, typename G> struct composed - : public internal::helper_composed_<F::dim, F, G, composed<F,G>, + : public internal::helper_composed_<F, G, composed<F,G>, mlc_is(F, Bijection_x2x<F>)::value && mlc_is(G, Bijection_x2x<G>)::value>, @@ -132,7 +128,7 @@ composed() {} composed(const F& f, const G& g) - : internal::helper_composed_<F::dim, F, G, composed<F,G>, + : internal::helper_composed_<F, G, composed<F,G>, mlc_is(F, Bijection_x2x<F>)::value && mlc_is(G, Bijection_x2x<G>)::value>(f, g) { @@ -159,38 +155,38 @@ // Implementation of the bijective version. - template <unsigned n, typename F, typename G, typename E> - helper_composed_<n,F,G,E,true>::helper_composed_() + template <typename F, typename G, typename E> + helper_composed_<F,G,E,true>::helper_composed_() { - this->m_ = h_mat<dim,mln_result(F)>::Id; } - template <unsigned n, typename F, typename G, typename E> - helper_composed_<n,F,G,E,true>::helper_composed_(const F& f, const G& g) + template <typename F, typename G, typename E> + helper_composed_<F,G,E,true>::helper_composed_(const F& f, const G& g) :f_(f), g_(g) { this->m_ = f_.mat() * g_.mat(); } - template <unsigned n, typename F, typename G, typename E> - metal::vec<n, mln_result(F)> - helper_composed_<n,F,G,E,true>::operator()(const metal::vec<n, mln_result(F)>& v) const + template <typename F, typename G, typename E> + typename helper_composed_<F,G,E,true>::invert + helper_composed_<F,G,E,true>::inv() const { - return this->m_(v); + return compose(g_.inv(), f_.inv()); } - template <unsigned n, typename F, typename G, typename E> + + template <typename F, typename G, typename E> void - helper_composed_<n,F,G,E,true>::set_first(const F& f) + helper_composed_<F,G,E,true>::set_first(const F& f) { this->f_ = f; this->m_ = this->f_.mat() * this->g_.mat(); } - template <unsigned n, typename F, typename G, typename E> + template <typename F, typename G, typename E> void - helper_composed_<n,F,G,E,true>::set_second(const G& g) + helper_composed_<F,G,E,true>::set_second(const G& g) { this->g_ = g; this->m_ = this->f_.mat() * this->g_.mat(); @@ -198,38 +194,30 @@ // Implementation of the non bijective version. - template <unsigned n, typename F, typename G, typename E> - helper_composed_<n,F,G,E,false>::helper_composed_() + template <typename F, typename G, typename E> + helper_composed_<F,G,E,false>::helper_composed_() { - this->m_ = h_mat<dim,mln_result(F)>::Id; } - template <unsigned n, typename F, typename G, typename E> - helper_composed_<n,F,G,E,false>::helper_composed_(const F& f, const G& g) + template <typename F, typename G, typename E> + helper_composed_<F,G,E,false>::helper_composed_(const F& f, const G& g) :f_(f), g_(g) { this->m_ = f_.mat() * g_.mat(); } - template <unsigned n, typename F, typename G, typename E> - metal::vec<n, mln_result(F)> - helper_composed_<n,F,G,E,false>::operator()(const metal::vec<n, mln_result(F)>& v) const - { - return this->m_(v); - } - - template <unsigned n, typename F, typename G, typename E> + template <typename F, typename G, typename E> void - helper_composed_<n,F,G,E,false>::set_first(const F& f) + helper_composed_<F,G,E,false>::set_first(const F& f) { this->f_ = f; this->m_ = this->f_.mat() * this->g_.mat(); } - template <unsigned n, typename F, typename G, typename E> + template <typename F, typename G, typename E> void - helper_composed_<n,F,G,E,false>::set_second(const G& g) + helper_composed_<F,G,E,false>::set_second(const G& g) { this->g_ = g; this->m_ = this->f_.mat() * this->g_.mat(); Index: trunk/milena/mln/fun/x2x/translation.hh =================================================================== --- trunk/milena/mln/fun/x2x/translation.hh (revision 1331) +++ trunk/milena/mln/fun/x2x/translation.hh (revision 1332) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/function.hh> -# include <mln/fun/internal/x2x_impl.hh> +# include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/metal/vec.hh> # include <mln/core/h_mat.hh> # include <mln/fun/i2v/all.hh> @@ -53,11 +53,11 @@ template <unsigned n, typename C> struct translation - : internal::x2x_impl_< metal::vec<n,C>, translation<n,C> > + : internal::x2x_linear_impl_< metal::vec<n,C>, translation<n,C> > , public Bijection_x2x< translation<n,C> > { - typedef fun::internal::x2x_impl_< metal::vec<n,C>, translation<n,C> > super_; + typedef fun::internal::x2x_linear_impl_< metal::vec<n,C>, translation<n,C> > super_; typedef translation<n,C> invert; invert inv() const; Index: trunk/milena/mln/fun/x2x/rotation.hh =================================================================== --- trunk/milena/mln/fun/x2x/rotation.hh (revision 1331) +++ trunk/milena/mln/fun/x2x/rotation.hh (revision 1332) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/function.hh> -# include <mln/fun/internal/x2x_impl.hh> +# include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/metal/vec.hh> # include <mln/metal/mat.hh> # include <cmath> @@ -52,10 +52,10 @@ template <unsigned n, typename C> struct rotation - : internal::x2x_impl_< metal::vec<n,C>, rotation<n,C> > + : internal::x2x_linear_impl_< metal::vec<n,C>, rotation<n,C> > , public Bijection_x2x< rotation<n,C> > { - typedef fun::internal::x2x_impl_< metal::vec<n,C>, rotation<n,C> > super_; + typedef fun::internal::x2x_linear_impl_< metal::vec<n,C>, rotation<n,C> > super_; typedef rotation<n,C> invert; invert inv() const; Index: trunk/milena/mln/fun/internal/x2x_impl.hh (deleted) =================================================================== Index: trunk/milena/mln/fun/internal/x2x_linear_impl.hh =================================================================== --- trunk/milena/mln/fun/internal/x2x_linear_impl.hh (revision 0) +++ trunk/milena/mln/fun/internal/x2x_linear_impl.hh (revision 1332) @@ -0,0 +1,100 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_FUN_INTERNAL_X2X_LINEAR_IMPL_HH +# define MLN_FUN_INTERNAL_X2X_LINEAR_IMPL_HH + +/*! \file mln/fun/internal/x2x_linear_impl.hh + * + * \brief Implementation class for every linear Function_x2x. + */ + +# include <mln/core/concept/function.hh> +# include <mln/core/h_mat.hh> +# include <mln/core/h_vec.hh> + +namespace mln +{ + + namespace fun + { + + namespace internal + { + + template <typename V, typename E> + struct x2x_linear_impl_ + { + enum { dim = V::dim }; + + typedef V argument; + typedef V result; + typedef typename V::coord coord; + typedef h_mat<dim, coord> matrix; + + V operator()(const V& x) const + { + h_vec<dim, coord> tmp = m_ * x.to_h_vec(); + return tmp.to_vec(); + } + + const matrix& mat() const; + + protected: + x2x_linear_impl_(); + + matrix m_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V, typename E> + x2x_linear_impl_<V,E>::x2x_linear_impl_() + { + } + + + template <typename V, typename E> + const typename x2x_linear_impl_<V,E>::matrix& + x2x_linear_impl_<V,E>::mat() const + { + return m_; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::internal + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_INTERNAL_X2X_LINEAR_IMPL_HH

1 0

milena r1331: Improve documentation in values
by Matthieu Garrigues 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Improve documentation in values. * float01.hh, * float01_.hh, * float01_f.hh, * gray.hh, * graylevel.hh, * rgb.hh, * scalar.hh, * stack.hh: Add documentation. --- float01.hh | 11 +++++++++++ float01_.hh | 5 ++++- float01_f.hh | 3 ++- gray.hh | 7 +++++++ graylevel.hh | 6 +++++- rgb.hh | 15 ++++++++++----- scalar.hh | 5 +++++ stack.hh | 17 +++++++++++++---- 8 files changed, 57 insertions(+), 12 deletions(-) Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1330) +++ trunk/milena/mln/value/graylevel.hh (revision 1331) @@ -28,6 +28,11 @@ #ifndef MLN_CORE_VALUE_GRAYLEVEL_HH # define MLN_CORE_VALUE_GRAYLEVEL_HH +/*! \file mln/value/graylevel.hh + * + * \brief Definition of the mln::value::graylevel class. + */ + # include <iostream> # include <mln/core/contract.hh> @@ -77,7 +82,6 @@ /// Ctor with gray. graylevel(const gray&); - /// Access to std type. mln_enc(int_u<n>) value() const; Index: trunk/milena/mln/value/gray.hh =================================================================== --- trunk/milena/mln/value/gray.hh (revision 1330) +++ trunk/milena/mln/value/gray.hh (revision 1331) @@ -85,17 +85,24 @@ /// Access to std type. unsigned long value() const; + /// Access to the encoding size. unsigned nbits() const; + /// Set the encoding size to nbits. void set_nbits(unsigned nbits); + /// Return an equivalent gray encoded on \p nbits bits. gray to_nbits(unsigned nbits) const; + /// Convertion. template <unsigned N> operator graylevel<N>() const; protected: + /// Encoding size. unsigned nbits_; + + /// Value. unsigned long val_; }; Index: trunk/milena/mln/value/float01_.hh =================================================================== --- trunk/milena/mln/value/float01_.hh (revision 1330) +++ trunk/milena/mln/value/float01_.hh (revision 1331) @@ -50,7 +50,7 @@ class float01; - /// General float01-level class on n bits. + /// General float01_ class on n bits. template <unsigned n> struct float01_ @@ -70,10 +70,13 @@ /// Access to std type. float value() const; + /// Set value to the \p val th position in the quantized interval. void set_ind(unsigned long val); + /// Float convertion. operator float() const; + /// Float assigment. float01_<n>& operator=(float val); }; Index: trunk/milena/mln/value/scalar.hh =================================================================== --- trunk/milena/mln/value/scalar.hh (revision 1330) +++ trunk/milena/mln/value/scalar.hh (revision 1331) @@ -28,6 +28,11 @@ #ifndef MLN_VALUE_SCALAR_HH # define MLN_VALUE_SCALAR_HH +/*! \file mln/value/scalar.hh + * + * \brief Definition of the basic mln::value::scalar_ class. + */ + # include <mln/value/concept/scalar.hh> # include <mln/metal/is_a.hh> # include <mln/metal/if.hh> Index: trunk/milena/mln/value/stack.hh =================================================================== --- trunk/milena/mln/value/stack.hh (revision 1330) +++ trunk/milena/mln/value/stack.hh (revision 1331) @@ -30,7 +30,7 @@ /*! \file mln/value/stack.hh * - * \brief Definition of an image class FIXME + * \brief Definition of the stack image type. */ # include <mln/core/internal/image_value_morpher.hh> @@ -50,7 +50,7 @@ { - /*! \brief data structure for stack_image + /*! \brief data structure for stack_image. * */ template <unsigned n, typename I> @@ -94,8 +94,16 @@ } // end of namespace mln::value::internal - /*! \brief FIXME + /*! \brief stack image class. stack_image stores a + * vector of n images of the same domain. * + * The parameter \c n is the number of images, \c I is the type of + * a stack element. Acces a value will compute a vector which + * contains n coordinates : + * [stack[0](p), + * stack[1](p), + * ... , + * stack[n](p)] */ template <unsigned n, typename I> struct stack_image : public mln::internal::image_value_morpher_< I, stack_image<n,I> > @@ -144,7 +152,7 @@ }; - + /// \{ Shortcut to build a stack with two images. template <typename I> stack_image<2, const I> stack(const Image& ima1, const Image& ima2); @@ -153,6 +161,7 @@ template <typename I> stack_image<2, I> stack(Image& ima1, Image& ima2); + /// \} } // end of namespace mln::value Index: trunk/milena/mln/value/float01.hh =================================================================== --- trunk/milena/mln/value/float01.hh (revision 1330) +++ trunk/milena/mln/value/float01.hh (revision 1331) @@ -72,20 +72,31 @@ /// Access to std type. float value() const; + + /// Access to the position in the quantized interval. unsigned long value_ind() const; + /// Access to the encoding size. unsigned nbits() const; + + /// Set the encoding size to nbits. float01& set_nbits(unsigned nbits); + + /// Return an equivalent gray encoded on \p nbits bits. const float01 to_nbits(unsigned nbits) const; + /// Convertion to float. operator float() const; // template <unsigned n> // operator float01_<n>() const; protected: + /// Encoding size. unsigned nbits_; + + /// Value. unsigned long val_; }; Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 1330) +++ trunk/milena/mln/value/rgb.hh (revision 1331) @@ -31,7 +31,7 @@ /*! \file mln/value/rgb8.hh * * \brief Color class for red-green-blue where every component is - * 8-bit encoded. + * n-bit encoded. */ # include <mln/value/concept/structured.hh> @@ -51,7 +51,7 @@ /*! \brief Color class for red-green-blue where every component is - * 8-bit encoded. + * n-bit encoded. */ template <unsigned n> struct rgb : public Structured< rgb<n> > @@ -64,6 +64,7 @@ /// Equivalent associated type. typedef int_u<n> equiv[3]; + /// \{ Acces to red/green/blue component. int_u<n> red() const { return c_[0]; } int_u<n>& red() { return c_[0]; } @@ -72,26 +73,30 @@ int_u<n> blue() const { return c_[2]; } int_u<n>& blue() { return c_[2]; } + /// \} - /// Ctors + /// \{ Ctors rgb<n>(); rgb<n>(equiv a); rgb<n>(enc r, enc g, enc b); rgb<n>(enc l); + /// \} - /// assignments + /// \{ Assignments. rgb<n>& operator=(const rgb<n>& v); rgb<n>& operator=(const enc& i); + /// \} /// Zero value. static const rgb<n> zero; - /// Colors. + /// \{ Colors. static const rgb<n> black; static const rgb<n> max_red; static const rgb<n> max_green; static const rgb<n> max_blue; static const rgb<n> white; + /// \} /// addition rgb<n> operator+(const rgb<n>& v) const; Index: trunk/milena/mln/value/float01_f.hh =================================================================== --- trunk/milena/mln/value/float01_f.hh (revision 1330) +++ trunk/milena/mln/value/float01_f.hh (revision 1331) @@ -43,7 +43,7 @@ struct float01; - /// General float01-level class on n bits. + /// General float01_f class on n bits. struct float01_f : public Floating< float01_f >, @@ -65,6 +65,7 @@ /// Op encoding_t. operator float() const; + /// Assigment with float. float01_f& operator=(const float val); };

1 0

milena r1330: Change concept of display show
by Guillaume Duhamel 12 Oct '07

12 Oct '07

In order to display a temporary image, now display::save function saves image and with display::show function finds the path of saved image and dispay it with specified viewer. URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Change concept of display show. * mln/display/save.hh: New. * mln/display/show.hh, * tests/show.cc: Update. --- mln/display/save.hh | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++ mln/display/show.hh | 25 ++----------- tests/show.cc | 8 +++- 3 files changed, 109 insertions(+), 22 deletions(-) Index: trunk/milena/tests/show.cc =================================================================== --- trunk/milena/tests/show.cc (revision 1329) +++ trunk/milena/tests/show.cc (revision 1330) @@ -40,6 +40,8 @@ # include <mln/core/inplace.hh> # include <mln/core/w_window2d_int.hh> # include <mln/display/show.hh> +# include <mln/display/save.hh> +# include <mln/display/color_pretty.hh> # include <mln/io/ppm/save.hh> @@ -63,5 +65,9 @@ // Call color_pretty for sub_image. for (unsigned i = 2; i < 22; i += 2) - display::show (inplace (tmp | i)); + { + image_if_value<image2d<unsigned> > t = inplace (tmp | i); + display::save (t); + display::show (t, "xv"); + } } Index: trunk/milena/mln/display/save.hh =================================================================== --- trunk/milena/mln/display/save.hh (revision 0) +++ trunk/milena/mln/display/save.hh (revision 1330) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_DISPLAY_SAVE_HH +# define MLN_DISPLAY_SAVE_HH + +/*! \file mln/display/save.hh + * + * \brief Create a pretty image, which display its content + * with red value for non-defined point site. + */ + +# include <mln/trait/image_from_mesh.hh> +# include <mln/core/image_if_value.hh> +# include <mln/core/image2d.hh> +# include <mln/value/rgb8.hh> +# include <mln/level/fill.hh> +# include <mln/level/paste.hh> +# include <mln/display/color_pretty.hh> +# include <mln/io/ppm/save.hh> + +namespace mln +{ + + namespace display + { + + std::map<void*, std::string> map_saved_image_tmp_; + + template <typename I> + void + save(const Image& input_); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + template <typename I> + void + save(const Image& input_) + { + const I& input = exact (input_); + image2d<value::rgb8> out = display::color_pretty(input); + + /// Use of mkstemp instead tempmap. + char *tmp = (char*)malloc (12 * sizeof (char)); + strcpy(tmp, "/tmp/XXXXXX"); + if (mkstemp(tmp) == -1) + return; + std::string path_tmp = tmp; + + io::ppm::save(out, path_tmp); + std::cout << input.id_ () << " = " << path_tmp << std::endl; + map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; + } + + } // end of namespace mln::display::impl + + /// Facade. + template <typename I> + void + save(const Image& input_) + { + return impl::save(input_); + } + +# endif // !MLN_INCLUDE_ONLY + + } // end of namespace mln::display + +} // end of namespace mln + + +#endif // ! MLN_DISPLAY_SAVE_HH Index: trunk/milena/mln/display/show.hh =================================================================== --- trunk/milena/mln/display/show.hh (revision 1329) +++ trunk/milena/mln/display/show.hh (revision 1330) @@ -37,12 +37,9 @@ # include <mln/trait/image_from_mesh.hh> # include <mln/core/image_if_value.hh> # include <mln/core/image2d.hh> -# include <mln/value/rgb8.hh> -# include <mln/level/fill.hh> -# include <mln/level/paste.hh> -# include <mln/display/color_pretty.hh> -# include <mln/io/ppm/save.hh> -# include <mln/core/image2d.hh> +# include <mln/display/save.hh> + +# include <map> namespace mln { @@ -64,22 +61,8 @@ show(const Image& input_, std::string cmd) { const I& input = exact (input_); - image2d<value::rgb8> out = display::color_pretty(input); - -// /// Save output image from color in temporary file. -// std::string path_tmp = tempnam (0, "ppm"); - - /// Use of mkstemp instead tempmap. - char *tmp = (char*)malloc (12 * sizeof (char)); - strcpy(tmp, "/tmp/XXXXXX"); - if (mkstemp(tmp) == -1) - return; - std::string path_tmp = tmp; - - io::ppm::save(out, path_tmp); - - std::string s = cmd + " " + path_tmp + " &"; + std::string s = cmd + " " + map_saved_image_tmp_[(void*)input.id_ ()] + " &"; system (s.c_str ()); }

1 0

milena r1329: Augment tests for gray values
by Matthieu Garrigues 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Augment tests for gray values. * mln/value/gray.hh: (operator=(graylevel<n>)) New. * mln/value/graylevel.hh: Add constructors/assigments with gray. * tests/value_graylevel.cc: Add tests. --- mln/value/gray.hh | 19 ++- mln/value/graylevel.hh | 25 ++++ tests/value_graylevel.cc | 252 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 267 insertions(+), 29 deletions(-) Index: trunk/milena/tests/value_graylevel.cc =================================================================== --- trunk/milena/tests/value_graylevel.cc (revision 1328) +++ trunk/milena/tests/value_graylevel.cc (revision 1329) @@ -47,62 +47,97 @@ using mln::literal::white; using mln::literal::black; + // Constructions + { + gl8 x; + + gl8 a = 12; + gl8 b(12); + mln_assertion(a == b); + + gl16 c = 2335; + gl8 d = c; + mln_assertion(c == d); + + gl8 e = gray(white); + mln_assertion(e == white); + + gl8 f = 12; + gl8 g = f; + gl8 h(f); + + mln_assertion(f == g); + mln_assertion(h == g); + } + // Literals { gl8 a = white; gl16 b = white; mln_assertion(a == b); - mln_assertion(a.value() == 255); - mln_assertion(b.value() == 65535); + mln_assertion(a.value() == float(255)); + mln_assertion(b.value() == float(65535)); + mln_assertion(a == white); + mln_assertion(b == white); - gl8 c = (white + white) / 2; + gl8 c = (gl16(white) + white) / 2; + std::cout << "gl8 c = (white + white) / 2; => c.value() == " + << int(c.value()) << std::endl; mln_assertion(c == white); - mln_assertion(c.value() == 255); + mln_assertion(c.value() == float(255)); + + c = (gl8(white) + white) / 2; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); + + c = (gray(white) + white) / 2; + mln_assertion(c == white); + mln_assertion(c.value() == float(255)); a = black; b = black; mln_assertion(a == b); - mln_assertion(a.value() == 0); - mln_assertion(b.value() == 0); + mln_assertion(a.value() == float(0)); + mln_assertion(b.value() == float(0)); c = (black + black) / 2; mln_assertion(c == black); - mln_assertion(c.value() == 0); + mln_assertion(c.value() == float(0)); } // Assigment { gl8 a; - gl8 b; + gl16 b; a = white; mln_assertion(a == white); - mln_assertion(a.value() == 255); + mln_assertion(a.value() == float(255)); a = 23; mln_assertion(a != white); mln_assertion(a != black); - mln_assertion(a.value() == 23); + mln_assertion(a.value() == float(23)); b = 2; mln_assertion(b != white); mln_assertion(b != black); - mln_assertion(b.value() == 2); + mln_assertion(b.value() == float(2)); a = b; - mln_assertion(a.value() == 2); + mln_assertion(a.value() == float(2 / 257)); signed char c = 51; a = c; - mln_assertion(a.value() == 51); + mln_assertion(a.value() == float(51)); // bounds a = 255; - mln_assertion(a.value() == 255); + mln_assertion(a.value() == float(255)); a = 0; - mln_assertion(a.value() == 0); + mln_assertion(a.value() == float(0)); } // Addition @@ -112,50 +147,215 @@ // gl8 <- gl8 + gl8 a = 42; - b = 16969; a += a; - mln_assertion(a.value() == 84); + mln_assertion(a.value() == float(84)); a = 42; - b = 16969; a = a + a; - mln_assertion(a.value() == 84); + mln_assertion(a.value() == float(84)); // gl8 <- gl8 + gl16 a = 42; b = 16969; a = a + b; - mln_assertion(a.value() == (42 + b.value() / 257) ); + mln_assertion(a.value() == float((42 + b.value() / 257) )); a = 42; b = 16969; a += b; - mln_assertion(a.value() == (42 + b.value() / 257) ); + mln_assertion(a.value() == float((42 + b.value() / 257) )); // gl16 <- gl8 + gl16 a = 42; b = 16969; b += a; - mln_assertion(b.value() == (42 * 257 + 16969) ); + mln_assertion(b.value() == float((42 * 257 + 16969) )); a = 42; b = 16969; b = a + b; - mln_assertion(b.value() == (42 * 257 + 16969) ); + mln_assertion(b.value() == float((42 * 257 + 16969) )); // misc a = 255; b = 0; a = a + b; - mln_assertion(a.value() == 255); + mln_assertion(a.value() == float(255)); a = 0; b = 65535; a = a + b; - mln_assertion(a.value() == 255); + mln_assertion(a.value() == float(255)); } + // Soustraction + { + gl8 a; + gl16 b; + + // gl8 <- gl8 - gl8 + a = 42; + a -= a; + mln_assertion(a == black); + + a = 42; + a = a - a; + mln_assertion(a == black); + + // gl8 <- gl8 - gl16 + a = 42; + b = 5969; + + a = b; + std::cout << "a.value() = " << int(a.value()) << std::endl; + std::cout << "should be " << (b.value() / 257) << std::endl; + + a = 42; + a = a - b; + std::cout << int(a.value()) << ":" << (42 - b.value() / 257) << std::endl; + mln_assertion(a.value() == float((42 - b.value() / 257) )); + a = 42; + b = 16969; + a -= b; + mln_assertion(a.value() == float((42 - b.value() / 257) )); + + + // gl16 <- gl8 - gl16 + a = 100; + b = 16969; + b -= a; + mln_assertion(b.value() == float((100 * 257 - 16969) )); + + a = 100; + b = 16969; + b = a - b; + mln_assertion(b.value() == float((100 * 257 - 16969) )); + + // misc + a = 255; + b = 0; + a = a - b; + mln_assertion(a.value() == float(255)); + + a = 0; + b = 65535; + a = a - b; + mln_assertion(a.value() == float(255)); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a - b; + d = a - b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 42; + gl16 b = 5969; + gl8 p; + p = b; + gl8 q; + gl8 r; + + q = a - p; + r = a - b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } + + + + // Multiplication + { + gl8 a; + gl16 b; + + // gl8 <- gl8 * gl8 + a = 21; + a *= a; + mln_assertion(a.value() == 42); + + a = 21; + a = a * a; + mln_assertion(a.value() == 42); + + // gl8 <- gl8 * gl16 + a = 10; + b = 5969; + a = a * b; + mln_assertion(a.value() == float((10 * b.value() / 257) )); + + a = 10; + b = 16969; + a *= b; + mln_assertion(a.value() == float((10 * b.value() / 257) )); + + + // gl16 <- gl8 * gl16 + a = 10; + b = 5969; + b *= a; + mln_assertion(b.value() == float((10 * 257 * 5969) )); + + a = 10; + b = 5969; + b = a * b; + mln_assertion(b.value() == float((10 * 257 * 5969) )); + + // misc + a = 255; + b = 0; + a = a * b; + mln_assertion(a == black); + + a = 0; + b = 65535; + a = a * b; + mln_assertion(a == black); + + // ... + { + graylevel<2> a = 2; + graylevel<3> b = 5; + graylevel<2> c; + graylevel<3> d; + + c = a * b; + d = a * b; + mln_assertion(c == d); + } + + { + + // ... + gl8 a = 7; + gl16 b = 5969; + + gl8 p; + p = b; + + gl8 q; + gl8 r; + + q = a * p; + r = a * b; + std::cout << int(q.value()) << " " << int(r.value()) << std::endl; + mln_assertion(q == r); + + } + + } // Not exhaustive @@ -183,7 +383,7 @@ // { // gl8 c = (white + white) / 2; // mln_assertion(c == white); - // mln_assertion(c.value() == 255); + // mln_assertion(c.value() == float(255)); // } // gray g = black; Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1328) +++ trunk/milena/mln/value/graylevel.hh (revision 1329) @@ -74,12 +74,19 @@ graylevel(const literal::white_t&); /// \} + /// Ctor with gray. + graylevel(const gray&); + + /// Access to std type. mln_enc(int_u<n>) value() const; /// Assigment with int. graylevel<n>& operator=(int val); + /// Assigment with gray. + graylevel<n>& operator=(const gray&); + /// \{ Assigment with literals. graylevel<n>& operator=(const literal::white_t&); graylevel<n>& operator=(const literal::black_t&); @@ -120,6 +127,9 @@ template <unsigned n, unsigned m> gray operator-(const graylevel<n>& lhs, const graylevel<m>& rhs); + template <unsigned n, unsigned m> + gray operator*(const graylevel<n>& lhs, const graylevel<m>& rhs); + @@ -140,6 +150,12 @@ this->v_ = val; } + template <unsigned n> + graylevel<n>::graylevel(const gray& g) + { + gray tmp = g.to_nbits(n); + this->v_ = tmp.value(); + } template <unsigned n> graylevel<n>::graylevel(const literal::black_t&) @@ -172,6 +188,15 @@ template <unsigned n> graylevel<n>& + graylevel<n>::operator=(const gray& g) + { + gray tmp = g.to_nbits(n); + this->v_ = tmp.value(); + return *this; + } + + template <unsigned n> + graylevel<n>& graylevel<n>::operator=(const literal::black_t&) { this->v_ = 0; Index: trunk/milena/mln/value/gray.hh =================================================================== --- trunk/milena/mln/value/gray.hh (revision 1328) +++ trunk/milena/mln/value/gray.hh (revision 1329) @@ -71,9 +71,13 @@ /// \} - /// Ctor. - template <unsigned N> - gray(const graylevel<N>& val); + /// \{ Constructors/assigments with graylevel. + template <unsigned n> + gray(const graylevel<n>& val); + + template <unsigned n> + gray& operator=(const graylevel<n>& val); + /// \} /// Ctor. gray(unsigned nbits, unsigned long val); @@ -169,6 +173,15 @@ { } + + template <unsigned n> + gray& gray::operator=(const graylevel<n>& g) + { + nbits_ = n; + val_ = g.value(); + return *this; + } + gray& gray::operator=(const literal::white_t&) { // nbits_ is not modified so that precision does not change.

1 0

1328: Slightly change vec, h_vec, mat to ease handling x2x transforms.
by Thierry Geraud 12 Oct '07

12 Oct '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Slightly change vec, h_vec, mat to ease handling x2x transforms. * mln/core/h_vec.hh (h_vec): New ctor overload for vec<d+1>. (operator=): New overload for vec<d+1>. * mln/metal/mat.hh (trait): New def for mat * vec. (operator*): Strengthen scalar version to disambiguate. * mln/metal/vec.hh (to_h_vec): New method decl. * mln/fun/x2x/translation.hh: Deactivate code in ctor w/o arg. * mln/fun/x2x/rotation.hh: Likewise. * mln/fun/internal/x2x_impl.hh (operator()): Update. * tests/mat.cc: Augment. * tests/h_vec.cc: Augment. * tests/vec.cc: Update. mln/core/h_vec.hh | 42 ++++++++++++++++++++++------ mln/fun/internal/x2x_impl.hh | 4 +- mln/fun/x2x/rotation.hh | 6 ++-- mln/fun/x2x/translation.hh | 8 +++-- mln/metal/mat.hh | 63 ++++++++++++++++++++++++++++++++++++------- mln/metal/vec.hh | 9 +++++- tests/h_vec.cc | 11 +++++++ tests/mat.cc | 7 ++++ tests/vec.cc | 5 ++- 9 files changed, 126 insertions(+), 29 deletions(-) Index: tests/mat.cc --- tests/mat.cc (revision 1327) +++ tests/mat.cc (working copy) @@ -57,4 +57,11 @@ std::cout << "hm1 = " << hm1 << ";" << std::endl; std::cout << "hm2 = " << hm2 << ";" << std::endl; std::cout << "hm3 = " << hm3 << ";" << std::endl; + + { + h_mat<2,float> m, m2; + m = m2; + // FIXME: Test *many* => runs ok... + } + } Index: tests/vec.cc --- tests/vec.cc (revision 1327) +++ tests/vec.cc (working copy) @@ -46,12 +46,13 @@ metal::vec<2,float> v2 = make::vec(6., 2.8); h_vec<1,float> hv1; - h_vec<2,float> hv2(v2); + h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. + h_vec<3,float> hv3(all(1.5)); hv3 += make::vec(0., 0., 0., 0.5); - metal::vec<3,float> v3 = hv3; + metal::vec<3,float> v3 = hv3.to_vec(); // Back from homogeneous. metal::vec<4,float> v4 = hv3; std::cout << "v1 = " << v1 << ";" << std::endl; Index: tests/h_vec.cc --- tests/h_vec.cc (revision 1327) +++ tests/h_vec.cc (working copy) @@ -45,6 +45,11 @@ } +void foo(const mln::h_vec<3,float>&) +{ +} + + int main() { @@ -59,4 +64,10 @@ run_in_3d(k); run_in_3d_h(k); + { + metal::vec<3,float> v; + h_vec<3,float> w(v); + w = v; + foo(v); + } } Index: mln/core/h_vec.hh --- mln/core/h_vec.hh (revision 1327) +++ mln/core/h_vec.hh (working copy) @@ -50,11 +50,11 @@ /// Constructor without argument. h_vec(); - /// Constructor from a metal::vec. - h_vec(const metal::vec<d,C>& x); + h_vec(const metal::vec<d+1, C>& other); + h_vec& operator=(const metal::vec<d+1, C>& rhs); - /// Conversion to a metal::vec. - operator metal::vec<d,C>() const; + /// Back to the natural (non-homogeneous) space. + metal::vec<d,C> to_vec() const; }; @@ -67,15 +67,39 @@ } template <unsigned d, typename C> - h_vec<d,C>::h_vec(const metal::vec<d,C>& x) + h_vec<d,C>::h_vec(const metal::vec<d+1, C>& other) + : metal::vec<d+1, C>(other) { - for (unsigned i = 0; i < d; ++i) - this->data_[i] = x[i]; - this->data_[d] = 1; // FIXME: literal::one } template <unsigned d, typename C> - h_vec<d,C>::operator metal::vec<d,C>() const + h_vec<d,C>& h_vec<d,C>::operator=(const metal::vec<d+1, C>& rhs) + { + if (& rhs = this) + return *this; + this->metal::vec<d+1, C>::operator=(rhs); + return *this; + } + + namespace metal + { + + // Immersion of a vector in its homogeneous space. + template <unsigned n, typename T> + 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] = 1; // FIXME: literal::one + return tmp; + } + + } // end of namespace mln::metal + + + template <unsigned d, typename C> + metal::vec<d,C> h_vec<d,C>::to_vec() const { const C w = this->data_[d]; mln_assertion(w != 0); Index: mln/metal/mat.hh --- mln/metal/mat.hh (revision 1327) +++ mln/metal/mat.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/trait/all.hh> # include <mln/value/props.hh> # include <mln/value/concept/all.hh> +# include <mln/metal/vec.hh> // FIXME: Document. @@ -140,6 +141,16 @@ typedef metal::mat< n, m, mln_trait_op_times(T,U) > ret; }; + // mat * vec + + template <unsigned n, unsigned m, typename T, + typename U> + struct set_precise_binary_<op::times, metal::mat<n,m,T>, metal::vec<m,U> > + { + typedef mln_trait_op_times(T,U) TxU; + typedef metal::vec< m, mln_sum(TxU) > ret; + }; + // mat * s template <unsigned n, unsigned m, typename T, @@ -214,10 +225,38 @@ mat<n, m, mln_trait_op_times(T,U)> operator*(const mat<n,o,T>& lhs, const mat<o,m,U>& rhs); // mat * mat + +// template <unsigned n, unsigned m, typename T, +// typename S> +// mat<n, m, mln_trait_op_times(T,S)> +// operator*(const mat<n,m,T>& lhs, const S& s); // mat * s + + + // FIXME: Simplification below of the general code above: + + template <unsigned n, unsigned m, typename T> + mat<n, m, T> + operator*(const mat<n,m,T>& lhs, const T& s); // mat * s + + template <unsigned n, unsigned m, typename T, - typename S> - mat<n, m, mln_trait_op_times(T,S)> - operator*(const mat<n,m,T>& lhs, const S& s); // mat * s + typename U> + typename mln::trait::op::times< mat<n,m,T>, vec<m,U> >::ret + operator*(const mat<n,m,T>& lhs, const vec<m,U>& rhs) // mat * vec + // FIXME: Move below... + { + typedef mat<n,m,T> mat_t; + typedef vec<m,U> vec_t; + mln_trait_op_times(mat_t, vec_t) tmp; + for (unsigned i = 0; i < n; ++i) + { + mln_trait_op_times(T,U) sum = 0; // FIXME: Use literal::zero. + for (unsigned j = 0; j < m; ++j) + sum += lhs(i, j) * rhs[j]; + tmp[i] = sum; + } + return tmp; + } // * @@ -270,7 +309,7 @@ { for (unsigned i = 0; i < n; ++i) for (unsigned j = 0; j < m; ++j) - id_.data_[i][j] = (i = j); + id_(i, j) = (i = j); flower = false; } return id_; @@ -451,12 +490,18 @@ return tmp; } - template <unsigned n, unsigned m, typename T, - typename S> - mat<n,m, mln_trait_op_times(T,S)> - operator*(const mat<n,m,T>& lhs, const S& s) + template <unsigned n, unsigned m, typename T> + mat<n, m, T> + operator*(const mat<n,m,T>& lhs, const T& s) // mat * s + + // FIXME: Read above. + +// template <unsigned n, unsigned m, typename T, +// typename S> +// mat<n,m, mln_trait_op_times(T,S)> +// operator*(const mat<n,m,T>& lhs, const S& s) { - mat<n,m, mln_trait_op_times(T,S)> tmp; + mat<n,m, T> tmp; for (unsigned i = 0; i < n; ++i) for (unsigned j = 0; j < m; ++j) tmp(i, j) = lhs(i, j) * s; Index: mln/metal/vec.hh --- mln/metal/vec.hh (revision 1327) +++ mln/metal/vec.hh (working copy) @@ -44,8 +44,10 @@ namespace mln { - // Fwd decl. + // Fwd decls. namespace literal { struct zero_t; } + template <unsigned d, typename C> struct h_vec; + namespace metal @@ -152,6 +154,11 @@ template <typename U> vec& operator=(const vec<n, U>& rhs); + + // Immersion of the vector into its homogeneous space. + h_vec<n, T> to_h_vec() const; + + const T& operator[](unsigned i) const; T& operator[](unsigned i); Index: mln/fun/x2x/translation.hh --- mln/fun/x2x/translation.hh (revision 1327) +++ mln/fun/x2x/translation.hh (working copy) @@ -52,8 +52,10 @@ template <unsigned n, typename C> struct translation + : internal::x2x_impl_< metal::vec<n,C>, translation<n,C> > - , public Bijection_x2x< translation<n,C> > + , + public Bijection_x2x< translation<n,C> > { typedef fun::internal::x2x_impl_< metal::vec<n,C>, translation<n,C> > super_; @@ -80,8 +82,8 @@ template <unsigned n, typename C> translation<n,C>::translation() { - t_ = make::vec<n,C>(fun::i2v::all<C>(0)); - this->m_ = h_mat<n,C>::Id; +// t_ = make::vec<n,C>(fun::i2v::all<C>(0)); +// this->m_ = h_mat<n,C>::Id; } template <unsigned n, typename C> Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 1327) +++ mln/fun/x2x/rotation.hh (working copy) @@ -82,9 +82,9 @@ template <unsigned n, typename C> rotation<n,C>::rotation() { - alpha_ = 0; - dir_ = 2; - this->m_ = h_mat<n,C>::Id; +// alpha_ = 0; +// dir_ = 2; +// this->m_ = h_mat<n,C>::Id; } template <unsigned n, typename C> Index: mln/fun/internal/x2x_impl.hh --- mln/fun/internal/x2x_impl.hh (revision 1327) +++ mln/fun/internal/x2x_impl.hh (working copy) @@ -56,9 +56,9 @@ typedef typename V::coord coord; typedef h_mat<dim, coord> matrix; - h_vec<dim, coord> operator()(const h_vec<dim, coord>& x) const + V operator()(const V& x) const { - return m_ * x; + return (m_ * x.to_h_vec()).to_vec(); } const matrix& mat() const;

1 0

milena r1327: Add test for seed2tiling*.hh
by Guillaume Duhamel 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add test for seed2tiling*.hh . * seed2tiling.cc: New test for seed2tiling*. --- seed2tiling.cc | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) Index: trunk/milena/tests/seed2tiling.cc =================================================================== --- trunk/milena/tests/seed2tiling.cc (revision 0) +++ trunk/milena/tests/seed2tiling.cc (revision 1327) @@ -0,0 +1,101 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/seeds2tiling.cc + * + * \brief Test on mln::geom::seed2tiling*.hh. + */ + + +# include <mln/core/image2d.hh> +# include <mln/core/sub_image.hh> +# include <mln/core/neighb2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/level/fill.hh> +# include <mln/level/stretch.hh> +# include <mln/border/fill.hh> +# include <mln/io/pbm/load.hh> +# include <mln/io/pgm/save.hh> +# include <mln/labeling/foreground.hh> +# include <mln/debug/println.hh> +# include <mln/draw/mesh.hh> +# include <mln/geom/seeds2tiling.hh> +# include <mln/geom/seeds2tiling_with_chamfer.hh> +# include <mln/make/voronoi.hh> + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if_value.hh> +#include <mln/core/inplace.hh> + +#include <mln/core/w_window2d_int.hh> +#include <mln/make/win_chamfer.hh> + +int main(int argc, char** argv) +{ + if (argc < 2) + { + std::cerr << "missing argument : specify the location of the binary image (*.pbm)" << std::endl; + return 1; + } + using namespace mln; + using value::int_u8; + unsigned max = 2048; + + image2d<bool> input = io::pbm::load(argv[1]); + + { + + image2d<unsigned> lab(input.domain()); + image2d<unsigned> inte(input.domain()); + image2d<int_u8> inte2(input.domain()); + image2d<int_u8> out(input.domain()); + + const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2,3> (); + + unsigned n; + labeling::foreground(input, c4(), lab, n); + std::cout << "number of labels = " << n << std::endl; + + + inte = geom::seeds2tiling(lab, c4 ()); + border::fill (inte, 0); + level::stretch (inte, inte2); + io::pgm::save(inte2, "ima1.pgm"); + + std::cout << "ima1 generate with seeds2tiling" + << std::endl; + inte = geom::seeds2tiling_with_chamfer(lab, w_win, max, c4 ()); + border::fill (inte, 0); + level::stretch (inte, inte2); + + io::pgm::save(inte2, "ima2.pgm"); + std::cout << "ima2 generate with seeds2tiling_with_chamfer" + << std::endl; + } + +}

1 0

milena r1326: Add seeds2tiling with distance priority (chamfer)
by Guillaume Duhamel 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add seeds2tiling with distance priority (chamfer). * seeds2tiling_with_chamfer.hh: New. --- seeds2tiling_with_chamfer.hh | 108 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) Index: trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 0) +++ trunk/milena/mln/geom/seeds2tiling_with_chamfer.hh (revision 1326) @@ -0,0 +1,108 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_GEOM_SEEDS2TILING_WITH_CHAMFER_HH +# define MLN_GEOM_SEEDS2TILING_WITH_CHAMFER_HH + +/*! \file mln/geom/seeds2tiling_with_chamfer.hh + * + * \brief . + */ + +# include <map> + + +# include <mln/core/queue_p_fast_priority.hh> +# include <mln/core/clone.hh> +# include <mln/accu/mean.hh> +# include <mln/estim/min_max.hh> +# include <mln/metal/vec.hh> +# include <mln/geom/chamfer.hh> + + +namespace mln +{ + namespace geom + { + + template <typename I, typename N> + I + seeds2tiling_with_chamfer (Image& ima_, const w_window2d_int& w_win, unsigned max, + const Neighborhood<N>& nbh); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename N> + I + seeds2tiling_with_chamfer (Image& ima_, const w_window2d_int& w_win, unsigned max, + const Neighborhood<N>& nbh) + + { + I& ima = exact(ima_); + image2d<unsigned> dist = geom::chamfer(ima, w_win, max); + I out = clone(ima_); + queue_p_fast_priority<mln_psite(I), unsigned> q; + + // Init. + { + mln_piter(I) p(ima.domain()); + + for_all(p) + q.push_force(p, max - dist(p)); + } + + + // Body: alternative version. + { + while (! q.empty()) + { + mln_psite(I) p = q.front(); + q.pop(); + if (out(p) != 0) // p has already been processed so ignore + continue; + mln_niter(N) n(nbh, p); + + for_all(n) if (ima.has(n)) + if (out(n) != 0) + out(p) = out(n); + } + } + + return out; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::geom + +} // end of namespace mln + + +#endif // ! MLN_GEOM_SEEDS2TILING_WITH_CHAMFER_HH

1 0

milena r1325: Add tests for queue
by Guillaume Duhamel 12 Oct '07

12 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add tests for queue. * queue_p_fast.cc, * queue_p_fast_priority.cc, * queue_p_priority.cc: New tests. * image2d.cc: Update test for (id_) in mln/core/internal. --- image2d.cc | 10 ++++ queue_p_fast.cc | 57 +++++++++++++++++++++++++++ queue_p_fast_priority.cc | 98 +++++++++++++++++++++++++++++++++++++++++++++++ queue_p_priority.cc | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 263 insertions(+) Index: trunk/milena/tests/image2d.cc =================================================================== --- trunk/milena/tests/image2d.cc (revision 1324) +++ trunk/milena/tests/image2d.cc (revision 1325) @@ -34,6 +34,7 @@ #include <mln/geom/size2d.hh> #include <mln/core/init.hh> +#include <mln/border/resize.hh> @@ -47,6 +48,15 @@ image2d<int> f(nrows, ncols, border); + { + std::cout << f.id_() << std::endl; + image2d<int> g; + std::cout << g.id_() << std::endl; + g = f; + // border::resize (g, 2); + std::cout << g.id_() << std::endl; + } + mln_assertion(f.npoints() == geom::nrows(f) * geom::ncols(f)); mln_assertion(f.ncells() == (nrows + 2 * border) * (ncols + 2 * border)); } Index: trunk/milena/tests/queue_p_fast.cc =================================================================== --- trunk/milena/tests/queue_p_fast.cc (revision 0) +++ trunk/milena/tests/queue_p_fast.cc (revision 1325) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/queue_p.cc + * + * \brief Tests on mln::queue_p. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/queue_p_fast.hh> + + + +int main() +{ + using namespace mln; + + queue_p_fast<point2d> q; + q + .push(make::point2d(6, 9)) + .push(make::point2d(5, 1)) + .push(make::point2d(4, 2)); + mln_assertion(q.npoints() == 3); + + std::cout << q.bbox() << std::endl; + std::cout << q << std::endl; + + q.pop(); + mln_assertion(q.npoints() == 2); + point2d p = q.front(); + mln_assertion(q.npoints() == 2); + mln_assertion(p == make::point2d(5, 1)); +} Index: trunk/milena/tests/queue_p_priority.cc =================================================================== --- trunk/milena/tests/queue_p_priority.cc (revision 0) +++ trunk/milena/tests/queue_p_priority.cc (revision 1325) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/queue_p_priority.cc + * + * \brief Tests on mln::queue_p_priority. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/queue_p_priority.hh> + +int main () +{ + using namespace mln; + + mln::queue_p_priority<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.empty ()); +} Index: trunk/milena/tests/queue_p_fast_priority.cc =================================================================== --- trunk/milena/tests/queue_p_fast_priority.cc (revision 0) +++ trunk/milena/tests/queue_p_fast_priority.cc (revision 1325) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/queue_p_priority.cc + * + * \brief Tests on mln::queue_p_priority. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/queue_p_fast_priority.hh> + +int main () +{ + using namespace mln; + + mln::queue_p_fast_priority<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.empty ()); +}

1 0