Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 2844: Allow some state to be transmitted fom meta cuu to accu.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Allow some state to be transmitted fom meta cuu to accu. * mln/core/concept/meta_accumulator.hh (unmeta): New. * mln/core/concept/object.hh (include): Add metal abort. * mln/metal/abort.hh: Upgrade doc style. * mln/accu/rank.hh: Likewise. (rank::k): New method. (rank::n): New method. (meta::rank): New attributes, resp. k and n. (unmeta): New overload for meta::rank. * mln/accu/transform.hh: Use unmeta. * tests/accu/rank.cc: Augment. * mln/morpho/erosion.spe.hh: Shorten checks in lines dispatch. mln/accu/rank.hh | 44 ++++++++++++++++++++++++++------ mln/accu/transform.hh | 7 ++--- mln/core/concept/meta_accumulator.hh | 41 ++++++++++++++++++++++++++---- mln/core/concept/object.hh | 8 ++--- mln/metal/abort.hh | 7 ++--- mln/morpho/erosion.spe.hh | 47 ++++++++++++++--------------------- tests/accu/rank.cc | 43 ++++++++++++++++++++------------ 7 files changed, 131 insertions(+), 66 deletions(-) Index: tests/accu/rank.cc --- tests/accu/rank.cc (revision 2843) +++ tests/accu/rank.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 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 @@ -25,18 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/rank.cc - * - * \brief Tests on mln::accu::rank. - */ +/// \file tests/accu/rank.cc +/// +/// Tests on mln::accu::rank. #include <mln/accu/rank.hh> #include <mln/value/int_u8.hh> -using namespace mln; + template <typename A> -void fill(Accumulator<A>& accu_) +void fill(mln::Accumulator<A>& accu_) { A& accu = exact(accu_); accu.take(2); @@ -49,45 +48,59 @@ accu.take(5); } + int main() { + using namespace mln; + using value::int_u8; + + { + accu::meta::rank r; + r.k = 4; + r.n = 9; + accu::rank<int_u8> a = accu::unmeta(r, int_u8()); + mln_assertion(a.k() == 4 && a.n() == 9); +// Meta_Accumulator<accu::meta::rank>& R = r; +// accu::unmeta(R, int_u8()); + } + { - accu::rank<value::int_u8> accu(0, 8); + accu::rank<int_u8> accu(0, 8); fill(accu); mln_assertion(accu.to_result() == 1u); } { - accu::rank<value::int_u8> accu(1, 8); + accu::rank<int_u8> accu(1, 8); fill(accu); mln_assertion(accu.to_result() == 2u); } { - accu::rank<value::int_u8> accu(2, 8); + accu::rank<int_u8> accu(2, 8); fill(accu); mln_assertion(accu.to_result() == 2u); } { - accu::rank<value::int_u8> accu(3, 8); + accu::rank<int_u8> accu(3, 8); fill(accu); mln_assertion(accu.to_result() == 3u); } { - accu::rank<value::int_u8> accu(4, 8); + accu::rank<int_u8> accu(4, 8); fill(accu); mln_assertion(accu.to_result() == 4u); } { - accu::rank<value::int_u8> accu(5, 8); + accu::rank<int_u8> accu(5, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } { - accu::rank<value::int_u8> accu(6, 8); + accu::rank<int_u8> accu(6, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } { - accu::rank<value::int_u8> accu(7, 8); + accu::rank<int_u8> accu(7, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } Index: mln/core/concept/meta_accumulator.hh --- mln/core/concept/meta_accumulator.hh (revision 2843) +++ mln/core/concept/meta_accumulator.hh (working copy) @@ -1,4 +1,4 @@ -// 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,10 +28,9 @@ #ifndef MLN_CORE_CONCEPT_META_ACCUMULATOR_HH # define MLN_CORE_CONCEPT_META_ACCUMULATOR_HH -/*! \file mln/core/concept/meta_accumulator.hh - * - * \brief Definition of the concept of mln::Meta_Accumulator. - */ +/// \file mln/core/concept/meta_accumulator.hh +/// +/// Definition of the concept of mln::Meta_Accumulator. # include <mln/core/concept/object.hh> # include <mln/core/concept/accumulator.hh> @@ -83,6 +82,23 @@ }; + namespace accu + { + + // To be specialized when some state (attributes) have to be transfered + // from the meta-accumulator to the accumulator. + // Warning: the first argument has to be an object with the exact type. + template <typename M, typename T> + mln_accu_with(M, T) + unmeta(const M&, T); + + template <typename M, typename T> + void + unmeta(const Meta_Accumulator<M>&, T); // Safety. + + } // end of namespace mln::accu + + # ifndef MLN_INCLUDE_ONLY @@ -93,6 +109,21 @@ // FIXME: Check "with" on E. } + namespace accu + { + + template <typename M, typename T> + inline + mln_accu_with(M, T) + unmeta(const M&, T) + { + mlc_is_a(M, Meta_Accumulator)::check(); + mln_accu_with(M, T) a; + return a; + } + + } // end of namespace mln::accu + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/concept/object.hh --- mln/core/concept/object.hh (revision 2843) +++ mln/core/concept/object.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_CORE_CONCEPT_OBJECT_HH # define MLN_CORE_CONCEPT_OBJECT_HH -/*! \file mln/core/concept/object.hh - * - * \brief Definition of the top Milena class mln::Object. - */ +/// \file mln/core/concept/object.hh +/// +/// Definition of the top Milena class mln::Object. # include <cassert> # include <iostream> @@ -44,6 +43,7 @@ # include <mln/trace/all.hh> // metal +# include <mln/metal/abort.hh> # include <mln/metal/is_a.hh> # include <mln/metal/is_not_a.hh> # include <mln/metal/is.hh> Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 2843) +++ mln/metal/abort.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_METAL_ABORT_HH # define MLN_METAL_ABORT_HH -/*! \file mln/metal/abort.hh - * - * \brief FIXME: Document. - */ +/// \file mln/metal/abort.hh +/// +/// FIXME: Document. # include <mln/metal/bool.hh> Index: mln/accu/transform.hh --- mln/accu/transform.hh (revision 2843) +++ mln/accu/transform.hh (working copy) @@ -148,7 +148,7 @@ template <typename I, typename A, typename W> mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) transform(const Image& input, - const Meta_Accumulator<A>&, + const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform"); @@ -157,9 +157,10 @@ // mln_precondition(exact(win).is_valid()); typedef mln_accu_with(A, mln_value(I)) A_; - A_ a; + A_ a_ = accu::unmeta(exact(a), mln_value(I)()); + mln_ch_value(I, mln_result(A_)) output; - output = internal::transform_dispatch(input, a, win); + output = internal::transform_dispatch(input, a_, win); trace::exiting("accu::transform"); return output; Index: mln/accu/rank.hh --- mln/accu/rank.hh (revision 2843) +++ mln/accu/rank.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 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,13 +28,12 @@ #ifndef MLN_ACCU_RANK_HH # define MLN_ACCU_RANK_HH -/*! \file mln/accu/rank.hh - * - * \brief Define an rank accumulator. - * - * \todo It should be renamed as rank_h since it relies on histogram - * (thus low quantization). - */ +/// \file mln/accu/rank.hh +/// +/// Define an rank accumulator. +/// +/// \todo It should be renamed as rank_h since it relies on histogram +/// (thus low quantization). # include <vector> # include <mln/accu/internal/base.hh> @@ -80,6 +79,12 @@ /// Always true here. bool is_valid() const; + /// Give the rank. + unsigned k() const; + + /// Give the total number of elements. + unsigned n() const; + protected: unsigned k_; // 0 <= k_ < n @@ -116,11 +121,20 @@ { typedef accu::rank<T> ret; }; + unsigned k, n; }; } // end of namespace mln::accu::meta + template <typename T> + rank<T> unmeta(const meta::rank& m, T) + { + rank<T> a(m.k, m.n); + return a; + } + + # ifndef MLN_INCLUDE_ONLY @@ -137,7 +151,21 @@ init(); } + template <typename T> + inline + unsigned + rank<T>::k() const + { + return k_; + } + template <typename T> + inline + unsigned + rank<T>::n() const + { + return n_; + } template <typename T> inline Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2843) +++ mln/morpho/erosion.spe.hh (working copy) @@ -1444,11 +1444,10 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_box, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1456,7 +1455,6 @@ /// \} - /// Handling win::vline2d. /// \{ @@ -1486,11 +1484,10 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_box, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1527,14 +1524,12 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_not(mln_trait_image_kind(I), - mln::trait::image::kind::logic) test_not_logic; - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_not_logic, test_box) temp; - typedef mlc_and(temp, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic)::value + && mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1571,14 +1566,12 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_not(mln_trait_image_kind(I), - mln::trait::image::kind::logic) test_not_logic; - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_not_logic, test_box) temp; - typedef mlc_and(temp, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic)::value + && mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } }

