March 2009 - Olena-patches

3464: Fix missing tests in morpho.
by Thierry Geraud 03 Mar '09

03 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix missing tests in morpho. * tests/morpho/top_hat.cc: New. * tests/morpho/Makefile.am: Update. * tests/morpho/closing/area.cc, * tests/morpho/closing/height.cc (Copyright): Fix. * tests/morpho/closing/structural.cc: New. * tests/morpho/closing/Makefile.am: Update. * tests/morpho/opening/volume.cc, * tests/morpho/opening/area.cc, * tests/morpho/opening/height.cc (Copyright): Fix. * tests/morpho/opening/structural.cc: New. * tests/morpho/opening/Makefile.am: Update. Makefile.am | 12 ++++------ closing/Makefile.am | 2 + closing/area.cc | 4 +-- closing/height.cc | 5 ++-- closing/structural.cc | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ opening/Makefile.am | 2 + opening/area.cc | 4 +-- opening/height.cc | 4 ++- opening/structural.cc | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ opening/volume.cc | 4 ++- top_hat.cc | 24 ++++++++++---------- 11 files changed, 152 insertions(+), 27 deletions(-) Index: tests/morpho/top_hat.cc --- tests/morpho/top_hat.cc (revision 3462) +++ tests/morpho/top_hat.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/morpho/elementary/top_hat.cc - * - * \brief Test on mln::morpho::elementary::top_hat's. - */ +/// \file tests/morpho/elementary/top_hat.cc +/// +/// Test on mln::morpho::top_hat. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> @@ -37,7 +37,7 @@ #include <mln/debug/iota.hh> #include <mln/debug/println.hh> -#include <mln/morpho/elementary/top_hat.hh> +#include <mln/morpho/top_hat.hh> int main() @@ -51,15 +51,15 @@ debug::iota(ima); debug::println(ima); - debug::println( morpho::elementary::top_hat_white(ima, c4()) ); - debug::println( morpho::elementary::top_hat_black(ima, c4()) ); - debug::println( morpho::elementary::top_hat_self_complementary(ima, c4()) ); + debug::println( morpho::top_hat_white(ima, c4().win()) ); + debug::println( morpho::top_hat_black(ima, c4().win()) ); + debug::println( morpho::top_hat_self_complementary(ima, c4().win()) ); image2d<bool> msk(3, 3, 0); data::fill(msk, pw::value(ima) >= pw::cst(5u)); debug::println(msk); - debug::println( morpho::elementary::top_hat_white(msk, c4()) ); - debug::println( morpho::elementary::top_hat_black(msk, c4()) ); - debug::println( morpho::elementary::top_hat_self_complementary(msk, c4()) ); + debug::println( morpho::top_hat_white(msk, c4().win()) ); + debug::println( morpho::top_hat_black(msk, c4().win()) ); + debug::println( morpho::top_hat_self_complementary(msk, c4().win()) ); } Property changes on: tests/morpho/top_hat.cc ___________________________________________________________________ Added: svn:mergeinfo Index: tests/morpho/closing/Makefile.am --- tests/morpho/closing/Makefile.am (revision 3463) +++ tests/morpho/closing/Makefile.am (working copy) @@ -8,6 +8,7 @@ height \ area \ volume \ + structural \ sum leveling_SOURCES = leveling.cc @@ -15,6 +16,7 @@ height_SOURCES = height.cc area_SOURCES = area.cc volume_SOURCES = volume.cc +structural_SOURCES = structural.cc sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) Index: tests/morpho/closing/area.cc --- tests/morpho/closing/area.cc (revision 3463) +++ tests/morpho/closing/area.cc (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 Index: tests/morpho/closing/height.cc --- tests/morpho/closing/height.cc (revision 3463) +++ tests/morpho/closing/height.cc (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -41,6 +41,7 @@ #include "tests/data.hh" + int main() { using namespace mln; Index: tests/morpho/closing/structural.cc --- tests/morpho/closing/structural.cc (revision 0) +++ tests/morpho/closing/structural.cc (revision 0) @@ -0,0 +1,59 @@ +// Copyright (C) 2009 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/closing/structural.cc +/// +/// Test on mln::morpho::closing::structural. + +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/core/alias/window2d.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/morpho/closing/structural.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena, out; + io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); + + bool w[] = { 0, 1, 1, + 0, 0, 1, + 0, 0, 1 }; + + out = morpho::closing::structural(lena, + convert::to<window2d>(w)); + io::pgm::save(out, "out.pgm"); +} Index: tests/morpho/opening/Makefile.am --- tests/morpho/opening/Makefile.am (revision 3463) +++ tests/morpho/opening/Makefile.am (working copy) @@ -8,6 +8,7 @@ height \ area \ volume \ + structural \ sum leveling_SOURCES = leveling.cc @@ -15,6 +16,7 @@ height_SOURCES = height.cc area_SOURCES = area.cc volume_SOURCES = volume.cc +structural_SOURCES = structural.cc sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) Index: tests/morpho/opening/volume.cc --- tests/morpho/opening/volume.cc (revision 3463) +++ tests/morpho/opening/volume.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -40,6 +41,7 @@ #include "tests/data.hh" + int main() { using namespace mln; Index: tests/morpho/opening/area.cc --- tests/morpho/opening/area.cc (revision 3463) +++ tests/morpho/opening/area.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -41,7 +42,6 @@ #include "tests/data.hh" - int main() { using namespace mln; Index: tests/morpho/opening/height.cc --- tests/morpho/opening/height.cc (revision 3463) +++ tests/morpho/opening/height.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -40,6 +41,7 @@ #include "tests/data.hh" + int main() { using namespace mln; Index: tests/morpho/opening/structural.cc --- tests/morpho/opening/structural.cc (revision 0) +++ tests/morpho/opening/structural.cc (revision 0) @@ -0,0 +1,59 @@ +// Copyright (C) 2009 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/opening/structural.cc +/// +/// Test on mln::morpho::opening::structural. + +#include <mln/core/image/image2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/core/alias/window2d.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/morpho/opening/structural.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d<int_u8> lena, out; + io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); + + bool w[] = { 0, 1, 1, + 0, 0, 1, + 0, 0, 1 }; + + out = morpho::opening::structural(lena, + convert::to<window2d>(w)); + io::pgm::save(out, "out.pgm"); +} Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 3463) +++ tests/morpho/Makefile.am (working copy) @@ -30,7 +30,9 @@ meyer_wst_long \ rank_filter \ skeleton_constrained \ - thinning + thinning \ + top_hat + # -------------- # # Normal tests. # @@ -38,7 +40,6 @@ # FIXME: Have erosion and dilation perform symmetric tests. erosion_SOURCES = erosion.cc - contrast_SOURCES = contrast.cc general_SOURCES = general.cc gradient_SOURCES = gradient.cc @@ -48,21 +49,18 @@ graph_image_morpho_SOURCES = graph_image_morpho.cc graph_image_wst_SOURCES = graph_image_wst.cc - line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc - complex_image_morpho_SOURCES = complex_image_morpho.cc complex_image_wst_SOURCES = complex_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc - rank_filter_SOURCES = rank_filter.cc - skeleton_constrained_SOURCES = skeleton_constrained.cc - +top_hat_SOURCES = top_hat.cc combined_SOURCES = combined.cc + # --------------- # # Complex tests. # # --------------- #

1 0

3463: Update calls to morphological structural closing and opening.
by Thierry Geraud 03 Mar '09

