March 2009 - Olena-patches

3565: Add some executable source.
by Thierry Geraud 24 Mar '09

24 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some executable source. * theo/icdar: New directory. * theo/icdar/dibco: New directory. * theo/icdar/hsc: New directory. * theo/icdar/hsc/fuzzy.sh: New. * theo/icdar/hsc/dist.sh: New. * theo/icdar/hsc/exec: New directory. * theo/icdar/hsc/exec/iz_lines.cc: New. * theo/icdar/hsc/exec/relabel_lines.cc: New. * theo/icdar/hsc/exec/show_lines_pbm.cc: New. * theo/icdar/hsc/exec/show_lines.cc: New. * theo/exec/watershed_superpose.cc: New. * theo/exec/gaussian_directional_2d__float.cc: New. * theo/exec/distance_thick.cc: New. * theo/exec/closing_rectangle.cc: Add pbm case. * theo/exec/opening_rectangle.cc: New. * theo/exec/closing_isotropic.cc: Add pgm case. exec/closing_isotropic.cc | 10 + exec/closing_rectangle.cc | 26 ++ exec/distance_thick.cc | 46 +++++ exec/gaussian_directional_2d__float.cc | 99 +++++++++++ exec/opening_rectangle.cc | 62 ++++++ exec/watershed_superpose.cc | 36 ++++ icdar/hsc/dist.sh | 8 icdar/hsc/exec/iz_lines.cc | 106 +++++++++++ icdar/hsc/exec/relabel_lines.cc | 296 +++++++++++++++++++++++++++++++++ icdar/hsc/exec/show_lines.cc | 53 +++++ icdar/hsc/exec/show_lines_pbm.cc | 44 ++++ icdar/hsc/fuzzy.sh | 18 ++ 12 files changed, 801 insertions(+), 3 deletions(-) Index: theo/icdar/hsc/fuzzy.sh --- theo/icdar/hsc/fuzzy.sh (revision 0) +++ theo/icdar/hsc/fuzzy.sh (revision 0) @@ -0,0 +1,18 @@ +#! /bin/sh + +convert -geometry 25% -depth 8 +compress $1 small.pgm +./+bin/gaussian_directional_2d__float small.pgm 1 1 31 fuz.pgm + +./+bin/closing_rectangle fuz.pgm 7 31 tmp.pgm +./+bin/watershed_flooding tmp.pgm ws_txt.pgm + +convert -negate fuz.pgm -depth 8 +compress tmp.pgm + +./+bin/closing_rectangle tmp.pgm 7 31 tmp.pgm +./+bin/watershed_flooding tmp.pgm ws_spc.pgm + +./+bin/relabel_lines ws_txt.pgm ws_spc.pgm tmp.ppm + +./+bin/show_lines small.pgm tmp.ppm ${1%pbm}ppm + +rm fuz.pgm tmp.pgm ws_txt.pgm ws_spc.pgm small.pgm tmp.ppm Property changes on: theo/icdar/hsc/fuzzy.sh ___________________________________________________________________ Added: svn:executable + * Index: theo/icdar/hsc/exec/iz_lines.cc --- theo/icdar/hsc/exec/iz_lines.cc (revision 0) +++ theo/icdar/hsc/exec/iz_lines.cc (revision 0) @@ -0,0 +1,106 @@ +#include "../exec/filetype.hh" + +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/dpoint2d.hh> + +#include <mln/core/image/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/pw/all.hh> + +// #include <mln/debug/colorize.hh> + +#include <mln/transform/influence_zone_geodesic.hh> + +// #include <mln/level/transform.hh> +// #include <mln/fun/l2l/wrap.hh> + + +using mln::value::int_u8; + + + +namespace mln +{ + + + template <typename L> + image2d<int_u8> + left_iz(const image2d<bool>& in, const image2d<L>& ws_txt) + { + box2d b = ws_txt.domain(); + + image2d<int_u8> ima(b); + data::fill(ima, 0); + + unsigned nrows = ima.nrows(); + int_u8 l = 0; + for (unsigned row = 0; row < nrows; ++row) + if (ws_txt.at_(row, 0) == 0) + ima.at_(row, 0) = ++l; + + io::pgm::save(ima, "tmp_iz_start.pgm"); + + data::paste( transform::influence_zone_geodesic(ima | (pw::value(ws_txt) == pw::cst(0)), + c8(), + mln_max(unsigned)), + ima ); + + image2d<int_u8> out(in.domain()); + data::fill(out, false); + data::fill((out | pw::value(in)).rw(), 255); + + mln_piter(box2d) p(out.domain()); + for_all(p) +// if (in(p) == true) + { + point2d p_(p.row() / 4, p.col() / 4); + if (! ima.has(p_) || ima(p_) == 0) + continue; + out(p) = ima(p_); + } + + return out; + } + + +} // ! mln + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm ws_txt.pgm output.ppm" << std::endl + << " Label lines." << std::endl + << " input is the large binary image;" << std::endl + << " ws_txt is a small (25p) watershed image thru text." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + image2d<bool> in; + io::pbm::load(in, argv[1]); + + image2d<int_u8> ws_txt, out; + io::pgm::load(ws_txt, argv[2]); + + out = left_iz(in, ws_txt); + + io::pgm::save(out, argv[3]); + +// io::ppm::save(debug::colorize(value::rgb8(), out, 254), +// argv[3]); + + trace::exiting("main"); +} Index: theo/icdar/hsc/exec/relabel_lines.cc --- theo/icdar/hsc/exec/relabel_lines.cc (revision 0) +++ theo/icdar/hsc/exec/relabel_lines.cc (revision 0) @@ -0,0 +1,296 @@ +#include "../exec/filetype.hh" + +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/dpoint2d.hh> + +#include <mln/value/label_8.hh> +#include <mln/core/image/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/pw/all.hh> +#include <mln/labeling/blobs.hh> +// #include <mln/labeling/compute.hh> +#include <mln/accu/maj_h.hh> + +#include <mln/morpho/elementary/dilation.hh> +#include <mln/debug/colorize.hh> + +#include <mln/transform/influence_zone_geodesic.hh> +#include <mln/level/transform.hh> +#include <mln/fun/l2l/wrap.hh> + + +namespace mln +{ + + typedef value::int_u8 L; + + enum { max_L = 256 - 1 }; + + typedef L par_t[max_L]; + typedef std::vector<L> labels_t[max_L]; + + + L find_root(par_t& par, L l) + { + if (par[l] == l) + return l; + return par[l] = find_root(par, par[l]); + } + + + image2d<L> doit(const image2d<L>& ws_txt, + const image2d<L>& ws_spc) + { + labels_t left_, right_; + +// image2d<bool> cross(ws_txt.domain()); +// data::fill(cross, false); + + box2d b = ws_txt.domain(); + mln_piter_(box2d) p(b); + for_all(p) + { + if (ws_txt(p) != 0 || ws_spc(p) != 0) + continue; + if (ws_txt(p + left) == 0 && ws_txt(p + right) == 0 + // text = locally horizontal: + // o o o + && + ws_spc(p + left) != 0 && ws_spc(p + right) != 0 + // region frontiere = locally roughly vertical: + // x . + // o + // . x + ) + { + L l1 = ws_spc(p + left), + l2 = ws_spc(p + right); + if (l1 == 0 || l2 == 0) + continue; + if (l2 == l1) + continue; + right_[l1].push_back(l2); + left_[l2].push_back(l1); +// cross(p) = true; + } + } + +// io::pbm::save(cross, "tmp_cross.pbm"); + + + // debug code: + +// for (L l = 0; l < max_L; ++l) +// if (right_[l].size()) +// { +// std::cout << l << " -> "; +// const std::vector<L>& lab = right_[l]; +// for (L i = 0; i < lab.size(); ++i) +// { +// std::cout << lab[i] << ' '; +// const std::vector<L>& rev_lab = left_[ lab[i] ]; +// if (rev_lab.size()) +// { +// std::cout << '('; +// for (L j = 0; j < rev_lab.size(); ++j) +// std::cout << rev_lab[j] << ','; +// std::cout << ')'; +// } +// } +// std::cout << std::endl; +// } + + + par_t par; + for (L l = 0; l < max_L; ++l) + par[l] = l; + + for (L l = 1; l < max_L; ++l) + if (right_[l].size() == 1) + { + L l2 = right_[l][0]; + mln_invariant(l2 != 0); + if (left_[l2].size() != 0 && left_[l2][0] == l) + { + mln_invariant(l != 0 && l2 != l); + // Union. + par[l] = l2; // l --right--> l2 + } + } + + for (L l = 1; l < max_L; ++l) + par[l] = find_root(par, l); + +// // debug code: + +// for (L l = 1; l < max_L; ++l) +// if (par[l] != l) +// std::cout << l << " -> " << par[l] << " "; +// std::cout << std::endl; + + + image2d<L> out(b); + for_all(p) + out(p) = par[ ws_spc(p) ]; + + return out; + } + + + void left_iz(const image2d<bool>& ws) + { + using value::int_u8; + image2d<int_u8> ima(ws.domain()); + data::fill(ima, 0); + unsigned nrows = ima.nrows(); + int_u8 l = 0; + for (unsigned row = 0; row < nrows; ++row) + if (ws.at_(row, 0) == true) + ima.at_(row, 0) = ++l; + io::pgm::save(ima, "tmp_iz_start.pgm"); + + data::paste( transform::influence_zone_geodesic(ima | pw::value(ws), + c8(), + mln_max(unsigned)), + ima ); + + io::pgm::save(ima, "tmp_iz.pgm"); + } + + + + image2d<L> doit_cut(const image2d<L>& ws_txt, + const image2d<L>& ws_spc) + { + + box2d b = ws_txt.domain(); + + image2d<bool> lines(b); + data::fill(lines, (pw::value(ws_txt) == pw::cst(0)) | b); + + left_iz(lines); // THIS IS A TEST! + + + //debug: + io::pbm::save(lines, "tmp_ws_line.pbm"); + + mln_piter_(box2d) p(b); + for_all(p) + if (ws_txt(p) == 0 && + ws_txt(p + up) == 0 && + ws_txt(p + down) == 0) + lines(p) = false; + + //debug: + io::pbm::save(lines, "tmp_lines.pbm"); + + typedef value::int_u<12> L2; + L2 n_lines; + image2d<L2> line_lab = labeling::blobs(lines, c8(), n_lines); + + { + io::pgm::save(level::transform(line_lab, + fun::l2l::wrap<value::int_u8>()), + "tmp_lines.pgm"); + } + + // Cannot be used with int_u* (only with label_*): + // util::array<L2> arr = labeling::compute(accu::maj_h<L2>(), + // line_lab | (pw::value(line_lab) != pw::cst(0)), + // ws_spc, + // max_L); + + util::array< accu::maj_h<L2> > arr(max_L + 1); // L -> L2 + for_all(p) + { + if (line_lab(p) == 0) // not on a line + continue; + L l = ws_spc(p); // l = label of a region + if (l == 0) + continue; + arr[l].take(line_lab(p)); + } + + util::array<L2> arr_(max_L); // L -> L2 + for (L l = 1; l < max_L; ++l) + arr_[l] = arr[l].to_result(); + +// // debug: +// for (L l = 1; l < max_L; ++l) +// std::cout << l << " -> " << arr_[l] << " "; +// std::cout << std::endl; + + L2 l2_max = 0; + for (L l = 1; l < max_L; ++l) + if (arr_[l] > l2_max) + l2_max = arr_[l]; + + for (L l = 1; l < max_L; ++l) + if (arr_[l] == 0) + arr_[l] = ++l2_max; + +// // debug: +// std::cout << std::endl << std::endl; +// for (L l = 1; l < max_L; ++l) +// std::cout << l << " -> " << arr_[l] << " "; +// std::cout << std::endl; + + util::array<L> newl(l2_max + 1); + for (unsigned i = 0; i <= l2_max; ++i) + newl[i] = 0; + + L cur = 1; + for (L l = 1; l < max_L; ++l) + { + L2 l2 = arr_[l]; + if (newl[l2] == 0) + newl[l2] = cur++; + } + + image2d<L> out(b); + for_all(p) + if (ws_spc(p) == 0) + out(p) = 0; + else + out(p) = newl[ arr_[ws_spc(p)] ]; + + out = morpho::elementary::dilation(out, c4()); // c2_row + + return out; + } + + +} // ! mln + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " ws_txt.pgm ws_spc.pgm output.ppm" << std::endl + << " Label lines." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + image2d<L> ws_txt, ws_spc; + io::pgm::load(ws_txt, argv[1]); + io::pgm::load(ws_spc, argv[2]); + + image2d<L> out = doit_cut(ws_txt, ws_spc); + + io::ppm::save(debug::colorize(value::rgb8(), out, 254), + argv[3]); + + trace::exiting("main"); +} Index: theo/icdar/hsc/exec/show_lines_pbm.cc --- theo/icdar/hsc/exec/show_lines_pbm.cc (revision 0) +++ theo/icdar/hsc/exec/show_lines_pbm.cc (revision 0) @@ -0,0 +1,44 @@ +#include "../exec/filetype.hh" + +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/dpoint2d.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm regions.ppm output.ppm" << std::endl + << " 'input' is PBM: dark text / light background" << std::endl + << " 'regions': one color per region." << std::endl; + std::abort(); +} + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + box2d b = input.domain(); + + image2d<rgb8> reg, out(b); + io::ppm::load(reg, argv[2]); + + data::fill(out, rgb8(0,0,0)); + + mln_piter_(box2d) p(b); + for_all(p) if (input(p)) + out(p) = reg.at_(p.row() / 4, p.col() / 4); + + io::ppm::save(out, argv[3]); + + trace::exiting("main"); +} Index: theo/icdar/hsc/exec/show_lines.cc --- theo/icdar/hsc/exec/show_lines.cc (revision 0) +++ theo/icdar/hsc/exec/show_lines.cc (revision 0) @@ -0,0 +1,53 @@ +#include "../exec/filetype.hh" + +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/dpoint2d.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm regions.ppm output.ppm" << std::endl + << " 'input': dark text / light background" << std::endl + << " 'regions': one color per region." << std::endl; + std::abort(); +} + + +const mln::value::int_u8 +foo(const mln::value::int_u8& c, + const mln::value::int_u8& g) +{ + float ratio = 1.f - float(g) / 256.f; + return unsigned(ratio * c); +} + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + box2d b = input.domain(); + + image2d<rgb8> reg, out(b); + io::ppm::load(reg, argv[2]); + + mln_piter_(box2d) p(b); + for_all(p) + out(p) = rgb8( foo(reg(p).red(), input(p)), + foo(reg(p).green(), input(p)), + foo(reg(p).blue(), input(p)) ); + + io::ppm::save(out, argv[3]); + + trace::exiting("main"); +} Index: theo/icdar/hsc/dist.sh --- theo/icdar/hsc/dist.sh (revision 0) +++ theo/icdar/hsc/dist.sh (revision 0) @@ -0,0 +1,8 @@ +#! /bin/sh + +./+bin/distance_thick $1 out.pgm +convert -depth 8 +compress $1 ${1%pbm}pgm +./+bin/closing_rectangle out.pgm 11 101 out2.pgm +./+bin/watershed_flooding out2.pgm out3.pgm +./+bin/watershed_superpose ${1%pbm}pgm out3.pgm ${1%pbm}ppm +rm out.pgm out2.pgm out3.pgm Property changes on: theo/icdar/hsc/dist.sh ___________________________________________________________________ Added: svn:executable + * Index: theo/exec/watershed_superpose.cc --- theo/exec/watershed_superpose.cc (revision 0) +++ theo/exec/watershed_superpose.cc (revision 0) @@ -0,0 +1,36 @@ +#include "filetype.hh" + +#include <mln/morpho/watershed/superpose.hh> +#include <mln/data/fill.hh> +#include <mln/pw/all.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm watershed.pgm output.ppm" << std::endl + << " Superpose the watershed line over the input image." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + trace::entering("main"); + + image2d<int_u8> ima, ws; + io::pgm::load(ima, argv[1]); + io::pgm::load(ws, argv[2]); + + io::ppm::save(morpho::watershed::superpose(ima, ws), + argv[3]); + + trace::exiting("main"); +} Index: theo/exec/gaussian_directional_2d__float.cc --- theo/exec/gaussian_directional_2d__float.cc (revision 0) +++ theo/exec/gaussian_directional_2d__float.cc (revision 0) @@ -0,0 +1,99 @@ + +# define MLN_FLOAT float + +#include "filetype.hh" +#include "./gaussian_directional_2d.hh" + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/pw/all.hh> + +#include <mln/data/fill.hh> +#include <mln/level/saturate.hh> + + + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.xxx bdr dir sigma output.pgm" << std::endl + << " xxx is pbm or pgm" << std::endl + << " bdr is the outer border value" << std::endl + << " dir = 0 (vertical blur) or 1 (horizontal blur)" << std::endl + << " sigma > 0" << std::endl + << " Directional gaussian blur." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + + using namespace mln; + using value::int_u8; + + trace::entering("main"); + + if (argc != 6) + usage(argv); + + + int dir = atoi(argv[3]); + if (dir != 0 && dir != 1) + usage(argv); + + MLN_FLOAT sigma = atof(argv[4]); + if (sigma <= 0.f) + usage(argv); + + + switch (get_filetype(argv[1])) + { + case filetype::pbm: + { + int bdr = atoi(argv[2]); + if (bdr != 0 && bdr != 1) + usage(argv); + + image2d<bool> ima; + io::pbm::load(ima, argv[1]); + + image2d<MLN_FLOAT> temp(ima.domain()), out; + data::fill(temp, ima); + + out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); + + io::pgm::save(level::saturate(int_u8(), + (pw::value(out) * pw::cst(255.f)) | out.domain()), + argv[5]); + } + break; + + case filetype::pgm: + { + int bdr = atoi(argv[2]); + if (bdr < 0 || bdr > 255) + usage(argv); + + image2d<int_u8> ima; + io::pgm::load(ima, argv[1]); + + image2d<MLN_FLOAT> temp(ima.domain()), out; + data::fill(temp, ima); + + out = linear::gaussian_directional_2d(temp, dir, sigma, bdr); + + io::pgm::save(level::saturate(int_u8(), out), argv[5]); + } + break; + + default: + std::cerr << "file type not handled!" << std::endl; + usage(argv); + } + + trace::exiting("main"); +} Index: theo/exec/distance_thick.cc --- theo/exec/distance_thick.cc (revision 0) +++ theo/exec/distance_thick.cc (revision 0) @@ -0,0 +1,46 @@ +#include "filetype.hh" + +#include <mln/transform/distance_front.hh> +#include <mln/make/w_window2d_int.hh> +#include <mln/level/stretch.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm dmap.pgm" << std::endl + << " Distance is stretch (from int_u12) to int_u8." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + typedef value::int_u<12> int_u12; + + if (argc != 3) + usage(argv); + + trace::entering("main"); + + image2d<bool> ima; + io::pbm::load(ima, argv[1]); + + int ws[] = { 00, 11, 0, 11, 0, + 11, 7, 5, 7, 11, + 00, 5, 0, 5, 0, + 11, 7, 5, 7, 11, + 00, 11, 0, 11, 0 }; + + image2d<int_u12> dmap = transform::distance_front(ima, + c4(), make::w_window2d_int(ws), + mln_max(int_u12)); + + io::pgm::save(level::stretch(int_u8(), dmap), + argv[2]); + + trace::exiting("main"); +} Index: theo/exec/closing_rectangle.cc --- theo/exec/closing_rectangle.cc (revision 3564) +++ theo/exec/closing_rectangle.cc (working copy) @@ -6,9 +6,10 @@ void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.pgm height width output.pgm" << std::endl + std::cerr << "usage: " << argv[0] << " input.xxx height width output.xxx" << std::endl << " Height and width are odd positive integers." << std::endl - << " Rectangle closing." << std::endl; + << " xxx is pbm or pgm." << std::endl + << " Rectangle closing on a 2D image." << std::endl; std::abort(); } @@ -32,11 +33,30 @@ if (width < 0 || width % 2 == 0) usage(argv); + + std::string filename = argv[1]; + + switch (get_filetype(argv[1])) + { + case filetype::pbm: + { + image2d<bool> ima, clo; + io::pbm::load(ima, argv[1]); + clo = morpho::closing::structural(ima, win::rectangle2d(height, width)); + io::pbm::save(clo, argv[4]); + } + break; + + case filetype::pgm: + { image2d<int_u8> ima, clo; io::pgm::load(ima, argv[1]); - clo = morpho::closing::structural(ima, win::rectangle2d(height, width)); io::pgm::save(clo, argv[4]); + } + break; + }; + trace::exiting("main"); } Index: theo/exec/opening_rectangle.cc --- theo/exec/opening_rectangle.cc (revision 0) +++ theo/exec/opening_rectangle.cc (revision 0) @@ -0,0 +1,62 @@ +#include "filetype.hh" + +#include <mln/morpho/opening/structural.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.xxx height width output.xxx" << std::endl + << " Height and width are odd positive integers." << std::endl + << " xxx is pbm or pgm." << std::endl + << " Rectangle opening on a 2D image." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + trace::entering("main"); + + if (argc != 5) + usage(argv); + + int height = atoi(argv[2]); + if (height < 0 || height % 2 == 0) + usage(argv); + + int width = atoi(argv[3]); + if (width < 0 || width % 2 == 0) + usage(argv); + + + std::string filename = argv[1]; + + switch (get_filetype(argv[1])) + { + case filetype::pbm: + { + image2d<bool> ima, ope; + io::pbm::load(ima, argv[1]); + ope = morpho::opening::structural(ima, win::rectangle2d(height, width)); + io::pbm::save(ope, argv[4]); + } + break; + + case filetype::pgm: + { + image2d<int_u8> ima, ope; + io::pgm::load(ima, argv[1]); + ope = morpho::opening::structural(ima, win::rectangle2d(height, width)); + io::pgm::save(ope, argv[4]); + } + break; + }; + + + trace::exiting("main"); +} Index: theo/exec/closing_isotropic.cc --- theo/exec/closing_isotropic.cc (revision 3564) +++ theo/exec/closing_isotropic.cc (working copy) @@ -19,6 +19,7 @@ int main(int argc, char* argv[]) { using namespace mln; + using value::int_u8; if (argc != 4) usage(argv); @@ -46,6 +47,15 @@ } break; + case filetype::pgm: + { + image2d<int_u8> ima, out; + io::pgm::load(ima, argv[1]); + out = morpho::closing::structural(ima, win::disk2d(2 * r + 1)); + io::pgm::save(out, argv[3]); + } + break; + case filetype::dump: { image3d<bool> ima, out;