16 years, 2 months

cleanup-2008 2843: Make topological watershed work.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Make topological watershed work. * abraham/tests/core/image/thru_v2w2v.cc: make::image2d -> make::image. * abraham/mln/morpho/topo_wst.hh: fix reversion of tree . * abraham/mln/value/shell.hh: add traits. mln/morpho/topo_wst.hh | 13 +++++++++---- mln/value/shell.hh | 13 ++++++++++++- tests/core/image/thru_v2w2v.cc | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) Index: abraham/tests/core/image/thru_v2w2v.cc --- abraham/tests/core/image/thru_v2w2v.cc (revision 2842) +++ abraham/tests/core/image/thru_v2w2v.cc (working copy) @@ -47,7 +47,7 @@ }; - image2d<double> ima(make::image2d(vs)); + image2d<double> ima(make::image(vs)); thru<mln::fun::v2w2v::cos<double>, image2d<double> > out(ima); double i = 0; Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 2842) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -91,6 +91,7 @@ mln_value(I) min() { return mln_min(mln_value(I)); } mln_value(I) max() { return mln_max(mln_value(I)); } + void revert () { level = max() - level + min(); } }; // struct node @@ -171,15 +172,15 @@ template <class I, class N> topo_wst<I, N>::topo_wst(const Image& i, const Neighborhood<N>& n) - : pima(exact(i)), - nbh(exact(n)), + : nbh(exact(n)), Par_node(exact(i).domain(), exact(i).border()), Par_tree(exact(i).domain(), exact(i).border()), Rnk_tree(exact(i).domain(), exact(i).border()), Rnk_node(exact(i).domain(), exact(i).border()), subtreeRoot(exact(i).domain(), exact(i).border()), nodes(exact(i).domain(), exact(i).border()), - isproc(exact(i).domain(), exact(i).border()) + isproc(exact(i).domain(), exact(i).border()), + pima(exact(i)) { } @@ -227,7 +228,11 @@ BuildComponentTree(); compressTree(); arith::revert_inplace(pima); - arith::revert_inplace(nodes); + // arith::revert_inplace(nodes); + mln_piter(image2d<node>) p (nodes.domain()); + for_all(p) + nodes(p).revert(); + build_euler_tour(); build_minim(); topo_watershed(); Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 2842) +++ abraham/mln/value/shell.hh (working copy) @@ -41,9 +41,20 @@ struct shell; } - // FIXME : traits + namespace trait + { + + template <typename F, typename I> + struct value_< mln::value::shell<F, I> > + : + value_< mln_result(F) > + { + }; + + } // end of namespace trait + namespace value { namespace impl

16 years, 2 months

cleanup-2008 2840: Add FFT to nature.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Add FFT to nature. * nature/fft.cc: New. * nature/nature.cc: Add a FFT test. * nature/opening.cc: . * nature/co_occurence.hh: . * nature/Makefile: Add special rule to use FFTW. * abraham/tests/transform/fft.cc: New. * abraham/tests/transform/fft_.cc: New. * abraham/mln/transform/fft.hh: conversion to milena. mln/morpho/topo_wst.hh | 13 +++++++++---- mln/value/shell.hh | 13 ++++++++++++- tests/core/image/thru_v2w2v.cc | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) Index: abraham/tests/core/image/thru_v2w2v.cc --- abraham/tests/core/image/thru_v2w2v.cc (revision 2842) +++ abraham/tests/core/image/thru_v2w2v.cc (working copy) @@ -47,7 +47,7 @@ }; - image2d<double> ima(make::image2d(vs)); + image2d<double> ima(make::image(vs)); thru<mln::fun::v2w2v::cos<double>, image2d<double> > out(ima); double i = 0; Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 2842) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -91,6 +91,7 @@ mln_value(I) min() { return mln_min(mln_value(I)); } mln_value(I) max() { return mln_max(mln_value(I)); } + void revert () { level = max() - level + min(); } }; // struct node @@ -171,15 +172,15 @@ template <class I, class N> topo_wst<I, N>::topo_wst(const Image& i, const Neighborhood<N>& n) - : pima(exact(i)), - nbh(exact(n)), + : nbh(exact(n)), Par_node(exact(i).domain(), exact(i).border()), Par_tree(exact(i).domain(), exact(i).border()), Rnk_tree(exact(i).domain(), exact(i).border()), Rnk_node(exact(i).domain(), exact(i).border()), subtreeRoot(exact(i).domain(), exact(i).border()), nodes(exact(i).domain(), exact(i).border()), - isproc(exact(i).domain(), exact(i).border()) + isproc(exact(i).domain(), exact(i).border()), + pima(exact(i)) { } @@ -227,7 +228,11 @@ BuildComponentTree(); compressTree(); arith::revert_inplace(pima); - arith::revert_inplace(nodes); + // arith::revert_inplace(nodes); + mln_piter(image2d<node>) p (nodes.domain()); + for_all(p) + nodes(p).revert(); + build_euler_tour(); build_minim(); topo_watershed(); Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 2842) +++ abraham/mln/value/shell.hh (working copy) @@ -41,9 +41,20 @@ struct shell; } - // FIXME : traits + namespace trait + { + + template <typename F, typename I> + struct value_< mln::value::shell<F, I> > + : + value_< mln_result(F) > + { + }; + + } // end of namespace trait + namespace value { namespace impl

16 years, 2 months

scool r127: Handle typedefs

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r127: Handle typedefs URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-11-12 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle typedefs. * pp-cxx/CxxFun.str: Fix pretty print of identifiers. * scl-syn/Declaration.sdf: Add the grammar entry for typedefs. * scoolt/Declaration.str: Traduce the scool typedef into a C++ * typedef. --- pp-cxx/CxxFun.str | 2 +- scl-syn/Declaration.sdf | 10 +++++++--- scoolt/Declaration.str | 12 ++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxFun.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxFun.str (revision 126) +++ branches/scool-ng/src/pp-cxx/CxxFun.str (revision 127) @@ -50,7 +50,7 @@ CxxTopLevelToAbox: CxxTypedef(t, idf) -> - H hs=0 [ H hs=1 [ "typedef" ~<CxxTypeToAbox> t ~S(idf)] ";" ] + H hs=0 [ H hs=1 [ "typedef" ~<CxxTypeToAbox> t ~<CxxIdToAbox> idf] ";" ] CxxArgDefToAbox: (t, idf) -> Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 126) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 127) @@ -91,6 +91,7 @@ where <ClassWhereClauseToCxx(|cqualif, idf, body)> wclause => cxx_code + //////////////////////////////////////////////////////////////////////////////// // Static functions // //////////////////////////////////////////////////////////////////////////////// @@ -99,3 +100,14 @@ StaticClassFunction(idf, params, cqualif, StaticClassBlock(body)) -> cxx_code where <StaticClassFunctionToCxx(|cqualif, idf, params, body)> [] => cxx_code + + + //////////////////////////////////////////////////////////////////////////////// + // Static functions // + //////////////////////////////////////////////////////////////////////////////// + + DeclarationToCxx: + TypeDefinition(tqualif, idf, StaticInitialiser(type)) -> CxxTypedef(cxx_type, cxx_idf) + where + <IdentifierToCxx> idf => cxx_idf + ; <TypeToCxx> type => cxx_type Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 126) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 127) @@ -4,7 +4,7 @@ Lexical Type Statement Expression Class exports - sorts Declaration Block FunctionBlock SimpleDeclaration StaticFunction + sorts Declaration Block FunctionBlock SimpleDeclaration StaticFunction ExpressionInitialiser StaticExpressionInitialiser context-free syntax StaticFunction -> Declaration @@ -17,10 +17,14 @@ "{" StaticStatement* "}" -> StaticBlock {cons("StaticBlock")} "{" StaticClassStatement* "}" -> StaticClassBlock {cons("StaticClassBlock")} - "=" Expression -> Initialiser {cons("Initialiser")} + "=" Expression -> ExpressionInitialiser {cons("Initialiser")} + "=" StaticExpression -> StaticExpressionInitialiser {cons("StaticInitialiser")} - SimpleQualifier? Identifier ":" SimpleType Initialiser? ";" -> SimpleDeclaration {cons("SimpleDeclaration")} + SimpleQualifier? Identifier ":" SimpleType ExpressionInitialiser? ";" -> SimpleDeclaration {cons("SimpleDeclaration")} + + SimpleQualifier? Identifier ":" "type" ";" -> SimpleDeclaration {cons("TypeDeclaration")} + SimpleQualifier? Identifier ":" "type" StaticExpressionInitialiser ";" -> SimpleDeclaration {cons("TypeDefinition")} FunctionQualifier? Identifier ":" FunctionType ";" -> Declaration {cons("FunctionDeclaration")}

