- Olena-patches

branch exp/next-build-ok updated: last-svn-commit-491-g396cb06
by lazzara＠lrde.epita.fr 11 Oct '10

11 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next-build-ok has been updated via 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (commit) from 6713b18ae5ff02fd54f2496881ccb1118c02f45c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 396cb06 Fix namespace ambiguities. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 8 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 +++--- .../scribo/binarization/sauvola_threshold_image.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-491-g396cb06 Fix namespace ambiguities.
by Guillaume Lazzara 11 Oct '10

11 Oct '10

* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_threshold_image.hh, * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. --- scribo/ChangeLog | 8 ++++++++ .../binarization/internal/first_pass_functor.hh | 6 +++--- .../scribo/binarization/sauvola_threshold_image.hh | 2 +- scribo/scribo/subsampling/integral_single_image.hh | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dc6c426..986678e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2010-10-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix namespace ambiguities. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_threshold_image.hh, + * scribo/subsampling/integral_single_image.hh: Add mln:: prefix. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/core/line_info.hh: Make stats computation more robust diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 92ccc55..694779f 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -126,9 +126,9 @@ namespace scribo t_p); # else value::int_u8 t_p; - convert::from_to(sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R), + mln::convert::from_to(sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R), t_p); # endif // SCRIBO_SAUVOLA_DEBUG diff --git a/scribo/scribo/binarization/sauvola_threshold_image.hh b/scribo/scribo/binarization/sauvola_threshold_image.hh index 0225d37..beaf06e 100644 --- a/scribo/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/scribo/binarization/sauvola_threshold_image.hh @@ -437,7 +437,7 @@ namespace scribo for(def::coord row = 0; row < nrows; ++row) for(def::coord col = 0; col < ncols; ++col) - convert::from_to( + mln::convert::from_to( internal::compute_sauvola_threshold(P(row, col), simple, squared, window_size, K, diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index 077172a..fc0c8dd 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -155,7 +155,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - convert::from_to(local_sum / 9, *p_sub++); + mln::convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -193,7 +193,7 @@ namespace scribo + v21*v21 + v22*v22 + v23*v23 + v31*v31 + v32*v32 + v33*v33; - convert::from_to(local_sum / 9, *p_sub++); + mln::convert::from_to(local_sum / 9, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -284,7 +284,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - convert::from_to(local_sum / 4, *p_sub++); + mln::convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; @@ -319,7 +319,7 @@ namespace scribo ptr2 += 2; S local_sum = v11 + v12 + v21 + v22, local_sum_2 = v11*v11 + v12*v12 + v21*v21 + v22*v22; - convert::from_to(local_sum / 4, *p_sub++); + mln::convert::from_to(local_sum / 4, *p_sub++); h_sum += local_sum; h_sum_2 += local_sum_2; -- 1.5.6.5

1 0

branch features/maxtree updated: last-svn-commit-9-g81466eb
by git＠lrde.epita.fr 30 Sep '10

30 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch features/maxtree has been updated via 81466eb3026e78a9f6c89a9555028a6ff1488b14 (commit) via 42d1898c6190f04d9e01631ba024582fbe1614a6 (commit) via f9fd9217dd2c5e64f401a3ebad15b60baa8a8ee9 (commit) from e2a0e25ddd6d6ae71fd0a1a1b10ae3e9c2e66f6d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 81466eb 2-steps maxtree algorithm with Salembier topological sort and 42d1898 Salembier algorithm working on edges. f9fd921 Minor fixes. ----------------------------------------------------------------------- Summary of changes: milena/sandbox/ChangeLog | 26 +++ milena/sandbox/edwin/MaxTree/Makefile | 13 + milena/sandbox/edwin/MaxTree/cplx2d.hh | 113 ++++++++++ milena/sandbox/edwin/MaxTree/salembier_edge.cc | 30 +++ milena/sandbox/edwin/MaxTree/salembier_edge.hh | 191 ++++++++++++++++ .../sandbox/edwin/MaxTree/salembier_two_steps.cc | 231 ++++++++++++++++++++ milena/sandbox/edwin/TreeAlgorithmsComp/Makefile | 1 + milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh | 24 +- 8 files changed, 618 insertions(+), 11 deletions(-) create mode 100644 milena/sandbox/edwin/MaxTree/Makefile create mode 100644 milena/sandbox/edwin/MaxTree/cplx2d.hh create mode 100644 milena/sandbox/edwin/MaxTree/salembier_edge.cc create mode 100644 milena/sandbox/edwin/MaxTree/salembier_edge.hh create mode 100644 milena/sandbox/edwin/MaxTree/salembier_two_steps.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-9-g81466eb 2-steps maxtree algorithm with Salembier topological sort and union-find building.
by edwin carlinet 30 Sep '10

