September 2010 - Olena-patches

[Olena] #229: Have Olena's BuildBot generate GitStats information
by Olena Trac 23 Nov '11

23 Nov '11

#229: Have Olena's BuildBot generate GitStats information -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: trivial | Milestone: Olena 1.1 Component: other | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Git statistics are generated by my (Roland's) account for a limited set of branches, each night. It'd be smarter to have one of the buildslave invoke a script running `gitstats` and uploading the result (as `lrde- upload.sh` does) prior to building the project. We could even filter branches (having statistics for all branches might not be relevant). -- Ticket URL: <https://trac.lrde.org/olena/ticket/229> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 4

[Olena] #225: Code not displayed in tutorial
by Olena Trac 09 Sep '11

09 Sep '11

#225: Code not displayed in tutorial ---------------------------+------------------------------------------------ Reporter: jonathan | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: doc, tutorial | ---------------------------+------------------------------------------------ in page, [http://www.lrde.epita.fr/dload/olena/1.0/doc/milena/devel_doc/] all examples of code are not displayed (all boxes are empty) -- Ticket URL: <https://trac.lrde.org/olena/ticket/225> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

[Olena] #220: Change the logo of the Trac
by Olena Trac 08 Sep '11

08 Sep '11

#220: Change the logo of the Trac ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Component: Trac | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Use this one instead: http://www.lrde.epita.fr/dload/olena/logos/olena_small.jpg. Unfortunately, we don't have the required permissions on the Trac's files/dirs to change it. -- Ticket URL: <https://trac.lrde.org/olena/ticket/220> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 5

[Olena] #172: Experiment SCOOP 1.5/2 with C++0x concepts
by Olena 12 Jul '11

12 Jul '11

#172: Experiment SCOOP 1.5/2 with C++0x concepts -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: trivial | Milestone: Olena 2.0 Component: Olena-NG | Version: 2.0 Keywords: | -------------------------+-------------------------------------------------- What I call SCOOP 1.5 is the paradigm currently used in Milena 1.0 (as of Nov. 2008), and SCOOP 2 the paradigm described in the MPOOL'08 paper (used in Olena-NG). -- Ticket URL: <https://trac.lrde.org/olena/ticket/172> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

last-svn-commit-137-gdb55e63 Add the binarization tool submitted to H-DIBCO 2010.
by Guillaume Lazzara 04 Nov '10

04 Nov '10

