November 2008 - Olena-patches

cleanup-2008 2878: It now compiles.
by Alexandre Abraham 14 Nov '08

14 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> It now compiles. * markov/markov.cc: add name modification. * markov/markov.hh: many little fixes. markov.cc | 7 ++++++- markov.hh | 49 +++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 19 deletions(-) Index: markov/markov.cc --- markov/markov.cc (revision 2877) +++ markov/markov.cc (working copy) @@ -26,6 +26,7 @@ // Public License. #include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pbm/save.hh> @@ -47,6 +48,10 @@ image2d<int_u8> ima; io::pgm::load(ima, argv[1]); + int temperature = atoi(argv[2]); - io::pgm::save(markov(ima, temperature), name.append("_markoved.pbm")); + + std::string name(argv[1]); + name.erase(name.length() - 4); + io::pbm::save(markov(ima, c4(), temperature), name.append("_markoved.pbm")); } Index: markov/markov.hh --- markov/markov.hh (revision 2877) +++ markov/markov.hh (working copy) @@ -2,10 +2,13 @@ # define MARKOV_HH_ # include <cmath> +# include <random.hh> +# include <T_gen.hh> namespace mln { + /* I think we don't need it anymore... inline const neighb2d& neighb_h1() { @@ -19,49 +22,59 @@ } return it; } + */ - double compute_energy(const Image2d<int_u8>& ima, bool xi, const point2d& p) + template <typename I, typename N> + double compute_energy(const I& ima, const N& nbh, bool xi, const mln_piter(I)& p) { // Compute u(x,y) double u; - if (v) - u = ima(p) / 255; + if (xi) + u = (double) ima(p) / mln_max(mln_value(I)); else - u = 1 - ima(p) / 255; + u = (double) (1 - ima(p)) / mln_max(mln_value(I)); // u(x) is cst donc osef // u voisinage + + mln_niter(N) n(nbh, p); + for_all(n) + // treat each point here ;), no need to make weird neighborhoods + // make sth with |ima(p) - ima(n)| + abs(ima(p) - ima(n)); } - template <typename I, typename G, typename R> // I == int_u8 - markov(const Image& ima_, unsigned start_temp) + template <typename I, typename N> // I == int_u8 + mln_ch_value(I, bool) markov(const Image& ima_, const Neighborhood<N> nbh_, unsigned start_temp) { - exact(I) &ima = ima_; + const I &ima = exact(ima_); + const N &nbh = exact(nbh_); - double espilon = 0.001; + double epsilon = 0.001; mln_ch_value(I, bool) out(ima.domain()); // FIXME: generalize, we might not do a binarisation - G temp(start_temp); + // G temp(start_temp); + temperature_generator temp(start_temp, 0.99); - R v_random(0, 1); - R p_random(0., 1.); + Random<bool> v_random(0, 1); // mettre max et min ? + Random<double> p_random(0., 1.); // idem - init(ima, out); + // init(ima, out); ca empeche de compiloter - while (temp.value() < epsilon) + while (temp < epsilon) { - mln_piter p(ima.domain()); + mln_piter(I) p(ima.domain()); for_all(p) { bool v = v_random.get(); - u = compute_energy(ima, out(p), p); - up = compute_energy(ima, v, p); + double u = compute_energy(ima, nbh, out(p), p); + double up = compute_energy(ima, nbh, v, p); - d_u = abs(up - u); + double d_u = abs(up - u); - proba = ...; + double proba = 0.5; // FIXME if (d_u < 0 or (p_random.get() > proba)) out(p) = v;

1 0

cleanup-2008 2877: Add a .cc file, correct some little things.
by Alexandre Abraham 14 Nov '08

14 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Add a .cc file, correct some little things. * markov/markov.cc: New. * markov/markov.hh: . markov.cc | 52 +++++++++++++++++++++++++++++++++ markov.hh | 95 ++++++++++++++++++++++++++++++++------------------------------ 2 files changed, 102 insertions(+), 45 deletions(-) Index: markov/markov.cc --- markov/markov.cc (revision 0) +++ markov/markov.cc (revision 0) @@ -0,0 +1,52 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. + +#include <mln/core/image/image2d.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pbm/save.hh> + +#include <mln/value/int_u8.hh> + +#include "markov.hh" + +int main(int argc, const char * argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) { + std::cerr << "usage: " << argv[0] << " in.pgm temperature" << std::endl; + return 1; + } + + image2d<int_u8> ima; + io::pgm::load(ima, argv[1]); + + int temperature = atoi(argv[2]); + io::pgm::save(markov(ima, temperature), name.append("_markoved.pbm")); +} Index: markov/markov.hh --- markov/markov.hh (revision 2876) +++ markov/markov.hh (working copy) @@ -3,6 +3,8 @@ # include <cmath> +namespace mln +{ inline const neighb2d& neighb_h1() @@ -32,11 +34,13 @@ // u voisinage } - template <typename I, typename G, typename R, typename E> // I == int_u8 -markov(const Image2d& ima, unsigned start_temp) + template <typename I, typename G, typename R> // I == int_u8 + markov(const Image& ima_, unsigned start_temp) { + exact(I) &ima = ima_; + double espilon = 0.001; - Image2d<bool> out(ima.domain()); // FIXME: generalize, we might not do a binarisation + mln_ch_value(I, bool) out(ima.domain()); // FIXME: generalize, we might not do a binarisation G temp(start_temp); R v_random(0, 1); @@ -46,13 +50,12 @@ while (temp.value() < epsilon) { - qiterator p(ima); + mln_piter p(ima.domain()); for_all(p) { bool v = v_random.get(); - u = compute_energy(ima, out(p), p); up = compute_energy(ima, v, p); @@ -68,4 +71,6 @@ return out; } +} // end of namespace mln + #endif /* !MARKOV_HH_ */