16 years, 2 months

scool r126: Add reference files for tests on typedefs and fix tests

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r126: Add reference files for tests on typedefs and fix tests URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-11-12 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on typedefs and fix tests. * class/c++_ast/typedef_001.aterm: New. * class/c++_build/typedef_001.g++: New. * class/c++_src/typedef_001.cc: New. * variable/c++_build/declaration_001.g++: New. * variable/c++_build/declaration_005.g++: New. * variable/c++_build/declaration_007.g++: New. * variable/c++_build/declaration_008.g++: New. * class/scool_ast/typedef_001.aterm: New. * class/scool_src/typedef_001.scl:, * variable/c++_ast/declaration_001.aterm:, * variable/c++_ast/declaration_005.aterm:, * variable/c++_ast/declaration_007.aterm:, * variable/c++_ast/declaration_008.aterm:, * variable/c++_src/declaration_001.cc:, * variable/c++_src/declaration_005.cc:, * variable/c++_src/declaration_007.cc:, * variable/c++_src/declaration_008.cc:, * variable/scool_ast/declaration_001.aterm:, * variable/scool_ast/declaration_005.aterm:, * variable/scool_ast/declaration_007.aterm:, * variable/scool_ast/declaration_008.aterm:, * variable/scool_src/declaration_001.scl:, * variable/scool_src/declaration_005.scl:, * variable/scool_src/declaration_007.scl:, * variable/scool_src/declaration_008.scl: Here. --- class/c++_ast/typedef_001.aterm | 1 + class/c++_src/typedef_001.cc | 6 ++++++ class/scool_ast/typedef_001.aterm | 1 + class/scool_src/typedef_001.scl | 3 +++ variable/c++_ast/declaration_001.aterm | 2 +- variable/c++_ast/declaration_005.aterm | 2 +- variable/c++_ast/declaration_007.aterm | 2 +- variable/c++_ast/declaration_008.aterm | 2 +- variable/c++_src/declaration_001.cc | 2 +- variable/c++_src/declaration_005.cc | 4 ++++ variable/c++_src/declaration_007.cc | 3 ++- variable/c++_src/declaration_008.cc | 1 + variable/scool_ast/declaration_001.aterm | 2 +- variable/scool_ast/declaration_005.aterm | 2 +- variable/scool_ast/declaration_007.aterm | 2 +- variable/scool_ast/declaration_008.aterm | 2 +- variable/scool_src/declaration_001.scl | 2 +- variable/scool_src/declaration_005.scl | 6 ++++++ variable/scool_src/declaration_007.scl | 3 ++- variable/scool_src/declaration_008.scl | 1 + 20 files changed, 37 insertions(+), 12 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/typedef_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/typedef_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/typedef_001.aterm (revision 126) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("foo"),[],[CxxPublic([CxxTypedef(CxxType("int"),CxxId("new_type"))])])]) Index: branches/scool-ng/tests/class/c++_src/typedef_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/typedef_001.cc (revision 0) +++ branches/scool-ng/tests/class/c++_src/typedef_001.cc (revision 126) @@ -0,0 +1,6 @@ +template < typename Exact > +class foo +{ + public: + typedef int new_type; +}; Index: branches/scool-ng/tests/class/scool_ast/typedef_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/typedef_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/typedef_001.aterm (revision 126) @@ -0,0 +1 @@ +Program([ClassDefinition(Identifier("foo"),None,None,ClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("new_type"),StaticInitialiser(SimpleType("int")))])]))]) Index: branches/scool-ng/tests/class/scool_src/typedef_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/typedef_001.scl (revision 125) +++ branches/scool-ng/tests/class/scool_src/typedef_001.scl (revision 126) @@ -1,4 +1,7 @@ foo : class = { + public + { new_type: type = int; } +} Index: branches/scool-ng/tests/class/c++_build/typedef_001.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxType(CxxId("list"),[CxxType("int")]),CxxId("l"))]) +CxxProgram([CxxProgram("#include <list>\n\nusing std::list;\n"),CxxDecl(CxxType(CxxId("list"),[CxxType("int")]),CxxId("l"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42")),CxxDecl(CxxConstType(CxxType("int")),CxxId("j"),CxxInt("51"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxType("int"),CxxId("i"),CxxId("j"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("j"),CxxInt("42")),CxxDecl(CxxType("int"),CxxId("i"),CxxId("j"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42"))]) Index: branches/scool-ng/tests/variable/c++_src/declaration_007.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 126) @@ -1 +1,2 @@ -const int i; +const int i = 42; +const int j = 51; Index: branches/scool-ng/tests/variable/c++_src/declaration_008.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_008.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_008.cc (revision 126) @@ -1 +1,2 @@ +const int j = 42; int i = j; Index: branches/scool-ng/tests/variable/c++_src/declaration_001.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 126) @@ -1 +1 @@ -const int i; +const int i = 42; Index: branches/scool-ng/tests/variable/c++_src/declaration_005.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_005.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_005.cc (revision 126) @@ -1 +1,5 @@ +#include <list> + +using std::list; + list< int > l; Index: branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),Parameters([SimpleType("int")])),None)]) +Program([Cxx("#include <list>\n\nusing std::list;\n"),SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),Parameters([SimpleType("int")])),None)]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),None)]) +Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("42")))),SimpleDeclaration(None,Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("51"))))]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(Some("var"),Identifier("i"),SimpleType("int"),Some(Initialiser(Identifier("j"))))]) +Program([SimpleDeclaration(None,Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("42")))),SimpleDeclaration(Some("var"),Identifier("i"),SimpleType("int"),Some(Initialiser(Identifier("j"))))]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),None)]) +Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("42"))))]) Index: branches/scool-ng/tests/variable/scool_src/declaration_001.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_001.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_001.scl (revision 126) @@ -1 +1 @@ -i : int; +i : int = 42; Index: branches/scool-ng/tests/variable/scool_src/declaration_005.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_005.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_005.scl (revision 126) @@ -1 +1,7 @@ +|[ +#include <list> + +using std::list; +]| + var l : list[int]; Index: branches/scool-ng/tests/variable/scool_src/declaration_007.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_007.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_007.scl (revision 126) @@ -1 +1,2 @@ -i : int ; +i : int = 42; +j : int = 51; Index: branches/scool-ng/tests/variable/scool_src/declaration_008.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_008.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_008.scl (revision 126) @@ -1 +1,2 @@ +j : int = 42; var i : int = j; Index: branches/scool-ng/tests/variable/c++_build/declaration_001.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_005.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_007.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_008.g++ ===================================================================

16 years, 2 months

