Olena-patches October 2013

olena-patches@lrde.epita.fr

4 participants
137 discussions

*****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: Leland(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

11 years, 2 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: Sonny(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

11 years, 2 months

olena: branch morpher-composition created: olena-2.0-821-ga65dcf8

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch morpher-composition has been created at a65dcf8c35129a8569f942d2e7829e14cc89c84d (commit) - Log ----------------------------------------------------------------- a65dcf8 Milena: Add a ``one-liner'' test to interpolated-tr_image. 7991e3f Milena: Add helpers to instantiate mln::interpolated and mln::tr_image. 8fecc48 Milena: Exercise mln::interpolated and mln::tr_image together. 3410400 Milena: Make rotation axis optional. 3700b60 Milena: Have mln::debug::iota work with images of floats. e037dab Milena: Introduce point-wise function bindings. 95c9f69 Milena: Add support for unary minus on images. 5569585 Milena: Exercise the unary plus operator on images. 15202a6 Typo in milena/ChangeLog. 70c7697 Milena: Fix and update the Doxygen documentation. 908e330 Milena: Aesthetic changes. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 2 months

olena: olena-2.0-817-g3700b60 Milena: Have mln::debug::iota work with images of floats.

by Roland Levillain

* mln/debug/iota.hh (mln::trait::modulus<T>): New trait. (mln::debug::impl::iota(trait::image::speed::any, I&, unsigned)): * mln/debug/iota.spe.hh (mln::debug::impl::iota(trait::image::speed::fastest, I&, unsigned)): Here. * tests/debug/iota.cc: Exercise mln::debug::iota with an image of floats. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/debug/iota.hh | 35 +++++++++++++++++++++++++++++------ milena/mln/debug/iota.spe.hh | 11 ++++++----- milena/tests/debug/iota.cc | 37 ++++++++++++++++++++++++++++++++----- 4 files changed, 79 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c63c9e6..6adf168 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Have mln::debug::iota work with images of floats. + + * mln/debug/iota.hh (mln::trait::modulus<T>): New trait. + (mln::debug::impl::iota(trait::image::speed::any, I&, unsigned)): + * mln/debug/iota.spe.hh + (mln::debug::impl::iota(trait::image::speed::fastest, I&, unsigned)): + Here. + * tests/debug/iota.cc: Exercise mln::debug::iota with an image of + floats. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Introduce point-wise function bindings. * mln/pw/bind.hh: New. diff --git a/milena/mln/debug/iota.hh b/milena/mln/debug/iota.hh index 4bd92f7..6945a73 100644 --- a/milena/mln/debug/iota.hh +++ b/milena/mln/debug/iota.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -27,13 +27,34 @@ #ifndef MLN_DEBUG_IOTA_HH # define MLN_DEBUG_IOTA_HH -/*! \file - * - * \brief Fill an image with successive values. - */ +/// \file +/// \brief Routine filling an image with successive values. # include <mln/core/concept/image.hh> +namespace mln +{ + namespace trait + { + // FIXME: Move this to mln/trait/ and generalize it? + + /* Local trait: Modulus type compatible with `unsigned'. + + The `mln::debug::iota' routine below performs an operation + `i % m', where `i' is an `unsigned' value and `m' is the + image's maximum value type. However, this operation is not + valid when `m' is a `float' or a `double'. Hence the following + trait, returning `unsigned' for these floating-point + value types and `T' for any other value type T. */ + template <typename T> struct modulus_type { typedef T ret; }; + template <> struct modulus_type<float> { typedef unsigned ret; }; + template <> struct modulus_type<double> { typedef unsigned ret; }; + + } // end of namespace mln::debug + +} // end of namespace mln + + // Specializations are in: # include <mln/debug/iota.spe.hh> @@ -68,8 +89,10 @@ namespace mln { unsigned i = base_index; mln_piter(I) p(input.domain()); + typedef mln_value(I) V; for_all(p) - input(p) = ++i % mln_max(mln_value(I)); + input(p) = + static_cast<V>(++i % mln_max(typename trait::modulus_type<V>::ret)); } } // end of namespace mln::debug::impl diff --git a/milena/mln/debug/iota.spe.hh b/milena/mln/debug/iota.spe.hh index 37e17d9..f608696 100644 --- a/milena/mln/debug/iota.spe.hh +++ b/milena/mln/debug/iota.spe.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2013 EPITA Research and +// Development Laboratory (LRDE). // // This file is part of Olena. // @@ -28,8 +28,7 @@ # define MLN_DEBUG_IOTA_SPE_HH /// \file -/// -/// Specializations for mln::debug::iota. +/// \brief Specializations of mln::debug::iota. # ifndef MLN_DEBUG_IOTA_HH # error "Forbidden inclusion of *.spe.hh" @@ -60,8 +59,10 @@ namespace mln { unsigned i = base_index; mln_pixter(I) p(input); + typedef mln_value(I) V; for_all(p) - p.val() = static_cast<mln_value(I)>(++i % mln_max(mln_value(I))); + p.val() = + static_cast<V>(++i % mln_max(typename trait::modulus_type<V>::ret));; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/debug/iota.cc b/milena/tests/debug/iota.cc index 0873a0e..9d58607 100644 --- a/milena/tests/debug/iota.cc +++ b/milena/tests/debug/iota.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. // @@ -29,17 +30,23 @@ #include <mln/debug/iota.hh> #include <mln/data/compare.hh> +#include <mln/test/predicate.hh> + +#include <mln/pw/all.hh> +#include <mln/fun/vv2v/diff_abs.hh> + int main() { using namespace mln; using value::int_u8; + // Exercise mln::debug::iota with an image of ints. { - int vs[4][4] = { {1, 2, 3, 4}, - {5, 6, 7, 8}, - {9, 10,11,12}, - {13,14,15,16} }; + int vs[4][4] = { { 1, 2, 3, 4}, + { 5, 6, 7, 8}, + { 9, 10, 11, 12}, + {13, 14, 15, 16} }; image2d<int> ref = make::image(vs); image2d<int> ima(4, 4); @@ -47,4 +54,24 @@ int main() debug::iota(ima); mln_assertion(ima == ref); } + + // Exercise mln::debug::iota with an image of floats. + { + float vs[4][4] = { { 1.f, 2.f, 3.f, 4.f}, + { 5.f, 6.f, 7.f, 8.f}, + { 9.f, 10.f, 11.f, 12.f}, + {13.f, 14.f, 15.f, 16.f} }; + + image2d<float> ref = make::image(vs); + image2d<float> ima(4, 4); + + debug::iota(ima); + // Use a ``tolerant'' comparison. + float threshold = 0.0001f; + mln_assertion(test::predicate(ima.domain(), + pw::bind(fun::vv2v::diff_abs<float>(), + pw::value(ima), + pw::value(ref)) + < pw::cst(threshold))); + } } -- 1.7.10.4

11 years, 2 months

*****SPAM***** Environmental company currently looking for partners from all over the world.

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: Coleman(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

11 years, 2 months

olena: olena-2.0-821-ga65dcf8 Milena: Add a ``one-liner'' test to interpolated-tr_image.

by Roland Levillain

* tests/core/image/imorph/interpolated-tr_image.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/core/image/imorph/interpolated-tr_image.cc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41ccdce..28cbe0a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Add a ``one-liner'' test to interpolated-tr_image. + + * tests/core/image/imorph/interpolated-tr_image.cc: Here. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Add helpers to instantiate mln::interpolated and mln::tr_image. * mln/core/image/imorph/interpolated.hh (mln::interpolate) diff --git a/milena/tests/core/image/imorph/interpolated-tr_image.cc b/milena/tests/core/image/imorph/interpolated-tr_image.cc index de85d58..e31d75c 100644 --- a/milena/tests/core/image/imorph/interpolated-tr_image.cc +++ b/milena/tests/core/image/imorph/interpolated-tr_image.cc @@ -78,4 +78,10 @@ int main() R rotated(inter.domain(), inter, rotate); PRINTLN(rotated); } + + // Equivalent ``one-liner''. + { + PRINTLN(apply_tr(interpolate<fun::x2v::bilinear>(safe(ima, 0.f).rw()), + fun::x2x::rotation<2, float>(math::pi / 4))); + } } -- 1.7.10.4

11 years, 2 months

olena: olena-2.0-820-g7991e3f Milena: Add helpers to instantiate mln::interpolated and mln::tr_image.

by Roland Levillain

* mln/core/image/imorph/interpolated.hh (mln::interpolate) * mln/core/image/imorph/tr_image.hh (mln::apply_tr): New functions. --- milena/ChangeLog | 8 ++++++ milena/mln/core/image/imorph/interpolated.hh | 25 +++++++++++++++++++ milena/mln/core/image/imorph/tr_image.hh | 34 ++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index 382f48a..41ccdce 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Add helpers to instantiate mln::interpolated and mln::tr_image. + + * mln/core/image/imorph/interpolated.hh (mln::interpolate) + * mln/core/image/imorph/tr_image.hh (mln::apply_tr): + New functions. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Exercise mln::interpolated and mln::tr_image together. * tests/core/image/imorph/interpolated-tr_image.cc: New. diff --git a/milena/mln/core/image/imorph/interpolated.hh b/milena/mln/core/image/imorph/interpolated.hh index 0c20ac3..9b4aaa9 100644 --- a/milena/mln/core/image/imorph/interpolated.hh +++ b/milena/mln/core/image/imorph/interpolated.hh @@ -138,6 +138,22 @@ namespace mln }; + /** \brief Helper routine to create an mln::interpolated morphed + image. + + Careful, the order of the template parameters is inverted + compared to mln::interpolated. This is so that the routine can + be used this way: + + \code + mln::interpolate<mln::fun::x2v::bilinear>(ima); + \encode + + (i.e., so that parameter I can be deduced from \a ima). */ + template <template <class> class F, typename I> + interpolated<I, F> interpolate(Image<I>& ima); + + # ifndef MLN_INCLUDE_ONLY @@ -216,6 +232,15 @@ namespace mln } + // interpolate. + + template <template <class> class F, typename I> + interpolated<I, F> interpolate(Image<I>& ima) + { + interpolated<I, F> tmp(exact(ima)); + return tmp; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln diff --git a/milena/mln/core/image/imorph/tr_image.hh b/milena/mln/core/image/imorph/tr_image.hh index 3f2451f..f036e40 100644 --- a/milena/mln/core/image/imorph/tr_image.hh +++ b/milena/mln/core/image/imorph/tr_image.hh @@ -155,6 +155,19 @@ namespace mln }; + /// \brief Helper routine to create an mln::tr_image morphed image. + template <typename S, typename I, typename T> + tr_image<S, I, T> + apply_tr(const Site_Set<S>& s, const Image<I>& ima, + const Function_v2v<T>& tr); + + /// \brief Helper routine to create an mln::tr_image morphed + /// images. The domain is deduced from \a ima. + template <typename I, typename T> + tr_image<mln_domain(I), I, T> + apply_tr(const Image<I>& ima, const Function_v2v<T>& tr); + + # ifndef MLN_INCLUDE_ONLY @@ -265,6 +278,27 @@ namespace mln return tmp; } + + /// transform. + + template <typename S, typename I, typename T> + tr_image<S, I, T> + apply_tr(const Site_Set<S>& s, const Image<I>& ima, + const Function_v2v<T>& tr) + { + tr_image<S, I, T> tmp(exact(s), exact(ima), exact(tr)); + return tmp; + } + + template <typename I, typename T> + tr_image<mln_domain(I), I, T> + apply_tr(const Image<I>& ima, const Function_v2v<T>& tr) + { + tr_image<mln_domain(I), I, T> tmp(exact(ima).domain(), exact(ima), + exact(tr)); + return tmp; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln -- 1.7.10.4

11 years, 2 months

olena: olena-2.0-819-g8fecc48 Milena: Exercise mln::interpolated and mln::tr_image together.

by Roland Levillain

* tests/core/image/imorph/interpolated-tr_image.cc: New. * tests/core/image/imorph/Makefile.am (check_PROGRAMS): Add interpolated-tr_image. --- milena/ChangeLog | 8 +++ milena/tests/core/image/imorph/Makefile.am | 15 +++--- .../{interpolated.cc => interpolated-tr_image.cc} | 51 ++++++++++++++------ 3 files changed, 52 insertions(+), 22 deletions(-) copy milena/tests/core/image/imorph/{interpolated.cc => interpolated-tr_image.cc} (55%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b9e6a3..382f48a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Exercise mln::interpolated and mln::tr_image together. + + * tests/core/image/imorph/interpolated-tr_image.cc: New. + * tests/core/image/imorph/Makefile.am (check_PROGRAMS): + Add interpolated-tr_image. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Make rotation axis optional. * mln/fun/x2x/rotation.hh diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am index ddfc8b0..97a3ce6 100644 --- a/milena/tests/core/image/imorph/Makefile.am +++ b/milena/tests/core/image/imorph/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -17,11 +18,11 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - decorated_image \ - interpolated \ - labeled_image \ - safe_image \ - tr_image - + decorated_image \ + interpolated \ + interpolated-tr_image \ + labeled_image \ + safe_image \ + tr_image TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/imorph/interpolated.cc b/milena/tests/core/image/imorph/interpolated-tr_image.cc similarity index 55% copy from milena/tests/core/image/imorph/interpolated.cc copy to milena/tests/core/image/imorph/interpolated-tr_image.cc index 0ed5b16..de85d58 100644 --- a/milena/tests/core/image/imorph/interpolated.cc +++ b/milena/tests/core/image/imorph/interpolated-tr_image.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development -// Laboratory (LRDE). +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -25,36 +24,58 @@ // executable file might be covered by the GNU General Public License. /// \file -/// \brief Exercise mln::interpolated using mln::fun::x2v::bilinear. +/// \brief Exercise the mln::interpolated and mln::tr_image morphers +/// together. #include <iostream> #include <mln/core/image/image2d.hh> #include <mln/core/image/imorph/interpolated.hh> +#include <mln/core/image/imorph/safe.hh> +#include <mln/core/image/imorph/tr_image.hh> + #include <mln/fun/x2v/bilinear.hh> +#include <mln/fun/x2x/rotation.hh> + +#include <mln/math/pi.hh> #include <mln/algebra/vec.hh> +#include <mln/debug/iota.hh> #include <mln/debug/println.hh> +/// Sugar macro for mln::debug::println. +#define PRINTLN(Ima) mln::debug::println(#Ima " = ", Ima) + int main() { using namespace mln; - 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(ima); + typedef image2d<float> I; + I ima(4, 4); + debug::iota(ima); + PRINTLN(ima); - algebra::vec<2, float> v1 = make::vec(2.3f, 0.6f); - algebra::vec<2, float> v2 = make::vec(3.2f, 1.8f); + // Step-by-step approach. + { + /// Wrap `ima' into a safe_image morpher to prevent out-of-domain + /// accesses due to the interpolation or the rotation below. + typedef mln::safe_image<I> S; + S safe(ima, 0.f); + PRINTLN(safe); - debug::println(ima); + /// Add an on-the-fly bilinear interpolation. + typedef interpolated<S, fun::x2v::bilinear> B; + B inter(safe); + PRINTLN(inter); - std::cout << "inter(" << v1 << ") = " << inter(v1) << std::endl; - std::cout << "inter(" << v2 << ") = " << inter(v2) << std::endl; + /// Rotate image on the fly. + float angle = math::pi / 4; + typedef fun::x2x::rotation<2, float> F; + F rotate(angle); + typedef tr_image<mln_domain_(B), B, F> R; + R rotated(inter.domain(), inter, rotate); + PRINTLN(rotated); + } } -- 1.7.10.4

11 years, 2 months

olena: olena-2.0-818-g3410400 Milena: Make rotation axis optional.

by Roland Levillain

* mln/fun/x2x/rotation.hh (rotation<n, C>::rotation(const C&, const algebra::vec<n,C>&)): Provide a default version for the second argument. --- milena/ChangeLog | 8 ++++++++ milena/mln/fun/x2x/rotation.hh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6adf168..5b9e6a3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Make rotation axis optional. + + * mln/fun/x2x/rotation.hh + (rotation<n, C>::rotation(const C&, const algebra::vec<n,C>&)): + Provide a default version for the second argument. + +2013-10-09 Roland Levillain <roland(a)lrde.epita.fr> + Milena: Have mln::debug::iota work with images of floats. * mln/debug/iota.hh (mln::trait::modulus<T>): New trait. diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index fd88a84..80b1e78 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -162,9 +162,9 @@ namespace mln /// Constructor without argument. rotation(); - /// Constructor with radian alpha and a facultative direction + /// Constructor with radian alpha and an optional direction /// (rotation axis). - rotation(const C& alpha, const algebra::vec<n,C>& axis); + rotation(const C& alpha, const algebra::vec<n,C>& axis = literal::zero); /// Constructor with quaternion rotation(const algebra::quat& q); /// Constructor with h_mat. -- 1.7.10.4

11 years, 2 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: Corina(a)consult-studio.com Please AVOID using the "reply" button of your email. Yours truly, HR dept

11 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
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