30 Sep '10

* edwin/MaxTree/salembier_two_steps.cc: 2-steps MaxTree algorithm. --- milena/sandbox/ChangeLog | 7 + .../sandbox/edwin/MaxTree/salembier_two_steps.cc | 231 ++++++++++++++++++++ 2 files changed, 238 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/edwin/MaxTree/salembier_two_steps.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index f1a971f..3286933 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,12 @@ 2010-09-30 edwin carlinet <carlinet(a)lrde.epita.fr> + 2-steps maxtree algorithm with Salembier topological sort and + union-find building. + + * edwin/MaxTree/salembier_two_steps.cc: 2-steps MaxTree algorithm. + +2010-09-30 edwin carlinet <carlinet(a)lrde.epita.fr> + Salembier algorithm working on edges. * edwin/MaxTree/Makefile: New. diff --git a/milena/sandbox/edwin/MaxTree/salembier_two_steps.cc b/milena/sandbox/edwin/MaxTree/salembier_two_steps.cc new file mode 100644 index 0000000..ac1aef0 --- /dev/null +++ b/milena/sandbox/edwin/MaxTree/salembier_two_steps.cc @@ -0,0 +1,231 @@ +#include <mln/io/pgm/load.hh> + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/data/fill.hh> +#include <mln/extension/fill.hh> + +#include <mln/util/hqueues.hh> +#include <mln/util/array.hh> +#include <mln/debug/println.hh> + +namespace mln +{ + typedef image2d< value::int_u8 > I; + + struct salembier_args + { + typedef unsigned P; + typedef value::int_u8 V; + + enum { nvalues = mln_card(V) }; + + const I& f; + util::array<int> dp; + unsigned n_nbhs; + + unsigned hmin; + util::hqueues<P, V> hqueue; + P levroot[nvalues]; + bool is_node_at_level[nvalues]; + image2d<unsigned> parent; + image2d<bool> deja_vu; + std::vector<P> porder; + }; + + int flood(salembier_args& args, const int h) + { + typedef unsigned P; + + mln_assertion(args.is_node_at_level[h]); + + P root = args.levroot[h]; + + while (!args.hqueue[h].empty()) + { + P p = args.hqueue[h].pop_front(); + args.parent.element(p) = root; + + // Process the neighbors + for (unsigned j = 0; j < args.n_nbhs; ++j) + { + unsigned n = p + args.dp[j]; + + if (!args.deja_vu.element(n)) + { + int n_idx = args.f.element(n); // en faite vset.index_of(...) + args.hqueue[n_idx].push(n); + args.deja_vu.element(n) = true; + + if (!args.is_node_at_level[n_idx]) + { + args.levroot[n_idx] = n; + args.is_node_at_level[n_idx] = true; + } + + while (h < n_idx) + n_idx = flood(args, n_idx); + } + } + args.porder.push_back(p); + } + + args.is_node_at_level[h] = false; + unsigned c = h; + while (c > args.hmin && !args.is_node_at_level[c]) + --c; + + if (args.is_node_at_level[c]) + { + P q = args.levroot[c]; + args.parent.element(root) = q; + //args.count_edges(q) += args.count_edges(root); // attribute.merge + } + else + args.parent.element(root) = root; + + return c; + } + + salembier_args + salembier(const image2d<value::int_u8>& f, const neighb2d& nbh = c4()) + { + // Init + enum { nv = mln_card(mln_value_(I)) }; + + salembier_args args = { f}; + { + box2d b(2 * f.nrows() - 1, 2 * f.ncols() - 1); + + args.dp = offsets_wrt(f, nbh); + args.n_nbhs = args.dp.nelements(); + + args.porder.reserve(f.nsites()); + initialize(args.parent, f); + initialize(args.deja_vu, f); + //initialize(args.count_edges, f); + //args.active_edges.init_(b); + + std::fill(args.is_node_at_level, args.is_node_at_level + nv, false); + data::fill(args.deja_vu, false); + extension::fill(args.deja_vu, true); + //data::fill(args.active_edges, false); + //data::fill(args.count_edges, 0); + } + + // Get start value + unsigned pstart = f.index_of_point(f.domain().pmin()); + mln_value_(I) hstart = f.element(pstart); + { + unsigned h[nv] = {0}; + mln_pixter_(const I) px(f); + for_all(px) + { + mln_value_(I) v = px.val(); + ++h[v]; + if (v < hstart) + { + hstart = v; + pstart = px.offset(); + } + } + + for (unsigned i = 0; i < nv; ++i) + args.hqueue[i].reserve(h[i]); + } + + // Start flooding + args.hmin = hstart; + args.deja_vu.element(pstart) = true; + args.hqueue[hstart].push(pstart); + args.levroot[hstart] = pstart; + args.is_node_at_level[hstart] = true; + + int r = flood(args, hstart); + mln_assertion(r == hstart); + return args; + } + + unsigned zfindroot(image2d<unsigned>& parent, unsigned p) + { + if (parent.element(p) == p) + return p; + else + return (parent.element(p) = zfindroot(parent, parent.element(p))); + } + + + image2d<unsigned> + unionfind(const image2d<value::int_u8>& ima, const neighb2d& nbh, + const std::vector<unsigned>& s) + { + image2d<unsigned> parent; + image2d<unsigned> zpar; + + initialize(parent, ima); + initialize(zpar, ima); + data::fill(parent, 0); + + util::array<int> dp = offsets_wrt(ima, nbh); + unsigned n_nbhs = dp.nelements(); + + int nsites = s.size(); + for (int i = 0; i < nsites; ++i) + { + unsigned p = s[i]; + parent.element(p) = p; // make set + zpar.element(p) = p; // make set + + for (int j = 0; j < n_nbhs; ++j) + { + unsigned n = p + dp[j]; + if (parent.element(n) != 0) // deja vu + { // make union + unsigned r = zfindroot(zpar, n); + zpar.element(r) = p; + } + } + } + + // canonisation + for (int i = nsites - 1; i >=0; --i) + { + unsigned p = s[i]; + unsigned q = parent.element(q); + if (q == parent.element(q)) + parent.element(p) = parent.element(q); + } + return parent; + } + +} + +void usage(char** argv) +{ + std::cout << "Usage: " << argv[0] << " input.png" << std::endl; + std::cout << "Calcule un MaxTree avec UnionFind mix Salembier ordering" + << std::endl; + abort(); +} + +int main(int argc, char** argv) +{ + using namespace mln; + typedef image2d< value::int_u8 > I; + + if (argc < 2) + usage(argv); + + const char* filename = argv[1]; + + I input; + io::pgm::load(input, filename); + + salembier_args a = salembier(input, c4()); + + image2d<unsigned> parent = unionfind(input, c4(), a.porder); + + std::cout << "Attribute Image: " << std::endl; + debug::println(a.parent); + debug::println(a.parent); +} -- 1.5.6.5