cleanup-2008 2842: Update labeling routines to modern conventions.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update labeling routines to modern conventions. * mln/morpho/erosion.spe.hh (erosion_dispatch_wrt_win): Add check over win simplicity. * mln/labeling/flat_zones.hh, * mln/labeling/level.hh, * mln/labeling/foreground.hh, * mln/labeling/regional_minima.hh, * mln/labeling/regional_maxima.hh, * mln/labeling/compute.hh, * mln/labeling/level.spe.hh, * mln/labeling/background.hh: Partial update w.r.t. routine naming and style. * mln/labeling/all.hh (todo): New. labeling/all.hh | 13 ++++---- labeling/background.hh | 26 ++++++++--------- labeling/compute.hh | 11 +++---- labeling/flat_zones.hh | 21 ++++++------- labeling/foreground.hh | 26 ++++++++--------- labeling/level.hh | 67 ++++++++++++++++++++++++++++++++++++-------- labeling/level.spe.hh | 42 +++++++-------------------- labeling/regional_maxima.hh | 14 ++++----- labeling/regional_minima.hh | 14 ++++----- morpho/erosion.spe.hh | 4 ++ 10 files changed, 133 insertions(+), 105 deletions(-) Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2841) +++ mln/morpho/erosion.spe.hh (working copy) @@ -58,6 +58,8 @@ /// /// \todo Warning: we should also have the "arbitrary" versions working /// on sets (not only on functions!) +/// +/// \todo HERE Factor dispatch for lines... # ifndef MLN_INCLUDE_ONLY @@ -1384,6 +1386,8 @@ && mlc_is_a(mln_site(I), Gpoint)::value && + mln_is_simple_window(W)::value + && mlc_not_equal(mln_trait_image_value_storage(I), trait::image::value_storage::disrupted)::value }; return erosion_dispatch_wrt_arbitrary_win(metal::bool_<test>(), Index: mln/labeling/flat_zones.hh --- mln/labeling/flat_zones.hh (revision 2841) +++ mln/labeling/flat_zones.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_LABELING_FLAT_ZONES_HH # define MLN_LABELING_FLAT_ZONES_HH -/*! \file mln/labeling/flat_zones.hh - * - * \brief Connected component labeling of the flat zones of an image. - */ +/// \file mln/labeling/flat_zones.hh +/// +/// Connected component labeling of the flat zones of an image. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -93,7 +92,7 @@ // end of requirements - flat_zones_functor(const I_& input, const N_& nbh) + flat_zones_functor(const I& input, const N& nbh) : input(input), nbh(nbh), s(input.domain()) @@ -108,16 +107,16 @@ template <typename I, typename N, typename L> mln_ch_value(I, L) - flat_zones_(const I& input, const N& nbh, L& nlabels) + flat_zones(const Image& input, const Neighborhood<N>& nbh, L& nlabels) { - trace::entering("labeling::impl::generic::flat_zones_"); + trace::entering("labeling::impl::generic::flat_zones"); typedef flat_zones_functor<I,N,L> F; - F f(input, nbh); + F f(exact(input), exact(nbh)); canvas::labeling<F> run(f); nlabels = run.nlabels; - trace::exiting("labeling::impl::generic::flat_zones_"); + trace::exiting("labeling::impl::generic::flat_zones"); return run.output; } @@ -136,13 +135,13 @@ L& nlabels) { trace::entering("labeling::flat_zones"); + const I& input = exact(input_); const N& nbh = exact(nbh_); mln_precondition(input.has_data()); // Calls the only (generic) impl. - mln_ch_value(I, L) output = - impl::generic::flat_zones_(input, nbh, nlabels); + mln_ch_value(I, L) output = impl::generic::flat_zones(input, nbh, nlabels); trace::exiting("labeling::flat_zones"); return output; Index: mln/labeling/level.hh --- mln/labeling/level.hh (revision 2841) +++ mln/labeling/level.hh (working copy) @@ -67,6 +67,32 @@ # ifndef MLN_INCLUDE_ONLY + + // Tests. + + namespace internal + { + + template <typename I, typename N, typename L> + void + level_tests(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + L& nlabels) + { + mln_precondition(exact(input).has_data()); + // mln_precondition(exact(nbh).is_valid()); + + (void) input; + (void) val; + (void) nbh; + (void) nlabels; + } + + } // end of namespace mln::labeling::internal + + + + // Generic implementation. + namespace impl { @@ -101,7 +127,7 @@ const mln_value(I_)& val; - level_functor(const I_& input, const mln_value(I_)& val, const N_& nbh) + level_functor(const I& input, const mln_value(I)& val, const N& nbh) : input(input), nbh(nbh), s(input.domain()), @@ -117,19 +143,22 @@ template <typename I, typename N, typename L> mln_ch_value(I, L) - level_(const I& input, const mln_value(I)& val, const N& nbh, + level(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels) { - trace::entering("labeling::impl::generic::level_"); + trace::entering("labeling::impl::generic::level"); + + internal::level_tests(input, val, nbh, nlabels); typedef level_functor<I,N,L> F; - F f(input, val, nbh); + F f(exact(input), val, exact(nbh)); canvas::labeling<F> run(f); nlabels = run.nlabels; // FIXME: Handle run.status - trace::exiting("labeling::impl::generic::level_"); + trace::exiting("labeling::impl::generic::level"); return run.output; } @@ -139,20 +168,36 @@ } // end of namespace mln::labeling::impl + // Dispatch. + + namespace internal + { + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + level_dispatch(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + L& nlabels) + { + return impl::generic::level(input, val, nbh, nlabels); + } + + } // end of namespace mln::labeling::internal + + // Facade. template <typename I, typename N, typename L> mln_ch_value(I, L) - level(const Image& input, const mln_value(I)& val, - const Neighborhood<N>& nbh, L& nlabels) + level(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + L& nlabels) { trace::entering("labeling::level"); - mln_precondition(exact(input).has_data()); - mln_ch_value(I, L) output = - impl::level_(mln_trait_image_speed(I)(), - exact(input), val, exact(nbh), nlabels); + internal::level_tests(input, val, nbh, nlabels); + + mln_ch_value(I, L) output; + output = internal::level_dispatch(input, val, nbh, nlabels); trace::exiting("labeling::level"); return output; Index: mln/labeling/all.hh --- mln/labeling/all.hh (revision 2841) +++ mln/labeling/all.hh (working copy) @@ -28,10 +28,12 @@ #ifndef MLN_LABELING_ALL_HH # define MLN_LABELING_ALL_HH -/*! \file mln/labeling/all.hh - * - * \brief File that includes all labeling routines. - */ +/// \file mln/labeling/all.hh +/// +/// File that includes all labeling routines. +/// +/// \todo Many files in this directory have to be updated with the +/// test and dispatch mechanisms. namespace mln @@ -47,9 +49,7 @@ namespace generic {} } - } - } # include <mln/labeling/background.hh> @@ -61,4 +61,5 @@ # include <mln/labeling/regional_maxima.hh> # include <mln/labeling/regional_minima.hh> + #endif // ! MLN_LABELING_ALL_HH Index: mln/labeling/foreground.hh --- mln/labeling/foreground.hh (revision 2841) +++ mln/labeling/foreground.hh (working copy) @@ -29,11 +29,10 @@ #ifndef MLN_LABELING_FOREGROUND_HH # define MLN_LABELING_FOREGROUND_HH -/*! \file mln/labeling/foreground.hh - * - * \brief Connected component labeling of the object part in a binary - * image. - */ +/// \file mln/labeling/foreground.hh +/// +/// Connected component labeling of the object part in a binary +/// image. # include <mln/labeling/level.hh> @@ -59,27 +58,28 @@ * * \see mln::labeling::level */ - template <typename I, typename N> - mln_ch_value(I, unsigned) + template <typename I, typename N, typename L> + mln_ch_value(I, L) foreground(const Image& input, const Neighborhood<N>& nbh, - unsigned& nlabels); + L& nlabels); # ifndef MLN_INCLUDE_ONLY - template <typename I, typename N> + template <typename I, typename N, typename L> inline - mln_ch_value(I, unsigned) + mln_ch_value(I, L) foreground(const Image& input, const Neighborhood<N>& nbh, - unsigned& nlabels) + L& nlabels) { trace::entering("labeling::foreground"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); mln_precondition(exact(input).has_data()); + // mln_precondition(exact(nbh).is_valid()); - mln_ch_value(I, unsigned) output = - labeling::level(input, true, nbh, nlabels); + mln_ch_value(I, L) output = labeling::level(input, true, nbh, nlabels); trace::exiting("labeling::foreground"); return output; Index: mln/labeling/regional_minima.hh --- mln/labeling/regional_minima.hh (revision 2841) +++ mln/labeling/regional_minima.hh (working copy) @@ -30,8 +30,8 @@ # define MLN_LABELING_REGIONAL_MINIMA_HH /// \file mln/labeling/regional_minima.hh -/// \brief Connected component labeling of the regional minima of an -/// image. +/// +/// Connected component labeling of the regional minima of an image. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -124,9 +124,9 @@ template <typename I, typename N, typename L> mln_ch_value(I, L) - regional_minima_(const I& input, const N& nbh, L& nlabels) + regional_minima(const I& input, const N& nbh, L& nlabels) { - trace::entering("labeling::impl::generic::regional_minima_"); + trace::entering("labeling::impl::generic::regional_minima"); // FIXME: abort if L is not wide enough to encode the set of // minima. @@ -136,7 +136,7 @@ canvas::labeling<F> run(f); nlabels = run.nlabels; - trace::exiting("labeling::impl::generic::regional_minima_"); + trace::exiting("labeling::impl::generic::regional_minima"); return run.output; } @@ -155,13 +155,13 @@ L& nlabels) { trace::entering("labeling::regional_minima"); + const I& input = exact(input_); const N& nbh = exact(nbh_); mln_precondition(input.has_data()); // Calls the only (generic) impl. - mln_ch_value(I, L) output = - impl::generic::regional_minima_(input, nbh, nlabels); + mln_ch_value(I, L) output = impl::generic::regional_minima(input, nbh, nlabels); trace::exiting("labeling::regional_minima"); return output; Index: mln/labeling/regional_maxima.hh --- mln/labeling/regional_maxima.hh (revision 2841) +++ mln/labeling/regional_maxima.hh (working copy) @@ -30,8 +30,8 @@ # define MLN_LABELING_REGIONAL_MAXIMA_HH /// \file mln/labeling/regional_maxima.hh -/// \brief Connected component labeling of the regional maxima of an -/// image. +/// +/// Connected component labeling of the regional maxima of an image. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -118,10 +118,10 @@ template <typename I, typename N, typename L> mln_ch_value(I, L) - regional_maxima_(const I& input, const N& nbh, + regional_maxima(const I& input, const N& nbh, L& nlabels) { - trace::entering("labeling::impl::generic::regional_maxima_"); + trace::entering("labeling::impl::generic::regional_maxima"); // FIXME: abort if L is not wide enough to encode the set of // maxima. @@ -131,7 +131,7 @@ canvas::labeling<F> run(f); nlabels = run.nlabels; - trace::exiting("labeling::impl::generic::regional_maxima_"); + trace::exiting("labeling::impl::generic::regional_maxima"); return run.output; } @@ -150,13 +150,13 @@ L& nlabels) { trace::entering("labeling::regional_maxima"); + const I& input = exact(input_); const N& nbh = exact(nbh_); mln_precondition(input.has_data()); // Calls the only (generic) impl. - mln_ch_value(I, L) output = - impl::generic::regional_maxima_(input, nbh, nlabels); + mln_ch_value(I, L) output = impl::generic::regional_maxima(input, nbh, nlabels); trace::exiting("labeling::regional_maxima"); return output; Index: mln/labeling/compute.hh --- mln/labeling/compute.hh (revision 2841) +++ mln/labeling/compute.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,11 +28,10 @@ #ifndef MLN_LABELING_COMPUTE_HH # define MLN_LABELING_COMPUTE_HH -/*! \file mln/labeling/compute.hh - * - * \brief Compute accumulators onto sites/values of each labeled component - * of an image. - */ +/// \file mln/labeling/compute.hh +/// +/// Compute accumulators onto sites/values of each labeled component +/// of an image. # include <mln/core/concept/meta_accumulator.hh> # include <mln/util/array.hh> Index: mln/labeling/level.spe.hh --- mln/labeling/level.spe.hh (revision 2841) +++ mln/labeling/level.spe.hh (working copy) @@ -39,8 +39,7 @@ # error "Forbidden inclusion of *.spe.hh" # endif // ! MLN_LABELING_LEVEL_HH -# include <mln/border/adjust.hh> -# include <mln/border/fill.hh> +# include <mln/extension/adjust_fill.hh> # include <mln/value/other.hh> @@ -78,7 +77,8 @@ template <typename I, typename N, typename L> mln_ch_value(I, L) - level_(const I& input, const mln_value(I)& val, const N& nbh, + level(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels); } // end of namespace mln::labeling::impl::generic @@ -124,17 +124,19 @@ }; - // Fastest routine. + // Fastest implementation. template <typename I, typename N, typename L> mln_ch_value(I, L) - level_fastest_(const I& input, const mln_value(I)& val, const N& nbh, + level_fastest(const Image& input, const mln_value(I)& val, + const Neighborhood<N>& nbh, L& nlabels) { - trace::entering("labeling::impl::level_fastest_"); + trace::entering("labeling::impl::level_fastest"); + + // FIXME: HERE - border::adjust(input, nbh.delta()); - border::fill(input, value::other(val)); + extension::adjust_fill(input, nbh.delta(), value::other(val)); typedef level_fastest_functor<I,N,L> F; F f(input, val, nbh); @@ -143,32 +145,10 @@ nlabels = run.nlabels; // FIXME: Handle run.status - trace::exiting("labeling::impl::level_fastest_"); + trace::exiting("labeling::impl::level_fastest"); return run.output; } - - // Disjunction between "fastest" and "not fastest". - - template <typename I, typename N, typename L> - mln_ch_value(I, L) - level_(trait::image::speed::any, - const I& input, const mln_value(I)& val, const N& nbh, - L& nlabels) - { - return generic::level_(input, val, nbh, nlabels); - } - -// template <typename I, typename N, typename L> -// mln_ch_value(I, L) -// level_(trait::image::speed::fastest, -// const I& input, const mln_value(I)& val, const N& nbh, -// L& nlabels) -// { -// return level_fastest_(input, val, nbh, nlabels); -// } - - } // end of namespace mln::labeling::impl Index: mln/labeling/background.hh --- mln/labeling/background.hh (revision 2841) +++ mln/labeling/background.hh (working copy) @@ -29,11 +29,10 @@ #ifndef MLN_LABELING_BACKGROUND_HH # define MLN_LABELING_BACKGROUND_HH -/*! \file mln/labeling/background.hh - * - * \brief Connected component labeling of the background in a binary - * image. - */ +/// \file mln/labeling/background.hh +/// +/// Connected component labeling of the background in a binary +/// image. # include <mln/labeling/level.hh> @@ -59,27 +58,28 @@ * * \see mln::labeling::level */ - template <typename I, typename N> - mln_ch_value(I, unsigned) + template <typename I, typename N, typename L> + mln_ch_value(I, L) background(const Image& input, const Neighborhood<N>& nbh, - unsigned& nlabels); + L& nlabels); # ifndef MLN_INCLUDE_ONLY - template <typename I, typename N> + template <typename I, typename N, typename L> inline - mln_ch_value(I, unsigned) + mln_ch_value(I, L) background(const Image& input, const Neighborhood<N>& nbh, - unsigned& nlabels) + L& nlabels) { trace::entering("labeling::background"); + mlc_equal(mln_trait_image_kind(I), mln::trait::image::kind::binary)::check(); mln_precondition(exact(input).has_data()); + // mln_precondition(exact(nbh).is_valid()); - mln_ch_value(I, unsigned) output = - labeling::level(input, false, nbh, nlabels); + mln_ch_value(I, L) output = labeling::level(input, false, nbh, nlabels); trace::exiting("labeling::background"); return output;

