- Olena-patches

2901: Fix and clean up apps/statues/mesh-curv.
by Roland Levillain 19 Nov '08

19 Nov '08

* apps/statues/mesh-curv.cc (main): Fix the formula used to compute the curvature. No longer normalize h_inv (inverse curvature) values, and ensure they are in the range 0..1. Remove useless code. --- milena/ChangeLog | 10 ++++++++++ milena/apps/statues/mesh-curv.cc | 35 +++++------------------------------ 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb85633..59065a6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix and clean up apps/statues/mesh-curv. + + * apps/statues/mesh-curv.cc (main): Fix the formula used to + compute the curvature. + No longer normalize h_inv (inverse curvature) values, and ensure + they are in the range 0..1. + Remove useless code. + 2008-11-18 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix connectivity number values for c4. diff --git a/milena/apps/statues/mesh-curv.cc b/milena/apps/statues/mesh-curv.cc index bba4d38..b9915b7 100644 --- a/milena/apps/statues/mesh-curv.cc +++ b/milena/apps/statues/mesh-curv.cc @@ -39,10 +39,6 @@ #include <TriMesh.h> -#include <mln/accu/min_max.hh> -#include <mln/fun/v2v/linear.hh> -#include <mln/math/abs.hh> - #include "io.hh" @@ -73,47 +69,26 @@ int main(int argc, char* argv[]) // Computes faces (triangles). mesh.need_faces(); - // Computation of the mean curvature on each vertex of the mesh. + // Computation of the curvature on each vertex of the mesh. mesh.need_curvatures(); std::vector<float> vertex_h_inv(mesh.vertices.size(), 0.f); for (unsigned v = 0; v < mesh.vertices.size(); ++v) { float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; - float h_inv = 1 / pi * atan(-h) + pi / 2; + float h_inv = 1 / pi * (atan(-h) + pi / 2); vertex_h_inv[v] = h_inv; } // For each face of the mesh, computean an average curvature value // from the mean curvature at its vertices. std::vector<float> face_h_inv(mesh.faces.size(), 42.f); - mln::accu::min_max<float> acc; for (unsigned f = 0; f < mesh.faces.size(); ++f) { float h_inv = (vertex_h_inv[mesh.faces[f][0]] + vertex_h_inv[mesh.faces[f][1]] + vertex_h_inv[mesh.faces[f][2]]) / 3; + mln_invariant(0.f <= h_inv); + mln_invariant(h_inv <= 1.f); face_h_inv[f] = h_inv; - acc.take(h_inv); - } - - /* Shrink the values of FACE_H_INV into the range 0..1, as these are - the only values accepted a an RGB floating-point component in the - OFF file format. */ - std::vector<float> normalized_face_h_inv(face_h_inv.size(), 0.0f); - std::pair<float, float> min_max(acc); - // FIXME: Taken from mln/level/stretch.hh (this should be factored). - float min = min_max.first; - float max = min_max.second; - // Don't normalize actually if the curvature is constants (i.e., - // if min == max). - if (min != max) - { - float m = 0.0f; - float M = 1.0f; - float a = (M - m) / (max - min); - float b = (m * max - M * min) / (max - min); - mln::fun::v2v::linear<float, float, float> f(a, b); - std::transform(face_h_inv.begin(), face_h_inv.end(), - normalized_face_h_inv.begin(), f); } // Taken and adapted from TriMesh_io.cc @@ -124,7 +99,7 @@ int main(int argc, char* argv[]) << " for writing." << std::endl; exit(2); } - write_off_float(mesh_ptr, normalized_face_h_inv, f_out); + write_off_float(mesh_ptr, face_h_inv, f_out); fclose(f_out); delete mesh_ptr; -- 1.6.0.1

1 0

cleanup-2008 2900: Fix connectivity number values for c4.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix connectivity number values for c4. * tests/morpho/skeleton_constrained.cc: Use tiny image. * mln/topo/is_simple_2d.hh (connectivity_number_c4): Fix values. mln/topo/is_simple_2d.hh | 39 +++++++++++++++++------------------ tests/morpho/skeleton_constrained.cc | 2 - 2 files changed, 21 insertions(+), 20 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2899) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -89,7 +89,7 @@ border::thickness = 1; image2d<bool> pic; - io::pbm::load(pic, MLN_IMG_DIR "/fly.pbm"); + io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); mln_VAR( nbh, make::dual_neighb(pic, c4(), c8()) ); Index: mln/topo/is_simple_2d.hh --- mln/topo/is_simple_2d.hh (revision 2899) +++ mln/topo/is_simple_2d.hh (working copy) @@ -100,27 +100,28 @@ 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + static const unsigned char connectivity_number_c4[256] = { - 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 2, 3, 3, 3, 2, 3, 2, 2, 3, 3, 4, 3, 3, 3, 3, 2, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 2, 3, 3, 3, 3, 4, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 3, 2, + 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, 4, 3, 3, 3, 3, 2, + 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, + 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, + + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 3, 2, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 };

1 0

cleanup-2008 2899: Fix the code that computes connexity numbers.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix the code that computes connexity numbers. * garrigues/ocr/compute_local_configurations.cc: Fix. compute_local_configurations.cc | 65 +++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 34 deletions(-) Index: garrigues/ocr/compute_local_configurations.cc --- garrigues/ocr/compute_local_configurations.cc (revision 2898) +++ garrigues/ocr/compute_local_configurations.cc (working copy) @@ -6,23 +6,27 @@ #include <mln/debug/println.hh> #include <iomanip> + int main() { using namespace mln; - using namespace mln::value; + using value::int_u8; typedef image2d<bool> I; - image2d<bool> ima(3,3); - point2d p(1,1); - std::cout << "----- Object in C8 ------" << std::endl; + box2d b = make::box2d(-1,-1, 1,1); + image2d<bool> ima(b, 0); + point2d p(0, 0); + + std::vector<int_u8> x8(256), x4(256); + for (unsigned i = 0; i < 256; i++) { level::fill(ima, false); - int_u8 tmp = i; - mln_niter_(neighb2d) n(c8() , p); + int_u8 tmp = i; + mln_fwd_niter_(neighb2d) n(c8(), p); for_all(n) { if (tmp % 2) @@ -30,16 +34,28 @@ tmp = tmp >> 1; } + labeling::blobs(ima, c8(), x8[i]); - unsigned x; - labeling::blobs(ima, c8(), x); + { + int_u8 nl; + image2d<int_u8> lab = labeling::blobs(ima, c4(), nl); + std::set<int_u8> s; + mln_fwd_niter_(neighb2d) n(c4(), p); + for_all(n) + if (lab(n) != 0) + s.insert(lab(n)); + x4[i] = s.size(); + } + } -// std::cout << "----- conf no " << i << "------" << std::endl; -// debug::println(ima); -// std::cout << "----- " << x << " cc------" << std::endl; -// std::cout << "-----------" << std::endl; - std::cout << std::setw(2) << x << ", "; + // Now printing! + + std::cout << "----- Object in C8 ------" << std::endl; + + for (unsigned i = 0; i < 256; i++) + { + std::cout << std::setw(2) << x8[i] << ", "; if (! ((i + 1) % 4)) std::cout << " "; if (! ((i + 1) % 16)) std::cout << std::endl; if (! ((i + 1) % 64)) std::cout << std::endl; @@ -49,29 +65,10 @@ for (unsigned i = 0; i < 256; i++) { - level::fill(ima, false); - int_u8 tmp = i; - - mln_niter_(neighb2d) n(c8() , p); - for_all(n) - { - if (tmp % 2) - ima(n) = true; - tmp = tmp >> 1; - } - - - unsigned x; - labeling::blobs(ima, c4(), x); - -// std::cout << "----- conf no " << i << "------" << std::endl; -// debug::println(ima); -// std::cout << "----- " << x << " cc------" << std::endl; -// std::cout << "-----------" << std::endl; - - std::cout << std::setw(2) << x << ", "; + std::cout << std::setw(2) << x4[i] << ", "; if (! ((i + 1) % 4)) std::cout << " "; if (! ((i + 1) % 16)) std::cout << std::endl; if (! ((i + 1) % 64)) std::cout << std::endl; } + }

