* mln/debug/all.hh: Update. * mln/debug/ctree.hh: New. --- milena/ChangeLog | 24 ++++++++++++++++++++++++ milena/mln/debug/all.hh | 2 +- milena/{sandbox/edwin => }/mln/debug/ctree.hh | 5 +++-- 3 files changed, 28 insertions(+), 3 deletions(-) copy milena/{sandbox/edwin => }/mln/debug/ctree.hh (97%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0529b68..bb30678 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,27 @@ +2010-05-04 edwin carlinet <carlinet@lrde.epita.fr> + + Tree build algorithms and tree management routines + + * mln/core/image/all.hh: Update. + * mln/morpho/tree/all.hh: Update. + * mln/tag/skeleton.hh: Update. + * mln/morpho/tree/component_tree.hh: Routines to build component + trees. + * mln/morpho/tree/compute_attribute_image.hh: Routines to compute + attribute images. + * mln/morpho/tree/dual_input_tree.hh: Routines to build dual-input + trees. + * mln/morpho/tree/filter/direct.hh, + * mln/morpho/tree/filter/max.hh, + * mln/morpho/tree/filter/min.hh, + * mln/morpho/tree/filter/subtractive.hh: Filtering routines. + * mln/morpho/tree/impl/hqueue.hh, + * mln/morpho/tree/impl/hqueue_fast.hh, + * mln/morpho/tree/impl/union_find.hh, + * mln/morpho/tree/impl/union_find_fast.hh: Tree computation algorithms. + * mln/morpho/tree/leaf_last.hh, + * mln/morpho/tree/propagate_node.hh: Tree management routines. + 2010-04-09 edwin carlinet <carlinet@lrde.epita.fr> Unified structure for simple/dual input min/max tree. diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index 68021ee..2e50185 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -44,7 +44,7 @@ namespace mln } } - +# include <mln/debug/ctree.hh> # include <mln/debug/draw_graph.hh> # include <mln/debug/format.hh> # include <mln/debug/histo.hh> diff --git a/milena/sandbox/edwin/mln/debug/ctree.hh b/milena/mln/debug/ctree.hh similarity index 97% copy from milena/sandbox/edwin/mln/debug/ctree.hh copy to milena/mln/debug/ctree.hh index 1cb5cbd..c8e576d 100644 --- a/milena/sandbox/edwin/mln/debug/ctree.hh +++ b/milena/mln/debug/ctree.hh @@ -105,7 +105,8 @@ namespace mln depth = 0; else { - while (old != tree.parent(n)) + typename T::node_t par = tree.parent(n); + while (old != par) { --depth; old = tree.parent(old); @@ -115,7 +116,7 @@ namespace mln for (unsigned i = 0; i < depth; i++) std::cout << " "; - std::cout << n; + std::cout << n.index(); for (unsigned i = depth; i < height + 1; i++) std::cout << " "; -- 1.5.6.5