1 0

last-svn-commit-8-g42d1898 Salembier algorithm working on edges.
by edwin carlinet 30 Sep '10

30 Sep '10

* edwin/MaxTree/Makefile: New. * edwin/MaxTree/cplx2d.hh: Special edge connectivity. * edwin/MaxTree/salembier_edge.cc, * edwin/MaxTree/salembier_edge.hh: Boundary consideration of salembier algorithm. --- milena/sandbox/ChangeLog | 10 ++ milena/sandbox/edwin/MaxTree/Makefile | 13 ++ milena/sandbox/edwin/MaxTree/cplx2d.hh | 113 ++++++++++++++ milena/sandbox/edwin/MaxTree/salembier_edge.cc | 30 ++++ milena/sandbox/edwin/MaxTree/salembier_edge.hh | 191 ++++++++++++++++++++++++ 5 files changed, 357 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/edwin/MaxTree/Makefile create mode 100644 milena/sandbox/edwin/MaxTree/cplx2d.hh create mode 100644 milena/sandbox/edwin/MaxTree/salembier_edge.cc create mode 100644 milena/sandbox/edwin/MaxTree/salembier_edge.hh diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 29b629c..f1a971f 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,15 @@ 2010-09-30 edwin carlinet <carlinet(a)lrde.epita.fr> + Salembier algorithm working on edges. + + * edwin/MaxTree/Makefile: New. + * edwin/MaxTree/cplx2d.hh: Special edge connectivity. + * edwin/MaxTree/salembier_edge.cc, + * edwin/MaxTree/salembier_edge.hh: Boundary consideration of + salembier algorithm. + +2010-09-30 edwin carlinet <carlinet(a)lrde.epita.fr> + Minor fixes. * edwin/TreeAlgorithmsComp/Makefile: Minor fixes. diff --git a/milena/sandbox/edwin/MaxTree/Makefile b/milena/sandbox/edwin/MaxTree/Makefile new file mode 100644 index 0000000..97d1bff --- /dev/null +++ b/milena/sandbox/edwin/MaxTree/Makefile @@ -0,0 +1,13 @@ +CCFILES := $(shell find -name '*.cc') +CXXFLAGS=-W -Wall -I../../.. +CC=g++ + +all: + +depend: + $(CXX) $(CXXFLAGS) -MM $(CCFILES) > makefile.deps + +clean: + rm *.o + +-include makefile.deps \ No newline at end of file diff --git a/milena/sandbox/edwin/MaxTree/cplx2d.hh b/milena/sandbox/edwin/MaxTree/cplx2d.hh new file mode 100644 index 0000000..bdf038f --- /dev/null +++ b/milena/sandbox/edwin/MaxTree/cplx2d.hh @@ -0,0 +1,113 @@ +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 CPLX2D_HH +# define CPLX2D_HH + +# include <mln/core/var.hh> +# include <mln/data/paste.hh> +# include <mln/morpho/gradient.hh> + +namespace mln +{ + + template <typename I, typename J> + void data__paste_values(const Image<I>& input_, Image<J>& output_) + { + const I& input = exact(input_); + J& output = exact(output_); + + mln_fwd_piter(I) pi(input.domain()); + mln_fwd_piter(J) po(output.domain()); + for_all_2(pi, po) + output(po) = input(pi); + } + + namespace cplx2d + { + + typedef neighb< win::multiple<window2d, bool(*)(const point2d&)> > dbl_neighb2d; + + inline + bool is_row_odd(const point2d& p) + { + return p.row() % 2; + } + + // Pixel to neighboring edges. + const neighb2d& p2e() + { + return c4(); + } + + // Edge to (the couple of) pixels. + const dbl_neighb2d& e2p() + { + static bool e2p_h[] = { 0, 1, 0, + 0, 0, 0, + 0, 1, 0 }; + static bool e2p_v[] = { 0, 0, 0, + 1, 0, 1, + 0, 0, 0 }; + static dbl_neighb2d nbh = make::double_neighb2d(is_row_odd, e2p_h, e2p_v); + return nbh; + } + + + inline + bool is_pixel(const point2d& p) + { + // Original pixels. + return p.row() % 2 == 0 && p.col() % 2 == 0; + } + + inline + bool is_edge(const point2d& p) + { + // Edges between pixels. + return p.row() % 2 + p.col() % 2 == 1; + } + + typedef fun::C<bool (*)(const mln::point2d&)> predicate_t; + + image_if< image2d<value::int_u8>, predicate_t > + f_to_g(const image2d<value::int_u8>& f, value::int_u8 value_on_non_edges = 0) + { + image2d<value::int_u8> f_(2 * f.nrows() - 1, 2 * f.ncols() - 1); + data::fill(f_, value_on_non_edges); // Useless but for display! + + data__paste_values(f, (f_ | is_pixel).rw()); + + mln_VAR(g, f_ | is_edge); + data::paste(morpho::gradient(extend(g, f_), e2p().win()), g); + + return g; + } + + } + +} + +#endif // !CPLX2D_HH diff --git a/milena/sandbox/edwin/MaxTree/salembier_edge.cc b/milena/sandbox/edwin/MaxTree/salembier_edge.cc new file mode 100644 index 0000000..a9abcea --- /dev/null +++ b/milena/sandbox/edwin/MaxTree/salembier_edge.cc @@ -0,0 +1,30 @@ +#include <mln/io/pgm/load.hh> +#include <mln/debug/println.hh> +#include "salembier_edge.hh" + +void usage(char** argv) +{ + std::cout << "Usage: " << argv[0] << " input.png" << std::endl; + std::cout << "Calcule la longueur des contours des CC avec l'algo de Salembier." + << std::endl; + abort(); +} + +int main(int argc, char** argv) +{ + using namespace mln; + typedef image2d< value::int_u8 > I; + + if (argc < 2) + usage(argv); + + const char* filename = argv[1]; + + I input; + io::pgm::load(input, filename); + + image2d<int> e = salembier(input); + + std::cout << "Attribute Image: " << std::endl; + debug::println(e); +} diff --git a/milena/sandbox/edwin/MaxTree/salembier_edge.hh b/milena/sandbox/edwin/MaxTree/salembier_edge.hh new file mode 100644 index 0000000..5072a2b --- /dev/null +++ b/milena/sandbox/edwin/MaxTree/salembier_edge.hh @@ -0,0 +1,191 @@ +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 SALEMBIER_EDGE_HH +# define SALEMBIER_EDGE_HH + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/routine/initialize.hh> + +#include <mln/core/image/attribute_image.hh> +#include <mln/util/hqueues.hh> + +#include "cplx2d.hh" + + +namespace mln +{ + typedef image2d<value::int_u8> I; + + + template <typename I, typename N> + struct salembier_args + { + typedef mln_psite(I) P; + typedef mln_value(I) V; + + enum { nvalues = mln_card(V) }; + + const I& f; + const N& nbh; + unsigned hmin; + util::hqueues< mln_psite(I), mln_value(I) > hqueue; + P levroot[nvalues]; + bool is_node_at_level[nvalues]; + mln_ch_value(I, P) parent; + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, bool) active_edges; + mln_ch_value(I, int) count_edges; + }; + + + + template <typename I, typename N> + int flood(salembier_args<I, N>& args, const int h) + { + typedef mln_psite(I) P; + + mln_assertion(args.is_node_at_level[h]); + + P root = args.levroot[h]; + + while (!args.hqueue[h].empty()) + { + P p = args.hqueue[h].pop_front(); + args.parent(p) = root; + + mln_niter(N) n(args.nbh, p); + for_all(n) + if (args.f.domain().has(n) && !args.deja_vu(n)) + { + int n_idx = args.f(n); // en faite vset.index_of(...) + args.hqueue[n_idx].push(n); + args.deja_vu(n) = true; + + if (!args.is_node_at_level[n_idx]) + { + args.levroot[n_idx] = n; + args.is_node_at_level[n_idx] = true; + } + + while (h < n_idx) + n_idx = flood(args, n_idx); + } + + mln_niter(N) e(cplx2d::p2e(), p * 2); + for_all(e) + if (args.active_edges(e)) + { + args.active_edges(e) = false; + args.count_edges(root)--; // attribute.untake(e) + } + else + { + args.active_edges(e) = true; + args.count_edges(root)++; // attribute.take(e) + } + } + + args.is_node_at_level[h] = false; + unsigned c = h; + while (c > args.hmin && !args.is_node_at_level[c]) + --c; + + if (args.is_node_at_level[c]) + { + P q = args.levroot[c]; + args.parent(root) = q; + args.count_edges(q) += args.count_edges(root); // attribute.merge + } + else + args.parent(root) = root; + + return c; + } + + image2d<int> + salembier(const image2d<value::int_u8>& f, + const neighb2d& nbh = c4()) + { + // Init + typedef image2d<value::int_u8> I; + typedef neighb2d N; + + enum { nv = mln_card(mln_value_(I)) }; + + salembier_args<I, N> args = { f, nbh, }; + { + box2d b(2 * f.nrows() - 1, 2 * f.ncols() - 1); + + initialize(args.parent, f); + initialize(args.deja_vu, f); + initialize(args.count_edges, f); + args.active_edges.init_(b); + + std::fill(args.is_node_at_level, args.is_node_at_level + nv, false); + data::fill(args.deja_vu, false); + data::fill(args.active_edges, false); + data::fill(args.count_edges, 0); + } + + // Get start value + mln_psite_(I) pstart = f.domain().pmin(); + mln_value_(I) hstart = f(pstart); + { + unsigned h[nv] = {0}; + mln_piter_(I) p(f.domain()); + for_all(p) + { + mln_value_(I) v = f(p); + ++h[v]; + if (v < hstart) + { + hstart = v; + pstart = p; + } + } + + for (unsigned i = 0; i < nv; ++i) + args.hqueue[i].reserve(h[i]); + } + + // Start flooding + args.hmin = hstart; + args.deja_vu(pstart) = true; + args.hqueue[hstart].push(pstart); + args.levroot[hstart] = pstart; + args.is_node_at_level[hstart] = true; + + int r = flood(args, hstart); + mln_assertion(r == hstart); + return args.count_edges; + } + +} + +#endif // !SALEMBIER_EDGE_HH -- 1.5.6.5

