Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Use Abox instead of strings * pp-cxx/CxxExp.str: Use Abox format instead of strings. CxxExp.str | 63 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 94) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 95) @@ -4,53 +4,58 @@ rules - CxxArgListToStr: - [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] - - CxxArgListToStr: - [e | []] -> <CxxExpToStr> e + CxxArgListToAbox: +// [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] + [ e | l ] -> H hs=0 [ ~<CxxExpToAbox> e H hs=1 [ "," ~<CxxArgListToAbox> l ] ] + where + not(<?[]> l) - CxxArgListToStr: - [] -> "" + CxxArgListToAbox: + [e | []] -> H hs=0 [ ~<CxxExpToAbox> e ] - CxxExpToStr: - CxxInt(i) -> i + CxxArgListToAbox: + [] -> [] - CxxExpToStr: - CxxSum(e1, e2) -> <concat-strings> [<CxxExpToStr> e1, " + ", <CxxExpToStr> e2] - CxxExpToStr: - CxxKeyword(idf, exp) -> <concat-strings> [idf, " ", <CxxExpToStr> exp] + CxxExpToAbox: + CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf ~<CxxParametersToAbox> params "(" ~<CxxArgListToAbox> args ")" ] - CxxExpToStr: - CxxAssign(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] + CxxParametersToAbox: + params -> H hs=1 [ "<" ~<CxxListToAbox(CxxParameterToAbox|",")> params ">" ] + where + not(<?[]> params) - CxxExpToStr: - CxxFunCall([], CxxId(idf), args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] + CxxExpToAbox: + CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] - CxxExpToStr: - CxxProgram(exp) -> exp + CxxExpToAbox: + CxxInt(i) -> S(i) - CxxExpToStr: - x -> x - where <is-string> x + CxxExpToAbox: + CxxSum(e1, e2) -> H hs=1 [~<CxxExpToAbox> e1 "+" ~<CxxExpToAbox> e2] - CxxExpToStr: - CxxId(idf) -> idf + CxxExpToAbox: + CxxKeyword(idf, exp) -> H hs=1 [ ~<CxxIdToAbox> idf ~<CxxExpToAbox> exp] + CxxExpToAbox: + CxxAssign(idf, exp) -> H hs=1 [ ~<CxxIdToAbox> idf "=" ~<CxxExpToAbox> exp] + CxxExpToAbox: + CxxProgram(exp) -> S(exp) CxxExpToAbox: - CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] + x -> S(x) + where + <is-string> x CxxExpToAbox: - x -> S(<CxxExpToStr> x) + CxxId(idf) -> S(idf) - CxxExpToAbox: - CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf "< " ~<CxxListToAbox(CxxParameterToAbox|",")> params " >" "(" ~S(~<CxxArgListToStr> args) ")" ] - where <debug> params + // FIXME: This shouldn't be here. + CxxParametersToAbox: + [] -> H [] CxxParameterToAbox: type -> abox_type -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