03 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update calls to morphological structural closing and opening. * nivault/extract_score.cc, * garrigues/factures/extract_array_highlight.cc, * inim/nature/closing.cc, * inim/nature/nature.cc, * inim/nature/opening.cc, * inim/nature/hom.cc, * theo/exec/closing_isotropic.cc (closing, opening): Update to... (closing::structural, opening::structural): ...this. * dalila/dematOld.hh, * dalila/demat.hh: Remove; they are just copies of... * scribo/demat.hh: ...this! garrigues/factures/extract_array_highlight.cc | 12 ++++++++---- inim/nature/closing.cc | 8 +++++--- inim/nature/hom.cc | 10 ++++++---- inim/nature/nature.cc | 11 ++++++----- inim/nature/opening.cc | 8 +++++--- nivault/extract_score.cc | 13 +++++++------ theo/exec/closing_isotropic.cc | 6 +++--- 7 files changed, 40 insertions(+), 28 deletions(-) Index: nivault/extract_score.cc --- nivault/extract_score.cc (revision 3462) +++ nivault/extract_score.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 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 @@ -40,8 +41,8 @@ # include <mln/morpho/erosion.hh> # include <mln/morpho/dilation.hh> # include <mln/morpho/complementation.hh> -# include <mln/morpho/closing.hh> -# include <mln/morpho/opening.hh> +# include <mln/morpho/closing/structural.hh> +# include <mln/morpho/opening/structural.hh> # include <mln/make/w_window2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/vline2d.hh> @@ -209,8 +210,8 @@ // } { // fermeture avec un disk et un element vertial pour reperer les notes. - IB closed1 = morpho::opening(score_b, win::vline2d(5)); - IB closed2 = morpho::opening(score_b, win::disk2d(5)); + IB closed1 = morpho::opening::structural(score_b, win::vline2d(5)); + IB closed2 = morpho::opening::structural(score_b, win::disk2d(5)); morpho::opening_area(closed1, c4(), 20, closed1); morpho::opening_area(closed2, c4(), 15, closed2); io::pbm::save(closed1, "closed1.pbm"); @@ -220,7 +221,7 @@ } { // Fermeture avec un element struturant en horizontale pour obtenir les lignes de port�e. -// IB hclosed = morpho::closing(score_b, win::hline2d(73)); +// IB hclosed = morpho::closing::structural(score_b, win::hline2d(73)); // io::pbm::save(hclosed, "hclosed.pbm"); } } Index: garrigues/factures/extract_array_highlight.cc --- garrigues/factures/extract_array_highlight.cc (revision 3462) +++ garrigues/factures/extract_array_highlight.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 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 @@ -31,7 +32,7 @@ #include <mln/geom/resize.hh> #include <mln/display/all.hh> #include <mln/value/int_u8.hh> -#include <mln/morpho/opening.hh> +#include <mln/morpho/opening/structural.hh> #include <mln/win/hline2d.hh> #include <mln/win/vline2d.hh> #include <mln/win/disk2d.hh> @@ -51,10 +52,12 @@ #include <mln/draw/box.hh> + using namespace mln; typedef image2d<bool> ima2d_bool; typedef image2d<unsigned> ima2d_unsigned; + image2d<bool> filter_arrays(image2d<bool> in) { @@ -98,6 +101,7 @@ return output; } + image2d<value::rgb8> highlight_vlines(image2d<bool> in) { @@ -106,7 +110,7 @@ tmp = filter_arrays(in); // Opening. - tmp = morpho::opening(tmp, win::vline2d(5)); + tmp = morpho::opening::structural(tmp, win::vline2d(5)); image2d<value::rgb8> output(tmp.domain()); mln_fwd_piter_(ima2d_unsigned) p(tmp.domain()); @@ -127,7 +131,7 @@ image2d<bool> tmp; tmp = filter_arrays(in); // Opening. - tmp = morpho::opening(tmp, win::hline2d(5)); + tmp = morpho::opening::structural(tmp, win::hline2d(5)); image2d<value::rgb8> output(tmp.domain()); mln_fwd_piter_(ima2d_unsigned) p(tmp.domain()); Index: inim/nature/closing.cc --- inim/nature/closing.cc (revision 3462) +++ inim/nature/closing.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -32,7 +33,8 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/morpho/closing.hh> +#include <mln/morpho/closing/structural.hh> + int main(int argc, const char * argv[]) { @@ -54,6 +56,6 @@ std::string name(argv[i]); name.erase(name.length() - 4); - io::pgm::save(morpho::closing(ima, rect), name.append("_closed.pgm")); + io::pgm::save(morpho::closing::structural(ima, rect), name.append("_closed.pgm")); } } Index: inim/nature/nature.cc --- inim/nature/nature.cc (revision 3462) +++ inim/nature/nature.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -53,7 +54,7 @@ #include <mln/morpho/hit_or_miss.hh> #include <mln/morpho/gradient.hh> -#include <mln/morpho/opening.hh> +#include <mln/morpho/opening/structural.hh> #include <mln/binarization/threshold.hh> @@ -367,8 +368,8 @@ image2d<bool> inter (up_left + up_right + bottom_right + bottom_left + up + bottom + left + right); - image2d<bool> final = morpho::opening(inter, win::hline2d(20)); - final += morpho::opening(inter, win::vline2d(20)); + image2d<bool> final = morpho::opening::structural(inter, win::hline2d(20)); + final += morpho::opening::structural(inter, win::vline2d(20)); // Now we count blank points in our result @@ -398,7 +399,7 @@ // Last but not least : text detection thanks to FFT - transform::fft<double> fourier(morpho::opening(uinty, win::hline2d(20))); + transform::fft<double> fourier(morpho::opening::structural(uinty, win::hline2d(20))); fourier.transform(); std::string name(argv[1]); Index: inim/nature/opening.cc --- inim/nature/opening.cc (revision 3462) +++ inim/nature/opening.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -32,7 +33,8 @@ #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/morpho/opening.hh> +#include <mln/morpho/opening/structural.hh> + int main(int argc, const char * argv[]) { @@ -54,6 +56,6 @@ std::string name(argv[i]); name.erase(name.length() - 4); - io::pgm::save(morpho::opening(ima, rect), name.append("_opened.pgm")); + io::pgm::save(morpho::opening::structural(ima, rect), name.append("_opened.pgm")); } } Index: inim/nature/hom.cc --- inim/nature/hom.cc (revision 3462) +++ inim/nature/hom.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -43,11 +44,12 @@ #include <mln/estim/mean.hh> #include <mln/morpho/hit_or_miss.hh> #include <mln/morpho/dilation.hh> -#include <mln/morpho/opening.hh> +#include <mln/morpho/opening/structural.hh> #include <mln/win/hline2d.hh> #include <mln/win/vline2d.hh> + int main(int argc, const char * argv[]) { using namespace mln; @@ -305,8 +307,8 @@ convert::from_to(vert, winin); convert::from_to(hori, winout); - image2d<bool> final = morpho::opening(inter, win::hline2d(20)); - final += morpho::opening(inter, win::vline2d(20)); + image2d<bool> final = morpho::opening::structural(inter, win::hline2d(20)); + final += morpho::opening::structural(inter, win::vline2d(20)); io::pbm::save( final, name.append("_hom.pbm")); Index: theo/exec/closing_isotropic.cc --- theo/exec/closing_isotropic.cc (revision 3462) +++ theo/exec/closing_isotropic.cc (working copy) @@ -1,6 +1,6 @@ #include "filetype.hh" -#include <mln/morpho/closing.hh> +#include <mln/morpho/closing/structural.hh> #include <mln/win/disk2d.hh> #include <mln/win/sphere3d.hh> @@ -41,7 +41,7 @@ { image2d<bool> ima, out; io::pbm::load(ima, argv[1]); - out = morpho::closing(ima, win::disk2d(2 * r + 1)); + out = morpho::closing::structural(ima, win::disk2d(2 * r + 1)); io::pbm::save(out, argv[3]); } break; @@ -50,7 +50,7 @@ { image3d<bool> ima, out; io::dump::load(ima, argv[1]); - out = morpho::closing(ima, win::sphere3d(2 * r + 1)); + out = morpho::closing::structural(ima, win::sphere3d(2 * r + 1)); io::dump::save(out, argv[3]); } break;

1 0