1 0

last-svn-commit-7-gf9fd921 Minor fixes.
by edwin carlinet 30 Sep '10

30 Sep '10

* edwin/TreeAlgorithmsComp/Makefile: Minor fixes. * edwin/TreeAlgorithmsComp/bench.hh: Minor fixes. --- milena/sandbox/ChangeLog | 9 ++++++++ milena/sandbox/edwin/TreeAlgorithmsComp/Makefile | 1 + milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh | 24 +++++++++++---------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 5d3a05f..29b629c 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,14 @@ +2010-09-30 edwin carlinet <carlinet(a)lrde.epita.fr> + + Minor fixes. + + * edwin/TreeAlgorithmsComp/Makefile: Minor fixes. + * edwin/TreeAlgorithmsComp/bench.hh: Minor fixes. + 2010-06-02 edwin carlinet <carlinet(a)lrde.epita.fr> + Minor fixes in component tree algorithms. + * edwin/TreeAlgorithmsComp/Makefile: New. * edwin/TreeAlgorithmsComp/bench.hh, * edwin/TreeAlgorithmsComp/nnodes.hh: Shared headers. diff --git a/milena/sandbox/edwin/TreeAlgorithmsComp/Makefile b/milena/sandbox/edwin/TreeAlgorithmsComp/Makefile index fea59aa..06e9df4 100644 --- a/milena/sandbox/edwin/TreeAlgorithmsComp/Makefile +++ b/milena/sandbox/edwin/TreeAlgorithmsComp/Makefile @@ -15,6 +15,7 @@ LDFLAGS = $(if $(WALL_CLOCK), -ltbb) CC = g++ tbb_CXXFLAGS = $(CXXFLAGS) -I $(TBB_INCLUDE_DIR) -DWALL_CLOCK +#tbb_CXXFLAGS += -DTRACE # pour debuguer les threads tbb_LDFLAGS = -L $(TBB_LIB_DIR) -ltbb TARGETS = \ diff --git a/milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh b/milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh index a68ab71..e6e6bdc 100644 --- a/milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh +++ b/milena/sandbox/edwin/TreeAlgorithmsComp/bench.hh @@ -48,20 +48,22 @@ # else // !WALL_CLOCK # include <tbb/tick_count.h> +# include <cmath> -# define START_BENCH(N_ITERATION) \ - { \ +# define START_BENCH(N_ITERATION) \ + { \ + const int n_iteration__ = N_ITERATION; \ tbb::tick_count t0__ = tbb::tick_count::now(); \ - const int n_iteration__ = N_ITERATION; \ - for (int i__ = 0; i__ < n_iteration__; ++i__) { + for (int i__ = 0; i__ < n_iteration__; ++i__) { \ -# define END_BENCH(MSG) \ - } \ - tbb::tick_count t1__ = tbb::tick_count::now(); \ - std::cout << MSG \ - << (t1__ - t0__).seconds() * 1000 / n_iteration__ \ - << " ms." << std::endl; \ - } + +# define END_BENCH(MSG) \ + }; \ + tbb::tick_count t1__ = tbb::tick_count::now(); \ + std::cout << MSG \ + << (t1__ - t0__).seconds() * 1000 / n_iteration__ \ + << " ms ." << std::endl; \ + } # endif -- 1.5.6.5

