* apps/generic-skel/image3d-skel-unconstrained.cc: Remove a useless header inclusion. * apps/generic-skel/image3d-skel-with-end-points.cc: Fix a comment. * tools/compute_local_configurations.cc: Add a comment. * tools/connectivity_numbers_3d.hh: Add a FIXME. --- milena/ChangeLog | 12 ++++++++++++ .../generic-skel/image3d-skel-unconstrained.cc | 1 - .../generic-skel/image3d-skel-with-end-points.cc | 2 +- milena/tools/compute_local_configurations.cc | 2 +- milena/tools/connectivity_numbers_3d.hh | 2 ++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3e2adbf..95a51a4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2011-07-13 Roland Levillain <roland@lrde.epita.fr> + Misc changes in apps/generic-skel/ and tools/. + + * apps/generic-skel/image3d-skel-unconstrained.cc: + Remove a useless header inclusion. + * apps/generic-skel/image3d-skel-with-end-points.cc: + Fix a comment. + * tools/compute_local_configurations.cc: + Add a comment. + * tools/connectivity_numbers_3d.hh: Add a FIXME. + +2011-07-13 Roland Levillain <roland@lrde.epita.fr> + Exercise breadth-first thinning with predicate is_not_1d_isthmus. * apps/generic-skel/image3d-skel-with-1d-isthmuses.cc: New. diff --git a/milena/apps/generic-skel/image3d-skel-unconstrained.cc b/milena/apps/generic-skel/image3d-skel-unconstrained.cc index 236361d..0a16232 100644 --- a/milena/apps/generic-skel/image3d-skel-unconstrained.cc +++ b/milena/apps/generic-skel/image3d-skel-unconstrained.cc @@ -43,7 +43,6 @@ #include <mln/topo/is_simple_point3d.hh> #include <mln/topo/detach_point.hh> -#include <mln/topo/is_not_end_point.hh> #include "apps/data.hh" diff --git a/milena/apps/generic-skel/image3d-skel-with-end-points.cc b/milena/apps/generic-skel/image3d-skel-with-end-points.cc index 32f3634..82f3e78 100644 --- a/milena/apps/generic-skel/image3d-skel-with-end-points.cc +++ b/milena/apps/generic-skel/image3d-skel-with-end-points.cc @@ -98,7 +98,7 @@ int main() topo::is_simple_point3d<I, N> is_simple(nbh_fg, nbh_bg); // Simple point detach procedure. topo::detach_point<I> detach; - // Constraint: do not collapse end points. + // Constraint: do not remove end points. /* FIXME: This criterion is static, e.g. it is attached to INPUT (fixed), not OUTPUT (changing during the thinning). This is not as good as a dynamic critertion (attached to OUTPUT). Maybe it diff --git a/milena/tools/compute_local_configurations.cc b/milena/tools/compute_local_configurations.cc index 41dbdc3..e06477b 100644 --- a/milena/tools/compute_local_configurations.cc +++ b/milena/tools/compute_local_configurations.cc @@ -59,11 +59,11 @@ int main() Note that the value corresponding to P is always `false', to prevent the connection of two components through P. */ data::fill(ima, false); - int_u8 tmp = i; mln_fwd_niter_(neighb2d) n(c8(), p); for_all(n) { + // Inspect the least significant bit. if (tmp % 2) ima(n) = true; tmp = tmp >> 1; diff --git a/milena/tools/connectivity_numbers_3d.hh b/milena/tools/connectivity_numbers_3d.hh index c1dfb19..8b577c6 100644 --- a/milena/tools/connectivity_numbers_3d.hh +++ b/milena/tools/connectivity_numbers_3d.hh @@ -245,6 +245,8 @@ connectivity_numbers_3d(F f) | background. | `-------------------------------------------------------------*/ +// FIXME: Factor these using mln/topo/connectivity_number_3d.hh + conn_number_t connectivity_number_3d__6_26_one(const mln::image3d<bool>& ima) { -- 1.7.2.5