3462: Disambiguate morphological structural opening and closing.
by Thierry Geraud 03 Mar '09

03 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Disambiguate morphological structural opening and closing. * mln/morpho/closing.hh: Move and rename as... * mln/morpho/closing/structural.hh: ...this. (closing): Rename as... (closing::structural): ...this. Layout. * mln/morpho/closing/all.hh: Update. * mln/morpho/opening.hh: Move and rename as... * mln/morpho/opening/structural.hh: ...this. (opening): Rename as... (opening::structural): ...this. Layout. * mln/morpho/opening/all.hh: Update. * mln/morpho/all.hh: Update. * mln/morpho/elementary/closing.hh, * mln/morpho/elementary/opening.hh: Layout. * mln/morpho/elementary/top_hat.hh: Update doc style. Layout. (top_hat_white, top_hat_black, top_hat_self_complementary): Make calls to elementary closing (resp. opening) explicit. * mln/morpho/top_hat.hh: Update doc style. (top_hat_white, top_hat_black, top_hat_self_complementary): Make calls to structural closing (resp. opening) explicit. all.hh | 2 - closing/all.hh | 14 +++++---- closing/structural.hh | 36 ++++++++++++++++--------- elementary/closing.hh | 2 + elementary/opening.hh | 2 + elementary/top_hat.hh | 56 +++++++++++++++++++++------------------ opening/all.hh | 14 +++++---- opening/structural.hh | 38 ++++++++++++++++---------- top_hat.hh | 71 +++++++++++++++++++++++++++++--------------------- 9 files changed, 141 insertions(+), 94 deletions(-) Index: mln/morpho/closing/all.hh --- mln/morpho/closing/all.hh (revision 3461) +++ mln/morpho/closing/all.hh (working copy) @@ -1,5 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009 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 @@ -31,14 +30,17 @@ /// \file mln/morpho/closing/all.hh /// -/// File that includes all closing attributes. +/// File that includes all closing operators. + #include <mln/morpho/closing/algebraic.hh> -#include <mln/morpho/closing/leveling.hh> -#include <mln/morpho/closing/area_on_vertices.hh> #include <mln/morpho/closing/area.hh> -#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/closing/area_on_vertices.hh> #include <mln/morpho/closing/height.hh> +#include <mln/morpho/closing/leveling.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/closing/volume.hh> + #endif // ! MLN_MORPHO_CLOSING_ALL_HH Index: mln/morpho/closing/structural.hh --- mln/morpho/closing/structural.hh (revision 3461) +++ mln/morpho/closing/structural.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -26,12 +26,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_CLOSING_HH -# define MLN_MORPHO_CLOSING_HH +#ifndef MLN_MORPHO_CLOSING_STRUCTURAL_HH +# define MLN_MORPHO_CLOSING_STRUCTURAL_HH -/// \file mln/morpho/closing.hh +/// \file mln/morpho/closing/structural.hh /// -/// Morphological closing. +/// Morphological structural closing. # include <mln/morpho/includes.hh> @@ -42,36 +42,48 @@ namespace morpho { - /// Morphological closing. + namespace closing + { + + /// Morphological structural closing. /// /// This operator is e_{-B} o d_B. /// template <typename I, typename W> - mln_concrete(I) closing(const Image& input, const Window<W>& win); + mln_concrete(I) + structural(const Image& input, const Window<W>& win); + # ifndef MLN_INCLUDE_ONLY + template <typename I, typename W> inline - mln_concrete(I) closing(const Image& input, const Window<W>& win) + mln_concrete(I) + structural(const Image& input, const Window<W>& win) { - trace::entering("morpho::closing"); + trace::entering("morpho::closing::structural"); + mln_precondition(exact(input).is_valid()); mln_precondition(! exact(win).is_empty()); mln_concrete(I) output = erosion(dilation(input, win), win::sym(win)); mln_postcondition(output >= input); - trace::exiting("morpho::closing"); + + trace::exiting("morpho::closing::structural"); return output; } + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho::closing + } // end of namespace mln::morpho } // end of namespace mln -#endif // ! MLN_MORPHO_CLOSING_HH +#endif // ! MLN_MORPHO_CLOSING_STRUCTURAL_HH Property changes on: mln/morpho/closing/structural.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/morpho/elementary/closing.hh --- mln/morpho/elementary/closing.hh (revision 3461) +++ mln/morpho/elementary/closing.hh (working copy) @@ -49,6 +49,7 @@ /// Morphological elementary closing. /// /// This operator is e o d. + // template <typename I, typename N> mln_concrete(I) closing(const Image& input, const Neighborhood<N>& nbh); @@ -67,6 +68,7 @@ mln_concrete(I) output = erosion(dilation(input, nbh), nbh); mln_postcondition(output >= input); + trace::exiting("morpho::elementary::closing"); return output; } Index: mln/morpho/elementary/top_hat.hh --- mln/morpho/elementary/top_hat.hh (revision 3461) +++ mln/morpho/elementary/top_hat.hh (working copy) @@ -49,31 +49,31 @@ namespace elementary { - /*! Morphological elementary white top-hat (for object / light objects). - * - * This operator is Id - ope. - */ + /// Morphological elementary white top-hat (for object / light objects). + /// + /// This operator is Id - ope. + // template <typename I, typename N> mln_concrete(I) top_hat_white(const Image& input, const Neighborhood<N>& nbh); - /*! Morphological elementary black top-hat (for background / dark objects). - * - * This operator is clo - Id. - */ + /// Morphological elementary black top-hat (for background / dark objects). + /// + /// This operator is clo - Id. + // template <typename I, typename N> mln_concrete(I) top_hat_black(const Image& input, const Neighborhood<N>& nbh); - /*! Morphological elementary self-complementary top-hat. - * - * This operator is \n - * = top_hat_white + top_hat_black \n - * = (Id - opening) + (closing - Id) \n - * = closing - opening. \n - */ + /// Morphological elementary self-complementary top-hat. + /// + /// This operator is \n + /// = top_hat_white + top_hat_black \n + /// = (Id - opening) + (closing - Id) \n + /// = closing - opening. \n + // template <typename I, typename N> mln_concrete(I) top_hat_self_complementary(const Image& input, const Neighborhood<N>& nbh); @@ -81,61 +81,67 @@ # ifndef MLN_INCLUDE_ONLY + template <typename I, typename N> inline mln_concrete(I) - top_hat_white(const Image& input, - const Neighborhood<N>& nbh) + top_hat_white(const Image& input, const Neighborhood<N>& nbh) { trace::entering("morpho::elementary::top_hat_white"); + mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); mln_concrete(I) output = morpho::minus(input, - opening(input, nbh)); + elementary::opening(input, nbh)); mln_postcondition(test::positive(output)); + trace::exiting("morpho::elementary::top_hat_white"); return output; } + template <typename I, typename N> inline mln_concrete(I) - top_hat_black(const Image& input, - const Neighborhood<N>& nbh) + top_hat_black(const Image& input, const Neighborhood<N>& nbh) { trace::entering("morpho::elementary::top_hat_black"); + mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_concrete(I) output = morpho::minus(closing(input, nbh), + mln_concrete(I) output = morpho::minus(elementary::closing(input, nbh), input); mln_postcondition(test::positive(output)); + trace::exiting("morpho::elementary::top_hat_black"); return output; } + template <typename I, typename N> inline mln_concrete(I) - top_hat_self_complementary(const Image& input, - const Neighborhood<N>& nbh) + top_hat_self_complementary(const Image& input, const Neighborhood<N>& nbh) { trace::entering("morpho::elementary::top_hat_self_complementary"); mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); - mln_concrete(I) output = morpho::minus(closing(input, nbh), - opening(input, nbh)); + mln_concrete(I) output = morpho::minus(elementary::closing(input, nbh), + elementary::opening(input, nbh)); mln_postcondition(test::positive(output)); // mln_postcondition(output == white + black); + trace::exiting("morpho::elementary::top_hat_self_complementary"); return output; } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho::elementary Index: mln/morpho/elementary/opening.hh --- mln/morpho/elementary/opening.hh (revision 3461) +++ mln/morpho/elementary/opening.hh (working copy) @@ -49,6 +49,7 @@ /// Morphological elementary opening. /// /// This operator is d o e. + // template <typename I, typename N> mln_concrete(I) opening(const Image& input, const Neighborhood<N>& nbh); @@ -67,6 +68,7 @@ mln_concrete(I) output = dilation(erosion(input, nbh), nbh); mln_postcondition(output <= input); + trace::exiting("morpho::elementary::opening"); return output; } Index: mln/morpho/all.hh --- mln/morpho/all.hh (revision 3461) +++ mln/morpho/all.hh (working copy) @@ -56,7 +56,6 @@ } -# include <mln/morpho/closing.hh> # include <mln/morpho/complementation.hh> # include <mln/morpho/contrast.hh> # include <mln/morpho/dilation.hh> @@ -69,7 +68,6 @@ # include <mln/morpho/meyer_wst.hh> # include <mln/morpho/min.hh> # include <mln/morpho/minus.hh> -# include <mln/morpho/opening.hh> # include <mln/morpho/plus.hh> # include <mln/morpho/Rd.hh> # include <mln/morpho/rank_filter.hh> Index: mln/morpho/top_hat.hh --- mln/morpho/top_hat.hh (revision 3461) +++ mln/morpho/top_hat.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 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,15 +29,14 @@ #ifndef MLN_MORPHO_TOP_HAT_HH # define MLN_MORPHO_TOP_HAT_HH -/*! \file mln/morpho/top_hat.hh - * - * \brief Morphological top-hats. - * - * \todo Save memory. - */ +/// \file mln/morpho/top_hat.hh +/// +/// Morphological top-hats. +/// +/// \todo Save memory. -# include <mln/morpho/opening.hh> -# include <mln/morpho/closing.hh> +# include <mln/morpho/opening/structural.hh> +# include <mln/morpho/closing/structural.hh> namespace mln @@ -45,86 +45,99 @@ namespace morpho { - /*! Morphological white top-hat (for object / light objects). - * - * This operator is Id - ope_B. - */ + + /// Morphological white top-hat (for object / light objects). + /// + /// This operator is Id - ope_B. + // template <typename I, typename W> mln_concrete(I) top_hat_white(const Image& input, const Window<W>& win); - /*! Morphological black top-hat (for background / dark objects). - * - * This operator is clo_B - Id. - */ + /// Morphological black top-hat (for background / dark objects). + /// + /// This operator is clo_B - Id. + // template <typename I, typename W> mln_concrete(I) top_hat_black(const Image& input, const Window<W>& win); - /*! Morphological self-complementary top-hat. - * - * This operator is \n - * = top_hat_white + top_hat_black \n - * = (input - opening) + (closing - input) \n - * = closing - opening. \n - */ + /// Morphological self-complementary top-hat. + /// + /// This operator is \n + /// = top_hat_white + top_hat_black \n + /// = (input - opening) + (closing - input) \n + /// = closing - opening. \n + // template <typename I, typename W> mln_concrete(I) top_hat_self_complementary(const Image& input, const Window<W>& win); + # ifndef MLN_INCLUDE_ONLY + template <typename I, typename W> inline - mln_concrete(I) top_hat_white(const Image& input, const Window<W>& win) + mln_concrete(I) + top_hat_white(const Image& input, const Window<W>& win) { trace::entering("morpho::top_hat_white"); + mln_precondition(exact(input).is_valid()); mln_precondition(! exact(win).is_empty()); mln_concrete(I) output = morpho::minus(input, - opening(input, win)); + opening::structural(input, win)); mln_postcondition(test::positive(output)); + trace::exiting("morpho::top_hat_white"); return output; } + template <typename I, typename W> inline mln_concrete(I) top_hat_black(const Image& input, const Window<W>& win) { trace::entering("morpho::top_hat_black"); + mln_precondition(exact(input).is_valid()); mln_precondition(! exact(win).is_empty()); - mln_concrete(I) output = morpho::minus(closing(input, win), + mln_concrete(I) output = morpho::minus(closing::structural(input, win), input); mln_postcondition(test::positive(output)); + trace::exiting("morpho::top_hat_black"); return output; } + template <typename I, typename W> inline mln_concrete(I) top_hat_self_complementary(const Image& input, const Window<W>& win) { trace::entering("morpho::top_hat_self_complementary"); + mln_precondition(exact(input).is_valid()); mln_precondition(! exact(win).is_empty()); - mln_concrete(I) output = morpho::minus(closing(input, win), - opening(input, win)); + mln_concrete(I) output = morpho::minus(closing::structural(input, win), + opening::structural(input, win)); mln_postcondition(test::positive(output)); + trace::exiting("morpho::top_hat_self_complementary"); return output; } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho Index: mln/morpho/opening/all.hh --- mln/morpho/opening/all.hh (revision 3461) +++ mln/morpho/opening/all.hh (working copy) @@ -1,5 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009 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 @@ -31,14 +30,17 @@ /// \file mln/morpho/opening/all.hh /// -/// File that includes all opening attributes. +/// File that includes all opening operators. + #include <mln/morpho/opening/algebraic.hh> -#include <mln/morpho/opening/leveling.hh> -#include <mln/morpho/opening/area_on_vertices.hh> #include <mln/morpho/opening/area.hh> -#include <mln/morpho/opening/volume.hh> +#include <mln/morpho/opening/area_on_vertices.hh> #include <mln/morpho/opening/height.hh> +#include <mln/morpho/opening/leveling.hh> +#include <mln/morpho/opening/structural.hh> +#include <mln/morpho/opening/volume.hh> + #endif // ! MLN_MORPHO_OPENING_ALL_HH Index: mln/morpho/opening/structural.hh --- mln/morpho/opening/structural.hh (revision 3461) +++ mln/morpho/opening/structural.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -26,12 +26,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_OPENING_HH -# define MLN_MORPHO_OPENING_HH +#ifndef MLN_MORPHO_OPENING_STRUCTURAL_HH +# define MLN_MORPHO_OPENING_STRUCTURAL_HH -/// \file mln/morpho/opening.hh +/// \file mln/morpho/opening/structural.hh /// -/// Morphological opening. +/// Morphological structural opening. # include <mln/morpho/includes.hh> @@ -42,37 +42,47 @@ namespace morpho { - /// Morphological opening. + namespace opening + { + + /// Morphological structural opening. /// /// This operator is d_{-B} o e_B. template <typename I, typename W> - mln_concrete(I) opening(const Image& input, const Window<W>& win); + mln_concrete(I) + structural(const Image& input, const Window<W>& win); + # ifndef MLN_INCLUDE_ONLY + template <typename I, typename W> inline - mln_concrete(I) opening(const Image& input, const Window<W>& win) + mln_concrete(I) + structural(const Image& input, const Window<W>& win) { - trace::entering("morpho::opening"); + trace::entering("morpho::opening::structural"); + mln_precondition(exact(input).is_valid()); mln_precondition(! exact(win).is_empty()); mln_concrete(I) output = dilation(erosion(input, win), win::sym(win)); - // FIXME: Is this postcondition always true, even if the - // structuring element is not centered? mln_postcondition(output <= input); - trace::exiting("morpho::opening"); + + trace::exiting("morpho::opening::structural"); return output; } + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho::opening + } // end of namespace mln::morpho } // end of namespace mln -#endif // ! MLN_MORPHO_OPENING_HH +#endif // ! MLN_MORPHO_OPENING_STRUCTURAL_HH Property changes on: mln/morpho/opening/structural.hh ___________________________________________________________________ Added: svn:mergeinfo

