February 2009 - Olena-patches

[PATCH 01/19] Remove dead code in mln::internal::site_relative_iterator_base.
by Roland Levillain 03 Feb '09

03 Feb '09

* mln/core/internal/site_relative_iterator_base.hh (mln::internal::site_relative_iterator_base<S,E>::start_) (mln::internal::site_relative_iterator_base<S,E>::next_): Remove dead code. --- milena/ChangeLog | 9 +++++++++ .../core/internal/site_relative_iterator_base.hh | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4a59467..36a9c7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + + Remove dead code in mln::internal::site_relative_iterator_base. + + * mln/core/internal/site_relative_iterator_base.hh + (mln::internal::site_relative_iterator_base<S,E>::start_) + (mln::internal::site_relative_iterator_base<S,E>::next_): + Remove dead code. + 2009-02-03 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate fastest versions of algebraic impl. diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index d186b87..1d2251b 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -159,8 +159,6 @@ namespace mln exact(this)->do_start_(); if (this->is_valid()) p_ = exact(this)->compute_p_(); -// else -// exact(this)->invalidate(); } template <typename S, typename E> @@ -171,8 +169,6 @@ namespace mln exact(this)->do_next_(); if (this->is_valid()) p_ = exact(this)->compute_p_(); -// else -// exact(this)->invalidate(); } template <typename S, typename E> -- 1.6.1.2

1 0

3257: Update Laurent's code.
by Thierry Geraud 03 Feb '09