1 0

cleanup-2008 2898: Prepare to debug morpho skeleton_constrained.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Prepare to debug morpho skeleton_constrained. * tests/morpho/skeleton_constrained.cc: Add extra echos. * mln/topo/is_simple_2d.hh: Relax test on domain extension. * mln/morpho/skeleton_constrained.hh: Likewise. Prefer adjust duplicate over adjust fill. mln/morpho/skeleton_constrained.hh | 20 ++++++++++++-------- mln/topo/is_simple_2d.hh | 4 ++-- tests/morpho/skeleton_constrained.cc | 13 +++++++++---- 3 files changed, 23 insertions(+), 14 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2897) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -47,6 +47,7 @@ #include <mln/pw/value.hh> #include <mln/core/image/image_if.hh> +#include <mln/extension/adjust_duplicate.hh> #include <mln/logical/not.hh> #include <mln/arith/revert.hh> @@ -62,7 +63,9 @@ void show_connectivity_numbers(const image2d<bool>& ima, const N& nbh) { - extension::adjust_fill(ima, nbh, false); + extension::adjust_duplicate(ima, nbh); + + debug::println_with_border(ima); image2d<unsigned> when_true(ima.domain()), when_false(ima.domain()); mln_piter(box2d) p(ima.domain()); @@ -83,11 +86,13 @@ using namespace mln; using value::int_u8; + border::thickness = 1; + image2d<bool> pic; - io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); + io::pbm::load(pic, MLN_IMG_DIR "/fly.pbm"); mln_VAR( nbh, - make::dual_neighb(pic, c8(), c4()) ); + make::dual_neighb(pic, c4(), c8()) ); show_connectivity_numbers(pic, nbh); @@ -99,7 +104,7 @@ image2d<int_u8> dmap = transform::distance_geodesic(logical::not_(pic), nbh.foreground(), mln_max(int_u8)); - debug::println("dst =", dmap); + debug::println("dst =", dmap | pw::value(pic)); dmap = arith::revert(dmap); mln_VAR( skl, Index: mln/topo/is_simple_2d.hh --- mln/topo/is_simple_2d.hh (revision 2897) +++ mln/topo/is_simple_2d.hh (working copy) @@ -135,11 +135,11 @@ unsigned res = 0; - mln_bkd_niter(neighb2d) n(c8(), p); + mln_fwd_niter(neighb2d) n(c8(), p); for_all(n) { res = (res << 1); - if (ima.domain().has(n) && ima(n) == b) + if (ima.has(n) && ima(n) == b) res = res | 1; } Index: mln/morpho/skeleton_constrained.hh --- mln/morpho/skeleton_constrained.hh (revision 2897) +++ mln/morpho/skeleton_constrained.hh (working copy) @@ -31,12 +31,14 @@ /// \file mln/morpho/skeleton_constrained.hh /// /// Compute a skeleton under constraints. +/// +/// \todo Add an extension handling policy for the user to set it. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/site_set/p_priority.hh> -# include <mln/extension/adjust_fill.hh> +# include <mln/extension/adjust_duplicate.hh> # include <mln/level/fill.hh> @@ -72,7 +74,7 @@ const K& constraint = exact(constraint_); const R& priority = exact(priority_); - extension::adjust_fill(input, nbh, false); + extension::adjust_duplicate(input, nbh); // FIXME: Tests! @@ -86,16 +88,17 @@ { initialize(output, input); level::fill(output, input); + extension::adjust_duplicate(output, nbh); mln_piter(I) p(input.domain()); for_all(p) - if ( input(p) == false ) -// if ( input(p) == false && -// is_simple(input, nbh, p) ) // p is a simple point of the background. + if ( input(p) == false && + is_simple(input, nbh, p) ) // p is a simple point of the background. { q.push(priority(p), p); - // std::cout << "push " << p << std::endl; + // std::cout << p << " "; } + std::cout << std::endl; } // std::cout << std::endl << "propagation..." << std::endl; @@ -108,16 +111,17 @@ { p = q.pop_front(); for_all(n) - if ( output.domain().has(n) && + if ( output.has(n) && output(n) == true && constraint(n) == false && is_simple(output, nbh, n) ) { output(n) = false; // Remove n from object. q.push(priority(n), n); - // std::cout << "push " << n << std::endl; + // std::cout << n << " "; } } + std::cout << std::endl; } return output;

1 0

cleanup-2008 2897: Have for tests morpho skeleton an example that works.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Have for tests morpho skeleton an example that works. * tests/morpho/skeleton_constrained.cc (main): Use distance as the priority. Swap c4 and c8; otherwise it does not work properly... skeleton_constrained.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2896) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -48,6 +48,10 @@ #include <mln/pw/value.hh> #include <mln/core/image/image_if.hh> +#include <mln/logical/not.hh> +#include <mln/arith/revert.hh> +#include <mln/transform/distance_geodesic.hh> + #include "tests/data.hh" @@ -83,7 +87,7 @@ io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); mln_VAR( nbh, - make::dual_neighb(pic, c4(), c8()) ); + make::dual_neighb(pic, c8(), c4()) ); show_connectivity_numbers(pic, nbh); @@ -91,13 +95,17 @@ image2d<bool> K(pic.domain()); level::fill(K, false); - image2d<int_u8> prior(pic.domain()); - level::fill(prior, 1); + + image2d<int_u8> dmap = transform::distance_geodesic(logical::not_(pic), + nbh.foreground(), + mln_max(int_u8)); + debug::println("dst =", dmap); + dmap = arith::revert(dmap); mln_VAR( skl, morpho::skeleton_constrained(pic, nbh, is_simple_2d_t(), - K, prior) ); + K, dmap) ); debug::println("pic =", pic); debug::println("skl =", skl);

1 0

