Olena-patches May 2008

olena-patches@lrde.epita.fr

11 participants
115 discussions

Re: [Olena-patches] [Olena] #100: Check the license of Olena 1.0 before its release

by Olena

#100: Check the license of Olena 1.0 before its release -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: | Keywords: lint license gnu -----------------------+---------------------------------------------------- Old description: > * Check the license we want to use for Olena 1.0ß.[[BR]] For the moment, > we use a modified GPL which looks like a LGPL for template-based, generic > C++ libraries. Discuss this with Akim Demaille and Alexandre Duret-Lutz. > * Add a COPYING and/or LICENSE file (see the GNU Coding Standards). > * Check the copyright notice of each header file.[[BR]] Automate this > with a tool (*). > > (*) Better: start hacking a small tool to check the conformance of Milena > headers w.r.t. the layout and the expected contents. We could name it > `olint` (Olena Lint), `milint` (Milena Lint) or even `llint` or `lrde- > lint`. (Note that Simon Nivault has started a small script to check the > header guards here: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/src > /check-guards.) > > Benoît Sigoure has written a script named `gplize.sh`, too (see what > Thomas Moulard said in ticket:22). New description: * Check the license we want to use for Olena 1.0.[[BR]] For the moment, we use a modified GPL which looks like a LGPL for template-based, generic C++ libraries. Discuss this with Akim Demaille and Alexandre Duret-Lutz. * Add a COPYING and/or LICENSE file (see the GNU Coding Standards). * Check the copyright notice of each header file.[[BR]] Automate this with a tool (*). (*) Better: start hacking a small tool to check the conformance of Milena headers w.r.t. the layout and the expected contents. We could name it `olint` (Olena Lint), `milint` (Milena Lint) or even `llint` or `lrde- lint`. (Note that Simon Nivault has started a small script to check the header guards here: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/src /check-guards.) Benoît Sigoure has written a script named `gplize.sh`, too (see what Thomas Moulard said in ticket:22). Comment (by levill_r): s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/100#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #84: Olena 1.0 Code Examples (as documentation)

by Olena

#84: Olena 1.0 Code Examples (as documentation) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: doc -----------------------+---------------------------------------------------- Changes (by levill_r): * summary: Olena 1.0ß Code Examples (as documentation) => Olena 1.0 Code Examples (as documentation) Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/84#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #83: Olena 1.0 Whitepaper

by Olena

#83: Olena 1.0 Whitepaper -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * summary: Olena 1.0ß Whitepaper => Olena 1.0 Whitepaper Old description: > Write a 2-page whitepaper on Olena 1.0ß. New description: Write a 2-page whitepaper on Olena 1.0. Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/83#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #82: Olena 1.0 Tutorial

by Olena

#82: Olena 1.0 Tutorial -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * summary: Olena 1.0ß Tutorial => Olena 1.0 Tutorial Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/82#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #80: Olena 1.0 User Documentation

by Olena

#80: Olena 1.0 User Documentation -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: vaucanson doc -----------------------+---------------------------------------------------- Changes (by levill_r): * summary: Olena 1.0ß User Documentation => Olena 1.0 User Documentation Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/80#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #96: Update Olena's Web site for Olena 1.0

by Olena

#96: Update Olena's Web site for Olena 1.0 -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * summary: Update Olena's Web site for Olena 1.0ß => Update Olena's Web site for Olena 1.0 Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/96#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

Re: [Olena-patches] [Olena] #100: Check the license of Olena 1.0 before its release

by Olena

16 years

Re: [Olena-patches] [Olena] #97: Improve Olena's Trac for the 1.0 release

by Olena

#97: Improve Olena's Trac for the 1.0 release --------------------------+------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Olena | Version: 1.0 Resolution: | Keywords: --------------------------+------------------------------------------------- Changes (by levill_r): * summary: Improve Olena's Trac for the 1.0ß release => Improve Olena's Trac for the 1.0 release Comment: s/1.0ß/1.0/ -- Ticket URL: <https://trac.lrde.org/olena/ticket/97#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years

