- Olena-patches

3481: Add fastest version for thick front distance transform.
by Thierry Geraud 05 Mar '09

05 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add fastest version for thick front distance transform. * mln/core/concept/weighted_window.hh (mln_is_simple_weighted_window): New. * sandbox/folio/distance_front_new.hh: Copy to and rename as... * mln/canvas/distance_front.hh: ...this. Update doc. (distance_front_dispatch): Fix missing test. canvas/distance_front.hh | 10 ++++++---- core/concept/weighted_window.hh | 10 ++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) Index: mln/core/concept/weighted_window.hh --- mln/core/concept/weighted_window.hh (revision 3480) +++ mln/core/concept/weighted_window.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 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 @@ -40,6 +40,12 @@ # include <mln/trait/windows.hh> + +# define mln_is_simple_weighted_window(W) \ + mln_is_simple_window(typename W::window) + + + namespace mln { Index: mln/canvas/distance_front.hh --- mln/canvas/distance_front.hh (revision 3480) +++ mln/canvas/distance_front.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 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 @@ -30,7 +31,7 @@ /// \file mln/canvas/distance_front.hh /// -/// Discrete distance canvas by front propagation. +/// Canvas of discrete distance computation by thick front propagation. # include <vector> # include <mln/core/concept/image.hh> @@ -47,7 +48,7 @@ namespace canvas { - /// Discrete front distance canvas. + /// Canvas of discrete distance computation by thick front propagation. template <typename I, typename N, typename W, typename D, typename F> @@ -360,7 +361,6 @@ D max, F& functor) { return impl::distance_front_fastest(input, nbh, w_win, max, functor); - // return impl::generic::distance_front(input, nbh, w_win, max, functor); } template <typename I, @@ -377,6 +377,8 @@ trait::image::speed::fastest)::value && mln_is_simple_neighborhood(N)::value + && + mln_is_simple_weighted_window(W)::value }; return distance_front_dispatch(metal::bool_<test>(), input, nbh, w_win, max, functor); Property changes on: mln/canvas/distance_front.hh ___________________________________________________________________ Added: svn:mergeinfo

1 0

3480: Fix fastest distance computation.
by Thierry Geraud 05 Mar '09

05 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix fastest distance computation. * folio/distance_front.cc (main): Remove echo. Test equality between generic and fastest results. * folio/distance_front_new.hh (distance_front_fastest): Fix erroneous line moves. distance_front.cc | 6 ++++-- distance_front_new.hh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) Index: folio/distance_front.cc --- folio/distance_front.cc (revision 3479) +++ folio/distance_front.cc (working copy) @@ -38,6 +38,7 @@ #include <mln/data/fill.hh> #include <mln/debug/println.hh> #include <mln/opt/at.hh> +#include <mln/level/compare.hh> # include <mln/transform/internal/distance_functor.hh> # include "distance_front_new.hh" @@ -74,13 +75,14 @@ w_win, dmax, f); - debug::println("ref", ref); + // debug::println("ref", ref); output = canvas::impl::distance_front_fastest(input, nbh, w_win, dmax, f); - debug::println("output", output); + // debug::println("output", output); + mln_invariant(output == ref); } Index: folio/distance_front_new.hh --- folio/distance_front_new.hh (revision 3479) +++ folio/distance_front_new.hh (working copy) @@ -316,10 +316,10 @@ } } } + } bucket_size -= bucket_d.size(); bucket_d.clear(); } - } } // end of Propagation. trace::exiting("canvas::impl::distance_front_fastest");

1 0

3479: Complete Etienne's work.
by Thierry Geraud 05 Mar '09

05 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Complete Etienne's work. * folio/distance_front.cc: New. * folio/distance_front_new.hh: Make it compile. Fix missing work. distance_front.cc | 38 ++++++++++++++++++++++++------ distance_front_new.hh | 63 ++++++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 36 deletions(-) Index: folio/distance_front.cc --- folio/distance_front.cc (revision 3478) +++ folio/distance_front.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 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 @@ -29,6 +30,7 @@ /// /// Test on mln::transform::distance_front. +#include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/make/w_window2d_int.hh> @@ -37,7 +39,8 @@ #include <mln/debug/println.hh> #include <mln/opt/at.hh> -#include <mln/transform/distance_front.hh> +# include <mln/transform/internal/distance_functor.hh> +# include "distance_front_new.hh" int main() @@ -45,18 +48,39 @@ using namespace mln; using value::int_u8; - image2d<bool> input(9, 9); + typedef image2d<bool> I; + + I input(9, 9); data::fill(input, false); opt::at(input, 4, 4) = true; + + int_u8 dmax = 18; + mln_VAR(nbh, c4()); + int ws[] = { 0, 9, 0, 9, 0, 9, 6, 4, 6, 9, 0, 4, 0, 4, 0, 9, 6, 4, 6, 9, 0, 9, 0, 9, 0 }; + mln_VAR(w_win, make::w_window2d_int(ws)); + + + transform::internal::distance_functor f; + image2d<int_u8> ref, output; + + ref = canvas::impl::generic::distance_front(input, + nbh, + w_win, + dmax, + f); + debug::println("ref", ref); + + output = canvas::impl::distance_front_fastest(input, + nbh, + w_win, + dmax, + f); + debug::println("output", output); - image2d<int_u8> output = transform::distance_front(input, - c4(), make::w_window2d_int(ws), - int_u8(18)); - debug::println(output); } Index: folio/distance_front_new.hh --- folio/distance_front_new.hh (revision 3478) +++ folio/distance_front_new.hh (working copy) @@ -38,11 +38,7 @@ # include <mln/core/concept/weighted_window.hh> # include <mln/data/fill.hh> # include <mln/accu/max.hh> - -//# include <mln/core/routine/duplicate.hh> -//# include <mln/core/site_set/p_queue_fast.hh> -//# include <queue> -//# include <mln/extension/adjust_fill.hh> +# include <mln/extension/adjust_fill.hh> namespace mln @@ -75,11 +71,14 @@ typename F> void distance_front_tests(const Image& input_, - const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, D max, + const Neighborhood<N>& nbh_, + const Weighted_Window<W>& w_win_, + D max, F& functor) { const I& input = exact(input_); const N& nbh = exact(nbh_); + const W& w_win = exact(w_win_); mln_precondition(input.is_valid()); mln_precondition(nbh.is_valid()); @@ -108,7 +107,9 @@ typename F> mln_ch_value(I, D) distance_front(const Image& input_, - const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, D max, + const Neighborhood<N>& nbh_, + const Weighted_Window<W>& w_win_, + D max, F& functor) { trace::entering("canvas::impl::generic::distance_front"); @@ -159,7 +160,7 @@ break; } } - } + } // end of Initialization. // Propagation. { @@ -199,11 +200,11 @@ bucket_size -= bucket_d.size(); bucket_d.clear(); } + } // end of Propagation. trace::exiting("canvas::impl::generic::distance_front"); return dmap; } - } } // of namespace mln::canvas::impl::generic @@ -216,7 +217,8 @@ typename F> mln_ch_value(I, D) distance_front_fastest(const Image& input_, - const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + const Neighborhood<N>& nbh_, + const Weighted_Window<W>& w_win_, D max, F& functor) { trace::entering("canvas::impl::distance_front_fastest"); @@ -225,12 +227,14 @@ const N& nbh = exact(nbh_); const W& w_win = exact(w_win_); -// mln_precondition(input.is_valid()); // ?x -// mln_precondition(w_win.is_valid()); // ?x - extension::adjust(input, w_win); // ? + mln_precondition(input.is_valid()); + mln_precondition(w_win.is_valid()); -// typedef mln_site(I) P; - typedef std::vector<unsigned> bucket_t; + // Handling w_win. + extension::adjust(input, w_win); + const unsigned n_ws = w_win.size(); + util::array<int> dp = offsets_wrt(input, w_win.win()); + mln_invariant(dp.nelements() == n_ws); // Distance map. mln_ch_value(I, D) dmap; @@ -247,6 +251,7 @@ } // Aux data. + typedef std::vector<unsigned> bucket_t; std::vector<bucket_t> bucket(mod); unsigned bucket_size = 0; @@ -254,14 +259,14 @@ { functor.init_(input); // <-- init - // For the extension to be ignored: // ? - extension::fill(input, true); // ? - extension::fill(dmap, D(0)); // ? + // For the extension to be ignored: + extension::fill(input, true); + extension::fill(dmap, D(0)); mln_pixter(const I) p(input); mln_nixter(const I, N) n(p, nbh); for_all(p) - if (functor.inqueue_p_wrt_input_p_(input(p))) // <-- inqueue_p_wrt_input_p + if (functor.inqueue_p_wrt_input_p_(p.val())) // <-- inqueue_p_wrt_input_p { dmap.element(p.offset()) = 0; for_all(n) @@ -272,14 +277,12 @@ break; } } - } + } // end of Initialization. // Propagation. { unsigned p; - mln_qiter(W) q(w_win, p); // ?x- - for (unsigned d = 0; bucket_size != 0; ++d) { bucket_t& bucket_d = bucket[d % mod]; @@ -298,15 +301,16 @@ // p has already been processed, having a distance less than d. continue; - for_all(q) + for (unsigned i = 0; i < n_ws; ++i) { - if (dmap.domain().has(q) && dmap(q) > d) + unsigned q = p + dp[i]; + if (dmap.element(q) > d) { - unsigned d_ = d + q.w(); - if (d_ < dmap(q)) + unsigned d_ = d + w_win.w(i); + if (d_ < dmap.element(q)) { - dmap(q) = d_; - functor.process_(dmap.element(p), q); // <- process + dmap.element(q) = d_; + functor.process_(p, q); // <- process bucket[d_ % mod].push_back(q); ++bucket_size; } @@ -315,11 +319,12 @@ bucket_size -= bucket_d.size(); bucket_d.clear(); } + } + } // end of Propagation. trace::exiting("canvas::impl::distance_front_fastest"); return dmap; } - } } // of namespace mln::canvas::impl