cleanup-2008 2896: Import skeleton from matthieu's sandbox.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Import skeleton from matthieu's sandbox. * mln/topo/is_simple_2d.hh: New. * mln/morpho/skeleton_constrained.hh: New. * tests/morpho/skeleton_constrained.cc: New. * tests/morpho/Makefile.am: Update. * img/small.pbm: New. * img/fly.pbm: New. * mln/win/multiple_size.hh (i_): Change type to signed. (size_): Change return type to int to prevent warning. (is_valid_, invalidate_): Fix the case of the iterator construction is deferred. img/fly.pbm | 5 mln/morpho/skeleton_constrained.hh | 177 +++++++++++------------------------ mln/topo/is_simple_2d.hh | 167 +++++++++++++-------------------- mln/win/multiple_size.hh | 12 +- tests/morpho/Makefile.am | 3 tests/morpho/skeleton_constrained.cc | 104 ++++++++++++++++++++ 6 files changed, 246 insertions(+), 222 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 0) +++ tests/morpho/skeleton_constrained.cc (revision 0) @@ -0,0 +1,104 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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/morpho/skeleton_constrained.cc +/// +/// Test on mln::morpho::skeleton_constrained. +/// + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/var.hh> +#include <mln/value/int_u8.hh> + +#include <mln/make/dual_neighb.hh> +#include <mln/topo/is_simple_2d.hh> +#include <mln/morpho/skeleton_constrained.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> +#include <mln/debug/println_with_border.hh> + +#include <mln/pw/value.hh> +#include <mln/core/image/image_if.hh> + +#include "tests/data.hh" + + +namespace mln +{ + + template <typename N> + void show_connectivity_numbers(const image2d<bool>& ima, + const N& nbh) + { + extension::adjust_fill(ima, nbh, false); + + image2d<unsigned> when_true(ima.domain()), when_false(ima.domain()); + mln_piter(box2d) p(ima.domain()); + for_all(p) + { + when_true(p) = connectivity_number_2d(ima, nbh.foreground(), p, true); + when_false(p) = connectivity_number_2d(ima, nbh.background(), p, false); + } + debug::println("when true = ", when_true | pw::value(ima)); + debug::println("when false = ", when_false | pw::value(ima)); + } + +} // mln + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<bool> pic; + io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); + + mln_VAR( nbh, + make::dual_neighb(pic, c4(), c8()) ); + + show_connectivity_numbers(pic, nbh); + + + image2d<bool> K(pic.domain()); + level::fill(K, false); + + image2d<int_u8> prior(pic.domain()); + level::fill(prior, 1); + + mln_VAR( skl, + morpho::skeleton_constrained(pic, + nbh, is_simple_2d_t(), + K, prior) ); + + debug::println("pic =", pic); + debug::println("skl =", skl); +} Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 2895) +++ tests/morpho/Makefile.am (working copy) @@ -31,6 +31,7 @@ opening_area \ opening_height \ opening_volume \ + skeleton_constrained \ thinning # -------------- # @@ -67,6 +68,8 @@ meyer_wst_SOURCES = meyer_wst.cc +skeleton_constrained_SOURCES = skeleton_constrained.cc + combined_SOURCES = combined.cc # --------------- # Index: mln/topo/is_simple_2d.hh --- mln/topo/is_simple_2d.hh (revision 2893) +++ mln/topo/is_simple_2d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,47 +25,59 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_SIMPLE_POINT_HH -# define MLN_SIMPLE_POINT_HH +#ifndef MLN_TOPO_IS_SIMPLE_2D_HH +# define MLN_TOPO_IS_SIMPLE_2D_HH -/*! \file simple_point.hh - * - * \brief is_simple_point tell if a point is simple or not (Cf - * bertrand.07.chap). - * - */ +/// \file mln/topo/is_simple_2d.hh +/// +/// Define the function is_simple_2d which tests if a point is simple +/// or not (Cf bertrand.07.chap). + +#include <mln/core/concept/image.hh> +#include <mln/core/concept/neighborhood.hh> #include <mln/core/alias/point2d.hh> -#include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> + namespace mln { -/*! Tell if a point is simple or not. A point of an object is simple - * if in its c8 neiborhood, there is exactly one connected component of the - * object, and only one connected component of the background - * Examples : ( | == object, - = background) - * - * - - | - * | P | Here p is simple in the c4 and c8 case. - * | | | - * - * - | - - * | P | Here p is never simple. - * | | | - * - */ + /// Test if a point is simple or not. A point of an object is simple + /// if in its c8 neiborhood, there is exactly one connected component of the + /// object, and only one connected component of the background + /// Examples : ( | == object, - = background) + /// + /// - - | + /// | P | Here p is simple in the c4 and c8 case. + /// | | | + /// + /// - | - + /// | P | Here p is never simple. + /// | | | + + template<typename I, typename N> + bool + is_simple_2d(const Image& ima, const Neighborhood<N>& nbh, const mln_psite(I)& p); + + - bool is_simple_point(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); + struct is_simple_2d_t + { + template<typename I, typename N> + bool operator()(const Image& ima, + const Neighborhood<N>& nbh, + const mln_psite(I)& p) const + { + return is_simple_2d(ima, nbh, p); + } + }; - unsigned nb_connexity2d(const image2d<bool>& ima, const neighb2d& nbh, const point2d& p); - bool is_curve_extremum(const image2d<bool>& ima, unsigned nbh, const point2d& p); # ifndef MLN_INCLUDE_ONLY - static const unsigned char nb_connexity_c8[256] = + static const unsigned char connectivity_number_c8[256] = { 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, @@ -88,7 +100,7 @@ 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - static const unsigned char nb_connexity_c4[256] = + static const unsigned char connectivity_number_c4[256] = { 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, @@ -111,96 +123,57 @@ 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 }; - neighb2d int_to_neighb(unsigned i) - { - if (i == 8) - return c8(); - if (i == 4) - return c4(); - mln_assertion(0); - return c4(); - } - unsigned complement_neighb(unsigned i) + template<typename I, typename N> + inline + unsigned + connectivity_number_2d(const Image& ima_, const Neighborhood<N>& nbh_, + const mln_psite(I)& p, bool b) { - if (i == 8) - return 4; - if (i == 4) - return 8; - mln_assertion(0); - return 0; - } + const I& ima = exact(ima_); + const N& nbh = exact(nbh_); - unsigned nb_connexity2d(const image2d<bool>& ima, unsigned nbh, const point2d& p, bool object) - { unsigned res = 0; - mln_bkd_niter_(neighb2d) n(c8() , p); + mln_bkd_niter(neighb2d) n(c8(), p); for_all(n) { res = (res << 1); - if (ima.domain().has(n) && ima(n) == object) + if (ima.domain().has(n) && ima(n) == b) res = res | 1; } - if (nbh == 8) - return nb_connexity_c8[res]; - else - { - mln_assertion(nbh == 4); - return nb_connexity_c4[res]; - } - } - - bool is_curve_extremum(const image2d<bool>& ima, unsigned nbh_i, const point2d& p_, unsigned deep) - { -// return false; - unsigned cpt = 0; - mln_site_(image2d<bool>) next = p_; - mln_site_(image2d<bool>) p = next; - mln_niter_(neighb2d) n(int_to_neighb(nbh_i) , p); + unsigned number; - p = next; - for_all(n) + switch (nbh.size()) { - if (ima.domain().has(n) && ima(n) == true) - { - next = n; - cpt++; - } + case 4: + number = connectivity_number_c4[res]; + break; + case 8: + number = connectivity_number_c8[res]; + break; + default: + mln_assertion(0); } - if (cpt != 1) - return false; - for (unsigned i = 0; i < deep - 1; i++) - { - cpt = 0; - p = next; - for_all(n) - { - if (ima.domain().has(n) && ima(n) == true) - { - next = n; - cpt++; - } - } - if (cpt != 2) - return false; + return number; } - return true; - } - bool is_simple_point2d(const image2d<bool>& ima, unsigned nbh, const point2d& p) + template<typename I, typename N> + inline + bool + is_simple_2d(const Image& ima, const Neighborhood<N>& nbh_, const mln_psite(I)& p) { - mln_assertion(nbh == 4 || nbh == 8); - - return (nb_connexity2d(ima, nbh, p, true) == 1) && - (nb_connexity2d(ima, complement_neighb(nbh), p, false) == 1); + const N& nbh = exact(nbh_); + return + connectivity_number_2d(ima, nbh.foreground(), p, true ) == 1 && + connectivity_number_2d(ima, nbh.background(), p, false) == 1; } # endif // MLN_INCLUDE_ONLY } // end of namespace mln -#endif // ! MLN_SIMPLE_POINT_HH +#endif // ! MLN_TOPO_IS_SIMPLE_2D_HH Index: mln/win/multiple_size.hh --- mln/win/multiple_size.hh (revision 2895) +++ mln/win/multiple_size.hh (working copy) @@ -159,8 +159,8 @@ mln_psite(W) compute_p_() const; private: - unsigned i_; - unsigned size_() const; + int i_; + int size_() const; }; @@ -321,7 +321,7 @@ bool multiple_size_qiter<n,W,F>::is_valid_() const { - return i_ < size_(); + return i_ != -1 && i_ < size_(); } template <unsigned n, typename W, typename F> @@ -329,7 +329,7 @@ void multiple_size_qiter<n,W,F>::invalidate_() { - i_ = size_(); + i_ = -1; } template <unsigned n, typename W, typename F> @@ -358,10 +358,10 @@ template <unsigned n, typename W, typename F> inline - unsigned + int multiple_size_qiter<n,W,F>::size_() const { - return this->s_->size_around(*this->c_); + return int(this->s_->size_around(*this->c_)); } # endif // ! MLN_INCLUDE_ONLY Index: mln/morpho/skeleton_constrained.hh --- mln/morpho/skeleton_constrained.hh (revision 2893) +++ mln/morpho/skeleton_constrained.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,137 +25,97 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_SKELETON_HH -# define MLN_SKELETON_HH +#ifndef MLN_MORPHO_SKELETON_CONSTRAINED_HH +# define MLN_MORPHO_SKELETON_CONSTRAINED_HH -# include <iomanip> -# include <iostream> -# include <sstream> - -# include <mln/core/var.hh> - -# include <mln/core/image/image2d.hh> -# include <mln/core/image/cast_image.hh> -# include <mln/core/alias/neighb2d.hh> +/// \file mln/morpho/skeleton_constrained.hh +/// +/// Compute a skeleton under constraints. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/site_set/p_priority.hh> - -# include <mln/value/int_u8.hh> -# include <mln/arith/revert.hh> -# include <mln/transform/distance.hh> - -# include <mln/make/w_window2d_int.hh> - +# include <mln/extension/adjust_fill.hh> # include <mln/level/fill.hh> -# include <mln/debug/println.hh> - -# include <mln/logical/not.hh> - -# include "simple_point.hh" - -#include <mln/make/w_window2d_int.hh> - -# include <mln/io/pgm/save.hh> -# include <mln/io/pbm/save.hh> namespace mln { - template <typename V> - void save_state(const image2d<V>& ima) + namespace morpho { - static int id = 0; - std::stringstream filename; - std::cout << id << std::endl; - filename << "skel_trace_" << std::setw(5) << std::setfill('0') - << std::right << id++ << ".ppm"; + template <typename I, + typename N, typename F, + typename K, typename R> + mln_ch_value(I, bool) + skeleton_constrained(const Image& input, + const Neighborhood<N>& nbh, const F& is_simple, + const Image<K>& constraint, const Image<R>& priority); - io::pbm::save(ima, filename.str()); - } - image2d<bool> crest(const image2d<bool>& input, - const image2d<value::int_u8>& dist_map, - const neighb2d& nbh) - { - image2d<bool> is_crest; - initialize(is_crest, input); - level::fill(is_crest, false); - mln_piter_(image2d<bool>) p(input.domain()); - mln_niter_(neighb2d) n(nbh, p); - for_all(p) - { - if (!input(p) || dist_map(p) < 0) - continue; +# ifndef MLN_INCLUDE_ONLY - unsigned nb_eq = 0; - unsigned nb_gt = 0; - for_all(n) - if (input.domain().has(n)) + template <typename I, + typename N, typename F, + typename K, typename R> + inline + mln_ch_value(I, bool) + skeleton_constrained(const Image& input_, + const Neighborhood<N>& nbh_, const F& is_simple, + const Image<K>& constraint_, const Image<R>& priority_) { - if (dist_map(n) == dist_map(p)) - nb_eq++; - else if (dist_map(n) > dist_map(p)) - nb_gt++; - } - - if ((nb_gt == 1 && nb_eq == 0) || - (nb_gt == 0)) - is_crest(p) = true; - } - return is_crest; - } + const I& input = exact(input_); + const N& nbh = exact(nbh_); + const K& constraint = exact(constraint_); + const R& priority = exact(priority_); + extension::adjust_fill(input, nbh, false); - image2d<bool> - skeleton_with_constraint(const image2d<bool>& input, - unsigned nbh_i, - const image2d<bool>& K, - const image2d<value::int_u8>& priority) - { - mln_assertion(nbh_i == 4 || nbh_i == 8); + // FIXME: Tests! - neighb2d nbh = int_to_neighb(nbh_i); - image2d<bool> output; - initialize(output, input); + typedef mln_psite(I) P; + typedef p_queue_fast Q; + p_priority<mln_value(R), Q> q; - typedef mln_site_(image2d<bool>) P; - p_priority<value::int_u8, p_queue_fast > q; + mln_ch_value(I, bool) output; // Initialization. { - p_priority<value::int_u8, p_queue_fast > q_tmp; - + initialize(output, input); level::fill(output, input); - mln_piter_(image2d<bool>) p(input.domain()); + + mln_piter(I) p(input.domain()); for_all(p) - if (!input(p) && - is_simple_point2d(input, nbh_i, p)) // p is a simple point of background + if ( input(p) == false ) +// if ( input(p) == false && +// is_simple(input, nbh, p) ) // p is a simple point of the background. + { q.push(priority(p), p); + // std::cout << "push " << p << std::endl; + } } + // std::cout << std::endl << "propagation..." << std::endl; + // Propagation. { P p; - mln_niter_(neighb2d) n(nbh, p); + mln_niter(N) n(nbh, p); while (! q.is_empty()) { p = q.pop_front(); - for_all(n) if (output.domain().has(n) && - output(n) && - K(n) == false && - is_simple_point2d(output, nbh_i, n) - // && // n is simple - // !is_curve_extremum(output, nbh_i, n, 1) - ) + output(n) == true && + constraint(n) == false && + is_simple(output, nbh, n) ) { - output(n) = false; // Remove n from object - // save_state(output); + output(n) = false; // Remove n from object. q.push(priority(n), n); + // std::cout << "push " << n << std::endl; } } } @@ -163,32 +123,11 @@ return output; } +# endif // ! MLN_INCLUDE_ONLY - image2d<bool> - skeleton(const image2d<bool>& input, unsigned nbh_i) - { - mln_assertion(nbh_i == 4 || nbh_i == 8); - neighb2d nbh = int_to_neighb(nbh_i); - - int vals[] = { 0, 9, 0, 9, 0, - 9, 6, 4, 6, 9, - 0, 4, 0, 4, 0, // Values of distances. - 9, 6, 4, 6, 9, - 0, 9, 0, 9, 0 }; - - image2d<value::int_u8> dist_map_n = transform::distance(value::int_u8(), logical::not_(input), nbh, make::w_window2d_int(vals)); - image2d<value::int_u8> dist_map = arith::revert(dist_map_n); - - io::pgm::save(dist_map, "distance.pgm"); - io::pgm::save(dist_map_n, "distance_n.pgm"); - - // Make K - image2d<bool> K = crest(input, dist_map_n, nbh); - io::pbm::save(K, "K.pbm"); - - return skeleton_with_constraint(input, nbh_i, K, dist_map); - } + } // end of namespace mln::morpho } // end of namespace mln -#endif + +#endif // ! MLN_MORPHO_SKELETON_CONSTRAINED_HH Index: img/small.pbm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/small.pbm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: img/fly.pbm --- img/fly.pbm (revision 0) +++ img/fly.pbm (revision 0) @@ -0,0 +1,5 @@ +P4 +# CREATOR: XV version 3.10a-jumboFix+Enh of 20050501 + +5 6 +��X� \ No newline at end of file

