November 2008 - Olena-patches

2927: Mixin working for op_less.
by Alexandre Abraham 20 Nov '08

20 Nov '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Mixin working for op_less. * abraham/tests/morpho/test_watershed_topo.cc: . * abraham/tests/morpho/Makefile: . * abraham/tests/value/mixin.cc: New. * abraham/mln/core/image/thru.hh: . * abraham/mln/value/mixin.hh: New. * abraham/mln/value/op_less.hh: New. * abraham/mln/value/shell.hh: . mln/core/image/thru.hh | 4 - mln/value/mixin.hh | 117 ++++++++++++++++++++++++++++++++++++ mln/value/op_less.hh | 46 ++++++++++++++ mln/value/shell.hh | 3 tests/morpho/Makefile | 2 tests/morpho/test_watershed_topo.cc | 46 ++++---------- tests/value/mixin.cc | 64 +++++++++++++++++++ 7 files changed, 247 insertions(+), 35 deletions(-) Index: abraham/tests/morpho/test_watershed_topo.cc --- abraham/tests/morpho/test_watershed_topo.cc (revision 2926) +++ abraham/tests/morpho/test_watershed_topo.cc (working copy) @@ -13,49 +13,33 @@ #include <string> #include <iostream> -int print_and_exit (std::string s) -{ - std::cerr << s << std::endl; - return 1; -} - -int main () +int main (int argc, const char * argv[]) { using namespace mln; using value::int_u8; typedef image2d<int_u8> image2dint; - image2dint input, mverif, wverif; - - // #define TEST - - // io::pgm::load(input, "./images/test_watershed.pgm"); - // io::pgm::load(input, "./images/little_test.pgm"); - io::pgm::load(input, "./images/test.pgm"); - // io::pgm::load(input, "../../img/dots.pgm"); - //io::pgm::load(input, "./images/+irm6.pgm"); - - // io::pgm::load(input, "./images/lena_light.pgm"); - // io::pgm::load(mverif, "./images/result_m_watershed.pgm"); - // io::pgm::load(wverif, "./images/result_topo_watershed.pgm"); - - morpho::topo_wst< image2d<int_u8>, neighb2d> n(input, c4()); + if (argc < 2) { + std::cerr << "usage: " << argv[0] << " in.pgm [other_files.pgm]" << std::endl; + return 1; + } - /* - image2dint::fwd_piter it(input.domain()); - for_all(it) + for (int i = 1; i < argc; ++i) { - input(it) = input(it)/17; - mverif(it) = mverif(it)/17; - } - */ - // io::tikz::save(input, "start.tex"); + image2dint ima; + io::pgm::load(ima, argv[i]); + + morpho::topo_wst< image2d<int_u8>, neighb2d> n(ima, c4()); n.go(); - io::pgm::save(n.pima, "out.pgm"); + std::string name(argv[i]); + name.erase(name.length() - 4); + + io::pgm::save(n.pima, name.append("_wsd.pgm")); + } return 0; } Index: abraham/tests/morpho/Makefile --- abraham/tests/morpho/Makefile (revision 2926) +++ abraham/tests/morpho/Makefile (working copy) @@ -2,7 +2,7 @@ OBJ=$(SRC:.cc=.o) EXEC=$(SRC:.cc=) CC=g++ -CXXFLAGS=-Wall -W -I ../../ -I ../../../../ -g +CXXFLAGS=-Wall -W -I ../../ -I ../../../../ -O3 -DNDEBUG all: $(EXEC) Index: abraham/tests/value/mixin.cc --- abraham/tests/value/mixin.cc (revision 0) +++ abraham/tests/value/mixin.cc (revision 0) @@ -0,0 +1,64 @@ +// Copyright (C) 2007 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 +// 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/value/mixin.hh + * + * \brief Mixin types. + */ + + +#include <mln/value/mixin.hh> +#include <mln/value/rgb.hh> +#include <mln/value/rgb8.hh> + + +namespace mln +{ + + namespace value + { + template <unsigned int n> + struct op_less< mln::value::rgb<n> > + { + bool operator()(const mln::value::rgb<n> &a, const mln::value::rgb<n> &b) + { + return a.red() < b.red(); + } + }; + } +} + +int main () +{ + mln::value::rgb8 r(12, 13, 14); + mln::value::rgb8 s(13, 14, 15); + + std::cout + << ( *(mln::value::mixin<mln::value::rgb8, mln::value::op_less>*)(void*) &r < + *(mln::value::mixin<mln::value::rgb8, mln::value::op_less>*)(void*) &s ) + << std::endl; +} Index: abraham/mln/core/image/thru.hh --- abraham/mln/core/image/thru.hh (revision 2926) +++ abraham/mln/core/image/thru.hh (working copy) @@ -118,6 +118,8 @@ /// Mutable access is for reading and writing. lvalue operator()(const mln_psite(I)& p); + + F f; }; # ifndef MLN_INCLUDE_ONLY @@ -164,7 +166,7 @@ thru<F,I>::operator()(const mln_psite(I)& p) const { mln_precondition(this->data_->ima_.has(p)); - return F()( this->data_->ima_(p) ); + return f( this->data_->ima_(p) ); } template <typename F, typename I> Index: abraham/mln/value/mixin.hh --- abraham/mln/value/mixin.hh (revision 0) +++ abraham/mln/value/mixin.hh (revision 0) @@ -0,0 +1,117 @@ +// Copyright (C) 2007 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_VALUE_MIXIN_HH +# define MLN_CORE_VALUE_MIXIN_HH + +# include <mln/core/concept/function.hh> +# include <mln/core/concept/image.hh> +# include <mln/value/internal/value_like.hh> +# include <mln/value/op_less.hh> // FIXME : include all modificators + +namespace mln +{ + namespace value + { + template <typename T, template <typename> class F> + struct mixin; + } + + namespace trait + { + + template <typename T, template <typename> class F> + struct value_< mln::value::mixin<T, F> > + : value_< T > // FIXME + { + }; + + } // end of namespace trait + + namespace value + { + + template <typename T, template <typename> class F> + struct mixin : T, Value < mixin<T, F> >, internal::value_like_ <T, mln_enc(T), mixin<T, F>, mixin<T, F> > + { + typedef T value; + + // Ctor ? + + // operator (T) (); + + }; + } + +# ifndef MLN_INCLUDE_ONLY + + namespace value + { + + template <typename T> + struct mixin <T, op_less> : T, Value < mixin<T, op_less> >, internal::value_like_ <T, mln_enc(T), mixin<T, op_less>, mixin<T, op_less> > + { + typedef mixin<T, op_less> exact; + + bool operator< (const exact &rhs) + { + static op_less<T> l; + return l((T)*this, (T)rhs); + } + }; + + // Ctor + + // template <typename T, template <typename> class F> + // mixin<T, F>::operator(T)() + // { + // return (T)*this; + // } + + } + +/* + template <typename F, typename I> + std::ostream& operator<<(std::ostream& ostr, value::shell<F, I> &s) + { + ostr << (typename value::shell<F, I>::value) s; + return ostr; + } + + template <typename F, typename I> + std::istream& operator>>(std::istream& istr, value::shell<F, I> &s) + { + (typename value::shell<F, I>::value) s >> istr; + return istr; + } +*/ + +# endif // MLN_INCLUDE_ONLY + +}; // end of namespace mln + +#endif // MLN_CORE_VALUE_MIXIN_HH Index: abraham/mln/value/op_less.hh --- abraham/mln/value/op_less.hh (revision 0) +++ abraham/mln/value/op_less.hh (revision 0) @@ -0,0 +1,46 @@ +// Copyright (C) 2007 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_VALUE_OP_LESS_HH +# define MLN_CORE_VALUE_OP_LESS_HH + +namespace mln +{ + + namespace value + { + + template <typename T> + struct op_less + { + // Should have an operator() (T& lhs, T& rhs) + }; + + } // end of namespace value +} // end of namespace mln + +#endif // ! MLN_CORE_VALUE_OP_LESS_HH Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 2926) +++ abraham/mln/value/shell.hh (working copy) @@ -48,8 +48,7 @@ template <typename F, typename I> struct value_< mln::value::shell<F, I> > - : - value_< mln_result(F) > + : value_< mln_result(F) > { };