1 0

3461: Print dimension in op<<(win::ball).
by Thierry Geraud 03 Mar '09

03 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Print dimension in op<<(win::ball). * mln/win/ball.hh (print_): Print dimension. * tests/win/ball.cc: Inactivate echo. mln/win/ball.hh | 2 +- tests/win/ball.cc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) Index: mln/win/ball.hh --- mln/win/ball.hh (revision 3460) +++ mln/win/ball.hh (working copy) @@ -136,7 +136,7 @@ void ball<G,C>::print_(std::ostream& ostr) const { - ostr << "[ball: diameter=" << diameter_ << ']'; + ostr << "[" << G::dim << "D ball: diameter=" << diameter_ << ']'; } # endif // ! MLN_INCLUDE_ONLY Index: tests/win/ball.cc --- tests/win/ball.cc (revision 3460) +++ tests/win/ball.cc (working copy) @@ -30,6 +30,7 @@ /// Tests on mln::win::ball. #include <mln/win/ball.hh> + #include <mln/convert/to_image.hh> #include <mln/debug/println.hh> @@ -41,8 +42,11 @@ win::ball<grid::square, def::coord> b(7); mln_assertion(b.delta() == 3); mln_assertion(b.size() == 29); + mln_assertion(b.diameter() == 7); + + // std::cout << b << std::endl; - debug::println(convert::to_image(b)); + // debug::println(convert::to_image(b)); // - - - | - - - // - | | | | | - // - | | | | | -