1 0

cleanup-2008 2895: Make the neighborhood energy count.
by Alexandre Abraham 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Make the neighborhood energy count. * markov/markov.hh: . markov.hh | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2894) +++ markov/markov.hh (working copy) @@ -9,8 +9,8 @@ namespace mln { - template <typename I, typename N> - double compute_energy(const I& ima, const N& nbh, bool xi, const mln_site(I) &p) + template <typename I, typename O, typename N> + double compute_energy(const I& ima, const O& out, const N& nbh, bool xi, const mln_site(I) &p) { // Compute u(x,y) double u; @@ -25,19 +25,19 @@ mln_niter(N) n(nbh, p); for_all(n) - diff_sum += abs(ima(p) - ima(n)); + { + diff_sum += abs(out(p) - out(n)); + } - return u + 10 * diff_sum; + return u + 100 * diff_sum; } template <typename I, typename N> // I == int_u8 - mln_ch_value(I, bool) markov(const Image& ima_, const Neighborhood<N> nbh_, unsigned start_temp) + mln_ch_value(I, bool) markov(const Image& ima_, const Neighborhood<N>& nbh_, unsigned start_temp) { const I &ima = exact(ima_); const N &nbh = exact(nbh_); - double epsilon = 0.001; - // mln_ch_value(I, bool) out(ima.domain()); // FIXME: generalize, we might not do a binarisation mln_ch_value(I, bool) out = binarization::threshold(ima, 255 / 2); // FIXME : max @@ -47,25 +47,42 @@ Random<bool> v_random(0, 1); // mettre max et min ? Random<double> p_random(0., 1.); // idem - while (temp > epsilon) + unsigned modifications = 42; + unsigned turn = 1; + bool gradient = false; + + while (!gradient || modifications) { mln_piter(I) p(ima.domain()); + modifications = 0; for_all(p) { bool v = v_random.get(); - double u = compute_energy(ima, nbh, out(p), p); - double up = compute_energy(ima, nbh, v, p); - - double d_u = abs(up - u); + double u = compute_energy(ima, out, nbh, out(p), p); + double up = compute_energy(ima, out, nbh, v, p); + double d_u = up - u; double proba = exp(-d_u / temp); - if (d_u < 0 || (p_random.get() > proba)) + // std::cout << "Difference : " << d_u << std::endl; + + if (d_u < 0 || !gradient && (p_random.get() < proba)) + { out(p) = v; + modifications ++; + } } temp = gtemp; + std::cout << "Turn : " << turn << " Modifs : " << modifications << " Temp : " << temp << std::endl; + turn ++; + if (!gradient && !modifications) + { + std::cout << "Gradient !" << std::endl; + modifications = 1; + gradient = true; + } } return out;

1 0

cleanup-2008 2884: Fix some constants.
by Alexandre Abraham 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix some constants. * markov/markov.hh: . markov.hh | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2883) +++ markov/markov.hh (working copy) @@ -4,45 +4,30 @@ # include <cmath> # include <random.hh> # include <T_gen.hh> +# include <mln/binarization/threshold.hh> namespace mln { - /* I think we don't need it anymore... - inline - const neighb2d& neighb_h1() - { - static neighb2d it; - if (it.size() == 0) - { - static const bool vals[] = { 0, 0, 0, - 0, 0, 1, - 0, 0, 0 }; - convert::from_to(vals, it); - } - return it; - } - */ - template <typename I, typename N> - double compute_energy(const I& ima, const N& nbh, bool xi, const mln_piter(I)& p) + double compute_energy(const I& ima, const N& nbh, bool xi, const mln_site(I) &p) { // Compute u(x,y) double u; if (xi) u = (double) ima(p) / mln_max(mln_value(I)); else - u = (double) (1 - ima(p)) / mln_max(mln_value(I)); + u = 1. - (double) ima(p) / mln_max(mln_value(I)); - // u(x) is cst donc osef + // u(x) is cst so we don't care - // u voisinage + double diff_sum = 0; mln_niter(N) n(nbh, p); for_all(n) - // treat each point here ;), no need to make weird neighborhoods - // make sth with |ima(p) - ima(n)| - abs(ima(p) - ima(n)); + diff_sum += abs(ima(p) - ima(n)); + + return u + 10 * diff_sum; } template <typename I, typename N> // I == int_u8 @@ -52,16 +37,17 @@ const N &nbh = exact(nbh_); double epsilon = 0.001; - mln_ch_value(I, bool) out(ima.domain()); // FIXME: generalize, we might not do a binarisation - // G temp(start_temp); - temperature_generator temp(start_temp, 0.99); + + // mln_ch_value(I, bool) out(ima.domain()); // FIXME: generalize, we might not do a binarisation + mln_ch_value(I, bool) out = binarization::threshold(ima, 255 / 2); // FIXME : max + + temperature_generator gtemp(start_temp, 0.99); + double temp = start_temp; Random<bool> v_random(0, 1); // mettre max et min ? Random<double> p_random(0., 1.); // idem - // init(ima, out); ca empeche de compiloter - - while (temp < epsilon) + while (temp > epsilon) { mln_piter(I) p(ima.domain()); @@ -74,11 +60,12 @@ double d_u = abs(up - u); - double proba = 0.5; // FIXME + double proba = exp(-d_u / temp); - if (d_u < 0 or (p_random.get() > proba)) + if (d_u < 0 || (p_random.get() > proba)) out(p) = v; } + temp = gtemp; } return out;

1 0

r2894: Remove images
by Dalila Benboudjema 18 Nov '08

18 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-18 Dalila Benboudjema <dalila(a)lrde.epita.fr> Remove images. * images/factures/facture.pbm: Remove. * images/factures/facture2.pbm: Remove. * images/factures/facture3.pbm: Remove. * images/factures: Remove. * images/photos/chavez.pbm: Remove. * images/photos/family.pbm: Remove. * images/photos/garden.pbm: Remove. * images/photos/garden_crop.pbm: Remove. * images/photos/revolution.pbm: Remove. * images/photos/revolution2.pbm: Remove. * images/photos: Remove. * images: Remove. --- 0 files changed Index: images/photos/garden_crop.pbm (deleted) =================================================================== Index: images/photos/revolution.pbm (deleted) =================================================================== Index: images/photos/revolution2.pbm (deleted) =================================================================== Index: images/photos/chavez.pbm (deleted) =================================================================== Index: images/photos/garden.pbm (deleted) =================================================================== Index: images/photos/family.pbm (deleted) =================================================================== Index: images/factures/facture.pbm (deleted) =================================================================== Index: images/factures/facture2.pbm (deleted) =================================================================== Index: images/factures/facture3.pbm (deleted) ===================================================================

1 0

cleanup-2008 2893: Cleanup optional methods in neighborhoods.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Cleanup optional methods in neighborhoods. * tests/make/dual_neighb.cc: Test foreground and bg methods. * mln/core/internal/neighborhood_base.hh (neighborhood_extra_impl, neighborhood_impl): New. (D): Change parameter into... (W): ...this; that allows for factoring code here. * mln/core/neighb.hh: Upgrade doc style. Update inheritance. (window, size, delta, dp): Move... * mln/core/internal/neighborhood_base.hh (neighborhood_impl): ...in this new class. * mln/core/concept/neighborhood.hh: Upgrade doc style. (operator==): New. * mln/metal/ands.hh: New. * mln/metal/all.hh: Update. * mln/win/multiple_size.hh (n): New parameter. (todo): New. * mln/make/dual_neighb.hh: Upgrade doc style. Update. mln/core/concept/neighborhood.hh | 30 ++++-- mln/core/internal/neighborhood_base.hh | 148 +++++++++++++++++++++++++++++---- mln/core/neighb.hh | 80 ++--------------- mln/make/dual_neighb.hh | 15 +-- mln/metal/all.hh | 1 mln/metal/ands.hh | 69 +++++++++++++++ mln/win/multiple_size.hh | 135 +++++++++++++++--------------- tests/make/dual_neighb.cc | 3 8 files changed, 313 insertions(+), 168 deletions(-) Index: tests/make/dual_neighb.cc --- tests/make/dual_neighb.cc (revision 2892) +++ tests/make/dual_neighb.cc (working copy) @@ -59,6 +59,9 @@ mln_assertion( count(ima, make::dual_neighb(ima, c4(), c8())) == c4().size() + c8().size() ); + mln_assertion( make::dual_neighb(ima, c4(), c8()).foreground() == c4() ); + mln_assertion( make::dual_neighb(ima, c4(), c8()).background() == c8() ); + // We can observe that the neighboord is not restricted by the // respective domains defined by ima(p) == false and ima(p) == true: // for instance, at (0,0) we are in the *object* (ima(0,0) == true), Index: mln/core/internal/neighborhood_base.hh --- mln/core/internal/neighborhood_base.hh (revision 2892) +++ mln/core/internal/neighborhood_base.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,49 +28,163 @@ #ifndef MLN_CORE_INTERNAL_NEIGHBORHOOD_BASE_HH # define MLN_CORE_INTERNAL_NEIGHBORHOOD_BASE_HH -/*! \file mln/core/internal/neighborhood_base.hh - * - * \brief Definition of a base class for neighborhood classes. - */ +/// \file mln/core/internal/neighborhood_base.hh +/// +/// Definition of a base class for neighborhood classes. +/// +/// \todo Complete conditional implementation inheritance +/// w.r.t. properties. # include <mln/core/concept/neighborhood.hh> +# include <mln/core/concept/window.hh> namespace mln { + + // Forward declaration. + namespace win + { + template <unsigned n, typename W, typename F> + class multiple_size; + } + + namespace internal { + template <typename W, typename E> + struct neighborhood_extra_impl + : public Neighborhood<E> + { + }; - /*! A base class for neighborhood classes. - * - * \p D is a dpsite type. - */ - template <typename D, typename E> - struct neighborhood_base : public Neighborhood<E> + template <typename W, typename F, typename E> + struct neighborhood_extra_impl< win::multiple_size<2,W,F>, E > + : public Neighborhood<E> { - /// DPsite associated type. - typedef D dpsite; + /// Give the foreground neighborhood in the case of a dual + /// neighborhood. For instance, with (object:c4, background:c8), + /// the result is c4. + + neighb<W> foreground() const + { + W win = internal::force_exact<E>(*this).win().window_(1); // True, so object. + neighb<W> nbh(win); + return nbh; + } + + /// Give the background neighborhood in the case of a dual + /// neighborhood. For instance, with (object:c4, background:c8), + /// the result is c8. + + neighb<W> background() const + { + W win = internal::force_exact<E>(*this).win().window_(0); // False, so background. + neighb<W> nbh(win); + return nbh; + } + + }; + + + + + template <typename W, typename E> + struct neighborhood_impl : public neighborhood_extra_impl<W,E> + { + // Optional methods... + + /// Give the neighborhood size, i.e., the number of elements it + /// contains. + unsigned size() const; + + /// Give the maximum coordinate gap between the neighborhood + /// center and a neighboring point. + unsigned delta() const; + + /// Give the maximum coordinate gap between the neighborhood + /// center and a neighboring point. + const mln_dpsite(W)& dp(unsigned i) const; + + // end of Optional methods. + }; + + + /// Base class for neighborhood implementation classes. + /// + /// \p W is the underlying window type. + + template <typename W, typename E> + struct neighborhood_base : public neighborhood_impl<W,E> + { + /// Window associated type. + typedef W window; + + /// Dpsite associated type. + typedef mln_dpsite(W) dpsite; /// Psite associated type. - typedef mln_psite(D) psite; + typedef mln_psite(W) psite; /// Site associated type. - typedef mln_site(D) site; + typedef mln_site(W) site; protected: neighborhood_base(); }; + + # ifndef MLN_INCLUDE_ONLY - template <typename D, typename E> + + // neighborhood_base + + template <typename W, typename E> + inline + neighborhood_base<W,E>::neighborhood_base() + { + } + + + // neighborhood_impl + + template <typename W, typename E> + inline + unsigned + neighborhood_impl<W,E>::size() const + { + mlc_is(mln_trait_window_size(W), + trait::window::size::fixed)::check(); + return exact(this)->win().size(); + } + + template <typename W, typename E> + inline + unsigned + neighborhood_impl<W,E>::delta() const + { + mlc_is(mln_trait_window_support(W), + trait::window::support::regular)::check(); + mlc_is_not(mln_trait_window_definition(W), + trait::window::definition::varying)::check(); + return exact(this)->win().delta(); + } + + template <typename W, typename E> inline - neighborhood_base<D,E>::neighborhood_base() + const mln_dpsite(W)& + neighborhood_impl<W,E>::dp(unsigned i) const { + mlc_is(mln_trait_window_support(W), + trait::window::support::regular)::check(); + mlc_is(mln_trait_window_definition(W), + trait::window::definition::unique)::check(); + return exact(this)->win().dp(i); } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 2892) +++ mln/core/neighb.hh (working copy) @@ -28,18 +28,14 @@ #ifndef MLN_CORE_NEIGHB_HH # define MLN_CORE_NEIGHB_HH -/*! \file mln/core/neighb.hh - * - * \brief Definition of a window-to-neighborhood adapter. - * - * \todo Introduce properties so that we can deal properly with - * optional methods. - * - * \todo See if the impl of from_to is fine. What about removing the - * origin? etc. - */ +/// \file mln/core/neighb.hh +/// +/// Definition of a window-to-neighborhood adapter. +/// +/// +/// \todo See if the impl of from_to is fine. What about removing the +/// origin? etc. -# include <mln/core/concept/window.hh> # include <mln/core/internal/neighborhood_base.hh> # include <mln/core/internal/site_relative_iterator_base.hh> @@ -53,17 +49,15 @@ template <typename W> class neighb_bkd_niter; - /*! \brief Adapter class from window to neighborhood. - */ + + /// Adapter class from window to neighborhood. + template <typename W> - class neighb : public internal::neighborhood_base< mln_dpsite(W), neighb<W> >, + class neighb : public internal::neighborhood_base< W, neighb<W> >, private mlc_is_a(W, Window)::check_t { public: - /// Window associated type. - typedef W window; - /// Forward site iterator associated type. typedef neighb_fwd_niter<W> fwd_niter; @@ -87,27 +81,11 @@ void change_window(const W& new_win); - // Optional methods... - - /// Give the neighborhood size, i.e., the number of elements it - /// contains. - unsigned size() const; - - /// Give the maximum coordinate gap between the neighborhood - /// center and a neighboring point. - unsigned delta() const; - - /// Give the maximum coordinate gap between the neighborhood - /// center and a neighboring point. - const mln_dpsite(W)& dp(unsigned i) const; - - // end of Optional methods. - - /// \internal Hook to the window. W& hook_win_(); private: + W win_; }; @@ -238,40 +216,6 @@ template <typename W> inline - unsigned - neighb<W>::size() const - { - mlc_is(mln_trait_window_size(W), - trait::window::size::fixed)::check(); - return win_.size(); - } - - template <typename W> - inline - unsigned - neighb<W>::delta() const - { - mlc_is(mln_trait_window_support(W), - trait::window::support::regular)::check(); - mlc_is_not(mln_trait_window_definition(W), - trait::window::definition::varying)::check(); - return win_.delta(); - } - - template <typename W> - inline - const mln_dpsite(W)& - neighb<W>::dp(unsigned i) const - { - mlc_is(mln_trait_window_support(W), - trait::window::support::regular)::check(); - mlc_is(mln_trait_window_definition(W), - trait::window::definition::unique)::check(); - return win_.dp(i); - } - - template <typename W> - inline W& neighb<W>::hook_win_() { Index: mln/core/concept/neighborhood.hh --- mln/core/concept/neighborhood.hh (revision 2892) +++ mln/core/concept/neighborhood.hh (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,9 +29,9 @@ #ifndef MLN_CORE_CONCEPT_NEIGHBORHOOD_HH # define MLN_CORE_CONCEPT_NEIGHBORHOOD_HH -/*! \file mln/core/concept/neighborhood.hh - * \brief Definition of the concept of mln::Neighborhood. - */ +/// \file mln/core/concept/neighborhood.hh +/// +/// Definition of the concept of mln::Neighborhood. # include <mln/core/concept/object.hh> # include <mln/trait/windows.hh> @@ -42,7 +43,9 @@ // Fwd decl. template <typename E> struct Neighborhood; - // Neighborhood category flag type. + + /// Neighborhood category flag type. + template <> struct Neighborhood<void> { @@ -50,11 +53,11 @@ }; - /*! \brief Base class for implementation classes that are neighborhoods. - * - * \see mln::doc::Neighborhood for a complete documentation of this - * class contents. - */ + /// \brief Base class for implementation classes that are neighborhoods. + /// + /// \see mln::doc::Neighborhood for a complete documentation of this + /// class contents. + template <typename E> struct Neighborhood : public Object<E> { @@ -78,6 +81,9 @@ + template <typename L, typename R> + bool operator==(const Neighborhood<L>& lhs, const Neighborhood<R>& rhs); + template <typename N> std::ostream& @@ -108,6 +114,12 @@ } + template <typename L, typename R> + inline + bool operator==(const Neighborhood<L>& lhs, const Neighborhood<R>& rhs) + { + return exact(lhs).win() == exact(rhs).win(); + } template <typename N> inline Index: mln/metal/ands.hh --- mln/metal/ands.hh (revision 0) +++ mln/metal/ands.hh (revision 0) @@ -0,0 +1,69 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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_METAL_ANDS_HH +# define MLN_METAL_ANDS_HH + +/// \file mln/metal/ands.hh +/// +/// Definition of a multiple-"and"s Boolean expression. + +# include <mln/metal/bool.hh> + + +namespace mln +{ + + namespace metal + { + + /// Ands type. + template < typename E1, + typename E2, + typename E3, + typename E4 = true_, + typename E5 = true_, + typename E6 = true_, + typename E7 = true_, + typename E8 = true_ > + struct ands : bool_<( E1::value && + E2::value && + E3::value && + E4::value && + E5::value && + E6::value && + E7::value && + E8::value )> + {}; + + + } // end of namespace mln::metal + +} // end of namespace mln + + +#endif // ! MLN_METAL_ANDS_HH Index: mln/metal/all.hh --- mln/metal/all.hh (revision 2892) +++ mln/metal/all.hh (working copy) @@ -54,6 +54,7 @@ # include <mln/metal/none.hh> # include <mln/metal/abort.hh> +# include <mln/metal/ands.hh> # include <mln/metal/bexpr.hh> # include <mln/metal/bool.hh> # include <mln/metal/equal.hh> Index: mln/make/dual_neighb.hh --- mln/make/dual_neighb.hh (revision 2892) +++ mln/make/dual_neighb.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_MAKE_DUAL_NEIGHB_HH # define MLN_MAKE_DUAL_NEIGHB_HH -/*! \file mln/make/dual_neighb.hh - * - * \brief Routine to create a dual neighborhood. - */ +/// \file mln/make/dual_neighb.hh +/// +/// Routine to create a dual neighborhood. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -47,7 +46,7 @@ { template <typename I, typename N> - neighb< win::multiple_size< mln_window(N), pw::value_ > > + neighb< win::multiple_size< 2, mln_window(N), pw::value_ > > dual_neighb(const Image& ima, const Neighborhood<N>& nbh_true, const Neighborhood<N>& nbh_false); @@ -59,7 +58,7 @@ template <typename I, typename N> inline - neighb< win::multiple_size< mln_window(N), pw::value_ > > + neighb< win::multiple_size< 2, mln_window(N), pw::value_ > > dual_neighb(const Image& ima_, const Neighborhood<N>& nbh_true_, const Neighborhood<N>& nbh_false_) @@ -73,7 +72,7 @@ const N& nbh_false = exact(nbh_false_); mln_precondition(ima.has_data()); - typedef win::multiple_size< mln_window(N), pw::value_ > W; + typedef win::multiple_size< 2, mln_window(N), pw::value_ > W; W win(pw::value(ima)); win.set_window(false, nbh_false.win()); // 0 win.set_window(true, nbh_true .win()); // 1 Index: mln/win/multiple_size.hh --- mln/win/multiple_size.hh (revision 2892) +++ mln/win/multiple_size.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,14 +28,16 @@ #ifndef MLN_WIN_MULTIPLE_SIZE_HH # define MLN_WIN_MULTIPLE_SIZE_HH -/*! \file mln/win/multiple_size.hh - * - * \brief Definition of a multiple-size window. - */ +/// \file mln/win/multiple_size.hh +/// +/// Definition of a multiple-size window. +/// +/// \todo Use n for tests and code!!! # include <mln/core/internal/window_base.hh> # include <mln/core/internal/site_relative_iterator_base.hh> # include <mln/util/array.hh> +# include <mln/metal/ands.hh> @@ -45,8 +47,8 @@ // Forward declarations. namespace win { - template <typename W, typename F> class multiple_size; - template <typename W, typename F> class multiple_size_qiter; + template <unsigned n, typename W, typename F> class multiple_size; + template <unsigned n, typename W, typename F> class multiple_size_qiter; } @@ -54,8 +56,8 @@ namespace trait { - template <typename W, typename F> - struct window_< win::multiple_size<W,F> > + template <unsigned n, typename W, typename F> + struct window_< win::multiple_size<n,W,F> > { typedef trait::window::size::unknown size; typedef trait::window::support::regular support; @@ -69,12 +71,13 @@ namespace win { - template <typename W, typename F> + template <unsigned n, typename W, typename F> class multiple_size - : public internal::window_base< mln_dpsite(W), multiple_size<W,F> >, + : public internal::window_base< mln_dpsite(W), multiple_size<n,W,F> >, - private metal::and_< mlc_is(mln_trait_window_size(W), + private metal::ands< mlc_bool(n > 1), + mlc_is(mln_trait_window_size(W), trait::window::size::fixed), mlc_is(mln_trait_window_support(W), trait::window::support::regular) >::check_t @@ -85,11 +88,11 @@ typedef mln_psite(W) psite; typedef mln_site(W) site; - typedef multiple_size< window<dpsite>, F > regular; + typedef multiple_size< n, window<dpsite>, F > regular; - typedef multiple_size_qiter<W,F> fwd_qiter; - typedef multiple_size_qiter<W,F> bkd_qiter; - typedef multiple_size_qiter<W,F> qiter; + typedef multiple_size_qiter<n,W,F> fwd_qiter; + typedef multiple_size_qiter<n,W,F> bkd_qiter; + typedef multiple_size_qiter<n,W,F> qiter; typedef W element; @@ -126,19 +129,19 @@ }; - template <typename W, typename F> + template <unsigned n, typename W, typename F> class multiple_size_qiter - : public internal::site_relative_iterator_base< multiple_size<W,F>, - multiple_size_qiter<W,F> > + : public internal::site_relative_iterator_base< multiple_size<n,W,F>, + multiple_size_qiter<n,W,F> > { - typedef multiple_size_qiter<W,F> self_; - typedef internal::site_relative_iterator_base< multiple_size<W,F>, self_ > super_; + typedef multiple_size_qiter<n,W,F> self_; + typedef internal::site_relative_iterator_base< multiple_size<n,W,F>, self_ > super_; public: multiple_size_qiter(); template <typename P> - multiple_size_qiter(const multiple_size<W,F>& w, const P& c); + multiple_size_qiter(const multiple_size<n,W,F>& w, const P& c); /// Test the iterator validity. bool is_valid_() const; @@ -164,68 +167,68 @@ # ifndef MLN_INCLUDE_ONLY - // win::multiple_size<W,F> + // win::multiple_size<n,W,F> - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline - multiple_size<W,F>::multiple_size() + multiple_size<n,W,F>::multiple_size() : f_() { } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline - multiple_size<W,F>::multiple_size(const F& f) + multiple_size<n,W,F>::multiple_size(const F& f) : f_(f) { } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline bool - multiple_size<W,F>::is_empty() const + multiple_size<n,W,F>::is_empty() const { return win_.is_empty(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline void - multiple_size<W,F>::set_window(unsigned i, const W& win) + multiple_size<n,W,F>::set_window(unsigned i, const W& win) { mln_precondition(i == win_.nelements()); win_.append(win); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline const W& - multiple_size<W,F>::window_(unsigned i) const + multiple_size<n,W,F>::window_(unsigned i) const { mln_precondition(i < win_.nelements()); return win_[i]; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline unsigned - multiple_size<W,F>::nwindows() const + multiple_size<n,W,F>::nwindows() const { return win_.nelements(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline const F& - multiple_size<W,F>::function() const + multiple_size<n,W,F>::function() const { return f_; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline bool - multiple_size<W,F>::is_centered() const + multiple_size<n,W,F>::is_centered() const { mln_precondition(win_.nelements() >= 1); for (unsigned i = 0; i < win_.nelements(); ++i) @@ -234,10 +237,10 @@ return true; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline bool - multiple_size<W,F>::is_symmetric() const + multiple_size<n,W,F>::is_symmetric() const { mln_precondition(win_.nelements() >= 1); for (unsigned i = 0; i < win_.nelements(); ++i) @@ -246,20 +249,20 @@ return true; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline void - multiple_size<W,F>::sym() + multiple_size<n,W,F>::sym() { mln_precondition(win_.nelements() >= 1); for (unsigned i = 0; i < win_.nelements(); ++i) win_[i].sym(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline unsigned - multiple_size<W,F>::delta() const + multiple_size<n,W,F>::delta() const { mln_precondition(win_.nelements() >= 1); unsigned d = win_[0].delta(); @@ -272,20 +275,20 @@ return d; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline unsigned - multiple_size<W,F>::size_around(const mln_psite(W)& p) const + multiple_size<n,W,F>::size_around(const mln_psite(W)& p) const { mln_precondition(win_.nelements() >= 2); mln_precondition(f_(p) < win_.nelements()); return win_[f_(p)].size(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline const mln_dpsite(W)& - multiple_size<W,F>::ith_dp_around(unsigned i, const mln_psite(W)& p) const + multiple_size<n,W,F>::ith_dp_around(unsigned i, const mln_psite(W)& p) const { mln_precondition(win_.nelements() >= 2); mln_precondition(f_(p) < win_.nelements()); @@ -294,18 +297,18 @@ } - // win::multiple_size_qiter<W,F> + // win::multiple_size_qiter<n,W,F> - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline - multiple_size_qiter<W,F>::multiple_size_qiter() + multiple_size_qiter<n,W,F>::multiple_size_qiter() { } - template <typename W, typename F> + template <unsigned n, typename W, typename F> template <typename P> inline - multiple_size_qiter<W,F>::multiple_size_qiter(const multiple_size<W,F>& w, const P& c) + multiple_size_qiter<n,W,F>::multiple_size_qiter(const multiple_size<n,W,F>& w, const P& c) { this->center_at(c); // We have to first change the center so that 'invalidate' can @@ -313,50 +316,50 @@ this->change_target(w); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline bool - multiple_size_qiter<W,F>::is_valid_() const + multiple_size_qiter<n,W,F>::is_valid_() const { return i_ < size_(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline void - multiple_size_qiter<W,F>::invalidate_() + multiple_size_qiter<n,W,F>::invalidate_() { i_ = size_(); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline void - multiple_size_qiter<W,F>::do_start_() + multiple_size_qiter<n,W,F>::do_start_() { i_ = 0; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline void - multiple_size_qiter<W,F>::do_next_() + multiple_size_qiter<n,W,F>::do_next_() { ++i_; } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline mln_psite(W) - multiple_size_qiter<W,F>::compute_p_() const + multiple_size_qiter<n,W,F>::compute_p_() const { return *this->c_ + this->s_->ith_dp_around(i_, *this->c_); } - template <typename W, typename F> + template <unsigned n, typename W, typename F> inline unsigned - multiple_size_qiter<W,F>::size_() const + multiple_size_qiter<n,W,F>::size_() const { return this->s_->size_around(*this->c_); }

1 0