1 0

*****SPAM***** olena-patches@lrde.epita.fr_V|AGRA � Official 67% 0FF!
by olena-patches＠lrde.epita.fr 20 Sep '10

20 Sep '10

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Click here! [...] Content analysis details: (30.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.0 NO_REAL_NAME From: does not include a real name 1.5 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO 0.9 FUZZY_VPILL BODY: Attempt to obfuscate words in spam 0.1 HTML_90_100 BODY: Message is 90% to 100% HTML 0.0 HTML_MESSAGE BODY: HTML included in message 3.1 HTML_IMAGE_ONLY_08 BODY: HTML: images with 400-800 bytes of words 0.0 BAYES_50 BODY: Bayesian spam probability is 40 to 60% [score: 0.5490] 0.0 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 1.5 RAZOR2_CF_RANGE_E8_51_100 Razor2 gives engine 8 confidence level above 50% [cf: 100] 1.5 RAZOR2_CF_RANGE_E4_51_100 Razor2 gives engine 4 confidence level above 50% [cf: 100] 0.5 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/) 0.5 RAZOR2_CF_RANGE_51_100 Razor2 gives confidence level above 50% [cf: 100] 3.9 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [115.88.32.114 listed in sbl-xbl.spamhaus.org] 3.8 URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist [URIs: favorgood.ru] 4.1 URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist [URIs: favorgood.ru] 2.1 URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist [URIs: favorgood.ru] 4.5 URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist [URIs: favorgood.ru] 0.9 HTML_SHORT_LINK_IMG_1 HTML is very short with a linked image The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