1 0

3460: Rename win::ball3d into win::sphere3d.
by Thierry Geraud 02 Mar '09

02 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename win::ball3d into win::sphere3d. * fabien/igr/seg_vol_irm.cc, * theo/exec/closing_isotropic.cc: Update. fabien/igr/seg_vol_irm.cc | 4 ++-- theo/exec/closing_isotropic.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: fabien/igr/seg_vol_irm.cc --- fabien/igr/seg_vol_irm.cc (revision 3459) +++ fabien/igr/seg_vol_irm.cc (working copy) @@ -86,7 +86,7 @@ #include <mln/morpho/erosion.hh> #include <mln/win/disk2d.hh> -#include <mln/win/ball3d.hh> +#include <mln/win/sphere3d.hh> #include <mln/math/diff_abs.hh> @@ -137,7 +137,7 @@ I close_threshold(const Image& input, metal::int_<3>) { - return morpho::erosion(morpho::dilation(input, win::ball3d(5)), win::ball3d(7)); + return morpho::erosion(morpho::dilation(input, win::sphere3d(5)), win::sphere3d(7)); } Index: theo/exec/closing_isotropic.cc --- theo/exec/closing_isotropic.cc (revision 3459) +++ theo/exec/closing_isotropic.cc (working copy) @@ -2,7 +2,7 @@ #include <mln/morpho/closing.hh> #include <mln/win/disk2d.hh> -#include <mln/win/ball3d.hh> +#include <mln/win/sphere3d.hh> @@ -50,7 +50,7 @@ { image3d<bool> ima, out; io::dump::load(ima, argv[1]); - out = morpho::closing(ima, win::ball3d(2 * r + 1)); + out = morpho::closing(ima, win::sphere3d(2 * r + 1)); io::dump::save(out, argv[3]); } break;

1 0

3459: Have win::disk2d and win::sphere3d (new) rely on win::ball.
by Thierry Geraud 02 Mar '09