* src/Makefile.am, * src/contest/Makefile.am, * src/contest/hdibco-2010/Makefile.am: New. * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code of the submitted program for H-DIBCO 2010. --- scribo/ChangeLog | 11 ++ scribo/src/Makefile.am | 1 + .../{tests/toolchain => src/contest}/Makefile.am | 2 +- .../contest/hdibco-2010}/Makefile.am | 8 +- .../hdibco-2010/sauvola_ms_hdibco.cc} | 100 +++++++------------ 5 files changed, 56 insertions(+), 66 deletions(-) copy scribo/{tests/toolchain => src/contest}/Makefile.am (98%) copy scribo/{tests/toolchain => src/contest/hdibco-2010}/Makefile.am (87%) copy scribo/src/{binarization/pgm_sauvola_ms.cc => contest/hdibco-2010/sauvola_ms_hdibco.cc} (53%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f2eb3c3..3888981 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add the binarization tool submitted to H-DIBCO 2010. + + * src/Makefile.am, + * src/contest/Makefile.am, + * src/contest/hdibco-2010/Makefile.am: New. + + * src/contest/hdibco-2010/sauvola_ms_hdibco.cc: New. Source code + of the submitted program for H-DIBCO 2010. + +2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tools in scribo/src. * src/Makefile.am: Add postprocessing subdir. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index b3a7859..774740a 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/scribo/scribo.mk SUBDIRS = \ binarization \ + contest \ debug \ primitive \ filter \ diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/Makefile.am similarity index 98% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/Makefile.am index 826fb86..81f314b 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/Makefile.am @@ -20,4 +20,4 @@ include $(top_srcdir)/scribo/tests/tests.mk SUBDIRS = \ - nepomuk \ No newline at end of file + hdibco-2010 \ No newline at end of file diff --git a/scribo/tests/toolchain/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am similarity index 87% copy from scribo/tests/toolchain/Makefile.am copy to scribo/src/contest/hdibco-2010/Makefile.am index 826fb86..44add64 100644 --- a/scribo/tests/toolchain/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -19,5 +19,9 @@ include $(top_srcdir)/scribo/tests/tests.mk -SUBDIRS = \ - nepomuk \ No newline at end of file +check_PROGRAMS = sauvola_ms_hdibco + +sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc + + +TESTS = $(check_PROGRAMS) diff --git a/scribo/src/binarization/pgm_sauvola_ms.cc b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc similarity index 53% copy from scribo/src/binarization/pgm_sauvola_ms.cc copy to scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc index 38ff2e6..68fdaac 100644 --- a/scribo/src/binarization/pgm_sauvola_ms.cc +++ b/scribo/src/contest/hdibco-2010/sauvola_ms_hdibco.cc @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,86 +23,61 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <cctype> #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> +#include <mln/io/ppm/load.hh> #include <mln/io/pbm/save.hh> #include <scribo/binarization/sauvola_ms.hh> -#include <scribo/debug/usage.hh> - -bool check_args(int argc, char * argv[]) -{ - if (argc < 3 || argc > 6) - return false; - - if (argc >= 5) - { - int s = atoi(argv[4]); - - if (s < 1 || s > 3) - { - std::cout << "s must be set to 2 or 3." - << std::endl; - return false; - } - } - - return true; -} - - -const char *args_desc[][2] = -{ - { "input.pgm", "A graylevel image." }, - { "out.pbm", "A binary image." }, - { "w", "Window size at scale 1. (default: 101)" }, - { "s", "First subsampling ratio (default: 3)." }, - { "k", "Sauvola's formuale parameter (default: 0.34)" }, - {0, 0} -}; - - - +#include <scribo/postprocessing/fill_object_holes.hh> +#include <scribo/preprocessing/denoise.hh> int main(int argc, char *argv[]) { using namespace mln; using namespace scribo; - if (!check_args(argc, argv)) - return scribo::debug::usage(argv, - "Multi-Scale Binarization of a color image based on Sauvola's algorithm.", - "input.pgm output.pbm <w> <s> <k>", - args_desc); - trace::entering("main"); + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << " <input.{pgm,ppm}> <output.pbm>" << std::endl; + std::cout << "--------------" << std::endl; + std::cout << "EPITA/LRDE - 2010" << std::endl; + return 1; + } - // Window size - unsigned w_1; - if (argc >= 4) - w_1 = atoi(argv[3]); // Scale 1 - else - w_1 = 101u; + std::string ext = argv[1]; + ext = ext.substr(ext.length() - 3, 3); + for (unsigned i = 0; i < ext.length(); ++i) + ext[i] = tolower(ext[i]); - // First subsampling scale. - unsigned s; - if (argc >= 5) - s = atoi(argv[4]); - else - s = 3u; + // Load + image2d<value::int_u8> input; - double k; - if (argc >= 6) - k = atof(argv[5]); - else - k = 0.34f; + if (ext == "pgm") + io::pgm::load(input, argv[1]); + else if (ext == "ppm") + { + image2d<value::rgb8> input_color; + io::ppm::load(input_color, argv[1]); - image2d<value::int_u8> input_1; - io::pgm::load(input_1, argv[1]); + // Convert to Gray level image. + input = data::transform(input_color, mln::fun::v2v::rgb_to_int_u<8>()); + } + else + { + std::cout << "Invalid input file format! Expecting PGM or PPM images." << std::endl; + return 1; + } + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); + output = scribo::binarization::sauvola_ms(input, 101, 3, 0.4); + + output = scribo::preprocessing::denoise_bg(output, c8(), 4); + output = scribo::postprocessing::fill_object_holes(output, 0.01f); io::pbm::save(output, argv[2]); } -- 1.5.6.5

2 1

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