cleanup-2008 2375: Make basic neighborhoods rely on neighb<W> and fix from_to.

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 basic neighborhoods rely on neighb<W> and fix from_to. * tests/core/other/neighb.cc: Revamp. * doc/tutorial/examples/p_key.cc: Augment. * mln/core/window.hh (clear): New. (insert): New overload. * mln/core/alias/neighb1d.hh, * mln/core/alias/neighb2d.hh, * mln/core/alias/neighb3d.hh: Update. They now rely on neighb<W>. * mln/core/alias/window1d.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh: Update. (impl::from_to_): Replace by... (from_to): ...these new overloads. * mln/core/neighb.hh (todo): New. (include): Fix missings. (to_window): Rename as... (win): ...this. (size, delta, hook_win_): New. (impl::from_to_): Replace by... (from_to): ...this and update. * mln/core/concept/neighborhood.hh: Update. * mln/metal/abort.hh (mlc_abort): New. * mln/make/neighb2d.hh: Remove. * mln/convert/to.hh (impl::from_to_): Update call to... (from_to): ...this. * mln/convert/from_to.hh (impl::from_to_): Rename as... (from_to): ...this. Now convert::from_to is a set of overloaded routines; that makes much easier the definitions of new versions. doc/tutorial/examples/p_key.cc | 6 +- mln/convert/from_to.hh | 83 ++++++++++++++++------------------ mln/convert/to.hh | 2 mln/core/alias/neighb1d.hh | 15 +++--- mln/core/alias/neighb2d.hh | 95 +++++++++++++++++++++++++++------------ mln/core/alias/neighb3d.hh | 77 ++++++++++++++----------------- mln/core/alias/window1d.hh | 17 +----- mln/core/alias/window2d.hh | 38 ++++++--------- mln/core/alias/window3d.hh | 17 +----- mln/core/concept/neighborhood.hh | 7 ++ mln/core/neighb.hh | 71 ++++++++++++++++++++++------- mln/core/window.hh | 29 +++++++++++ mln/metal/abort.hh | 2 tests/core/other/neighb.cc | 30 ++++++------ 14 files changed, 287 insertions(+), 202 deletions(-) Index: tests/core/other/neighb.cc --- tests/core/other/neighb.cc (revision 2374) +++ tests/core/other/neighb.cc (working copy) @@ -26,33 +26,37 @@ // Public License. /// \file tests/core/other/neighb.cc -/// \brief Tests on mln::neighb<D> specializations. +/// \brief Tests on regular neighborhoods. #include <mln/core/alias/neighb1d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/neighb3d.hh> +#include <mln/literal/origin.hh> using namespace mln; + template <typename N> -void test(const Neighborhood<N>& nbh, const mln_site(N)& p_ref, - unsigned size) +unsigned +size(const N& nbh) { - mln_niter(N) n(nbh, p_ref); - unsigned i = 0; + mln_site(N) O = literal::origin; + mln_niter(N) n(nbh, O); + unsigned s = 0; for_all(n) - ++i; - mln_assertion(i == size); + ++s; + return s; } + int main() { - test(c2(), point1d(0), 2); + mln_assertion(size(c2()) == 2); - test(c4(), point2d(0, 0), 4); - test(c8(), point2d(0, 0), 8); + mln_assertion(size(c4()) == 4); + mln_assertion(size(c8()) == 8); - test( c6(), point3d(0, 0, 0), 6); - test(c18(), point3d(0, 0, 0), 18); - test(c26(), point3d(0, 0, 0), 26); + mln_assertion(size( c6()) == 6); + mln_assertion(size(c18()) == 18); + mln_assertion(size(c26()) == 26); } Index: doc/tutorial/examples/p_key.cc --- doc/tutorial/examples/p_key.cc (revision 2374) +++ doc/tutorial/examples/p_key.cc (working copy) @@ -41,6 +41,8 @@ for (unsigned i = 0; i < 7; ++i) p += dp[i], s.insert(p.row(), p); + picture(s); + std::cout << s.keys() << std::endl; std::cout << s << std::endl; } @@ -78,8 +80,8 @@ s.remove_key(0); std::cout << s << std::endl; - std::cout << "change key 2 -> 4" << std::endl; - s.change_key(2, 4); + std::cout << "change key 2 -> 5" << std::endl; + s.change_key(2, 5); std::cout << s << std::endl; std::cout << "remove key 3" << std::endl; Index: mln/core/window.hh --- mln/core/window.hh (revision 2374) +++ mln/core/window.hh (working copy) @@ -114,6 +114,9 @@ */ bool is_empty() const; + /// Clear the window. + void clear(); + /*! \brief Give the maximum coordinate gap between the window center and a window point. */ @@ -128,6 +131,10 @@ /// Insert a delta-point \p dp. window<D>& insert(const D& dp); + /// Insert another window \p win. + template <typename W> + window<D>& insert(const Window<W>& win); + /// \{ Insertion of a delta-point with different numbers of /// arguments (coordinates) w.r.t. the dimension. window<D>& insert(const mln_coord(D)& dind); // For 1D or index access. @@ -211,7 +218,6 @@ *this = tmp; } - template <typename D> inline bool @@ -222,6 +228,14 @@ template <typename D> inline + void + window<D>::clear() + { + dps_.clear(); + } + + template <typename D> + inline unsigned window<D>::delta() const { @@ -280,6 +294,19 @@ } template <typename D> + template <typename W> + inline + window<D>& + window<D>::insert(const Window<W>& win_) + { + const W& win = exact(win_); + const unsigned n = win.size(); + for (unsigned i = 0; i < n; ++i) + dps_.insert(win.dp(i)); + return *this; + } + + template <typename D> inline window<D>& window<D>::insert(const mln_coord(D)& dind) Index: mln/core/alias/neighb1d.hh --- mln/core/alias/neighb1d.hh (revision 2374) +++ mln/core/alias/neighb1d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -36,7 +36,8 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/alias/dpoint1d.hh> +# include <mln/core/alias/window1d.hh> +# include <mln/geom/sym.hh> namespace mln @@ -45,7 +46,7 @@ /*! \brief Type alias for a neighborhood defined on the 1D square * grid with integer coordinates. */ - typedef neighb_<dpoint1d> neighb1d; + typedef neighb<window1d> neighb1d; /*! \brief 2-connectivity neighborhood on the 1D grid. @@ -62,12 +63,12 @@ inline const neighb1d& c2() { - static bool flower = true; static neighb1d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint1d(+1)); - flower = false; + it.hook_win_() + .insert(dpoint1d(-1)) + .insert(dpoint1d(+1)); } return it; } Index: mln/core/alias/neighb2d.hh --- mln/core/alias/neighb2d.hh (revision 2374) +++ mln/core/alias/neighb2d.hh (working copy) @@ -32,11 +32,14 @@ * * \brief Definition of the mln::neighb2d alias and of some classical * 2D neighborhoods. + * + * \todo Add symmetry and non-centering tests in conversion. */ # include <cmath> -# include <mln/core/neighborhood.hh> -# include <mln/core/alias/dpoint2d.hh> +# include <mln/core/alias/window2d.hh> +# include <mln/core/neighb.hh> +# include <mln/convert/from_to.hh> namespace mln @@ -45,14 +48,11 @@ /*! \brief Type alias for a neighborhood defined on the 2D square * grid with integer coordinates. */ - typedef neighborhood<dpoint2d> neighb2d; + typedef neighb<window2d> neighb2d; } -# include <mln/make/neighb2d.hh> - - namespace mln { @@ -101,20 +101,31 @@ + namespace convert + { + + template <unsigned S> + void from_to(const bool (&values)[S], neighb2d& nbh); + + template <unsigned R, unsigned C> + void from_to(bool const (&values)[R][C], neighb2d& nbh); + + } // end of namespace mln::convert + + + # ifndef MLN_INCLUDE_ONLY inline const neighb2d& c4() { - // FIXME: `flower' is probably not a canonical name to state - // whether the neighborhood is initialized or not. :) - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1) - .insert(1, 0); - flower = false; + static const bool vals[] = { 0, 1, 0, + 1, 0, 1, + 0, 1, 0 }; + convert::from_to(vals, it); } return it; } @@ -122,15 +133,13 @@ inline const neighb2d& c8() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1) - .insert(1,-1) - .insert(1, 0) - .insert(1, 1); - flower = false; + static const bool vals[] = { 1, 1, 1, + 1, 0, 1, + 1, 1, 1 }; + convert::from_to(vals, it); } return it; } @@ -138,12 +147,13 @@ inline const neighb2d& c2_row() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1); - flower = false; + static const bool vals[] = { 0, 0, 0, + 1, 0, 1, + 0, 0, 0 }; + convert::from_to(vals, it); } return it; } @@ -151,16 +161,45 @@ inline const neighb2d& c2_col() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(1, 0); - flower = false; + static const bool vals[] = { 0, 1, 0, + 0, 0, 0, + 0, 1, 0 }; + convert::from_to(vals, it); } return it; } + + namespace convert + { + + template <unsigned S> + void + from_to(const bool (&values)[S], neighb2d& nbh) + { + enum { h = mlc_sqrt_int(S) / 2 }; + mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); + window2d& win = nbh.hook_win_(); + convert::from_to(values, win); + mln_postcondition(win.is_neighbable_()); + } + + template <unsigned R, unsigned C> + void + from_to(bool const (&values)[R][C], neighb2d& nbh) + { + mlc_bool(R % 2 == 1)::check(); + mlc_bool(C % 2 == 1)::check(); + window2d& win = nbh.hook_win_(); + convert::from_to(values, win); + mln_postcondition(win.is_neighbable_()); + } + + } // end of namespace mln::convert + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/alias/neighb3d.hh --- mln/core/alias/neighb3d.hh (revision 2374) +++ mln/core/alias/neighb3d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -36,7 +36,8 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/alias/dpoint3d.hh> +# include <mln/core/alias/window3d.hh> +# include <mln/geom/sym.hh> namespace mln @@ -45,7 +46,7 @@ /*! \brief Type alias for a neighborhood defined on the 3D square * grid with integer coordinates. */ - typedef neighb_<dpoint3d> neighb3d; + typedef neighb<window3d> neighb3d; /*! \brief 6-connectivity neighborhood on the 3D grid. @@ -102,19 +103,23 @@ */ const neighb3d& c26(); + + # ifndef MLN_INCLUDE_ONLY inline const neighb3d& c6() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 0, 0) + .insert(0, 1, 0) + .insert(0, 0, 1); + win + .insert(geom::sym(win)); } return it; } @@ -122,22 +127,20 @@ inline const neighb3d& c18() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - - it.insert(dpoint3d(+1, 0, +1)); - it.insert(dpoint3d(+1, 0, -1)); - it.insert(dpoint3d(0, +1, +1)); - it.insert(dpoint3d(0, +1, -1)); - it.insert(dpoint3d(+1, +1, 0)); - it.insert(dpoint3d(+1, -1, 0)); - - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 0, 1) + .insert(1, 0, -1) + .insert(0, 1, 1) + .insert(0, 1, -1) + .insert(1, 1, 0) + .insert(1, -1, 0); + win + .insert(geom::sym(win)) + .insert(c6().win()); } return it; } @@ -145,26 +148,18 @@ inline const neighb3d& c26() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - - it.insert(dpoint3d(+1, 0, +1)); - it.insert(dpoint3d(+1, 0, -1)); - it.insert(dpoint3d(0, +1, +1)); - it.insert(dpoint3d(0, +1, -1)); - it.insert(dpoint3d(+1, +1, 0)); - it.insert(dpoint3d(+1, -1, 0)); - - it.insert(dpoint3d(+1, +1, +1)); - it.insert(dpoint3d(+1, +1, -1)); - it.insert(dpoint3d(+1, -1, +1)); - it.insert(dpoint3d(+1, -1, -1)); - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 1, 1) + .insert(1, 1, -1) + .insert(1, -1, 1) + .insert(1, -1, -1); + win + .insert(geom::sym(win)) + .insert(c18().win()); } return it; } Index: mln/core/alias/window1d.hh --- mln/core/alias/window1d.hh (revision 2374) +++ mln/core/alias/window1d.hh (working copy) @@ -47,13 +47,9 @@ namespace convert { - namespace impl - { template <unsigned M> - void from_to_(bool const (&values)[M], window1d& win); - - } // end of namespace mln::convert::impl + void from_to(const bool (&values)[M], window1d& win); } // end of namespace mln::convert @@ -63,25 +59,20 @@ namespace convert { - namespace impl - { template <unsigned M> void - from_to_(bool const (&values)[M], window1d& win) + from_to(bool const (&values)[M], window1d& win) { mlc_bool(M % 2 == 1)::check(); - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? - + win.clear(); const int h = int(M) / 2; unsigned i = 0; for (int ind = - h; ind <= h; ++ind) if (values[i++]) - win.insert(dpoint1d(ind)); + win.insert(ind); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2374) +++ mln/core/alias/window2d.hh (working copy) @@ -31,6 +31,8 @@ /// \file mln/core/alias/window2d.hh /// \brief Definition of the mln::window2d alias and of a construction /// routine. +/// +/// \todo c8p etc. # include <mln/core/window.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,16 +60,12 @@ namespace convert { - namespace impl - { template <unsigned S> - void from_to_(bool const (&values)[S], window2d& win); + void from_to(const bool (&values)[S], window2d& win); template <unsigned R, unsigned C> - void from_to_(bool const (&values)[R][C], window2d& win); - - } // end of namespace mln::convert::impl + void from_to(const bool (&values)[R][C], window2d& win); } // end of namespace mln::convert @@ -78,16 +76,15 @@ inline const window2d& win_c4p() { - static bool initialized_p = false; static window2d it; - if (!initialized_p) + if (it.size() == 0) { - it.insert(dpoint2d( 0, -1)); - it.insert(dpoint2d(-1, 0)); - it.insert(dpoint2d( 0, 0)); - it.insert(dpoint2d(+1, 0)); - it.insert(dpoint2d( 0, +1)); - initialized_p = true; + it + .insert( 0, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert( 0, +1); } return it; } @@ -95,16 +92,14 @@ namespace convert { - namespace impl - { template <unsigned S> void - from_to_(bool const (&values)[S], window2d& win) + from_to(const bool (&values)[S], window2d& win) { - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? enum { h = mlc_sqrt_int(S) / 2 }; mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); + win.clear(); unsigned i = 0; for (int row = - h; row <= h; ++row) for (int col = - h; col <= h; ++col) @@ -114,12 +109,11 @@ template <unsigned R, unsigned C> void - from_to_(bool const (&values)[R][C], window2d& win) + from_to(const bool (&values)[R][C], window2d& win) { mlc_bool(R % 2 == 1)::check(); mlc_bool(C % 2 == 1)::check(); - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? - + win.clear(); const int drow = int(R) / 2, dcol = int(C) / 2; for (int row = - drow; row <= drow; ++row) for (int col = - dcol; col <= dcol; ++col) @@ -127,8 +121,6 @@ win.insert(row, col); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/alias/window3d.hh --- mln/core/alias/window3d.hh (revision 2374) +++ mln/core/alias/window3d.hh (working copy) @@ -48,13 +48,9 @@ namespace convert { - namespace impl - { template <unsigned M> - void from_to_(bool const (&values)[M], window3d& win); - - } // end of namespace mln::convert::impl + void from_to(bool const (&values)[M], window3d& win); } // end of namespace mln::convert @@ -64,27 +60,22 @@ namespace convert { - namespace impl - { template <unsigned M> void - from_to_(bool const (&values)[M], window3d& win) + from_to(bool const (&values)[M], window3d& win) { - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? const int h = unsigned(std::pow(float(M), float(1. / 3.))) / 2; mln_precondition((2 * h + 1) * (2 * h + 1) * (2 * h + 1) == M); - + win.clear(); unsigned i = 0; for (int sli = - h; sli <= h; ++sli) for (int row = - h; row <= h; ++row) for (int col = - h; col <= h; ++col) if (values[i++]) - win.insert(dpoint3d(sli, row, col)); + win.insert(sli, row, col); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 2374) +++ mln/core/neighb.hh (working copy) @@ -31,9 +31,17 @@ /*! \file mln/core/neighb.hh * * \brief Definition of a window-to-neighborhood adapter. + * + * \todo Introduce properties so that we can deal properly with + * optional methods. + * + * \todo See if the impl of from_to is fine. What about removing the + * origin? etc. */ +# include <mln/core/concept/window.hh> # include <mln/core/internal/neighborhood_base.hh> +# include <mln/core/internal/site_relative_iterator_base.hh> # include <mln/convert/from_to.hh> @@ -53,8 +61,8 @@ { public: + /// Window associated type. typedef W window; - const W& to_window() const { return win_; } /// Forward site iterator associated type. typedef neighb_fwd_niter<W> fwd_niter; @@ -78,6 +86,21 @@ /// Change the corresponding window. void change_window(const W& new_win); + + // Optional methods... + + /// Give the neighborhood size, i.e., the number of elements it + /// contains. + unsigned size() const; + + /// Give the maximum coordinate gap between the neighborhood + /// center and a neighboring point. + unsigned delta() const; + + + /// \internal Hook to the window. + W& hook_win_(); + private: W win_; }; @@ -86,18 +109,14 @@ namespace convert { - namespace impl - { template <typename W> void - from_to_(const mln::neighb<W>& from, W& to); + from_to(const mln::neighb<W>& from, W& to); template <typename W> void - from_to_(const W& from, mln::neighb<W>& to); - - } // end of namespace convert::impl + from_to(const W& from, mln::neighb<W>& to); } // end of namespace convert @@ -211,30 +230,50 @@ win_ = new_win; } + template <typename W> + inline + unsigned + neighb<W>::size() const + { + return win_.size(); + } + + template <typename W> + inline + unsigned + neighb<W>::delta() const + { + return win_.delta(); + } + + template <typename W> + inline + W& + neighb<W>::hook_win_() + { + return win_; + } + - // convert::impl::from_to_ + // convert::from_to namespace convert { - namespace impl - { template <typename W> void - from_to_(const mln::neighb<W>& from, W& to) + from_to(const mln::neighb<W>& from, W& to) { to = from.win(); } template <typename W> void - from_to_(const W& from, mln::neighb<W>& to) + from_to(const W& from, mln::neighb<W>& to) { to.change_window(from); } - } // end of namespace convert::impl - } // end of namespace convert @@ -254,7 +293,7 @@ this->change_target(nbh); this->center_at(c); i_.center_at(c); // Always before change_target for this kind of iter. - i_.change_target(nbh.to_window()); + i_.change_target(nbh.win()); } template <typename W> @@ -314,7 +353,7 @@ this->change_target(nbh); this->center_at(c); i_.center_at(c); // Always before change_target for this kind of iter. - i_.change_target(nbh.to_window()); + i_.change_target(nbh.win()); } template <typename W> Index: mln/core/concept/neighborhood.hh --- mln/core/concept/neighborhood.hh (revision 2374) +++ mln/core/concept/neighborhood.hh (working copy) @@ -65,7 +65,10 @@ typedef bkd_niter; typedef window; - window to_window() const; + either + const window& win() const; + or + window win() const; */ protected: @@ -85,7 +88,7 @@ typedef mln_bkd_niter(E) bkd_niter; typedef mln_window(E) window; - bool m = (& E::to_window) == (& E::to_window); + bool m = (& E::win) == (& E::win); m = 0; // const window& (E::*m)() const = & E::to_window; // m = 0; Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 2374) +++ mln/metal/abort.hh (working copy) @@ -35,6 +35,8 @@ # include <mln/metal/bool.hh> +# define mlc_abort(A_TYPE) mln::metal::abort_< A_TYPE > + namespace mln { Index: mln/convert/to.hh --- mln/convert/to.hh (revision 2374) +++ mln/convert/to.hh (working copy) @@ -68,7 +68,7 @@ trace::entering("convert::to"); T tmp; - impl::from_to_(from, tmp); + from_to(from, tmp); trace::exiting("convert::to"); return tmp; Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2374) +++ mln/convert/from_to.hh (working copy) @@ -32,9 +32,11 @@ * * \brief General conversion procedure between two objects. * - * \todo Prefer a static check that fails in the "unknown" case. - * * \todo Use 'round' instead of static_cast in vec->Gpoint. + * + * \todo Test the effectiveness of guards. + * \todo Add fwd decls. + * \todo Dispatch code in appropriate files. */ # include <mln/core/concept/object.hh> @@ -46,6 +48,7 @@ # include <mln/algebra/vec.hh> # include <mln/metal/is.hh> +# include <mln/metal/abort.hh> @@ -56,49 +59,63 @@ { - /// Conversion of an object \p from towards an object \p to. + /// Guards. + template <typename F, typename T> + void + from_to(const F& from, Object<T>& to); + template <typename F, typename T> - inline void - from_to(F& from, Object<T>& to); // See below an explanation of this signature. + from_to(const Object<F>& from, Object<T>& to); + + template <typename F, typename T> + void + from_to(const Object<F>& from, T& to); + /// end of Guards. template <typename T> - inline void from_to(const float& from, Object<T>& to); template <typename T> - inline void from_to(const int& from, Object<T>& to); - // Technical note: - - // In order to remain as general as possible (for instance to be - // able to pass a C array to 'from'), the signature cannot be - // "const F& from." It cannot embed the strong typing "Object<*>" - // neither. +# ifndef MLN_INCLUDE_ONLY -# ifndef MLN_INCLUDE_ONLY + /// Guards. + template <typename F, typename T> + void + from_to(const F&, Object<T>&) + { + mlc_abort(F)::check(); + } - namespace impl + template <typename F, typename T> + void + from_to(const Object<F>&, Object<T>&) { + mlc_abort(F)::check(); + } - // Default (F -> Object) means "unknown conversion". template <typename F, typename T> void - from_to_(const F& from, Object<T>& to); + from_to(const Object<F>&, T&) + { + mlc_abort(F)::check(); + } + /// end of Guards. // Image -> Site_Set. template <typename I, typename S> inline void - from_to_(const Image& from, Site_Set<S>& to) + from_to(const Image& from, Site_Set<S>& to) { mlc_is(mln_trait_site_set_contents(S), mln::trait::site_set::contents::dynamic)::check(); @@ -110,7 +127,7 @@ template <unsigned n, typename T, typename P> inline void - from_to_(const algebra::vec<n,T>& from, Gpoint& to_) + from_to(const algebra::vec<n,T>& from, Gpoint& to_) { mlc_bool(P::dim == n)::check(); P& to = exact(to_); @@ -122,7 +139,7 @@ template <typename T, unsigned m> inline void - from_to_(const algebra::vec<3,T>& from, value::rgb<m>& to_) + from_to(const algebra::vec<3,T>& from, value::rgb<m>& to_) { value::rgb<m>& to = exact(to_); algebra::vec<3, unsigned> tmp; @@ -132,34 +149,16 @@ to = value::rgb<m>(tmp); } - + // Value -> Value template <typename F, typename T> inline void - from_to_(const Value<F>& from, Value<T>& to) + from_to(const Value<F>& from, Value<T>& to) { mln::convert::impl::from_value_to_value(from, to); } - } // end of namespace mln::convert::impl - - - - // Facades. - - - template <typename F, typename T> - inline - void - from_to(F& from, Object<T>& to) - { - trace::entering("convert::from_to"); - mlc_equal(F, mln_exact(F))::check(); - impl::from_to_(from, exact(to)); - trace::exiting("convert::from_to"); - } - - + // float -> Object template <typename T> inline void @@ -169,7 +168,7 @@ exact(to) = from; } - + // int -> Object template <typename T> inline void

