- Olena-patches

1403: Fix ChangeLogs
by Roland Levillain 29 Oct '07

29 Oct '07

My bad. I need to get used again to Olena's multiple ChangeLogs! :) Index: ChangeLog =================================================================== --- ChangeLog (revision 1402) +++ ChangeLog (revision 1403) @@ -1,10 +1,3 @@ -2007-10-29 Roland Levillain <roland(a)lrde.epita.fr> - - * milena/mln/labeling: Rename as... - * milena/mln/labeling: ...this. - According to the Robert & Collins dictionary, `labelling' is - spelled with two l's. - 2007-10-22 Roland Levillain <roland(a)lrde.epita.fr> Add support for the FreeImage library. Index: milena/ChangeLog =================================================================== --- milena/ChangeLog (revision 1402) +++ milena/ChangeLog (revision 1403) @@ -1,3 +1,10 @@ +2007-10-29 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/labeling: Rename as... + * mln/labeling: ...this. + According to the Robert & Collins dictionary, `labelling' is + spelled with two l's. + 2007-10-29 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update test for fllt.

1 0

1401: Rename milena/mln/labeling as milena/mln/labelling.
by Roland Levillain 29 Oct '07

29 Oct '07

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * milena/mln/labeling: Rename as... * milena/mln/labeling: ...this. According to the Robert & Collins dictionary, `labelling' is spelled with two l's. 0 files changed

1 0

milena r1393: Add iterator for branches
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add iterator for branches. * mln/util/branch_iter.hh: To iterate on branch. * mln/util/tree.hh: Add branch class, fix tree. * mln/util/tree_to_image.hh: Fix. * mln/value/concept/built_in.hh: Add a forward declaration. * sandbox/garrigues/fllt.hh: Update. * tests/branch_iter.cc: Test for branch_iter. --- mln/util/branch_iter.hh | 161 ++++++++++++++++++++++++++++++++++++++++++ mln/util/tree.hh | 98 ++++++++++++++++++++++--- mln/util/tree_to_image.hh | 3 mln/value/concept/built_in.hh | 1 sandbox/garrigues/fllt.hh | 43 +++++++++-- tests/branch_iter.cc | 68 +++++++++++++++++ 6 files changed, 354 insertions(+), 20 deletions(-) Index: trunk/milena/tests/branch_iter.cc =================================================================== --- trunk/milena/tests/branch_iter.cc (revision 0) +++ trunk/milena/tests/branch_iter.cc (revision 1393) @@ -0,0 +1,68 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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/branch_iter.cc + * + * \brief test of mln::util::branch_iter + * + */ + +#include <mln/core/image2d.hh> +#include <mln/util/tree.hh> +#include <mln/util/branch_iter.hh> + +int main() +{ + using namespace mln; + + util::node<int> n(11); + + util::tree<int> t(&n); + + util::node<int>* f = n.add_child(42); + + util::node<int>* g = f->add_child(421); + util::node<int>* h = f->add_child(422); + + g->add_child(4211)->add_child(51)->add_child(52)->add_child(53)->add_child(54)->add_child(55); + g->add_child(4212); + + f->add_child(4221); + f->add_child(4222); + + n.add_child(43); + + util::branch<int> b(t, n); + + std::vector< util::node<int>* >::iterator it; + util::branch_iter<int> p(b); + for_all(p) + { + std::cout << "parcour : " << util::node<int>(p).elt() << std::endl; + } +} Index: trunk/milena/mln/value/concept/built_in.hh =================================================================== --- trunk/milena/mln/value/concept/built_in.hh (revision 1392) +++ trunk/milena/mln/value/concept/built_in.hh (revision 1393) @@ -42,6 +42,7 @@ namespace value { + template <typename B> struct Built_In; // Category flag type. template <> struct Built_In<void> // No inheritance here since this category is special (on the side). Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1392) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1393) @@ -65,9 +65,8 @@ mln_piter(set_p<point2d>) p(node->elt_.points); for_all(p) - { output(p) = node->elt_.value; - } + typename std::vector< util::node<T>* >::const_iterator it = node->child_.begin(); for (int i = 0; Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1392) +++ trunk/milena/mln/util/tree.hh (revision 1393) @@ -45,15 +45,34 @@ namespace util { + /// Fwd declarations. + template <typename T> class node; + template <typename T> class tree; + template <typename T> class branch; + template <typename T> - struct node + class node { + public: + + /// \{ Constructors node(); - node(T& elt); + node(T elt); + /// \} + + /// \{ Acccess to the element. + T& elt(); + const T& elt() const; + /// \} + + /// Access to the children + const std::vector< node<T>* >& children() const; + std::vector< node<T>* >& children(); - T& content(); - const T& content() const; - node<T>* add_child(T& elt); + /// Access to the parent node. + const node<T>* parent() const; + + node<T>* add_child(T elt); void set_parent(node<T>* parent); node<T>* get_parent(); void print_rec(int n) const; @@ -61,14 +80,17 @@ int search_rec(node<T>** res, T& elt); node<T>* search(T& elt); + private: + //FIXME tree<T>& tree_; T elt_; node<T>* parent_; std::vector< node<T>* > child_; }; template <typename T> - struct tree + class tree { + public: typedef node<T> node_t; tree(); tree(node<T>* root); @@ -77,9 +99,26 @@ void add_tree_up (T& elt); void add_tree_down (T& elt); + private: node<T>* root_; }; + + template <typename T> + class branch + { + public: + branch(tree<T>& tree, node<T>& apex); + + node<T>& apex(); + tree<T>& tree(); + + private: + node<T>& apex_; + util::tree<T>& tree_; + }; + + # ifndef MLN_INCLUDE_ONLY template <typename T> @@ -131,7 +170,7 @@ } template <typename T> - node<T>::node(T& elt) + node<T>::node(T elt) : elt_ (elt), parent_ (0) { @@ -139,21 +178,36 @@ template <typename T> const T& - node<T>::content() const + node<T>::elt() const { return elt_; } template <typename T> T& - node<T>::content() + node<T>::elt() { return elt_; } + + template <typename T> + std::vector< node<T>* >& + node<T>::children() + { + return child_; + } + + template <typename T> + const std::vector< node<T>* >& + node<T>::children() const + { + return child_; + } + template <typename T> node<T>* - node<T>::add_child(T& elt) + node<T>::add_child(T elt) { node<T>* s = new node<T>(elt); @@ -211,6 +265,30 @@ return 0; } + // Branch methods + template <typename T> + branch<T>::branch(util::tree<T>& tree, + util::node<T>& apex) + : tree_(tree), + apex_(apex) + { + } + + + template <typename T> + util::node<T>& + branch<T>::apex() + { + return apex_; + } + + template <typename T> + util::tree<T>& + branch<T>::tree() + { + return tree_; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::util Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 0) +++ trunk/milena/mln/util/branch_iter.hh (revision 1393) @@ -0,0 +1,161 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_UTIL_BRANCH_ITER_HH +# define MLN_UTIL_BRANCH_ITER_HH + +# include <stack> +# include <mln/util/tree.hh> +/*! + * \file mln/util/branch.hh + * + * \brief Definition of a iterator on branch. + * + */ + +namespace mln +{ + + namespace util + { + template <typename T> + class branch_iter + { + public: + branch_iter(branch<T> branch); + + /// Convertion to node. + operator node<T>&() const; + + /// Test the iterator validity. + bool is_valid() const; + + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + + /// Go to the next point. + void next(); + + + private: + util::branch<T> branch_; + + typedef typename std::vector< util::node<T>* >::iterator child_iter; + typedef std::pair<child_iter, child_iter> iter_pair; + /// Store child().begin() and child().end(). + std::stack< iter_pair > s_; + + util::node<T>* n_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename T> + branch_iter<T>::branch_iter(branch<T> branch) + : branch_(branch) + { + invalidate(); + } + + template <typename T> + branch_iter<T>::operator node<T>&() const + { + mln_assertion(n_); + return *n_; + } + + template <typename T> + bool + branch_iter<T>::is_valid() const + { + return n_ != 0; + } + + template <typename T> + void + branch_iter<T>::invalidate() + { + n_ = 0; + } + + + template <typename T> + void + branch_iter<T>::start() + { + s_.push(iter_pair(branch_.apex().children().begin(), + branch_.apex().children().end())); + n_ = &branch_.apex(); + + //n_ = *(s_.top().first); + //s_.top().first++; + } + + template <typename T> + void + branch_iter<T>::next() + { + if (s_.size() == 0) + invalidate(); + else + { + if (s_.top().first == s_.top().second) + //if (*(s_.top().first) == 0) + { + mln_assertion(n_); + s_.pop(); + next(); + return; + } + else + { + n_ = *(s_.top().first); + s_.top().first++; + + mln_assertion(n_); + if (n_->children().size() > 0) + s_.push(iter_pair(n_->children().begin(), + n_->children().end())); + return; + } + } + } + +# endif // ! MLN_INCLUDE_ONLY + + + } + +} // end of namespace mln + + +#endif // !MLN_UTIL_BRANCH_HH Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1392) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1393) @@ -246,10 +246,10 @@ // FIXME : we can make it faster. mln_piter(set_p) p(R); current_region = new fllt_node(P, V)(); - current_region->content().value = g; + current_region->elt().value = g; for_all(p) { - current_region->content().points.insert(p); + current_region->elt().points.insert(p); if (regions(p) == 0) regions(p) = current_region; else @@ -281,7 +281,7 @@ // and which are the holes. Keep one pixel of each holes. // WARNING : We trust labeling::level to label the exterior border with 1. - current_region->content().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(n))); + current_region->elt().holes.insert(a_point_of(tmp | pw::value(tmp) == pw::cst(n))); // FIXME : [optimisation] Remove from N border of holes???. // Recompute gn <- min u(x) x belongs to A @@ -469,7 +469,7 @@ // debug::println(regions); - //debug::println(ima | regions(make:defined reference to `mln::fllt::lower<mln::value::int_u<8u> >::inc':point2d(-4,-1))->content().points); + //debug::println(ima | regions(make:defined reference to `mln::fllt::lower<mln::value::int_u<8u> >::inc':point2d(-4,-1))->elt().points); return (&tree); @@ -530,10 +530,38 @@ static const neighb2d& reg_nbh() { return c8(); } }; + +// template <> +// void find_shape_of_holes(fllt_node(P, V)* lower, +// fllt_node(P, V)* upper) +// { +// } + template <typename P, typename V> - void find_shapes_of_holes(fllt_node(P, V)* lower, + void merge_trees(fllt_node(P, V)* lower, fllt_node(P, V)* upper) { + + // In order to merge the trees, we only have to find for each shape S + // with a hole H in it whether one of its children has a hole HŽ + // containing H. If it is the case, we do nothing. Otherwise, we + // put the shape of the hole H (and all its descendants) as child of + // the shape . + + fllt_node(P, V)* it = lower; + + if (lower->elt().holes.size() > 0) + { + + } + // FIXME : add an method to tree to get the childen. + // FIXME : add an iterator to browse a tree. + + mln_piter(set_p) p(lower->child_); + for_all(p) + { + merge_trees(lower, upper); + } } template <typename V> @@ -546,10 +574,9 @@ fllt_tree(P, V)* lower_tree; lower_tree = compute_level_set<V, lower<V> >(ima); + upper_tree = compute_level_set<V, upper<V> >(ima); - // upper_tree = compute_level_set<V, upper<V> >(ima); - - //find_shapes_of_holes(lower_tree, upper_tree); + merge_trees(lower_tree, upper_tree); } } // end of namespace mln::fllt