1 0

milena r2926: Put algebraic_union_find into a routine
by Matthieu Garrigues 19 Nov '08

19 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-11-19 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Put algebraic_union_find into a routine. * mln/canvas/morpho/algebraic_union_find.hh: algebraic_union_find is now a routine. The old version (functor) is renamed as algebraic_union_find_f. * mln/morpho/closing_attribute.hh, * mln/morpho/opening_attribute.hh: Update to use algebraic_union_find as a routine instead of a functor. --- canvas/morpho/algebraic_union_find.hh | 157 +++++++++++++++++++++++++++++++++- morpho/closing_attribute.hh | 74 ++++++++++++++-- morpho/opening_attribute.hh | 77 +++++++++++++++- 3 files changed, 295 insertions(+), 13 deletions(-) Index: trunk/milena/mln/morpho/closing_attribute.hh =================================================================== --- trunk/milena/mln/morpho/closing_attribute.hh (revision 2925) +++ trunk/milena/mln/morpho/closing_attribute.hh (revision 2926) @@ -56,9 +56,73 @@ namespace impl { + template <typename I, typename A_> + struct closing_attribute_t + { + // requirements from mln::canvas::morpho::algebraic_union_find + + typedef A_ A; + typedef mln_psite(I) P; + typedef p_array S; + + mln_result(A) lambda; + const S s; + + inline + void init() + { + // FIXME: border::fill(input, mln_max(mln_value(I))); + } + + inline + bool is_active(const A& attr) const + { + return attr.to_result() < lambda; + } + + inline + void inactivate(A& attr) + { + attr.set_value(lambda); + } + + // end of requirements + + inline + closing_attribute_t(const Image& input, mln_result(A) lambda) + : lambda(lambda), + s(level::sort_psites_increasing(exact(input))) + { + } + + }; + + } // end of namespace mln::morpho::impl + + + template <typename A, + typename I, typename N, typename O> + inline + void closing_attribute(const Image& input, + const Neighborhood<N>& nbh, mln_result(A) lambda, + Image<O>& output) + { + typedef impl::closing_attribute_t<I, A> F; + F f(input, lambda); + canvas::morpho::algebraic_union_find(input, nbh, f, output); + + mln_postcondition(output >= input); + } + + // ----------------------------------------------------------- + // Old code below. + + namespace impl + { + template <typename A_, typename I_, typename N_, typename O_> - struct closing_attribute_t + struct closing_attribute_t_f { typedef mln_psite(I_) P; @@ -104,7 +168,7 @@ // end of requirements inline - closing_attribute_t(const I_& input, const N_& nbh, + closing_attribute_t_f(const I_& input, const N_& nbh, mln_result(A) lambda, O_& output) : input(input), nbh(nbh), lambda(lambda), output(output), s(level::sort_psites_increasing(input)) @@ -119,7 +183,7 @@ template <typename A, typename I, typename N, typename O> inline - void closing_attribute(const Image& input_, + void closing_attribute_f(const Image& input_, const Neighborhood<N>& nbh_, mln_result(A) lambda, Image<O>& output_) { @@ -128,9 +192,9 @@ O& output = exact(output_); mln_precondition(output.domain() == input.domain()); - typedef impl::closing_attribute_t<A,I,N,O> F; + typedef impl::closing_attribute_t_f<A,I,N,O> F; F f(input, nbh, lambda, output); - canvas::morpho::algebraic_union_find<F> run(f); + canvas::morpho::algebraic_union_find_f<F> run(f); mln_postcondition(output >= input); } Index: trunk/milena/mln/morpho/opening_attribute.hh =================================================================== --- trunk/milena/mln/morpho/opening_attribute.hh (revision 2925) +++ trunk/milena/mln/morpho/opening_attribute.hh (revision 2926) @@ -56,9 +56,75 @@ namespace impl { + template <typename I, typename A_> + struct opening_attribute_t + { + // requirements from mln::canvas::morpho::algebraic_union_find + + typedef A_ A; + typedef mln_psite(I) P; + typedef p_array S; + + mln_result(A) lambda; + const S s; + + inline + void init() + { + // FIXME: border::fill(input, mln_max(mln_value(I))); + } + + inline + bool is_active(const A& attr) const + { + return attr.to_result() < lambda; + } + + inline + void inactivate(A& attr) + { + attr.set_value(lambda); + } + + // end of requirements + + inline + opening_attribute_t(const Image& input, mln_result(A) lambda) + : lambda(lambda), + s(level::sort_psites_decreasing(exact(input))) + { + } + + }; + + } // end of namespace mln::morpho::impl + + + template <typename A, + typename I, typename N, typename O> + inline + void opening_attribute(const Image& input, + const Neighborhood<N>& nbh, mln_result(A) lambda, + Image<O>& output) + { + typedef impl::opening_attribute_t<I, A> F; + F f(input, lambda); + canvas::morpho::algebraic_union_find(input, nbh, f, output); + + mln_postcondition(output <= input); + } + + + // ----------------------------------------------------------- + // Old code below. + + + namespace impl + { + template <typename A_, typename I_, typename N_, typename O_> - struct opening_attribute_t + struct opening_attribute_t_f { typedef mln_psite(I_) P; @@ -99,7 +165,7 @@ // end of requirements inline - opening_attribute_t(const I_& input, const N_& nbh, + opening_attribute_t_f(const I_& input, const N_& nbh, mln_result(A) lambda, O_& output) : input(input), nbh(nbh), lambda(lambda), output(output), s(level::sort_psites_decreasing(input)) @@ -114,7 +180,7 @@ template <typename A, typename I, typename N, typename O> inline - void opening_attribute(const Image& input_, + void opening_attribute_f(const Image& input_, const Neighborhood<N>& nbh_, mln_result(A) lambda, Image<O>& output_) { @@ -123,13 +189,14 @@ O& output = exact(output_); mln_precondition(output.domain() == input.domain()); - typedef impl::opening_attribute_t<A,I,N,O> F; + typedef impl::opening_attribute_t_f<A,I,N,O> F; F f(input, nbh, lambda, output); - canvas::morpho::algebraic_union_find<F> run(f); + canvas::morpho::algebraic_union_find_f<F> run(f); mln_postcondition(output <= input); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho Index: trunk/milena/mln/canvas/morpho/algebraic_union_find.hh =================================================================== --- trunk/milena/mln/canvas/morpho/algebraic_union_find.hh (revision 2925) +++ trunk/milena/mln/canvas/morpho/algebraic_union_find.hh (revision 2926) @@ -49,10 +49,162 @@ namespace morpho { + // FIXME: Is it really needed? + struct opening_attribute_functor_base + { + inline void init() {} + + template <typename A> + inline bool is_active(const A&) const { return false; } + + template <typename A> + inline void inactivate(A&) {} + }; + + + template <typename I> + static inline + mln_psite(I) + find_root(I& parent, + const mln_psite(I)& x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + template <typename I, typename N, typename F, typename O> + void + algebraic_union_find(const Image& input_, + const Neighborhood<N>& nbh_, + F& f, + Image<O>& output_) + { + trace::entering("canvas::morpho::algebraic_union_find"); + + // FIXME: Tests? + + typedef typename F::S S; + typedef typename F::A A; + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + O& output = exact(output_); + + mln_precondition(output.domain() == input.domain()); + + // Local type. + typedef mln_psite(I) P; + + // Auxiliary data. + mln_ch_value(O, bool) deja_vu; + mln_ch_value(O, P) parent; + mln_ch_value(O, A) data; + + // init + { + initialize(deja_vu, input); + mln::level::fill(deja_vu, false); + initialize(parent, input); + initialize(data, input); + f.init(); // init required. + } + + // first pass + { + mln_fwd_piter(S) p(f.s); // s required. + mln_niter(N) n(nbh, p); + for_all(p) + { + // Make set. + { + parent(p) = p; + /* FIXME: What if the value_type of DATA (i.e., A) were not + based on a accu::count<mln::pix>? Currently, nothing + enforces this, but the code below expects this line to be + valid: + + data(p).take_as_init(make::pix(f.input, p)) + + which probably restricts the kind of input images. + + If we want to be more generic, the initialization should + read something like: + + init_data(p); + + i.e., the functor for the initialization of data should + be passed as an argument to the canvas' ctor. + + Of course, we might want to restrict attributes to the + accumulator accu::count<mln::pix> (which is perfectly + acceptable), but then this class should statically check + the conformance of the template parameter A to this + constraint. */ + data(p).take_as_init(make::pix(input, p)); // FIXME: algebraic so p! + } + + for_all(n) + if (input.domain().has(n) && deja_vu(n)) + { + //do_union(n, p); + P r = find_root(parent, n); + if (r != p) + { + if (input(r) == input(p) || f.is_active(data(r))) // Equiv(r, p) + // Either a flat zone or the component of r is still growing. + { + /* FIXME: Same remark as above concerning the + initialization of data(p); instead of + + data(p).take(data(r)); + + we should (or could) have + + unite_data(p, r); + + so as to keep the generic aspect of this canvas + (as long as the set of acceptable types for the + template parameter A is not bound). */ + data(p).take(data(r)); + parent(r) = p; + } + else + f.inactivate(data(p)); + } + } + deja_vu(p) = true; + } + } + + // second pass + { + mln_bkd_piter(S) p(f.s); + for_all(p) + if (parent(p) == p) // p is root. + output(p) = input(p); + else + output(p) = output(parent(p)); + } + + /* + Change 2nd pass into: + for_all(p) if (not is_root(p)) output(p) = output(parent(p)); + and add in init: + mln::level::assign(output, input); + */ + trace::exiting("canvas::morpho::algebraic_union_find"); + } + + + // ----------------------------------------------------------- + // Old code below. + // General version. template <typename F> - struct algebraic_union_find + struct algebraic_union_find_f { F& f; @@ -68,7 +220,7 @@ mln_ch_value(O, psite) parent; mln_ch_value(O, A) data; - algebraic_union_find(F& f) + algebraic_union_find_f(F& f) : f(f) { run(); @@ -194,7 +346,6 @@ }; - // FIXME: Fast version.

1 0

r2925: Clean and Fix tiled_image2d
by Matthieu Garrigues 19 Nov '08

19 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2008-11-19 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Clean and Fix tiled_image2d. * garrigues/tiled_image2d/backend/mmap.hh, * garrigues/tiled_image2d/tiled_image2d.cc, * garrigues/tiled_image2d/tiled_image2d.hh: Use a lru cache of size 10 instead of 1500. --- backend/mmap.hh | 7 +++++-- tiled_image2d.cc | 6 +++--- tiled_image2d.hh | 16 ++++++++++------ 3 files changed, 18 insertions(+), 11 deletions(-) Index: trunk/milena/sandbox/garrigues/tiled_image2d/backend/mmap.hh =================================================================== --- trunk/milena/sandbox/garrigues/tiled_image2d/backend/mmap.hh (revision 2924) +++ trunk/milena/sandbox/garrigues/tiled_image2d/backend/mmap.hh (revision 2925) @@ -42,8 +42,8 @@ typedef Block block_type; mmap_backend(int fd, unsigned n_blocks) - : fd_(fd), size_(n_blocks) { - + : fd_(fd), size_(n_blocks), n_loaded_(0) { + std::cout << "size: " << size_ << "blocks." << std::endl; assert(Block::nbytes % getpagesize() == 0); if (fd == -1) { perror("open"); exit(1); } assert(fd_ != -1); @@ -97,6 +97,7 @@ assert(n < size_); Block *b = loaded_[n]; loaded_[n] = 0; + n_loaded_--; if (munmap(b->bytes, Block::nbytes) == -1) perror("munmap"); } @@ -105,6 +106,7 @@ assert(n < size_); Block *b = loaded_[n]; if (!b) { + n_loaded_++; b = (Block*) mmap(0, Block::nbytes, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, fd_, n * Block::nbytes); if (b == (void*)-1) perror("mmap"); @@ -117,6 +119,7 @@ Block** loaded_; int fd_; unsigned size_; + int n_loaded_; }; Index: trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.hh =================================================================== --- trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2924) +++ trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.hh (revision 2925) @@ -72,10 +72,10 @@ template <typename T> struct data_< tiled_image2d<T> > { - typedef block<T, BLOCK_SIZE> block; - typedef mmap_backend<block> backend; - typedef lru_support<backend> support; - typedef layout2d<BLOCK_SIDE, BLOCK_SIDE> layout; + typedef typename tiled_image2d<T>::block block; + typedef typename tiled_image2d<T>::backend backend; + typedef typename tiled_image2d<T>::support support; + typedef typename tiled_image2d<T>::layout layout; data_(const box2d& b); ~data_(); @@ -154,9 +154,13 @@ /// Block type. typedef block<T, BLOCK_SIZE> block; + //typedef block<T, 10> block; + + /// Backend type. + typedef mmap_backend<block> backend; /// Support type. - typedef lru_support<mmap_backend<block> > support; + typedef lru_support<backend> support; /// Layout type typedef layout2d<BLOCK_SIDE, BLOCK_SIDE> layout; /// Page type @@ -245,7 +249,7 @@ support_(*new support( *new backend( open("/tmp/milena_tiled.image", O_RDWR | O_CREAT | O_TRUNC, 0664), layout::image_layout::size(geom::nrows(b), geom::ncols(b))), - 1500 // Fixme : size of lru cache. + 10 // Fixme : size of lru cache. ) ) { Index: trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc =================================================================== --- trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc (revision 2924) +++ trunk/milena/sandbox/garrigues/tiled_image2d/tiled_image2d.cc (revision 2925) @@ -45,10 +45,10 @@ using namespace mln; std::cout << "allocate the image." << std::endl; - tiled_image2d<value::int_u8> ima(1024 * 1024, 1024 * 1.5); + tiled_image2d<value::int_u8> ima(30000, 30024); std::cout << "fill the image." << std::endl; debug::iota(ima); - std::cout << "save the image." << std::endl; - io::pgm::save(ima, "test.pgm"); + //std::cout << "save the image." << std::endl; + //io::pgm::save(ima, "/tmp/test.pgm"); }

1 0

2924: Cleanup labeling::compute.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* mln/labeling/compute.hh: Refactor and cleanup. * mln/util/array.hh: add a two new constructors. --- milena/ChangeLog | 8 +++ milena/mln/labeling/compute.hh | 110 ++++++++++++++++++++++------------------ milena/mln/util/array.hh | 21 ++++++++ 3 files changed, 90 insertions(+), 49 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9ca0020..443fb05 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup labeling::compute. + + * mln/labeling/compute.hh: Refactor and cleanup. + + * mln/util/array.hh: add a two new constructors. + +2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an example using make::graph. * doc/examples/mk_graph.cc: new example. diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 5be6dca..1206c3d 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -33,6 +33,8 @@ /// Compute accumulators onto sites/values of each labeled component /// of an image. +# include <mln/core/concept/image.hh> +# include <mln/core/concept/accumulator.hh> # include <mln/core/concept/meta_accumulator.hh> # include <mln/util/array.hh> @@ -57,7 +59,8 @@ namespace mln util::array<mln_result(A)> compute(const Accumulator<A>& a, const Image& input, - const Image<J>& label, mln_value(J) nlabels); + const Image<J>& label, + const mln_value(J)& nlabels); /// Compute an accumulator onto the pixel values of the image \p input. /// for each component of the image \p label. @@ -73,7 +76,8 @@ namespace mln util::array<mln_accu_with(A, mln_value(I))::result> compute(const Meta_Accumulator<A>& a, const Image& input, - const Image<J>& label, mln_value(J) nlabels); + const Image<J>& label, + const mln_value(J)& nlabels); /// Compute an accumulator onto the pixel sites of each component domain of /// \p label. @@ -87,7 +91,8 @@ namespace mln template <typename A, typename J> util::array<mln_result(A)> compute(const Accumulator<A>& a, - const Image<J>& label, mln_value(J) nlabels); + const Image<J>& label, + const mln_value(J)& nlabels); /// Compute an accumulator onto the pixel sites of each component domain of /// \p label. @@ -101,7 +106,8 @@ namespace mln template <typename A, typename J> util::array<mln_accu_with(A, mln_psite(J))::result> compute(const Meta_Accumulator<A>& a, - const Image<J>& label, mln_value(J) nlabels); + const Image<J>& label, + const mln_value(J)& nlabels); @@ -112,30 +118,36 @@ namespace mln template <typename A, typename J> inline - void compute_tests(const Accumulator<A>&, - const Image<J>& label, - mln_value(J)) + void + compute_tests(const Accumulator<A>& a, + const Image<J>& label, + const mln_value(J)& nlabels) { mln_precondition(exact(label).has_data()); + (void) a; (void) label; + (void) nlabels; } template <typename A, typename I, typename J> inline - void compute_tests(const Accumulator<A>&, - const Image& input, - const Image<J>& label, - mln_value(J)) + void + compute_tests(const Accumulator<A>& a, + const Image& input, + const Image<J>& label, + const mln_value(J)& nlabels) { mln_precondition(exact(input).has_data()); mln_precondition(exact(label).has_data()); + (void) a; (void) input; (void) label; + (void) nlabels; } - } + } // end of namespace mln::labeling::internal @@ -148,68 +160,60 @@ namespace mln template <typename A, typename J> inline util::array<mln_result(A)> - compute(const Accumulator<A>& a, + compute(const Accumulator<A>& a_, const Image<J>& label_, - mln_value(J) nlabels) + const mln_value(J)& nlabels) { trace::entering("labeling::impl::generic::compute"); - internal::compute_tests(a, label_, nlabels); + internal::compute_tests(a_, label_, nlabels); + const A& a = exact(a_); const J& label = exact(label_); - util::array<A> accus; - for (mln_value(J) i = 0; i <= nlabels; ++i) - accus.append(exact(a)); + util::array<A> accus(nlabels + 1, a); mln_piter(J) p(label.domain()); - mln_value(J) l; for_all(p) accus[label(p)].take(p); - util::array<mln_result(A)> results; + util::array<mln_result(A)> arr(nlabels + 1); for (unsigned i = 0; i < accus.nelements(); ++i) if (accus[i].is_valid()) - results.append(accus[i]); - else - results.append(mln_result(A)()); + arr[i] = accus[i]; trace::exiting("labeling::impl::generic::compute"); - return results; + return arr; } template <typename A, typename I, typename J> inline util::array<mln_result(A)> - compute(const Accumulator<A>& a, + compute(const Accumulator<A>& a_, const Image& input_, const Image<J>& label_, - mln_value(J) nlabels) + const mln_value(J)& nlabels) { trace::entering("labeling::impl::generic::compute"); - internal::compute_tests(a, input_, label_, nlabels); + internal::compute_tests(a_, input_, label_, nlabels); + const A& a = exact(a_); const I& input = exact(input_); const J& label = exact(label_); - util::array<A> accus; - for (mln_value(J) i = 0; i <= nlabels; ++i) - accus.append(A()); + util::array<A> accus (nlabels + 1, a); mln_piter(I) p(input.domain()); - mln_value(J) l; for_all(p) accus[label(p)].take(input(p)); - util::array<mln_result(A)> results; + util::array<mln_result(A)> res(nlabels + 1); for (unsigned i = 0; i < accus.nelements(); ++i) if (accus[i].is_valid()) - results.append(accus[i]); - else - results.append(mln_result(A)()); + res[i] = accus[i]; trace::exiting("labeling::impl::generic::compute"); - return results; + return res; } } // end of namespace mln::labeling::impl::internal @@ -226,7 +230,7 @@ namespace mln util::array<mln_result(A)> compute_dispatch(const Accumulator<A>& a, const Image<J>& label, - mln_value(J) nlabels) + const mln_value(J)& nlabels) { return impl::generic::compute(a, label, nlabels); } @@ -238,12 +242,12 @@ namespace mln compute_dispatch(const Accumulator<A>& a, const Image& input, const Image<J>& label, - mln_value(J) nlabels) + const mln_value(J)& nlabels) { return impl::generic::compute(a, input, label, nlabels); } - } // end of namespace mln::internal + } // end of namespace mln::labeling::internal @@ -254,15 +258,18 @@ namespace mln util::array<mln_result(A)> compute(const Accumulator<A>& a, const Image& input, - const Image<J>& label, mln_value(J) nlabels) + const Image<J>& label, + const mln_value(J)& nlabels) { trace::entering("labeling::compute"); - util::array<mln_result(A)> results = - internal::compute_dispatch(a, input, label, nlabels); + internal::compute_tests(a, input, label, nlabels); + + typedef util::array<mln_result(A)> R; + R res = internal::compute_dispatch(a, input, label, nlabels); trace::exiting("labeling::compute"); - return results; + return res; } template <typename A, typename I, typename J> @@ -270,7 +277,8 @@ namespace mln util::array<mln_accu_with(A, mln_value(I))::result> compute(const Meta_Accumulator<A>& a, const Image& input, - const Image<J>& label, mln_value(J) nlabels) + const Image<J>& label, + const mln_value(J)& nlabels) { typedef mln_accu_with(A, mln_value(I)) A_; A_ a_ = accu::unmeta(exact(a), mln_value(I)()); @@ -283,15 +291,18 @@ namespace mln inline util::array<mln_result(A)> compute(const Accumulator<A>& a, - const Image<J>& label, mln_value(J) nlabels) + const Image<J>& label, + const mln_value(J)& nlabels) { trace::entering("labeling::compute"); - util::array<mln_result(A)> results = - internal::compute_dispatch(a, label, nlabels); + internal::compute_tests(a, label, nlabels); + + typedef util::array<mln_result(A)> R; + R res = internal::compute_dispatch(a, label, nlabels); trace::exiting("labeling::compute"); - return results; + return res; } @@ -299,7 +310,8 @@ namespace mln inline util::array<mln_accu_with(A, mln_psite(J))::result> compute(const Meta_Accumulator<A>& a, - const Image<J>& label, mln_value(J) nlabels) + const Image<J>& label, + const mln_value(J)& nlabels) { typedef mln_accu_with(A, mln_psite(J)) A_; A_ a_ = accu::unmeta(exact(a), mln_psite(J)()); diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index 5f49839..9658919 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -82,6 +82,13 @@ namespace mln /// Constructor without arguments. array(); + /// Construct a new array and resize it to \n elements. + array(unsigned n); + + /// Construct a new array, resize it to \n elements and fill it + /// with \p default_value. + array(unsigned n, const T& value); + /// Reserve memory for \p n elements. void reserve(unsigned n); @@ -247,6 +254,20 @@ namespace mln template <typename T> inline + array<T>::array(unsigned n) + : v_(n) + { + } + + template <typename T> + inline + array<T>::array(unsigned n, const T& value) + : v_(n, value) + { + } + + template <typename T> + inline void array<T>::reserve(unsigned n) { -- 1.5.6.5

1 0

Re: [Olena-patches] [Olena] #74: Review the trunk/milena/mln/morpho directory
by Olena 19 Nov '08

19 Nov '08

#74: Review the trunk/milena/mln/morpho directory -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: closed Priority: critical | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * status: assigned => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/74#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[Olena] #174: Merge back branch cleanup-2008 into the trunk
by Olena 19 Nov '08

19 Nov '08

#174: Merge back branch cleanup-2008 into the trunk ------------------------+--------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: repository | ------------------------+--------------------------------------------------- As of r2335 (2009-09-17), source:trunk/ has been entirely merged into source:branches/cleanup-2008/, and everybody is using the cleanup-2008 branch. So, there is not point in maintaining two branches. Moreover, as more and more Olena Team members are using Git, we should avoid using Subversion branches (e.g., on the SVN ''server''), and use Git's instead. The plan is as follow : 1. Warn contributors about the forthcoming merge, to * '''prevent them from committing to Olena''' until further notice; * have them switch (all of their) Subbversion working copies (or Git repositories) to source:trunk/. 1. Overwrite the content of source:trunk/ with the latest revision of source:branch/cleanup-2008/ (probably using `svn rm` then `svn cp`). Don't try to reintegrate patches one by one, since there have been many merges from trunk to cleanup-2008, and we'll probably end up with a very complicated set of conflicting merges. Remember we're not ''really'' merging back cleanup-2008 to trunk, as the merge(s) ''already occurred'', and cleanup-2008 already contains what trunk has (see source:branches/README.branches). We're merely replacing the current trunk with the content of cleanup-2008. 1. Notify contributors they can work from the trunk again. 1. Update source:branches/README.branches, but don't close (remove) the branch source:branch/cleanup-2008/, as it might disturb Git repositories aware of this branch. Simply set its status as 'CLOSED'. I (Roland) should be the one performing this task. -- Ticket URL: <https://trac.lrde.org/olena/ticket/174> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

2922: Update README.branches (close branches/cleanup-2008).
by Roland Levillain 19 Nov '08

19 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/branches Index: README.branches =================================================================== --- README.branches (revision 2921) +++ README.branches (revision 2922) @@ -2,7 +2,7 @@ * cleanup-2008 -** Status: OPEN +** Status: CLOSED ** Object: Cleanup of Olena 1.0 Should be merged back, then closed, as soon as all cleanup changes have been applied. @@ -14,6 +14,8 @@ on 2008-09-05 by Guillaume Lazzara. - Sync'd (merge) trunk (r2189:2315) into cleanup-2008 by (the set of) revisions 2316..2335 on 2008-09-17 by Roland Levillain. +- Merge back cleanup-2008 (r2335:2920) into trunk by revision 2921 by + Roland Levillain, and ``close'' branch (although not deleted). rev. branches @@ -45,15 +47,19 @@ | | . 2335 | `o | | - ... | | + | . + ... | . + | . | | - v | - trunk | - | - v - branches/cleanup-2008 +2920 | .o close branches/cleanup-2008 + | / +2921 o' merge branches/cleanup-2008 (r2335:2920) -> trunk + | + ... | + | + v + trunk - * olena-ng ** Status: OPEN ** Object: Olena NG (Next Generation), based on the SCOOP 2 paradigm

1 0

2923: Start working on image reconstruction.
by Ugo Jardonnet 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start working on image reconstruction. * jardonnet/igr/src/igr.cc(rgb->gs, |egrad|, vclosing and wst): New. * jardonnet/igr/Makefile(tar, bin, deps): New. * jardonnet/igr/check: New check directory. * jardonnet/igr/check/s7.ppm: New test image. * jardonnet/igr/check/tiny.ppm: New tiny test image. abraham/mln/fun/meta/inty.hh | 3 - jardonnet/igr/Makefile | 55 ++++++++++++++++++++ jardonnet/igr/src/igr.cc | 116 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 1 deletion(-) Index: jardonnet/igr/src/igr.cc --- jardonnet/igr/src/igr.cc (revision 0) +++ jardonnet/igr/src/igr.cc (revision 0) @@ -0,0 +1,116 @@ +#include <iostream> + +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include <mln/literal/colors.hh> + +#include <mln/arith/revert.hh> + +#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/closing_volume.hh> +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/elementary/gradient.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/paste.hh> +#include <mln/level/apply.hh> + +#include <mln/fun/v2v/rgb_to_hsi.hh> +#include <mln/fun/v2v/abs.hh> + +#include <mln/value/hsi.hh> + +#include <mln/core/image/thru.hh> + +//FIXME: Alexandre' sandbox +#include <mln/fun/meta/inty.hh> + +using namespace mln; +using namespace value; + +bool usage(int argc, char ** argv) +{ + if (argc != 3) + { + std::cout << "usage: " + << argv[0] << " image1 lambda" << std::endl; + return false; + } + return true; +} + +int main(int argc, char ** argv) +{ + if (not usage(argc, argv)) + return 1; + + image2d<rgb8> ima = + io::ppm::load<value::rgb8>(argv[1]); + unsigned lambda = atoi(argv[2]); + + + // RGB -> GS + //////////////////// + + image2d<hsi_f> hsi = level::transform(ima, fun::v2v::f_rgb_to_hsi_f); + + //FIXME: fix and use alexandre stuff + /* thru<to_hsi, image2d<hsi_f> > tmp(hsi_f); + image2d<int_u8> g_ima; + level::paste(tmp, g_ima);*/ + + image2d<int_u8> g_ima(ima.domain()); + mln_piter_(image2d<rgb8>) p(g_ima.domain()); + for_all(p) + { + g_ima(p) = hsi(p).inty() * 255; + } + + io::pgm::save(g_ima, "g_ima.ppm"); + + + // |grad(ima)| + /////////////////// + + image2d<int_u8> mg_ima(g_ima.domain()); + mg_ima = morpho::elementary::gradient(g_ima, c4()); + + //level::apply(mg_ima, fun::v2v::abs<int_u8>()); + + io::pgm::save(mg_ima, "mg_ima.ppm"); + + + // Volume Closing + /////////////////// + + image2d<int_u8> o_ima(mg_ima.domain()); + morpho::closing_volume(mg_ima, c4(), lambda, o_ima); + + io::pgm::save(o_ima, "o_ima.ppm"); + + + // Watershed + /////////////////// + + int_u16 nbasins = 0; + image2d<int_u16> ws = + morpho::meyer_wst(o_ima, c4(), nbasins); + + std::cout << "nbasins: " << nbasins << std::endl; + + image2d<rgb8> out(ima.domain()); + mln_piter_(image2d<int_u8>) pp(ws.domain()); + for_all(pp) + { + if (ws(pp) == 0u) + out(pp) = literal::red; + else + out(pp) = rgb8(o_ima(pp),o_ima(pp),o_ima(pp)); + } + + io::ppm::save(out, "out.ppm"); +} Index: jardonnet/igr/Makefile --- jardonnet/igr/Makefile (revision 0) +++ jardonnet/igr/Makefile (revision 0) @@ -0,0 +1,55 @@ +### Makefile --- + +## Author: ugo.jardonnet(a)lrde.epita.fr +## Version: $Id: Makefile,v 0.0 2008/11/19 11:40:34 jardonnet Exp $ +## Keywords: +## X-URL: + +PROJ=igr-reco +SRC=src/igr.cc +BIN=igr +LFLAGS=-I../../abraham/ -I../../../ +CFLAGS=-W -Wall -Wextra -O1 -DNDEBUG +FILES=src configure check README + +$(BIN): Makefile + g++ $(CFLAGS) $(LFLAGS) $(SRC) -o $(BIN) + +check: + cd check && ./check + +clean: + rm -f $(BIN) + rm -f .deps .depsr + rm -f *.ppm + +dist: clean todo AUTHORS svn_check + rm -rf $(PROJ) + mkdir $(PROJ) + cp -r Makefile AUTHORS TODO $(FILES) $(PROJ) + -find $(PROJ) -name ".svn" -exec rm -rf {} \; + -find $(PROJ) -name "*~" -exec rm -rf {} \; + -find $(PROJ) -name "#*" -exec rm -rf {} \; + tar cjvf $(PROJ).tar.bz2 $(PROJ) + rm -rf $(PROJ) + chmod 644 $(PROJ).tar.bz2 + +svn_check: + @svn st | grep \? ; [ $$? = "1" ] \ + || (echo "----------------------------------------------"\ + && echo "SOME FILES ARE MISSING FROM THE SVN REPOSITORY"\ + && echo "----------------------------------------------"); + +todo: + grep "FIXME" -r . --exclude="Makefile" > TODO + +.deps: + g++ $(LFLAGS) -MM $(SRC) > $@ + @sed -ir s/igr.cc// .deps + @sed -ir s/igr.o/igr/ .deps + +.PHONY: doc check .deps + +include .deps + +### Makefile ends here \ No newline at end of file Index: jardonnet/igr/check/s7.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/igr/check/s7.ppm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/igr/check/tiny.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/igr/check/tiny.ppm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: abraham/mln/fun/meta/inty.hh --- abraham/mln/fun/meta/inty.hh (revision 2921) +++ abraham/mln/fun/meta/inty.hh (working copy) @@ -41,7 +41,8 @@ }; template <class H, class S, class I> - struct function< meta::inty< value::hsi_<H, S, I> > > : public Function_v2w_w2v<function< meta::inty < value::hsi_<H, S, I> > > > + struct function< meta::inty< value::hsi_<H, S, I> > > : + public Function_v2w_w2v<function< meta::inty < value::hsi_<H, S, I> > > > { typedef value::hsi_<H, S, I> value; Index: markov/markov.hh

1 0

2920: Add an example using make::graph.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* doc/examples/mk_graph.cc: new example. --- milena/ChangeLog | 6 +++ milena/doc/examples/mk_graph.cc | 93 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) create mode 100644 milena/doc/examples/mk_graph.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 9275628..9ca0020 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an example using make::graph. + + * doc/examples/mk_graph.cc: new example. + +2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Revamp labeling::compute. * mln/labeling/compute.hh: Add compute_dispatch and compute_tests. diff --git a/milena/doc/examples/mk_graph.cc b/milena/doc/examples/mk_graph.cc new file mode 100644 index 0000000..18b7a86 --- /dev/null +++ b/milena/doc/examples/mk_graph.cc @@ -0,0 +1,93 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file doc/examples/mk_graph.cc +/// +/// This example shows how to create a graph from an influence zone image + +# include <mln/essential/2d.hh> + +# include <mln/core/site_set/p_vertices.hh> +# include <mln/core/site_set/p_edges.hh> + +# include <mln/debug/colorize.hh> +# include <mln/debug/draw_graph.hh> + +# include <mln/make/graph.hh> + +# include <mln/transform/influence_zone_geodesic.hh> + +# include <mln/util/graph.hh> + + +int main(int argc, char *argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc < 2) + { + std::cout << "Usage: " << argv[0] << " <image.pbm>" << std::endl; + return 1; + } + + image2d<bool> ima = io::pbm::load(argv[1]); + logical::not_inplace(ima); + + // Create a label image and compute the influence zones. + int_u8 nlabels; + image2d<int_u8> lbl = labeling::blobs(ima, c8(), nlabels); + io::ppm::save(debug::colorize< image2d<value::rgb8> >(lbl, nlabels), + "1_blobs.ppm"); + image2d<int_u8> iz = transform::influence_zone_geodesic(lbl, + c8(), + lbl.ncols()); + io::ppm::save(debug::colorize< image2d<value::rgb8> >(iz, nlabels), + "2_influence_zone_geodesic.ppm"); + + /// Make a graph from the influence zone image. + util::graph g = make::graph(iz, nlabels); + + // Use the center of each bbox component as vertex in the graph. + typedef fun::i2v::array<point2d> i2v_t; + util::array<point2d> centers = labeling::compute(accu::center<point2d>(), iz, nlabels); + i2v_t f = convert::to<i2v_t>(centers); + p_vertices<util::graph, i2v_t> pv(g, f); + + // Find lines (sites) associated to edges. + typedef fun::i2v::array<p_line2d> i2e_t; + util::array<p_line2d> lines; + mln_edge_iter_(util::graph) e(g); + for_all(e) + lines.append(p_line2d(f(e.v1()), f(e.v2()))); + p_edges<util::graph, i2e_t> pe(g, convert::to<i2e_t>(lines)); + + // Draw graph. + image2d<value::rgb8> out(ima.domain()); + debug::draw_graph(out, pv, literal::red, literal::green); + io::ppm::save(out, "3_graph.ppm"); +} -- 1.5.6.5

1 0

2919: [Scribo] Fix table removal.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* scribo/demat.hh: erosion had to be called vertically and horizontally before removing tables. --- milena/sandbox/ChangeLog | 8 ++++++++ milena/sandbox/scribo/demat.hh | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 3711cbb..3414875 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,11 @@ +2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix table removal. + + * scribo/demat.hh: erosion had to be called vertically and + horizontally before removing tables. + + 2008-11-19 Alexandre Abraham <abraham(a)lrde.epita.fr> Little fixes. diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index 59e8014..87e8008 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -64,7 +64,7 @@ namespace scribo settings_t() { bbox_enlarge = 1; - ero_line_width = 101; + ero_line_width = 51; bbox_distance = 25; min_comp_size = 5; } @@ -493,7 +493,6 @@ namespace scribo #endif boxes_t vboxes = component_boxes(vfilter); - erase_table_boxes(in, vboxes, (settings.ero_line_width / 2), 0); // Lignes horizontales std::cout << "Removing horizontal lines" << std::endl; @@ -505,8 +504,9 @@ namespace scribo #endif boxes_t hboxes = component_boxes(hfilter); - erase_table_boxes(in, hboxes, (settings.ero_line_width / 2), 1); + erase_table_boxes(in, vboxes, (settings.ero_line_width / 2), 0); + erase_table_boxes(in, hboxes, (settings.ero_line_width / 2), 1); #ifndef NOUT image2d<rgb8> tmp = clone(output); -- 1.5.6.5

1 0