16 years, 3 months

scool r94: Add template functions to the pretty-printer

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Add template functions to the pretty-printer * pp-cxx/CxxExp.str: Implement CxxFunCall constructor. * pp-cxx/CxxStm.str: Be more strict when adding a semicolon. CxxExp.str | 19 +++++++++++++++++-- CxxStm.str | 5 +++-- 2 files changed, 20 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 93) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 94) @@ -5,10 +5,10 @@ rules CxxArgListToStr: - [ e | [h|tail] ] -> <concat-strings> [ e, ", ", <CxxArgListToStr> [h|tail] ] + [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] CxxArgListToStr: - [e | []] -> e + [e | []] -> <CxxExpToStr> e CxxArgListToStr: [] -> "" @@ -46,3 +46,18 @@ CxxExpToAbox: x -> S(<CxxExpToStr> x) + + CxxExpToAbox: + CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf "< " ~<CxxListToAbox(CxxParameterToAbox|",")> params " >" "(" ~S(~<CxxArgListToStr> args) ")" ] + where <debug> params + + + CxxParameterToAbox: + type -> abox_type + where + <CxxTypeToAbox> type => abox_type + + CxxParameterToAbox: + exp -> abox_exp + where + <CxxExpToAbox> exp => abox_exp Index: branches/scool-ng/src/pp-cxx/CxxStm.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxStm.str (revision 93) +++ branches/scool-ng/src/pp-cxx/CxxStm.str (revision 94) @@ -11,8 +11,9 @@ // As said on https://trac.lrde.org/scool/wiki/SCOOL/Specs/Misc the C++ inserted // must be valid and so contain an ending ';' Semicolon: - _#([_, CxxProgram(exp)]) -> S("") + _#([_, CxxProgram(_)]) -> S("") Semicolon: - _#([_, _]) -> S(";") + x -> S(";") + where not(<?_#([_, CxxProgram(_)])> x) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