1 0

r3564: Correct new functions
by Frederic Bour 24 Mar '09

24 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-24 Frederic Bour <bour(a)lrde.epita.fr> Correct new functions. * fred/mln/core/image/thru_morpher.hh, * fred/mln/fun/math/inf.hh, * fred/mln/fun/math/sup.hh: Correct typo * fred/mln/fun/spe/unary.hh, * fred/mln/fun/unary.hh: Add composition with lresult. * fred/tests/Makefile, * fred/tests/thru.cc: Removed unnecessary include. --- mln/core/image/thru_morpher.hh | 1 mln/fun/math/inf.hh | 2 mln/fun/math/sup.hh | 4 - mln/fun/spe/unary.hh | 93 ++++++++++++++++++++++++++++++++++++++--- mln/fun/unary.hh | 38 +++++++++++++++- tests/Makefile | 13 ++--- tests/thru.cc | 9 +-- 7 files changed, 137 insertions(+), 23 deletions(-) Index: trunk/milena/sandbox/fred/tests/thru.cc =================================================================== --- trunk/milena/sandbox/fred/tests/thru.cc (revision 3563) +++ trunk/milena/sandbox/fred/tests/thru.cc (revision 3564) @@ -1,5 +1,5 @@ // Meta functions test -#include <mln/fun/essential.hh> +#include <mln/fun/v2v/convert.hh> #include <mln/fun/math/cos.hh> #include <mln/core/image/thru_morpher.hh> #include <mln/fun/compose.hh> @@ -28,10 +28,9 @@ debug::println(ima); debug::println(thru(cos, ima)); - thru_image<I, fun::cos::with<fun::cos>::ret::result::with<float>::ret > ima2; - ima2 = thru(cos(cos), ima); + mln_VAR(ima2, thru(cos(cos), ima)); - data::fill_with_image(ima2, (pw::value(tmp) - pw::cst(13.0f)) / pw::cst(12.0f) | tmp.domain()); + data::fill_with_image(ima2, tmp); - debug::println(ima); + debug::println(ima2); } \ No newline at end of file Index: trunk/milena/sandbox/fred/tests/Makefile =================================================================== --- trunk/milena/sandbox/fred/tests/Makefile (revision 3563) +++ trunk/milena/sandbox/fred/tests/Makefile (revision 3564) @@ -1,17 +1,16 @@ -TARGET=fun -OBJS=$(TARGET).o +TARGETS=fun.bin thru.bin cos.bin OLENADIR=../../../.. MILENADIR=$(OLENADIR)/milena -CXXFLAGS=-I$(MILENADIR) -I../ -DNDEBUG -O1 -ffast-math +CXXFLAGS=-I$(MILENADIR) -I../ -DNDEBUG -O1 CXX=g++ LD=g++ LDFLAGS= RM=rm -$(TARGET): $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) +%.bin: %.o + $(LD) $(LDFLAGS) -o $@ $< %.o: %.cc $(CXX) $(CXXFLAGS) -c $< @@ -19,7 +18,7 @@ %.o: %.hh $(CXX) $(CXXFLAGS) -c $< -all: $(TARGET) +all: $(TARGETS) clean: - $(RM) -f $(TARGET) *.o *~ + $(RM) -f $(TARGETS) *.o *~ Index: trunk/milena/sandbox/fred/mln/core/image/thru_morpher.hh =================================================================== --- trunk/milena/sandbox/fred/mln/core/image/thru_morpher.hh (revision 3563) +++ trunk/milena/sandbox/fred/mln/core/image/thru_morpher.hh (revision 3564) @@ -72,7 +72,6 @@ data(I& ima, const F& f); I ima_; - // FIXME: value or pointer or whatever ? F f_; }; Index: trunk/milena/sandbox/fred/mln/fun/spe/unary.hh =================================================================== --- trunk/milena/sandbox/fred/mln/fun/spe/unary.hh (revision 3563) +++ trunk/milena/sandbox/fred/mln/fun/spe/unary.hh (revision 3564) @@ -44,7 +44,8 @@ namespace internal { - template <typename Impl> + // Wrapper for bijective functions + template <typename Impl, typename T> struct unary_modifier { typedef typename Impl::result result; @@ -52,7 +53,43 @@ typedef typename Impl::lvalue lvalue; typedef unary_modifier lresult; - // FIXME: "argument& x" or "lvalue x" directly? ~~~ + unary_modifier(const Impl& impl, T& x) + : x_(&x), impl_(&impl) + { + } + + result to_result() const + { + return impl_->read(*x_); + }; + + operator result() const + { + return to_result(); + }; + + const result& operator = (const result& r) const + { + argument x(*x_); + impl_->write(x, r); + *x_ = x; + + return r; + } + + private: + T *x_; + const Impl *impl_; + }; + + template <typename Impl> + struct unary_modifier<Impl, typename Impl::argument> + { + typedef typename Impl::result result; + typedef typename Impl::argument argument; + typedef typename Impl::lvalue lvalue; + typedef unary_modifier lresult; + unary_modifier(const Impl& impl, argument& x) : x_(&x), impl_(&impl) { @@ -71,6 +108,7 @@ const result& operator = (const result& r) const { impl_->write(*x_, r); + return r; } @@ -79,6 +117,44 @@ const Impl *impl_; }; + template <typename Impl, typename Impl2, typename T> + struct unary_modifier<Impl, unary_modifier<Impl2, T> > + { + typedef typename Impl::result result; + typedef typename Impl::argument argument; + typedef typename Impl::lvalue lvalue; + typedef unary_modifier lresult; + + // FIXME: "argument& x" or "lvalue x" directly? ~~~ + unary_modifier(const Impl& impl, const unary_modifier<Impl2, T>& m) + : m_(m), impl_(&impl) + { + } + + result to_result() const + { + return impl_->read(m_.to_result()); + }; + + operator result() const + { + return to_result(); + }; + + const result& operator = (const result& r) const + { + argument m(m_); + impl_->write(m, r); + m_ = m; + + return r; + } + + private: + const unary_modifier<Impl2, T> m_; + const Impl *impl_; + }; + } // end of namespace mln::fun::internal // Forward declaration (defined in mln/fun/unary.hh) @@ -123,7 +199,14 @@ typedef typename impl::argument argument; typedef typename impl::result result; typedef typename impl::lvalue lvalue; - typedef mln::fun::spe::internal::unary_modifier<impl> lresult; + + template <typename U> + struct lresult_with + { + typedef mln::fun::spe::internal::unary_modifier<impl, U> ret; + }; + + typedef typename lresult_with<argument>::ret lresult; unary_impl_set() {} unary_impl_set(const typename super::init_param& p) : super(p) {} @@ -190,8 +273,8 @@ } // end of namespace mln::fun - template <typename Impl> - std::ostream& operator << (std::ostream& o, const mln::fun::spe::internal::unary_modifier<Impl>& m) + template <typename Impl, typename T> + std::ostream& operator << (std::ostream& o, const mln::fun::spe::internal::unary_modifier<Impl, T>& m) { return o << m.to_result(); } Index: trunk/milena/sandbox/fred/mln/fun/math/sup.hh =================================================================== --- trunk/milena/sandbox/fred/mln/fun/math/sup.hh (revision 3563) +++ trunk/milena/sandbox/fred/mln/fun/math/sup.hh (revision 3564) @@ -46,8 +46,8 @@ namespace next { - template <typename T, typename T> - struct set_binary_<mln::fun::inf, mln::Object, T, mln::Object, T> + template <typename T> + struct set_binary_<mln::fun::sup, mln::Object, T, mln::Object, T> { typedef set_binary_ ret; typedef T result; Index: trunk/milena/sandbox/fred/mln/fun/math/inf.hh =================================================================== --- trunk/milena/sandbox/fred/mln/fun/math/inf.hh (revision 3563) +++ trunk/milena/sandbox/fred/mln/fun/math/inf.hh (revision 3564) @@ -46,7 +46,7 @@ namespace next { - template <typename T, typename T> + template <typename T> struct set_binary_<mln::fun::inf, mln::Object, T, mln::Object, T> { typedef set_binary_ ret; Index: trunk/milena/sandbox/fred/mln/fun/unary.hh =================================================================== --- trunk/milena/sandbox/fred/mln/fun/unary.hh (revision 3563) +++ trunk/milena/sandbox/fred/mln/fun/unary.hh (revision 3564) @@ -101,7 +101,7 @@ typedef unary_with_lvalue_helper<false, M, T> super; typedef typename super::function function; - static typename function::lresult lcall(const M& m, T& x) + static typename function::template lresult_with<T>::ret lcall(const M& m, T& x) { function f(super::inst(m)); return f(x); @@ -114,6 +114,33 @@ } }; + template <typename MF, typename MG, typename T> + struct unary_with_lvalue_helper<true, MF, mln::fun::spe::internal::unary_modifier<MG, T> > + : unary_with_lvalue_helper<false, MF, mln::fun::spe::internal::unary_modifier<MG, T> > + { + typedef unary_with_lvalue_helper<false, MF, typename MG::result > super; + typedef typename super::function function; + + static typename function::template lresult_with<typename MG::result>::ret lcall(const MF& m, T& x) + { + function f(super::inst(m)); + return f(x); + } + + static typename function::template lresult_with< mln::fun::spe::internal::unary_modifier<MG, T> >::ret + lcall(const MF& m, const mln::fun::spe::internal::unary_modifier<MG, T>& x) + { + function f(super::inst(m)); + return f(x); + } + + static void set(const MF& m, typename function::lvalue v, const T& x) + { + function f(super::inst(m)); + f.set(v, x); + } + }; + template <typename M, typename T> struct unary_with_helper : unary_with_lvalue_helper<mln_trait_fun_is_assignable__1comma_(mln::fun::spe::unary<M, T>)::value, M, T> @@ -139,11 +166,18 @@ } template <typename T> - typename with<T>::ret::lresult operator()(T& v) const + typename with<T>::ret::template lresult_with<T>::ret operator()(T& v) const { return with<T>::impl::lcall(exact(*this), v); } + template <typename G, typename U> + typename with< mln::fun::spe::internal::unary_modifier<G, U> >::ret::lresult + operator()(const mln::fun::spe::internal::unary_modifier<G, U>& v) const + { + return with< mln::fun::spe::internal::unary_modifier<G, U> >::impl::lcall(exact(*this), v); + } + template <typename T, typename R> void set(T& v, const R& r) const {