2 1

milena r1394: Fix use of tree
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix use of tree. * mln/util/tree.hh, * mln/util/tree_to_image.hh, * sandbox/garrigues/fllt.hh: Fix. --- mln/util/tree.hh | 11 ++++------- mln/util/tree_to_image.hh | 10 +++++----- sandbox/garrigues/fllt.hh | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1393) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1394) @@ -62,15 +62,15 @@ I& output = exact(output_); - mln_piter(set_p<point2d>) p(node->elt_.points); + mln_piter(set_p<point2d>) p(node->elt().points); for_all(p) - output(p) = node->elt_.value; + output(p) = node->elt().value; - typename std::vector< util::node<T>* >::const_iterator it = node->child_.begin(); + typename std::vector< util::node<T>* >::const_iterator it = node->children().begin(); for (int i = 0; - it != node->child_.end(); + it != node->children().end(); ++it, ++i) { if (*it) @@ -84,7 +84,7 @@ tree_to_image (tree<T>& tree, Image& output_) { I& output = exact(output_); - tree_to_image_rec(tree.root_, output); + tree_to_image_rec(tree.root(), output); } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1393) +++ trunk/milena/mln/util/tree.hh (revision 1394) @@ -95,7 +95,7 @@ tree(); tree(node<T>* root); - tree<T>* tree_get(T& elt); + node<T>* root(); void add_tree_up (T& elt); void add_tree_down (T& elt); @@ -135,13 +135,10 @@ } template <typename T> - tree<T>* - tree<T>::tree_get(T& elt) + node<T>* + tree<T>::root() { - node<T>* n = root_->search(elt); - tree<T>* res = new tree (n); - - return res; + return root_; } template <typename T> Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1393) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1394) @@ -576,7 +576,7 @@ lower_tree = compute_level_set<V, lower<V> >(ima); upper_tree = compute_level_set<V, upper<V> >(ima); - merge_trees(lower_tree, upper_tree); + //merge_trees(lower_tree, upper_tree); } } // end of namespace mln::fllt