03 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update Laurent's code. * theo/esiee/laurent/ismm09/main.cc: Augment. * theo/esiee/laurent/ismm09/lca.hh: New. * theo/color/segment.cc: Use 16bit labels. color/segment.cc | 12 - esiee/laurent/ismm09/lca.hh | 173 +++++++++++++++ esiee/laurent/ismm09/main.cc | 489 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 595 insertions(+), 79 deletions(-) Index: theo/esiee/laurent/ismm09/main.cc --- theo/esiee/laurent/ismm09/main.cc (revision 3256) +++ theo/esiee/laurent/ismm09/main.cc (working copy) @@ -174,10 +174,15 @@ return e + (is_row_odd(e) ? down : right); } + + // Function-Object "e -> (l1, l2)". + + struct e_to_labels_t + { template <typename W, typename L> inline void - e_to_labels(const W& w, const point2d& e, L& l1, L& l2) + operator()(const W& w, const point2d& e, L& l1, L& l2) const { mln_precondition(w(e) == 0); l1 = 0; @@ -199,6 +204,7 @@ std::swap(l1, l2); mln_postcondition(l2 >= l1); } + }; } // end of namespace mln::cplx2d @@ -207,21 +213,402 @@ template <typename A, typename L> util::array<L> - sort_by_increasing_attributes(const util::array<A>& a, L n_basins) + sort_by_increasing_attributes(const util::array<A>& a, L l_max) { typedef std::pair<A,L> pair_t; std::vector<pair_t> v; - v.reserve(n_basins); - for (L l = 1; l <= n_basins; ++l) + v.reserve(l_max.next()); + + v.push_back(pair_t(mln_min(A), 0)); // First elt, even after sorting. + for (L l = 1; l <= l_max; ++l) v.push_back(pair_t(a[l], l)); std::sort(v.begin(), v.end()); - util::array<L> l(n_basins); - for (unsigned i = 0; i < n_basins; ++i) - l[i] = v[i].second; + util::array<L> ls(l_max.next()); + for (unsigned i = 1; i <= l_max; ++i) + ls[i] = v[i].second; + + return ls; + } + + + // Find-Root for a region labeled with 'l'. + + template <typename L> + inline + L find_root_l(util::array<L>& lpar, L l) + { + if (lpar[l] == l) return l; + else + return lpar[l] = find_root_l(lpar, lpar[l]); + } + + + + template <typename I> + inline + mln_psite(I) + find_root_e(I& z_epar, mln_psite(I) e) + { + if (z_epar(e) == e) + return e; + else + return z_epar(e) = find_root_e(z_epar, z_epar(e)); + } + + + + // Test emptiness of the queue of a set of regions. + + template <typename Qs, typename L> + bool test_q_emptiness(const Qs& qs, L l, util::array<L>& lpar) + { + L l_ = l; + while (lpar[l_] != l_) + { + if (! qs[l_].is_empty()) + return false; + l_ = lpar[l_]; + } + return true; + } + + + // Get smallest edge. + + template <typename Q_, + typename W, typename L, typename F, + typename E> + void + get_smallest_edge(Q_& q_, // in-out + L l, const W& w, util::array<L>& lpar, const F& e_to_labels, // in + E& e) // out + { + typedef mln_element(Q_) Q; // q_ is an array of queues with type Q. + + // Test that, when a region has merged, its edge queue has been + // emptied. + mln_invariant(test_q_emptiness(q_, l, lpar)); + + L lr = find_root_l(lpar, l); + Q& q = q_[lr]; + + while (! q.is_empty()) + { + e = q.pop_front(); + + L l1, l2; + e_to_labels(w, e, // input + l1, l2); // output + + mln_invariant(l1 != l2); + + L l1r = find_root_l(lpar, l1), + l2r = find_root_l(lpar, l2); + + mln_invariant(l1r == lr || l2r == lr); + + if (l1r == l2r) + // 'e' is an internal edge => forget it. + continue; + + // Otherwise 'e' has been found. + return; + } + + mln_invariant(0); // We should not be here! + } + + + + + // ################################################################### + // ################################################################### + // ################################################################### + // ################################################################### + // ################################################################### + + + + template <typename W, + typename G, + typename L, typename A, + typename F> + void + compute_pseudo_tree(const W& w, + const G& g, + const util::array<L>& ls, + const A& a, + const F& e_to_labels) + { + + typedef mln_value(G) T; // <--- Type of edge values. + typedef mln_psite(G) E; // <--- Type of edges. + + const L l_max = ls.nelements() - 1; + + mln_VAR( g_line, g | (pw::value(w) == 0) ); + + + // Edges -> Priority queue. + + typedef p_priority< T, p_queue<E> > Q; + util::array<Q> q(l_max.next()); + + { + L l1, l2; + + mln_piter(g_line_t) e(g_line.domain()); + for_all(e) + { + mln_invariant(w(e) == 0); + e_to_labels(w, e, // input + l1, l2); // output + q[l1].push(mln_max(T) - g(e), e); + q[l2].push(mln_max(T) - g(e), e); + } + } + + + + // Initialization. + // ----------------------------------- + + + + // Information "label l -> edge e". + + E null = E(0,0); // Impossible value. FIXME: lack of genericity. + + + util::array<E> edge(l_max.next()); + for (L l = 0; l <= l_max; ++l) + edge[l] = null; + + + util::array<L> lpar(l_max.next()); + for (L l = 0; l <= l_max; ++l) + lpar[l] = l; // Make-Set. + + + // To know if an edge is out of a given region (label l), we + // maintain the information about region merging using an + // union-find structure named "lpar". + // + // In the following "lpar[l]" is shortly denoted by lr, meaning + // l-root. + + + // Given a region R with label l and an edge e = (l1, l2) from the + // priority queue, we get know if that edge is out of the set of + // regions containing l: we shall have l1r = lr or l2r = lr. + + // Please note that an edge (l1, l2) is internal to a set of + // regions if l1r = l2r. + + + + + mln_ch_value(g_line_t, E) + epar, // Edge forest. + z_epar; // Auxiliary data: edge forest with compression and balancing. + + { + initialize(epar, g_line); + initialize(z_epar, g_line); + mln_piter(g_line_t) e(g_line.domain()); + for_all(e) + { + // Make-Set. + epar(e) = e; + z_epar(e) = e; + } + debug::println("epar (init):", epar); // epar(e) == e so we depict the edges! + } + + + + // GO GO GO !!! + + + for (unsigned i = 1; i < l_max; ++i) + { + L l = ls[i]; // Region label. + E e; + get_smallest_edge(q, // in-out + l, w, lpar, e_to_labels, // in + e); // out + // FIXME: the call below is performed above!!! + L l1, l2; + e_to_labels(w, e, l1, l2); + + L l1r = find_root_l(lpar, l1), + l2r = find_root_l(lpar, l2); + + // Consistency tests. + { + if (i > 1) + { + L former_l = ls[i-1]; + mln_invariant(a[l] >= a[former_l]); + } + mln_invariant(epar(e) == e); // 'e' has not been processed yet. + mln_invariant(l1 != l2); // It is a valid edge, i.e., between 2 different regions... + mln_invariant(l1r != l2r); // ...that are not already merged. + + L lr = find_root_l(lpar, l); + mln_invariant(lr == l // Either l is not deja-vu + || ((lr == l1r && lr != l2r) || // or l belongs to l1r xor l2r. + (lr == l2r && lr != l1r))); + } + + + + // aa(e) = a[l]; // FIXME: Re-activate. + + + + /* + std::cout << "l = " << l + << " e = " << e + << " (l1, l2) = (" << l1 << ", " << l2 << ") => " + << " merging R" << l1r << " and R" << l2r + << std::endl; + */ + + + // Merging both regions. + { + if (l2r < l1r) + std::swap(l1r, l2r); + mln_invariant(l2r > l1r); + lpar[l1r] = l2r; + + /* + std::cout << "q[l1r] = " << q[l1r] << std::endl; + std::cout << "q[l2r] = " << q[l2r] << std::endl; + */ + + + q[l2r].insert(q[l1r]); + q[l1r].clear(); + + + /* + std::cout << "q[l2r] = " << q[l2r] << std::endl + << std::endl; + */ + + + /* + // Displaying lpar. + { + std::cout << "lpar = "; + for (unsigned i = 1; i <= l_max; ++i) + { + L l = v[i].second; + std::cout << l << "->" << lpar[l] << " "; + } + std::cout << std::endl; + } + */ + } + + E e1 = edge[l1], + e2 = edge[l2]; + + if (e1 == null && e2 == null) + { + // New edge-component (singleton) + // Put differently: new edge-node! + edge[l1] = e; + edge[l2] = e; + // after: + // e + // / \ + // l1 l2 + } + else if (e1 != null && e2 != null) + { + // Two trees shall merge. + E e1r = find_root_e(z_epar, e1), + e2r = find_root_e(z_epar, e2); + mln_invariant(e1r != e2r); // Otherwise, there's a bug! + // before: + // e1r e2r + // |... |... + // e1 e2 + // / \ / \ + // l1 . l2 . + epar(e1r) = e; z_epar(e1r) = e; + epar(e2r) = e; z_epar(e2r) = e; + // after: + // e + // / \ + // e1r e2r + // |... |... + // e1 e2 + // / \ / \ + // l1 . l2 . + } + else if (e1 != null && e2 == null) + { + E e1r = find_root_e(z_epar, e1); + // before: + // e1r + // |... + // e1 null + // / \ / + // l1 . l2 + epar(e1r) = e; z_epar(e1r) = e; + edge[l2] = e; + // after: + // e + // / \ + // e1r l2 + // |... + // e1 + // / \ + // l1 . + } + else + { + mln_invariant(e1 == null && e2 != null); + E e2r = find_root_e(z_epar, e2); + epar(e2r) = e; z_epar(e2r) = e; + edge[l1] = e; + } + + } // end of "for every region with increasing attribute" + + + { + // Display edge tree. + + mln_ch_value(g_line_t, bool) deja_vu; + initialize(deja_vu, g_line); + data::fill(deja_vu, false); + + std::cout << "edge tree: " << std::endl; + for (L l = 1; l <= l_max; ++l) + { + std::cout << l << ": "; + E e = edge[l]; + while (! deja_vu(e)) + { + std::cout << e << " -> "; + deja_vu(e) = true; + e = epar(e); + } + std::cout << e << std::endl; + } + } + + + } @@ -232,9 +619,8 @@ void usage(char* argv[]) { - std::cerr << "usage: " << argv[0] << " input.pgm echo output.pgm" << std::endl; - std::cerr << "Laurent ISMM 2009 scheme with saliency map as output." << std::endl; - std::cerr << " echo = 0 or 1." << std::endl; + std::cerr << "usage: " << argv[0] << " input.pgm" << std::endl; + std::cerr << "Laurent ISMM 2009 scheme." << std::endl; abort(); } @@ -247,7 +633,7 @@ using value::int_u8; using value::label_16; - if (argc != 4) + if (argc != 2) usage(argv); // f: regular image. @@ -256,6 +642,8 @@ io::pgm::load(f, argv[1]); + cplx2d::e_to_labels_t e_to_labels; + // g: weights on edges. mln_VAR(g, cplx2d::f_to_g(f) ); @@ -271,8 +659,8 @@ // w: watershed labeling on edges. typedef label_16 L; // <--- Type of labels. - L n_basins; - mln_VAR( w, morpho::meyer_wst(g, nbh_g, n_basins) ); + L l_max; + mln_VAR( w, morpho::meyer_wst(g, nbh_g, l_max) ); debug::println("w:", w); @@ -299,17 +687,17 @@ util::array<A> a = labeling::compute(accu::meta::count(), g, // image of values w, // image of labels - n_basins); + l_max); + + util::array<L> ls = sort_by_increasing_attributes(a, l_max); - util::array<L> l = sort_by_increasing_attributes(a, n_basins); { - /* - std::cout << "l:" << std::endl; - for (unsigned i = 0; i < l.nelements(); ++i) - std::cout << l[i] << "(" << a[l[i]] << ") "; - std::cout << std::endl; - */ + std::cout << "ls:" << std::endl; + for (unsigned i = 1; i <= l_max; ++i) + std::cout << ls[i] << "(" << a[ls[i]] << ") "; + std::cout << std::endl + << std::endl; } @@ -320,66 +708,13 @@ // for_all(e) // if (w(e) == 0) // { -// cplx2d::e_to_labels(w, e, l1, l2); + // e_to_labels(w, e, l1, l2); // std::cout << e << ':' << l1 << ',' << l2 << std::endl; // } // } - - // Edges -> Priority queue. - - typedef p_priority< T, p_queue<E> > Q; - util::array<Q> q(n_basins.next()); - - { - L l1, l2; - mln_piter_(g_t) e(g.domain()); - for_all(e) - if (w(e) == 0) - { - cplx2d::e_to_labels(w, e, // input - l1, l2); // output - q[l1].push(mln_max(T) - g(e), e); - q[l2].push(mln_max(T) - g(e), e); - } - } - - - // Information "label l -> edge e". - - E null = E(0,0); // Impossible value. - - util::array<E> edge(n_basins.next()); - for (L l = 0; l <= n_basins; ++l) - edge[l] = null; - - - // Initialization. - - util::array<L> lpar(n_basins.next()); - for (L l = 0; l <= n_basins; ++l) - lpar[l] = l; // Make-Set. - - - - mln_ch_value_(g_line_t, E) - epar, // Edge forest. - z_epar; // Auxiliary data: edge forest with compression and balancing. - - { - initialize(epar, g_line); - initialize(z_epar, g_line); - mln_piter_(g_line_t) e(g_line.domain()); - for_all(e) - { - // Make-Set. - epar(e) = e; - z_epar(e) = e; - } - debug::println("all edges:", epar); // epar(e) == e so we depict the edges! - } - - + compute_pseudo_tree(w, g, ls, a, + e_to_labels); } Index: theo/esiee/laurent/ismm09/lca.hh --- theo/esiee/laurent/ismm09/lca.hh (revision 0) +++ theo/esiee/laurent/ismm09/lca.hh (revision 0) @@ -0,0 +1,173 @@ + +namespace mln +{ + + + // From parent image to children image. + + template <typename I, typename E, typename L> + mln_ch_value(I, std::vector<mln_psite(I)>) + compute_children(const I& epar, const std::vector<E>& edge, L l_max, std::vector<E>& roots) + { + typedef std::vector<mln_psite(I)> C; // Children. + mln_ch_value(I,C) chl; + initialize(chl, epar); + + mln_ch_value(I,bool) deja_vu; + initialize(deja_vu, epar); + data::fill(deja_vu, false); + + for (L l = 1; l <= l_max; ++l) + { + E e = edge[l]; + while (deja_vu(e) == false) + { + deja_vu(e) = true; + if (epar(e) != e) + { + chl(epar(e)).push_back(e); + e = epar(e); + } + else + roots.push_back(e); + } + } + + return chl; + } + + + /// Compute an LCA + /// Reference article: The LCA Problem Revisited, M. A. Bender and M. + /// Farach-Colton, May 2000 + /// + /// See also Topological Watershed, Alexandre Abraham, LRDE CSI report + /// 0821, June 2008 + /// + template <typename L, typename I, typename E> + class lca_t + { + + public: + + /// Constructor + lca_t(const L& l_max_, + const I& edge_children, + const std::vector<E>& roots) + { + unsigned l_max = l_max_.next(); + euler_tour_edge_.resize(2 * l_max + 1); + euler_tour_depth_.resize(2 * l_max + 1); + initialize (euler_position_, edge_children); + + // BUILD EULER TOUR + std::stack<E> to_treat; + for (unsigned i = 0; i < roots.size(); ++i) + to_treat.push(roots[i]); + + unsigned euler_edge = 0; + mln_ch_value(I, bool) deja_vu; + initialize(deja_vu, edge_children); + data::fill(deja_vu, false); + + while (!to_treat.empty()) + { + E e = to_treat.top(); + to_treat.pop(); + + euler_tour_edge_[euler_edge] = e; + if (deja_vu(e)) + euler_tour_depth_[euler_edge] = euler_tour_depth_[euler_edge - 1] - 1; + else + euler_tour_depth_[euler_edge] = euler_tour_depth_[euler_edge - 1] + 1; + + if (!deja_vu(e)) + { + for (int j = edge_children(e).size() - 1; j >= 0; --j) + { + to_treat.push(e); + to_treat.push(edge_children(e)[j]); + } + deja_vu(e) = true; + euler_position_(e) = euler_edge; + } + + ++euler_edge; + } + + // BUILD MINIMAS + int size = 2 * l_max - 1; + int logn = (int)(ceil(log((double)(size))/log(2.0))); + + minim_ = new int [logn * size]; // FIXME : Think about freeing this + Minim_ = new int* [logn]; + + Minim_[0] = minim_; + + // Init + for (unsigned i = 0; i < size - 1; ++i) + if (euler_tour_depth_[i] < euler_tour_depth_[i+1]) + { + Minim_[0][i] = i; + } else { + Minim_[0][i] = i+1; + } + + int k; + for (int j = 1; j < logn; j++) + { + k = 1 << (j - 1); + Minim_[j] = &minim_[j * size]; + for (int i = 0; i < size; i++) + { + if ((i + (k << 1)) < size) + { + if (euler_tour_depth_[Minim_[j - 1][i]] <= euler_tour_depth_[Minim_[j - 1][i + k]]) + Minim_[j][i] = Minim_[j - 1][i]; + else + Minim_[j][i] = Minim_[j - 1][i + k]; + } + } + } + } + + + /// Destructor + ~lca_t() + { + delete[] Minim_; + delete[] minim_; + } + + + const E& operator() (const E& a, const E& b) + { + if (a == b) + return a; + + int m = euler_position_(a), + n = euler_position_(b), + k; + + if (m > n) + std::swap(m, n); + + k = (int)(log((double)(n - m))/log(2.)); + + if (euler_tour_depth_[Minim_[k][m]] + < euler_tour_depth_[Minim_[k][n - (1 << k)]]) + return euler_tour_edge_[Minim_[k][m]]; + else + return euler_tour_edge_[Minim_[k][n - (1 << k)]]; + } + + private: + int *minim_; + int **Minim_; + std::vector<E> euler_tour_edge_; + std::vector<unsigned> euler_tour_depth_; + mln_ch_value(I, unsigned) euler_position_; + }; + + +} // mln Index: theo/color/segment.cc --- theo/color/segment.cc (revision 3256) +++ theo/color/segment.cc (working copy) @@ -227,6 +227,13 @@ } + value::int_u8 L_to_int_u8(unsigned l) + { + return l == 0 ? + 0 : // wshed line + 1 + (l - 1) % 255; // basin + } + } // mln @@ -297,7 +304,7 @@ // Watershed transform. - typedef value::label_8 L; + typedef value::label_16 L; L nbasins; mln_ch_value_(f_t, L) w = morpho::meyer_wst(g, e2e(), nbasins); @@ -330,7 +337,8 @@ w_all); } - io::pgm::save(w_all, "temp_w_all.pgm"); + io::pgm::save( level::transform(w_all, convert::to_fun(L_to_int_u8)), + "temp_w_all.pgm" ); }