02 Mar '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Have win::disk2d and win::sphere3d (new) rely on win::ball. * mln/win/ball.hh: New. (diameter): New method; replace both... (disk2d::length): ...this and... (ball3d::length): ...this. * mln/win/ball3d.hh: Rename as... * mln/win/sphere3d.hh: ...this. (ball3d): Remove; replace by... (sphere3d): ...this new typedef. * mln/win/disk2d.hh (disk2d): Remove; replace by... (disk2d): ...this new typedef. * mln/win/all.hh (Copyright): Fix. (include): Update. * tests/win/ball.cc: New. * tests/win/sphere3d.cc: New. * tests/win/disk2d.cc: Remove echo. * tests/win/Makefile.am: Update. mln/win/all.hh | 5 + mln/win/ball.hh | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++ mln/win/disk2d.hh | 78 ++------------------------ mln/win/sphere3d.hh | 86 +++------------------------- tests/win/Makefile.am | 4 + tests/win/ball.cc | 53 +++++++++++++++++ tests/win/disk2d.cc | 9 --- tests/win/sphere3d.cc | 42 ++++++++++++++ 8 files changed, 271 insertions(+), 156 deletions(-) Index: mln/win/all.hh --- mln/win/all.hh (revision 3458) +++ mln/win/all.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA, 2009 Research and Development +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Olena Library. This library is free @@ -46,7 +46,7 @@ // Types. # include <mln/win/backdiag2d.hh> -# include <mln/win/ball3d.hh> +# include <mln/win/ball.hh> # include <mln/win/cube3d.hh> # include <mln/win/cuboid3d.hh> # include <mln/win/diag2d.hh> @@ -58,6 +58,7 @@ # include <mln/win/octagon2d.hh> # include <mln/win/rectangle2d.hh> # include <mln/win/segment1d.hh> +# include <mln/win/sphere3d.hh> # include <mln/win/vline2d.hh> // Routines. Index: mln/win/ball.hh --- mln/win/ball.hh (revision 0) +++ mln/win/ball.hh (revision 0) @@ -0,0 +1,150 @@ +// Copyright (C) 2009 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_WIN_BALL_HH +# define MLN_WIN_BALL_HH + +/// \file mln/win/ball.hh +/// +/// Definition of the mln::win::ball window. + +# include <mln/core/internal/classical_window_base.hh> +# include <mln/core/dpoint.hh> +# include <mln/core/site_set/box.hh> +# include <mln/fun/i2v/all_to.hh> + + +namespace mln +{ + + // Forward declaration. + namespace win { template <typename G, typename C> struct ball; } + + + namespace trait + { + + template <typename G, typename C> + struct window_< mln::win::ball<G,C> > : classical_window_ + { + }; + + } // end of namespace trait + + + + namespace win + { + + /*! \brief Generic ball window defined on a given grid. + * + * A ball is centered and symmetric; so its diameter is odd. + * + * G is the given grid on which the ball is defined and C is the + * type of coordinates. + */ + template <typename G, typename C> + struct ball : public internal::classical_window_base< dpoint<G,C>, ball<G,C> > + { + + /// Constructor. + /// \param[in] diameter Diameter of the ball. + /// \pre \p diameter is odd. + ball(unsigned diameter); + + /// Give the ball diameter. + unsigned diameter() const; + + /// Give the maximum coordinate gap between the window + /// center and a window point. + unsigned delta_() const; + + void print_(std::ostream& ostr) const; + + protected: + unsigned diameter_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename G, typename C> + inline + ball<G,C>::ball(unsigned diameter) + : diameter_(diameter) + { + mln_precondition(diameter % 2 == 1); + int + radius = diameter / 2, + sqr_radius = radius * radius; + typedef point<G,C> P; + box b(all_to(-radius), all_to(+radius)); + P O = literal::origin; + mln_piter(box) p(b); + for_all(p) + { + unsigned d = 0; + for (unsigned i = 0; i < P::dim; ++i) + d += p[i] * p[i]; + if (d <= sqr_radius) + this->insert(p - O); + } + } + + template <typename G, typename C> + inline + unsigned ball<G,C>::diameter() const + { + return diameter_; + } + + template <typename G, typename C> + inline + unsigned ball<G,C>::delta_() const + { + return diameter_ / 2; + } + + template <typename G, typename C> + inline + void + ball<G,C>::print_(std::ostream& ostr) const + { + ostr << "[ball: diameter=" << diameter_ << ']'; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_WIN_BALL_HH Index: mln/win/sphere3d.hh --- mln/win/sphere3d.hh (revision 3457) +++ mln/win/sphere3d.hh (working copy) @@ -26,94 +26,28 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_WIN_BALL3D_HH -# define MLN_WIN_BALL3D_HH +#ifndef MLN_WIN_SPHERE3D_HH +# define MLN_WIN_SPHERE3D_HH -/// \file mln/win/ball3d.hh +/// \file mln/win/sphere3d.hh /// -/// Definition of the mln::win::ball3d window. +/// Definition of the mln::win::sphere3d window. -# include <mln/core/internal/classical_window_base.hh> +# include <mln/win/ball.hh> # include <mln/core/alias/dpoint3d.hh> namespace mln { - mln_internal_add_classical_window_trait(ball3d); - - namespace win { - /*! \brief Ball (sphere) window defined on the 3D square grid. - * - * A ball3d is centered and symmetric. - * - */ - struct ball3d : public internal::classical_window_base< dpoint3d, ball3d > - { - /*! \brief Constructor. - * - * \param[in] length Length, thus diameter. - * - */ - ball3d(unsigned length); - - /*! \brief Give the disk diameter. - */ - unsigned length() const; - - /*! \brief Give the maximum coordinate gap between the window - * center and a window point. - */ - unsigned delta_() const; - - void print_(std::ostream& ostr) const; - - protected: - unsigned length_; - }; - - - -# ifndef MLN_INCLUDE_ONLY - - inline - ball3d::ball3d(unsigned length) - : length_(length) - { - mln_precondition(length % 2 == 1); - const def::coord - r = static_cast<def::coord>(length / 2), - minus_r = static_cast<def::coord>(-r), - r2 = static_cast<def::coord>(r * r); - for (def::coord a = minus_r; a <= r; ++a) - for (def::coord b = minus_r; b <= r; ++b) - for (def::coord c = minus_r; c <= r; ++c) - if (a * a + b * b + c * c <= r2) - insert(dpoint3d(a, b, c)); - } - - inline - unsigned ball3d::length() const - { - return length_; - } - - inline - unsigned ball3d::delta_() const - { - return length_ / 2; - } - - inline - void ball3d::print_(std::ostream& ostr) const - { - ostr << "[ball3d: length=" << length_ << ']'; - } + /// 3D sphere window; precisely, ball-shaped window defined on the + /// 3D cubic grid. + // + typedef ball<grid::cube, def::coord> sphere3d; -# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::win @@ -121,4 +55,4 @@ -#endif // ! MLN_WIN_BALL3D_HH +#endif // ! MLN_WIN_SPHERE3D_HH Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 3458) +++ mln/win/disk2d.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -33,86 +33,22 @@ /// /// Definition of the mln::win::disk2d window. -# include <mln/core/internal/classical_window_base.hh> +# include <mln/win/ball.hh> # include <mln/core/alias/dpoint2d.hh> namespace mln { - mln_internal_add_classical_window_trait(disk2d); - namespace win { - /*! \brief Disk window defined on the 2D square grid. - * - * A disk2d is centered and symmetric. - * - */ - struct disk2d : public internal::classical_window_base< dpoint2d, disk2d > - { - /*! \brief Constructor. - * - * \param[in] length Length, thus diameter. - * - */ - disk2d(unsigned length); - - /*! \brief Give the disk diameter. - */ - unsigned length() const; - - /*! \brief Give the maximum coordinate gap between the window - * center and a window point. - */ - unsigned delta_() const; - - void print_(std::ostream& ostr) const; - - protected: - unsigned length_; - }; - - - -# ifndef MLN_INCLUDE_ONLY - - inline - disk2d::disk2d(unsigned length) - : length_(length) - { - mln_precondition(length % 2 == 1); - const def::coord - r = static_cast<def::coord>(length / 2), - minus_r = static_cast<def::coord>(-r), - r2 = static_cast<def::coord>(r * r); - for (def::coord a = minus_r; a <= r; ++a) - for (def::coord b = minus_r; b <= r; ++b) - if (a * a + b * b <= r2) - insert(dpoint2d(a, b)); - } - - inline - unsigned disk2d::length() const - { - return length_; - } - - inline - unsigned disk2d::delta_() const - { - return length_ / 2; - } - - inline - void disk2d::print_(std::ostream& ostr) const - { - ostr << "[disk2d: length=" << length_ << ']'; - } + /// 2D disk window; precisely, ball-shaped window defined on the + /// 2D square grid. + // + typedef ball<grid::square, def::coord> disk2d; -# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::win Index: tests/win/ball.cc --- tests/win/ball.cc (revision 0) +++ tests/win/ball.cc (revision 0) @@ -0,0 +1,53 @@ +// Copyright (C) 2009 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/win/ball.cc +/// +/// Tests on mln::win::ball. + +#include <mln/win/ball.hh> +#include <mln/convert/to_image.hh> +#include <mln/debug/println.hh> + + +int main() +{ + using namespace mln; + + win::ball<grid::square, def::coord> b(7); + mln_assertion(b.delta() == 3); + mln_assertion(b.size() == 29); + + debug::println(convert::to_image(b)); + // - - - | - - - + // - | | | | | - + // - | | | | | - + // | | | | | | | + // - | | | | | - + // - | | | | | - + // - - - | - - - +} Index: tests/win/sphere3d.cc --- tests/win/sphere3d.cc (revision 0) +++ tests/win/sphere3d.cc (revision 0) @@ -0,0 +1,42 @@ +// Copyright (C) 2009 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/win/sphere3d.cc +/// +/// Tests on mln::win::sphere3d. + +#include <mln/win/sphere3d.hh> + + +int main() +{ + using namespace mln; + + win::sphere3d s(3); + mln_assertion(s.delta() == 1); + mln_assertion(s.size() == 7); +} Index: tests/win/disk2d.cc --- tests/win/disk2d.cc (revision 3458) +++ tests/win/disk2d.cc (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -31,10 +31,7 @@ /// Tests on mln::win::disk2d. #include <cmath> - #include <mln/win/disk2d.hh> -#include <mln/convert/to_image.hh> -#include <mln/debug/println.hh> int main() @@ -56,6 +53,4 @@ std::abs(x) > 27 || std::abs(y) > 27); } - - debug::println(convert::to_image(disk)); } Index: tests/win/Makefile.am --- tests/win/Makefile.am (revision 3458) +++ tests/win/Makefile.am (working copy) @@ -4,6 +4,7 @@ check_PROGRAMS = \ backdiag2d \ + ball \ cube3d \ cuboid3d \ diag2d \ @@ -15,10 +16,12 @@ rectangle2d \ segment1d \ shift \ + sphere3d \ sym \ vline2d backdiag2d_SOURCES = backdiag2d.cc +ball_SOURCES = ball.cc cube3d_SOURCES = cube3d.cc cuboid3d_SOURCES = cuboid3d.cc diag2d_SOURCES = diag2d.cc @@ -30,6 +33,7 @@ rectangle2d_SOURCES = rectangle2d.cc segment1d_SOURCES = segment1d.cc shift_SOURCES = shift.cc +sphere3d_SOURCES = sphere3d.cc sym_SOURCES = sym.cc vline2d_SOURCES = vline2d.cc

1 0

r3458: Update working file
by Fabien Freling 02 Mar '09