2 1

milena r1395: Fix tree
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix tree. * mln/util/branch_iter.hh, * mln/util/tree.hh, * tests/tree.cc: Fix. --- mln/util/branch_iter.hh | 2 +- mln/util/tree.hh | 31 +++++++++++++++++++++++-------- tests/tree.cc | 2 -- 3 files changed, 24 insertions(+), 11 deletions(-) Index: trunk/milena/tests/tree.cc =================================================================== --- trunk/milena/tests/tree.cc (revision 1394) +++ trunk/milena/tests/tree.cc (revision 1395) @@ -60,6 +60,4 @@ util::tree<unsigned>* tre = new util::tree<unsigned>(&node); mln_assertion(tre); tre->add_tree_up(elt6); - util::tree<unsigned>* trees = tre->tree_get(elt5); - mln_assertion(trees); } Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1394) +++ trunk/milena/mln/util/tree.hh (revision 1395) @@ -55,6 +55,7 @@ { public: + typedef std::vector< node<T>* > children_t; /// \{ Constructors node(); node(T elt); @@ -66,15 +67,15 @@ /// \} /// Access to the children - const std::vector< node<T>* >& children() const; - std::vector< node<T>* >& children(); + const children_t& children() const; + children_t& children(); /// Access to the parent node. + //node<T>*& parent(); const node<T>* parent() const; node<T>* add_child(T elt); void set_parent(node<T>* parent); - node<T>* get_parent(); void print_rec(int n) const; void print() const; int search_rec(node<T>** res, T& elt); @@ -96,6 +97,7 @@ tree(node<T>* root); node<T>* root(); + branch<T> main_branch(); void add_tree_up (T& elt); void add_tree_down (T& elt); @@ -142,12 +144,19 @@ } template <typename T> + branch<T> + tree<T>::main_branch() + { + return branch<T>(*this, root()); + } + + template <typename T> void tree<T>::add_tree_up(T& elt) { node<T>* n = new node<T> (elt); - root_->parent_ = n; - n->child_.push_back (root_); + root_->set_parent(n); + n->children().push_back (root_); root_ = n; } @@ -222,14 +231,20 @@ parent->child_.push_back(this); } - template <typename T> - node<T>* - node<T>::get_parent() + const node<T>* + node<T>::parent() const { return parent_; } +// template <typename T> +// node<T>*& +// node<T>::parent() +// { +// return parent_; +// } + template <typename T> int node<T>::search_rec(node<T>** res, T& elt) Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1394) +++ trunk/milena/mln/util/branch_iter.hh (revision 1395) @@ -49,7 +49,7 @@ branch_iter(branch<T> branch); /// Convertion to node. - operator node<T>&() const; + operator util::node<T>&() const; /// Test the iterator validity. bool is_valid() const;

2 1

milena r1396: Fix warnings in some tests
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix warnings in some tests. * tests/border_resize_sub_image.cc, * tests/branch_iter.cc: Fix. --- border_resize_sub_image.cc | 2 +- branch_iter.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: trunk/milena/tests/border_resize_sub_image.cc =================================================================== --- trunk/milena/tests/border_resize_sub_image.cc (revision 1395) +++ trunk/milena/tests/border_resize_sub_image.cc (revision 1396) @@ -60,7 +60,7 @@ typedef image2d<int> I; unsigned border = 42; - unsigned new_border = 51; + //unsigned new_border = 51; box2d b(literal::origin, point2d(1,1)); I ima(3,3, border); Index: trunk/milena/tests/branch_iter.cc =================================================================== --- trunk/milena/tests/branch_iter.cc (revision 1395) +++ trunk/milena/tests/branch_iter.cc (revision 1396) @@ -47,7 +47,7 @@ util::node<int>* f = n.add_child(42); util::node<int>* g = f->add_child(421); - util::node<int>* h = f->add_child(422); + f->add_child(422); g->add_child(4211)->add_child(51)->add_child(52)->add_child(53)->add_child(54)->add_child(55); g->add_child(4212);

2 1

milena r1397: Fix warnings
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix warnings. * mln/util/tree.hh: Fix --- tree.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1396) +++ trunk/milena/mln/util/tree.hh (revision 1397) @@ -116,8 +116,8 @@ tree<T>& tree(); private: - node<T>& apex_; util::tree<T>& tree_; + node<T>& apex_; };