1943: Add a max tree node counter for Mathhieu.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a max tree node counter for Mathhieu. * sandbox/geraud/max_tree_nnodes.cc: New. max_tree_nnodes.cc | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) Index: sandbox/geraud/max_tree_nnodes.cc --- sandbox/geraud/max_tree_nnodes.cc (revision 0) +++ sandbox/geraud/max_tree_nnodes.cc (revision 0) @@ -0,0 +1,151 @@ + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/level/fill.hh> +# include <mln/util/pix.hh> +# include <mln/morpho/includes.hh> +# include <mln/level/sort_psites.hh> + +# include <mln/core/image2d.hh> +# include <mln/core/neighb2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/io/pgm/load.hh> + + + +namespace mln +{ + + template <typename I, typename N> + struct max_tree_ + { + typedef mln_point(I) point; + typedef p_array<point> S; + + // in: + const I& f; + const N& nbh; + + // aux: + S s; + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, point) parent; + mln_ch_value(I, point) zpar; + + max_tree_(const I& f, const N& nbh) + : f(f), + nbh(nbh) + { + run(); + } + + void run() + { + // init + { + initialize(deja_vu, f); + mln::level::fill(deja_vu, false); + initialize(parent, f); + initialize(zpar, f); + s = level::sort_psites_decreasing(f); + } + + // first pass + { + mln_fwd_piter(S) p(s); + mln_niter(N) n(nbh, p); + for_all(p) + { + make_set(p); + for_all(n) + if (f.has(n) && deja_vu(n)) + do_union(n, p); + deja_vu(p) = true; + } + } + + // second pass: canonization + { + mln_bkd_piter(S) p(s); + for_all(p) + { + point q = parent(p); + if (f(parent(q)) == f(q)) + parent(p) = parent(q); + } + } + + } // end of run() + + void make_set(const point& p) + { + parent(p) = p; + zpar(p) = p; + } + + bool is_root(const point& p) const + { + return parent(p) == p; + } + + bool is_node(const point& p) const + { + return is_root(p) || f(parent(p)) < f(p); + } + + point find_root(const point& x) + { + if (zpar(x) == x) + return x; + else + return zpar(x) = find_root(zpar(x)); + } + + void do_union(const point& n, const point& p) + { + point r = find_root(n); + if (r != p) + { + parent(r) = p; + zpar(r) = p; + } + } + + }; + + + + + template <typename I, typename N> + unsigned max_tree(const I& f, const N& nbh) + { + max_tree_<I,N> run(f, nbh); + + mln_piter(I) p(f.domain()); + unsigned nnodes = 0; + for_all(p) + if (run.is_node(p)) + ++nnodes; + return nnodes; + } + +} // end of mln + + + +int main(int argc, char* argv[]) +{ + if (argc != 2) + { + std::cerr << "usage: " << argv[0] << " filename" << std::endl; + return 1; + } + + using namespace mln; + using value::int_u8; + + image2d<int_u8> f; + io::pgm::load(f, argv[1]); + + std::cout << "n nodes = " << mln::max_tree(f, c4()) << std::endl; +}

16 years