1 0

r2876: Pseudo-code of the canvas of the algorithm
by Maxime van Noppen 14 Nov '08

14 Nov '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2876: Pseudo-code of the canvas of the algorithm URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-14 Maxime van Noppen <yabo(a)lrde.epita.fr> Pseudo-code of the canvas of the algorithm. * markov.hh: New. --- markov.hh | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) Index: branches/cleanup-2008/milena/sandbox/markov/markov.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/markov/markov.hh (revision 0) +++ branches/cleanup-2008/milena/sandbox/markov/markov.hh (revision 2876) @@ -0,0 +1,71 @@ +#ifndef MARKOV_HH_ +# define MARKOV_HH_ + +# include <cmath> + + + inline +const neighb2d& neighb_h1() +{ + static neighb2d it; + if (it.size() == 0) + { + static const bool vals[] = { 0, 0, 0, + 0, 0, 1, + 0, 0, 0 }; + convert::from_to(vals, it); + } + return it; +} + +double compute_energy(const Image2d<int_u8>& ima, bool xi, const point2d& p) +{ + // Compute u(x,y) + double u; + if (v) + u = ima(p) / 255; + else + u = 1 - ima(p) / 255; + + // u(x) is cst donc osef + + // u voisinage +} + + template <typename I, typename G, typename R, typename E> // I == int_u8 +markov(const Image2d& ima, unsigned start_temp) +{ + double espilon = 0.001; + Image2d<bool> out(ima.domain()); // FIXME: generalize, we might not do a binarisation + G temp(start_temp); + + R v_random(0, 1); + R p_random(0., 1.); + + init(ima, out); + + while (temp.value() < epsilon) + { + qiterator p(ima); + + for_all(p) + { + bool v = v_random.get(); + + + u = compute_energy(ima, out(p), p); + up = compute_energy(ima, v, p); + + d_u = abs(up - u); + + proba = ...; + + if (d_u < 0 or (p_random.get() > proba)) + out(p) = v; + } + } + + return out; +} + +#endif /* !MARKOV_HH_ */

1 0

r2874: [Markov] Add temperator generator
by Matthieu Garrigues 14 Nov '08

14 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-14 Matthieu Garrigues <garrigues(a)lrde.epita.fr> [Markov] Add temperator generator. * markov/T_gen.hh: New. --- T_gen.hh | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) Index: branches/cleanup-2008/milena/sandbox/markov/T_gen.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/markov/T_gen.hh (revision 0) +++ branches/cleanup-2008/milena/sandbox/markov/T_gen.hh (revision 2874) @@ -0,0 +1,76 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_TEMPERATURE_GENERATOR_HH +# define MLN_TEMPERATURE_GENERATOR_HH + +class temperature_generator +{ +public: + + temperature_generator(float t0, float alpha) : t_(t0), alpha_(alpha) {} + + operator float() + { + float tmp = t_; + t_ *= alpha_; + return tmp; + } + +private: + float t_; + float alpha_; +}; + +// Example. +// #include <iostream> +// int main() +// { +// temperature_generator temp_gen(100, 0.9); +// float t; + +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// t = temp_gen; +// std::cout << t << std::endl; +// } + +#endif // ! MLN_TEMPERATURE_GENERATOR_HH

1 0

r2873: Create the sandbox for the Markov project
by Maxime van Noppen 14 Nov '08

14 Nov '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2873: Create the sandbox for the Markov project URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-14 Maxime van Noppen <yabo(a)lrde.epita.fr> Create the sandbox for the Markov project. * markov: New. --- 0 files changed

1 0

cleanup-2008 2872: Make morpho erosion generic impl rely on accu transform.
by Thierry Geraud 13 Nov '08