2 1

milena r1399: Improve fllt. Add more tests
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Improve fllt. Add more tests. * mln/set/is_subset_of.hh: New, Test if a point set is a subset of another. * mln/util/branch_iter.hh: Update * mln/util/tree.hh: (tree<T>::add_child(node<T>*)) New, (tree<T>::main_branch()) New. * sandbox/garrigues/fllt.hh: Improve fllt. * sandbox/garrigues/test_fllt.cc: Update * sandbox/garrigues/test_fllt2.cc, * sandbox/garrigues/test_fllt3.cc, * sandbox/garrigues/test_fllt4.cc, * sandbox/garrigues/test_fllt5.cc, * sandbox/garrigues/test_fllt_tiny.cc: New, differents cases of tests for fllt. --- mln/set/is_subset_of.hh | 75 +++++++++++++++++ mln/util/branch_iter.hh | 17 +++ mln/util/tree.hh | 22 ++++- sandbox/garrigues/fllt.hh | 156 ++++++++++++++++++++++++++++-------- sandbox/garrigues/test_fllt.cc | 44 +++++----- sandbox/garrigues/test_fllt2.cc | 40 +++++++++ sandbox/garrigues/test_fllt3.cc | 40 +++++++++ sandbox/garrigues/test_fllt4.cc | 40 +++++++++ sandbox/garrigues/test_fllt5.cc | 40 +++++++++ sandbox/garrigues/test_fllt_tiny.cc | 24 +++++ 10 files changed, 439 insertions(+), 59 deletions(-) Index: trunk/milena/mln/set/is_subset_of.hh =================================================================== --- trunk/milena/mln/set/is_subset_of.hh (revision 0) +++ trunk/milena/mln/set/is_subset_of.hh (revision 1399) @@ -0,0 +1,75 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_SET_IS_SUBSET_OF_HH +# define MLN_SET_IS_SUBSET_OF_HH + +# include <mln/core/concept/point_set.hh> + +namespace mln +{ + + namespace set + { + /*! \brief Test if a point set is a subset of another point set. + * + * \relates mln::Point_Set + */ + template <typename Pl, typename Pr> + bool + is_subset_of(const Point_Set<Pl>& lhs, const Point_Set<Pr>& rhs); + +# ifndef MLN_INCLUDE_ONL + + template <typename Pl, typename Pr> + bool + is_subset_of(const Point_Set<Pl>& lhs_, const Point_Set<Pr>& rhs_) + { + Pl lhs = exact(lhs_); + Pr rhs = exact(rhs_); + + if (lhs.npoints() > rhs.npoints()) + return false; + + mln_piter(Pl) p(lhs); + for_all(p) + { + if (!rhs.has(p)) + return false; + } + return true; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::set + +} // end of namespace mln + + +#endif // ! MLN_SET_SUBSET_HH Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1398) +++ trunk/milena/mln/util/tree.hh (revision 1399) @@ -71,10 +71,14 @@ children_t& children(); /// Access to the parent node. + node<T>* parent(); //node<T>*& parent(); - const node<T>* parent() const; + /// \{ Add a child to the node node<T>* add_child(T elt); + node<T>* add_child(node<T>* node); + /// \} + void set_parent(node<T>* parent); void print_rec(int n) const; void print() const; @@ -147,7 +151,7 @@ branch<T> tree<T>::main_branch() { - return branch<T>(*this, root()); + return branch<T>(*this, *root()); } template <typename T> @@ -222,6 +226,16 @@ return s; } + + template <typename T> + node<T>* + node<T>::add_child(node<T>* node) + { + node->parent_ = this; + this->children().push_back(node); + return node; + } + template <typename T> void node<T>::set_parent(node<T>* parent) @@ -232,8 +246,8 @@ } template <typename T> - const node<T>* - node<T>::parent() const + node<T>* + node<T>::parent() { return parent_; } Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1398) +++ trunk/milena/mln/util/branch_iter.hh (revision 1399) @@ -50,6 +50,7 @@ /// Convertion to node. operator util::node<T>&() const; + util::node<T>& operator *(); /// Test the iterator validity. bool is_valid() const; @@ -94,6 +95,14 @@ } template <typename T> + util::node<T>& + branch_iter<T>::operator*() + { + mln_assertion(n_); + return *n_; + } + + template <typename T> bool branch_iter<T>::is_valid() const { @@ -131,7 +140,6 @@ if (s_.top().first == s_.top().second) //if (*(s_.top().first) == 0) { - mln_assertion(n_); s_.pop(); next(); return; @@ -141,6 +149,13 @@ n_ = *(s_.top().first); s_.top().first++; + if (!n_) + { + std::cout << "browsing warning : nul pointer" << std::endl; + next(); + return; + } + mln_assertion(n_); if (n_->children().size() > 0) s_.push(iter_pair(n_->children().begin(), Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1398) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1399) @@ -61,8 +61,10 @@ # include <mln/set/uni.hh> # include <mln/set/diff.hh> # include <mln/set/inter.hh> +# include <mln/set/is_subset_of.hh> # include <mln/util/tree.hh> +# include <mln/util/branch_iter.hh> # include <mln/labeling/regional_minima.hh> # include <mln/labeling/regional_maxima.hh> @@ -84,15 +86,18 @@ { template <typename P, typename V> - struct fllt_node + struct fllt_node_elt { V value; set_p points; set_p holes; }; - # define fllt_tree(P, V) util::tree< fllt_node<P, V> > - # define fllt_node(P, V) util::node< fllt_node<P, V> > + # define fllt_tree(P, V) util::tree< fllt_node_elt<P, V> > + # define fllt_node(P, V) util::node< fllt_node_elt<P, V> > + # define fllt_branch(P, V) util::branch< fllt_node_elt<P, V> > + # define fllt_branch_iter(P, V) util::branch_iter< fllt_node_elt<P, V> > + // # define fllt_node(P, V) typename fllt_tree(P, V)::node_t @@ -254,7 +259,7 @@ regions(p) = current_region; else { - if (regions(p)->get_parent() == 0) + if (regions(p)->parent() == 0) regions(p)->set_parent(current_region); } } @@ -356,8 +361,9 @@ template <typename V, typename F> - fllt_tree(point2d, V)* - compute_level_set(const image2d<V>& ima) + fllt_tree(point2d, V)& + compute_level_set(const image2d<V>& ima, + image2d< fllt_node(point2d, V)* >& regions) { typedef point2d P; typedef image2d<V> I; @@ -369,6 +375,9 @@ mln::pw::cst_<int> > > I_IF; + // Check + mln_assertion(ima.domain() == regions.domain()); + // Declarations. set_p R, N, A; V g, gn; @@ -381,7 +390,6 @@ // debug::println_with_border(u); image2d<bool> tagged(ima.domain()); fllt_node(P, V)* current_region; - image2d<fllt_node(P, V)*> regions(ima.domain()); // INIT R.clear(); @@ -471,7 +479,7 @@ // debug::println(regions); //debug::println(ima | regions(make:defined reference to `mln::fllt::lower<mln::value::int_u<8u> >::inc':point2d(-4,-1))->elt().points); - return (&tree); + return (tree); } // end of compute_level_set @@ -530,16 +538,71 @@ static const neighb2d& reg_nbh() { return c8(); } }; + template <typename P, typename V> + void + move_shape(fllt_node(P, V)& node, + fllt_node(P, V)& hole, + fllt_tree(P, V)& tree, + const image2d<fllt_node(P, V)*>& other_reg) + { + fill_a_shape(hole, tree, other_reg); + node.elt().points = set::uni(hole.elt().points, node.elt().points); + node.add_child(&hole); + } -// template <> -// void find_shape_of_holes(fllt_node(P, V)* lower, -// fllt_node(P, V)* upper) -// { -// } + template <typename P, typename V> + fllt_node(P, V)* + find_the_hole(fllt_node(P, V)& node, + const P p, + const image2d<fllt_node(P, V)*>& other_reg) + { + fllt_node(P, V)* s = other_reg(p); + + mln_assertion(s); + while (s->parent() && (s->parent()->elt().value < node.elt().value)) + { + mln_assertion(s); + s = s->parent(); + mln_assertion(s); + } + return s; + } + + template <typename P, typename V> + void + fill_a_shape(fllt_node(P, V)& node, + fllt_tree(P, V)& tree, + const image2d<fllt_node(P, V)*>& other_reg) + { + mln_piter(set_p) p(node.elt().holes); + for_all(p) + { + bool h = true; + fllt_node(P, V)* hole = find_the_hole(node, point2d(p), other_reg); + typename fllt_node(P, V)::children_t::iterator it; + for (it = node.children().begin(); + it != node.children().end(); + it++) + { + if (set::is_subset_of(hole->elt().points, + (*it)->elt().points)) + { + h = false; + break; + } + } + if (h) + move_shape(node, *hole, tree, other_reg); + + } + } template <typename P, typename V> - void merge_trees(fllt_node(P, V)* lower, - fllt_node(P, V)* upper) + void + merge_trees(fllt_tree(P, V)& lower, + fllt_tree(P, V)& upper, + const image2d<fllt_node(P, V)*>& low_reg, + const image2d<fllt_node(P, V)*>& upp_reg) { // In order to merge the trees, we only have to find for each shape S @@ -548,35 +611,64 @@ // put the shape of the hole H (and all its descendants) as child of // the shape . - fllt_node(P, V)* it = lower; - - if (lower->elt().holes.size() > 0) - { - - } - // FIXME : add an method to tree to get the childen. - // FIXME : add an iterator to browse a tree. - - mln_piter(set_p) p(lower->child_); + fllt_branch_iter(P, V) p(lower.main_branch()); for_all(p) { - merge_trees(lower, upper); + fllt_node(P, V)& n(p); + fill_a_shape(n, lower, upp_reg); } +// fllt_branch_iter(P, V) q(upper.main_branch()); +// for_all(q) +// { +// fllt_node(P, V)& n(p); +// fill_a_shape(n, upper, low_reg); +// } } template <typename V> // Fixme : return type - void fllt(const image2d<V>& ima) + void + fllt(const image2d<V>& ima) { typedef point2d P; - fllt_tree(P, V)* upper_tree; - fllt_tree(P, V)* lower_tree; + fllt_tree(P, V) upper_tree; + fllt_tree(P, V) lower_tree; + image2d<fllt_node(P, V)*> low_reg(ima.domain()); + image2d<fllt_node(P, V)*> upp_reg(ima.domain()); + + lower_tree = compute_level_set<V, lower<V> >(ima, low_reg); + upper_tree = compute_level_set<V, upper<V> >(ima, upp_reg); - lower_tree = compute_level_set<V, lower<V> >(ima); - upper_tree = compute_level_set<V, upper<V> >(ima); + merge_trees(lower_tree, upper_tree, low_reg, upp_reg); - //merge_trees(lower_tree, upper_tree); + + + image2d<value::int_u8> output (ima.domain ()); + util::tree_to_image (lower_tree, output); + + if (output != ima) + { + std::cerr << "BUG!!!" << std::endl; + abort(); + } + + io::pgm::save(output, "out_final.pgm"); + std::cout << "out_final.pgm generate" + << std::endl; + + + fllt_branch_iter(P, V) p(lower_tree.main_branch()); + for_all(p) + { + std::cout << "region mere : " << (*p).parent() << std::endl; + std::cout << " ^" << std::endl; + std::cout << " |" << std::endl; + std::cout << "region : " << &*p << std::endl; + + debug::println(ima | (*p).elt().points); + std::cout << std::endl; + } } } // end of namespace mln::fllt Index: trunk/milena/sandbox/garrigues/test_fllt.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt.cc (revision 1398) +++ trunk/milena/sandbox/garrigues/test_fllt.cc (revision 1399) @@ -15,26 +15,26 @@ using namespace mln; -// int ws[81] = {3,2,3,3,5,5,5,5,5, -// 2,1,3,4,4,4,4,5,5, -// 2,3,4,2,3,3,2,4,4, -// 1,4,2,1,1,2,1,2,2, -// 1,2,4,2,1,2,1,1,1, -// 1,3,3,3,4,3,2,5,1, -// 1,3,4,3,4,3,2,5,1, -// 1,3,3,3,4,3,2,5,1, -// 1,3,3,4,2,3,2,1,1}; - -// w_window2d_int w_win = make::w_window2d(ws); -// image2d<int> ima = convert::to_image(w_win); -//fllt::fllt(ima); - - - image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); - - image2d<int> ima_int(ima.domain()); - -level::fill(ima_int, ima); - debug::println(ima); - fllt::fllt(ima_int); + int ws[81] = {3,2,3,3,5,5,5,5,5, + 2,1,3,4,4,4,4,5,5, + 2,3,4,2,3,3,2,4,4, + 1,4,2,1,1,2,1,2,2, + 1,2,4,2,1,2,1,1,1, + 1,3,3,3,4,3,2,5,1, + 1,3,4,3,4,3,2,5,1, + 1,3,3,3,4,3,2,5,1, + 1,3,3,4,2,3,2,1,1}; + + w_window2d_int w_win = make::w_window2d(ws); + image2d<int> ima = convert::to_image(w_win); +fllt::fllt(ima); + + +// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + +// image2d<int> ima_int(ima.domain()); + +// level::fill(ima_int, ima); +// debug::println(ima); +// fllt::fllt(ima_int); } Index: trunk/milena/sandbox/garrigues/test_fllt2.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt2.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt2.cc (revision 1399) @@ -0,0 +1,40 @@ +# include "fllt.hh" +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> +# include <mln/level/fill.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/load.hh> + +int main() +{ + + using namespace mln; + + int ws[81] = {5,5,5,5,5,5,5,5,5, + 5,5,5,5,5,5,5,5,5, + 5,5,5,5,5,5,8,8,5, + 5,5,1,1,1,5,8,8,5, + 5,5,1,1,1,5,8,8,5, + 5,5,1,1,1,5,8,8,5, + 5,5,5,5,5,5,8,8,5, + 5,5,5,5,5,5,5,5,5, + 5,5,5,5,5,5,5,5,5}; + + w_window2d_int w_win = make::w_window2d(ws); + image2d<int> ima = convert::to_image(w_win); +fllt::fllt(ima); + + +// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + +// image2d<int> ima_int(ima.domain()); + +// level::fill(ima_int, ima); +// debug::println(ima); +// fllt::fllt(ima_int); +} Index: trunk/milena/sandbox/garrigues/test_fllt3.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt3.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt3.cc (revision 1399) @@ -0,0 +1,40 @@ +# include "fllt.hh" +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> +# include <mln/level/fill.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/load.hh> + +int main() +{ + + using namespace mln; + + int ws[81] = {2,2,2,2,2,2,2,2,2, + 2,2,2,2,2,2,2,2,2, + 2,1,1,1,1,1,1,1,2, + 2,1,2,2,1,0,0,1,2, + 2,1,2,2,1,0,0,1,2, + 2,1,2,2,1,0,0,1,2, + 2,1,1,1,1,1,1,1,2, + 2,1,1,1,1,1,1,1,2, + 2,2,2,2,2,2,2,2,2}; + + w_window2d_int w_win = make::w_window2d(ws); + image2d<int> ima = convert::to_image(w_win); +fllt::fllt(ima); + + +// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + +// image2d<int> ima_int(ima.domain()); + +// level::fill(ima_int, ima); +// debug::println(ima); +// fllt::fllt(ima_int); +} Index: trunk/milena/sandbox/garrigues/test_fllt_tiny.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt_tiny.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt_tiny.cc (revision 1399) @@ -0,0 +1,24 @@ +# include "fllt.hh" +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> +# include <mln/level/fill.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/load.hh> + +int main() +{ + + using namespace mln; + + image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + + image2d<int> ima_int(ima.domain()); + + level::fill(ima_int, ima); + fllt::fllt(ima_int); +} Index: trunk/milena/sandbox/garrigues/test_fllt4.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt4.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt4.cc (revision 1399) @@ -0,0 +1,40 @@ +# include "fllt.hh" +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> +# include <mln/level/fill.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/load.hh> + +int main() +{ + + using namespace mln; + + int ws[81] = {5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1, + 5,5,5,5,5,1,1,1,1}; + + w_window2d_int w_win = make::w_window2d(ws); + image2d<int> ima = convert::to_image(w_win); +fllt::fllt(ima); + + +// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + +// image2d<int> ima_int(ima.domain()); + +// level::fill(ima_int, ima); +// debug::println(ima); +// fllt::fllt(ima_int); +} Index: trunk/milena/sandbox/garrigues/test_fllt5.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt5.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt5.cc (revision 1399) @@ -0,0 +1,40 @@ +# include "fllt.hh" +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/value/int_u8.hh> +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> +# include <mln/level/fill.hh> +# include <mln/io/pgm/load.hh> +# include <mln/io/pbm/load.hh> + +int main() +{ + + using namespace mln; + + int ws[81] = {5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1, + 5,5,5,2,2,2,1,1,1}; + + w_window2d_int w_win = make::w_window2d(ws); + image2d<int> ima = convert::to_image(w_win); +fllt::fllt(ima); + + +// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); + +// image2d<int> ima_int(ima.domain()); + +// level::fill(ima_int, ima); +// debug::println(ima); +// fllt::fllt(ima_int); +}