16 years, 2 months

cleanup-2008 2841: Fix conversion problems in linear::gaussian.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Fix conversion problems in linear::gaussian. * tests/linear/gaussian.cc: Update tests. * mln/linear/gaussian.hh: Fix conversion issues. * doc/tutorial/design/include/imagetours.tex: Update documentation. doc/tutorial/design/include/imagetours.tex | 17 +++----- mln/linear/gaussian.hh | 61 +++++++++++++++++++++++++---- tests/linear/gaussian.cc | 7 +++ 3 files changed, 68 insertions(+), 17 deletions(-) Index: tests/linear/gaussian.cc --- tests/linear/gaussian.cc (revision 2840) +++ tests/linear/gaussian.cc (working copy) @@ -38,6 +38,7 @@ #include <mln/io/pgm/save.hh> #include <mln/level/transform.hh> +#include <mln/level/paste.hh> #include <mln/math/round.hh> #include <mln/linear/gaussian.hh> @@ -57,4 +58,10 @@ image2d<value::int_u8> out = linear::gaussian(lena, 5.1f); io::pgm::save(out, "out.pgm"); + + + image2d<float> lenaf(lena.domain()); + level::paste(lena, lenaf); + + image2d<float> outf = linear::gaussian(lenaf, 5.1f); } Index: doc/tutorial/design/include/imagetours.tex --- doc/tutorial/design/include/imagetours.tex (revision 2840) +++ doc/tutorial/design/include/imagetours.tex (working copy) @@ -34,16 +34,15 @@ In the Milena library, an image can be seen as an application $site$ to $value$. A $site$ is a localized object in space. -Points in $1D$, $2D$ or $3D$, are the sites objects commonly used in the +Points $1D$, $2D$ or $3D$ are the sites objects commonly used in the library. -However, the $site$ concept allows Milena to deal with complicated image type -(for instance see the \verb+graph_image+ type). +%%However, the $site$ concept allows Milena to deal with complicated image type +%%(for instance see the \verb+graph_image+ type). -So, an image is composed by a set of localized objects, $sites$, that -compose the definition domain of the image. +An image is composed by a set of localized objects ($sites$): the definition domain of the image. A value is associated to each site of the image. This is the destination domain of the image. -To access to a value of an image named $ima$ localized at the point p, we +To access to a value localized at the site p in an image named $ima$, we just use the mathematics notation: \verb+ima(p)+. Obviously, every image types of Milena provide an access $site$ to $value$, @@ -65,11 +64,11 @@ In this document, we will used the following naming convention for the image types parameters: \begin{itemize} -\item{\verb+T+:} represents an image value type. -\item{\verb+S+:} represents a type of a $sites$ set. +\item{\verb+T+:} represents an image $value$ type. +\item{\verb+S+:} represents a type of a $sites$ $set$ type. \item{\verb+F+:} is a type of a function $site$ to $value$. \item{\verb+P+:} represents a $site$ type. -\item{\verb+I+:} represents an image type. +\item{\verb+I+:} represents an $image$ type. \end{itemize} \subsection{Primary images} Index: mln/linear/gaussian.hh --- mln/linear/gaussian.hh (revision 2840) +++ mln/linear/gaussian.hh (working copy) @@ -470,7 +470,7 @@ template <class I, class F, class O> inline void - generic_filter_common_(trait::value::nature::scalar, + generic_filter_common_(trait::value::nature::floating, const Image& in, const F& coef, float sigma, @@ -487,15 +487,14 @@ generic_filter_(mln_trait_image_dimension(I)(), work_img, coef, i); - // FIXME deal with overflow problem - // for instance, when we paste a float image into a int_u8 images. + // We don't need to convert work_img level::paste(work_img, out); } template <class I, class F, class O> inline void - generic_filter_common_(trait::value::nature::scalar, + generic_filter_common_(trait::value::nature::floating, const Image& in, const F& coef, float sigma, @@ -512,12 +511,60 @@ generic_filter_(mln_trait_image_dimension(I)(), work_img, coef, dir); - // FIXME deal with overflow problem - // for instance, when we paste a float image into a int_u8 images. + // We don't need to convert work_img level::paste(work_img, out); } + template <class I, class F, class O> + inline + void + generic_filter_common_(trait::value::nature::scalar, + const Image& in, + const F& coef, + float sigma, + Image<O>& out) + { + mln_ch_value(O, float) work_img(exact(in).domain()); + level::paste(in, work_img); + extension::adjust_fill(work_img, 4, 0); + + // On tiny sigma, Derich algorithm doesn't work. + // It is the same thing that to convolve with a Dirac. + if (sigma > 0.006) + for (int i = 0; i < I::site::dim; ++i) + generic_filter_(mln_trait_image_dimension(I)(), + work_img, coef, i); + + // Convert work_img into result type + level::paste(level::stretch(mln_value(I)(), work_img), out); + } + + template <class I, class F, class O> + inline + void + generic_filter_common_(trait::value::nature::scalar, + const Image& in, + const F& coef, + float sigma, + Image<O>& out, + int dir) + { + mln_ch_value(O, float) work_img(exact(in).domain()); + level::paste(in, work_img); + extension::adjust_fill(work_img, 4, 0); + + // On tiny sigma, Derich algorithm doesn't work. + // It is the same thing that to convolve with a Dirac. + if (sigma > 0.006) + generic_filter_(mln_trait_image_dimension(I)(), + work_img, coef, dir); + + // Convert work_img into result type + level::paste(level::stretch(mln_value(I)(), work_img), out); + } + + template <class I, class F, class O> inline @@ -565,10 +612,8 @@ } // end of namespace mln::linear::impl - // Facade. - /*! Apply an approximated gaussian filter of \p sigma on \p input. * on a specific direction \p dir * if \p dir = 0, the filter is applied on the first image dimension.