13 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make morpho erosion generic impl rely on accu transform. * mln/set/compute.hh (todo): New. * mln/morpho/erosion.hh (erosion_on_function): Rely on accu transform. * mln/morpho/erosion.spe.hh (erosion_on_function_fastest) Remove; useless since accu::transform is specialized for fastest input. (dispatch for the generic version): Remove; useless. morpho/erosion.hh | 21 +++--------------- morpho/erosion.spe.hh | 58 -------------------------------------------------- set/compute.hh | 5 +++- 3 files changed, 8 insertions(+), 76 deletions(-) Index: mln/set/compute.hh --- mln/set/compute.hh (revision 2871) +++ mln/set/compute.hh (working copy) @@ -30,9 +30,12 @@ /// \file mln/set/compute.hh /// -/// Compute an accumulator on a site set. +/// Compute an accumulator on a site set or a binary image. +/// +/// \todo Add a version with a binary image as input. # include <mln/core/concept/meta_accumulator.hh> +# include <mln/core/concept/image.hh> # include <mln/core/concept/site_set.hh> Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2871) +++ mln/morpho/erosion.spe.hh (working copy) @@ -97,38 +97,6 @@ template <typename I, typename W> mln_concrete(I) - erosion_on_function_fastest(const Image& input_, const Window<W>& win_) - { - trace::entering("morpho::impl::erosion_on_function_fastest"); - - typedef mln_concrete(I) O; - const I& input = exact(input_); - const W& win = exact(win_); - - extension::adjust_fill(input, win, mln_max(mln_value(I))); - - O output; - initialize(output, input); - - mln_pixter(const I) p(input); - mln_pixter(O) o(output); - mln_qixter(const I, W) q(p, win); - accu::min<mln_value(I)> min; - for_all_2(p, o) - { - min.init(); - for_all(q) - min.take(q.val()); - o.val() = min.to_result(); - } - - trace::exiting("morpho::impl::erosion_on_function_fastest"); - - return output; - } - - template <typename I, typename W> - mln_concrete(I) erosion_on_set_fastest(const Image& input_, const Window<W>& win_) { trace::entering("morpho::impl::erosion_on_set_fastest"); @@ -1169,32 +1137,6 @@ namespace internal { - // dispatch for the generic version - - // FIXME: De-activate because when the window is multiple, the access - // win.dp(i), used in dpoints_pixter, is impossible. - - // template <typename I, typename W> - // mln_concrete(I) - // erosion_dispatch_for_generic(trait::image::kind::logic, // On sets. - // trait::image::speed::fastest, - // const I& input, const W& win) - // { - // if (win.is_centered()) - // return impl::erosion_on_set_centered_fastest(input, win); - // else - // return impl::erosion_on_set_fastest(input, win); - // } - - // template <typename I, typename W> - // mln_concrete(I) - // erosion_dispatch_for_generic(trait::image::kind::any, // On functions. - // trait::image::speed::fastest, - // const I& input, const W& win) - // { - // return impl::erosion_on_function_fastest(input, win); - // } - template <typename I, typename W> mln_concrete(I) erosion_dispatch_for_generic(trait::image::kind::logic, // On sets. Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 2871) +++ mln/morpho/erosion.hh (working copy) @@ -34,6 +34,7 @@ /// \brief Morphological erosion. # include <mln/morpho/includes.hh> +# include <mln/accu/transform.hh> // Specializations are in: # include <mln/morpho/erosion.spe.hh> @@ -83,35 +84,21 @@ namespace generic { + // On function. template <typename I, typename W> inline mln_concrete(I) - erosion_on_function(const Image& input_, const Window<W>& win_) + erosion_on_function(const Image& input, const Window<W>& win) { trace::entering("morpho::impl::generic::erosion_on_function"); - const I& input = exact(input_); - const W& win = exact(win_); internal::erosion_tests(input, win); extension::adjust_fill(input, win, mln_max(mln_value(I))); - mln_concrete(I) output; - initialize(output, input); - - accu::min<mln_value(I)> min; - - mln_piter(I) p(input.domain()); - mln_qiter(W) q(win, p); - for_all(p) - { - min.init(); - for_all(q) if (input.has(q)) - min.take(input(q)); - output(p) = min; - } + output = accu::transform(input, accu::meta::min(), win); trace::exiting("morpho::impl::generic::erosion_on_function"); return output;

1 0

cleanup-2008 2871: Update dispatch of level::transform_inplace routine.
by Nicolas Ballas 13 Nov '08