2 1

milena r1400: Update fllt
by Matthieu Garrigues 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Update fllt. * mln/util/branch_iter.hh: (deepness) New. * sandbox/garrigues/fllt.hh: More output. FIXME : optimize. --- mln/util/branch_iter.hh | 35 ++++++++++++++- sandbox/garrigues/fllt.hh | 102 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 116 insertions(+), 21 deletions(-) Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1399) +++ trunk/milena/mln/util/branch_iter.hh (revision 1400) @@ -64,7 +64,8 @@ /// Go to the next point. void next(); - + /// Give how deep is the iterator in the branch. + unsigned deepness() const; private: util::branch<T> branch_; @@ -74,6 +75,8 @@ std::stack< iter_pair > s_; util::node<T>* n_; + unsigned deepness_; + unsigned futur_deepness_; }; @@ -103,6 +106,24 @@ } template <typename T> + unsigned + branch_iter<T>::deepness() const + { + mln_assertion(is_valid()); + //return s_.size(); + + unsigned i = 0; + node<T>* p = n_; + while (p) + { + p = p->parent(); + i++; + } + return i; + // return deepness_; + } + + template <typename T> bool branch_iter<T>::is_valid() const { @@ -121,6 +142,7 @@ void branch_iter<T>::start() { + deepness_ = 0; s_.push(iter_pair(branch_.apex().children().begin(), branch_.apex().children().end())); n_ = &branch_.apex(); @@ -140,26 +162,35 @@ if (s_.top().first == s_.top().second) //if (*(s_.top().first) == 0) { + deepness_ = futur_deepness_; + //deepness_--; + futur_deepness_ = deepness_; +// std::cout << "dec :" << deepness_ << std::endl; s_.pop(); next(); return; } else { + deepness_ = futur_deepness_; +// std::cout << "st :" << deepness_ << std::endl; n_ = *(s_.top().first); s_.top().first++; if (!n_) { - std::cout << "browsing warning : nul pointer" << std::endl; +// std::cout << "browsing warning : nul pointer" << std::endl; next(); return; } mln_assertion(n_); if (n_->children().size() > 0) + { + futur_deepness_ = deepness_ + 1; s_.push(iter_pair(n_->children().begin(), n_->children().end())); + } return; } } Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1399) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1400) @@ -266,8 +266,8 @@ // Count the number of conected components of the border of R. - image2d<int> tmp(u.domain().to_larger(1)); - image2d<bool> border_ima(tmp.domain()); + static image2d<int> tmp(u.domain().to_larger(1)); + static image2d<bool> border_ima(tmp.domain()); level::fill(border_ima, false); level::fill(inplace(border_ima | N), true); unsigned n; @@ -401,7 +401,6 @@ level::fill(regions, 0); level::fill(tagged, false); - level::fill(min_locals, 0); // Get the locals extremums unsigned nlabels; @@ -461,9 +460,9 @@ util::tree_to_image (tree, output); - debug::println(output); - std::cout << std::endl; - debug::println(ima); +// debug::println(output); +// std::cout << std::endl; +// debug::println(ima); if (output != ima) { @@ -625,6 +624,54 @@ // } } + + template <typename P, typename V> + void + visualize_deepness(image2d<value::int_u8>& output, + fllt_tree(P, V)& tree) + { + fllt_branch_iter(P, V) p(tree.main_branch()); + level::fill(output, 0); + for_all(p) + { + //std::cout << (&*p) << ":" << p.deepness() << std::endl; + mln_piter(set_p<point2d>) q((*p).elt().points); + for_all(q) + { + if (output(q) < p.deepness()) + output(q) = p.deepness(); + } + } + } + + + template <typename P, typename V> + void + visualize_bounds(image2d<value::int_u8>& output, + fllt_tree(P, V)& tree, + unsigned limit) + { + fllt_branch_iter(P, V) p(tree.main_branch()); + level::fill(output, 255); + for_all(p) + { + if ((*p).elt().points.npoints() > limit) + { + mln_piter(set_p<point2d>) q((*p).elt().points); + for_all(q) + { + mln_niter(neighb2d) n(c4(), q); + bool is_border = false; + for_all (n) + if (!((*p).elt().points).has (n)) + is_border = true; + if (is_border) + output(q) = 0; + } + } + } + } + template <typename V> // Fixme : return type void @@ -637,12 +684,16 @@ image2d<fllt_node(P, V)*> low_reg(ima.domain()); image2d<fllt_node(P, V)*> upp_reg(ima.domain()); + std::cout << "1/ Compute the lower level set." << std::endl; lower_tree = compute_level_set<V, lower<V> >(ima, low_reg); + std::cout << "2/ Compute the upper level set." << std::endl; upper_tree = compute_level_set<V, upper<V> >(ima, upp_reg); + std::cout << "3/ Merge the two trees." << std::endl; merge_trees(lower_tree, upper_tree, low_reg, upp_reg); + std::cout << "4/ Generate outputs." << std::endl; image2d<value::int_u8> output (ima.domain ()); util::tree_to_image (lower_tree, output); @@ -653,22 +704,35 @@ abort(); } - io::pgm::save(output, "out_final.pgm"); - std::cout << "out_final.pgm generate" - << std::endl; +// io::pgm::save(output, "out_final.pgm"); +// std::cout << "out_final.pgm generate" +// << std::endl; - fllt_branch_iter(P, V) p(lower_tree.main_branch()); - for_all(p) - { - std::cout << "region mere : " << (*p).parent() << std::endl; - std::cout << " ^" << std::endl; - std::cout << " |" << std::endl; - std::cout << "region : " << &*p << std::endl; +// fllt_branch_iter(P, V) p(lower_tree.main_branch()); +// for_all(p) +// { +// std::cout << "region mere : " << (*p).parent() << std::endl; +// std::cout << " ^" << std::endl; +// std::cout << " |" << std::endl; +// std::cout << "region : " << &*p << std::endl; - debug::println(ima | (*p).elt().points); - std::cout << std::endl; - } +// debug::println(ima | (*p).elt().points); +// std::cout << std::endl; +// } + +// image2d<value::int_u8> viz(ima.domain()); +// image2d<value::int_u8> viz2(ima.domain()); + +// visualize_deepness(viz, lower_tree); +// level::stretch(viz, viz2); +// debug::println(viz); +// debug::println(viz2); +// io::pgm::save(viz2, "fllt.pgm"); + +// visualize_bounds(viz, lower_tree, 2000); +// debug::println(viz); +// io::pgm::save(viz, "fllt_bounds.pgm"); } } // end of namespace mln::fllt