scool r93: Add reference files for tests on template functions

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on template functions * check.sh: Remove debug message. * function/c++_src/call_001.cc: New. * function/c++_src/call_002.cc: New. * function/c++_src/call_003.cc: New. * function/c++_src/call_004.cc: New. * function/c++_src/call_005.cc: New. * function/c++_src/call_006.cc: New. check.sh | 1 - function/c++_src/call_001.cc | 4 ++++ function/c++_src/call_002.cc | 4 ++++ function/c++_src/call_003.cc | 4 ++++ function/c++_src/call_004.cc | 4 ++++ function/c++_src/call_005.cc | 4 ++++ function/c++_src/call_006.cc | 4 ++++ 7 files changed, 24 insertions(+), 1 deletion(-) Index: branches/scool-ng/tests/function/c++_src/call_001.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_001.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_001.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(); +} Index: branches/scool-ng/tests/function/c++_src/call_002.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_002.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_002.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(42); +} Index: branches/scool-ng/tests/function/c++_src/call_003.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_003.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_003.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(bar, 42); +} Index: branches/scool-ng/tests/function/c++_src/call_004.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_004.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_004.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< int >(); +} Index: branches/scool-ng/tests/function/c++_src/call_005.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_005.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_005.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< 42 >(); +} Index: branches/scool-ng/tests/function/c++_src/call_006.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_006.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_006.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< int, 42 >(42); +} Index: branches/scool-ng/tests/check.sh =================================================================== --- branches/scool-ng/tests/check.sh (revision 92) +++ branches/scool-ng/tests/check.sh (revision 93) @@ -266,7 +266,6 @@ -t) shift tests="$1" - echo "XTEST: " $1 ;; -h | --help) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