r1942: Add and optimize blob labeling to FLLT

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2008-05-13 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add and optimize blob labeling to FLLT. * geraud/fllt.cc: Fllt with blob labeling. * geraud/fllt.svg.5.cc: New, version before adding blob labeling. --- fllt.cc | 251 +++++++++++++++++++++++++++++------------ fllt.svg.5.cc | 350 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 529 insertions(+), 72 deletions(-) Index: trunk/milena/sandbox/geraud/fllt.cc =================================================================== --- trunk/milena/sandbox/geraud/fllt.cc (revision 1941) +++ trunk/milena/sandbox/geraud/fllt.cc (revision 1942) @@ -25,12 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. +#include <iomanip> + #include <mln/core/image2d.hh> #include <mln/core/neighb2d.hh> #include <mln/core/p_array.hh> #include <mln/core/clone.hh> #include <mln/core/image_if_value.hh> #include <mln/core/sub_image.hh> +#include <mln/core/p_queue_fast.hh> #include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> @@ -51,6 +54,8 @@ #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/util/tree.hh> + #include <sstream> @@ -60,6 +65,23 @@ namespace my { +# define fllt_tree(P, V) mln::util::tree< fllt_node_elt<P, V> > +# define fllt_node(P, V) mln::util::tree_node< fllt_node_elt<P, V> > +# define fllt_branch(P, V) mln::util::branch< fllt_node_elt<P, V> > +# define fllt_branch_iter_ind(P, V) mln::util::branch_iter_ind< fllt_node_elt<P, V> > + + template <typename P, typename V> + struct fllt_node_elt + { + V value; + p_array points; + p_array holes; + /// Tell if his parent if brighter or not. Nb : if the parent + /// if brighter, the node come from the lower level set + bool brighter; + unsigned npoints; + }; + template <typename N_t, typename G> void update_gN(const N_t& N, G& gN) { @@ -108,8 +130,32 @@ } + void save_u(const image2d<value::int_u8>& u, + const image2d<int>& is, + box2d R_box, + int in_R) + { + static int id = 0; + std::stringstream filename; + filename << "fllt_trace_" << std::setw(5) << std::setfill('0') + << std::right << id++ << ".ppm"; + + image2d<value::int_u8> out = clone(u); + + mln_assertion(R_box.is_valid()); + mln_piter_(box2d) p(R_box); + for_all(p) + if (is(p) == in_R) + out(p) = 255; +// else if (is(p) == in_N) +// out(p) = literal::green; + + io::pgm::save(out, filename.str()); + //io::pgm::save(out, filename.str()); + } + template <typename I> - void save(const I& is, const std::string& name = "") + void save(const I& is, unsigned in_N, unsigned in_R, const std::string& name = "") { static unsigned counter = 0; using value::rgb8; @@ -119,17 +165,14 @@ mln_piter(I) p(is.domain()); for_all(p) - switch (is(p)) { - case 1: // R + if (is(p) == in_R) temp(p) = literal::red; - break; - case 2: // N + else if (is(p) == in_N) // N temp(p) = literal::green; - break; - case 3: // A + else if (is(p) < in_N) temp(p) = literal::blue; - break; - } + else + temp(p) = literal::white; if (name == "") { @@ -142,9 +185,78 @@ } + template <typename I, typename V> + void blob(const I& is, + p_array<mln_point(I)>* N[256], + unsigned in_N, + fllt_node(mln_point(I), V)* current_cc) + { + typedef p_array<mln_point(I)> arr_t; + +// std::cout << ">>>>>>>enter blob." << std::endl; + bool flower = true; + unsigned ncc = 0; + static image2d<unsigned> is_labeled(is.domain()); + static unsigned label = 0; + + if (label == 0) + { + level::fill(is_labeled, 0); + label++; + } + + typedef mln_psite(I) P; + P cur; + mln_niter(neighb2d) n(c8(), cur); + p_queue_fast qu; + p_array& holes = current_cc->elt().holes; + + + for (unsigned i = 0; i < 256; ++i) + { + mln_piter(arr_t) p(*N[i]); + for_all(p) + { + mln_assertion(is(p) == in_N); + if (is_labeled(p) != label) + { + if (flower == false) + holes.append(p); + else + flower = false; + qu.push(p); + is_labeled(p) = label; + do + { + cur = qu.front(); + qu.pop(); + for_all(n) if (is.has(n)) + if (is(n) == in_N && is_labeled(n) != label) + { + qu.push(n); + is_labeled(n) = label; + } + } + while (! qu.is_empty()); + } + } + } + + ++label; + +// if (holes.size() == 2) +// std::cout << holes[0] << holes[1] << std::endl; +// std::cout << " <<<<<<<exiting blob." << std::endl; + } + + template <typename I, typename Nbh> - void fllt(const Image& input_, const Neighborhood<Nbh>& nbh_) + fllt_tree(mln_point(I), mln_value(I))& + fllt(const Image& input_, const Neighborhood<Nbh>& nbh_) { + typedef fllt_node(mln_point(I), mln_value(I)) node_type; + typedef fllt_tree(mln_point(I), mln_value(I)) tree_type; + const I& input = exact(input_); const Nbh& nbh = exact(nbh_); @@ -160,12 +272,12 @@ mln_fwd_piter(I) p(input.domain()); p.start(); -// image2d<unsigned char> is(input.domain()); -// const unsigned in_R = 1, in_N = 2, in_A = 3, in_O = 0; -// level::fill(is, in_O); - image2d<bool> deja_vu(input.domain()); - level::fill(deja_vu, false); + node_type* current_cc; + unsigned in_N = 1, in_R = 2; + + image2d<int> deja_vu(input.domain().to_larger(1)); + level::fill(deja_vu, 0); typedef p_array<mln_point(I)> arr_t; arr_t* A = new arr_t(); @@ -174,7 +286,7 @@ N[i] = new arr_t(); accu::bbox<mln_point(I)> N_box; - unsigned n_step_1 = 0, n_step_3 = 0; + unsigned n_step_1 = 0, n_step_3 = 0, n_comps = 0, n_holes = 0; // Step 1. step_1: @@ -189,25 +301,24 @@ ++n_step_1; x0 = p; g = input(x0); + current_cc = new node_type(); } // Step 2. step_2: { + in_N += 2; + in_R = in_N + 1; // R <- 0 and N <- 0 - if (N_box.is_valid() != 0) - { -// level::fill(inplace(is | N_box.to_result()), in_O); - level::fill(inplace(deja_vu | N_box.to_result()), false); - } clear_N(N); N_box.init(); // A <- { x0 } A->clear(); A->append(x0); -// is(x0) = in_A; - deja_vu(x0) = true; + N_box.take(x0); + + deja_vu(x0) = in_R; } // Step 3. @@ -219,33 +330,22 @@ mln_niter(Nbh) x(nbh, a); -// my::save(is); - - // R <- R U A if (A->npoints() == 0) goto the_end; -// for_all(a) -// { -// mln_invariant(is(a) == in_A); -// is(a) = in_R; -// } - // N <- N U { x in nbh of A and not in R } for_all(a) for_all(x) { -// if (u.has(x)) -// mln_invariant(is(x) != in_O || deja_vu(x) == false); - - //if (u.has(x) && is(x) == in_O) - if (u.has(x) && !deja_vu(x)) + if (deja_vu.has(x) && deja_vu(x) < in_N) + { + if (u.has(x)) { N[u(x)]->append(x); -// is(x) = in_N; N_box.take(x); - deja_vu(x) = true; + } + deja_vu(x) = in_N; } } // gN = min u(x) for all x in N @@ -261,19 +361,27 @@ if (g < gN) { g = gN; - // FIXME: DO the hole thing. + + ++n_comps; + blob(deja_vu, N, in_N, current_cc); + node_type* parent = current_cc; + + n_holes += current_cc->elt().holes.npoints(); + save_u(u, deja_vu, N_box, in_R); + arr_t* tmp = A; A = N[g]; N[g] = tmp; -// mln_piter(arr_t) a(A); -// for_all(a) -// { -// mln_invariant(is(a) == in_N); -// is(a) = in_A; -// // N_box is not re-computed so that we save time; -// // N_box is always growing while looping from step 3. -// } N[g]->clear(); + mln_piter(arr_t) a(*A); + for_all(a) + { + mln_invariant(deja_vu(a) == in_N); + deja_vu(a) = in_R; + current_cc->elt().points.append(a); + // N_box is not re-computed so that we save time; + // N_box is always growing while looping from step 3. + } goto step_3; } // b) @@ -282,38 +390,23 @@ arr_t* tmp = A; A = N[g]; N[g] = tmp; -// mln_piter(arr_t) a(A); -// for_all(a) -// { -// mln_invariant(is(a) == in_N); -// is(a) = in_A; -// } N[g]->clear(); + mln_piter(arr_t) a(*A); + for_all(a) + { + mln_invariant(deja_vu(a) == in_N); + deja_vu(a) = in_R; + current_cc->elt().points.append(a); + } goto step_3; } // c) else { - // Here deja_vu is (R U N U A) - // we only want R - - // yet A is empty (cause included in R) - // so this test is ok: mln_invariant((is | in_A).npoints() == 0); - - for (unsigned i = 0; i < 256; ++i) - if (N[i]->npoints()) - level::fill(inplace(deja_vu | *N[i]), false); - -// mln_invariant(deja_vu == ((pw::value(is) == pw::cst(in_R)) | input.domain())); - -// mln_piter(I) r(N_box); -// for_all(r) -// if (is(r) == in_R) -// u(r) = g; - + // FIXME: IDEA: this change might be performed while R is constructed(?) mln_piter(I) r(N_box); for_all(r) - if (deja_vu(r)) + if (deja_vu(r) == in_R) u(r) = g; goto step_1; @@ -322,7 +415,9 @@ the_end: std::cout << n_step_1 << ' ' << n_step_3 << std::endl; + std::cout << "n comps = " << n_comps << " n holes = " << n_holes << std::endl; + return *new tree_type(current_cc); } } // end of namespace mln::my @@ -348,3 +443,15 @@ io::pgm::save(lena, "./out.pgm"); } + +// 16891 99970 +// ./a.out ../../img/lena.pgm 1.17s user 0.06s system 93% cpu 1.318 total +// matt @ ..k/lrde/oln/trunk/milena/sandbox/geraud $ time ./a.out ../../img/lena.pgm 12:50:12 +// 16891 99970 +// ./a.out ../../img/lena.pgm 1.22s user 0.02s system 87% cpu 1.413 total +// matt @ ..k/lrde/oln/trunk/milena/sandbox/geraud $ time ./a.out ../../img/lena.pgm 12:50:16 +// 16891 99970 +// ./a.out ../../img/lena.pgm 1.14s user 0.09s system 92% cpu 1.336 total +// matt @ ..k/lrde/oln/trunk/milena/sandbox/geraud $ time ./a.out ../../img/lena.pgm 12:50:18 +// 16891 99970 +// ./a.out ../../img/lena.pgm 1.20s user 0.04s system 92% cpu 1.329 total Index: trunk/milena/sandbox/geraud/fllt.svg.5.cc =================================================================== --- trunk/milena/sandbox/geraud/fllt.svg.5.cc (revision 0) +++ trunk/milena/sandbox/geraud/fllt.svg.5.cc (revision 1942) @@ -0,0 +1,350 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <mln/core/image2d.hh> +#include <mln/core/neighb2d.hh> +#include <mln/core/p_array.hh> +#include <mln/core/clone.hh> +#include <mln/core/image_if_value.hh> +#include <mln/core/sub_image.hh> + +#include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/level/fill.hh> +#include <mln/level/compare.hh> +#include <mln/debug/println.hh> +#include <mln/labeling/regional_minima.hh> +#include <mln/accu/bbox.hh> +#include <mln/geom/bbox.hh> +#include <mln/pw/all.hh> + +#include <mln/literal/black.hh> +#include <mln/literal/white.hh> +#include <mln/literal/colors.hh> + +#include <sstream> + + +namespace mln +{ + + namespace my + { + + template <typename N_t, typename G> + void update_gN(const N_t& N, G& gN) + { + for (unsigned g = 0; g < 256; ++g) + if (N[g]->npoints() != 0) + { + gN = g; + return; + } + // if N is empty, gN is the max value. + gN = 255; + } + + + template <typename N_t> + void print_N(const N_t& N) + { + for (unsigned i = 0; i < 256; ++i) + { + if (N[i]->npoints() == 0) + continue; + std::cout < + void clear_N(N_t& N) + { + for (unsigned i = 0; i < 256; ++i) + N[i]->clear(); + } + + + + template <typename T> + image2d<T> enlarge(const image2d<T>& input, unsigned coef) + { + unsigned + nrows_ = coef * geom::nrows(input), + ncols_ = coef * geom::ncols(input); + image2d<T> output(nrows_, ncols_); + for (int row = 0; row < nrows_; ++row) + for (int col = 0; col < ncols_; ++col) + output.at(row, col) = input.at(row / coef, col / coef); + return output; + } + + + template <typename I> + void save(const I& is, const std::string& name = "") + { + static unsigned counter = 0; + using value::rgb8; + + image2d<rgb8> temp(is.domain()); + level::fill(temp, literal::black); + + mln_piter(I) p(is.domain()); + for_all(p) + switch (is(p)) { + case 1: // R + temp(p) = literal::red; + break; + case 2: // N + temp(p) = literal::green; + break; + case 3: // A + temp(p) = literal::blue; + break; + } + + if (name == "") + { + std::stringstream filename; + filename << "./temp_" << ++counter << ".ppm"; + io::ppm::save(my::enlarge(temp, 10), filename.str()); + } + else + io::ppm::save(temp, name); + } + + + template <typename I, typename Nbh> + void fllt(const Image& input_, const Neighborhood<Nbh>& nbh_) + { + const I& input = exact(input_); + const Nbh& nbh = exact(nbh_); + + unsigned l = 0, l_max; + mln_ch_value(I, unsigned) reg_min = labeling::regional_minima(input, nbh, l_max); + std::vector<bool> tag(l_max + 1, false); + tag[0] = true; + + // Variables. + I u = mln::clone(input); + mln_point(I) x0; + mln_value(I) g, gN; + mln_fwd_piter(I) p(input.domain()); + p.start(); + +// image2d<unsigned char> is(input.domain()); +// const unsigned in_R = 1, in_N = 2, in_A = 3, in_O = 0; +// level::fill(is, in_O); + + image2d<bool> deja_vu(input.domain()); + level::fill(deja_vu, false); + + typedef p_array<mln_point(I)> arr_t; + arr_t* A = new arr_t(); + arr_t* N[256]; + for (unsigned i = 0; i < 256; ++i) + N[i] = new arr_t(); + accu::bbox<mln_point(I)> N_box; + + unsigned n_step_1 = 0, n_step_3 = 0; + + // Step 1. + step_1: + { + while (tag[reg_min(p)] && p.is_valid()) + p.next(); + if (p.is_valid()) + tag[reg_min(p)] = true; // To be processed. + else + goto the_end; + + ++n_step_1; + x0 = p; + g = input(x0); + } + + // Step 2. + step_2: + { + // R <- 0 and N <- 0 + if (N_box.is_valid() != 0) + { +// level::fill(inplace(is | N_box.to_result()), in_O); + level::fill(inplace(deja_vu | N_box.to_result()), false); + } + clear_N(N); + N_box.init(); + + // A <- { x0 } + A->clear(); + A->append(x0); +// is(x0) = in_A; + deja_vu(x0) = true; + } + + // Step 3. + step_3: + { + ++n_step_3; + + mln_piter(arr_t) a(*A); + mln_niter(Nbh) x(nbh, a); + + +// my::save(is); + + + // R <- R U A + if (A->npoints() == 0) + goto the_end; + +// for_all(a) +// { +// mln_invariant(is(a) == in_A); +// is(a) = in_R; +// } + + // N <- N U { x in nbh of A and not in R } + for_all(a) + for_all(x) + { +// if (u.has(x)) +// mln_invariant(is(x) != in_O || deja_vu(x) == false); + + //if (u.has(x) && is(x) == in_O) + if (u.has(x) && !deja_vu(x)) + { + N[u(x)]->append(x); +// is(x) = in_N; + N_box.take(x); + deja_vu(x) = true; + } + } + // gN = min u(x) for all x in N + update_gN(N, gN); + + // FIXME: update the number of CC of the border of R + } + + // Step 4. + step_4: + { + // a) + if (g < gN) + { + g = gN; + // FIXME: DO the hole thing. + arr_t* tmp = A; + A = N[g]; + N[g] = tmp; +// mln_piter(arr_t) a(A); +// for_all(a) +// { +// mln_invariant(is(a) == in_N); +// is(a) = in_A; +// // N_box is not re-computed so that we save time; +// // N_box is always growing while looping from step 3. +// } + N[g]->clear(); + goto step_3; + } + // b) + else if (g == gN) + { + arr_t* tmp = A; + A = N[g]; + N[g] = tmp; +// mln_piter(arr_t) a(A); +// for_all(a) +// { +// mln_invariant(is(a) == in_N); +// is(a) = in_A; +// } + N[g]->clear(); + goto step_3; + } + // c) + else + { + // Here deja_vu is (R U N U A) + // we only want R + + // yet A is empty (cause included in R) + // so this test is ok: mln_invariant((is | in_A).npoints() == 0); + + for (unsigned i = 0; i < 256; ++i) + if (N[i]->npoints()) + level::fill(inplace(deja_vu | *N[i]), false); + +// mln_invariant(deja_vu == ((pw::value(is) == pw::cst(in_R)) | input.domain())); + +// mln_piter(I) r(N_box); +// for_all(r) +// if (is(r) == in_R) +// u(r) = g; + + mln_piter(I) r(N_box); + for_all(r) + if (deja_vu(r)) + u(r) = g; + + goto step_1; + } + } + + the_end: + std::cout << n_step_1 << ' ' << n_step_3 << std::endl; + + } + + } // end of namespace mln::my + +} // end of namespace mln + + +int main(int argc, char* argv[]) +{ + if (argc != 2) + { + std::cerr << "usage: " << argv[0] << " filename" << std::endl; + return 1; + } + + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena; + io::pgm::load(lena, argv[1]); + + my::fllt(lena, c4()); + io::pgm::save(lena, "./out.pgm"); + +}

16 years

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2008