1 0

milena r3563: Conversion from util::array to image1d
by Fabien Freling 24 Mar '09

24 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-24 Fabien Freling <fabien.freling(a)lrde.epita.fr> Conversion from util::array to image1d. * mln/convert/from_to.hxx: Update from_to for image1d. * mln/core/image/image1d.hh: Update from_to. * mln/world/binary_2d/projected_histo.hh: Update. --- convert/from_to.hxx | 5 +++++ core/image/image1d.hh | 15 +++++++++++++++ world/binary_2d/projected_histo.hh | 17 ++++++++++------- 3 files changed, 30 insertions(+), 7 deletions(-) Index: trunk/milena/mln/world/binary_2d/projected_histo.hh =================================================================== --- trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3562) +++ trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3563) @@ -32,9 +32,12 @@ /// /// FIXME: insert comment. +# include <mln/core/concept/image.hh> # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/alias/dpoint2d.hh> +# include <mln/geom/all.hh> +# include <mln/opt/at.hh> # include <mln/value/int_u12.hh> # include <mln/util/couple.hh> @@ -47,25 +50,25 @@ namespace binary_2d { + template <typename I> util::couple<image1d<float>, image1d<float> > - projected_histo(const image2d<bool>& input, bool value = true) + projected_histo(const Image<I>& input_, bool value = true) { - const unsigned nrows = input.nrows(); + mln_ch_value(I, bool) input = exact(input_); + + const unsigned nrows = geom::nrows(input); image1d<float> row_histo(nrows); data::fill(row_histo, 0); - const unsigned ncols = input.ncols(); + const unsigned ncols = geom::ncols(input); image1d<float> col_histo(ncols); data::fill(col_histo, 0); - mln_precondition(row_histo.nelements() == nrows); - mln_precondition(col_histo.nelements() == ncols); - for (unsigned row = 0; row < nrows; ++row) { for (unsigned col = 0; col < ncols; ++col) { - if (input.at_(row, col) == value) + if (opt::at(input, geom::bbox(input).min_row() + row, geom::bbox(input).min_col() + col) == value) { ++row_histo.at_(row); ++col_histo.at_(col); Index: trunk/milena/mln/core/image/image1d.hh =================================================================== --- trunk/milena/mln/core/image/image1d.hh (revision 3562) +++ trunk/milena/mln/core/image/image1d.hh (revision 3563) @@ -133,6 +133,10 @@ template <typename V, typename T> void from_to_(const histo::array<V>& from, image1d<T>& to); + // util::array -> image1d. + template <typename V, typename T> + void from_to_(const util::array<V>& from, image1d<T>& to); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert @@ -577,6 +581,17 @@ from_to(from[i], to(point1d(i))); } + // util::array -> image1d. + template <typename V, typename T> + inline + void + from_to_(const util::array<V>& from, image1d<T>& to) + { + to.init_(make::box1d(from.nelements()), 0); + for (unsigned i = 0; i < from.nelements(); ++i) + from_to(from[i], to(point1d(i))); + } + } // end of namespace mln::convert::over_load } // end of namespace mln::convert Index: trunk/milena/mln/convert/from_to.hxx =================================================================== --- trunk/milena/mln/convert/from_to.hxx (revision 3562) +++ trunk/milena/mln/convert/from_to.hxx (revision 3563) @@ -418,6 +418,11 @@ void from_to_(const histo::array<V>& from, image1d<T>& to); + // util::array -> image1d + template <typename V, typename T> + void + from_to_(const util::array<V>& from, image1d<T>& to); + } // end of namespace mln::convert::over_load } // end of namespace mln::convert