2 1

milena r1401: Update test for fllt
by Guillaume Duhamel 29 Oct '07

29 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-29 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update test for fllt. * test_fllt.cc: Update. --- test_fllt.cc | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) Index: trunk/milena/sandbox/garrigues/test_fllt.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt.cc (revision 1400) +++ trunk/milena/sandbox/garrigues/test_fllt.cc (revision 1401) @@ -9,32 +9,40 @@ # include <mln/level/fill.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pbm/load.hh> +# include <sstream> + int main() { using namespace mln; - int ws[81] = {3,2,3,3,5,5,5,5,5, - 2,1,3,4,4,4,4,5,5, - 2,3,4,2,3,3,2,4,4, - 1,4,2,1,1,2,1,2,2, - 1,2,4,2,1,2,1,1,1, - 1,3,3,3,4,3,2,5,1, - 1,3,4,3,4,3,2,5,1, - 1,3,3,3,4,3,2,5,1, - 1,3,3,4,2,3,2,1,1}; - - w_window2d_int w_win = make::w_window2d(ws); - image2d<int> ima = convert::to_image(w_win); -fllt::fllt(ima); - - -// image2d<value::int_u8> ima = io::pgm::load("../../img/tiny.pgm"); - -// image2d<int> ima_int(ima.domain()); - -// level::fill(ima_int, ima); -// debug::println(ima); -// fllt::fllt(ima_int); +// int ws[81] = {3,2,3,3,5,5,5,5,5, +// 2,1,3,4,4,4,4,5,5, +// 2,3,4,2,3,3,2,4,4, +// 1,4,2,1,1,2,1,2,2, +// 1,2,4,2,1,2,1,1,1, +// 1,3,3,3,4,3,2,5,1, +// 1,3,4,3,4,3,2,5,1, +// 1,3,3,3,4,3,2,5,1, +// 1,3,3,4,2,3,2,1,1}; + +// w_window2d_int w_win = make::w_window2d(ws); +// image2d<int> ima = convert::to_image(w_win); +// fllt::fllt(ima); + + + for (int i = 1; i < 16; ++i) + for (int j = 1; j < 16; ++j) + { + std::stringstream path; + path << "/lrde/tegucigalpa/theo/pub/mln_docs/lena_tiles/lena_" < ima = io::pgm::load(path.str()); + image2d<int> ima_int(ima.domain()); + level::fill(ima_int, ima); + debug::println(ima_int); + fllt::fllt(ima_int); + } + }

2 1