13 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Update dispatch of level::transform_inplace routine. * tests/level/transform_inplace.cc: Add new tests. * doc/technical/designs/properties/values.txt: Fix typos. * mln/level/transform.spe.hh: Minor changes. * mln/level/transform_inplace.hh: Update routine disptach. doc/technical/designs/properties/values.txt | 3 mln/level/transform.spe.hh | 53 ++++--- mln/level/transform_inplace.hh | 195 ++++++++++++++++++++++++++-- tests/level/transform_inplace.cc | 106 +++++++++++++++ 4 files changed, 325 insertions(+), 32 deletions(-) Index: tests/level/transform_inplace.cc --- tests/level/transform_inplace.cc (revision 2870) +++ tests/level/transform_inplace.cc (working copy) @@ -29,8 +29,19 @@ /// /// Tests on mln::level::transform_inplace + +#include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/flat_image.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/sub_image.hh> +#include <mln/core/image/extension_val.hh> + + #include <mln/core/routine/clone.hh> + + #include <mln/fun/v2v/inc.hh> #include <mln/fun/v2v/dec.hh> #include <mln/debug/iota.hh> @@ -38,6 +49,7 @@ #include <mln/level/transform_inplace.hh> #include <mln/level/compare.hh> +#include <mln/fun/p2b/chess.hh> int main() @@ -45,6 +57,9 @@ using namespace mln; const unsigned size = 50; + + // image 2d tests + { image2d<int> ref(size, size); debug::iota(ref); @@ -54,3 +69,94 @@ mln_assertion(ima == ref); } + + /// image 1d test + { + image1d<unsigned short> ref(size); + debug::iota(ref); + + image1d<unsigned short> ima = clone(ref); + level::transform_inplace(ima, fun::v2v::inc<int>()); + level::transform_inplace(ima, fun::v2v::dec<int>()); + + mln_assertion(ima == ref); + } + + + /// image 3d test + { + image3d<unsigned short> ref(size, size, size); + debug::iota(ref); + + image3d<unsigned short> ima = clone(ref); + level::transform_inplace(ima, fun::v2v::inc<int>()); + level::transform_inplace(ima, fun::v2v::dec<int>()); + + mln_assertion(ima == ref); + } + + // flat image test + { + flat_image<short, box2d> ref(5, make::box2d(size, size)); + + flat_image<short, box2d> ima(5, make::box2d(size, size)); + level::transform_inplace(ima, fun::v2v::inc<int>()); + level::transform_inplace(ima, fun::v2v::dec<int>()); + + mln_assertion(ima == ref); + } + + // image if test + { + typedef image2d<unsigned short> I; + typedef image_if<I, fun::p2b::chess> II; + + I ref(size, size); + debug::iota(ref); + II ref_if = ref | fun::p2b::chess(); + + I ima = clone(ref); + II ima_if = ima | fun::p2b::chess(); + + level::transform_inplace(ima_if, fun::v2v::inc<int>()); + level::transform_inplace(ima_if, fun::v2v::dec<int>()); + + mln_assertion(ima_if == ref_if); + } + + // sub_image test + { + typedef image2d<int> I; + typedef sub_image< image2d<int>, box2d > II; + typedef image2d<unsigned short> III; + + I ref(size, size); + debug::iota(ref); + II sub_ref(ref, make::box2d(4,4, 10,10)); + + I ima = clone(ref); + II sub_ima(ima, make::box2d(4,4, 10,10)); + + level::transform_inplace(sub_ima, fun::v2v::inc<int>()); + level::transform_inplace(sub_ima, fun::v2v::dec<int>()); + + mln_assertion(sub_ima == sub_ref); + } + + // extended image test + { + typedef image2d<int> I; + typedef extension_val< image2d<int> > II; + + I ref(size, size); + + I ima = clone(ref); + II extend_ima(ima, 5); + + level::transform_inplace(extend_ima, fun::v2v::inc<int>()); + level::transform_inplace(extend_ima, fun::v2v::dec<int>()); + + mln_assertion(extend_ima == ref); + + } +} Index: doc/technical/designs/properties/values.txt --- doc/technical/designs/properties/values.txt (revision 2870) +++ doc/technical/designs/properties/values.txt (working copy) @@ -18,7 +18,8 @@ | + -- computed -=> Definition: This property indicates if the image value are stored in memory. +=> Definition: This property indicates if the image value. are stored in +memory. - direct: Images store all their values in memory, we can take a reference of the values. Index: mln/level/transform.spe.hh --- mln/level/transform.spe.hh (revision 2870) +++ mln/level/transform.spe.hh (working copy) @@ -85,6 +85,13 @@ template <typename I, typename F> mln_ch_value(I, mln_result(F)) transform(const Image& input_, const Function_v2v<F>& f_); + + template <typename I1, typename I2, typename F> + mln_ch_value(I1, mln_result(F)) + transform(const Image<I1>& input1, + const Image<I2>& input2, + const Function_vv2v<F>& f); + } @@ -262,8 +269,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::undef, - mln::trait::image::quant::any, + transform_dispatch(trait::undef, + trait::image::quant::any, const Image& input, const Function_v2v<F>& f) { return level::impl::generic::transform(input, f); @@ -272,8 +279,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::vw_set::any, - mln::trait::image::quant::any, + transform_dispatch(trait::image::vw_set::any, + trait::image::quant::any, const Image& input, const Function_v2v<F>& f) { return level::impl::generic::transform(input, f); @@ -282,8 +289,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::vw_set::uni, - mln::trait::image::quant::any, + transform_dispatch(trait::image::vw_set::uni, + trait::image::quant::any, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_taken(input, f); @@ -293,8 +300,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::vw_set::any, - mln::trait::image::quant::low, + transform_dispatch(trait::image::vw_set::any, + trait::image::quant::low, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_lowq(input, f); @@ -305,8 +312,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::quant::any, - mln::trait::image::value_access::direct, + transform_dispatch(trait::image::quant::any, + trait::image::value_access::direct, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_fast(input, f); @@ -316,8 +323,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::quant::low, - mln::trait::image::value_access::direct, + transform_dispatch(trait::image::quant::low, + trait::image::value_access::direct, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_fast_lowq(input, f); @@ -328,8 +335,8 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::quant::any, - mln::trait::image::value_access::any, + transform_dispatch(trait::image::quant::any, + trait::image::value_access::any, const Image& input, const Function_v2v<F>& f) { return transform_dispatch(mln_trait_image_vw_set(I)(), @@ -341,7 +348,7 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::value_storage::any, + transform_dispatch(trait::image::value_storage::any, const Image& input, const Function_v2v<F>& f) { return transform_dispatch(mln_trait_image_vw_set(I)(), @@ -352,7 +359,7 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::value_storage::singleton, + transform_dispatch(trait::image::value_storage::singleton, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_singleton(input, f); @@ -361,7 +368,7 @@ template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) - transform_dispatch(mln::trait::image::value_storage::one_block, + transform_dispatch(trait::image::value_storage::one_block, const Image& input_, const Function_v2v<F>& f_) { const I& input = exact(input_); @@ -384,7 +391,9 @@ template <typename I1, typename I2, typename F> mln_ch_value(I1, mln_result(F)) - transform_dispatch_2(trait::image::speed::any, + transform_dispatch_2(trait::image::value_alignement::any, + trait::image::value_alignement::any, + trait::image::speed::any, trait::image::speed::any, const Image<I1>& input1, const Image<I2>& input2, const Function_vv2v<F>& f) @@ -394,7 +403,9 @@ template <typename I1, typename I2, typename F> mln_ch_value(I1, mln_result(F)) - transform_dispatch_2(trait::image::speed::fastest, + transform_dispatch_2(trait::image::value_alignement::with_grid, + trait::image::value_alignement::with_grid, + trait::image::speed::fastest, trait::image::speed::fastest, const Image<I1>& input1, const Image<I2>& input2, const Function_vv2v<F>& f) @@ -421,7 +432,9 @@ transform_dispatch(const Image<I1>& input1, const Image<I2>& input2, const Function_vv2v<F>& f) { - return transform_dispatch_2(mln_trait_image_speed(I1)(), + return transform_dispatch_2(mln_trait_image_value_alignement(I1)(), + mln_trait_image_value_alignement(I2)(), + mln_trait_image_speed(I1)(), mln_trait_image_speed(I2)(), input1, input2, f); } Index: mln/level/transform_inplace.hh --- mln/level/transform_inplace.hh (revision 2870) +++ mln/level/transform_inplace.hh (working copy) @@ -36,6 +36,8 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> +# include <mln/value/set.hh> +# include <mln/value/lut_vec.hh> namespace mln @@ -184,16 +186,82 @@ } // end of namespace mln::level::impl::generic + /// Specialized implementation template <typename I, typename F> void - transform_inplace_fastest(Image& ima_, const Function_v2v<F>& f_) + transform_inplace_lowq(Image& input_, + const Function_v2v<F>& f_) { - trace::entering("level::impl::transform_inplace_fastest"); + trace::entering("level::impl::transform_inplace_lowq"); mlc_is(mln_trait_image_pw_io(I), trait::image::pw_io::read_write)::check(); + I& input = exact(input_); + const F& f = exact(f_); + + level::internal::transform_inplace_tests(input, f); + + value::lut_vec<mln_vset(I), mln_result(F)> + lut(input.values_eligible(), f); + + mln_piter(I) p(input.domain()); + for_all(p) + input(p) = lut(input(p)); + + trace::exiting("level::impl::transform_inplace_lowq"); + } + + template <typename I, typename F> + void + transform_inplace_taken(Image& input_, + const Function_v2v<F>& f_) + { + trace::entering("level::impl::transform_inplace_taken"); + + mlc_is(mln_trait_image_pw_io(I), + trait::image::pw_io::read_write)::check(); + + I& input = exact(input_); + const F& f = exact(f_); + + level::internal::transform_inplace_tests(input, f); + + value::lut_vec<mln_vset(I), mln_result(F)> + lut(input.taken_values(), f); + + mln_piter(I) p(input.domain()); + for_all(p) + input(p) = lut(input(p)); + + trace::exiting("level::impl::transform_inplace_taken"); + } + + + template <typename I, typename F> + void + transform_inplace_singleton(Image& input_, + const Function_v2v<F>& f_) + { + trace::entering("level::impl::transform_inplace_singleton"); + + I& input = exact(input_); + const F& f = exact(f_); + + level::internal::transform_inplace_tests(input, f); + + input.val() = f(input.val()); + + trace::exiting("level::impl::transform_inplace_singleton"); + } + + template <typename I, typename F> + void + transform_inplace_fastest(Image& ima_, const Function_v2v<F>& f_) + { + trace::entering("level::impl::transform_inplace_fastest"); + I& ima = exact(ima_); const F& f = exact(f_); @@ -207,6 +275,29 @@ } + template <typename I, typename F> + void + transform_inplace_fastest_lowq(Image& input_, + const Function_v2v<F>& f_) + { + trace::entering("level::impl::transform_inplace_fastest_lowq"); + + I& input = exact(input_); + const F& f = exact(f_); + + level::internal::transform_inplace_tests(input, f); + + value::lut_vec<mln_vset(I), mln_result(F)> + lut(input.values_eligible(), f); + + mln_pixter(I) pi(input); + for_all(pi) + pi.val() = lut(pi.val()); + + trace::exiting("level::impl::transform_inplace_fastest_lowq"); + } + + template <typename I1, typename I2, typename F> void transform_inplace_fastest(Image<I1>& ima_, const Image<I2>& aux_, @@ -243,9 +334,11 @@ // (ima, f) version. + /// Dispatch on quantization template <typename I, typename F> void - transform_inplace_dispatch(trait::image::speed::any, + transform_inplace_dispatch(trait::image::vw_set::any, + trait::image::quant::any, Image& ima, const Function_v2v<F>& f) { level::impl::generic::transform_inplace(ima, f); @@ -253,7 +346,28 @@ template <typename I, typename F> void - transform_inplace_dispatch(trait::image::speed::fastest, + transform_inplace_dispatch(trait::image::vw_set::uni, + trait::image::quant::any, + Image& ima, const Function_v2v<F>& f) + { + level::impl::transform_inplace_taken(ima, f); + } + + template <typename I, typename F> + void + transform_inplace_dispatch(trait::image::vw_set::any, + trait::image::quant::low, + Image& ima, const Function_v2v<F>& f) + { + level::impl::transform_inplace_lowq(ima, f); + } + + + + /// Dispatch for fast image + template <typename I, typename F> + void + transform_inplace_dispatch_fast(trait::image::quant::any, Image& ima, const Function_v2v<F>& f) { level::impl::transform_inplace_fastest(ima, f); @@ -261,37 +375,96 @@ template <typename I, typename F> void + transform_inplace_dispatch_fast(trait::image::quant::low, + Image& ima, const Function_v2v<F>& f) + { + level::impl::transform_inplace_fastest_lowq(ima, f); + } + + + + + /// Dispatch on value storage + template <typename I, typename F> + void + transform_inplace_dispatch(trait::image::value_storage::any, + trait::image::value_access::any, + Image& ima, const Function_v2v<F>& f) + { + transform_inplace_dispatch(mln_trait_image_vw_set(I)(), + mln_trait_image_quant(I)(), + ima, f); + } + + template <typename I, typename F> + void + transform_inplace_dispatch(trait::image::value_storage::singleton, + trait::image::value_access::any, + Image& ima, const Function_v2v<F>& f) + { + level::impl::transform_inplace_singleton(ima, f); + } + + + template <typename I, typename F> + void + transform_inplace_dispatch(trait::image::value_storage::one_block, + trait::image::value_access::direct, + Image& ima, const Function_v2v<F>& f) + { + transform_inplace_dispatch_fast(mln_trait_image_quant(I)(), + ima, f); + } + + + + + /// First dispatch + template <typename I, typename F> + void transform_inplace_dispatch(Image& ima, const Function_v2v<F>& f) { - transform_inplace_dispatch(mln_trait_image_speed(I)(), + transform_inplace_dispatch(mln_trait_image_value_storage(I)(), + mln_trait_image_value_access(I)(), ima, f); } + + // (ima, aux, f) version. template <typename I1, typename I2, typename F> void - transform_inplace_dispatch(trait::image::speed::any, + transform_inplace_dispatch(trait::image::value_alignement::any, + trait::image::value_alignement::any, + trait::image::speed::any, trait::image::speed::any, - Image<I1>& ima, const Image<I2>& aux, const Function_vv2v<F>& f) + Image<I1>& ima, const Image<I2>& aux, + const Function_vv2v<F>& f) { level::impl::generic::transform_inplace(ima, aux, f); } template <typename I1, typename I2, typename F> void - transform_inplace_dispatch(trait::image::speed::fastest, + transform_inplace_dispatch(trait::image::value_alignement::with_grid, + trait::image::value_alignement::with_grid, trait::image::speed::fastest, - Image<I1>& ima, const Image<I2>& aux, const Function_vv2v<F>& f) + trait::image::speed::fastest, + Image<I1>& ima, const Image<I2>& aux, + const Function_vv2v<F>& f) { level::impl::transform_inplace_fastest(ima, aux, f); } template <typename I1, typename I2, typename F> void - transform_inplace_dispatch(Image<I1>& ima, const Image<I2>& aux, const Function_vv2v<F>& f) + transform_inplace_dispatch(Image<I1>& ima, const Image<I2>& aux, + const Function_vv2v<F>& f) { - transform_inplace_dispatch(mln_trait_image_speed(I1)(), + transform_inplace_dispatch(mln_trait_image_value_alignement(I1)(), + mln_trait_image_value_alignement(I2)(), + mln_trait_image_speed(I1)(), mln_trait_image_speed(I2)(), ima, aux, f); }