1 0

milena r3562: Change arguments of projected_histo()
by Fabien Freling 23 Mar '09

23 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-23 Fabien Freling <fabien.freling(a)lrde.epita.fr> Change arguments of projected_histo(). * mln/world/binary_2d/projected_histo.hh: Change arguments, now returns a couple of image1d. --- projected_histo.hh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) Index: trunk/milena/mln/world/binary_2d/projected_histo.hh =================================================================== --- trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3561) +++ trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3562) @@ -36,6 +36,7 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/dpoint2d.hh> # include <mln/value/int_u12.hh> +# include <mln/util/couple.hh> namespace mln { @@ -46,15 +47,17 @@ namespace binary_2d { - void projected_histo(const image2d<bool>& input, - image1d<float>& row_histo, - image1d<float>& col_histo, - bool value = true) + util::couple<image1d<float>, image1d<float> > + projected_histo(const image2d<bool>& input, bool value = true) { const unsigned nrows = input.nrows(); + image1d<float> row_histo(nrows); data::fill(row_histo, 0); + const unsigned ncols = input.ncols(); + image1d<float> col_histo(ncols); data::fill(col_histo, 0); + mln_precondition(row_histo.nelements() == nrows); mln_precondition(col_histo.nelements() == ncols); @@ -71,10 +74,12 @@ } for (unsigned i = 0; i < row_histo.ninds(); ++i) - row_histo.at_(i) /= ncols; + row_histo.at_(i) = row_histo.at_(i) * 100 / ncols; for (unsigned i = 0; i < col_histo.ninds(); ++i) - col_histo.at_(i) /= nrows; + col_histo.at_(i) = col_histo.at_(i) * 100 / nrows; + + return util::couple<image1d<float>, image1d<float> > (row_histo, col_histo); } } // end of namespace mln::world::binary_2d