cleanup-2008 2373: Start a new documentation file about the value properties.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Start a new documentation file about the value properties. * doc/technical/designs/properties: New. * doc/technical/designs/properties/values.txt: New doc file. values.txt | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) Index: doc/technical/designs/properties/values.txt --- doc/technical/designs/properties/values.txt (revision 0) +++ doc/technical/designs/properties/values.txt (revision 0) @@ -0,0 +1,168 @@ +-*- outline -*- + + Values related properties + + +* TODO + -> Are the properties related to the values sufficiant? + -> What are the interface related to each value property? + -> How these values properties affect the fill/paste/transform process? + +* Values properties list: + +** value_access: /any/ + | + + -- direct + | + + -- computed + + +** value_storage:/any/ + | + + -- /organized/ + | | + | + -- singleton + | | + | + -- one_block + | | + | + -- piecewise + | + + -- disrupted + +=> Methods related: + value_storage == singleton + => ima.value() -> return the image value + + value_storage == one_block + => image.nelements() -> return the number of elements in memory + => image.buffer() -> return the start adress of the ima buffer + + value_storage == piece_wise + //FIXME + +** value_browsing:/any/ + | + + -- site_wise_only + | + + -------- cell_wise + | | + + -- value_wise | + \ | + -- + -- cell_and_value_wise + +=> Methods related: + value_browsing == value_wise + => ima.values_taken() -> return the current values taken by + ima + => ima.change_value(oldVal, newVal) -> change the value oldVal to newVal + => ima.change_values(f) -> apply f (a function v2v) to all the + values + => ima.sites(v) -> return the sites associated to the + value v + + value_browsing == cell_wise + => ima.values_cell() -> return the cells composing the image + + value_browsing == cell_and_value_wise + method of value_wise property value + cell_wise property value + + + + + +* fill (depends on the value_storage property) + +*** values_storage == oneblock +// Replace by Memcopy? +const unsigned n = ima.nelements(); +mln_value(I)* ptr = ima.buffer(); +for (unsigned i = 0; i < n; ++i) + *ptr++ = val; + +**** Method related +-> nelements +-> buffer + + +*** value_storage == piece_wise +// MemCopy on the runs? +for (ungsigned i = 0; i < ima.nruns(); ++i) + //FIXME +**** Method related: + nruns ??? + + +*** value_storage == any && value_browsing == value_wise + +// direct access to the value +mln_viter(mln_taken_values(I)) viter(I.taken_values(); +for_all(viter); + ima.changes_values(viter, v); + +**** Method related: + -> iterator on value taken + -> change_values + +*** Generic case: all the other case +mln_piter(I) p(ima.domain()); +for_all(p) + ima(p) = v; + + +* To keep in Mind + +-image storage in memory + +=> Computed + [...] + +=> All is store + + 0 1 2 3 4 + ---------- +0 |eeeeeeeeee| +1 |errrbbbgge| +2 |ebbbggrrre| +3 |errbbbrrbe| // e is the extended border +4 |eeeeeeeeee| + ---------- + + +=> Run + + 0 1 2 3 4 + ---------- +0 | | +1 | rbrrb | +2 | | +3 | bbbbb| +4 |grgbb | + ---------- + +=> Values oriented + +r : (5,2), (4, 2), (6, 2) +g : (5,4), (4, 4), (6, 3) +b : (2,2), (1, 2), (3, 2) + +-differentiate the localization of an image and its storage method. + +* Image related with 'special' values access + +** Run Images (sparce, value_encoded) + +=> fill: *cpt++ = v sur chaque run +| ++-> related to memory storage + +** Pkey Images + +=> change_value + + + +* Note + +- Cell access and Value access wise property depends on the image + --> property related: + cell-wise and value wise