branch more-generic-skel updated: last-svn-commit-212-g8cbc086
by git＠lrde.epita.fr 16 Sep '10

16 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch more-generic-skel has been updated discards 25950c4401a9d94c8879ff9e9d561272e3055eb4 (commit) discards c0f02ece8a92571bea34d5b46bdb227094292b48 (commit) discards 876aaf57aaaf4b4e7b7a5409503b919f89469406 (commit) discards c9a6f38e521e49267034ffd047ee96882456fe3b (commit) discards d0945cb873925fb3d20b9853980ee7a020b30157 (commit) via 8cbc0864835adb146da03fde34e7f3328bc580a8 (commit) via 086b7d82fff3cea004ec3c1a7ea0b6775df7ab7c (commit) via c17805cda0f19313b307ac6d31cdd8bdf2ae3a9e (commit) via 643158a15c5d243a437aaa467efc8234db4f81f3 (commit) via 0a6d80b5d914e684b642951c0b32c72421e8ceb5 (commit) via a087bc4d5c23b64db8ca8a3fe40c73387419ec70 (commit) via ee56e13b49f84c30aaaee1f3c1edfdac61784c52 (commit) via b4a75638b975b3e0a70d47ab1fa48caff05468f3 (commit) via a04de22136722fbb9445e9f0eec4b0a474a4393d (commit) via cb5723f7d881aa291082a67e2a0303456b1b3402 (commit) via 739f3d21f481e522f8712bbfb5dd891a7886d615 (commit) via 8b3107da88f52723fe8e170efc6a6f10d4bdc17e (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (25950c4401a9d94c8879ff9e9d561272e3055eb4) \ N -- N -- N (8cbc0864835adb146da03fde34e7f3328bc580a8) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 8cbc086 Use mln::data::paste to simplify mesh skeleton applications. 086b7d8 Update mesh skeleton applications. c17805c More generic breadth-first-thinning-based skeleton transformations. 643158a Introduce a helper to build an mln::mutable_extension_ima. 0a6d80b Introduce an extension-by-mutable-image morpher. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 77 +++++++++- milena/headers.mk | 4 + milena/mln/topo/detach_cell.hh | 1 - .../mln/{fun/p2b/chess.hh => topo/detach_point.hh} | 54 +++---- .../estimate.hh => mln/topo/is_not_end_point.hh} | 90 ++++++------ milena/mln/topo/is_simple_point2d.hh | 140 +++++++++++++++++ milena/mln/topo/skeleton/breadth_first_thinning.hh | 10 +- ...rst_thinning.hh => priority_driven_thinning.hh} | 158 ++++++++++---------- milena/tests/topo/skeleton/Makefile.am | 20 +++- .../skeleton/breadth_first_thinning.cc} | 55 ++++--- .../skeleton/breadth_first_thinning_constrained.cc | 69 +++++---- .../topo/skeleton/priority_driven_thinning.cc | 90 +++++++++++ .../priority_driven_thinning_constrained.cc | 94 ++++++++++++ 13 files changed, 636 insertions(+), 226 deletions(-) copy milena/mln/{fun/p2b/chess.hh => topo/detach_point.hh} (65%) copy milena/{sandbox/theo/estimate.hh => mln/topo/is_not_end_point.hh} (52%) create mode 100644 milena/mln/topo/is_simple_point2d.hh copy milena/mln/topo/skeleton/{breadth_first_thinning.hh => priority_driven_thinning.hh} (52%) copy milena/tests/{labeling/foreground.cc => topo/skeleton/breadth_first_thinning.cc} (54%) copy scribo/src/primitive/find/find_pattern_lines.cc => milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc (50%) create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning.cc create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch skeletons created: last-svn-commit-207-ga087bc4
by git＠lrde.epita.fr 16 Sep '10