1 0

r3561: Update binarization test with projected histograms
by Fabien Freling 23 Mar '09

23 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-23 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update binarization test with projected histograms. * fabien/binarization/test.cc: Update. * fabien/igr/Makefile: Update. * fabien/igr/matlab.cc: Update. --- TODO | 5 ++- binarization/test.cc | 72 ++++++++++++++++++++++++++++++++++++++++++++------- igr/Makefile | 27 +++++++++---------- igr/matlab.cc | 13 ++++++--- 4 files changed, 89 insertions(+), 28 deletions(-) Index: trunk/milena/sandbox/fabien/igr/matlab.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/matlab.cc (revision 3560) +++ trunk/milena/sandbox/fabien/igr/matlab.cc (revision 3561) @@ -105,7 +105,7 @@ // Calcul du masque image2d<bool> masque; initialize(masque, datasli); - data::fill(masque, false) + data::fill(masque, false); data::fill(masque | pw::value(datasli) > pw::cst(seuil), true); // si on a choisi une région avec roi2 if (nargin>2) @@ -114,8 +114,8 @@ // On applique le masque sur image et imasoustraite for (int k = 0; k < arr_ima.nelements(); ++k) { - data::fill(arr_ima[k] | pw::value(masque) == false; 0.0); - data::fill(arr_sous[k] | pw::value(masque) == false; 0.0); + data::fill(arr_ima[k] | pw::value(masque) == false, 0.0); + data::fill(arr_sous[k] | pw::value(masque) == false, 0.0); } // On regarde si le seuillage et le masquage sont OK @@ -143,14 +143,19 @@ // FIXME: [c,T]=max(image,[ ],3); + // Ou 'ima_c' est la valeur du max et 'ima_t' son index, le long de la dimension 3 + // kk est le nombre de points masques + std::cout << "kk = " << kk << std::endl; image2d<accu::sum<float> > accu_sum; accu::image::init(result); for (int i = first; i < last; ++i) accu::image::take(result, arr_ima[i]); - ima_auc accu::image::to_result(result); + // Conversion du temps du pic en secondes à partir fin période de base + tmax = acqui * (ima_t - ini); + return 0; } Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 3560) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 3561) @@ -1,3 +1,4 @@ +CXX = llvm-g++ DCM_SRC=/Users/HiSoKa/Downloads/gdcm-2.0.10 DCM_BIN=/Users/HiSoKa/Downloads/gdcmbin DICOM_INC = -I${DCM_SRC}/Source/Common/ \ @@ -13,43 +14,43 @@ all: 2d 3d wsd2d wsd3d grad 2d: seg_vol_irm.hh seg2d.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} seg2d.cc -o seg2d + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} seg2d.cc -o seg2d 3d: seg_vol_irm.hh seg3d.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} seg3d.cc -o seg3d + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} seg3d.cc -o seg3d wsd2d: watershed.hh watershed2d.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o wsd2d + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o wsd2d wsd3d: watershed.hh watershed3d.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o wsd3d + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o wsd3d wsd3dg: watershed.hh watershed3d.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} -g $^ -o wsd3dg + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} -g $^ -o wsd3dg nbasins: nbasins_finder.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o nbasins_finder + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o nbasins_finder grad: grad.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o grad + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o grad clo_vol: clo_vol.cc - g++ -I../../../ ${CXXFLAGS} $^ -o clo_vol + ${CXX} -I../../../ ${CXXFLAGS} $^ -o clo_vol wst: wst.cc - g++ -I../../../ ${CXXFLAGS} $^ -o wst + ${CXX} -I../../../ ${CXXFLAGS} $^ -o wst graph: graph.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o graph + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o graph med: med.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o med + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} $^ -o med thres: thres.cc - g++ -I../../../ ${CXXFLAGS} $^ -o thres + ${CXX} -I../../../ ${CXXFLAGS} $^ -o thres matlab: matlab.cc - g++ -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} -lm $^ -o matlab + ${CXX} -I../../../ ${DICOM_INC} ${DICOM_LIBS} ${CXXFLAGS} -lm $^ -o matlab clean: rm -rf *.dump *.p?m *.plot *.log *.csv *.dSYM Index: trunk/milena/sandbox/fabien/TODO =================================================================== --- trunk/milena/sandbox/fabien/TODO (revision 3560) +++ trunk/milena/sandbox/fabien/TODO (revision 3561) @@ -40,5 +40,6 @@ [ ] Integrate external libraries (GDCM, IM) [ ] Send result images to lrde account [ ] Translate Matlab code -[ ] Subsample binary images -[ ] Fast projected histogram +[X] Subsample binary images +[X] Fast projected histogram +[ ] Triple histogram Index: trunk/milena/sandbox/fabien/binarization/test.cc =================================================================== --- trunk/milena/sandbox/fabien/binarization/test.cc (revision 3560) +++ trunk/milena/sandbox/fabien/binarization/test.cc (revision 3561) @@ -1,16 +1,30 @@ #include <iostream> #include <fstream> +#include <mln/algebra/vec.hh> + #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb1d.hh> + +#include <mln/draw/line.hh> #include <mln/io/magick/load.hh> #include <mln/io/pgm/save.hh> +#include <mln/io/pbm/save.hh> #include <mln/level/stretch.hh> +#include <mln/make/box2d.hh> + +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/watershed/flooding.hh> + +#include <mln/util/couple.hh> + #include <mln/value/int_u8.hh> #include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> #include <mln/world/binary_2d/projected_histo.hh> #include <mln/world/binary_2d/subsample.hh> @@ -19,6 +33,9 @@ using namespace mln; using value::int_u8; using value::int_u12; +using value::label_16; + + int main(int argc, char* argv[]) { @@ -31,24 +48,61 @@ image2d<bool> ima; io::magick::load(ima, argv[1]); - image2d<int_u8> ima_sampled = world::binary_2d::subsample(ima, 3); - io::pgm::save(ima_sampled, argv[2]); + //image2d<int_u8> ima_sampled = world::binary_2d::subsample(ima, 3); + //io::pgm::save(ima_sampled, argv[2]); + + box2d left_box = make::box2d(0, 0, ima.nrows() - 1, (ima.ncols() / 3)); + util::couple<image1d<float>, image1d<float> > histos_left = world::binary_2d::projected_histo(ima | left_box); + + box2d middle_box = make::box2d(0, (ima.ncols() / 3), ima.nrows() - 1, (2 * ima.ncols() / 3)); + util::couple<image1d<float>, image1d<float> > histos_middle = world::binary_2d::projected_histo(ima | middle_box); + + box2d right_box = make::box2d(0, (2 * ima.ncols() / 3), ima.nrows() - 1, ima.ncols() - 1); + util::couple<image1d<float>, image1d<float> > histos_right = world::binary_2d::projected_histo(ima | right_box); + + image1d<float> row_histo = histos_right.first(); + image1d<float> col_histo = histos_right.second(); + + int i = col_histo.ninds(); + while (i > 0 && col_histo.at_(i) < 60.0) + { + col_histo.at_(i) = 100.0; + --i; + } + + // Closing + row_histo = morpho::closing::volume(row_histo, c2(), 31); - image1d<float> row_histo(ima.nrows()); - image1d<float> col_histo(ima.ncols()); - world::binary_2d::projected_histo(ima, row_histo, col_histo); + // Watershed + label_16 nbasins; + image1d<label_16> row_labels = morpho::watershed::flooding(row_histo, c2(), nbasins); + + // Draw lines + for (unsigned int i = 0; i < row_labels.ninds(); ++i) + { + if (row_labels.at_(i) == 0u) + { + algebra::vec<2, unsigned int> vmin; + algebra::vec<2, unsigned int> vmax; + vmin[0] = i; + vmin[1] = 0; + vmax[0] = i; + vmax[1] = ima.ncols() - 1; + mln_site_(image2d<bool>) pbeg(vmin); + mln_site_(image2d<bool>) pend(vmax); + draw::line(ima, pbeg, pend, 0); + } + } + io::pbm::save(ima, argv[2]); + // Gnuplot files creation std::ofstream fout_row("row.plot"); for (unsigned int i = 0; i < row_histo.ninds(); ++i) - { fout_row << i << " " << row_histo.at_(i) << std::endl; - } std::ofstream fout_col("col.plot"); for (unsigned int i = 0; i < col_histo.ninds(); ++i) - { fout_col << i << " " << col_histo.at_(i) << std::endl; - } return 0; }