16 years, 2 months

cleanup-2008 2839: INIM: Classif: Final Upgrade.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <jardonnet(a)lrde.epita.fr> INIM: Classif: Final Upgrade. * inim/classif/src/max_tree.hh: Fix comment. * inim/classif/src/proj.hh: Add specific projection. * inim/classif/src/v2.cc: Add efficient technique based histo value merging. max_tree.hh | 7 +++++-- proj.hh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- v2.cc | 50 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 91 insertions(+), 24 deletions(-) Index: inim/classif/src/max_tree.hh --- inim/classif/src/max_tree.hh (revision 2838) +++ inim/classif/src/max_tree.hh (working copy) @@ -153,6 +153,7 @@ return mean_color; } + // Filter method template<typename X> void lumberjack(const X& ima, const mln_value(X)& lambda) { @@ -177,8 +178,9 @@ std::cout << std::endl; } + // Fusion method template<typename X> - void nuclear_fusion(const X& ima, const mln_value(X)& lambda) + void nuclear_fusion(const X& ima, double lambda) { unsigned progress = 0; unsigned step = s.nsites() / 100; @@ -188,7 +190,8 @@ mln_fwd_piter(S) p(s); for_all(p) { - if (fabs(1 - ima(new_parent(p)) / ima(p)) < lambda) + if (ima(p) != 0) + if (fabs(1. - ima(new_parent(p)) / (double) ima(p)) < lambda) is_active(p) = false; ++progress; Index: inim/classif/src/display.hh Index: inim/classif/src/proj.hh --- inim/classif/src/proj.hh (revision 2838) +++ inim/classif/src/proj.hh (working copy) @@ -35,6 +35,7 @@ #include <mln/accu/maj_h.hh> #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/make/vec.hh> namespace mln { @@ -59,11 +60,11 @@ save_class(const image3d<T>& histo, const image3d& ws, K mean, const char * fn) { - accu::maj_h<value::int_u8> max_1; - image2d<value::int_u8> hproj = proj(histo, max_1); + accu::maj_h<value::int_u8> maj_1; + image2d<value::int_u8> hproj = proj(histo, maj_1); - accu::maj_h<value::int_u8> max_2; - image2d<value::int_u8> proj_class = proj(ws, max_2); + accu::maj_h<value::int_u8> maj_2; + image2d<value::int_u8> proj_class = proj(ws, maj_2); //std::cout << histo; @@ -82,6 +83,55 @@ io::ppm::save(out, fn); } + template <typename T, typename I, typename A> + image2d<mln_result(A)> + proj_vec(const image3d<T>& input, const I& histo, A) + { + image2d<A> acc(geom::nslis(input), geom::nrows(input)); + mln_piter(image3d<T>) p(input.domain()); + for_all(p) // 3d + if (histo(p) != literal::zero) + acc.at(p.sli(), p.row()).take(input(p)); + + image2d<mln_result(A)> output(acc.domain()); + level::paste(acc, output); + return output; + } + + template <typename I, typename T, typename U, typename V> + void + save_class_v2(const I& ima, const T& histo, image3d& mean, + const image3d<V>& parent, unsigned f, + const char * fn) + { + image3d<value::rgb8> out3d(histo.domain()); + + mln_piter(I) p(ima.domain()); + for_all(p) + { + point3d p3 = point3d(ima(p).red() / f, + ima(p).green() / f, + ima(p).blue() / f); + out3d(p3) = convert::to<value::rgb8>(mean(parent(p3))); + } + + //FIXME: maj_h implies set is finite, mx set is ordered + accu::mean<mln::algebra::vec<3u, float> > maj_2; + image2d<mln::algebra::vec<3u, float> > mproj = + proj_vec(out3d, histo, maj_2); + + image2d<value::rgb8> out(geom::nslis(histo), geom::nrows(histo)); + level::fill(out, literal::white); + + mln_piter(image2d<value::int_u8>) p1(out.domain()); + for_all(p1) + { + out(p1) = convert::to<value::rgb8>(mproj(p1)); + } + + io::ppm::save(out, fn); + } + } // end of namespace mln #endif /* MLN_PROJ_HH */ Index: inim/classif/src/v2.cc --- inim/classif/src/v2.cc (revision 2838) +++ inim/classif/src/v2.cc (working copy) @@ -30,7 +30,6 @@ const value::int_u8 v = 256 / f; // FIXME image3d<unsigned> histo(v,v,v); level::fill(histo, 0); - unsigned i = 0; mln_piter(I) p(ima.domain()); for_all(p) @@ -55,11 +54,11 @@ } template <typename I, typename J, typename N> -unsigned +void process_max_tree(const I& ima, const J& histo, const N& nbh, - double density_lambda, unsigned volume_lambda, - unsigned nb_represent_lambda, unsigned color_lambda, - unsigned div_factor) + double density_lambda, double value_lambda, + unsigned volume_lambda, unsigned nb_represent_lambda, + unsigned color_lambda, unsigned div_factor) { max_tree_<J,N> run(histo, nbh); @@ -70,13 +69,20 @@ image3d< algebra::vec<3, double> > mean_color = run.compute_mean_color(); image3d<double> density = compute_density(nb_represent, volume); - // Density closing + // Density fusion if (density_lambda > 0.00001) { - std::cout << "Density cutting" << std::endl; + std::cout << "Density fusion" << std::endl; run.nuclear_fusion(density, density_lambda); } + // value fusion + if (value_lambda > 0.00001) + { + std::cout << "Value fusion" << std::endl; + run.nuclear_fusion(histo, value_lambda); + } + // Volume cutting if (volume_lambda != 0) { @@ -115,7 +121,9 @@ for_all(p) if (run.is_active(p)) { - std::cerr << mean_color(p) << "\t\t" << nb_class << "\t\t" << density(p) << "\t\t" << volume(p) << "\t\t" << nb_represent(p) << std::endl; + std::cerr << mean_color(p) << "\t\t" << nb_class + << "\t\t" << density(p) << "\t\t" << volume(p) + << "\t\t" << nb_represent(p) << std::endl; ++nb_class; } @@ -125,13 +133,21 @@ // Write the image w.r.t. the max tree run.to_ppm(ima, "out.ppm", div_factor, mean_color); + + //proj + save_class_v2(ima, histo, mean_color, run.new_parent, + div_factor, "histo.ppm"); } bool usage(int argc, char ** argv) { - if (argc != 7) + if (argc != 8) { - std::cout << "usage: " << argv[0] << " image div_factor density_lambda volume_lambda nb_represent_lambda color_lambda" << std::endl; + std::cout << "usage: " << argv[0] << " image div_factor " + << "density_lambda value_lambda volume_lambda " + << "nb_represent_lambda color_lambda" << std::endl; + std::cout << "Help: A value of 0 for any lambda means " + << "the related action won't be performed" << std::endl; return false; } @@ -149,17 +165,15 @@ int div_factor = atoi(argv[2]); float density_lambda = atof(argv[3]); - unsigned volume_lambda = atoi(argv[4]); - unsigned nb_represent_lambda = atoi(argv[5]); - unsigned color_lambda = atoi(argv[6]); + float value_lambda = atof(argv[4]); + unsigned volume_lambda = atoi(argv[5]); + unsigned nb_represent_lambda = atoi(argv[6]); + unsigned color_lambda = atoi(argv[7]); //make histo image3d<unsigned> histo = fill_histo(ima, div_factor); - //proj - accu::mean<unsigned, unsigned, unsigned> mean; - image2d<unsigned> phisto = proj(histo, mean); - // Process max_tree - process_max_tree(ima, histo, c6(), density_lambda, volume_lambda, nb_represent_lambda, color_lambda, div_factor); + process_max_tree(ima, histo, c6(), density_lambda, value_lambda, + volume_lambda, nb_represent_lambda, color_lambda, div_factor); }