16 Sep '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch skeletons has been created at a087bc4d5c23b64db8ca8a3fe40c73387419ec70 (commit) - Log ----------------------------------------------------------------- a087bc4 Catch up with the renaming to detach_cell. ee56e13 Rename topo::detach as topo::detach_cell. b4a7563 Exercise breadth-first and priority-driven thinnings. a04de22 New skeletonization algorithm: priority-driven thinning. cb5723f Add helpers to compute skeletons by thinning on regular 2D images. 739f3d2 Add tracing mechanism to breadth-first thinning. 8b3107d Small fix in breadth-first thinning. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-207-ga087bc4 Catch up with the renaming to detach_cell.
by Roland Levillain 15 Sep '10

15 Sep '10

* apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-skel.cc: s/detach/detach_cell/. --- milena/ChangeLog | 9 +++++++++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 4 ++-- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 7 ++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3f871ab..da73aef 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-09-15 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the renaming to detach_cell. + + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-skel.cc: + s/detach/detach_cell/. + +2010-09-15 Roland Levillain <roland(a)lrde.epita.fr> + Rename topo::detach as topo::detach_cell. * mln/topo/detach.hh (detach): Rename as... diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index b910aae..5c17726 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -48,7 +48,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -265,7 +265,7 @@ main(int argc, char* argv[]) bin_ima_t skel = mln::topo::skeleton::breadth_first_thinning(surface, nbh, is_simple_p, - mln::topo::detach<D, G>, + mln::topo::detach_cell<D, G>, constraint_p); /*---------. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 4a59a6b..7092b18 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -48,7 +48,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -270,7 +270,7 @@ main(int argc, char* argv[]) bin_ima_t skel = mln::topo::skeleton::breadth_first_thinning(surface, nbh, is_simple_p, - mln::topo::detach<D, G>, + mln::topo::detach_cell<D, G>, constraint_p); /*---------. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index 5cd97b4..f5a7f11 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -44,7 +45,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -222,7 +223,7 @@ main(int argc, char* argv[]) bin_ima_t skel = mln::topo::skeleton::breadth_first_thinning(surface, nbh, is_simple_p, - mln::topo::detach<D, G>, + mln::topo::detach_cell<D, G>, constraint_p); /*---------. -- 1.5.6.5

1 0