1 0

milena r3560: Add ninds() method to image1d class
by Fabien Freling 20 Mar '09

20 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add ninds() method to image1d class. * mln/core/image/image1d.hh: Add ninds() method. * mln/world/binary_2d/projected_histo.hh: Update. --- core/image/image1d.hh | 13 +++++++++++++ world/binary_2d/projected_histo.hh | 19 ++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) Index: trunk/milena/mln/world/binary_2d/projected_histo.hh =================================================================== --- trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3559) +++ trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3560) @@ -47,11 +47,14 @@ { void projected_histo(const image2d<bool>& input, - image1d<value::int_u12>& row_histo, - image1d<value::int_u12>& col_histo) + image1d<float>& row_histo, + image1d<float>& col_histo, + bool value = true) { const unsigned nrows = input.nrows(); + data::fill(row_histo, 0); const unsigned ncols = input.ncols(); + data::fill(col_histo, 0); mln_precondition(row_histo.nelements() == nrows); mln_precondition(col_histo.nelements() == ncols); @@ -59,13 +62,19 @@ { for (unsigned col = 0; col < ncols; ++col) { - if (input(point2d(row, col))) + if (input.at_(row, col) == value) { - ++row_histo(point1d(row)); - ++col_histo(point1d(col)); + ++row_histo.at_(row); + ++col_histo.at_(col); } } } + + for (unsigned i = 0; i < row_histo.ninds(); ++i) + row_histo.at_(i) /= ncols; + + for (unsigned i = 0; i < col_histo.ninds(); ++i) + col_histo.at_(i) /= nrows; } } // end of namespace mln::world::binary_2d Index: trunk/milena/mln/core/image/image1d.hh =================================================================== --- trunk/milena/mln/core/image/image1d.hh (revision 3559) +++ trunk/milena/mln/core/image/image1d.hh (revision 3560) @@ -208,6 +208,10 @@ /// Read-write access to the image value located at (\p index). T& at_(def::coord index); + /// Give the number of indexes. + unsigned ninds() const; + + /// Fast Image method @@ -456,6 +460,15 @@ template <typename T> inline + unsigned + image1d<T>::ninds() const + { + mln_precondition(this->is_valid()); + return this->data_->b_.len(0); + } + + template <typename T> + inline T& image1d<T>::at_(def::coord index) {

