Olena-patches October 2013

olena-patches@lrde.epita.fr

4 participants
137 discussions

olena: olena-2.0-816-ge037dab Milena: Introduce point-wise function bindings.

by Roland Levillain

* mln/pw/bind.hh: New. * mln/pw/all.hh: Include mln/pw/bind.hh. * tests/pw/bind.cc: New. * tests/pw/Makefile.am (check_PROGRAMS): Add bind. * headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 12 ++ milena/headers.mk | 1 + milena/mln/pw/all.hh | 10 +- milena/mln/pw/bind.hh | 201 ++++++++++++++++++++ milena/tests/pw/Makefile.am | 5 +- .../tests/pw/bind.cc | 62 +++--- milena/tests/unit_test/unit-tests.mk | 1 + 7 files changed, 250 insertions(+), 42 deletions(-) create mode 100644 milena/mln/pw/bind.hh copy scribo/tests/primitive/extract/lines_h_discontinued.cc => milena/tests/pw/bind.cc (57%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e7d1f39..c63c9e6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Introduce point-wise function bindings. + + * mln/pw/bind.hh: New. + * mln/pw/all.hh: Include mln/pw/bind.hh. + * tests/pw/bind.cc: New. + * tests/pw/Makefile.am (check_PROGRAMS): Add bind. + * headers.mk, + * tests/unit_test/unit-tests.mk: + Regen. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Add support for unary minus on images. * mln/arith/minus.hh diff --git a/milena/headers.mk b/milena/headers.mk index 5321e76..7f5ba92 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1013,6 +1013,7 @@ mln/opt/element.hh \ mln/opt/essential.hh \ mln/opt/value.hh \ mln/pw/all.hh \ +mln/pw/bind.hh \ mln/pw/cst.hh \ mln/pw/essential.hh \ mln/pw/image.hh \ diff --git a/milena/mln/pw/all.hh b/milena/mln/pw/all.hh index 19e559f..3355486 100644 --- a/milena/mln/pw/all.hh +++ b/milena/mln/pw/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -26,10 +27,8 @@ #ifndef MLN_PW_ALL_HH # define MLN_PW_ALL_HH -/*! \file - * - * \brief File that includes all "point-wise" expression tools. - */ +/// \file +/// \brief Inclusion of all "point-wise" expression tools. namespace mln @@ -41,6 +40,7 @@ namespace mln } // end of namespace mln +# include <mln/pw/bind.hh> # include <mln/pw/cst.hh> # include <mln/pw/image.hh> # include <mln/pw/value.hh> diff --git a/milena/mln/pw/bind.hh b/milena/mln/pw/bind.hh new file mode 100644 index 0000000..690b130 --- /dev/null +++ b/milena/mln/pw/bind.hh @@ -0,0 +1,201 @@ +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE). +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_PW_BIND_HH +# define MLN_PW_BIND_HH + +/// \file +/// \brief Definition of point-wise function bindings. + +# include <mln/core/concept/function.hh> +# include <mln/fun/internal/selector.hh> + + +namespace mln +{ + + namespace pw + { + + /*-------------------------. + | Unary function binding. | + `-------------------------*/ + + /// \brief Point-wise unary function binding. + /// + /// This point-wise class is actually a function object embedding + /// a Milena function (functor) and another point-wise expression. + /// Its operator() returns the application of the embedded + /// function to the embedded point-wise expression. + template <typename F, typename PW> + struct unary_bound_fun_ + : fun::internal::selector_from_result_< typename F::result, + unary_bound_fun_<F, PW> >::ret + { + typedef typename F::result result; + + unary_bound_fun_(const Function_v2v<F>& f, const Function_v2v<PW>& pw); + + template <typename P> + result operator()(const P& p) const; + + protected: + /// The function to apply. + const F f_; + /// The point-wise expression. + const PW pw_; + }; + + + /// \brief Bind the unary function \a f to the point-wise + /// expression \a pw. + template <typename F, typename PW> + unary_bound_fun_<F, PW> + bind(const Function_v2v<F>& f, const Function_v2v<PW>& pw); + + + + /*--------------------------. + | Binary function binding. | + `--------------------------*/ + + /// \brief Point-wise binary function binding. + /// + /// This point-wise class is actually a function object embedding + /// a Milena function (functor) and another point-wise expression. + /// Its operator() returns the application of the embedded + /// function to the embedded point-wise expression. + template <typename F, typename PW1, typename PW2> + struct binary_bound_fun_ + : fun::internal::selector_from_result_< typename F::result, + binary_bound_fun_<F, + PW1, + PW2> >::ret + { + typedef typename F::result result; + + binary_bound_fun_(const Function_vv2v<F>& f, + const Function_v2v<PW1>& pw1, + const Function_v2v<PW2>& pw2); + + template <typename P> + result operator()(const P& p) const; + + protected: + /// The function to apply. + const F f_; + /// The first point-wise expression. + const PW1 pw1_; + /// The second point-wise expression. + const PW2 pw2_; + }; + + + /// \brief Bind the binary function \a f to the point-wise + /// expressions \a pw1 and \a pw2. + template <typename F, typename PW1, typename PW2> + binary_bound_fun_<F, PW1, PW2> + bind(const Function_vv2v<F>& f, + const Function_v2v<PW1>& pw1, const Function_v2v<PW2>& pw2); + + + +# ifndef MLN_INCLUDE_ONLY + + // pw::unary_bound_fun_<F, PW>. + + template <typename F, typename PW> + inline + unary_bound_fun_<F, PW>::unary_bound_fun_(const Function_v2v<F>& f, + const Function_v2v<PW>& pw) + : f_(exact(f)), + pw_(exact(pw)) + { + } + + template <typename F, typename PW> + template <typename P> + inline + typename F::result + unary_bound_fun_<F, PW>::operator()(const P& p) const + { + return f_(pw_(p)); + } + + + // pw::bind(f, pw). + + template <typename F, typename PW> + inline + unary_bound_fun_<F, PW> + bind(const Function_v2v<F>& f, const Function_v2v<PW>& pw) + { + return unary_bound_fun_<F, PW>(f, pw); + } + + + + // pw::binary_bound_fun_<F, PW1, PW2>. + + template <typename F, typename PW1, typename PW2> + inline + binary_bound_fun_<F, PW1, PW2>::binary_bound_fun_(const Function_vv2v<F>& f, + const Function_v2v<PW1>& pw1, + const Function_v2v<PW2>& pw2) + : f_(exact(f)), + pw1_(exact(pw1)), + pw2_(exact(pw2)) + { + } + + template <typename F, typename PW1, typename PW2> + template <typename P> + inline + typename F::result + binary_bound_fun_<F, PW1, PW2>::operator()(const P& p) const + { + return f_(pw1_(p), pw2_(p)); + } + + + // pw::bind(f, pw1, pw2). + + template <typename F, typename PW1, typename PW2> + inline + binary_bound_fun_<F, PW1, PW2> + bind(const Function_vv2v<F>& f, + const Function_v2v<PW1>& pw1, const Function_v2v<PW2>& pw2) + { + return binary_bound_fun_<F, PW1, PW2>(f, pw1, pw2); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::pw + +} // end of namespace mln + + +#endif // ! MLN_PW_BIND_HH diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am index 16bfa30..84e472b 100644 --- a/milena/tests/pw/Makefile.am +++ b/milena/tests/pw/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE) +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -18,6 +18,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + bind \ image \ value diff --git a/scribo/tests/primitive/extract/lines_h_discontinued.cc b/milena/tests/pw/bind.cc similarity index 57% copy from scribo/tests/primitive/extract/lines_h_discontinued.cc copy to milena/tests/pw/bind.cc index 73d457d..9095209 100644 --- a/scribo/tests/primitive/extract/lines_h_discontinued.cc +++ b/milena/tests/pw/bind.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -23,47 +23,39 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file +/// \file +/// \brief Exercise mln::pw::bind with unary and binary functions +/// bound to point-wise expressions. #include <mln/core/image/image2d.hh> -#include <mln/core/alias/neighb2d.hh> -#include <mln/win/hline2d.hh> -#include <mln/io/pbm/load.hh> -#include <mln/value/label_8.hh> -#include <mln/make/box2d.hh> -#include <scribo/primitive/extract/lines_h_discontinued.hh> -#include "tests/data.hh" +#include <mln/pw/all.hh> +#include <mln/fun/v2v/abs.hh> +#include <mln/fun/vv2v/max.hh> + +#include <mln/arith/minus.hh> +#include <mln/debug/iota.hh> +#include <mln/test/predicate.hh> int main() { using namespace mln; - using namespace scribo; - - image2d<bool> input; - io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); - - typedef value::label_8 V; - typedef image2d<V> I; - - // Horizontal - { - V nlines; - component_set - comps = primitive::extract::lines_h_discontinued(input, c4(), nlines, - 51, 3); - - mln_assertion(comps.nelements() == 2); - - mln_assertion(comps(1).bbox() == make::box2d(21, 37, 24, 176)); - mln_assertion(comps(1).mass_center() == point2d(23, 107)); - mln_assertion(comps(1).card() == 560); - - mln_assertion(comps(2).bbox() == make::box2d(94, 32, 97, 91)); - mln_assertion(comps(2).mass_center() == point2d(96, 62)); - mln_assertion(comps(2).card() == 240); - } - + image2d<int> pos_ints(3, 3); + debug::iota(pos_ints); + image2d<int> neg_ints = -pos_ints; + + // Exercise unary point-wise function binding. + mln_assertion(test::predicate(pos_ints.domain(), + pw::bind(fun::v2v::abs<int>(), + pw::value(neg_ints)) + == pw::value(pos_ints))); + + // Exercise binary point-wise function binding. + mln_assertion(test::predicate(pos_ints.domain(), + pw::bind(fun::vv2v::max<int>(), + pw::value(pos_ints), + pw::value(neg_ints)) + == pw::value(pos_ints))); } diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c95e225..6b9fe56 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -1065,6 +1065,7 @@ mln_opt_element \ mln_opt_essential \ mln_opt_value \ mln_pw_all \ +mln_pw_bind \ mln_pw_cst \ mln_pw_essential \ mln_pw_image \ -- 1.7.10.4

10 years, 7 months

olena: olena-2.0-815-g95c9f69 Milena: Add support for unary minus on images.

by Roland Levillain

* mln/arith/minus.hh (mln::trait::set_unary_<op::uminus, Image, I>): New. (mln::operator-(const Image&)) (mln::arith::uminus(const Image&)) (mln::arith::impl::uminus_(trait::image::speed::any, const I&, O&)) (mln::arith::impl::uminus_(trait::image::speed::fastest, const I&, O&)): New. * tests/arith/minus.cc: Exercise unary minus. --- milena/ChangeLog | 13 ++++++++ milena/mln/arith/minus.hh | 69 +++++++++++++++++++++++++++++++++++++++++++ milena/tests/arith/minus.cc | 29 ++++++++++++------ 3 files changed, 102 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1db0bf1..e7d1f39 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Add support for unary minus on images. + + * mln/arith/minus.hh + (mln::trait::set_unary_<op::uminus, Image, I>): New. + (mln::operator-(const Image&)) + (mln::arith::uminus(const Image&)) + (mln::arith::impl::uminus_(trait::image::speed::any, const I&, O&)) + (mln::arith::impl::uminus_(trait::image::speed::fastest, const I&, O&)): + New. + * tests/arith/minus.cc: Exercise unary minus. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Exercise the unary plus operator on images. * tests/arith/plus.cc: Here. diff --git a/milena/mln/arith/minus.hh b/milena/mln/arith/minus.hh index 334e09d..4e4b706 100644 --- a/milena/mln/arith/minus.hh +++ b/milena/mln/arith/minus.hh @@ -42,6 +42,13 @@ namespace mln namespace trait { + template <typename I> + struct set_unary_< op::uminus, Image, I > + { + typedef mln_trait_op_uminus(mln_value(I)) value; + typedef mln_ch_value(I, value) ret; + }; + template <typename L, typename R> struct set_binary_< op::minus, Image, L, Image, R > { @@ -60,6 +67,11 @@ namespace mln + template <typename I> + mln_trait_op_uminus(I) + operator-(const Image& ima); + + template <typename L, typename R> mln_trait_op_minus(L,R) operator-(const Image<L>& lhs, const Image<R>& rhs); @@ -84,6 +96,16 @@ namespace mln namespace arith { + /// Negation (unary minus operation) of image \p ima. + /*! + * \param[in] ima Sole operand image. + * \result The result image. + */ + template <typename I> + mln_trait_op_uminus(I) + uminus(const Image& ima); + + /// Point-wise subtraction of images \p lhs and \p rhs. /*! * \param[in] lhs First operand image. @@ -191,6 +213,18 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + template <typename I> + inline + mln_trait_op_uminus(I) + operator-(const Image& ima) + { + mln_trace("operator::uminus"); + + mln_trait_op_uminus(I) output = arith::uminus(ima); + + return output; + } + template <typename L, typename R> inline mln_trait_op_minus(L,R) @@ -252,6 +286,26 @@ namespace mln namespace impl { + template <typename I, typename O> + inline + void uminus_(trait::image::speed::any, const I& ima, O& output) + { + mln_piter(I) p(ima.domain()); + for_all(p) + output(p) = -ima(p); + } + + template <typename I, typename O> + inline + void uminus_(trait::image::speed::fastest, const I& ima, O& output) + { + mln_pixter(const I) ip(ima); + mln_pixter(O) op(output); + for_all_2(ip, op) + op.val() = -ip.val(); + } + + template <typename L, typename R, typename O> inline void minus_(trait::image::speed::any, const L& lhs, @@ -329,6 +383,21 @@ namespace mln // Facades. + template <typename I> + inline + mln_trait_op_uminus(I) + uminus(const Image& ima) + { + mln_trace("arith::uminus"); + + mln_trait_op_uminus(I) output; + initialize(output, ima); + impl::uminus_(mln_trait_image_speed(I)(), exact(ima), output); + + return output; + } + + template <typename L, typename R> inline mln_trait_op_minus(L, R) diff --git a/milena/tests/arith/minus.cc b/milena/tests/arith/minus.cc index d04ff70..2039631 100644 --- a/milena/tests/arith/minus.cc +++ b/milena/tests/arith/minus.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,29 +25,39 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/debug/iota.hh> + #include <mln/arith/minus.hh> + +#include <mln/debug/iota.hh> #include <mln/data/compare.hh> + int main() { using namespace mln; - // debug::trace::quiet = false; + image2d<int> ima(3,3); + debug::iota(ima); + // Exercise unary minus. { - image2d<int> ima(3,3); - debug::iota(ima); + int vs[3][3] = { + {-1, -2, -3}, + {-4, -5, -6}, + {-7, -8, -9} + }; + image2d<int> ref(make::image(vs)); + mln_assertion(-ima == ref); + } + // Exercise binary minus. + { int vs[3][3] = { {0, 1, 2}, {3, 4, 5}, {6, 7, 8} }; - image2d<int> ref(make::image(vs)); - - mln_assertion (ima - 1 == ref); + mln_assertion(ima - 1 == ref); } - } -- 1.7.10.4

10 years, 7 months

olena: olena-2.0-814-g5569585 Milena: Exercise the unary plus operator on images.

by Roland Levillain

* tests/arith/plus.cc: Here. Remove dead code. --- milena/ChangeLog | 7 +++ milena/tests/arith/plus.cc | 101 +++++++++----------------------------------- 2 files changed, 26 insertions(+), 82 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d2cca7e..1db0bf1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Exercise the unary plus operator on images. + + * tests/arith/plus.cc: Here. + Remove dead code. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Fix and update the Doxygen documentation. * mln/arith/minus.hh, diff --git a/milena/tests/arith/plus.cc b/milena/tests/arith/plus.cc index c9a86d3..ae890d5 100644 --- a/milena/tests/arith/plus.cc +++ b/milena/tests/arith/plus.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -24,104 +25,40 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/debug/iota.hh> + #include <mln/arith/plus.hh> + +#include <mln/debug/iota.hh> #include <mln/data/compare.hh> + int main() { using namespace mln; - // debug::trace::quiet = false; + image2d<int> ima(3,3); + debug::iota(ima); + // Exercise unary plus. { - image2d<int> ima(3,3); - debug::iota(ima); - int vs[3][3] = { { 4, 5, 6}, { 7, 8, 9}, {10, 11, 12} }; + image2d<int> ref(make::image(vs)); + mln_assertion (+ima == ima); + } + // Exercise binary plus. + { + int vs[3][3] = { + { 4, 5, 6}, + { 7, 8, 9}, + {10, 11, 12} + }; ima += 2; image2d<int> ref(make::image(vs)); - mln_assertion (ima + 1 == ref); } - } - - - -// #include <mln/core/image/image2d.hh> -// #include <mln/core/routine/duplicate.hh> -// #include <mln/value/int_u8.hh> - -// #include <mln/arith/plus.hh> -// #include <mln/arith/times.hh> -// #include <mln/data/compare.hh> -// #include <mln/fun/v2v/cast.hh> - -// #include <mln/debug/iota.hh> -// #include <mln/debug/println.hh> - - - -// int main() -// { -// using namespace mln; - -// // debug::trace::quiet = false; - -// { -// image2d<int> ref(3,3); -// debug::iota(ref); - -// image2d<int> ima_i = duplicate(ref); -// ima_i += ima_i; -// mln_assertion(ima_i == 2 * ref); - -// debug::println(ima_i); -// ima_i += 1; -// debug::println(ima_i); - -// image2d<float> ima_f(3,3); -// debug::iota(ima_f); -// debug::println(ima_i + ima_f); - -// point2d p(0, 0); -// std::cout << arith::plus<float>(ima_i, ima_i)(p) / 5 << std::endl; -// } - -// } - - - -// Bench: - -// { -// unsigned size = 5000; -// image2d<unsigned char> ima_uc(size, size); -// image2d<unsigned> ima_u; -// ima_u = 2u + ima_uc; -// } -// { -// unsigned size = 5000; -// image2d<value::int_u8> ima_uc(size, size); -// image2d<unsigned> ima_u; -// ima_u = 2u + ima_uc; -// } - -// { -// unsigned size = 5000; -// image2d<unsigned char> ima_uc(size, size); -// image2d<unsigned> ima_u; -// ima_u = ima_uc + ima_uc; -// } -// { -// unsigned size = 5000; -// image2d<value::int_u8> ima_u8(size, size); -// image2d<unsigned> ima_u; -// ima_u = ima_u8 + ima_u8; -// } -- 1.7.10.4

10 years, 7 months

olena: olena-2.0-813-g15202a6 Typo in milena/ChangeLog.

by Roland Levillain

--- milena/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7b3aaea..d2cca7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -498,7 +498,7 @@ Add more tests. - * tests/core/alias/dpoint2d.cc: Exercise the substraction of a + * tests/core/alias/dpoint2d.cc: Exercise the subtraction of a dpoint2d from a point2d. * tests/core/alias/neighb2d.cc: New. * tests/core/alias/Makefile.am (check_PROGRAMS): Add neighb2d. -- 1.7.10.4

10 years, 7 months

olena: olena-2.0-812-g70c7697 Milena: Fix and update the Doxygen documentation.

by Roland Levillain

* mln/arith/minus.hh, * mln/fun/vv2v/diff_abs.hh, * mln/math/diff_abs.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/arith/minus.hh | 23 +++++++++++------------ milena/mln/fun/vv2v/diff_abs.hh | 17 +++++++++++------ milena/mln/math/diff_abs.hh | 15 ++++++++------- 4 files changed, 39 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 52f9172..7b3aaea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Fix and update the Doxygen documentation. + + * mln/arith/minus.hh, + * mln/fun/vv2v/diff_abs.hh, + * mln/math/diff_abs.hh: + Here. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Aesthetic changes. * mln/arith/minus.hh, diff --git a/milena/mln/arith/minus.hh b/milena/mln/arith/minus.hh index bd3b09d..334e09d 100644 --- a/milena/mln/arith/minus.hh +++ b/milena/mln/arith/minus.hh @@ -28,8 +28,7 @@ # define MLN_ARITH_MINUS_HH /// \file -/// -/// Point-wise substraction between images. +/// \brief Point-wise subtraction between images. /// /// \todo Speedup; some versions are not optimal. @@ -85,7 +84,7 @@ namespace mln namespace arith { - /// Point-wise addition of images \p lhs and \p rhs. + /// Point-wise subtraction of images \p lhs and \p rhs. /*! * \param[in] lhs First operand image. * \param[in] rhs Second operand image. @@ -98,7 +97,7 @@ namespace mln minus(const Image<L>& lhs, const Image<R>& rhs); - /// Point-wise addition of images \p lhs and \p rhs. + /// Point-wise subtraction of images \p lhs and \p rhs. /*! * \param[in] lhs First operand image. * \param[in] rhs Second operand image. @@ -113,7 +112,7 @@ namespace mln const Function_v2v<F>& f); - /// Point-wise addition of images \p lhs and \p rhs. + /// Point-wise subtraction of images \p lhs and \p rhs. /*! * \param[in] lhs First operand image. * \param[in] rhs Second operand image. @@ -128,12 +127,12 @@ namespace mln minus(const Image<L>& lhs, const Image<R>& rhs); - /// Point-wise addition of image \p rhs in image \p lhs. + /// Point-wise subtraction of image \p rhs in image \p lhs. /*! - * \param[in,out] lhs First operand image (subject to addition). - * \param[in] rhs Second operand image (to be added to \p lhs). + * \param[in,out] lhs First operand image (subject to subtraction). + * \param[in] rhs Second operand image (to be subtracted to \p lhs). * - * This addition performs: \n + * This subtraction performs: \n * for all p of rhs.domain \n * lhs(p) -= rhs(p) * @@ -144,7 +143,7 @@ namespace mln minus_inplace(Image<L>& lhs, const Image<R>& rhs); - /// Point-wise addition of the value \p val to image \p input. + /// Point-wise subtraction of the value \p val to image \p input. /*! * \param[in] input The image. * \param[in] val The value. @@ -157,7 +156,7 @@ namespace mln minus_cst(const Image& input, const V& val); - /// Point-wise addition of the value \p val to image \p input. + /// Point-wise subtraction of the value \p val to image \p input. /*! * \param[in] input The image. * \param[in] val The value. @@ -172,7 +171,7 @@ namespace mln const Function_v2v<F>& f); - /// Point-wise addition of the value \p val to image \p input. + /// Point-wise subtraction of the value \p val to image \p input. /*! * \param[in,out] input The image. * \param[in] val The value. diff --git a/milena/mln/fun/vv2v/diff_abs.hh b/milena/mln/fun/vv2v/diff_abs.hh index abde9d2..3be04d7 100644 --- a/milena/mln/fun/vv2v/diff_abs.hh +++ b/milena/mln/fun/vv2v/diff_abs.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -27,8 +28,7 @@ # define MLN_FUN_VV2V_DIFF_ABS_HH /// \file -/// \brief Computing the absolute difference between two values using -/// a functor. +/// \brief Functor computing the absolute difference of two values. # include <mln/core/concept/function.hh> # include <mln/math/diff_abs.hh> @@ -43,13 +43,18 @@ namespace mln namespace vv2v { - // FIXME: Doc. - - /// \brief A functor computing the diff_absimum of two values. + /// \brief Functor computing the absolute difference of two + /// values. + /// + /// \tparam V The type of the values to compare. template <typename V> struct diff_abs : public Function_vv2v< diff_abs<V> > { typedef V result; + + /// \brief Compute the absolute difference of \a v1 and \a v2. + /// + /// That is, compute \f$|v1 - v2|\f$. V operator()(const V& v1, const V& v2) const; }; diff --git a/milena/mln/math/diff_abs.hh b/milena/mln/math/diff_abs.hh index e7f7b14..93881d6 100644 --- a/milena/mln/math/diff_abs.hh +++ b/milena/mln/math/diff_abs.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -28,8 +28,7 @@ # define MLN_MATH_DIFF_ABS_HH /// \file -/// -/// Define diff_abs routine. +/// \brief Routine computing the absolute difference of two values. /// /// \todo Do we want a specific version for vectorial types? @@ -40,9 +39,11 @@ namespace mln namespace math { - /*! \brief The absolute difference between to values. - \ingroup mlnmath - */ + /// \brief Return the absolute difference between \a v1 and \a v2. + /// + /// That is, compute \f$|v1 - v2|\f$. + /// + /// \ingroup mlnmath template <typename T> T diff_abs(const T& v1, const T& v2); -- 1.7.10.4

10 years, 7 months

olena: olena-2.0-811-g908e330 Milena: Aesthetic changes.

by Roland Levillain

* mln/arith/minus.hh, * tests/core/image/imorph/interpolated.cc: Here. --- milena/ChangeLog | 8 ++++ milena/mln/arith/minus.hh | 54 ++++++++++++++---------- milena/tests/core/image/imorph/interpolated.cc | 35 +++++++-------- 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0cdae57..52f9172 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Aesthetic changes. + + * mln/arith/minus.hh, + * tests/core/image/imorph/interpolated.cc: + Here. + 2013-10-07 Roland Levillain <roland(a)lrde.epita.fr> Milena: New test exercising fun_image with RGB component functions. diff --git a/milena/mln/arith/minus.hh b/milena/mln/arith/minus.hh index ddec735..bd3b09d 100644 --- a/milena/mln/arith/minus.hh +++ b/milena/mln/arith/minus.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -108,7 +109,8 @@ namespace mln */ template <typename L, typename R, typename F> mln_ch_value(L, mln_result(F)) - minus(const Image<L>& lhs, const Image<R>& rhs, const Function_v2v<F>& f); + minus(const Image<L>& lhs, const Image<R>& rhs, + const Function_v2v<F>& f); /// Point-wise addition of images \p lhs and \p rhs. @@ -166,7 +168,8 @@ namespace mln */ template <typename I, typename V, typename F> mln_ch_value(I, mln_result(F)) - minus_cst(const Image& input, const V& val, const Function_v2v<F>& f); + minus_cst(const Image& input, const V& val, + const Function_v2v<F>& f); /// Point-wise addition of the value \p val to image \p input. @@ -253,27 +256,19 @@ namespace mln template <typename L, typename R, typename O> inline void minus_(trait::image::speed::any, const L& lhs, - trait::image::speed::any, const R& rhs, O& output) + trait::image::speed::any, const R& rhs, + O& output) { mln_piter(L) p(lhs.domain()); for_all(p) output(p) = lhs(p) - rhs(p); } - template <typename L, typename R, typename F, typename O> - inline - void minus_(trait::image::speed::any, const L& lhs, - trait::image::speed::any, const R& rhs, const F& f, O& output) - { - mln_piter(L) p(lhs.domain()); - for_all(p) - output(p) = f(lhs(p) - rhs(p)); - } - template <typename L, typename R, typename O> inline void minus_(trait::image::speed::fastest, const L& lhs, - trait::image::speed::fastest, const R& rhs, O& output) + trait::image::speed::fastest, const R& rhs, + O& output) { mln_pixter(const L) lp(lhs); mln_pixter(const R) rp(rhs); @@ -282,10 +277,23 @@ namespace mln op.val() = lp.val() - rp.val(); } + + template <typename L, typename R, typename F, typename O> + inline + void minus_(trait::image::speed::any, const L& lhs, + trait::image::speed::any, const R& rhs, + const F& f, O& output) + { + mln_piter(L) p(lhs.domain()); + for_all(p) + output(p) = f(lhs(p) - rhs(p)); + } + template <typename L, typename R, typename F, typename O> inline void minus_(trait::image::speed::fastest, const L& lhs, - trait::image::speed::fastest, const R& rhs, const F& f, O& output) + trait::image::speed::fastest, const R& rhs, + const F& f, O& output) { mln_pixter(const L) lp(lhs); mln_pixter(const R) rp(rhs); @@ -294,10 +302,11 @@ namespace mln op.val() = f(lp.val() - rp.val()); } + template <typename L, typename R> inline void minus_inplace_(trait::image::speed::any, L& lhs, - trait::image::speed::any, const R& rhs) + trait::image::speed::any, const R& rhs) { mln_piter(L) p(lhs.domain()); for_all(p) @@ -307,7 +316,7 @@ namespace mln template <typename L, typename R> inline void minus_inplace_(trait::image::speed::fastest, L& lhs, - trait::image::speed::fastest, const R& rhs) + trait::image::speed::fastest, const R& rhs) { mln_pixter(L) lp(lhs); mln_pixter(const R) rp(rhs); @@ -384,8 +393,8 @@ namespace mln mln_precondition(exact(input).is_valid()); // Calls the previous version. - mln_trait_op_minus(I, V) output = minus(input, - pw::cst(val) | exact(input).domain()); + mln_trait_op_minus(I, V) output = + minus(input, pw::cst(val) | exact(input).domain()); return output; } @@ -401,9 +410,8 @@ namespace mln mln_precondition(exact(input).is_valid()); // Calls the previous version. - mln_ch_value(I, mln_result(F)) output = minus(input, - pw::cst(val) | exact(input).domain(), - f); + mln_ch_value(I, mln_result(F)) output = + minus(input, pw::cst(val) | exact(input).domain(), f); return output; } diff --git a/milena/tests/core/image/imorph/interpolated.cc b/milena/tests/core/image/imorph/interpolated.cc index 0088879..0ed5b16 100644 --- a/milena/tests/core/image/imorph/interpolated.cc +++ b/milena/tests/core/image/imorph/interpolated.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -23,37 +24,37 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// \brief Exercise mln::interpolated using mln::fun::x2v::bilinear. + #include <iostream> + #include <mln/core/image/image2d.hh> #include <mln/core/image/imorph/interpolated.hh> +#include <mln/fun/x2v/bilinear.hh> #include <mln/algebra/vec.hh> -#include <mln/data/fill.hh> - #include <mln/debug/println.hh> -#include <mln/fun/x2v/bilinear.hh> - - int main() { using namespace mln; - float tab[] = {1., 3., 5., 7., - 4., 7., 10., 13., - 7., 11., 15., 19., - 10., 15., 20., 25.}; - image2d<float> f = make::image2d(tab); + float tab[] = {1.f, 3.f, 5.f, 7.f, + 4.f, 7.f, 10.f, 13.f, + 7.f, 11.f, 15.f, 19.f, + 10.f, 15.f, 20.f, 25.f}; + image2d<float> ima = make::image2d(tab); - interpolated<image2d<float>, fun::x2v::bilinear> inter(f); + interpolated<image2d<float>, fun::x2v::bilinear> inter(ima); - algebra::vec<2, float> v1 = make::vec(2.3, 0.6); - algebra::vec<2, float> v2 = make::vec(3.2, 1.8); + algebra::vec<2, float> v1 = make::vec(2.3f, 0.6f); + algebra::vec<2, float> v2 = make::vec(3.2f, 1.8f); - debug::println(f); + debug::println(ima); - std::cout << v1 << " : " << inter(v1) << std::endl; - std::cout << v2 << " : " << inter(v2) << std::endl; + std::cout << "inter(" << v1 << ") = " << inter(v1) << std::endl; + std::cout << "inter(" << v2 << ") = " << inter(v2) << std::endl; } -- 1.7.10.4

10 years, 7 months

*****SPAM***** Environmental organization aggressively recruiting partners worldwide.

by olena-patches＠lrde.epita.fr

Eco-friendly enterprise looking for partnership Six percent commission on 180K per month income derived from sales of proprietary environmental technology information Necessary conditions: - Own a limited liability company - Daily availability through E-mail, phone or Skype - Prompt execution of all scheduled tasks In case if being interested, please provide: - Full name - Phone number (including country code) - City and Country - Email Reply to: Dora(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

10 years, 7 months

*****SPAM***** Environmental business currently seeking representatives worldwide.

by olena-patches＠lrde.epita.fr

Eco-friendly enterprise looking for partnership Six percent commission on 180K per month income derived from sales of proprietary environmental technology information Necessary conditions: - Own a limited liability company - Daily availability through E-mail, phone or Skype - Prompt execution of all scheduled tasks In case if being interested, please provide: - Full name - Phone number (including country code) - City and Country - Email Reply to: Hilda(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

10 years, 7 months

*****SPAM***** Superb Chance for Employment for Worldwide Population - Environmental corporation rooting out and Recruiting Potential Candidates

by olena-patches＠lrde.epita.fr

Eco-friendly enterprise looking for partnership Six percent commission on 180K per month income derived from sales of proprietary environmental technology information Necessary conditions: - Own a limited liability company - Daily availability through E-mail, phone or Skype - Prompt execution of all scheduled tasks In case if being interested, please provide: - �Full name - �Phone number (including country code) - City and Country - �Email Reply to: Karen(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

10 years, 7 months

*****SPAM***** Environmental corporation searching for representatives worldwide.

by olena-patches＠lrde.epita.fr

Eco-friendly enterprise looking for partnership Six percent commission on 180K per month income derived from sales of proprietary environmental technology information Necessary conditions: - Own a limited liability company - Daily availability through E-mail, phone or Skype - Prompt execution of all scheduled tasks In case if being interested, please provide: - Full name - Phone number (including country code) - City and Country - Email Reply to: Jane(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

10 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2013