16 years, 3 months

2373: * tests/morpho/line_graph_image_wst.cc: Remove useless #include's.

by Roland Levillain

--- milena/ChangeLog | 4 ++++ milena/tests/morpho/line_graph_image_wst.cc | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0781e3..bd979d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + * tests/morpho/line_graph_image_wst.cc: Remove useless #include's. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix test graph_image_wst. * tests/core/image/graph_image_wst.cc: Move test... diff --git a/milena/tests/morpho/line_graph_image_wst.cc b/milena/tests/morpho/line_graph_image_wst.cc index 06e22e7..ce6514f 100644 --- a/milena/tests/morpho/line_graph_image_wst.cc +++ b/milena/tests/morpho/line_graph_image_wst.cc @@ -37,10 +37,6 @@ #include <mln/morpho/meyer_wst.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { -- 1.6.0.1

16 years, 3 months

2372: Fix test graph_image_wst.

by Roland Levillain

* tests/core/image/graph_image_wst.cc: Move test... * tests/morpho/graph_image_wst.cc: ...here. Catch up with interfaces of cleanup-2008. Turn this test into an actual WST segmentation of a graph image. * tests/core/image/Makefile.am (check_PROGRAM): Remove graph_image_wst. (graph_image_wst_SOURCES): Move... * tests/morpho/Makefile.am: ...here. (check_PROGRAM): Add graph_image_wst. --- milena/ChangeLog | 14 +++ milena/tests/core/image/Makefile.am | 5 - milena/tests/core/image/graph_image_wst.cc | 149 ---------------------------- milena/tests/morpho/Makefile.am | 3 + milena/tests/morpho/graph_image_wst.cc | 120 ++++++++++++++++++++++ 5 files changed, 137 insertions(+), 154 deletions(-) delete mode 100644 milena/tests/core/image/graph_image_wst.cc create mode 100644 milena/tests/morpho/graph_image_wst.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 193a46d..f0781e3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix test graph_image_wst. + + * tests/core/image/graph_image_wst.cc: Move test... + * tests/morpho/graph_image_wst.cc: ...here. + Catch up with interfaces of cleanup-2008. + Turn this test into an actual WST segmentation of a graph image. + * tests/core/image/Makefile.am (check_PROGRAM): Remove + graph_image_wst. + (graph_image_wst_SOURCES): Move... + * tests/morpho/Makefile.am: ...here. + (check_PROGRAM): Add graph_image_wst. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix more morphological tests on graph-based images. * tests/morpho/Makefile.am (check_PROGRAMS): Re-enable diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index dc247cc..27435a1 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -10,7 +10,6 @@ check_PROGRAMS = \ flat_image \ ## hexa \ graph_image \ -## graph_image_wst \ image1d \ image2d \ ## image2d_h \ @@ -36,10 +35,6 @@ cast_image_SOURCES = cast_image.cc complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc -### FIXME: graph_image_wst is almost a clone of graph_image: move it -### into tests/morpho and turn it into a real test on the WST (see -### line_graph_image_wst). -##graph_image_wst_SOURCES = graph_image_wst.cc flat_image_SOURCES = flat_image.cc ##hexa_SOURCES = hexa.cc image1d_SOURCES = image1d.cc diff --git a/milena/tests/core/image/graph_image_wst.cc b/milena/tests/core/image/graph_image_wst.cc deleted file mode 100644 index 8f2acc3..0000000 --- a/milena/tests/core/image/graph_image_wst.cc +++ /dev/null @@ -1,149 +0,0 @@ -// 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. - -/// \file tests/core/image/graph_image_wst.cc -/// \brief Tests on the Watershed Transform on a mln::graph_image. - -#include <vector> - -#include <mln/core/alias/point2d.hh> -#include <mln/core/image/graph_image.hh> -#include <mln/core/image/graph_elt_window.hh> -#include <mln/core/image/graph_window_piter.hh> - -#include <mln/morpho/dilation.hh> - -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - - -int main() -{ - using namespace mln; - - /*--------. - | Graph. | - `--------*/ - - // Points associated to nodes. - std::vector<point2d> points; - points.push_back(point2d(0,0)); // Point associated to node 0. - points.push_back(point2d(2,2)); // Point associated to node 1. - points.push_back(point2d(0,4)); // Point associated to node 2. - points.push_back(point2d(4,3)); // Point associated to node 3. - points.push_back(point2d(4,4)); // Point associated to node 4. - - // Edges. - util::graph<point2d> g; - // Populate the graph with nodes. - for (unsigned i = 0; i < points.size(); ++i) - g.add_node (points[i]); - // Populate the graph with edges. - g.add_edge(0, 1); - g.add_edge(1, 2); - g.add_edge(1, 3); - g.add_edge(3, 4); - g.add_edge(4, 2); - - /*-------. - | Graph. | - `-------*/ - - p_graph<point2d> pg(g); - - /*-------------. - | Graph image. | - `-------------*/ - - // Values ("empty" vector). - std::vector<int> values(5); - // Graph image. - typedef graph_image<point2d, int> ima_t; - ima_t ima(pg, values); - // Initialize values. - debug::iota(ima); - // Print the image. - /* FIXME: Unfortunately, displaying graph images is not easy right - now (2008-02-05). We could use - - debug::println(ima); - - but there's not specialization working for graph_image; the one - selected by the compiler is based on a 2-D bbox, and expects the - interface of graph_image to work with points (not psites). - Moreover, this implementation only shows *values*, not the graph - itslef. - - An alternative is to use draw::graph (which, again, is misnamed), - but it doesn't show the values, only the nodes and edges of the - graph. - - The current solution is a mix between draw::graph and hand-made - iterations. */ - image2d<int> ima_rep(ima.bbox()); - // We use the value 9 in draw::graph instead of the default (which is - // 1) to represent edges to distinguish it from nodes holding a - // value of 1. - draw::graph (ima_rep, ima, 9); - debug::println (ima_rep); - - - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" < win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "neighbors of " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; - } - std::cout << std::endl; - - /*-------------------------. - | Processing graph images. | - `-------------------------*/ - - graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - draw::graph(ima_rep, ima_dil, 9); - debug::println(ima_rep); - - graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - draw::graph(ima_rep, ima_ero, 9); - debug::println(ima_rep); -} diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 48e3a82..d47f5d4 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -16,6 +16,7 @@ check_PROGRAMS = \ gradient \ gradient_elementary \ graph_image_morpho \ + graph_image_wst \ hit_or_miss \ laplacian \ lena_line_graph_image_wst1 \ @@ -54,9 +55,11 @@ laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc graph_image_morpho_SOURCES = graph_image_morpho.cc +graph_image_wst_SOURCES = graph_image_wst.cc line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc + meyer_wst_SOURCES = meyer_wst.cc combined_SOURCES = combined.cc diff --git a/milena/tests/morpho/graph_image_wst.cc b/milena/tests/morpho/graph_image_wst.cc new file mode 100644 index 0000000..41dcd5e --- /dev/null +++ b/milena/tests/morpho/graph_image_wst.cc @@ -0,0 +1,120 @@ +// 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. + +/// \file tests/morpho/graph_image_wst.cc +/// \brief Tests on the Watershed Transform on a mln::graph_image. + +#include <vector> + +#include <mln/core/alias/point2d.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_neighborhood_piter.hh> + +#include <mln/morpho/meyer_wst.hh> + + +int main() +{ + using namespace mln; + + /*--------. + | Graph. | + `--------*/ + + /* The graph is as follows: + + 0 1 2 3 4 + .----------- + | + 0 | 0 2 + 1 | \ / | + 2 | 1 | + 3 | \ | + 4 | 3-0 + + */ + + // Points associated to vertices. + std::vector<point2d> points; + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. + + // Edges. + util::graph<point2d> g; + // Populate the graph with vertices. + for (unsigned i = 0; i < points.size(); ++i) + g.add_vertex (points[i]); + // Populate the graph with edges. + g.add_edge(0, 1); + g.add_edge(1, 2); + g.add_edge(1, 3); + g.add_edge(3, 4); + g.add_edge(4, 2); + + /*-------. + | Graph. | + `-------*/ + + p_graph<point2d> pg(g); + + /*-------------. + | Graph image. | + `-------------*/ + + // Values. + std::vector<int> values(5); + values[0] = 0; // Value associated to vertex 0. + values[1] = 1; // Value associated to vertex 1. + values[2] = 2; // Value associated to vertex 2. + values[3] = 3; // Value associated to vertex 3. + values[4] = 0; // Value associated to vertex 4. + // Graph image. + typedef graph_image<point2d, int> ima_t; + ima_t ima(pg, values); + + /*------. + | WST. | + `------*/ + + typedef graph_elt_neighborhood<point2d> nbh_t; + nbh_t nbh; + + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef graph_image<point2d, wst_val_t> wst_ima_t; + wst_ima_t wshed = morpho::meyer_wst(ima, nbh, nbasins); + std::cout << "nbasins = " << nbasins << std::endl; + + // Manual iteration over the domain of WSHED. + mln_piter_(wst_ima_t) pw(wshed.domain()); + for_all (pw) + std::cout << "wshed (" << pw << ") = " << wshed(pw) << std::endl; +} -- 1.6.0.1