1 0

cleanup-2008 2870: Add set compute with an accumulator.
by Thierry Geraud 13 Nov '08

13 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add set compute with an accumulator. * tests/set/compute.cc: New. * tests/set/Makefile.am: Update. * tests/set/diff.cc: Upgrade doc style. Fix clumsy include. * mln/set/compute.hh: New. * mln/set/all.hh: Update. mln/set/all.hh | 11 +++- mln/set/compute.hh | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/set/Makefile.am | 2 tests/set/compute.cc | 44 +++++++++++++++++++ tests/set/diff.cc | 10 ++-- 5 files changed, 170 insertions(+), 9 deletions(-) Index: tests/set/compute.cc --- tests/set/compute.cc (revision 0) +++ tests/set/compute.cc (revision 0) @@ -0,0 +1,44 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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/set/compute.cc +/// +/// Tests on mln::set::compute. + +#include <mln/core/site_set/p_set.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/accu/count.hh> +#include <mln/set/compute.hh> + + +int main() +{ + using namespace mln; + + p_set<point2d> s; + mln_assertion(set::compute(accu::meta::count(), s) == 0); +} Index: tests/set/Makefile.am --- tests/set/Makefile.am (revision 2869) +++ tests/set/Makefile.am (working copy) @@ -3,12 +3,14 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + compute \ diff \ inter \ is_subset_of \ sym_diff \ uni +compute_SOURCES = compute.cc diff_SOURCES = diff.cc inter_SOURCES = inter.cc is_subset_of_SOURCES = is_subset_of.cc Index: tests/set/diff.cc --- tests/set/diff.cc (revision 2869) +++ tests/set/diff.cc (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,13 +26,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/set/diff.cc - * - * \brief Tests on mln::set::diff. - */ +/// \file tests/set/diff.cc +/// +/// Tests on mln::set::diff. #include <mln/core/site_set/p_set.hh> -#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/point2d.hh> #include <mln/set/diff.hh> Index: mln/set/all.hh --- mln/set/all.hh (revision 2869) +++ mln/set/all.hh (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_SET_ALL_HH # define MLN_SET_ALL_HH -/*! \file mln/set/all.hh - * - * \brief File that includes all set-related routines. - */ +/// \file mln/set/all.hh +/// +/// File that includes all set-related routines. namespace mln @@ -42,6 +42,8 @@ } + +# include <mln/set/compute.hh> # include <mln/set/diff.hh> # include <mln/set/inter.hh> # include <mln/set/get.hh> @@ -50,4 +52,5 @@ # include <mln/set/sym_diff.hh> # include <mln/set/uni.hh> + #endif // ! MLN_SET_ALL_HH Index: mln/set/compute.hh --- mln/set/compute.hh (revision 0) +++ mln/set/compute.hh (revision 0) @@ -0,0 +1,112 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_SET_COMPUTE_HH +# define MLN_SET_COMPUTE_HH + +/// \file mln/set/compute.hh +/// +/// Compute an accumulator on a site set. + +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/core/concept/site_set.hh> + + +namespace mln +{ + + namespace set + { + + /*! Compute an accumulator onto the sites of a site set. + * + * \param[in] a An accumulator. + * \param[in] s A site set. + * \return The accumulator result. + */ + template <typename A, typename S> + mln_result(A) + compute(const Accumulator<A>& a, const Site_Set<S>& s); + + + /*! Compute an accumulator onto the sites of a site set. + * + * \param[in] a A meta-accumulator. + * \param[in] s A site set. + * \return The accumulator result. + */ + template <typename A, typename S> + mln_accu_with(A, mln_site(S))::result + compute(const Meta_Accumulator<A>& a, const Site_Set<S>& s); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename A, typename S> + inline + mln_result(A) + compute(const Accumulator<A>& a_, const Site_Set<S>& s_) + { + trace::entering("set::compute"); + + A a = exact(a_); + const S& s = exact(s_); + + mln_piter(S) p(s); + for_all(p) + a.take(p); + + trace::exiting("set::compute"); + return a.to_result(); + } + + template <typename A, typename S> + mln_accu_with(A, mln_site(S))::result + compute(const Meta_Accumulator<A>& a_, const Site_Set<S>& s_) + { + trace::entering("set::compute"); + + mln_accu_with(A, mln_site(S)) a = accu::unmeta(exact(a_), mln_site(S)()); + const S& s = exact(s_); + + mln_piter(S) p(s); + for_all(p) + a.take(p); + + trace::exiting("set::compute"); + return a.to_result(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::set + +} // end of namespace mln + + +#endif // ! MLN_SET_COMPUTE_HH