1 0

Re: [Olena-patches] milena r3475: New fast front propagation
by Thierry GERAUD 05 Mar '09

05 Mar '09

Etienne FOLIO wrote: > URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena > > ChangeLog: > 2009-03-04 Etienne FOLIO <folio(a)lrde.epita.fr> > > New fast front propagation. > * sandbox/folio/distance_front_new.hh: New fast front propagation > (not tested). > ... règles de base : - utiliser un outil qui gère l'indentation et signale les blocs non balancés (genre, il manque un '{' ou '}') - ne pas régresser quand on récupère du code (genre : apparition d'une erreur de compil dans du code copié-collé de mln et qui ne devait pas être modifié) - commettre les changements (genre, là, je suis obligé de refaire ce que l'on a fait ensemble hier) - noter dans un cahier les infos que je vous transmets (genre : pour m'éviter de vous ré-expliquer votre sujet de séminaire de l'année passée !!!) pas content :-(

1 0

3478: Fix tests.
by Guillaume Lazzara 05 Mar '09

05 Mar '09

* mln/canvas/morpho/attribute_filter.hh: add a missing inline. * mln/registration/icp.hh: fix compilation issues. * tests/registration/registration.cc: enlarge the closest_point image bbox. * tests/transform/bench_closest_point_geodesic.cc: Update call to distance_and_closest_point_geodesic. * tests/transform/distance_and_closest_point_geodesic.cc: fix reference resut. --- milena/ChangeLog | 17 +++++++++++++++++ milena/mln/canvas/morpho/attribute_filter.hh | 1 + milena/mln/registration/icp.hh | 4 ++-- milena/tests/registration/registration.cc | 3 +-- .../transform/bench_closest_point_geodesic.cc | 13 ++++++------- .../distance_and_closest_point_geodesic.cc | 19 ++++++++++--------- 6 files changed, 37 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8cc165f..c8d86e9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2009-03-05 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Fix tests. + + * mln/canvas/morpho/attribute_filter.hh: add a missing inline. + + * mln/registration/icp.hh: fix compilation issues. + + * tests/registration/registration.cc: enlarge the closest_point image + bbox. + + * tests/transform/bench_closest_point_geodesic.cc: Update call to + distance_and_closest_point_geodesic. + + * tests/transform/distance_and_closest_point_geodesic.cc: fix + reference resut. + 2009-03-04 Etienne FOLIO <folio(a)lrde.epita.fr> New fast front propagation. diff --git a/milena/mln/canvas/morpho/attribute_filter.hh b/milena/mln/canvas/morpho/attribute_filter.hh index 298c236..4d21f9c 100644 --- a/milena/mln/canvas/morpho/attribute_filter.hh +++ b/milena/mln/canvas/morpho/attribute_filter.hh @@ -446,6 +446,7 @@ namespace mln // Facade. template <typename I, typename N, typename A> + inline mln_concrete(I) attribute_filter(const Image& input, const Neighborhood<N>& nbh, diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 6adc0b3..17eebff 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -197,8 +197,8 @@ namespace mln mln_piter(I) pi(cp_ima_.domain()); for_all(pi) { - debug(pi) = debug(cp_ima_(pi)); - debug2(pi) = debug2(cp_ima_(pi)); + debug(pi) = debug(X[cp_ima_(pi)]); + debug2(pi) = debug2(X[cp_ima_(pi)]); } io::pbm::save(slice(debug2,0), "debug2-b.ppm"); diff --git a/milena/tests/registration/registration.cc b/milena/tests/registration/registration.cc index 9433f5a..16d23c4 100644 --- a/milena/tests/registration/registration.cc +++ b/milena/tests/registration/registration.cc @@ -56,8 +56,7 @@ int main() arr_t arr2 = convert::to<arr_t>(img2); box3d bbox = img2.bbox(); - bbox.enlarge(1, 10); - bbox.enlarge(2, 10); + bbox.enlarge(10); registration::registration1(bbox, arr1, arr2); //FIXME: Auto test result } diff --git a/milena/tests/transform/bench_closest_point_geodesic.cc b/milena/tests/transform/bench_closest_point_geodesic.cc index 06a6b44..b92b690 100644 --- a/milena/tests/transform/bench_closest_point_geodesic.cc +++ b/milena/tests/transform/bench_closest_point_geodesic.cc @@ -35,9 +35,9 @@ #include <mln/core/alias/neighb3d.hh> #include <mln/data/fill.hh> #include <mln/opt/at.hh> -#include <mln/transform/closest_point_geodesic.hh> +#include <mln/transform/distance_and_closest_point_geodesic.hh> #include <mln/value/int_u8.hh> - +#include <mln/util/couple.hh> int main() { @@ -56,9 +56,8 @@ int main() std::rand() % nrows, std::rand() % ncols) = true; - trace::quiet = false; - - image3d<point3d> output = transform::closest_point_geodesic(input, - c6(), - mln_max(unsigned)); + util::couple<image3d<unsigned>, image3d<point3d> > output = + transform::distance_and_closest_point_geodesic(input, + c6(), + mln_max(unsigned)); } diff --git a/milena/tests/transform/distance_and_closest_point_geodesic.cc b/milena/tests/transform/distance_and_closest_point_geodesic.cc index d3544ab..368256b 100644 --- a/milena/tests/transform/distance_and_closest_point_geodesic.cc +++ b/milena/tests/transform/distance_and_closest_point_geodesic.cc @@ -51,15 +51,16 @@ unsigned dmap_ref[] = { 4, 4, 4, 3, 2, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; -unsigned cp_idx_ref[] = { 0 , 0 , 82 , 82 , 82 , 82, 82, 0 , 0 , - 0 , 82 , 82 , 82 , 82 , 82, 82, 82, 0 , - 110, 82 , 82 , 82 , 82 , 82, 82, 82, 82, - 110, 110, 110, 82 , 82 , 82, 82, 82, 0 , - 110, 110, 110, 110, 82 , 82, 82, 0 , 0 , - 110, 110, 110, 110, 82 , 82, 0 , 0 , 0 , - 110, 110, 110, 110, 110, 0 , 0 , 0 , 0 , - 0 , 110, 110, 110, 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 110, 0 , 0 , 0 , 0 , 0 , 0 }; +unsigned cp_idx_ref[] = { 2, 2, 0, 0, 0, 0, 0, 2, 2, + 2, 0, 0, 0, 0, 0, 0, 0, 2, + 1, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 2, + 1, 1, 1, 1, 0, 0, 0, 2, 2, + 1, 1, 1, 1, 0, 0, 2, 2, 2, + 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 1, 1, 1, 2, 2, 2, 2, 2, + 2, 2, 1, 2, 2, 2, 2, 2, 2 }; + int main() { -- 1.5.6.5

1 0

r3477: Add methods to check attribute computing
by Edwin Carlinet 04 Mar '09

04 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-04 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add methods to check attribute computing. * edwin/tree/propagate.hh, * edwin/tree/tree.cc: Fix bugs and add check function. * edwin/tree/routines.hh: Some utils about tree manipulation. --- Makefile | 14 +-- propagate.hh | 2 routines.hh | 109 +++++++++++++++++++++++++++++++ tree.cc | 207 +++++++++++++++++++++++++++++++---------------------------- 4 files changed, 227 insertions(+), 105 deletions(-) Index: trunk/milena/sandbox/edwin/tree/propagate.hh =================================================================== --- trunk/milena/sandbox/edwin/tree/propagate.hh (revision 3476) +++ trunk/milena/sandbox/edwin/tree/propagate.hh (revision 3477) @@ -62,7 +62,7 @@ { mln_bkd_piter(T) p(t.domain()); for_all(p) - if (a(t.parent(p)) == v) + if (t.is_a_node(p) && a(t.parent(p)) == v) { mln_assertion(t.is_a_node(t.parent(p))); a(p) = a(t.parent(p)); Index: trunk/milena/sandbox/edwin/tree/tree.cc =================================================================== --- trunk/milena/sandbox/edwin/tree/tree.cc (revision 3476) +++ trunk/milena/sandbox/edwin/tree/tree.cc (revision 3477) @@ -1,4 +1,3 @@ - #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> @@ -12,149 +11,167 @@ #include <mln/io/pbm/save.hh> #include <mln/level/sort_psites.hh> -#include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> + #include <mln/morpho/attribute/card.hh> -#include "../attributes/occupation.hh" -#include "propagate.hh" +#include <mln/morpho/attribute/sharpness.hh> +// to check: +#include <mln/labeling/blobs.hh> +#include <mln/labeling/compute.hh> +#include <mln/accu/count.hh> #include <mln/debug/println.hh> +#include <../../theo/color/change_attributes.hh> +//----------------- + + +#include <string> + +#include "propagate.hh" +#include "routines.hh" namespace mln { - template <typename T, typename A> + /// Structure to simplify filtering using min tree. + template <typename I> + struct treefilter : Object< treefilter > + { + typedef p_array< mln_site(I) > S; + typedef morpho::tree::data<I,S> tree_t; + + /// Constructor: Make the min tree based on the image \p f_, then + /// performs calculus using \p a_ attribute. To finish, it filters + /// tree's nodes which values are in [lambda1, lambda2] set. + template <typename A> + treefilter(Image& f_, + Accumulator<A> a_, + double lambda1 = mln_min(double), + double lambda2 = mln_max(double)); + + /// Get the min tree performed. + tree_t& tree() { return tree_; }; + + /// Get the boolean image got after filtering. + mln_ch_value(I, bool)& img() {return img_; }; + + private: + S sorted_sites_; + tree_t tree_; + mln_ch_value(I, bool) img_; + }; + + + template <typename I> + template <typename A> inline - void - sample(const T& t, const A& a, int echo) + treefilter::treefilter(Image& f_, + Accumulator<A> a_, + double lambda1, + double lambda2) + : sorted_sites_(level::sort_psites_decreasing(exact(f_))), + tree_(exact(f_), sorted_sites_, c4()) { - A aa; - initialize(aa, a); - data::fill(aa, false); // 'aa' is false /a priori/. - - typedef typename T::nodes_t N; - mln_fwd_piter(N) n(t.nodes()); - for_all(n) - // We only keep "highest" nodes at 'true' => largest component. - // aa(n) = (a(n) == true && a(t.parent(n)) == false); - aa(n) = a(n); - - if (echo) io::pbm::save(aa, "before.pbm"); - if (echo > 1) debug::println("aa (before)", aa); - - back_propagate_subbranch(t, aa, true); - if (echo > 1) debug::println("aa (After subbranch propagation)", aa); - back_propagate_level(t, aa); + mln_VAR(a, morpho::tree::compute_attribute_image(a_, tree_)); - if (echo > 1) debug::println("aa (Final)", aa); - io::pbm::save(aa, "out.pbm"); + img_ = duplicate((pw::cst(lambda1) < pw::value(a) && + pw::value(a) < pw::cst(lambda2)) + | a.domain()); + debug::println("attribut", a); } +// template <typename T> +// inline +// float +// find_treshold(const T& t) +// { +// mln_bkd_piter(T) = p(t.domain()); -} // mln +// for_all(p) +// if (t.is_a_node(p)) +// { +// if -using namespace mln; -int echo = 0; +// } +// } template <typename I, typename A> -inline -void -create_tree_and_compute(Image& f_, Accumulator<A> a_, float lambda, float lambda2 = mln_max(float)) + void filtercheck(const Image& img, const Meta_Accumulator<A>& a) { - using value::int_u8; - - I f = exact(f_); - - typedef p_array< mln_site(I) > S; - S s = level::sort_psites_decreasing(f); - typedef morpho::tree::data<I,S> tree_t; - tree_t t(f, s, c4()); - - mln_VAR(a, morpho::tree::compute_attribute_image(a_, t)); + using value::label_8; + label_8 n; + util::array<unsigned int> counts; - if (echo > 1) + debug::println("binaire:", img); + mln_VAR(lbl, labeling::blobs(img, c4(), n)); + debug::println("blob:", lbl); + counts = labeling::compute(a, lbl, n); + for (unsigned i = 0; i < counts.nelements(); i++) { - debug::println("parent imagee", t.parent_image()); - debug::println("a", a); - debug::println("a | nodes", a | t.nodes()); + std::cout << "counts[" < b = duplicate((pw::cst(lambda) < pw::value(a) && pw::value(a) < pw::cst(lambda2)) | a.domain()); - sample(t, b, echo); } +} // end of namespace mln + + void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.pgm echo lambda1 lamda2" << std::endl; - std::cerr << "\techo:\t0 (none)" << std::endl - << "\t\t1 (img output)" << std::endl - << "\t\t2 (debug)" << std::endl; + std::cerr << "usage: " << argv[0] << " input.pgm accumulator lambda1 [lambda2]" + << std::endl; abort(); } + int main(int argc, char* argv[]) { + using namespace mln; using value::int_u8; - mln_VAR(nbh, c4()); + typedef image2d<int_u8> I; + + float lambda1; + float lambda2; + I input; if (argc < 4) usage(argv); - echo = std::atoi(argv[2]); - float lambda1 = atof(argv[3]); - float lambda2 = (argc == 5) ? atof(argv[4]) : mln_max(float); - - typedef image2d<int_u8> I; - - I input; io::pgm::load(input, argv[1]); - if (echo > 1) debug::println("input", input); - I f = input; - // I f = morpho::elementary::gradient(input, nbh); - if (echo > 1) debug::println("f", f); - - // test de volume - typedef image1d<int> IM; - IM img(6); - morpho::attribute::volume<IM> accu; - img.element(0) = 50; - img.element(1) = 50; - img.element(2) = 40; - img.element(3) = 40; - img.element(4) = 20; - img.element(5) = 20; + lambda1 = atof(argv[3]); + lambda2 = (argc == 5) ? atof(argv[4]) : mln_max(float); - mln_piter_(image1d<int>) p(img.domain()); + std::string s(argv[2]); + treefilter* f = 0; + if (s == "card") + f = new treefilter(input, morpho::attribute::card(), lambda1, lambda2); + else if (s == "sharpness") + f = new treefilter(input, morpho::attribute::sharpness(), lambda1, lambda2); + else + usage(argv); - int tab[6] = { 50, 50, 40, 40, 20, 20 }; + back_propagate_subbranch(f->tree(), f->img() ,true); + back_propagate_level(f->tree(), f->img()); - for (int i = 0; i < 6; i++) - { - accu.take(tab[i]); - std::cout << "(" << tab[i] << "," << accu.to_result() << "):"; - } - std::cout << "Volume:" << accu.to_result() << std::endl; + filtercheck(f->img(), accu::meta::count()); - accu.init (); - for (int i = 5; i >= 0; i--) - { - accu.take(tab[i]); - std::cout << "(" << tab[i] << "," << accu.to_result() << "):"; - } - std::cout << "Volume:" << accu.to_result() << std::endl; - //create_tree_and_compute(img, morpho::attribute::volume<I2>()); - // + util::array< mln_psite_(I) > counts; + counts = morpho::tree::get_first_nodes(f->img(), f->tree()); + for (unsigned i = 0; i < counts.nelements(); i++) + std::cout << "counts[" <(), lambda1, lambda2); + mln_VAR(a, morpho::tree::compute_attribute_image(morpho::attribute::card(), f->tree())); + display_tree_attributes(f->tree(), a); + io::pbm::save(f->img(), "out.pbm"); + delete f; } Index: trunk/milena/sandbox/edwin/tree/routines.hh =================================================================== --- trunk/milena/sandbox/edwin/tree/routines.hh (revision 0) +++ trunk/milena/sandbox/edwin/tree/routines.hh (revision 3477) @@ -0,0 +1,109 @@ +// Copyright (C) 2007, 2008, 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 ROUTINES_HH_ +# define ROUTINES_HH_ + +# include <mln/morpho/tree/data.hh> +# include <mln/core/concept/image.hh> +# include <mln/data/fill.hh> + +namespace mln { + namespace morpho { + namespace tree { + + template <typename I, typename T> + util::array< mln_psite(I) > + get_first_nodes(const Image& img_, const T& tree) + { + I bin = exact(img_); + mln_ch_value(I, bool) deja_vu; + util::array< mln_psite(I) > fnodes; + + initialize(deja_vu, img_); + data::fill(deja_vu, false); + + bool can_break = false; + mln_bkd_piter(T) p(tree.domain()); + for_all(p) + { + if (tree.is_a_node(p) && bin(p) && bin(t.parent(p)) + { + fnodes.append(p); + } + } + + // else if (can_break) +// { +// std::cout < +// void +// println(const T& t, const Image f_) +// { +// //theo's code +// typedef mln_site(I) P; +// I f = exact(f_); + +// mln_ch_value(I, bool) deja_vu; +// initialize(deja_vu, f); +// data::fill(deja_vu, false); + +// typedef typename T::nodes_t nodes_t; +// mln_fwd_piter(T) p(t.nodes()); +// for_all(p) +// { +// if (deja_vu(p)) +// continue; +// P e = p; +// do +// { +// std::cout << f(e) << ':' << e << " -> "; +// deja_vu(e) = true; +// e = t.parent(e); +// } +// while (! deja_vu(e)); +// std::cout << f(e) << ':' << e << std::endl; +// } +// std::cout << std::endl; +// } +// } +} + + +#endif /* !ROUTINES_HH_ */ Index: trunk/milena/sandbox/edwin/tree/Makefile =================================================================== --- trunk/milena/sandbox/edwin/tree/Makefile (revision 3476) +++ trunk/milena/sandbox/edwin/tree/Makefile (revision 3477) @@ -1,28 +1,25 @@ -TARGET=a.out +TARGET=tree SRC=tree.cc OBJS=${SRC:.cc=.o} -OLENADIR=../../../.. +OLENADIR=$(MLN_DIR)/.. MILENADIR=$(OLENADIR)/milena CXXFLAGS=-I$(MILENADIR) -I./ -CXXFLAGS += "-DNDEBUG -O1" - +CXXFLAGS += -DNDEBUG -O1 CXX=g++ LD=g++ LDFLAGS= all: clean $(TARGET) + #chmod +x exo2.sh + #./exo2.sh $(TARGET): $(OBJS) $(SRC) $(LD) $(LDFLAGS) -o $@ $(OBJS) - -$(REF): $(OBJS_REF) $(SRC_REF) - $(LD) $(LDFLAGS) -o $@ $(OBJS_REF) - %.o: %.cc $(CXX) $(CXXFLAGS) -c $< @@ -30,4 +27,6 @@ $(CXX) $(CXXFLAGS) -c $< clean: - rm -f *.o $(REF) $(TARGET) \ No newline at end of file + rm -f *.o $(TARGET) + rm -f *.pbm + find -name "*.pgm" \! -regex ".*/affiche2?.pgm" -delete \ No newline at end of file

1 0

milena r3475: New fast front propagation
by Etienne FOLIO 04 Mar '09

04 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-04 Etienne FOLIO <folio(a)lrde.epita.fr> New fast front propagation. * sandbox/folio/distance_front_new.hh: New fast front propagation (not tested). --- distance_front_new.hh | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 415 insertions(+) Index: trunk/milena/sandbox/folio/distance_front_new.hh =================================================================== --- trunk/milena/sandbox/folio/distance_front_new.hh (revision 0) +++ trunk/milena/sandbox/folio/distance_front_new.hh (revision 3475) @@ -0,0 +1,415 @@ +// Copyright (C) 2008 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_CANVAS_DISTANCE_FRONT_HH +# define MLN_CANVAS_DISTANCE_FRONT_HH + +/// \file mln/canvas/distance_front.hh +/// +/// Discrete distance canvas by front propagation. + +# include <vector> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/concept/weighted_window.hh> +# include <mln/data/fill.hh> +# include <mln/accu/max.hh> + +//# include <mln/core/routine/duplicate.hh> +//# include <mln/core/site_set/p_queue_fast.hh> +//# include <queue> +//# include <mln/extension/adjust_fill.hh> + + +namespace mln +{ + + namespace canvas + { + + /// Discrete front distance canvas. + template <typename I, + typename N, typename W, typename D, + typename F> + mln_ch_value(I, D) + distance_front(const Image& input, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, D max, + F& functor); + + + +# ifndef MLN_INCLUDE_ONLY + + + // Tests. + + namespace internal + { + + template <typename I, + typename N, typename W, typename D, + typename F> + void + distance_front_tests(const Image& input_, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, D max, + F& functor) + { + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + mln_precondition(input.is_valid()); + mln_precondition(nbh.is_valid()); + + (void) input; + (void) nbh; + (void) max; + (void) functor; + } + + + } // of namespace mln::canvas::internal + + + + // Implementations. + + namespace impl + { + + namespace generic + { + + template <typename I, + typename N, typename W, typename D, + typename F> + mln_ch_value(I, D) + distance_front(const Image& input_, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, D max, + F& functor) + { + trace::entering("canvas::impl::generic::distance_front"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + const W& w_win = exact(w_win_); + + mln_precondition(input.is_valid()); + mln_precondition(w_win.is_valid()); + + typedef mln_site(I) P; + typedef std::vector bucket_t; + + // Distance map. + mln_ch_value(I, D) dmap; + initialize(dmap, input); + data::fill(dmap, max); + + // Mod determination. + unsigned mod; + { + accu::max<unsigned> m; + for (unsigned i = 0; i < w_win.size(); ++i) + m.take(w_win.w(i)); + mod = unsigned(m) + 1; + } + + // Aux data. + std::vector<bucket_t> bucket(mod); + unsigned bucket_size = 0; + + // Initialization. + { + functor.init(input); // <-- init + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + if (functor.inqueue_p_wrt_input_p(input(p))) // <-- inqueue_p_wrt_input_p + { + dmap(p) = 0; + for_all(n) + if (input.domain().has(n) && + functor.inqueue_p_wrt_input_n(input(n))) // <-- inqueue_p_wrt_input_n + { + bucket[0].push_back(p); + ++bucket_size; + break; + } + } + } + + // Propagation. + { + P p; + mln_qiter(W) q(w_win, p); + for (unsigned d = 0; bucket_size != 0; ++d) + { + bucket_t& bucket_d = bucket[d % mod]; + for (unsigned i = 0; i < bucket_d.size(); ++i) + { + p = bucket_d[i]; + + if (dmap(p) == max) + { + // Saturation so stop. + bucket_size = bucket_d.size(); // So at end bucket_size == 0. + break; + } + + if (dmap(p) < d) + // p has already been processed, having a distance less than d. + continue; + + for_all(q) + if (dmap.domain().has(q) && dmap(q) > d) + { + unsigned d_ = d + q.w(); + if (d_ < dmap(q)) + { + dmap(q) = d_; + functor.process(p, q); // <- process + bucket[d_ % mod].push_back(q); + ++bucket_size; + } + } + } + bucket_size -= bucket_d.size(); + bucket_d.clear(); + } + + trace::exiting("canvas::impl::generic::distance_front"); + return dmap; + } + } + + } // of namespace mln::canvas::impl::generic + + + + // Fastest version. + + template <typename I, + typename N, typename W, typename D, + typename F> + mln_ch_value(I, D) + distance_front_fastest(const Image& input_, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + D max, F& functor) + { + trace::entering("canvas::impl::distance_front_fastest"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + const W& w_win = exact(w_win_); + +// mln_precondition(input.is_valid()); // ?x +// mln_precondition(w_win.is_valid()); // ?x + extension::adjust(input, w_win); // ? + +// typedef mln_site(I) P; + typedef std::vector<unsigned> bucket_t; + + // Distance map. + mln_ch_value(I, D) dmap; + initialize(dmap, input); + data::fill(dmap, max); + + // Mod determination. + unsigned mod; + { + accu::max<unsigned> m; + for (unsigned i = 0; i < w_win.size(); ++i) + m.take(w_win.w(i)); + mod = unsigned(m) + 1; + } + + // Aux data. + std::vector<bucket_t> bucket(mod); + unsigned bucket_size = 0; + + // Initialization. + { + functor.init_(input); // <-- init + + // For the extension to be ignored: // ? + extension::fill(input, true); // ? + extension::fill(dmap, D(0)); // ? + + mln_pixter(const I) p(input); + mln_nixter(const I, N) n(p, nbh); + for_all(p) + if (functor.inqueue_p_wrt_input_p_(input(p))) // <-- inqueue_p_wrt_input_p + { + dmap.element(p.offset()) = 0; + for_all(n) + if (functor.inqueue_p_wrt_input_n_(n.val())) // <-- inqueue_p_wrt_input_n + { + bucket[0].push_back(p.offset()); + ++bucket_size; + break; + } + } + } + + // Propagation. + { + unsigned p; + + mln_qiter(W) q(w_win, p); // ?x- + + for (unsigned d = 0; bucket_size != 0; ++d) + { + bucket_t& bucket_d = bucket[d % mod]; + for (unsigned i = 0; i < bucket_d.size(); ++i) + { + p = bucket_d[i]; + + if (dmap.element(p) == max) + { + // Saturation so stop. + bucket_size = bucket_d.size(); // So at end bucket_size == 0. + break; + } + + if (dmap.element(p) < d) + // p has already been processed, having a distance less than d. + continue; + + for_all(q) + { + if (dmap.domain().has(q) && dmap(q) > d) + { + unsigned d_ = d + q.w(); + if (d_ < dmap(q)) + { + dmap(q) = d_; + functor.process_(dmap.element(p), q); // <- process + bucket[d_ % mod].push_back(q); + ++bucket_size; + } + } + } + bucket_size -= bucket_d.size(); + bucket_d.clear(); + } + + trace::exiting("canvas::impl::distance_front_fastest"); + return dmap; + } + } + + + } // of namespace mln::canvas::impl + + + + // Dispatch. + + namespace internal + { + + template <typename I, + typename N, typename W, typename D, + typename F> + inline + mln_ch_value(I, D) + distance_front_dispatch(metal::false_, + const Image& input, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + D max, F& functor) + { + return impl::generic::distance_front(input, nbh, max, w_win, functor); + } + + template <typename I, + typename N, typename W, typename D, + typename F> + inline + mln_ch_value(I, D) + distance_front_dispatch(metal::true_, + const Image& input, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + D max, F& functor) + { + return impl::distance_front_fastest(input, nbh, w_win, max, functor); +// return impl::generic::distance_front(input, nbh, w_win, max, functor); + } + + template <typename I, + typename N, typename W, typename D, + typename F> + inline + mln_ch_value(I, D) + distance_front_dispatch(const Image& input, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + D max, F& functor) + { + enum { + test = mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value + && + mln_is_simple_neighborhood(N)::value + }; + return distance_front_dispatch(metal::bool_<test>(), + input, nbh, w_win, max, functor); + } + + + } // of namespace mln::canvas::internal + + + + // Facade. + + template <typename I, + typename N, typename W, typename D, + typename F> + inline + mln_ch_value(I, D) + distance_front(const Image& input, + const Neighborhood<N>& nbh, const Weighted_Window<W>& w_win, + D max, F& functor) + { + trace::entering("canvas::distance_front"); + + internal::distance_front_tests(input, nbh, w_win, max, functor); + + mln_ch_value(I,D) output; + output = internal::distance_front_dispatch(input, nbh, w_win, max, functor); + + trace::exiting("canvas::distance_front"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::canvas + +} // end of namespace mln + + +#endif // ! MLN_CANVAS_DISTANCE_FRONT_HH

1 0

3474: Cleanup IGR's code.
by Guillaume Lazzara 04 Mar '09

04 Mar '09

* lazzara/igr/irm/irm_seg_with_mm_and_rag.cc: rename as... * lazzara/igr/irm/grad_clo: ... this. * lazzara/igr/irm/wst_rag.cc, * lazzara/igr/registration_3d.cc: make it compile. --- milena/sandbox/ChangeLog | 10 +++++ ...seg_with_mm_and_rag.cc => grad_clo_and_wshd.cc} | 8 ++-- milena/sandbox/lazzara/igr/irm/wst_rag.cc | 37 +++++++++++--------- milena/sandbox/lazzara/igr/registration_3d.cc | 28 ++++++++++----- 4 files changed, 53 insertions(+), 30 deletions(-) rename milena/sandbox/lazzara/igr/irm/{irm_seg_with_mm_and_rag.cc => grad_clo_and_wshd.cc} (89%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index d1fba6c..6d60f7a 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2009-03-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Cleanup IGR's code. + + * lazzara/igr/irm/irm_seg_with_mm_and_rag.cc: rename as... + * lazzara/igr/irm/grad_clo: ... this. + + * lazzara/igr/irm/wst_rag.cc, + * lazzara/igr/registration_3d.cc: make it compile. + 2009-03-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Create small tools for IGR. diff --git a/milena/sandbox/lazzara/igr/irm/irm_seg_with_mm_and_rag.cc b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc similarity index 89% rename from milena/sandbox/lazzara/igr/irm/irm_seg_with_mm_and_rag.cc rename to milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc index 9647986..960d03f 100644 --- a/milena/sandbox/lazzara/igr/irm/irm_seg_with_mm_and_rag.cc +++ b/milena/sandbox/lazzara/igr/irm/grad_clo_and_wshd.cc @@ -22,7 +22,7 @@ #include <mln/convert/to_fun.hh> #include <mln/morpho/gradient.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/fun/l2l/wrap.hh> @@ -64,11 +64,11 @@ int main(int argc, char *argv[]) image2d<int_u8> grad = morpho::gradient(irm, win_c4p()); io::pgm::save(grad, "tmp_grad_c4p.pgm"); -// image2d<int_u8> clo = morpho::closing_area(grad, c4(), atoi(argv[3])); -// io::pgm::save(clo, "tmp_clo_a100.pgm"); + image2d<int_u8> clo = morpho::closing::area(grad, c4(), atoi(argv[3])); + io::pgm::save(clo, "tmp_clo_a100.pgm"); label_16 nbasins; - image2d<label_16> wshed = morpho::meyer_wst(grad, c4(), nbasins); + image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); std::cout << "nbasins = " << nbasins << std::endl; io::pgm::save(level::transform(wshed, fun::l2l::wrap<int_u8>()), diff --git a/milena/sandbox/lazzara/igr/irm/wst_rag.cc b/milena/sandbox/lazzara/igr/irm/wst_rag.cc index b88b8ec..c88b435 100644 --- a/milena/sandbox/lazzara/igr/irm/wst_rag.cc +++ b/milena/sandbox/lazzara/igr/irm/wst_rag.cc @@ -12,7 +12,6 @@ #include <mln/core/alias/dpoint2d.hh> #include <mln/draw/box.hh> #include <mln/level/stretch.hh> -#include <mln/canvas/morpho/algebraic_union_find.hh> #include <mln/fun/v2v/id.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> #include <mln/morpho/elementary/dilation.hh> @@ -20,6 +19,7 @@ #include <mln/extension/adjust_fill.hh> #include <mln/extract/all.hh> #include <mln/make/region_adjacency_graph.hh> +#include <mln/make/graph.hh> // Given a color image and a wshed image, computes the component graph. // Vertex values are computed thanks to a RGB image. @@ -223,20 +223,20 @@ int main(int argc, char *argv[]) I input; io::ppm::load(input, argv[1]); -// image2d<rgb16> input = level::convert(rgb16(), input_); - J vol; - io::dump::load(vol, argv[2]); + J wsd; + io::dump::load(wsd, argv[2]); label_16 nbasins = atoi(argv[3]); std::cout << "nbasins = " << nbasins << std::endl; - util::graph g = make::graph(vol, c4(), nbasins); - - // Compute value distances with a RGB image. - mln_VAR(ima_v, make_vertex_graph_image(g, input, vol, nbasins)); + /// Build graph + util::graph g = make::graph(wsd, c4(), nbasins); + // Build graph images and compute distance values with a RGB image. + mln_VAR(ima_v, make_vertex_graph_image(g, input, wsd, nbasins)); mln_VAR(ima_e, make_edge_graph_image(ima_v, g)); + //DEBUG io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size, literal::white), "wst_rag_graph_image_white.ppm"); @@ -244,6 +244,7 @@ int main(int argc, char *argv[]) "wst_rag_graph_image_black.ppm"); + /// Try to merge vertices. mln_piter_(ima_e_t) e(ima_e.domain()); util::array<label_16> parent(g.v_nmax()); for (unsigned i = 0; i < parent.nelements(); ++i) @@ -272,21 +273,23 @@ int main(int argc, char *argv[]) mln_invariant(f(0) == 0u); --nbasins2; //nbasins2 does not count the basin with label 0. std::cout << "nbasins2 = " << nbasins2 << std::endl; + J wsd2 = level::transform(wsd, f); + - J vol2 = level::transform(vol, f); - util::graph g2 = make::graph(vol2, c4(), nbasins2); - // Compute value distances with a RGB image. - mln_VAR(ima_v2, make_vertex_graph_image(g2, input, vol2, nbasins2)); + /// Reconstruct a graph from the simplified image. + util::graph g2 = make::graph(wsd2, c4(), nbasins2); + // Compute distance values with a RGB image. + mln_VAR(ima_v2, make_vertex_graph_image(g2, input, wsd2, nbasins2)); mln_VAR(ima_e2, make_edge_graph_image(ima_v2, g2)); - mln_VAR(vol2_, - morpho::elementary::dilation(extend(vol2 | (pw::value(vol2) == 0u), - vol2), + mln_VAR(wsd2_, + morpho::elementary::dilation(extend(wsd2 | (pw::value(wsd2) == 0u), + wsd2), c8())); - data::fill((vol2 | (pw::value(vol2) == 0u)).rw(), vol2_); + data::fill((wsd2 | (pw::value(wsd2) == 0u)).rw(), wsd2_); - io::ppm::save(labeling::mean_values(input, vol2, nbasins2), + io::ppm::save(labeling::mean_values(input, wsd2, nbasins2), "wst_rag_mean_colors.ppm"); io::ppm::save(make_debug_graph_image(input, ima_v2, ima_e2, box_size, literal::white), "wst_rag_graph_image2_white.ppm"); diff --git a/milena/sandbox/lazzara/igr/registration_3d.cc b/milena/sandbox/lazzara/igr/registration_3d.cc index f049d88..d144b5c 100644 --- a/milena/sandbox/lazzara/igr/registration_3d.cc +++ b/milena/sandbox/lazzara/igr/registration_3d.cc @@ -16,33 +16,43 @@ int main(int, char *argv[]) arr_t ref; io::cloud::load(ref, argv[2]); + box3d bbox = geom::bbox(ref); + bbox.enlarge(1, bbox.nrows() / 2); + bbox.enlarge(2, bbox.ncols() / 2); + bbox.enlarge(0, bbox.nslis() / 2); + + // Starting registration. util::timer t; t.start(); - typedef fun::x2x::rotation<3u,float> rot_t; typedef fun::x2x::translation<3u,float> trans_t; - fun::x2x::composed<trans_t,rot_t> qk = registration::registration3(in, ref); + fun::x2x::composed<trans_t,rot_t> qk = registration::registration2(bbox, in, ref); std::cout << "igr.cc - Registration - " << t << "s" << std::endl; - box3d bbox = geom::bbox(ref); - bbox.enlarge(1, 50); - bbox.enlarge(2, 50); image3d<value::rgb8> ima_in(bbox); data::fill(ima_in, literal::black); data::fill((ima_in | in).rw(), literal::green); - mln_VAR(ext_ima, extended_with(ima_in, pw::cst(value::rgb8(literal::black)))); + mln_VAR(ext_ima, extend(ima_in, pw::cst(value::rgb8(literal::black)))); mln_VAR(trima, transposed_image(bbox, ext_ima, qk)); + p_array<point3d> arr; + mln_VAR(tmp, (ima_in | in)); + mln_piter_(tmp_t) p(tmp.domain()); + for_all(p) + arr.insert(qk(p)); + std::cout << arr.nsites() << std::endl; + io::cloud::save(arr, "registered.txt"); + image3d<value::rgb8> ima_ref(geom::bbox(ref)); - mln_VAR(ext_ima_ref, extended_with(ima_ref, pw::cst(value::rgb8(literal::black)))); + mln_VAR(ext_ima_ref, extend(ima_ref, pw::cst(value::rgb8(literal::black)))); data::fill(ext_ima_ref, literal::black); data::fill((ext_ima_ref | ref).rw(), literal::white); data::fill((ext_ima_ref | pw::value(trima) == pw::cst(literal::green)).rw(), literal::green); -// io::cloud::save(res, "registered.txt"); +// io::cloud::save(trima, "registered.txt"); - io::ppm::save(debug::slices_2d(ima_ref, 5, 3, literal::black), "registration_3d.ppm"); +// io::ppm::save(debug::slices_2d(ima_ref, 5, 3, literal::black), "registration_3d.ppm"); } -- 1.5.6.5

1 0

3473: Fix compilation issues.
by Guillaume Lazzara 04 Mar '09

04 Mar '09

* mln/canvas/morpho/attribute_filter.hh: move MLN_INCLUDE_ONLY guards. * mln/registration/icp.hh: add missing to_vec(). Fix use of the new closest_point_functor. * mln/transform/internal/closest_point_functor.hh: fix a wrong index propagation. --- milena/ChangeLog | 12 +++ milena/mln/canvas/morpho/attribute_filter.hh | 18 ++++- milena/mln/registration/icp.hh | 80 +++++++++++--------- .../transform/internal/closest_point_functor.hh | 14 +++- 4 files changed, 82 insertions(+), 42 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c1c56a1..7040630 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2009-03-03 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Fix compilation issues. + + * mln/canvas/morpho/attribute_filter.hh: move MLN_INCLUDE_ONLY guards. + + * mln/registration/icp.hh: add missing to_vec(). Fix use of the new + closest_point_functor. + + * mln/transform/internal/closest_point_functor.hh: fix a wrong index + propagation. + 2009-03-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add standard deviation accumulator. diff --git a/milena/mln/canvas/morpho/attribute_filter.hh b/milena/mln/canvas/morpho/attribute_filter.hh index e605f18..298c236 100644 --- a/milena/mln/canvas/morpho/attribute_filter.hh +++ b/milena/mln/canvas/morpho/attribute_filter.hh @@ -47,9 +47,14 @@ # include <mln/data/fill.hh> # include <mln/level/sort_psites.hh> -namespace mln { - namespace canvas { - namespace morpho { +namespace mln +{ + + namespace canvas + { + + namespace morpho + { // Facade Fwd Declaration template <typename I, typename N, typename A> @@ -433,10 +438,10 @@ namespace mln { }; return attribute_filter_dispatch(metal::bool_<test>(), input, nbh, a, lambda, increasing); } + } // end of namespace mln::canvas::morpho::internal -# endif // ! MLN_INCLUDE_ONLY // Facade. @@ -451,8 +456,13 @@ namespace mln { return internal::attribute_filter_dispatch(input, nbh, a, lambda, increasing); } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::canvas::morpho + } // end of namespace mln::canvas + } // end of namespace mln diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index a5ad215..6adc0b3 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -55,7 +55,7 @@ # include <mln/core/alias/neighb3d.hh> -# include <mln/transform/internal/closest_point_functor.hh> +# include <mln/transform/distance_and_closest_point_geodesic.hh> # include <mln/canvas/distance_geodesic.hh> # include <mln/pw/all.hh> @@ -76,6 +76,8 @@ # include <mln/util/timer.hh> +# include <mln/io/cloud/save.hh> + namespace mln { @@ -165,17 +167,15 @@ namespace mln data::fill(model, false); data::fill((model | X).rw(), true); - transform::internal::closest_point_functor<model_t> f(X); - util::timer t; - t.start(); - dmap_X_ = canvas::distance_geodesic(model, c6(), - mln_max(value::int_u16), - f); - std::cout << "distance_geodesic = " << t << "s" << std::endl; + typedef util::couple<mln_ch_value(model_t, value::int_u16), + mln_ch_value(model_t, unsigned)> couple_t; + couple_t cpl = transform::distance_and_closest_point_geodesic(X, box, + c6(), + mln_max(value::int_u16)); - initialize(this->cp_ima_, f.cp_ima); - this->cp_ima_ = f.cp_ima; + dmap_X_ = cpl.first(); + cp_ima_ = cpl.second(); mln_postcondition(cp_ima_.is_valid()); mln_postcondition(cp_ima_.domain().is_valid()); @@ -183,27 +183,27 @@ namespace mln std::cout << "pmax = " << cp_ima_.domain().pmax() << std::endl;; #ifndef NDEBUG -// mln_ch_value(I, bool) debug2(box); -// data::fill(debug2, false); -// mln_ch_value(I, value::rgb8) debug(box); -// mln_piter(p_array) p(X); -// for_all(p) -// { -// debug(p) = debug::internal::random_color(value::rgb8()); -// debug2(p) = true; -// } -// io::pbm::save(slice(debug2,0), "debug2-a.ppm"); -// -// mln_piter(I) pi(cp_ima_.domain()); -// for_all(pi) -// { -// debug(pi) = debug(cp_ima_(pi)); -// debug2(pi) = debug2(cp_ima_(pi)); -// } -// -// io::pbm::save(slice(debug2,0), "debug2-b.ppm"); -// io::ppm::save(slice(debug,0), "debug.ppm"); -// std::cout << "map saved" << std::endl; + mln_ch_value(I, bool) debug2(box); + data::fill(debug2, false); + mln_ch_value(I, value::rgb8) debug(box); + mln_piter(p_array) p(X); + for_all(p) + { + debug(p) = debug::internal::random_color(value::rgb8()); + debug2(p) = true; + } + io::pbm::save(slice(debug2,0), "debug2-a.ppm"); + + mln_piter(I) pi(cp_ima_.domain()); + for_all(pi) + { + debug(pi) = debug(cp_ima_(pi)); + debug2(pi) = debug2(cp_ima_(pi)); + } + + io::pbm::save(slice(debug2,0), "debug2-b.ppm"); + io::ppm::save(slice(debug,0), "debug.ppm"); + std::cout << "map saved" << std::endl; #endif } @@ -278,11 +278,11 @@ namespace mln mln_piter(p_array) p(kept); for_all(p) - ext_result(qR.rotate(p) + qT) = literal::green; + ext_result(qR.rotate(p.to_vec()) + qT) = literal::green; mln_piter(p_array) p2(removed); for_all(p2) - ext_result(qR.rotate(p2) + qT) = literal::red; + ext_result(qR.rotate(p2.to_vec()) + qT) = literal::red; io::ppm::save(slice(ext_result,0), "registered-2.ppm"); } @@ -427,6 +427,16 @@ namespace mln } } + { + std::ostringstream ss2; + ss2 << method << "_" << r << "_removed_sites" << ".cloud"; + io::cloud::save(removed_set, ss2.str()); + } + { + std::ostringstream ss2; + ss2 << method << "_" << r << "_kept_sites" << ".cloud"; + io::cloud::save(tmp, ss2.str()); + } # ifndef NDEBUG std::ostringstream ss2; @@ -458,14 +468,14 @@ namespace mln mln_piter(p_array) p1(P_); for_all(p1) { - vec3d_f Pk_i = pair.first.rotate(p1) + pair.second; + vec3d_f Pk_i = pair.first.rotate(p1.to_vec()) + pair.second; out(Pk_i) = literal::red; } mln_piter(p_array) p2(P_sub); for_all(p2) { - vec3d_f Pk_i = pair.first.rotate(p2) + pair.second; + vec3d_f Pk_i = pair.first.rotate(p2.to_vec()) + pair.second; out(Pk_i) = c; } diff --git a/milena/mln/transform/internal/closest_point_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh index 8df47b7..a1ab93c 100644 --- a/milena/mln/transform/internal/closest_point_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -46,6 +46,11 @@ namespace mln namespace internal { + + /// Functor to be passed to a canvas. + /// Computes an image of closest points. + /// + /// The image values are initialized with \p pset.nsites(). template <typename I> struct closest_point_functor_with_indexes { @@ -72,7 +77,10 @@ namespace mln void process_(unsigned p, unsigned n); }; - + /// Functor to be passed to a canvas. + /// Computes an image of closest points. + /// + /// The image values are initialized with \p literal::origin. template <typename I> struct closest_point_functor_with_sites { @@ -115,11 +123,11 @@ namespace mln closest_point_functor_with_indexes::init(const I& input) { initialize(cp_ima, input); - data::fill(cp_ima, 0u); + data::fill(cp_ima, pset_.nsites()); mln_piter(p_array<mln_psite(I)>) p(pset_); for_all(p) - cp_ima(p) = cp_ima.index_of_point(p); + cp_ima(p) = p.index(); } template <typename I> -- 1.5.6.5

1 0

milena r3472: Add standard deviation accumulator
by Fabien Freling 03 Mar '09

03 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-03-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add standard deviation accumulator. * mln/accu/stat/deviation.hh: New accumulator for standard deviation. --- deviation.hh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) Index: trunk/milena/mln/accu/stat/deviation.hh =================================================================== --- trunk/milena/mln/accu/stat/deviation.hh (revision 0) +++ trunk/milena/mln/accu/stat/deviation.hh (revision 3472) @@ -0,0 +1,188 @@ +// 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_ACCU_STAT_DEVIATION_HH +# define MLN_ACCU_STAT_DEVIATION_HH + +/// \file mln/accu/stat/deviation.hh +/// +/// Define an accumulator that computes a standard deviation. + +# include <mln/accu/internal/base.hh> +# include <mln/accu/count.hh> +# include <mln/accu/sum.hh> +# include <mln/math/sqr.hh> +# include <mln/math/sqrt.hh> + + +namespace mln +{ + + namespace accu + { + + namespace stat + { + + /// Generic standard deviation accumulator class. + /*! + * Parameter \c T is the type of values that we sum. Parameter \c + * S is the type to store the standard deviation; the default type of + * \c S is the summation type (property) of \c T. Parameter \c M + * is the type of the mean value; the default type of \c M is \c + * S. + */ + template <typename T, + typename S = mln_sum(T), + typename M = S> + struct deviation : public mln::accu::internal::base< M , deviation<T,S,M> > + { + typedef T argument; + typedef M result; + + deviation(const T mean); + + /// Manipulators. + /// \{ + void init(); + void take(const argument& t); + void take(const deviation<T,S,M>& other); + /// \} + + /// Get the value of the accumulator. + M to_result() const; + operator M () const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + + accu::count<T> count_; + accu::sum<T,S> sum_; + T mean_; + }; + + + + template <typename I, typename S, typename M> + struct deviation< util::pix, S,M >; + + + namespace meta + { + + /// Meta accumulator for deviation. + struct deviation : public Meta_Accumulator< deviation > + { + template < typename T, + typename S = mln_sum(T), + typename M = S > + struct with + { + typedef accu::stat::deviation<T,S,M> ret; + }; + }; + + } // end of namespace mln::accu::meta + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T, typename S, typename M> + inline + deviation<T,S,M>::deviation(const T mean) + { + init(); + mean_ = mean; + } + + template <typename T, typename S, typename M> + inline + void + deviation<T,S,M>::init() + { + count_.init(); + sum_.init(); + } + + template <typename T, typename S, typename M> + inline + void deviation<T,S,M>::take(const argument& t) + { + count_.take(t); + sum_.take(math::sqr(t - mean_)); + } + + template <typename T, typename S, typename M> + inline + void + deviation<T,S,M>::take(const deviation<T,S,M>& other) + { + // FIXME + count_.take(other.count_); + sum_.take(other.sum_); + } + + template <typename T, typename S, typename M> + inline + M + deviation<T,S,M>::to_result() const + { + unsigned n = count_.to_result(); + if (n == 0u) + return M(); // Safety. + return static_cast<M>(math::sqrt(sum_.to_result() / n)); + } + + template <typename T, typename S, typename M> + inline + deviation<T,S,M>::operator M() const + { + return to_result(); + } + + template <typename T, typename S, typename M> + inline + bool + deviation<T,S,M>::is_valid() const + { + return count_.to_result() != 0; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu::stat + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_STAT_DEVIATION_HH

1 0