1 0

3255: De-activate fastest versions of algebraic impl.
by Thierry Geraud 03 Feb '09

03 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate fastest versions of algebraic impl. * mln/morpho/closing_attribute.hh: De-activate fastest version. * mln/canvas/morpho/algebraic_union_find.hh: Likewise. * mln/morpho/elementary/gradient.hh (p_out): Fix type. canvas/morpho/algebraic_union_find.hh | 8 ++++++-- morpho/closing_attribute.hh | 6 +++++- morpho/elementary/gradient.hh | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) Index: mln/morpho/elementary/gradient.hh --- mln/morpho/elementary/gradient.hh (revision 3254) +++ mln/morpho/elementary/gradient.hh (working copy) @@ -160,11 +160,12 @@ accu::min_max<mln_value(I)> a; extension::adjust_duplicate(input, nbh); - mln_concrete(I) output; + typedef mln_concrete(I) O; + O output; initialize(output, input); mln_pixter(const I) p_in(input); - mln_pixter(I) p_out(output); + mln_pixter(O) p_out(output); mln_nixter(const I, N) n(p_in, nbh); for_all_2(p_in, p_out) { Index: mln/morpho/closing_attribute.hh --- mln/morpho/closing_attribute.hh (revision 3254) +++ mln/morpho/closing_attribute.hh (working copy) @@ -36,6 +36,9 @@ /// \todo How to pass dynamic data (e.g., k of accu::rank) to the routine? /// /// \todo Add extension::adjust_fill. +/// +/// \todo Re-activate the fastest version when accumulators are +/// cleaned-up. # include <mln/morpho/includes.hh> # include <mln/canvas/morpho/algebraic_union_find.hh> @@ -223,7 +226,8 @@ const Image& input, const Neighborhood<N>& nbh, mln_result(A) lambda) { - return impl::closing_attribute_fastest<A>(input, nbh, lambda); + return impl::generic::closing_attribute<A>(input, nbh, lambda); +// return impl::closing_attribute_fastest<A>(input, nbh, lambda); } template <typename A, typename I, typename N> Index: mln/canvas/morpho/algebraic_union_find.hh --- mln/canvas/morpho/algebraic_union_find.hh (revision 3254) +++ mln/canvas/morpho/algebraic_union_find.hh (working copy) @@ -31,7 +31,10 @@ /// \file mln/canvas/morpho/algebraic_union_find.hh /// -/// FIXME: Doc! +/// \todo: Doc! +/// +/// \todo Re-activate the fastest version when accumulators are +/// cleaned-up. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -352,7 +355,8 @@ const Neighborhood<N>& nbh, F& f) { - return impl::algebraic_union_find_fastest(input, nbh, f); + return impl::generic::algebraic_union_find(input, nbh, f); +// return impl::algebraic_union_find_fastest(input, nbh, f); } template <typename I, typename N, typename F>

1 0

3254: Rename io::raw as io::dump in sandbox.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* sandbox/theo/igr/irm_anat_segm.cc, * sandbox/theo/igr/pgms2raw.cc, * sandbox/theo/igr/raw2pgm.cc: rename here. --- milena/sandbox/ChangeLog | 8 ++++++++ milena/sandbox/theo/igr/irm_anat_segm.cc | 4 ++-- milena/sandbox/theo/igr/pgms2raw.cc | 2 +- milena/sandbox/theo/igr/raw2pgm.cc | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index b10e391..aa7979b 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename io::raw as io::dump in sandbox. + + * sandbox/theo/igr/irm_anat_segm.cc, + * sandbox/theo/igr/pgms2raw.cc, + * sandbox/theo/igr/raw2pgm.cc: rename here. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update igr's code. * lazzara/igr.cc: make use of registration::icp. diff --git a/milena/sandbox/theo/igr/irm_anat_segm.cc b/milena/sandbox/theo/igr/irm_anat_segm.cc index 47bb962..8816a7f 100644 --- a/milena/sandbox/theo/igr/irm_anat_segm.cc +++ b/milena/sandbox/theo/igr/irm_anat_segm.cc @@ -36,7 +36,7 @@ int main(int argc, char* argv[]) trace::quiet = false; image3d<int_u8> vol, grad, clo; - io::raw::load(vol, argv[1]); + io::dump::load(vol, argv[1]); grad = morpho::elementary::gradient(vol, c6()); clo = morpho::closing_volume(grad, c6(), 666); @@ -58,5 +58,5 @@ int main(int argc, char* argv[]) convert::from_to(a, f); image3d<int_u8> out = level::transform(wst, f); - io::raw::save(out, argv[2]); + io::dump::save(out, argv[2]); } diff --git a/milena/sandbox/theo/igr/pgms2raw.cc b/milena/sandbox/theo/igr/pgms2raw.cc index 406feaf..444ecd7 100644 --- a/milena/sandbox/theo/igr/pgms2raw.cc +++ b/milena/sandbox/theo/igr/pgms2raw.cc @@ -34,5 +34,5 @@ int main(int argc, char* argv[]) arr.append(ima); } image3d<int_u8> vol = make::image3d(arr); - io::raw::save(vol, argv[1]); + io::save(vol, argv[1]); } diff --git a/milena/sandbox/theo/igr/raw2pgm.cc b/milena/sandbox/theo/igr/raw2pgm.cc index 90105d6..d654ffd 100644 --- a/milena/sandbox/theo/igr/raw2pgm.cc +++ b/milena/sandbox/theo/igr/raw2pgm.cc @@ -26,7 +26,7 @@ int main(int argc, char* argv[]) usage(argv); image3d<int_u8> vol; - io::raw::load(vol, argv[1]); + io::dump::load(vol, argv[1]); int_u8 bg = 0; image2d<int_u8> ima = debug::slices_2d(vol, 1.f, bg); -- 1.5.6.5

1 0

3253: Rename io::raw as io::dump.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* headers.mk: update distributed headers. * tests/unit_test/mln_io_raw_all.cc, * tests/unit_test/mln_io_raw_load.cc, * tests/unit_test/mln_io_raw_save.cc, * tests/io/raw/raw.cc, * tests/io/raw/Makefile.am, * tests/io/raw/pbm.cc, * mln/io/raw/all.hh, * mln/io/raw/load.hh, * mln/io/raw/save.hh: move to... * tests/unit_test/mln_io_dump_all, * tests/unit_test/mln_io_dump_load, * tests/unit_test/mln_io_dump_save, * tests/io/dump/Makefile.am, * tests/io/dump/dump.cc, * mln/io/dump/all.hh, * mln/io/dump/load.hh, * mln/io/dump/save.hh: ... here. * mln/io/all.hh * mln/io/essential.hh: update includes. * tests/unit_test/Makefile.am: update unit test list. --- milena/ChangeLog | 30 ++++++++++ milena/headers.mk | 6 +- milena/mln/io/all.hh | 1 + milena/mln/io/{raw => dump}/all.hh | 18 +++--- milena/mln/io/{raw => dump}/load.hh | 18 +++--- milena/mln/io/{raw => dump}/save.hh | 18 +++--- milena/mln/io/essential.hh | 14 ++--- milena/tests/io/{raw => dump}/Makefile.am | 4 +- milena/tests/io/{raw/raw.cc => dump/dump.cc} | 20 +++--- milena/tests/io/raw/pbm.cc | 62 -------------------- milena/tests/unit_test/Makefile.am | 12 ++-- .../{mln_io_raw_all.cc => mln_io_dump_all.cc} | 6 +- .../{mln_io_raw_load.cc => mln_io_dump_load.cc} | 6 +- .../{mln_io_raw_save.cc => mln_io_dump_save.cc} | 6 +- 14 files changed, 93 insertions(+), 128 deletions(-) rename milena/mln/io/{raw => dump}/all.hh (82%) rename milena/mln/io/{raw => dump}/load.hh (91%) rename milena/mln/io/{raw => dump}/save.hh (90%) rename milena/tests/io/{raw => dump}/Makefile.am (84%) rename milena/tests/io/{raw/raw.cc => dump/dump.cc} (87%) delete mode 100644 milena/tests/io/raw/pbm.cc rename milena/tests/unit_test/{mln_io_raw_all.cc => mln_io_dump_all.cc} (60%) rename milena/tests/unit_test/{mln_io_raw_load.cc => mln_io_dump_load.cc} (60%) rename milena/tests/unit_test/{mln_io_raw_save.cc => mln_io_dump_save.cc} (60%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5669206..dd76502 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename io::raw as io::dump. + + * headers.mk: update distributed headers. + + * tests/unit_test/mln_io_raw_all.cc, + * tests/unit_test/mln_io_raw_load.cc, + * tests/unit_test/mln_io_raw_save.cc, + * tests/io/raw/raw.cc, + * tests/io/raw/Makefile.am, + * tests/io/raw/pbm.cc, + * mln/io/raw/all.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh: move to... + + * tests/unit_test/mln_io_dump_all, + * tests/unit_test/mln_io_dump_load, + * tests/unit_test/mln_io_dump_save, + * tests/io/dump/Makefile.am, + * tests/io/dump/dump.cc, + * mln/io/dump/all.hh, + * mln/io/dump/load.hh, + * mln/io/dump/save.hh: ... here. + + * mln/io/all.hh + * mln/io/essential.hh: update includes. + + * tests/unit_test/Makefile.am: update unit test list. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update new version of ICP. * mln/registration/icp2.hh: Make it work and make it more generic. diff --git a/milena/headers.mk b/milena/headers.mk index 48ce0e0..26b1b7e 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -997,13 +997,13 @@ mln/io/ppm/save.hh \ mln/io/pfm/load.hh \ mln/io/pfm/all.hh \ mln/io/pfm/save.hh \ -mln/io/raw/load.hh \ -mln/io/raw/all.hh \ -mln/io/raw/save.hh \ mln/io/cloud/load.hh \ mln/io/cloud/all.hh \ mln/io/cloud/save.hh \ mln/io/all.hh \ +mln/io/dump/load.hh \ +mln/io/dump/all.hh \ +mln/io/dump/save.hh \ mln/io/pbm/load.hh \ mln/io/pbm/all.hh \ mln/io/pbm/save.hh \ diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 777ffb7..da9ddb8 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -47,6 +47,7 @@ namespace mln } # include <mln/io/cloud/all.hh> +# include <mln/io/dump/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> diff --git a/milena/mln/io/raw/all.hh b/milena/mln/io/dump/all.hh similarity index 82% rename from milena/mln/io/raw/all.hh rename to milena/mln/io/dump/all.hh index 32d34d7..97fc972 100644 --- a/milena/mln/io/raw/all.hh +++ b/milena/mln/io/dump/all.hh @@ -25,12 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_RAW_ALL_HH -# define MLN_IO_RAW_ALL_HH +#ifndef MLN_IO_DUMP_ALL_HH +# define MLN_IO_DUMP_ALL_HH -/// \file mln/io/raw/all.hh +/// \file mln/io/dump/all.hh /// -/// File that includes all raw io materials. +/// File that includes all dump io materials. namespace mln @@ -38,13 +38,13 @@ namespace mln namespace io { - /// Namespace of raw input/output handling. - namespace raw {} + /// Namespace of dump input/output handling. + namespace dump {} } } -# include <mln/io/raw/load.hh> -# include <mln/io/raw/save.hh> +# include <mln/io/dump/load.hh> +# include <mln/io/dump/save.hh> -#endif // ! MLN_IO_RAW_ALL_HH +#endif // ! MLN_IO_DUMP_ALL_HH diff --git a/milena/mln/io/raw/load.hh b/milena/mln/io/dump/load.hh similarity index 91% rename from milena/mln/io/raw/load.hh rename to milena/mln/io/dump/load.hh index eb1d789..7bbce9e 100644 --- a/milena/mln/io/raw/load.hh +++ b/milena/mln/io/dump/load.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_RAW_LOAD_HH -# define MLN_IO_RAW_LOAD_HH +#ifndef MLN_IO_DUMP_LOAD_HH +# define MLN_IO_DUMP_LOAD_HH -/// \file mln/io/raw/load.hh +/// \file mln/io/dump/load.hh /// /// Load a Milena image dumped into a file. @@ -47,7 +47,7 @@ namespace mln namespace io { - namespace raw + namespace dump { /// Load a Milena image by dumped into a file. @@ -110,14 +110,14 @@ namespace mln } - } // end of namespace mln::io::raw::internal + } // end of namespace mln::io::dump::internal template <typename I> void load(Image& ima, const std::string& filename) { - trace::entering("mln::io::raw::load"); + trace::entering("mln::io::dump::load"); std::ifstream file(filename.c_str()); if (! file) @@ -129,16 +129,16 @@ namespace mln internal::load_header(ima, file); internal::load_data(ima, file); - trace::exiting("mln::io::raw::load"); + trace::exiting("mln::io::dump::load"); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::raw + } // end of namespace mln::io::dump } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_RAW_LOAD_HH +#endif // ! MLN_IO_DUMP_LOAD_HH diff --git a/milena/mln/io/raw/save.hh b/milena/mln/io/dump/save.hh similarity index 90% rename from milena/mln/io/raw/save.hh rename to milena/mln/io/dump/save.hh index 06c1f7d..a489a20 100644 --- a/milena/mln/io/raw/save.hh +++ b/milena/mln/io/dump/save.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_RAW_SAVE_HH -# define MLN_IO_RAW_SAVE_HH +#ifndef MLN_IO_DUMP_SAVE_HH +# define MLN_IO_DUMP_SAVE_HH -/// \file mln/io/raw/save.hh +/// \file mln/io/dump/save.hh /// /// Save a Milena image by dumping its data to a file. /// \todo handle endianness. @@ -47,7 +47,7 @@ namespace mln namespace io { - namespace raw + namespace dump { /// Save a Milena image by dumping its data to a file. @@ -94,13 +94,13 @@ namespace mln } } - } // end of namespace mln::io::raw::internal + } // end of namespace mln::io::dump::internal template <typename I> void save(const Image& ima_, const std::string& filename) { - trace::entering("mln::io::raw::save"); + trace::entering("mln::io::dump::save"); const I& ima = exact(ima_); @@ -114,16 +114,16 @@ namespace mln internal::save_header(ima, file); internal::save_data(ima, file); - trace::exiting("mln::io::raw::save"); + trace::exiting("mln::io::dump::save"); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::raw + } // end of namespace mln::io::dump } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_RAW_SAVE_HH +#endif // ! MLN_IO_DUMP_SAVE_HH diff --git a/milena/mln/io/essential.hh b/milena/mln/io/essential.hh index d55f114..2b5199e 100644 --- a/milena/mln/io/essential.hh +++ b/milena/mln/io/essential.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// 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 @@ -28,18 +29,13 @@ #ifndef MLN_IO_ESSENTIAL_HH_ # define MLN_IO_ESSENTIAL_HH_ -/*! \file mln/io/essential.hh - * - * \brief File that includes the most useful io routines. - * - */ +/// \file mln/io/essential.hh +/// +/// File that includes the most useful io routines. # include <mln/io/pbm/all.hh> -# include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> -# include <mln/io/pnm/all.hh> # include <mln/io/ppm/all.hh> -# include <mln/io/txt/all.hh> #endif // !MLN_IO_ESSENTIAL_HH_ diff --git a/milena/tests/io/raw/Makefile.am b/milena/tests/io/dump/Makefile.am similarity index 84% rename from milena/tests/io/raw/Makefile.am rename to milena/tests/io/dump/Makefile.am index 2d3d1c0..36be121 100644 --- a/milena/tests/io/raw/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -3,8 +3,8 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - raw + dump -raw_SOURCES = raw.cc +dump_SOURCES = dump.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/raw/raw.cc b/milena/tests/io/dump/dump.cc similarity index 87% rename from milena/tests/io/raw/raw.cc rename to milena/tests/io/dump/dump.cc index 193b125..6099bc9 100644 --- a/milena/tests/io/raw/raw.cc +++ b/milena/tests/io/dump/dump.cc @@ -25,13 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/io/raw/raw.cc +/// \file tests/io/dump/dump.cc /// -/// Test on mln::io::raw::*. +/// Test on mln::io::dump::*. #include <mln/core/image/image2d.hh> -#include <mln/io/raw/load.hh> -#include <mln/io/raw/save.hh> +#include <mln/io/dump/load.hh> +#include <mln/io/dump/save.hh> #include <mln/level/compare.hh> @@ -52,10 +52,10 @@ int main() 1, 0 }; image2d<bool> pic = make::image2d(data); - io::raw::save(pic, "pic.raw"); + io::dump::save(pic, "pic.dump"); image2d<bool> pic2; - io::raw::load(pic2, "pic.raw"); + io::dump::load(pic2, "pic.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -66,10 +66,10 @@ int main() value::int_u8 data[4] = { 5, 1, 1, 9 }; image2d<value::int_u8> pic = make::image2d(data); - io::raw::save(pic, "pic.raw"); + io::dump::save(pic, "pic.dump"); image2d<value::int_u8> pic2; - io::raw::load(pic2, "pic.raw"); + io::dump::load(pic2, "pic.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -81,10 +81,10 @@ int main() value::rgb8 data[4] = { rgb8(2,4,5), rgb8(1,23,255), rgb8(64,41,150), rgb8(23,53,49) }; image2d<value::rgb8> pic = make::image2d(data); - io::raw::save(pic, "pic.raw"); + io::dump::save(pic, "pic.dump"); image2d<value::rgb8> pic2; - io::raw::load(pic2, "pic.raw"); + io::dump::load(pic2, "pic.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); diff --git a/milena/tests/io/raw/pbm.cc b/milena/tests/io/raw/pbm.cc deleted file mode 100644 index 3ccc040..0000000 --- a/milena/tests/io/raw/pbm.cc +++ /dev/null @@ -1,62 +0,0 @@ -// 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. - -/// \file tests/io/raw/raw.cc -/// -/// Test on mln::io::raw::. - -#include <mln/core/image/image2d.hh> -#include <mln/io/pbm/load.hh> -#include <mln/io/raw/load.hh> -#include <mln/io/raw/save.hh> - -#include <mln/level/compare.hh> - -#include "tests/data.hh" - - -int main() -{ - using namespace mln; - - image2d<bool> pic = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); - io::raw::save(pic, "pic.raw"); -// image2d<bool> pic2 = io::raw::load("pic.raw"); - -// mln_assertion(pic == pic2); -} - - -// sample binary image to test with xv, imview, and display -// to bring into the fore the binary image bug with raw raw. - -// | | | | - -// | | - - - -// | - - - - -// - - - - - -// - - - - - -// - - - - - diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 8c4e274..46e968c 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -963,13 +963,13 @@ mln_io_ppm_save \ mln_io_pfm_load \ mln_io_pfm_all \ mln_io_pfm_save \ -mln_io_raw_load \ -mln_io_raw_all \ -mln_io_raw_save \ mln_io_cloud_load \ mln_io_cloud_all \ mln_io_cloud_save \ mln_io_all \ +mln_io_dump_load \ +mln_io_dump_all \ +mln_io_dump_save \ mln_io_pbm_load \ mln_io_pbm_all \ mln_io_pbm_save \ @@ -2005,13 +2005,13 @@ mln_io_ppm_save_SOURCES = mln_io_ppm_save.cc mln_io_pfm_load_SOURCES = mln_io_pfm_load.cc mln_io_pfm_all_SOURCES = mln_io_pfm_all.cc mln_io_pfm_save_SOURCES = mln_io_pfm_save.cc -mln_io_raw_load_SOURCES = mln_io_raw_load.cc -mln_io_raw_all_SOURCES = mln_io_raw_all.cc -mln_io_raw_save_SOURCES = mln_io_raw_save.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc mln_io_all_SOURCES = mln_io_all.cc +mln_io_dump_load_SOURCES = mln_io_dump_load.cc +mln_io_dump_all_SOURCES = mln_io_dump_all.cc +mln_io_dump_save_SOURCES = mln_io_dump_save.cc mln_io_pbm_load_SOURCES = mln_io_pbm_load.cc mln_io_pbm_all_SOURCES = mln_io_pbm_all.cc mln_io_pbm_save_SOURCES = mln_io_pbm_save.cc diff --git a/milena/tests/unit_test/mln_io_raw_all.cc b/milena/tests/unit_test/mln_io_dump_all.cc similarity index 60% rename from milena/tests/unit_test/mln_io_raw_all.cc rename to milena/tests/unit_test/mln_io_dump_all.cc index 40875ba..0b1f553 100644 --- a/milena/tests/unit_test/mln_io_raw_all.cc +++ b/milena/tests/unit_test/mln_io_dump_all.cc @@ -1,9 +1,9 @@ -// Unit test for mln/io/raw/all.hh. +// Unit test for mln/io/dump/all.hh. // Generated by ./build_unit_test.sh, do not modify. // Include the file twice, so we detect missing inclusion guards. -#include <mln/io/raw/all.hh> -#include <mln/io/raw/all.hh> +#include <mln/io/dump/all.hh> +#include <mln/io/dump/all.hh> int main() { diff --git a/milena/tests/unit_test/mln_io_raw_load.cc b/milena/tests/unit_test/mln_io_dump_load.cc similarity index 60% rename from milena/tests/unit_test/mln_io_raw_load.cc rename to milena/tests/unit_test/mln_io_dump_load.cc index 11f9ba6..105868f 100644 --- a/milena/tests/unit_test/mln_io_raw_load.cc +++ b/milena/tests/unit_test/mln_io_dump_load.cc @@ -1,9 +1,9 @@ -// Unit test for mln/io/raw/load.hh. +// Unit test for mln/io/dump/load.hh. // Generated by ./build_unit_test.sh, do not modify. // Include the file twice, so we detect missing inclusion guards. -#include <mln/io/raw/load.hh> -#include <mln/io/raw/load.hh> +#include <mln/io/dump/load.hh> +#include <mln/io/dump/load.hh> int main() { diff --git a/milena/tests/unit_test/mln_io_raw_save.cc b/milena/tests/unit_test/mln_io_dump_save.cc similarity index 60% rename from milena/tests/unit_test/mln_io_raw_save.cc rename to milena/tests/unit_test/mln_io_dump_save.cc index 3ead995..05baca1 100644 --- a/milena/tests/unit_test/mln_io_raw_save.cc +++ b/milena/tests/unit_test/mln_io_dump_save.cc @@ -1,9 +1,9 @@ -// Unit test for mln/io/raw/save.hh. +// Unit test for mln/io/dump/save.hh. // Generated by ./build_unit_test.sh, do not modify. // Include the file twice, so we detect missing inclusion guards. -#include <mln/io/raw/save.hh> -#include <mln/io/raw/save.hh> +#include <mln/io/dump/save.hh> +#include <mln/io/dump/save.hh> int main() { -- 1.5.6.5

1 0

3252: Update igr's code.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* lazzara/igr.cc: make use of registration::icp. --- milena/sandbox/ChangeLog | 6 ++ milena/sandbox/lazzara/igr.cc | 194 +++++++++++++++++++++++++++++++++++------ 2 files changed, 173 insertions(+), 27 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 1058011..b10e391 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,9 @@ +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update igr's code. + + * lazzara/igr.cc: make use of registration::icp. + 2009-02-03 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update Laurent's cleanup code. diff --git a/milena/sandbox/lazzara/igr.cc b/milena/sandbox/lazzara/igr.cc index af601a0..1a0d498 100644 --- a/milena/sandbox/lazzara/igr.cc +++ b/milena/sandbox/lazzara/igr.cc @@ -1,3 +1,4 @@ +#include <mln/registration/icp2.hh> #include <mln/essential/2d.hh> #include <mln/core/image/image3d.hh> #include <mln/binarization/binarization.hh> @@ -9,9 +10,10 @@ //#include <mln/registration/multiscale.hh> #include <mln/essential/3d.hh> -#include <mln/registration/icp2.hh> #include <mln/core/image/slice_image.hh> +#include <mln/io/cloud/load.hh> + struct threshold : mln::Function_p2b<threshold> { bool operator()(const mln::value::rgb8& val) const @@ -21,6 +23,135 @@ struct threshold : mln::Function_p2b<threshold> } }; +namespace mln +{ + + using namespace fun::x2x; + + template <typename P> + struct transf_quat_t + { + transf_quat_t() + : q_(1,0,0,0), t_(literal::zero) + { + } + + + inline + float epsilon() + { + static const float e = 1e-5; + return e; + } + + inline + bool about_equal(float val1, float val2) + { + return fabs(val1 - val2) < epsilon(); + } + + template <unsigned n> + algebra::vec<n,float> rotate(const algebra::quat& q, const algebra::vec<n,float>& p) + { + return (q * algebra::quat(0. ,p) * q.inv()).v(); + } + + + bool check_rotation(const algebra::h_mat<3,float>& mat, const algebra::quat& q) + { + srand(time(0)); + assert(q.is_unit()); + rotation<3,float> rot(mat); + + algebra::vec<3,float> + tmp = make::vec(rand(), rand(), rand()), + p = tmp / norm::l2(tmp), + p_rot_1 = rotate(q, p), + p_rot_2 = rot(p); + return about_equal(norm::l2(p_rot_1 - p_rot_2), 0.f); + } + + + transf_quat_t(const algebra::quat& q, const vec3d_f& t) + : q_(q), t_(t) + { + assert(q.is_unit()); + float + w = q.to_vec()[0], + x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, + y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, + z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; + float data[9] = {1.f - y2 - z2, xy - zw, xz + yw, + xy + zw, 1.f - x2 - z2, yz - xw, + xz - yw, yz + xw, 1.f - x2 - y2}; + + algebra::h_mat<3,float> tmp = make::h_mat(data); + std::cout << tmp << std::endl; + // postcondition + assert(check_rotation(tmp, q)); + } + + void + set_quat(const algebra::quat& q) + { + q_ = q; + } + + + void + set_trans(const vec3d_f& t) + { + t_ = t; + } + + algebra::vec<P::dim,float> + operator()(const algebra::vec<P::dim,float>& v) const + { + return (q_ * algebra::quat(0., v) * q_.inv()).v() + t_; + } + + algebra::quat q_; + vec3d_f t_; + }; + + + template <typename P> + struct transf_mat_t + { + typedef rotation<P::dim,float> rot_t; + typedef translation<P::dim,float> trans_t; + + transf_mat_t() {} + transf_mat_t(const algebra::quat& q, const vec3d_f& t) + : r_(q), t_(t), c_(r_, t_) + { + } + + void + set_quat(const algebra::quat& q) + { + r_ = rot_t(q); + } + + void + set_trans_(const vec3d_f& t) + { + t_ = trans_t(t); + } + + algebra::vec<P::dim,float> + operator()(const algebra::vec<P::dim,float>& v) const + { + return c_(v); + } + + rot_t r_; + trans_t t_; + composed<rot_t, trans_t> c_; + }; + + +} template <typename T> inline @@ -106,12 +237,14 @@ get_main_object_shape(const mln::Image& in) typedef image2d<bool> J; - threshold f; - J in_bw = binarization::binarization(in, f); - io::pbm::save(in_bw, "01_in_bw.pbm"); +// threshold f; +// J in_bw = binarization::binarization(in, f); +// io::pbm::save(in_bw, "01_in_bw.pbm"); - J ima = keep_largest_component(in_bw); - io::pbm::save(in_bw, "02_ima.pbm"); +// J ima = keep_largest_component(in_bw); + J ima = keep_largest_component(in); +// io::pbm::save(in_bw, "02_ima.pbm"); + io::pbm::save(in, "02_ima.pbm"); std::cout << "Compute gradient" << std::endl; J ima_grad = morpho::gradient(ima, win_c4p()); @@ -133,36 +266,43 @@ int main(int, char* argv[]) typedef image2d<rgb8> I; typedef image2d<bool> J; - I in; - io::ppm::load(in, argv[1]); - J in_grad = get_main_object_shape(in); +// I in; +// J in; +// io::pbm::load(in, argv[1]); +// J in_grad = get_main_object_shape(in); - I ref; - io::ppm::load(ref, argv[2]); - J ref_grad = get_main_object_shape(ref); +// I ref; +// J ref; +// io::pbm::load(ref, argv[2]); +// J ref_grad = get_main_object_shape(ref); - std::cout << "Computing registration..." << std::endl; - J cloud = in_grad | pw::value(in_grad) == true; //FIXME: cannot use pw::image with registration. - // mln_VAR(surface, (ref_grad | pw::value(ref_grad) == true)); - - - //mln_VAR(registration, registration::multiscale(cloud, ref_grad, 5, 3)); typedef image3d<bool> K; - K in_3d = make::image3d(in_grad); - K ref_3d = make::image3d(ref_grad); - composed< rotation<K::psite::dim, float>, translation<K::psite::dim, float> > qk; - registration::icp(in_3d, ref_3d, qk); - - std::cout << "Build result image" << std::endl; - K res; - initialize(res, in_3d); + p_array<point3d> in_3d_, ref_3d_; + io::cloud::load(in_3d_, argv[1]); + io::cloud::load(ref_3d_, argv[2]); + + std::cout << "* loading data" << std::endl; + std::cout << " igr.cc - in_3d_.nsites = " << in_3d_.nsites() << std::endl; + std::cout << " igr.cc - ref_3d_.nsites = " << ref_3d_.nsites() << std::endl; + K in_3d = convert::to<K>(in_3d_); + K ref_3d = convert::to<K>(ref_3d_); + + registration::basic_closest_point<point3d> closest_point(ref_3d_); + typedef rotation<3u,float> rot_t; + typedef translation<3u,float> trans_t; + composed<rot_t,trans_t> qk = registration::icp(in_3d_, ref_3d_, closest_point); + + std::cout << "* Build result image" << std::endl; + box3d box = geom::bbox(ref_3d); + box.enlarge(40); + K res(box); data::fill(res, false); mln_VAR(ig, (in_3d | pw::value(in_3d) == true)); mln_piter_(ig_t) p(ig.domain()); for_all(p) - res(qk(p.to_site().to_vec())) = true; + res(qk(p.to_vec())) = true; io::pbm::save(slice(res,0), "04_registered.pbm"); } -- 1.5.6.5

1 0

3251: Update new version of ICP.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* mln/registration/icp2.hh: Make it work and make it more generic. --- milena/ChangeLog | 6 + milena/mln/registration/icp2.hh | 334 +++++++++++++++++++++++++++++---------- 2 files changed, 256 insertions(+), 84 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index da694aa..5669206 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Update new version of ICP. + + * mln/registration/icp2.hh: Make it work and make it more generic. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix distribution. * headers.mk: add mln/io/cloud/all.hh. diff --git a/milena/mln/registration/icp2.hh b/milena/mln/registration/icp2.hh index e077b4e..2993caa 100644 --- a/milena/mln/registration/icp2.hh +++ b/milena/mln/registration/icp2.hh @@ -32,93 +32,224 @@ /// /// Register an image over an another using the ICP algorithm. +# include <mln/core/alias/vec3d.hh> +# include <mln/math/jacobi.hh> # include <mln/fun/x2x/all.hh> # include <mln/fun/x2v/all.hh> # include <mln/convert/to.hh> -# include <mln/transform/internal/closest_point_functor.hh> -# include <mln/canvas/distance_geodesic.hh> # include <mln/accu/compute.hh> # include <mln/accu/center.hh> +# include <mln/accu/rms.hh> +# include <mln/trait/image_from_grid.hh> +# include <mln/set/compute.hh> + +//Should be removed when closest_point functors are moved. +# include <mln/core/alias/neighb3d.hh> +# include <mln/transform/internal/closest_point_functor.hh> +# include <mln/canvas/distance_geodesic.hh> +# include <mln/pw/all.hh> namespace mln { + namespace registration { using namespace fun::x2x; - /*! Register point in \p c using a map of closest points \p map + /*! Register point in \p c using a function of closest points + * \p closest_point. * - * \param[in] c The cloud of points. - * \param[in] map The map of closest points. - * \param[in] epsilon ICP stops if sqr_norm(qk - qk-1) / - * sqr_norm(qk) > epsilon + * \param[in] data_P The cloud of points. + * \param[in] model_X the reference surface. + * \param[in] closest_point The function of closest points. * \param[out] qk The rigid transformation obtained. * - * \pre \p ima has to be initialized. + * \return the rigid transformation which may be use later to create + * a registered image. + * + * WARNING: the function \p closest_point *MUST* take float/double + * vector as arguments. Otherwise the resulting transformation may be + * wrong due to the truncation of the vector coordinate values. + * + * \pre \p data_p and \p model_X must not be empty. + * + * Reference article: "A Method for Registration of 3-D Shapes", Paul J. + * Besl and Neil D. McKay, IEEE, 2, February 1992. + * */ - template <typename D, typename M, typename T> - void - icp(const Image<D>& data, const Image<M>& model, T& qk); + template <typename P, typename F> + composed< rotation<P::dim,float>,translation<P::dim,float> > + icp(const p_array& data_P, + const p_array& model_X, + const F& closest_point, + const algebra::quat& initial_rot, + const mln_vec(P)& initial_translation); + + template <typename P, typename F> + composed< rotation<P::dim,float>,translation<P::dim,float> > + icp(const p_array& data_P, + const p_array& model_X, + const F& closest_point); # ifndef MLN_INCLUDE_ONLY - template <typename P, typename C, typename T> + /// Closest point functor based on map distance. + template <typename P> + class cp_with_map_t + { + typedef mln_image_from_grid(mln_grid(P), P) I; + typedef mln_ch_value(I, P) cp_ima_t; + + public: + + cp_with_map_t(const p_array& model_X) + { + box3d box = geom::bbox(model_X); + box.enlarge(50); + + typedef mln_ch_value(I, bool) model_t; + model_t model(box); + data::fill(model, false); + data::fill((model | model_X).rw(), true); + + transform::internal::closest_point_functor f; + typedef mln_ch_value(I,value::int_u16) dmap_t; + dmap_t dmap_X = canvas::distance_geodesic(model, c6(), + mln_max(value::int_u16), + f); + + cp_ima_ = f.cp_ima; + } + + mln_site(I) operator()(const mln_site(I)& p) const + { + return cp_ima_(p); + } + + private: + cp_ima_t cp_ima_; + }; + + + /// Closest point functor based on map distance. + template <typename P> + class basic_closest_point + { + typedef mln_image_from_grid(mln_grid(P), P) I; + typedef p_array X_t; + + public: + + basic_closest_point(const p_array& X) + : X_(X) + { + } + + float + l2_distance(const vec3d_f& vec1, const vec3d_f& vec2) const + { + typedef float D; + D d = 0; + for (unsigned i = 0; i < 3; ++i) + { + D sqr_v1_v2 = static_cast<D>(mln::math::sqr(vec1[i] - vec2[i])); + d = static_cast<D>(d + sqr_v1_v2); + } + return d; + } + + mln_site(I) operator()(const vec3d_f& v) const + { + vec3d_f best_x = convert::to<vec3d_f>(X_[0].to_vec()); + + float best_d = l2_distance(v, best_x); + mln_piter(X_t) X_i(X_); + for_all(X_i) + { + float d = l2_distance(v, convert::to<vec3d_f>(X_i)); + if (d < best_d) + { + best_d = d; + best_x = X_i.to_vec(); + } + } + return best_x; + } + + private: + const p_array& X_; + }; + + + template <typename P, typename F> inline float compute_d_k(const p_array& data_P, - const C& cp_X, - const T& qk, - const T& qk_next) + const F& closest_point, + const algebra::quat& qR, + const algebra::quat& qR_old, + const vec3d_f& qT, + const vec3d_f& qT_old) { - float f = 0.f; + accu::rms<vec3d_f, float> accu; mln_piter(p_array) p(data_P); for_all(p) { // yk_i - pk+1_i - f += norm::l2(cp_X(qk(p.to_site().to_vec())).to_vec() - qk_next(p.to_site().to_vec())); + vec3d_f Pk_i = qR_old.rotate(p.to_vec()) + qT_old; + vec3d_f Pk_1_i = qR.rotate(p.to_vec()) + qT; + accu.take(closest_point(Pk_i).to_vec() - Pk_1_i); } - return f / data_P.nsites(); + return accu.to_result(); } - template <typename P, typename C, typename T> + template <typename P, typename F> inline float compute_e_k(const p_array& data_P, - const C& cp_X, - const T& qk) + const F& closest_point, + const algebra::quat& qR, + const vec3d_f& qT) { - float f = 0.f; + accu::rms<vec3d_f, float> accu; mln_piter(p_array) p(data_P); for_all(p) { // yk_i - pk_i - f += norm::l2(cp_X(qk(p.to_site().to_vec())).to_vec() - qk(p.to_site().to_vec())); + vec3d_f Pk_i = qR.rotate(p.to_vec()) + qT; + accu.take(closest_point(Pk_i).to_vec() - Pk_i); } - return f / data_P.nsites(); + return accu.to_result(); } - template <typename P, typename T> - fun::x2x::rotation<3u, float> + /// FIXME: work only for 3d images. + template <typename P, typename F> + algebra::quat get_rot(const p_array& data_P, - const algebra::vec<3u,float>& mu_P, - const algebra::vec<3u,float>& mu_Yk, - const T& qk) + const vec3d_f& mu_P, + const vec3d_f& mu_Yk, + const F& closest_point, + const algebra::quat& qR, + const vec3d_f& qT) { - // FIXME: Make use of a cross_covariance accu (maybe not because of map(ck[i])) + /// Mk: cross-covariance matrix. algebra::mat<3u,3u,float> Mk; mln_piter(p_array) p(data_P); + + // FIXME: could we use an accu? for_all(p) { - algebra::vec<3u,float> P_i = p.to_site().to_vec(); - algebra::vec<3u,float> Yk_i = qk(p.to_site().to_vec()); + vec3d_f P_i = p.to_vec(); + vec3d_f Pk_i = qR.rotate(p.to_vec()) + qT; + vec3d_f Yk_i = closest_point(Pk_i).to_vec(); Mk += make::mat(P_i - mu_P) * trans(make::mat(Yk_i - mu_Yk)); } Mk /= data_P.nsites(); - algebra::vec<3u,float> A; + vec3d_f A; A[0] = Mk(1,2) - Mk(2,1); A[1] = Mk(2,0) - Mk(0,2); A[2] = Mk(0,1) - Mk(1,0); @@ -127,11 +258,11 @@ namespace mln float t = tr(Mk); Qk(0,0) = t; - for (int i = 1; i < 4; i++) + for (int i = 1; i < 4; ++i) { Qk(i,0) = A[i - 1]; Qk(0,i) = A[i - 1]; - for (int j = 1; j < 4; j++) + for (int j = 1; j < 4; ++j) if (i == j) Qk(i,j) = 2 * Mk(i - 1,i - 1) - t; } @@ -145,80 +276,115 @@ namespace mln Qk(2,3) = Mk(1,2) + Mk(2,1); Qk(3,2) = Mk(1,2) + Mk(2,1); - algebra::quat qR = math::jacobi(Qk); - - return fun::x2x::rotation<3u, float>(qR); + return mln::math::jacobi(Qk); } - - template <typename P, typename C, typename T> - T - get_transformation(const p_array& data_P, - const algebra::vec<P::dim,float>& mu_P, - const C& cp_X, - const T& qk) + // Compute mu_Yk, mass center of Yk. + template <typename P, typename F> + inline + vec3d_f + get_mu_yk(const p_array& data_P, + const F& closest_point, + const algebra::quat& qR, + const vec3d_f& qT) { - algebra::vec<P::dim,float> mu_Yk; + accu::center<P,vec3d_f> accu; - // Compute mu_Yk, mass center of Yk. mln_piter(p_array) p(data_P); for_all(p) - mu_Yk += cp_X(qk(p.to_site().to_vec())).to_vec(); - mu_Yk /= data_P.nsites(); - - // qR - rotation<P::dim, float> tqR = get_rot(data_P, mu_P, mu_Yk, qk); - - // qT - const algebra::vec<P::dim,float> qT = mu_Yk - tqR(mu_P); - translation<P::dim, float> tqT(qT); - - return compose(tqR, tqT); + { + vec3d_f Pk_i = qR.rotate(p.to_vec()) + qT; + accu.take(closest_point(Pk_i).to_vec()); + } + return accu.to_result(); } - template <typename D, typename M, typename T> + template <typename P, typename F> inline - void - icp(const Image<D>& data, const Image<M>& model_X, T& qk) + composed< rotation<P::dim,float>,translation<P::dim,float> > + icp(const p_array& data_P, + const p_array& model_X, + const F& closest_point, + const algebra::quat& initial_rot, + const mln_vec(P)& initial_translation) { trace::entering("registration::icp"); - typedef mln_psite(M) P; + mln_precondition(P::dim == 3); + mln_precondition(!data_P.is_empty()); + mln_precondition(!model_X.is_empty()); + mln_precondition(!initial_rot.is_null()); + typedef p_array cloud_t; - cloud_t data_P = convert::to<cloud_t>(exact(data)); + vec3d_f mu_P = set::compute(accu::center<P,vec3d_f>(), data_P); + + vec3d_f qT_old, qT = initial_translation; + algebra::quat qR_old, qR = initial_rot; + float ek, ek_old = mln_max(float); + float dk, dk_old = mln_max(float); + unsigned k = 0; + do + { + qT_old = qT; + qR_old = qR; - // Compute distance map and closest point image. - transform::internal::closest_point_functor<M> f; - typedef mln_ch_value(M,value::int_u16) I; - I dmap_X = canvas::distance_geodesic(model_X, c6(), - mln_max(value::int_u16), f); + // Compute error ek = d(Pk,Yk) + ek = compute_e_k(data_P, closest_point, qR, qT); - const mln_ch_value(M, P)& cp_X = f.cp_ima; + /// Compute transformation + /// + // mu_Yk - Pk's mass center. + vec3d_f mu_Yk = get_mu_yk(data_P, closest_point, qR_old, qT_old); - algebra::vec<P::dim,float> mu_P = set::compute(accu::meta::center(), - exact(data).domain()).to_vec(); + // quaternion qR - rotation + qR = get_rot(data_P, mu_P, mu_Yk, closest_point, qR_old, qT_old); + vec3d_f tmp = qR.v(); - float d_k_prev = 0, d_k = mln_max(float); - float e_k_prev = 0, e_k = mln_max(float); - do - { - d_k_prev = d_k; - e_k_prev = e_k; + // vector qT - translation + qT = mu_Yk - qR.rotate(mu_P); + /// + /// End of "compute transformation" - //compute qk - T qk_next = get_transformation(data_P, mu_P, cp_X, qk); + // Distance dk = d(Pk+1, Yk) + dk = compute_d_k(data_P, closest_point, qR, qR_old, qT, qT_old); - d_k = compute_d_k(data_P, cp_X, qk, qk_next); - std::cout << d_k << std::endl; - e_k = compute_e_k(data_P, cp_X, qk); + // Check property according the related paper. + mln_assertion(0 <= dk); + mln_assertion(dk <= ek); + mln_assertion(ek <= dk_old); + mln_assertion(dk_old <= ek_old); - qk = qk_next; - } while ((d_k_prev - d_k) >= 1e-3); + // Backing up results. + dk_old = dk; + ek_old = ek; + + ++k; + + } while ((k < 3) + || norm::l2((qT - qT_old)) + norm::l2((qR - qR_old).to_vec()) > 1e-5); + + typedef rotation<3u,float> rot_t; + rot_t tqR(qR); + typedef translation<3u,float> trans_t; + trans_t tqT(qT); + composed<rot_t,trans_t> result(tqR, tqT); trace::exiting("registration::icp"); + return result; + } + + template <typename P, typename F> + inline + composed< rotation<P::dim,float>,translation<P::dim,float> > + icp(const p_array& data_P, + const p_array& model_X, + const F& closest_point) + { + return icp(data_P, model_X, closest_point, + algebra::quat(1,0,0,0), literal::zero); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

3250: Fix distribution.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* headers.mk: add mln/io/cloud/all.hh. * tests/unit_test/Makefile.am, * tests/unit_test/mln_io_cloud_all.cc: add missing unit test. * mln/accu/rms.hh, * mln/convert/impl/from_image_to_site_set.hh, * mln/core/alias/all.hh, * mln/fun/p2p/translation.hh, * mln/trace/exiting.hh, * mln/transform/internal/closest_point_functor.hh: add missing includes. * mln/debug/slices_2d.hh: remove an unused variable. --- milena/ChangeLog | 19 ++++++ milena/headers.mk | 1 + milena/mln/accu/rms.hh | 1 + milena/mln/convert/impl/from_image_to_site_set.hh | 1 + milena/mln/core/alias/all.hh | 60 ++++++++++---------- milena/mln/debug/slices_2d.hh | 1 - milena/mln/fun/p2p/translation.hh | 1 + milena/mln/trace/exiting.hh | 6 ++- .../transform/internal/closest_point_functor.hh | 1 + milena/tests/unit_test/Makefile.am | 2 + milena/tests/unit_test/mln_io_cloud_all.cc | 11 ++++ 11 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 milena/tests/unit_test/mln_io_cloud_all.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 79b7000..da694aa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,24 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix distribution. + + * headers.mk: add mln/io/cloud/all.hh. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_io_cloud_all.cc: add missing unit test. + + * mln/accu/rms.hh, + * mln/convert/impl/from_image_to_site_set.hh, + * mln/core/alias/all.hh, + * mln/fun/p2p/translation.hh, + * mln/trace/exiting.hh, + * mln/transform/internal/closest_point_functor.hh: add missing + includes. + + * mln/debug/slices_2d.hh: remove an unused variable. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve accu::center. * mln/accu/center.hh: Returns a vector instead of a site. The vector diff --git a/milena/headers.mk b/milena/headers.mk index d109eb7..48ce0e0 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1001,6 +1001,7 @@ mln/io/raw/load.hh \ mln/io/raw/all.hh \ mln/io/raw/save.hh \ mln/io/cloud/load.hh \ +mln/io/cloud/all.hh \ mln/io/cloud/save.hh \ mln/io/all.hh \ mln/io/pbm/load.hh \ diff --git a/milena/mln/accu/rms.hh b/milena/mln/accu/rms.hh index c873686..339eabc 100644 --- a/milena/mln/accu/rms.hh +++ b/milena/mln/accu/rms.hh @@ -34,6 +34,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/accu/internal/base.hh> +# include <mln/math/sqrt.hh> namespace mln diff --git a/milena/mln/convert/impl/from_image_to_site_set.hh b/milena/mln/convert/impl/from_image_to_site_set.hh index e6e9e69..2e79f7e 100644 --- a/milena/mln/convert/impl/from_image_to_site_set.hh +++ b/milena/mln/convert/impl/from_image_to_site_set.hh @@ -38,6 +38,7 @@ # include <utility> # include <mln/core/site_set/p_run.hh> +# include <mln/core/site_set/p_array.hh> # include <mln/metal/converts_to.hh> diff --git a/milena/mln/core/alias/all.hh b/milena/mln/core/alias/all.hh index ce509a6..a7dde7f 100644 --- a/milena/mln/core/alias/all.hh +++ b/milena/mln/core/alias/all.hh @@ -32,35 +32,35 @@ /// /// File that includes all the aliases. -#include <box1d.hh> -#include <box2d.hh> -#include <box2d_h.hh> -#include <box3d.hh> -#include <complex_geometry.hh> -#include <complex_image.hh> -#include <dpoint1d.hh> -#include <dpoint2d.hh> -#include <dpoint2d_h.hh> -#include <dpoint3d.hh> -#include <neighb1d.hh> -#include <neighb2d.hh> -#include <neighb3d.hh> -#include <p_run2d.hh> -#include <p_runs2d.hh> -#include <point1d.hh> -#include <point2d.hh> -#include <point2d_h.hh> -#include <point3d.hh> -#include <point3df.hh> -#include <vec3d.hh> -#include <w_window1d_float.hh> -#include <w_window1d_int.hh> -#include <w_window2d_float.hh> -#include <w_window2d_int.hh> -#include <w_window3d_float.hh> -#include <w_window3d_int.hh> -#include <window1d.hh> -#include <window2d.hh> -#include <window3d.hh> +#include <mln/core/alias/box1d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/box2d_h.hh> +#include <mln/core/alias/box3d.hh> +#include <mln/core/alias/complex_geometry.hh> +#include <mln/core/alias/complex_image.hh> +#include <mln/core/alias/dpoint1d.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/dpoint2d_h.hh> +#include <mln/core/alias/dpoint3d.hh> +#include <mln/core/alias/neighb1d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/core/alias/p_run2d.hh> +#include <mln/core/alias/p_runs2d.hh> +#include <mln/core/alias/point1d.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/alias/point2d_h.hh> +#include <mln/core/alias/point3d.hh> +#include <mln/core/alias/point3df.hh> +#include <mln/core/alias/vec3d.hh> +#include <mln/core/alias/w_window1d_float.hh> +#include <mln/core/alias/w_window1d_int.hh> +#include <mln/core/alias/w_window2d_float.hh> +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/core/alias/w_window3d_float.hh> +#include <mln/core/alias/w_window3d_int.hh> +#include <mln/core/alias/window1d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/window3d.hh> #endif // ! MLN_CORE_ALIAS_ALL_HH diff --git a/milena/mln/debug/slices_2d.hh b/milena/mln/debug/slices_2d.hh index 87b5729..c858b86 100644 --- a/milena/mln/debug/slices_2d.hh +++ b/milena/mln/debug/slices_2d.hh @@ -127,7 +127,6 @@ namespace mln unsigned round_up(float f) { unsigned n = static_cast<unsigned>(f + 0.499999f); - int i; if (n == 0u) ++n; if (float(n) < f) diff --git a/milena/mln/fun/p2p/translation.hh b/milena/mln/fun/p2p/translation.hh index b4f54a7..8b186f0 100644 --- a/milena/mln/fun/p2p/translation.hh +++ b/milena/mln/fun/p2p/translation.hh @@ -34,6 +34,7 @@ /// FIXME: doc # include <mln/core/concept/function.hh> +# include <mln/core/concept/gdpoint.hh> namespace mln diff --git a/milena/mln/trace/exiting.hh b/milena/mln/trace/exiting.hh index 240ceae..4cd6491 100644 --- a/milena/mln/trace/exiting.hh +++ b/milena/mln/trace/exiting.hh @@ -35,10 +35,11 @@ # include <string> # include <iostream> +# include <stack> +# include <mln/core/contract.hh> # include <mln/trace/quiet.hh> - namespace mln { @@ -48,6 +49,9 @@ namespace mln void exiting(const std::string& scope); + extern std::stack<std::clock_t> start_times; + extern std::stack<std::string> scopes; // For testing purpose + // (entering/exiting scope matching). # ifndef MLN_INCLUDE_ONLY diff --git a/milena/mln/transform/internal/closest_point_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh index 634d44c..02b3401 100644 --- a/milena/mln/transform/internal/closest_point_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -33,6 +33,7 @@ /// Closest point functor. # include <mln/core/macros.hh> +# include <mln/trait/ch_value.hh> namespace mln { diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 9ad9c7c..8c4e274 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -967,6 +967,7 @@ mln_io_raw_load \ mln_io_raw_all \ mln_io_raw_save \ mln_io_cloud_load \ +mln_io_cloud_all \ mln_io_cloud_save \ mln_io_all \ mln_io_pbm_load \ @@ -2008,6 +2009,7 @@ mln_io_raw_load_SOURCES = mln_io_raw_load.cc mln_io_raw_all_SOURCES = mln_io_raw_all.cc mln_io_raw_save_SOURCES = mln_io_raw_save.cc mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc +mln_io_cloud_all_SOURCES = mln_io_cloud_all.cc mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc mln_io_all_SOURCES = mln_io_all.cc mln_io_pbm_load_SOURCES = mln_io_pbm_load.cc diff --git a/milena/tests/unit_test/mln_io_cloud_all.cc b/milena/tests/unit_test/mln_io_cloud_all.cc new file mode 100644 index 0000000..8501037 --- /dev/null +++ b/milena/tests/unit_test/mln_io_cloud_all.cc @@ -0,0 +1,11 @@ +// Unit test for mln/io/cloud/all.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/io/cloud/all.hh> +#include <mln/io/cloud/all.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

1 0

3249: Improve accu::center.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* mln/accu/center.hh: Returns a vector instead of a site. The vector type can be passed as template parameter. --- milena/ChangeLog | 7 +++++ milena/mln/accu/center.hh | 66 +++++++++++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8385bcd..79b7000 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve accu::center. + + * mln/accu/center.hh: Returns a vector instead of a site. The vector + type can be passed as template parameter. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add default constructor to fun_image. * mln/core/image/fun_image.hh: add default constructor and refactor diff --git a/milena/mln/accu/center.hh b/milena/mln/accu/center.hh index 4102925..aba9a80 100644 --- a/milena/mln/accu/center.hh +++ b/milena/mln/accu/center.hh @@ -1,4 +1,4 @@ -// 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 @@ -32,6 +32,7 @@ /// /// Define an accumulator that computes the mass center of a site set. + # include <mln/accu/internal/base.hh> # include <mln/accu/bbox.hh> @@ -43,11 +44,16 @@ namespace mln /// Generic center accumulator class. - template <typename P> - struct center : public mln::accu::internal::base > + /// + /// \tparam P the type of site. + /// \tparam V the type of vector to be used as result. + /// The default vector type is the one provided by P. + template <typename P, typename V = typename P::vec> + struct center + : public mln::accu::internal::base<V, center<P,V> > { typedef P argument; - typedef P result; + typedef V result; center(); @@ -55,18 +61,19 @@ namespace mln /// \{ void init(); void take(const argument& t); - void take(const center& other); + void take(const center<P,V>& other); /// \} /// Get the value of the accumulator. - P to_result() const; - operator P () const; + V to_result() const; + operator V() const; + operator P() const; /// Check whether this accu is able to return a result. bool is_valid() const; protected: - algebra::vec<P::dim, float> center_; + V center_; unsigned nsites_; }; @@ -77,10 +84,10 @@ namespace mln struct center : public Meta_Accumulator< center > { - template <typename P> + template <typename P, typename V> struct with { - typedef accu::center ret; + typedef accu::center<P,V> ret; }; }; @@ -91,58 +98,65 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename P> + template <typename P, typename V> inline - center::center() + center<P,V>::center() { init(); } - template <typename P> + template <typename P, typename V> inline void - center::init() + center<P,V>::init() { center_ = literal::zero; nsites_ = 0; } - template <typename P> + template <typename P, typename V> inline - void center::take(const argument& t) + void center<P,V>::take(const argument& t) { center_ += t.to_vec(); ++nsites_; } - template <typename P> + template <typename P, typename V> inline void - center::take(const center& other) + center<P,V>::take(const center<P,V>& other) { center_ += other.center_; nsites_ += other.nsites_; } - template <typename P> + template <typename P, typename V> inline - P - center::to_result() const + V + center<P,V>::to_result() const { - return P(center_ / nsites_); + return center_ / nsites_; } - template <typename P> + template <typename P, typename V> inline - center::operator P() const + center<P,V>::operator V() const { return to_result(); } - template <typename P> + template <typename P, typename V> + inline + center<P,V>::operator P() const + { + return P(to_result()); + } + + template <typename P, typename V> inline bool - center::is_valid() const + center<P,V>::is_valid() const { return nsites_ > 0; } -- 1.5.6.5

1 0

3248: Add default constructor to fun_image.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* mln/core/image/fun_image.hh: add default constructor and refactor initialization. --- milena/ChangeLog | 7 +++++++ milena/mln/core/image/fun_image.hh | 20 +++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f846446..8385bcd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add default constructor to fun_image. + + * mln/core/image/fun_image.hh: add default constructor and refactor + initialization. + +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix step2 in tutorial. * doc/tutorial/figures/tuto1_first_image-1.pbm, diff --git a/milena/mln/core/image/fun_image.hh b/milena/mln/core/image/fun_image.hh index acf2716..0099dde 100644 --- a/milena/mln/core/image/fun_image.hh +++ b/milena/mln/core/image/fun_image.hh @@ -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 @@ -53,7 +53,7 @@ namespace mln template <typename F, typename I> struct data< fun_image<F,I> > { - data( I& ima); + data(I& ima); I& ima_; }; @@ -110,6 +110,9 @@ namespace mln typedef fun_image< tag::value_<mln_result(F)>, tag::image_ > skeleton; /// Constructor. + fun_image(); + + /// Constructor. fun_image(Image& ima); /// Initialize an empty image. @@ -145,10 +148,17 @@ namespace mln template <typename F, typename I> inline + fun_image<F,I>::fun_image() + { + this->data_ = 0; + } + + + template <typename F, typename I> + inline fun_image<F,I>::fun_image(Image& ima) { - mln_precondition(exact(ima).is_valid()); - this->data_ = new internal::data< fun_image<F,I> >(exact(ima)); + init_(ima); } -- 1.5.6.5

1 0