1 0

r3559: Add binarization directory for tests
by Fabien Freling 20 Mar '09

20 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add binarization directory for tests. * fabien/binarization/Makefile: New. * fabien/binarization/test.cc: New test. * fabien/igr/matlab.cc: Update. --- TODO | 2 + binarization/Makefile | 10 ++++++++ binarization/test.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ igr/matlab.cc | 56 ++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 109 insertions(+), 13 deletions(-) Index: trunk/milena/sandbox/fabien/igr/matlab.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/matlab.cc (revision 3558) +++ trunk/milena/sandbox/fabien/igr/matlab.cc (revision 3559) @@ -14,6 +14,8 @@ #include <mln/accu/sum.hh> #include <mln/accu/image/all.hh> #include <mln/arith/minus.hh> +#include <mln/arith/plus.hh> +#include <mln/arith/times.hh> #include <mln/data/fill.hh> #include <mln/data/paste.hh> #include <mln/level/compute.hh> @@ -101,26 +103,54 @@ float seuil = fseuil * ectys; // Calcul du masque - image2d<bool> masque; // FIXME: init this ROI, should be a domain + image2d<bool> masque; initialize(masque, datasli); data::fill(masque, false) data::fill(masque | pw::value(datasli) > pw::cst(seuil), true); // si on a choisi une région avec roi2 if (nargin>2) - masque=masque.*roi2; + data::fill(masque | pw::value(roi2) == false, false); - //on applique le masque sur image et imasoustraite + // On applique le masque sur image et imasoustraite + for (int k = 0; k < arr_ima.nelements(); ++k) + { + data::fill(arr_ima[k] | pw::value(masque) == false; 0.0); + data::fill(arr_sous[k] | pw::value(masque) == false; 0.0); + } + + // On regarde si le seuillage et le masquage sont OK + // FIXME: imagesc(abs(image(:,:,2))); + + // On cherche les maxi (intensité c et temps T) des courbes signal(temps) + // On masque toute la série d'images + + // Essai de lissage à parir de fin de montée vaculaire ini2 pour ameliorer + // les seuillages a 10 50 90 NON EVALUE RIGOUREUSEMENT + for (int k = init2 - 1; k < dim3 - 1; ++k) + arr_ima[k] = 0.5 * arr_ima[k] + 0.25 * arr_ima[k - 1] + 0.25 * arr_ima[k + 1]; + + for_all(p) + { + if (masque(p) == false) + { + for (int k = 0; k < arr_ima.nelements(); ++k) + arr_ima[k](p) = 0.0; + ima_c(p) = 0.0; + ima_t(p) = 0.0; + ++kk; + } + } + + // FIXME: [c,T]=max(image,[ ],3); + + std::cout << "kk = " << kk << std::endl; + + image2d<accu::sum<float> > accu_sum; + accu::image::init(result); + for (int i = first; i < last; ++i) + accu::image::take(result, arr_ima[i]); - for k=2:dim3 - for i=1:dim1 - for j=1:dim2 - if(masque(i,j)==0) - image(i,j,k)=0; - imasoustraite(i,j,k)=0; - end; - end; - end; - end; + ima_auc accu::image::to_result(result); return 0; } Index: trunk/milena/sandbox/fabien/TODO =================================================================== --- trunk/milena/sandbox/fabien/TODO (revision 3558) +++ trunk/milena/sandbox/fabien/TODO (revision 3559) @@ -40,3 +40,5 @@ [ ] Integrate external libraries (GDCM, IM) [ ] Send result images to lrde account [ ] Translate Matlab code +[ ] Subsample binary images +[ ] Fast projected histogram Index: trunk/milena/sandbox/fabien/binarization/test.cc =================================================================== --- trunk/milena/sandbox/fabien/binarization/test.cc (revision 0) +++ trunk/milena/sandbox/fabien/binarization/test.cc (revision 3559) @@ -0,0 +1,54 @@ +#include <iostream> +#include <fstream> + +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image2d.hh> + +#include <mln/io/magick/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/stretch.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> + +#include <mln/world/binary_2d/projected_histo.hh> +#include <mln/world/binary_2d/subsample.hh> + + +using namespace mln; +using value::int_u8; +using value::int_u12; + +int main(int argc, char* argv[]) +{ + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << "input.ext output.pgm" << std::endl; + return 1; + } + + image2d<bool> ima; + io::magick::load(ima, argv[1]); + + image2d<int_u8> ima_sampled = world::binary_2d::subsample(ima, 3); + io::pgm::save(ima_sampled, argv[2]); + + image1d<float> row_histo(ima.nrows()); + image1d<float> col_histo(ima.ncols()); + world::binary_2d::projected_histo(ima, row_histo, col_histo); + + std::ofstream fout_row("row.plot"); + for (unsigned int i = 0; i < row_histo.ninds(); ++i) + { + fout_row << i << " " << row_histo.at_(i) << std::endl; + } + + std::ofstream fout_col("col.plot"); + for (unsigned int i = 0; i < col_histo.ninds(); ++i) + { + fout_col << i << " " << col_histo.at_(i) << std::endl; + } + + return 0; +} Index: trunk/milena/sandbox/fabien/binarization/Makefile =================================================================== --- trunk/milena/sandbox/fabien/binarization/Makefile (revision 0) +++ trunk/milena/sandbox/fabien/binarization/Makefile (revision 3559) @@ -0,0 +1,10 @@ +GCCFLAGS = -DNDEBUG -O1 +LLVMFLAGS = -DNDEBUG -O4 + +all: gcc llvm + +gcc: test.cc + g++ -I../../../ `Magick++-config --cppflags --cxxflags --ldflags --libs` ${GCCFLAGS} test.cc -o test_gcc + +llvm: test.cc + llvm-g++ -I../../../ `Magick++-config --cppflags --cxxflags --ldflags --libs` ${LLVMFLAGS} test.cc -o test_llvm