02 Mar '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-03-02 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update working file. * fabien/igr/Makefile: Update. * fabien/igr/seg_vol_irm.cc: Update. --- Makefile | 2 seg_vol_irm.cc | 183 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 107 insertions(+), 78 deletions(-) Index: trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc (revision 3457) +++ trunk/milena/sandbox/fabien/igr/seg_vol_irm.cc (revision 3458) @@ -71,6 +71,7 @@ #include <mln/accu/count.hh> #include <mln/accu/center.hh> #include <mln/accu/max.hh> +#include <mln/accu/sum.hh> #include <mln/histo/compute.hh> @@ -80,13 +81,21 @@ #include <mln/pw/all.hh> #include <mln/morpho/elementary/gradient_internal.hh> -#include <mln/morpho/opening_area.hh> +#include <mln/morpho/closing.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> + +#include <mln/win/disk2d.hh> +#include <mln/win/ball3d.hh> + +#include <mln/math/diff_abs.hh> #include <mln/convert/from_to.hh> -//FIXME: remove -#include <mln/essential/2d.hh> +#include <mln/metal/int.hh> + #include <iostream> +#include <fstream> #include <mln/debug/println.hh> using namespace mln; @@ -117,32 +126,114 @@ template <typename I> +I +close_threshold(const Image& input, metal::int_<2>) +{ + return morpho::erosion(morpho::dilation(input, win::disk2d(5)), win::disk2d(7)); +} + + +template <typename I> +I +close_threshold(const Image& input, metal::int_<3>) +{ + return morpho::erosion(morpho::dilation(input, win::ball3d(5)), win::ball3d(7)); +} + + +template <typename I> unsigned find_threshold_value(const Image& input_) { const I& input = exact(input_); + int bg_thres = 30; + mln_ch_value(I, bool) ima_bg; + initialize(ima_bg, input); + data::fill(ima_bg, false); + int obj_thres = 50; + mln_ch_value(I, bool) ima_obj; + initialize(ima_obj, input); + data::fill(ima_obj, false); + unsigned result = 0; histo::array<mln_value(I)> arr_histo = histo::compute(input); image1d<unsigned> ima_histo; convert::from_to(arr_histo, ima_histo); + // We remove the 0 value because it is not part of the image. ima_histo(point1d(0)) = 0; - //ima_histo = morpho::opening_area(ima_histo, c2(), 5); - //mln_fwd_piter(image1d<unsigned>) p(ima_histo.domain()); for (unsigned int i = 1; i < ima_histo.nelements(); ++i) { ima_histo(point1d(i)) += ima_histo(point1d(i - 1)); } accu::max<unsigned> max_accu; unsigned max = level::compute(max_accu, ima_histo); + bool low_done = false; + bool high_done = false; for (unsigned int i = 0; i < ima_histo.nelements(); ++i) { - //std::cout << "[" < " << ((ima_histo(point1d(i)) * 100) / max) << std::endl; - if (((ima_histo(point1d(i)) * 100) / max) > 70) - return i; + if (!low_done && ((ima_histo(point1d(i)) * 100) / max) > bg_thres) + { + data::fill((ima_bg | pw::value(input) < pw::cst(i)).rw(), true); + low_done = true; } + if (!high_done && ((ima_histo(point1d(i)) * 100) / max) > (100 - obj_thres)) + { + data::fill((ima_obj | pw::value(input) > pw::cst(i)).rw(), true); + high_done = true; + } + } + + io::dump::save(ima_bg, "bg.pbm"); + io::dump::save(ima_obj, "obj.pbm"); + + ima_bg = close_threshold(ima_bg, metal::int_<I::site::dim>()); + ima_obj = close_threshold(ima_obj, metal::int_<I::site::dim>()); + + io::dump::save(ima_bg, "bg_closed.pbm"); + io::dump::save(ima_obj, "obj_closed.pbm"); + + histo::array<mln_value(I)> bg_histo = histo::compute(input | pw::value(ima_bg) == true); + histo::array<mln_value(I)> obj_histo = histo::compute(input | pw::value(ima_obj) == true); + + accu::sum<unsigned> sum_accu; + image1d<unsigned> ima_bg_histo; + convert::from_to(bg_histo, ima_bg_histo); + ima_bg_histo(point1d(0)) = 0; + unsigned bg_sum = level::compute(sum_accu, ima_bg_histo); + // We remove the 0 value because it is not part of the image. + std::ofstream fout_bg("bg_histo_norm.plot"); + for (unsigned int i = 0; i < ima_bg_histo.nelements(); ++i) + { + ima_bg_histo(point1d(i)) *= 10000; + ima_bg_histo(point1d(i)) /= bg_sum; + fout_bg < ima_obj_histo; + convert::from_to(obj_histo, ima_obj_histo); + unsigned obj_sum = level::compute(sum_accu, ima_obj_histo); + std::ofstream fout_obj("obj_histo_norm.plot"); + for (unsigned int i = 0; i < ima_obj_histo.nelements(); ++i) + { + ima_obj_histo(point1d(i)) *= 10000; + ima_obj_histo(point1d(i)) /= obj_sum; + fout_obj <(ima_bg_histo(point1d(1)), ima_obj_histo(point1d(1))); + for (unsigned int i = 1; i < ima_bg_histo.nelements(); ++i) + { + if (math::diff_abs<unsigned>(ima_bg_histo(point1d(i)), ima_obj_histo(point1d(i))) < min) + { + min = math::diff_abs<unsigned>(ima_bg_histo(point1d(i)), ima_obj_histo(point1d(i))); + result = i; + } + } + + return result; } @@ -155,85 +246,23 @@ // Threshold. - unsigned threshold_value = find_threshold_value(input_); mln_ch_value(I, bool) ima_thres; initialize(ima_thres, input); + data::fill(ima_thres, false); + unsigned threshold_value = find_threshold_value(input); data::fill((ima_thres | pw::value(input) < pw::cst(threshold_value)).rw(), true); return ima_thres; - - // Labeling. - - /*mln_ch_value(I, L) labels = labeling::flat_zones(threshold, nbh, nlabels); - accu::count<int_u8> a_; - util::array<unsigned> a = labeling::compute(a_, threshold, labels, nlabels); - - // We keep the third and second biggest object. - - mln_ch_value(I, bool) big_second; - initialize(big_second, input); - data::fill(big_second, false); - - util::array<L> arr_big = labeling::n_max<L>(a, 3); - data::fill((big_second | (pw::value(labels) == arr_big[2])).rw(), true); - mln_VAR(big_third, threshold | pw::value(labels) == arr_big[3]); - - // Fill holes. - - big_second = labeling::fill_holes(big_second, nbh, nlabels); - - // Gradient. - - mln_ch_value(I, bool) gradient = morpho::elementary::gradient_internal(big_second, nbh); - mln_VAR(gradient_map, gradient | pw::value(gradient) == true); - - mln_ch_value(I, rgb8) result = level::convert(rgb8(), input); - data::fill((result | gradient_map.domain()).rw(), literal::red); - - // Center. - - accu::center<mln_site(I)> center_; - mln_site(I) center = set::compute(center_, big_third.domain()); - result(center) = literal::blue; - - // Distance. - - mln_fwd_piter(gradient_map_t) p(gradient_map.domain()); - p_array<mln_site(I)> arr; - for_all(p) - { - if (mln::norm::l1_distance(p.to_site().to_vec(), center.to_vec()) < 200) - { - result(p) = literal::green; - - arr.append(p); - } } - // Save the cloud in a file. - - io::cloud::save(arr, "cloud.txt"); - return result;*/ -} - -int main() +int main(int argc, char* argv[]) { //trace::quiet = false; label_16 nlabels; - std::cout << "Processing IM_0043..." << std::endl; - image3d<int_u12> im43; - io::dicom::load(im43, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0043.dcm"); - io::dump::save(igr(im43, c6(), nlabels), "IM_0043.dump"); - - std::cout << "Processing IM_0046..." << std::endl; - image3d<int_u12> im46; - io::dicom::load(im46, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0046.dcm"); - io::dump::save(igr(im46, c6(), nlabels), "IM_0046.dump"); - - std::cout << "Processing IM_0049..." << std::endl; + /*std::cout << "Processing IM_0049..." << std::endl; image2d<int_u12> im49; io::dicom::load(im49, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0049.dcm"); io::pbm::save(igr(im49, c6(), nlabels), "IM_0049.pbm"); @@ -246,17 +275,17 @@ std::cout << "Processing IM_0055..." << std::endl; image2d<int_u12> im55; io::dicom::load(im55, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0055.dcm"); - io::pbm::save(igr(im55, c6(), nlabels), "IM_0055.pbm"); + io::pbm::save(igr(im55, c4(), nlabels), "IM_0055.pbm"); std::cout << "Processing IM_0058..." << std::endl; image2d<int_u12> im58; io::dicom::load(im58, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0058.dcm"); - io::pbm::save(igr(im58, c6(), nlabels), "IM_0058.pbm"); + io::pbm::save(igr(im58, c4(), nlabels), "IM_0058.pbm"); std::cout << "Processing IM_0061..." << std::endl; image3d<int_u12> im61; io::dicom::load(im61, "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0061.dcm"); - io::dump::save(igr(im61, c6(), nlabels), "IM_0061.dump"); + io::dump::save(igr(im61, c6(), nlabels), "IM_0061.dump");*/ std::cout << "Processing IM_0064..." << std::endl; image3d<int_u12> im64; Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 3457) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 3458) @@ -8,7 +8,7 @@ -L/Users/HiSoKa/Downloads/gdcmbin/bin \ -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib \ -framework CoreFoundation \ - -g \ + -DNDEBUG -O1 \ seg_vol_irm.cc -o seg_vol_irm clean:

1 0

Re: [Olena-patches] [Olena] #49: Determine the use of trace in basics algos.
by Olena Trac 02 Mar '09

02 Mar '09

#49: Determine the use of trace in basics algos. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => fixed Comment: Fixed with revision r3455. -- Ticket URL: <https://trac.lrde.org/olena/ticket/49#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

3457: Fix window3d.
by Guillaume Lazzara 02 Mar '09

02 Mar '09

* mln/core/alias/window3d.hh: add slice coordinate.. --- milena/ChangeLog | 6 ++++++ milena/mln/core/alias/window3d.hh | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8d754e2..dc9cd2a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix window3d. + + * mln/core/alias/window3d.hh: add slice coordinate.. + +2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add more window aliases. * mln/core/alias/neighb3d.hh: add c8_3d. diff --git a/milena/mln/core/alias/window3d.hh b/milena/mln/core/alias/window3d.hh index fe197f8..5489fbd 100644 --- a/milena/mln/core/alias/window3d.hh +++ b/milena/mln/core/alias/window3d.hh @@ -110,11 +110,11 @@ namespace mln if (it.size() == 0) { it - .insert( 0, -1) - .insert(-1, 0) - .insert( 0, 0) - .insert(+1, 0) - .insert( 0, +1); + .insert(0, 0, -1) + .insert(0, -1, 0) + .insert(0, 0, 0) + .insert(0, +1, 0) + .insert(0, 0, +1); } return it; } @@ -126,15 +126,15 @@ namespace mln if (it.size() == 0) { it - .insert(-1, -1) - .insert( 0, -1) - .insert(+1, -1) - .insert(-1, 0) - .insert( 0, 0) - .insert(+1, 0) - .insert(-1, +1) - .insert( 0, +1) - .insert(+1, +1); + .insert(0, -1, -1) + .insert(0, 0, -1) + .insert(0, +1, -1) + .insert(0, -1, 0) + .insert(0, 0, 0) + .insert(0, +1, 0) + .insert(0, -1, +1) + .insert(0, 0, +1) + .insert(0, +1, +1); } return it; } -- 1.5.6.5

1 0

3456: Add more window aliases.
by Guillaume Lazzara 02 Mar '09

02 Mar '09

* mln/core/alias/neighb3d.hh: add c8_3d. * mln/core/alias/window2d.hh: add win_c8p. * mln/core/alias/window3d.hh: add win_c4p_3d and win_c8p_3d. --- milena/ChangeLog | 10 +++++ milena/mln/core/alias/neighb3d.hh | 33 ++++++++++++++++ milena/mln/core/alias/window2d.hh | 30 +++++++++++++++ milena/mln/core/alias/window3d.hh | 74 +++++++++++++++++++++++++++++++++++++ 4 files changed, 147 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9de7f13..8d754e2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add more window aliases. + + * mln/core/alias/neighb3d.hh: add c8_3d. + + * mln/core/alias/window2d.hh: add win_c8p. + + * mln/core/alias/window3d.hh: add win_c4p_3d and win_c8p_3d. + +2009-03-02 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add missing traces in basic routines in geom/* (ticket #49). * mln/geom/bbox.hh, diff --git a/milena/mln/core/alias/neighb3d.hh b/milena/mln/core/alias/neighb3d.hh index 59d72bb..ad0545d 100644 --- a/milena/mln/core/alias/neighb3d.hh +++ b/milena/mln/core/alias/neighb3d.hh @@ -68,6 +68,25 @@ namespace mln /// const neighb3d& c4_3d(); + /// 8-connectivity neighborhood on the 3D grid. + /// + /// . . . + /// . . . + /// . . . + /// + /// o o o + /// o x o + /// o o o + /// + /// . . . + /// . . . + /// . . . + /// + /// \return A neighb3d. + /// + const neighb3d& c8_3d(); + + /*! \brief 6-connectivity neighborhood on the 3D grid. * * . . . @@ -159,6 +178,20 @@ namespace mln } inline + const neighb3d& c8_3d() + { + static neighb3d it; + if (it.size() == 0) + { + static const bool vals[] = { 1, 1, 1, + 1, 0, 1, + 1, 1, 1 }; + convert::from_to(vals, it); + } + return it; + } + + inline const neighb3d& c6() { static neighb3d it; diff --git a/milena/mln/core/alias/window2d.hh b/milena/mln/core/alias/window2d.hh index cd66a79..f1acabe 100644 --- a/milena/mln/core/alias/window2d.hh +++ b/milena/mln/core/alias/window2d.hh @@ -59,6 +59,16 @@ namespace mln /// \return A window2d. const window2d& win_c4p(); + /// \brief 8-connectivity window on the 2D grid, including the + /// center. + /// + /// o o o + /// o x o + /// o o o + /// + /// \return A window2d. + const window2d& win_c8p(); + namespace convert { @@ -96,6 +106,26 @@ namespace mln return it; } + inline const window2d& + win_c8p() + { + static window2d it; + if (it.size() == 0) + { + it + .insert(-1, -1) + .insert( 0, -1) + .insert(+1, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert(-1, +1) + .insert( 0, +1) + .insert(+1, +1); + } + return it; + } + namespace convert { diff --git a/milena/mln/core/alias/window3d.hh b/milena/mln/core/alias/window3d.hh index 04484fb..fe197f8 100644 --- a/milena/mln/core/alias/window3d.hh +++ b/milena/mln/core/alias/window3d.hh @@ -47,6 +47,44 @@ namespace mln /// the 3D square grid with integer coordinates. typedef window<mln::dpoint3d> window3d; + /// \brief 4-connectivity window on the 3D grid, including the + /// center. + /// + /// - - - + /// - - - + /// - - - + /// + /// - o - + /// o x o + /// - o - + /// + /// - - - + /// - - - + /// - - - + /// + /// + /// \return A window3d. + const window3d& win_c4p_3d(); + + /// \brief 8-connectivity window on the 3D grid, including the + /// center. + /// + /// - - - + /// - - - + /// - - - + /// + /// o o o + /// o x o + /// o o o + /// + /// - - - + /// - - - + /// - - - + /// + /// \return A window3d. + const window3d& win_c8p_3d(); + + namespace convert { @@ -65,6 +103,42 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline const window3d& + win_c4p_3d() + { + static window3d it; + if (it.size() == 0) + { + it + .insert( 0, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert( 0, +1); + } + return it; + } + + inline const window3d& + win_c8p_3d() + { + static window3d it; + if (it.size() == 0) + { + it + .insert(-1, -1) + .insert( 0, -1) + .insert(+1, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert(-1, +1) + .insert( 0, +1) + .insert(+1, +1); + } + return it; + } + namespace convert { -- 1.5.6.5

1 0