[Olena-patches] last-svn-commit-545-ga8d13f2 WIP: More comparisons on dilation (variants without accu).

--- milena/apps/bench/Makefile.am | 2 + milena/apps/bench/dilation-lena.cc | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 766f620..f106b23 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -39,7 +39,9 @@ MOSTLYCLEANFILES = \ dilation-lena-out-spe.pgm \ dilation-lena-out-gen.pgm \ dilation-lena-out-fast.pgm \ + dilation-lena-out-fast_noaccu.pgm \ dilation-lena-out-faster.pgm \ + dilation-lena-out-faster_noaccu.pgm \ dilation-lena-out-fast_static.pgm \ gradient-lena-out.pgm \ gradient-spe-lena-out-0.pgm \ diff --git a/milena/apps/bench/dilation-lena.cc b/milena/apps/bench/dilation-lena.cc index ea37f19..3557487 100644 --- a/milena/apps/bench/dilation-lena.cc +++ b/milena/apps/bench/dilation-lena.cc @@ -111,6 +111,33 @@ namespace fast } } +namespace fast_noaccu +{ + using namespace mln; + + template <typename I, typename W> + mln_concrete(I) dilation(const I& input, const W& win) + { + typedef mln_concrete(I) O; + O output; initialize(output, input); // Initialize output. + + mln_pixter(const I) pi(input); // Iterator on the pixels of `input'. + mln_pixter(O) po(output); // Iterator on the pixels of `output'. + + mln_qixter(const I, W) q(pi, win); // Iterator on the neighbors of `p' w.r.t. `win'. + for_all_2(pi, po) + { + // FIXME: Cheat: replace the accu::supremum by a maximum. + mln_value(I) sup = mln_min(mln_value(I)); + for_all(q) + if (q.val() > sup) + sup = q.val(); + po.val() = sup; + } + return output; + } +} + namespace faster { using namespace mln; @@ -136,6 +163,32 @@ namespace faster } } +namespace faster_noaccu +{ + using namespace mln; + + template <typename I, typename W> + mln_concrete(I) dilation(const I& input, const W& win) + { + typedef mln_concrete(I) O; + O output; initialize(output, input); // Initialize output. + + mln_pixter(const I) p(input); // Iterator on the pixels of `input'. + + mln_qixter(const I, W) q(p, win); // Iterator on the neighbors of `p' w.r.t. `win'. + for_all(p) + { + // FIXME: Cheat: replace the accu::supremum by a maximum. + mln_value(I) sup = mln_min(mln_value(I)); + for_all(q) + if (q.val() > sup) + sup = q.val(); + *(output.buffer() + p.offset()) = sup; + } + return output; + } +} + namespace fast_static { using namespace mln; @@ -195,11 +248,22 @@ int main() io::pgm::save(d, "dilation-lena-out-fast.pgm"); t.start(); + d = fast_noaccu::dilation(lena, win_c4p()); + t.stop(); + std::cout << t.read() << std::endl; + io::pgm::save(d, "dilation-lena-out-fast_noaccu.pgm"); + + t.start(); d = faster::dilation(lena, win_c4p()); t.stop(); std::cout << t.read() << std::endl; io::pgm::save(d, "dilation-lena-out-faster.pgm"); + t.start(); + d = faster_noaccu::dilation(lena, win_c4p()); + t.stop(); + std::cout << t.read() << std::endl; + io::pgm::save(d, "dilation-lena-out-faster_noaccu.pgm"); const unsigned n = 5; mln::dpoint2d dps[n] = { mln::dpoint2d( 0, -1), -- 1.7.2.5