[Olena-patches] 3857: Make Etienne's code compile.

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Make Etienne's code compile. * folio/test/histo/projected3d.cc: Make it compile. Comment some parts of code. projected3d.cc | 93 +++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 26 deletions(-) Index: folio/test/histo/projected3d.cc --- folio/test/histo/projected3d.cc (revision 3856) +++ folio/test/histo/projected3d.cc (working copy) @@ -8,6 +8,7 @@ #include <mln/core/image/image_if.hh> #include <mln/pw/value.hh> #include <mln/level/transform.hh> +#include <mln/level/stretch.hh> #include <mln/arith/revert.hh> #include <mln/core/alias/neighb3d.hh> @@ -22,15 +23,20 @@ #include <mln/accu/count.hh> #include <mln/accu/mean.hh> +#include <mln/accu/sum.hh> #include <mln/accu/image/init.hh> #include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> #include <mln/debug/println.hh> + namespace mln { + struct rgb8to6 : Function_v2v< rgb8to6 > { typedef value::rgb<6> result; @@ -40,8 +46,23 @@ return res; } }; + + struct take_log : Function_v2v< take_log > + { + typedef float result; + float operator()(float f) const + { + mln_precondition(f > 0); + return std::log(f + 1); +// return std::log(std::log(f + 1) + 1); + } + }; + } + + + int main(int argc, char* argv[]) { if (argc != 3) @@ -59,41 +80,61 @@ std::cout << " => loading " << argv[1] << "..." << std::endl; image2d<value::rgb8> ima; io::ppm::load(ima, argv[1]); - image2d<rgb6> ima6 = level::transform(ima, rgb8to6()); +// image2d<rgb6> ima6 = level::transform(ima, rgb8to6()); std::cout << " => computing histogram..." << std::endl; - image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima6); + image3d<unsigned> histo = histo::compute_histo_rgb<unsigned>(ima); // 6); - std::cout << " => computing reverted histogram..." << std::endl; - image3d<unsigned> reverted = arith::revert(histo); + { + mln_VAR(h, histo); - std::cout << " => computing closure..." << std::endl; - image3d<unsigned> closed = - morpho::closing::volume(reverted, c6(), atoi(argv[2])); + typedef accu::sum<unsigned> A; - std::cout << " => computing watershed..." << std::endl; - value::label_8 nbasin; - image3d<value::label_8> labels = - morpho::watershed::flooding(closed, c6(), nbasin); - std::cout << "found " << nbasin << " labels" << std::endl; + image2d<A> h_2d_a(h.nrows(), h.ncols()); + accu::image::init(h_2d_a); - labels = morpho::elementary::dilation(labels, c18()); + accu::image::take( unproject( h_2d_a, + h.domain(), + fun::v2v::projection<point3d, 2>() ).rw(), + h ); - std::cout << " => computing output labelized image..." << std::endl; - image2d<value::label_8> lab = histo::classify_with_histo_rgb(ima, labels); + image2d<float> h_2d = accu::image::to_result(h_2d_a); + io::pgm::save( level::stretch( int_u8(), + level::transform( h_2d, + take_log() ) ), + "h_2d.pgm" ); + } - std::cout << " => computing projection..." << std::endl; - typedef accu::mean<int_u8, unsigned, int_u8> A; +// std::cout << " => computing reverted histogram..." << std::endl; +// image3d<unsigned> reverted = arith::revert(histo); - image2d<A> vmean(lab.nrows(), lab.ncols()); - accu::image::init(vmean); - { - fun::v2v::projection<point3d, 0> vproj; - mln_VAR( vmean_, unproject(vmean, lab.domain(), vproj) ); - accu::image::take(vmean_, lab); - } +// std::cout << " => computing closure..." << std::endl; +// image3d<unsigned> closed = +// morpho::closing::volume(reverted, c6(), atoi(argv[2])); + +// std::cout << " => computing watershed..." << std::endl; +// value::label_8 nbasin; +// image3d<value::label_8> labels = +// morpho::watershed::flooding(closed, c6(), nbasin); +// std::cout << "found " << nbasin << " labels" << std::endl; + +// labels = morpho::elementary::dilation(labels, c18()); + +// std::cout << " => computing output labelized image..." << std::endl; +// image2d<value::label_8> lab = histo::classify_with_histo_rgb(ima, labels); + +// std::cout << " => computing projection..." << std::endl; + +// typedef accu::mean<int_u8, unsigned, int_u8> A; +// image2d<A> vmean(lab.nrows(), lab.ncols()); +// accu::image::init(vmean); +// { +// fun::v2v::projection<point3d, 0> vproj; +// mln_VAR( vmean_, unproject(vmean, lab.domain(), vproj) ); +// accu::image::take(vmean_, lab); +// } - std::cout << " => saving " << argv[2] << "..." << std::endl; - io::ppm::save(vmean, argv[2]); +// std::cout << " => saving " << argv[2] << "..." << std::endl; +// io::ppm::save(vmean, argv[2]); }