https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox
Index: ChangeLog
from Thierry Geraud <thierry.geraud(a)lrde.epita.fr>
Update of the ICIP'07 max-tree canonization code.
* scribo/demat.hh (trace): Set on.
* geraud/max_tree_nnodes.cc (neighb): Remove useless.
(mln_point): Update.
geraud/max_tree_nnodes.cc | 4 +---
scribo/demat.hh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
Index: scribo/demat.hh
--- scribo/demat.hh (revision 2651)
+++ scribo/demat.hh (working copy)
@@ -396,7 +396,7 @@
using value::rgb8;
border::thickness = 3;
- trace::quiet = true;
+ trace::quiet = false;
//Useful debug variables
unsigned l = atoi(argv[3]);
Index: geraud/max_tree_nnodes.cc
--- geraud/max_tree_nnodes.cc (revision 2651)
+++ geraud/max_tree_nnodes.cc (working copy)
@@ -19,7 +19,7 @@
template <typename I, typename N>
struct max_tree_
{
- typedef mln_point(I) point;
+ typedef mln_site(I) point;
typedef p_array<point> S;
// in:
@@ -30,7 +30,6 @@
S s;
mln_ch_value(I, bool) deja_vu;
mln_ch_value(I, point) parent;
- mln_ch_value(I, point) neighb;
mln_ch_value(I, point) zpar;
max_tree_(const I& f, const N& nbh)
@@ -45,7 +44,6 @@
// init
{
initialize(deja_vu, f);
- initialize(neighb, f);
mln::level::fill(deja_vu, false);
initialize(parent, f);
initialize(zpar, f);