1 0

milena r3558: Fix subsample() routine
by Fabien Freling 20 Mar '09

20 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix subsample() routine. * mln/world/binary_2d/subsample.hh: Fix. --- subsample.hh | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) Index: trunk/milena/mln/world/binary_2d/subsample.hh =================================================================== --- trunk/milena/mln/world/binary_2d/subsample.hh (revision 3557) +++ trunk/milena/mln/world/binary_2d/subsample.hh (revision 3558) @@ -45,33 +45,48 @@ namespace binary_2d { - image2d<value::int_u8> subsample(const image2d<bool>& input, unsigned n) + image2d<value::int_u8> subsample(image2d<bool>& input, unsigned n) { - bool* ptr = new bool[n]; + using value::int_u8; + + const bool** ptr = new const bool*[n]; const unsigned nrows = input.nrows() / n; const unsigned ncols = input.ncols() / n; - image2d<value::int_u8> output; - initialize(output, input); + algebra::vec<2, unsigned int> vmin; + algebra::vec<2, unsigned int> vmax; + vmin[0] = 0; + vmin[1] = 0; + vmax[0] = nrows - 1; + vmax[1] = ncols - 1; + point2d pmin(vmin); + point2d pmax(vmax); + image2d<int_u8> output(box<point2d>(pmin, pmax)); dpoint2d dp_row(1, 0); const unsigned delta_row = input.delta_index(dp_row); + unsigned count = 0; for (unsigned row = 0; row < nrows; ++row) { - unsigned count = 0; ptr[0] = & input(point2d(n * row, 0)); for (unsigned i = 1; i < n; ++i) ptr[i] = ptr[i - 1] + delta_row; for (unsigned col = 0; col < ncols; ++col) { - for (unsigned i = 0; i < n; ++i, ++ptr) + count = 0; + for (unsigned i = 0; i < n; ++i) { - if (ptr[i]) + for (unsigned j = 0; j < n; ++j, ++(ptr[i])) + { + if (*(ptr[i])) ++count; } + } output(point2d(row, col)) = count * 255 / n / n; } } + + return output; } } // end of namespace mln::world::binary_2d

1 0

milena r3557: Implement binary 2d specific routines
by Fabien Freling 20 Mar '09

20 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-20 Fabien Freling <fabien.freling(a)lrde.epita.fr> Implement binary 2d specific routines. * mln/world/binary_2d/projected_histo.hh: New projected histogram for binary 2d images. * mln/world/binary_2d/subsample.hh: Update. --- projected_histo.hh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ subsample.hh | 69 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 139 insertions(+), 7 deletions(-) Index: trunk/milena/mln/world/binary_2d/projected_histo.hh =================================================================== --- trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 0) +++ trunk/milena/mln/world/binary_2d/projected_histo.hh (revision 3557) @@ -0,0 +1,77 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_WORLD_BINARY_2D_PROJECTED_HISTO_HH +# define MLN_WORLD_BINARY_2D_PROJECTED_HISTO_HH + +/// \file mln/world/binary_2d/projected_histo.hh +/// +/// FIXME: insert comment. + +# include <mln/core/image/image1d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/dpoint2d.hh> +# include <mln/value/int_u12.hh> + +namespace mln +{ + + namespace world + { + + namespace binary_2d + { + + void projected_histo(const image2d<bool>& input, + image1d<value::int_u12>& row_histo, + image1d<value::int_u12>& col_histo) + { + const unsigned nrows = input.nrows(); + const unsigned ncols = input.ncols(); + mln_precondition(row_histo.nelements() == nrows); + mln_precondition(col_histo.nelements() == ncols); + + for (unsigned row = 0; row < nrows; ++row) + { + for (unsigned col = 0; col < ncols; ++col) + { + if (input(point2d(row, col))) + { + ++row_histo(point1d(row)); + ++col_histo(point1d(col)); + } + } + } + } + + } // end of namespace mln::world::binary_2d + + } // end of namspace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_BINARY_2D_PROJECTED_HISTO_HH Index: trunk/milena/mln/world/binary_2d/subsample.hh =================================================================== --- trunk/milena/mln/world/binary_2d/subsample.hh (revision 3556) +++ trunk/milena/mln/world/binary_2d/subsample.hh (revision 3557) @@ -1,13 +1,57 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. -// FIXME: Complete this file. +#ifndef MLN_WORLD_BINARY_2D_SUBSAMPLE_HH +# define MLN_WORLD_BINARY_2D_SUBSAMPLE_HH +/// \file mln/world/binary_2d/subsample.hh +/// +/// FIXME: insert comment. -template <typename I> -image2d<int_u8> subsample(const image2d<bool>& input, unsigned n) +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/dpoint2d.hh> +# include <mln/value/int_u8.hh> + +namespace mln +{ + + namespace world + { + + namespace binary_2d + { + + image2d<value::int_u8> subsample(const image2d<bool>& input, unsigned n) { - typedef bool* ptr; - ptr p = new ptr(n); + bool* ptr = new bool[n]; const unsigned nrows = input.nrows() / n; + const unsigned ncols = input.ncols() / n; + image2d<value::int_u8> output; + initialize(output, input); dpoint2d dp_row(1, 0); const unsigned delta_row = input.delta_index(dp_row); @@ -20,9 +64,20 @@ ptr[i] = ptr[i-1] + delta_row; for (unsigned col = 0; col < ncols; ++col) { - for (unsigned i = 0; i < n; ++i) - count += *(ptr[i]++); + for (unsigned i = 0; i < n; ++i, ++ptr) + { + if (ptr[i]) + ++count; + } output(point2d(row, col)) = count * 255 / n / n; } } } + + } // end of namespace mln::world::binary_2d + + } // end of namspace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_BINARY_2D_SUBSAMPLE_HH

1 0

3556: Make room for some non-generic routines.
by Thierry Geraud 20 Mar '09

20 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make room for some non-generic routines. * mln/world: New directory. * mln/world/binary_2d: New directory. * mln/world/binary_2d/subsample.hh: New. subsample.hh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) Index: mln/world/binary_2d/subsample.hh --- mln/world/binary_2d/subsample.hh (revision 0) +++ mln/world/binary_2d/subsample.hh (revision 0) @@ -0,0 +1,28 @@ + +// FIXME: Complete this file. + + +template <typename I> +image2d<int_u8> subsample(const image2d<bool>& input, unsigned n) +{ + typedef bool* ptr; + ptr p = new ptr(n); + const unsigned nrows = input.nrows() / n; + + dpoint2d dp_row(1, 0); + const unsigned delta_row = input.delta_index(dp_row); + + for (unsigned row = 0; row < nrows; ++row) + { + unsigned count = 0; + ptr[0] = & input(point2d(n * row, 0)); + for (unsigned i = 1; i < n; ++i) + ptr[i] = ptr[i-1] + delta_row; + for (unsigned col = 0; col < ncols; ++col) + { + for (unsigned i = 0; i < n; ++i) + count += *(ptr[i]++); + output(point2d(row, col)) = count * 255 / n / n; + } + } +}

1 0