16 years, 3 months

2371: Fix more morphological tests on graph-based images.

by Roland Levillain

* tests/morpho/Makefile.am (check_PROGRAMS): Re-enable graph_image_morpho, lena_line_graph_image_wst1, line_graph_image_wst and line_graph_image_morpho. * tests/morpho/graph_image_morpho.cc * tests/morpho/line_graph_image_morpho.cc: Add missing code from tests/core/image/graph_image.cc and tests/core/image/line_graph_image.cc to have this test pass again. * tests/morpho/lena_line_graph_image_wst1.cc: Catch up with util::ord usage and domain's has() semantics. --- milena/ChangeLog | 14 ++++++++ milena/tests/core/image/Makefile.am | 3 ++ milena/tests/morpho/Makefile.am | 8 ++-- milena/tests/morpho/graph_image_morpho.cc | 36 +++++++++++++++++++++ milena/tests/morpho/lena_line_graph_image_wst1.cc | 7 +++- milena/tests/morpho/line_graph_image_morpho.cc | 3 ++ 6 files changed, 65 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index abe1c4e..193a46d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix more morphological tests on graph-based images. + + * tests/morpho/Makefile.am (check_PROGRAMS): Re-enable + graph_image_morpho, lena_line_graph_image_wst1, + line_graph_image_wst and line_graph_image_morpho. + * tests/morpho/graph_image_morpho.cc + * tests/morpho/line_graph_image_morpho.cc: + Add missing code from tests/core/image/graph_image.cc and + tests/core/image/line_graph_image.cc to have this test pass again. + * tests/morpho/lena_line_graph_image_wst1.cc: Catch up with + util::ord usage and domain's has() semantics. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have morphological erosion work on non-classical image types. * mln/morpho/erosion.spe.hh diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index bf39e2b..dc247cc 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -36,6 +36,9 @@ cast_image_SOURCES = cast_image.cc complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc +### FIXME: graph_image_wst is almost a clone of graph_image: move it +### into tests/morpho and turn it into a real test on the WST (see +### line_graph_image_wst). ##graph_image_wst_SOURCES = graph_image_wst.cc flat_image_SOURCES = flat_image.cc ##hexa_SOURCES = hexa.cc diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 36f11dd..48e3a82 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -15,13 +15,13 @@ check_PROGRAMS = \ erosion_min_h \ gradient \ gradient_elementary \ -## graph_image_morpho \ + graph_image_morpho \ hit_or_miss \ laplacian \ -## lena_line_graph_image_wst1 \ + lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ -## line_graph_image_wst \ -## line_graph_image_morpho \ + line_graph_image_wst \ + line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ diff --git a/milena/tests/morpho/graph_image_morpho.cc b/milena/tests/morpho/graph_image_morpho.cc index 2acc5a5..0653953 100644 --- a/milena/tests/morpho/graph_image_morpho.cc +++ b/milena/tests/morpho/graph_image_morpho.cc @@ -38,6 +38,7 @@ #include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> #include <mln/draw/graph.hh> #include <mln/debug/iota.hh> @@ -105,10 +106,45 @@ int main() // Initialize values. debug::iota(ima); + /*-------------------------------------. + | Image representation/visualization. | + `-------------------------------------*/ + + // Compute the bounding box of IMA. + /* FIXME: mln::graph_image should automatically feature a bbox when + its parameter P is akin to a point. */ + accu::bbox<point2d> a; + for (std::vector<point2d>::const_iterator i = points.begin(); + i != points.end(); ++i) + a.take(*i); + box2d bbox = a.to_result(); + // Print the image. + /* FIXME: Unfortunately, displaying graph images is not easy right + now (2008-02-05). We could use + + debug::println(ima); + + but there's not specialization working for graph_image; the one + selected by the compiler is based on a 2-D bbox, and expects the + interface of graph_image to work with points (not psites). + Moreover, this implementation only shows *values*, not the graph + itslef. + + An alternative is to use draw::graph (which, again, is misnamed), + but it doesn't show the values, only the vertices and edges of the + graph. + + The current solution is a mix between draw::graph and hand-made + iterations. */ + image2d<int> ima_rep(bbox); + /*--------------------------. | Processing graph images. | `--------------------------*/ + typedef graph_elt_window<point2d> win_t; + win_t win; + graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); draw::graph(ima_rep, ima_dil, 9); debug::println(ima_rep); diff --git a/milena/tests/morpho/lena_line_graph_image_wst1.cc b/milena/tests/morpho/lena_line_graph_image_wst1.cc index 0af7832..d60980f 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst1.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst1.cc @@ -46,8 +46,11 @@ in it, interpolating inter-pixel points; \li print the watershed on lines into that same image, and save it. */ +#include <map> #include <vector> +#include <mln/util/ord.hh> + #include <mln/core/image/image2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/alias/window2d.hh> @@ -112,7 +115,7 @@ int main() exhibits the lack of a service from util::graph (or a another, missing tool) regarding the retrieval of vertex ids from points. */ - std::map<point2d, util::vertex_id> points; + std::map<point2d, util::vertex_id, util::ord<point2d> > points; util::vertex_id id = 0; // Vertices. @@ -136,7 +139,7 @@ int main() mln_fwd_qiter_(window2d) q(next_c4_win, p); for_all (p) for_all (q) - if (work.has(q)) + if (work.domain().has(q)) { g.add_edge(points[p], points[q]); edge_values.push_back(math::max(work(p), work(q))); diff --git a/milena/tests/morpho/line_graph_image_morpho.cc b/milena/tests/morpho/line_graph_image_morpho.cc index a3c74cf..43bf66b 100644 --- a/milena/tests/morpho/line_graph_image_morpho.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -109,6 +109,9 @@ int main() | Processing graph images. | `--------------------------*/ + typedef line_graph_elt_window<point2d> win_t; + win_t win; + line_graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); // Manual iteration over the domain of IMA_DIL. mln_piter_(ima_t) p_dil(ima_dil.domain()); -- 1.6.0.1