16 years, 2 months

cleanup-2008 2837: Make erosion work on nD images.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make erosion work on nD images. * mln/core/image/image1d.hh: Layout doc. (element): Precise doc. Fix precondition. (element): Rename ind as i (less ambiguous). * mln/core/image/image3d.hh: Fix doc. (element): Rename o as i to be consistent. * mln/border/fill.hh (fill_size_n): Factor const cast. * mln/win/segment1d.hh: Upgrade doc style. * mln/win/line.hh: Likewise. * mln/morpho/erosion.spe.hh: Likewise. (erosion_chooses_arbitrary): Remove; such a test has to be a static chek (at compile-time!) (erosion_dispatch_wrt_arbitrary_win): New. (erosion_dispatch_wrt_win): Turn dispatch into static. border/fill.hh | 6 ++-- core/image/image1d.hh | 27 ++++++++++--------- core/image/image3d.hh | 29 +++++++++++--------- morpho/erosion.spe.hh | 70 +++++++++++++++++++++++++------------------------- win/line.hh | 10 +++---- win/segment1d.hh | 8 ++--- 6 files changed, 79 insertions(+), 71 deletions(-) Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2836) +++ mln/core/image/image1d.hh (working copy) @@ -30,7 +30,8 @@ # define MLN_CORE_IMAGE_IMAGE1D_HH /// \file mln/core/image/image1d.hh -/// \brief Definition of the basic mln::image1d class. +/// +/// Definition of the basic mln::image1d class. # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> @@ -206,11 +207,13 @@ /// Give a hook to the value buffer. T* buffer(); - /// Read-only access to the image value located at (\p ind). - const T& element(unsigned ind) const; - - /// Read-write access to the image value located at (\p ind). - T& element(unsigned ind); + /// Read-only access to the \p i-th image value (including the + /// border). + const T& element(unsigned i) const; + + /// Read-write access to the \p i-th image value (including the + /// border). + T& element(unsigned i); /// Give the number of cells (points including border ones). unsigned nelements() const; @@ -445,19 +448,19 @@ template <typename T> inline const T& - image1d<T>::element(unsigned ind) const + image1d<T>::element(unsigned i) const { - mln_precondition(this->has(point1d(ind))); - return this->data_->buffer_[ind]; + mln_precondition(i < nelements()); + return this->data_->buffer_[i]; } template <typename T> inline T& - image1d<T>::element(unsigned ind) + image1d<T>::element(unsigned i) { - mln_precondition(this->has(point1d(ind))); - return this->data_->buffer_[ind]; + mln_precondition(i < nelements()); + return this->data_->buffer_[i]; } template <typename T> Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2836) +++ mln/core/image/image3d.hh (working copy) @@ -30,7 +30,8 @@ # define MLN_CORE_IMAGE_IMAGE3D_HH /// \file mln/core/image/image3d.hh -/// \brief Definition of the basic mln::image3d class. +/// +/// Definition of the basic mln::image3d class. # include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> @@ -192,16 +193,18 @@ /// Read-write access to the image value located at point \p p. T& operator()(const point3d& p); - /// Read-only access to the image value located at offset \p o. - const T& element(unsigned o) const; + /// Read-only access to the image value located at index \p i. + const T& element(unsigned i) const; - /// Read-write access to the image value located at offset \p o. - T& element(unsigned o); + /// Read-write access to the image value located at index \p i. + T& element(unsigned i); - /// Read-only access to the image value located at (\p ind). + /// Read-only access to the image value located at (\p sli, \p + /// row, \p col). const T& at(int sli, int row, int col) const; - /// Read-write access to the image value located at (\p ind). + /// Read-write access to the image value located at (\p sli, \p + /// row, \p col). T& at(int sli, int row, int col); @@ -463,19 +466,19 @@ template <typename T> inline const T& - image3d<T>::element(unsigned o) const + image3d<T>::element(unsigned i) const { - mln_precondition(o < nelements()); - return *(data_->buffer_ + o); + mln_precondition(i < nelements()); + return *(data_->buffer_ + i); } template <typename T> inline T& - image3d<T>::element(unsigned o) + image3d<T>::element(unsigned i) { - mln_precondition(o < nelements()); - return *(data_->buffer_ + o); + mln_precondition(i < nelements()); + return *(data_->buffer_ + i); } template <typename T> Index: mln/border/fill.hh --- mln/border/fill.hh (revision 2836) +++ mln/border/fill.hh (working copy) @@ -117,7 +117,7 @@ { trace::entering("border::impl::fill_size_n"); - const I& ima = exact(ima_); + I& ima = const_cast<I&>( exact(ima_) ); internal::fill_tests(ima, v); typedef mln_psite(I) P; @@ -129,11 +129,11 @@ { unsigned end = ima.index_of_point (pl); for (unsigned i = st; i < end; ++i) - (const_cast<I&>(ima)).element(i) = v; + ima.element(i) = v; st = end + len_r; } for (unsigned i = st; i < ima.nelements (); ++i) - const_cast<I&>(ima).element(i) = v; + ima.element(i) = v; trace::exiting("border::impl::fill_size_n"); } Index: mln/win/segment1d.hh --- mln/win/segment1d.hh (revision 2836) +++ mln/win/segment1d.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_WIN_SEGMENT1D_HH # define MLN_WIN_SEGMENT1D_HH -/*! \file mln/win/segment1d.hh - * - * \brief Definition of the mln::win::segment1d window. - */ +/// \file mln/win/segment1d.hh +/// +/// Definition of the mln::win::segment1d window. # include <mln/win/line.hh> # include <mln/core/grids.hh> Index: mln/win/line.hh --- mln/win/line.hh (revision 2836) +++ mln/win/line.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// 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_WIN_LINE_HH # define MLN_WIN_LINE_HH -/*! \file mln/win/line.hh - * - * \brief Definition of the mln::win::line window. - */ +/// \file mln/win/line.hh +/// +/// Definition of the mln::win::line window. # include <mln/core/internal/classical_window_base.hh> # include <mln/core/dpoint.hh> Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2836) +++ mln/morpho/erosion.spe.hh (working copy) @@ -52,13 +52,13 @@ # include <mln/canvas/browsing/backdiagonal2d.hh> -/*! \file mln/morpho/erosion.spe.hh - * - * \brief Specialization for mln::morpho::erosion. - * - * \todo Warning: we should also have the "arbitrary" versions working - * on sets (not only on functions!) - */ +/// \file mln/morpho/erosion.spe.hh +/// +/// Specialization for mln::morpho::erosion. +/// +/// \todo Warning: we should also have the "arbitrary" versions working +/// on sets (not only on functions!) + # ifndef MLN_INCLUDE_ONLY @@ -1231,26 +1231,6 @@ // dispatch for arbitrary elements template <typename I, typename W> - bool - erosion_chooses_arbitrary(const I&, const W& win) - { - return - win.size() >= 10 // size is not too small - && - // 2d case only - mlc_equal(mln_trait_image_dimension(I), - trait::image::dimension::two_d)::value - && - // on a grid - mlc_is_a(mln_site(I), - Gpoint)::value - && - // continuous data - mlc_not_equal(mln_trait_image_value_storage(I), - trait::image::value_storage::disrupted)::value; - } - - template <typename I, typename W> mln_concrete(I) erosion_dispatch_for_arbitrary(trait::image::speed::fastest, const I& input, const W& win) @@ -1372,22 +1352,44 @@ return ima; } + // dispatch w.r.t. win + template <typename I, typename W> mln_concrete(I) - erosion_dispatch_wrt_win(const I& input, const W& win) + erosion_dispatch_wrt_arbitrary_win(metal::true_, + const I& input, const W& win) { - // FIXME: De-activate because, when win is multiple, - // win::shift does not work. We have to introduce - // props from windows, then re-write win::shift. - - if (erosion_chooses_arbitrary(input, win)) return erosion_dispatch_for_arbitrary(input, win); - else + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_wrt_arbitrary_win(metal::false_, + const I& input, const W& win) + { return erosion_dispatch_for_generic(input, win); } + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const W& win) + { + // FIXME: + // The test "win.size() >= 10" (size is not too small) has been + // de-activated... + enum { test = mlc_equal(mln_trait_image_dimension(I), + trait::image::dimension::two_d)::value + && + mlc_is_a(mln_site(I), Gpoint)::value + && + mlc_not_equal(mln_trait_image_value_storage(I), + trait::image::value_storage::disrupted)::value }; + return erosion_dispatch_wrt_arbitrary_win(metal::bool_<test>(), + input, win); + } + template <typename I> mln_concrete(I) erosion_dispatch_wrt_win(const I& input, const win::rectangle2d& win)