1 0

Re: [Olena-patches] [Olena] #43: Fix the initialization of all global constants.
by Olena 13 Nov '08

13 Nov '08

#43: Fix the initialization of all global constants. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by lazzara): Fixed in branches/cleanup-2008 with revision #2818 and #2865. The associated test is named "global_vars" and is available in milena/tests. -- Ticket URL: <https://trac.lrde.org/olena/ticket/43#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

cleanup-2008 2869: Update unary logical not.
by Thierry Geraud 13 Nov '08

13 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update unary logical not. * mln/fun/v2b/lnot.hh: New. * mln/fun/v2b/all.hh: Update. * mln/logical/not.hh: Rely on level transform. fun/v2b/all.hh | 19 ++++++-------- fun/v2b/lnot.hh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ logical/not.hh | 70 +++++++++++----------------------------------------- 3 files changed, 99 insertions(+), 65 deletions(-) Index: mln/fun/v2b/all.hh --- mln/fun/v2b/all.hh (revision 2868) +++ mln/fun/v2b/all.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_FUN_V2B_ALL_HH # define MLN_FUN_V2B_ALL_HH -/*! \file mln/fun/v2b/all.hh - * - * \brief File that includes all functions from point to value. - */ +/// \file mln/fun/v2b/all.hh +/// +/// File that includes all functions from value to logic value. namespace mln @@ -40,15 +39,15 @@ namespace fun { - /// Namespace of functions from point to value. - namespace v2b - { - } - } + /// Namespace of functions from value to logic value. + namespace v2b {} } +} +# include <mln/fun/v2b/lnot.hh> # include <mln/fun/v2b/threshold.hh> + #endif // ! MLN_FUN_V2B_ALL_HH Index: mln/fun/v2b/lnot.hh --- mln/fun/v2b/lnot.hh (revision 0) +++ mln/fun/v2b/lnot.hh (revision 0) @@ -0,0 +1,75 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_V2B_LNOT_HH +# define MLN_FUN_V2B_LNOT_HH + +/// \file mln/fun/v2b/lnot.hh +/// +/// Functor that computes "logical not" on a value. + +# include <mln/core/concept/function.hh> + + +namespace mln +{ + + namespace fun + { + + namespace v2b + { + + /// Functor computing logical-not on a value. + template <typename V> + struct lnot : public Function_v2b< lnot<V> > + { + typedef V result; + V operator()(const V& v) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + inline + V + lnot<V>::operator()(const V& v) const + { + return ! v; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::v2b + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_V2B_LNOT_HH Index: mln/logical/not.hh --- mln/logical/not.hh (revision 2868) +++ mln/logical/not.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,18 +29,12 @@ #ifndef MLN_LOGICAL_NOT_HH # define MLN_LOGICAL_NOT_HH -/*! \file mln/logical/not.hh - * - * \brief Point-wise "logical not" of a binary image. - * - * \todo Add static assertion and save one iterator in in-place version. - */ - -# include <mln/core/concept/image.hh> +/// \file mln/logical/not.hh +/// +/// Point-wise "logical not" of a binary image. - -// Specializations are in: -# include <mln/logical/not.spe.hh> +# include <mln/logical/includes.hh> +# include <mln/fun/v2b/lnot.hh> namespace mln @@ -73,58 +68,21 @@ void not_inplace(Image& input); -# ifndef MLN_INCLUDE_ONLY - - namespace impl - { - - namespace generic - { - template <typename I, typename O> - inline - void not_(const I& input, O& output) - { - trace::entering("logical::impl::generic::not_"); - - mln_piter(I) p(input.domain()); - for_all(p) - output(p) = ! input(p); - trace::exiting("logical::impl::generic::not_"); - } - - template <typename I> - inline - void not_inplace(I& inout) - { - trace::entering("logical::impl::generic::not_"); - - mln_piter(I) p(inout.domain()); - for_all(p) - inout(p) = ! inout(p); - - trace::exiting("logical::impl::generic::not_"); - } - } - - } // end of namespace mln::logical::impl - - - // Facades. +# ifndef MLN_INCLUDE_ONLY template <typename I> inline mln_concrete(I) not_(const Image& input) { - trace::entering("logical::not"); + trace::entering("logical::not_"); mln_precondition(exact(input).has_data()); - mln_concrete(I) output; - initialize(output, input); - impl::not_(mln_trait_image_speed(I)(), exact(input), output); + fun::v2b::lnot<mln_value(I)> f; + mln_concrete(I) output = level::transform(input, f); - trace::exiting("logical::not"); + trace::exiting("logical::not_"); return output; } @@ -135,7 +93,9 @@ trace::entering("logical::not_inplace"); mln_precondition(exact(input).has_data()); - impl::not_inplace(mln_trait_image_speed(I)(), exact(input)); + + fun::v2b::lnot<mln_value(I)> f; + level::transform_inplace(input, f); trace::exiting("logical::not_inplace"); }

1 0