16 years, 3 months

2370: Have morphological erosion work on non-classical image types.

by Roland Levillain

* mln/morpho/erosion.spe.hh (mln::morpho::internal::erosion_dispatch): (Temporarily) disable delegation to fastest routines. --- milena/ChangeLog | 8 ++++++++ milena/mln/morpho/erosion.spe.hh | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7a5b4cd..abe1c4e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + + Have morphological erosion work on non-classical image types. + + * mln/morpho/erosion.spe.hh + (mln::morpho::internal::erosion_dispatch): (Temporarily) disable + delegation to fastest routines. + 2008-09-22 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add basic conversion + minor fixes. diff --git a/milena/mln/morpho/erosion.spe.hh b/milena/mln/morpho/erosion.spe.hh index 1fff72d..39f2faf 100644 --- a/milena/mln/morpho/erosion.spe.hh +++ b/milena/mln/morpho/erosion.spe.hh @@ -444,16 +444,23 @@ namespace mln { if (mlc_equal(mln_trait_image_kind(I)(), trait::image::kind::logic)::value == true) +/* FIXME: Temporarily disabled, since this dynamic dispatch triggers + errors when class I has no pixter associated type(s). */ +#if 0 if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) return impl::erosion_on_set_fastest(input, win); else +#endif return impl::generic::erosion_on_set(input, win); else +// FIXME: Likewise. +#if 0 if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) return impl::erosion_on_function_fastest(input, win); else +#endif return impl::generic::erosion_on_function(input, win); } -- 1.6.0.1

16 years, 3 months

Des pointeurs pour les graphes et images de graphes

by Roland Levillain

Je viens de boucler la migration des dernières classes concernant les graphes et images de graphes ce soir. J'ai mis à jour la page du Trac qui référence les fichiers concernés : https://trac.lrde.org/olena/wiki/Olena/GraphBasedImages Ça peut t'être utile pour retrouver l'information nécessaire à ton travail. La plupart des tests passent, sauf ceux qui utilisent la morpho élémentaire (à cause du nouveau dispatcher dynamique de l'érosion et de la dilatation, mais c'est un autre sujet). Ne pas hésiter à me solliciter en cas de doute. Je vais continuer mon travail sur les complexes, en suivant/poursuivant un chemin parallèle au tient vis-à-vis des graphes : tu peux y jeter un oeil pour t'en inspirer. Bon courage !

16 years, 4 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