16 years, 2 months

cleanup-2008 2836: INIM: Classif: Update gif creation.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif: Update gif creation. * inim/classif/src/display.hh: Display watershed class. * inim/classif/src/iccvg04.cc: Modify output info. * inim/classif/src/proj.hh: Beautify. * inim/classif/Makefile: Remove warning in non debug. Makefile | 4 ++-- src/display.hh | 28 +++++++++++++++------------- src/iccvg04.cc | 7 +++---- src/proj.hh | 3 ++- 4 files changed, 22 insertions(+), 20 deletions(-) Index: inim/classif/src/display.hh --- inim/classif/src/display.hh (revision 2835) +++ inim/classif/src/display.hh (working copy) @@ -34,6 +34,7 @@ #include <mln/geom/nslis.hh> #include <mln/value/all.hh> #include <mln/core/image/image3d.hh> +#include <mln/literal/colors.hh> #include <sys/stat.h> #include <sstream> @@ -44,29 +45,30 @@ namespace mln { - template <typename I> - void display(const I& ima, const char * dir) + template <typename I, typename J, typename K> + void display(const I& histo, const J& ws, K mean, const char * dir) { mkdir(dir, 0777); chdir(dir); - image2d< mln_value(I) > out(geom::nrows(ima), geom::ncols(ima)); + image2d< value::rgb8 > out(geom::nrows(histo), geom::ncols(histo)); + level::fill(out, literal::white); - for (int s = 0; s < geom::nslis(ima); ++s) + for (int s = 0; s < geom::nslis(histo); ++s) { - // image2d< value::int_u8 > out(geom::nrows(ima), geom::ncols(ima)); - for (int r = 0; r < geom::nrows(ima); ++r) + for (int r = 0; r < geom::nrows(histo); ++r) + for (int c = 0; c < geom::ncols(histo); ++c) + if (histo(point3d(s,r,c)) > 0) { - for (int c = 0; c < geom::ncols(ima); ++c) - { - out(point2d(r, c)) = ima(point3d(s, r, c)); - } + if (ws(point3d(s,r,c)) > 0) + out(point2d(r, c)) = convert::to<value::rgb8>(mean[ws(point3d(s,r,c))]); + else + out(point2d(r, c)) = literal::red; } std::ostringstream is; - is << "out_" << s << ".pgm"; - - io::pgm::save(out, is.str()); + is << "out_00" << s << ".ppm"; + io::ppm::save(out, is.str()); } chdir(".."); Index: inim/classif/src/iccvg04.cc --- inim/classif/src/iccvg04.cc (revision 2835) +++ inim/classif/src/iccvg04.cc (working copy) @@ -93,9 +93,7 @@ point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); int w = ws(p3); - //check if we are not on a border of the WS - if (w == 0) - border++; + //Even if we are not on a border of the WS count[w] += histo(p3); sum[w] += histo(p3) * convert::to< algebra::vec<3, value::int_u8> >(p3); @@ -103,7 +101,7 @@ convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; } - std::cout << border << std::endl; + std::cout << "dyke point : " << count[0] << std::endl; for (int i = 0; i < nbasins + 1; ++i) { std::cout << "sum[" << i << "] = " << sum[i] * f << " / " << count[i] << " == "; @@ -132,6 +130,7 @@ io::ppm::save(out, "out.ppm"); save_class(histo, ws, sum, "palette.ppm"); + display(histo, ws, sum, "histo"); } bool usage(int argc, char ** argv) Index: inim/classif/src/proj.hh --- inim/classif/src/proj.hh (revision 2835) +++ inim/classif/src/proj.hh (working copy) @@ -34,6 +34,7 @@ #include <mln/accu/mean.hh> #include <mln/accu/maj_h.hh> #include <mln/literal/white.hh> +#include <mln/literal/colors.hh> namespace mln { @@ -67,8 +68,8 @@ //std::cout << histo; image2d<value::rgb8> out(proj_class.domain()); - level::fill(out, literal::white); + mln_piter(image2d<value::int_u8>) p(proj_class.domain()); for_all(p) if (hproj(p) > 0) Index: inim/classif/Makefile --- inim/classif/Makefile (revision 2835) +++ inim/classif/Makefile (working copy) @@ -21,14 +21,14 @@ $(ICCVG): $(ICCVG_SRC) - g++ $(ICCVG_INCLUDES) -Wall -W -O1 -DNDEBUG $(ICCVG_SRC) -o $(ICCVG) + g++ $(ICCVG_INCLUDES) -O1 -DNDEBUG $(ICCVG_SRC) -o $(ICCVG) $(ICCVG_DBG): $(ICCVG_SRC) g++ $(ICCVG_INCLUDES) -Wall -W -O0 -g3 -ggdb3 $(ICCVG_SRC) -o $(ICCVG_DBG) $(V2): $(V2_SRC) - g++ $(V2_INCLUDES) -Wall -W -O1 -DNDEBUG $(V2_SRC) -o $(V2) + g++ $(V2_INCLUDES) -O1 -DNDEBUG $(V2_SRC) -o $(V2) $(V2_DBG): $(V2_SRC) .dep_v2

16 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches