Olena-patches September 2010

olena-patches@lrde.epita.fr

8 participants
73 discussions

last-svn-commit-490-g6713b18 Temporarily disable static tests on Magick::Quantum type size.

by Guillaume Lazzara

* mln/io/magick/load.hh, * mln/io/magick/save.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/io/magick/load.hh | 4 +++- milena/mln/io/magick/save.hh | 6 ++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fde9d16..1eedf26 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Temporarily disable static tests on Magick::Quantum type size. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Here. + 2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/value/int_s.hh: Fix warnings. diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index f961ccb..7004a80 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -35,6 +35,8 @@ /// before using any of these functions, as advised by the /// GraphicsMagick documentation /// (http://www.graphicsmagick.org/Magick++/Image.html). +/// +/// \fixme: re-enable quantum size check # include <cstdlib> @@ -141,7 +143,7 @@ namespace mln trace::entering("mln::io::magick::load"); // Ensure a Magick++'s Quantum is an 8-bit value. - mln::metal::equal<Magick::Quantum, unsigned char>::check(); + //mln::metal::equal<Magick::Quantum, unsigned char>::check(); I& ima = exact(ima_); diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index aa02ddf..2c87c88 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -35,6 +35,8 @@ /// before using any of these functions, as advised by the /// GraphicsMagick documentation /// (http://www.graphicsmagick.org/Magick++/Image.html). +/// +/// \fixme: re-enable quantum size check # include <cstdlib> @@ -94,7 +96,7 @@ namespace mln Magick::Color get_color(const value::int_u8& value) { // Ensure a Magick++'s Quantum is an 8-bit value. - mln::metal::equal<Magick::Quantum, unsigned char>::check(); + //mln::metal::equal<Magick::Quantum, unsigned char>::check(); return Magick::Color(value, value, value); } @@ -102,7 +104,7 @@ namespace mln Magick::Color get_color(const value::rgb8& value) { // Ensure a Magick++'s Quantum is an 8-bit value. - mln::metal::equal<Magick::Quantum, unsigned char>::check(); + //mln::metal::equal<Magick::Quantum, unsigned char>::check(); return Magick::Color(value.red(), value.green(), value.blue()); } -- 1.5.6.5

14 years, 3 months

last-svn-commit-184-g17eaa12 Have the topological WST be more generic (though still a bit buggy).

by Roland Levillain

* mln/morpho/watershed/topological.hh: s/site/psite/g. (morpho::watershed::min, morpho::watershed::max): Abort when the set of components is empty. * mln/core/site_set/p_set.hh (p_set::is_empty): New method. --- milena/ChangeLog | 9 ++ milena/mln/core/site_set/p_set.hh | 14 ++- milena/mln/morpho/watershed/topological.hh | 199 ++++++++++++++-------------- 3 files changed, 124 insertions(+), 98 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b4e98cd..601b5c4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Have the topological WST be more generic (though still a bit buggy). + + * mln/morpho/watershed/topological.hh: s/site/psite/g. + (morpho::watershed::min, morpho::watershed::max): + Abort when the set of components is empty. + * mln/core/site_set/p_set.hh (p_set::is_empty): New method. + 2010-07-19 Roland Levillain <roland(a)lrde.epita.fr> Fix and improve the Magick++ I/O API wrapper. diff --git a/milena/mln/core/site_set/p_set.hh b/milena/mln/core/site_set/p_set.hh index 53734e1..f41ded2 100644 --- a/milena/mln/core/site_set/p_set.hh +++ b/milena/mln/core/site_set/p_set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -108,6 +109,9 @@ namespace mln /// Give the number of sites. unsigned nsites() const; + /// Is the set empty? + bool is_empty() const; + /// Insertion element associated type. typedef P i_element; @@ -199,6 +203,14 @@ namespace mln template <typename P> inline + bool + p_set::is_empty() const + { + return s_.is_empty(); + } + + template <typename P> + inline void p_set::insert(const P& p) { diff --git a/milena/mln/morpho/watershed/topological.hh b/milena/mln/morpho/watershed/topological.hh index 8fe890c..ffd291a 100644 --- a/milena/mln/morpho/watershed/topological.hh +++ b/milena/mln/morpho/watershed/topological.hh @@ -38,6 +38,8 @@ /// Journal of Mathematical Imaging and Vision (JMIV), vol. 22, /// no. 2-3, pages 231--249, 2005. +# include <cstdlib> + # include <vector> # include <map> # include <queue> @@ -64,15 +66,16 @@ namespace mln { template <class I> - mln_site(I) min (const Image &ima_, p_set<mln_site(I)>& components) + mln_psite(I) min(const Image &ima_, p_set<mln_psite(I)>& components) { const I& ima = exact(ima_); - if (components.nsites() == 0) - return mln_site(I)(-1, -1); // FIXME + if (components.is_empty()) + // FIXME: Display an error message? Or throw an exception? + abort(); - typename p_set<mln_site(I)>::fwd_piter it(components); - mln_site(I) min = components[0]; + typename p_set<mln_psite(I)>::fwd_piter it(components); + mln_psite(I) min = components[0]; for_all(it) if (ima(it) < ima(min)) @@ -82,13 +85,14 @@ namespace mln } template <class I> - mln_site(I) max (p_set<mln_site(I)>& components) + mln_psite(I) max(p_set<mln_psite(I)>& components) { - if (components.nsites() == 0) - return mln_site(I)(-1, -1); // FIXME + if (components.is_empty()) + // FIXME: Display an error message? Or throw an exception? + abort(); - typename p_set<mln_site(I)>::fwd_piter it(components); - mln_site(I) max = components[0]; + typename p_set<mln_psite(I)>::fwd_piter it(components); + mln_psite(I) max = components[0]; for_all(it) if (ima(it) > ima(max)) @@ -104,7 +108,7 @@ namespace mln { // Typedefs // -------- - typedef mln_site(I) site; + typedef mln_psite(I) psite; typedef I image_t; typedef N neighborhood_t; @@ -115,23 +119,23 @@ namespace mln mln_value(I) level; int area; int highest; - typedef mln_site(I) site; + typedef mln_psite(I) psite; // Can't modify the sites in a p_array - // p_array<mln_site(I)> children; - std::vector<site> children; + // p_array<mln_psite(I)> children; + std::vector<psite> children; void addChildren(const node& n) { - // typename p_array<mln_site(I)>::fwd_piter it(n.children); + // typename p_array<mln_psite(I)>::fwd_piter it(n.children); // for (it.start(); // it.is_valid(); // it.next()) - // children.append(it.to_site()); + // children.append(it.to_psite()); for (unsigned i=0; i < n.children.size(); ++i) children.push_back(n.children[i]); } - void addChild(const site p) + void addChild(const psite p) { // children.append(n); children.push_back(p); @@ -140,25 +144,25 @@ namespace mln public: - mln_ch_value(I, site) Par_node; - mln_ch_value(I, site) Par_tree; + mln_ch_value(I, psite) Par_node; + mln_ch_value(I, psite) Par_tree; mln_ch_value(I, int) Rnk_tree; mln_ch_value(I, int) Rnk_node; - mln_ch_value(I, site) subtreeRoot; + mln_ch_value(I, psite) subtreeRoot; mln_ch_value(I, node) nodes; - site Root; + psite Root; private: - void MakeSet_tree(site x); - void MakeSet_node(site x); - site Find_tree(site x); - site Find_node(site x); + void MakeSet_tree(psite x); + void MakeSet_node(psite x); + psite Find_tree(psite x); + psite Find_node(psite x); void BuildComponentTree(); - site MergeNode(site& node1, site& node2); - site Link_tree(site x, site y); - site Link_node(site x, site y); + psite MergeNode(psite& node1, psite& node2); + psite Link_tree(psite x, psite y); + psite Link_node(psite x, psite y); node MakeNode(int level); private: @@ -177,31 +181,31 @@ namespace mln void go(); private: - site min (p_set<site>& components); - site max (p_set<site>& components); - bool highest_fork (p_set<site>& components); - bool highest_fork (p_set<site>& components, site &r); + psite min (p_set<psite>& components); + psite max (p_set<psite>& components); + bool highest_fork (p_set<psite>& components); + bool highest_fork (p_set<psite>& components, psite &r); // Optimized LCA Algorithm public: - site lca (site a, site b); + psite lca (psite a, psite b); private: int *euler; int *depth; int ctree_size; - std::map<site, int, mln::util::ord<site> > pos; - site *repr; + std::map<psite, int, mln::util::ord<psite> > pos; + psite *repr; int *minim; int **Minim; - void compute_ctree_size (site p); - void build_euler_tour_rec(site p, int &position, int d); + void compute_ctree_size (psite p); + void build_euler_tour_rec(psite p, int &position, int d); void build_euler_tour(); void build_minim (); - void removeOneSonNodes(site *p, mln_ch_value(I, site) &newPar_node); + void removeOneSonNodes(psite *p, mln_ch_value(I, psite) &newPar_node); void compressTree(); }; @@ -230,21 +234,21 @@ namespace mln } template <class I, class N> - void topo_wst<I, N>::MakeSet_tree(site x) + void topo_wst<I, N>::MakeSet_tree(psite x) { Par_tree(x) = x; Rnk_tree(x) = 0; } template <class I, class N> - void topo_wst<I, N>::MakeSet_node(site x) + void topo_wst<I, N>::MakeSet_node(psite x) { Par_node(x) = x; Rnk_node(x) = 0; } template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::Find_tree(site x) + typename topo_wst<I, N>::psite topo_wst<I, N>::Find_tree(psite x) { if (Par_tree(x) != x) Par_tree(x) = Find_tree(Par_tree(x)); @@ -252,7 +256,7 @@ namespace mln } template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::Find_node(site x) + typename topo_wst<I, N>::psite topo_wst<I, N>::Find_node(psite x) { if (Par_node(x) != x) Par_node(x) = Find_node(Par_node(x)); @@ -275,14 +279,14 @@ namespace mln // Init: // Sort the sites in increasing order - p_array<mln_site(I)> S; + p_array<mln_psite(I)> S; S = data::sort_psites_increasing(ima); // Clear the marker map data::fill(isproc, false); for (int ip = 0; ip < int(S.nsites()); ++ip) { - site p = S[ip]; + psite p = S[ip]; MakeSet_node(p); MakeSet_tree(p); // if (subtreeRoot.hold(p)) @@ -293,21 +297,21 @@ namespace mln - typename p_array<mln_site(I)>::fwd_piter ip(S); + typename p_array<mln_psite(I)>::fwd_piter ip(S); for_all(ip) { - site p = ip.to_site(); + psite p = ip; - site curCanonicalElt = Find_tree(p); - site curNode = Find_node(subtreeRoot(curCanonicalElt)); + psite curCanonicalElt = Find_tree(p); + psite curNode = Find_node(subtreeRoot(curCanonicalElt)); // FIXME: Should be `n' instead of `q'. mln_niter(N) q(nbh, ip); for_all(q) if (ima.has(q) and isproc(q) and ima(q) <= ima(p)) { - site adjCanonicalElt = Find_tree(q); - site adjNode = Find_node(subtreeRoot(adjCanonicalElt)); + psite adjCanonicalElt = Find_tree(q); + psite adjNode = Find_node(subtreeRoot(adjCanonicalElt)); if (curNode != adjNode) { if (nodes(curNode).level == nodes(adjNode).level) @@ -325,10 +329,10 @@ namespace mln } isproc(p) = true; } - // Pour garder une map de correspondance site <-> local_root + // Pour garder une map de correspondance psite <-> local_root // for (int ip = 0; ip < int(S.size()); ++ip) // { - // site p = S[ip]; + // psite p = S[ip]; // M(p) = Find_node(p); // } @@ -336,7 +340,7 @@ namespace mln for_all(r) Par_node(r) = Find_node(r); - // Find the ``first'' site of ima, according to the forward + // Find the ``first'' psite of ima, according to the forward // traversal order. mln_fwd_piter(I) rp(Par_node.domain());; rp.start(); @@ -346,11 +350,11 @@ namespace mln template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::MergeNode(site& node1, - site& node2) + typename topo_wst<I, N>::psite topo_wst<I, N>::MergeNode(psite& node1, + psite& node2) { - site tmpNode = Link_node(node1, node2); - site tmpNode2; + psite tmpNode = Link_node(node1, node2); + psite tmpNode2; if (tmpNode == node2) { nodes(node2).addChildren(nodes(node1)); @@ -367,7 +371,7 @@ namespace mln } template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::Link_tree(site x, site y) + typename topo_wst<I, N>::psite topo_wst<I, N>::Link_tree(psite x, psite y) { if (Rnk_tree(x) > Rnk_tree(y)) std::swap(x, y); @@ -379,7 +383,7 @@ namespace mln } template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::Link_node(site x, site y) + typename topo_wst<I, N>::psite topo_wst<I, N>::Link_node(psite x, psite y) { if (Rnk_node(x) > Rnk_node(y)) std::swap(x, y); @@ -402,7 +406,7 @@ namespace mln template <class I, class N> - bool topo_wst<I, N>::highest_fork (p_set<site>& components, site &r) + bool topo_wst<I, N>::highest_fork (p_set<psite>& components, psite &r) { if (components.nsites() == 0) { @@ -410,19 +414,19 @@ namespace mln return false; } - site + psite m = min(components), hfork = m; - typename p_set<site>::fwd_piter it(components); + typename p_set<psite>::fwd_piter it(components); for_all(it) { - // Can't remove the site from the set - if (it.to_site() == m) + // Can't remove the psite from the set + if (it.to_psite() == m) continue; - site c = lca(hfork, it.to_site()); - if (c != it.to_site()) + psite c = lca(hfork, it.to_psite()); + if (c != it.to_psite()) hfork = c; } @@ -434,20 +438,20 @@ namespace mln } template <class I, class N> - bool topo_wst<I, N>::highest_fork (p_set<site>& components) { - site i; + bool topo_wst<I, N>::highest_fork (p_set<psite>& components) { + psite i; return highest_fork(components, i); } template <class I, class N> - void topo_wst<I, N>::compute_ctree_size (site p) + void topo_wst<I, N>::compute_ctree_size (psite p) { ctree_size += 1; node& n = nodes(p); - // typename p_array<mln_site(I)>::fwd_piter it(n.children); + // typename p_array<mln_psite(I)>::fwd_piter it(n.children); // for_all(it) - // compute_ctree_size(it.to_site()); + // compute_ctree_size(it.to_psite()); for (unsigned i=0; i < n.children.size(); ++i) compute_ctree_size(n.children[i]); @@ -455,7 +459,7 @@ namespace mln template <class I, class N> - void topo_wst<I, N>::build_euler_tour_rec(site p, int &position, int d) + void topo_wst<I, N>::build_euler_tour_rec(psite p, int &position, int d) { if (pos.find(p) == pos.end()) pos[p] = position; @@ -466,10 +470,10 @@ namespace mln ++position; node& n = nodes(p); - // typename p_array<mln_site(I)>::fwd_piter it(n.children); + // typename p_array<mln_psite(I)>::fwd_piter it(n.children); // for_all(it) // { - // build_euler_tour_rec(it.to_site(), position, d+1); + // build_euler_tour_rec(it.to_psite(), position, d+1); // depth[position] = d; // Not optimized // euler[position] = pos[p]; // repr[position] = p; // Pas necessaire? @@ -498,7 +502,7 @@ namespace mln // FIXME : free this euler = new int[size]; depth = new int[size]; - repr = new site[size]; + repr = new psite[size]; int position = 0; build_euler_tour_rec(Root, position, 0); @@ -549,7 +553,7 @@ namespace mln template <class I, class N> - typename topo_wst<I, N>::site topo_wst<I, N>::lca (site a, site b) + typename topo_wst<I, N>::psite topo_wst<I, N>::lca (psite a, psite b) { int m = pos[a], @@ -577,8 +581,8 @@ namespace mln template <class I, class N> - void topo_wst<I, N>::removeOneSonNodes(site *p, - mln_ch_value(I, site) &newPar_node) + void topo_wst<I, N>::removeOneSonNodes(psite *p, + mln_ch_value(I, psite) &newPar_node) { node &n = nodes(*p); @@ -600,7 +604,7 @@ namespace mln template <class I, class N> void topo_wst<I, N>::compressTree() { - mln_ch_value(I, site) newPar_node; + mln_ch_value(I, psite) newPar_node; initialize(newPar_node, Par_node); // Remove the nodes with one son @@ -614,7 +618,7 @@ namespace mln } template <class T> - bool w_constructible(T &tree, typename T::site p, typename T::site &r) + bool w_constructible(T &tree, typename T::psite p, typename T::psite &r) { typedef typename T::image_t I; @@ -625,7 +629,7 @@ namespace mln // FIXME: Should be `n' instead of `q'. mln_niter(N) q(nbh, p); - p_set<mln_site(I)> v; + p_set<mln_psite(I)> v; for_all(q) // FIXME: Shouldn't it be: `ima.has(q)' instead of @@ -642,17 +646,17 @@ namespace mln return true; } - mln_site(I) c = min(ima, v); - mln_site(I) cmin = c; + mln_psite(I) c = min(ima, v); + mln_psite(I) cmin = c; - typename p_set<mln_site(I)>::fwd_piter it(v); + typename p_set<mln_psite(I)>::fwd_piter it(v); for_all(it) { - // Can't remove the site from the set - if (it.to_site() == cmin) + // Can't remove the psite from the set + if (it == cmin) continue; - mln_site(I) c1 = tree.lca(c, it); + mln_psite(I) c1 = tree.lca(c, it); if (c1 != it) c = c1; @@ -666,8 +670,8 @@ namespace mln } template <class T> - bool w_constructible(T &tree, typename T::site p) { - typename T::site r; + bool w_constructible(T &tree, typename T::psite p) { + typename T::psite r; return w_constructible(tree, p, r); } @@ -691,12 +695,13 @@ namespace mln mln_ch_value(I, bool) enqueued; initialize(enqueued, ima); - p_priority< mln_value(I), p_queue_fast<mln_site(I)> > l; - // p_queue < site > m; - std::queue<mln_site(I)> m; + p_priority< mln_value(I), p_queue_fast<mln_psite(I)> > l; + // p_queue < psite > m; + std::queue<mln_psite(I)> m; + // FIXME: « Unused variable 'min' » ! mln_value(I) min = mln_min(mln_value(I)); - std::cout << "Init" << std::endl; + // std::cout << "Init" << std::endl; // Flag C-maxima data::fill(cmax, false); @@ -704,7 +709,7 @@ namespace mln mln_piter(I) it(tree.Par_node.domain()); for_all(it) - // if (nodes(Par_node(it.to_site())).children.nsites() == 0) + // if (nodes(Par_node(it.to_psite())).children.nsites() == 0) if (tree.nodes(tree.Par_node(it)).children.size() == 0) { cmax(it) = true; @@ -727,16 +732,16 @@ namespace mln } - std::cout << "end" << std::endl; + // std::cout << "end" << std::endl; // Main loop while (!l.is_empty()) { - mln_site(I) x = l.front(); + mln_psite(I) x = l.front(); l.pop(); enqueued(x) = false; - mln_site(I) c; + mln_psite(I) c; bool is_w = w_constructible(tree, x, c); if (is_w) -- 1.5.6.5

14 years, 3 months

branch topological-wst created: last-svn-commit-184-g17eaa12

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch topological-wst has been created at 17eaa12b6d8b4a8f3f694c1a07bf27e1a11e6346 (commit) - Log ----------------------------------------------------------------- 17eaa12 Have the topological WST be more generic (though still a bit buggy). ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 3 months

branch more-generic-skel created: last-svn-commit-205-g25950c4

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch more-generic-skel has been created at 25950c4401a9d94c8879ff9e9d561272e3055eb4 (commit) - Log ----------------------------------------------------------------- 25950c4 Use mln::data::paste to simplify mesh skeleton applications. c0f02ec Update mesh skeleton applications. 876aaf5 More generic breadth-first-thinning-based skeleton transformations. c9a6f38 Introduce a helper to build an mln::mutable_extension_ima. d0945cb Introduce an extension-by-mutable-image morpher. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 3 months

branch mesh-segm-skel updated: last-svn-commit-200-gad49d7e

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch mesh-segm-skel has been updated via ad49d7efbc810b16dcedc41d74b52c4168ec81dd (commit) via 0448a2b0a84c09574f78eb46c33bd529880d5aae (commit) from 12ce2023e232ab5615217a77f783a1e3dd63849a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ad49d7e Make the 5th argument of breadth_first_thinning truly optional. 0448a2b Add more documentation on the detach procedure. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 19 ++++++++++ milena/mln/make/detachment.hh | 10 ++++- milena/mln/topo/detach.hh | 10 +++--- milena/mln/topo/skeleton/breadth_first_thinning.hh | 36 ++++++++++++++++++- 4 files changed, 66 insertions(+), 9 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 3 months

last-svn-commit-212-g8cbc086 Use mln::data::paste to simplify mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Here. --- milena/ChangeLog | 9 ++++++++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 22 ++++++++++---------- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 22 ++++++++++---------- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 22 ++++++++++---------- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5155968..4801766 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Use mln::data::paste to simplify mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Here. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. * apps/mesh-segm-skel/mesh-complex-skel.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index d04354d..2687bf6 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -267,9 +268,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -302,11 +300,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -324,7 +326,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 07f1925..855a36c 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -272,9 +273,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -307,11 +305,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -329,7 +331,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index af57de0..e460e0e 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -39,6 +39,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -225,9 +226,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -260,11 +258,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -282,7 +284,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } -- 1.5.6.5

14 years, 3 months

last-svn-commit-205-g25950c4 Use mln::data::paste to simplify mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Here. --- milena/ChangeLog | 9 ++++++++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 22 ++++++++++---------- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 22 ++++++++++---------- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 22 ++++++++++---------- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2c88979..b019568 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Use mln::data::paste to simplify mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Here. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. * apps/mesh-segm-skel/mesh-complex-skel.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index d04354d..2687bf6 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -267,9 +268,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -302,11 +300,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -324,7 +326,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 07f1925..855a36c 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -272,9 +273,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -307,11 +305,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -329,7 +331,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index af57de0..e460e0e 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -39,6 +39,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -225,9 +226,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -260,11 +258,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -282,7 +284,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } -- 1.5.6.5

14 years, 3 months

last-svn-commit-211-g086b7d8 Update mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Catch up with the new interface of breadth-first thinning and auxiliary routines. --- milena/ChangeLog | 10 +++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 82 ++++++++++++++++---- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 82 ++++++++++++++++---- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 82 ++++++++++++++++---- 4 files changed, 205 insertions(+), 51 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index db83d42..5155968 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Catch up with the new interface of breadth-first thinning and + auxiliary routines. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + More generic breadth-first-thinning-based skeleton transformations. * mln/topo/is_simple_cell.hh: Make this functor more generic. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index 5c17726..d04354d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -252,31 +254,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 7092b18..07f1925 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -257,31 +259,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index f5a7f11..af57de0 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -36,7 +36,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -210,31 +212,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach_cell<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } -- 1.5.6.5

14 years, 3 months

last-svn-commit-204-gc0f02ec Update mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Catch up with the new interface of breadth-first thinning and auxiliary routines. --- milena/ChangeLog | 10 ++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 84 +++++++++++++++---- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 84 +++++++++++++++---- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 87 +++++++++++++++---- 4 files changed, 210 insertions(+), 55 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b15ba2a..2c88979 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Catch up with the new interface of breadth-first thinning and + auxiliary routines. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + More generic breadth-first-thinning-based skeleton transformations. * mln/topo/is_simple_cell.hh: Make this functor more generic. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index b910aae..d04354d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -48,7 +50,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -252,31 +254,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 4a59a6b..07f1925 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -39,7 +39,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -48,7 +50,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -257,31 +259,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index 5cd97b4..af57de0 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -35,7 +36,9 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/core/site_set/p_set.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/mutable_extend.hh> #include <mln/value/label_16.hh> @@ -44,7 +47,7 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach.hh> +#include <mln/topo/detach_cell.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> #include <mln/io/off/load.hh> @@ -209,31 +212,77 @@ main(int argc, char* argv[]) | Skeleton. | `-----------*/ - mln::topo::is_simple_cell<bin_ima_t> is_simple_p; - /* FIXME: Cheat! We'd like to iterate on cells of highest - dimension (2-cells) only, but we cannot constrain the domain of - the input using image_if (yet) like this + // ---------------- // + // Skeleton image. // + // ---------------- // + + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<D> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + // Surface image type, of which domain is restricted to triangles. + typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to triangles. + typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> + bin_triangle_ima_t; + // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). + bin_triangle_ima_t bin_triangle_ima = + mln::mutable_extend((surface | is_a_triangle).rw(), surface); + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Neighborhood type returning the set of (n-1)- and (n+1)-faces + // adjacent to a an n-face. + typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + // Predicate type: is a triangle (2-face) simple? + typedef mln::topo::is_simple_cell< bin_triangle_ima_t, + adj_nbh_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_triangle_t; + is_simple_triangle_t is_simple_triangle; + + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Type of adjacency relationships between faces of immediately + // lower and higher dimensions. + adj_nbh_t adj_nbh; + // Functor detaching a cell. + mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + + mln_concrete_(bin_triangle_ima_t) skel = + mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, + nbh, + is_simple_triangle, + detach); - breadth_first_thinning(surface | is_n_face<2>, nbh, is_simple_p); - - As a workaround, we use the constraint predicate of the - skeleton routine to restrict the iteration to 2-cells. */ - mln::topo::is_n_face<bin_ima_t::dim> constraint_p; - bin_ima_t skel = - mln::topo::skeleton::breadth_first_thinning(surface, nbh, - is_simple_p, - mln::topo::detach<D, G>, - constraint_p); /*---------. | Output. | `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) + + Moreover, even if it worked, it would not have the same meaning + as mln::io::off::save_bin_alt. Maybe the latter is useful, after + all. But we need to factor it with the code of + mln::io::off::save, anyway. */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - mln::io::off::save_bin_alt(skel, output_filename); + // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only + // handles complex_image's. + mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); } -- 1.5.6.5

14 years, 3 months

last-svn-commit-210-gc17805c More generic breadth-first-thinning-based skeleton transformations.

by Roland Levillain

* mln/topo/is_simple_cell.hh: Make this functor more generic. * mln/topo/detach_cell.hh (detach): Turn this function into a more generic functor. * mln/make/attachment.hh (mln::make::attachment) * mln/make/detachment.hh (mln::make::detachment): Make these routines more generic. * mln/topo/skeleton/breadth_first_thinning.hh (mln::topo::skeleton::breadth_first_thinning): Adjust. * headers.mk: Regen. --- milena/ChangeLog | 15 +++ milena/mln/make/attachment.hh | 48 +++++---- milena/mln/make/detachment.hh | 41 +++++--- milena/mln/topo/detach_cell.hh | 107 ++++++++++++++++--- milena/mln/topo/is_simple_cell.hh | 81 ++++++++------- milena/mln/topo/skeleton/breadth_first_thinning.hh | 18 +++- 6 files changed, 213 insertions(+), 97 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index eaf4b85..db83d42 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + More generic breadth-first-thinning-based skeleton transformations. + + * mln/topo/is_simple_cell.hh: Make this functor more generic. + * mln/topo/detach_cell.hh (detach): Turn this function into a + more generic functor. + * mln/make/attachment.hh (mln::make::attachment) + * mln/make/detachment.hh (mln::make::detachment): + Make these routines more generic. + * mln/topo/skeleton/breadth_first_thinning.hh + (mln::topo::skeleton::breadth_first_thinning): + Adjust. + * headers.mk: Regen. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a helper to build an mln::mutable_extension_ima. * mln/core/routine/mutable_extend.hh: New. diff --git a/milena/mln/make/attachment.hh b/milena/mln/make/attachment.hh index 088f9df..3af5332 100644 --- a/milena/mln/make/attachment.hh +++ b/milena/mln/make/attachment.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,52 +43,58 @@ namespace mln /** \brief Compute the attachment of the cell corresponding to the facet \a f to the image \a ima. + \param ima The input image to which the facet is attached. + \param f The psite corresponding to the attached facet. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). + + \return A set of faces containing the attachment. + + \pre ima is an image of Boolean values. \pre \a f is a facet (it does not belong to any face of higher dimension). - \pre ima is an image of Boolean values. - - \return a set of faces containing the attachment. We do not use the fomal definition of the attachment here (see couprie.08.pami). We use the following (equivalent) definition: an N-face F in CELL is in the attachment of CELL to IMA if it is adjacent to at least an (N-1)-face or an (N+1)-face that does not belong to CELL. */ - template <unsigned D, typename G, typename V> - p_set< complex_psite<D, G> > - attachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima); + template <typename I, typename N> + p_set<mln_psite(I)> + attachment(const Image& ima, const mln_psite(I)& f, + const Neighborhood<N>& nbh); # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G, typename V> + template <typename I, typename N> inline - p_set< complex_psite<D, G> > - attachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima) + p_set<mln_psite(I)> + attachment(const Image& ima_, const mln_psite(I)& f, + const Neighborhood<N>& nbh_) { mln_precondition(topo::is_facet(f)); - mlc_equal(V, bool)::check(); + mlc_equal(mln_value(I), bool)::check(); + + I ima = exact(ima_); + N nbh = exact(nbh_); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; faces_t f_hat = make::cell(f); - faces_t att_f; + faces_t attach_f; - typedef complex_lower_higher_neighborhood<D, G> adj_nbh_t; - adj_nbh_t adj_nbh; mln_piter(faces_t) g(f_hat); - mln_niter(adj_nbh_t) n(adj_nbh, g); + mln_niter(N) n(nbh, g); for_all(g) for_all(n) if (ima(n) && !f_hat.has(n)) { - att_f.insert(g); + attach_f.insert(g); break; } - return att_f; + return attach_f; } # endif // MLN_INCLUDE_ONLY diff --git a/milena/mln/make/detachment.hh b/milena/mln/make/detachment.hh index 16a8c92..6cd01ba 100644 --- a/milena/mln/make/detachment.hh +++ b/milena/mln/make/detachment.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -43,12 +43,19 @@ namespace mln /** \brief Compute the detachment of the cell corresponding to the facet \a f from the image \a ima. + \param ima The input image from which the facet is to be + detached. + \param f The psite corresponding to the facet to detach. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). + + \return A set of faces containing the detachment. + \pre \a f is a facet (it does not belong to any face of higher dimension). \pre \a ima is an image of Boolean values. - \return a set of faces containing the detachment. - We do not use the fomal definition of the detachment here (see couprie.08.pami). We use the following (equivalent) definition: an N-face F in CELL is not in the detachment of CELL from IMA if @@ -60,34 +67,34 @@ namespace mln the part that is removed, i.e., the detached part CELL - ATTACHMENT. It would be wise to rename this routine to something else. */ - template <unsigned D, typename G, typename V> - p_set< complex_psite<D, G> > - detachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima); + template <typename I, typename N> + p_set<mln_psite(I)> + detachment(const Image& ima, const mln_psite(I)& f, + const Neighborhood<N>& nbh); # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G, typename V> + template <typename I, typename N> inline - p_set< complex_psite<D, G> > - detachment(const complex_psite<D, G>& f, - const complex_image<D, G, V>& ima) + p_set<mln_psite(I)> + detachment(const Image& ima_, const mln_psite(I)& f, + const Neighborhood<N>& nbh_) { mln_precondition(topo::is_facet(f)); - mlc_equal(V, bool)::check(); + mlc_equal(mln_value(I), bool)::check(); + + I ima = exact(ima_); + N nbh = exact(nbh_); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; faces_t f_hat = make::cell(f); // Initialize DETACH_F to F_HAT. faces_t detach_f = f_hat; - typedef complex_lower_higher_neighborhood<D, G> adj_nbh_t; - adj_nbh_t adj_nbh; mln_piter(faces_t) g(f_hat); - mln_niter(adj_nbh_t) n(adj_nbh, g); + mln_niter(N) n(nbh, g); for_all(g) for_all(n) if (ima(n) && !f_hat.has(n)) diff --git a/milena/mln/topo/detach_cell.hh b/milena/mln/topo/detach_cell.hh index dfc4fb5..9e2a489 100644 --- a/milena/mln/topo/detach_cell.hh +++ b/milena/mln/topo/detach_cell.hh @@ -27,7 +27,7 @@ # define MLN_TOPO_DETACH_CELL_HH /// \file -/// \brief Detaching a cell from a binary complex-based image. +/// \brief Detaching a cell from a binary (probably complex-based) image. # include <mln/core/site_set/p_set.hh> # include <mln/core/image/complex_image.hh> @@ -40,38 +40,111 @@ namespace mln namespace topo { - /** Detach the cell corresponding to \a f from \a ima. + /** A functor detaching a cell from a binary (probably + complex-based) image. - \pre \a f is a facet (it does not belong to any face of higher - dimension). - \pre \a ima is an image of Boolean values. */ - template <unsigned D, typename G> - void - detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima); + \tparam I The type of the image. + \tparam N An neighborhood type corresponding to (directly) + adjacent faces (should return the set of (n-1)- and + (n+1)-faces adjacent to an n-face). */ + template <typename I, typename N> + class detach_cell + { + public: + /// Constructors. + /// \{ + /** Construct an mln::topo::detach_cell from a neighborhood. + + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + detach_cell(const Neighborhood<N>& nbh); + + /** Construct an mln::topo::detach_cell from an image and a + neighborhood. + + \pre \a ima is an image of Boolean values. + + \param ima The input image from which the facet is to be + detached. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + detach_cell(mln::Image& ima, const Neighborhood<N>& nbh); + /// \} + + /* FIXME: Rename as init() or something like this? See how other + functors are written. */ + /** Set the underlying image. + + \pre \a ima is an image of Boolean values. */ + void set_image(mln::Image& ima); + + /** Detach the cell corresponding to \a f from \a ima. + + \pre \a f is a facet (it does not belong to any face of + higher dimension). + + \param f The psite corresponding to the facet to detach. + \param nbh An adjacency relationship between faces + (should return the set of (n-1)- and (n+1)-faces + adjacent to an n-face). */ + void + operator()(const mln_psite(I)& f); + + private: + I* ima_; + const N& nbh_; + }; # ifndef MLN_INCLUDE_ONLY - template <unsigned D, typename G> + template <typename I, typename N> + inline + detach_cell<I, N>::detach_cell(const Neighborhood<N>& nbh) + : ima_(0), nbh_(exact(nbh)) + { + } + + template <typename I, typename N> + inline + detach_cell<I, N>::detach_cell(mln::Image& ima, + const Neighborhood<N>& nbh) + : ima_(exact(&ima)), nbh_(exact(nbh)) + { + mlc_equal(mln_value(I), bool)::check(); + } + + template <typename I, typename N> + inline + void + detach_cell<I, N>::set_image(mln::Image& ima) + { + mlc_equal(mln_value(I), bool)::check(); + ima_ = exact(&ima); + } + + template <typename I, typename N> inline void - detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima) + detach_cell<I, N>::operator()(const mln_psite(I)& f) { + mln_precondition(ima_); mln_precondition(topo::is_facet(f)); - typedef complex_psite<D, G> psite; - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; - // Compute the detachment of P from IMA. - faces_t detach = make::detachment(f, ima); - // Detach all its faces from IMA. + // Compute the detachment of P from *IMA_. + faces_t detach = make::detachment(*ima_, f, nbh_); + // Detach all its faces from *IMA_. # if 0 // FIXME: Does not work yet? Check again. - data::fill(ima | detach, false); + data::fill(*ima_ | detach, false); # endif mln_piter(faces_t) p(detach); for_all(p) - ima(p) = false; + (*ima_)(p) = false; } # endif // MLN_INCLUDE_ONLY diff --git a/milena/mln/topo/is_simple_cell.hh b/milena/mln/topo/is_simple_cell.hh index a86a8fa..bf60c3d 100644 --- a/milena/mln/topo/is_simple_cell.hh +++ b/milena/mln/topo/is_simple_cell.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,6 @@ # define MLN_TOPO_IS_SIMPLE_CELL_HH /// \file -/// /// \brief Testing whether a facet is a simple cell. # include <mln/core/concept/function.hh> @@ -48,22 +47,29 @@ namespace mln namespace topo { + /* FIXME: Maybe we could add traits to deduce N from NL and NH (or + the converse). Anyway, the part of the code where neighborhood + are used should be moved into another functor + (`is_collapsible', see below), thus pushing away this + issue. */ + /** \brief A predicate for the simplicity of a point based on the collapse property of the attachment. The functor does not actually take a cell as input, but a face - that is expected to be a D-facet. */ - template <typename I> - class is_simple_cell : public mln::Function_v2b< is_simple_cell > + that is expected to be a D-facet. + + \tparam I The type of the image. + \tparam N The neighborhood type returning the set of + (n-1)- and (n+1)-faces adjacent to a an n-face. + \tparam NL The neighborhood type returning the set of + (n-1)-faces adjacent to a an n-face. + \tparam NH The neighborhood type returning the set of + (n+1)-faces adjacent to a an n-face. */ + template <typename I, typename N, typename NL, typename NH> + class is_simple_cell : public mln::Function_v2b< is_simple_cell<I, N, NL, NH> > { public: - /// Dimension of the image (and therefore of the complex). - static const unsigned D = I::dim; - /// Geometry of the image. - typedef mln_geom(I) G; - /// Psite type. - typedef mln::complex_psite<D, G> psite; - /// Result type of the functor. typedef bool result; @@ -76,8 +82,11 @@ namespace mln void set_image(const mln::Image& ima); /// Based on the algorithm A2 from couprie.08.pami. - bool operator()(const mln::complex_psite<I::dim,mln_geom(I)>& p) const; - // Tech note: The argument type above is explicit to help g++-3.3. + /* FIXME: We probably broke the compatiblity with g++ 3.3, as it + seems this compiler does not like an indirect type like the + one of the following operator's argument. Check and possibly + improve this. */ + bool operator()(const mln_psite(I)& p) const; private: const I* ima_; @@ -87,44 +96,44 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline - is_simple_cell::is_simple_cell() + is_simple_cell<I, N, NL, NH>::is_simple_cell() : ima_(0) { } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline - is_simple_cell::is_simple_cell(const mln::Image& ima) - : ima_(mln::exact(&ima)) + is_simple_cell<I, N, NL, NH>::is_simple_cell(const mln::Image& ima) + : ima_(exact(&ima)) { } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline void - is_simple_cell::set_image(const mln::Image& ima) + is_simple_cell<I, N, NL, NH>::set_image(const mln::Image& ima) { - ima_ = mln::exact(&ima); + ima_ = exact(&ima); } - template <typename I> + template <typename I, typename N, typename NL, typename NH> inline bool - is_simple_cell::operator()(const mln::complex_psite<I::dim,mln_geom(I)>& p) const - // Tech note: The argument type above is explicit to help g++-3.3. + is_simple_cell<I, N, NL, NH>::operator()(const mln_psite(I)& p) const { mln_precondition(ima_); - typedef p_set<psite> faces_t; + typedef p_set<mln_psite(I)> faces_t; - // Compute the attachment of the cell corresponding to P to he + // Compute the attachment of the cell corresponding to P to the // domain of *IMA_. - faces_t att = make::attachment(p, *ima_); + N adj_nbh; + faces_t att = make::attachment(*ima_, p, adj_nbh); // A cell with an empty attachment is not simple. - /* FIXME: Why does p_set not provide an empty() predicate? */ + /* FIXME: Why p_set does not provide an empty() predicate? */ if (att.nsites() == 0) return false; @@ -134,10 +143,8 @@ namespace mln routine. */ // Try to collapse the attachment (to a single point). { - typedef complex_lower_neighborhood<D, G> lower_adj_nbh_t; - typedef complex_higher_neighborhood<D, G> higher_adj_nbh_t; - lower_adj_nbh_t lower_adj_nbh; - higher_adj_nbh_t higher_adj_nbh; + NL lower_adj_nbh; + NH higher_adj_nbh; while (att.nsites() > 1) { @@ -149,11 +156,11 @@ namespace mln for_all(g) /* G cannot have dimension 0, since we later look for an adjacent face H of lower dimension. */ - if (static_cast<psite>(g).n() > 0) + if (static_cast<mln_psite(I)>(g).n() > 0) { // Check whether G is a facet within ATT. bool g_is_facet = true; - mln_niter(higher_adj_nbh_t) f(higher_adj_nbh, g); + mln_niter(NH) f(higher_adj_nbh, g); for_all(f) if (att.has(f)) { @@ -165,13 +172,13 @@ namespace mln // Look for a face H stricly included in G. bool gh_is_simple_pair = false; - mln_niter(lower_adj_nbh_t) h(lower_adj_nbh, g); + mln_niter(NL) h(lower_adj_nbh, g); for_all(h) { bool h_strictly_in_g = true; if (att.has(h)) { - mln_niter(higher_adj_nbh_t) i(higher_adj_nbh, h); + mln_niter(NH) i(higher_adj_nbh, h); for_all(i) if (i != g && att.has(i)) { diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index 3be9539..2be2b9c 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -61,9 +61,13 @@ namespace mln (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. \param constraint A constraint on point (site); if it returns \c false for a point, this point - will not be removed. */ + will not be removed. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G, typename H> mln_concrete(I) breadth_first_thinning(const Image& input, @@ -83,8 +87,11 @@ namespace mln \param is_simple The predicate on the simplicity of points (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. - \param detach A function used to detach a cell from - \a input. */ + \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G> mln_concrete(I) breadth_first_thinning(const Image& input, @@ -112,8 +119,9 @@ namespace mln const H& constraint = exact(constraint_); mln_concrete(I) output = duplicate(input); - // Attach the work image to IS_SIMPLE. + // Attach the work image to IS_SIMPLE and DETACH. is_simple.set_image(output); + detach.set_image(output); typedef mln_psite(I) psite; typedef p_set<psite> set_t; @@ -152,7 +160,7 @@ namespace mln given p during the thinning. */ if (output(p) && constraint(p) && is_simple(p)) { - detach(p, output); + detach(p); mln_niter(N) n_(nbh, p); for_all(n_) { -- 1.5.6.5

14 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2010