URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-20 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Add subdirectory draw in tests and fix tests/level.
* mln/display/all.hh: Add save_and_show.hh.
* tests/Makefile.am: Update for display.
* tests/display: New subdirectory tests.
* tests/display/Makefile.am: New Makefile.am for draw.
* tests/show.cc: Remove ...
* tests/display/show.cc: ... and replace here.
* tests/color_pretty.cc: Remove ...
* tests/display/color_pretty.cc: ... and replace here.
* tests/save_and_show.cc: Remove ...
* tests/display/save_and_show.cc: ... and replace here.
* tests/level/apply.cc,
* tests/level/saturate.cc: Fix warning.
---
mln/display/all.hh | 1
tests/Makefile.am | 10 ----
tests/display/Makefile.am | 14 ++++++
tests/display/color_pretty.cc | 86 +++++++++++++++++++++++++++++++++++++++++
tests/display/save_and_show.cc | 74 +++++++++++++++++++++++++++++++++++
tests/display/show.cc | 75 +++++++++++++++++++++++++++++++++++
tests/level/apply.cc | 1
tests/level/saturate.cc | 1
8 files changed, 250 insertions(+), 12 deletions(-)
Index: trunk/milena/tests/save_and_show.cc (deleted)
===================================================================
Index: trunk/milena/tests/show.cc (deleted)
===================================================================
Index: trunk/milena/tests/color_pretty.cc (deleted)
===================================================================
Index: trunk/milena/tests/level/apply.cc
===================================================================
--- trunk/milena/tests/level/apply.cc (revision 1500)
+++ trunk/milena/tests/level/apply.cc (revision 1501)
@@ -40,7 +40,6 @@
{
using namespace mln;
- const unsigned size = 1000;
image2d<int> ima(3, 3);
int vs[3][3] = {
{ 2, 2, 3 },
Index: trunk/milena/tests/level/saturate.cc
===================================================================
--- trunk/milena/tests/level/saturate.cc (revision 1500)
+++ trunk/milena/tests/level/saturate.cc (revision 1501)
@@ -40,7 +40,6 @@
{
using namespace mln;
- const unsigned size = 1000;
image2d<int> ima(3, 3);
int vs[3][3] = {
{ 2, 2, 3 },
Index: trunk/milena/tests/display/save_and_show.cc
===================================================================
--- trunk/milena/tests/display/save_and_show.cc (revision 0)
+++ trunk/milena/tests/display/save_and_show.cc (revision 1501)
@@ -0,0 +1,74 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/save_and_show.cc
+ *
+ * \brief Tests on mln::display::show.
+ */
+
+# include <mln/core/image2d.hh>
+# include <mln/io/pbm/load.hh>
+# include <mln/make/win_chamfer.hh>
+# include <mln/geom/chamfer.hh>
+# include <mln/value/rgb8.hh>
+# include <mln/core/sub_image.hh>
+# include <mln/core/image_if_value.hh>
+# include <mln/core/inplace.hh>
+# include <mln/core/w_window2d_int.hh>
+# include <mln/display/show.hh>
+# include <mln/io/ppm/save.hh>
+# include <mln/display/save_and_show.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ unsigned max = 51;
+
+
+ image2d<bool> input = io::pbm::load("../../img/toto.pbm");
+
+ // Create a weighted windows :
+ // 0 2 0
+ // 2 p 2
+ // 0 2 0
+ const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> ();
+
+ // Call chamfer for a distance image.
+ image2d<unsigned> tmp = geom::chamfer(input, w_win, max);
+
+ // Call color_pretty for sub_image.
+ for (unsigned i = 2; i < 6; i += 2)
+ {
+ image_if_value<image2d<unsigned> > t = inplace (tmp | i);
+ display::save_and_show (t, "xv");
+ }
+
+// image2d<value::rgb8> ima (100, 100);
+// display::save_and_show (ima, "xv");
+}
Index: trunk/milena/tests/display/show.cc
===================================================================
--- trunk/milena/tests/display/show.cc (revision 0)
+++ trunk/milena/tests/display/show.cc (revision 1501)
@@ -0,0 +1,75 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/show.cc
+ *
+ * \brief Tests on mln::display::show.
+ */
+
+# include <mln/core/image2d.hh>
+# include <mln/io/pbm/load.hh>
+# include <mln/make/win_chamfer.hh>
+# include <mln/geom/chamfer.hh>
+# include <mln/value/rgb8.hh>
+# include <mln/core/sub_image.hh>
+# include <mln/core/image_if_value.hh>
+# include <mln/core/inplace.hh>
+# include <mln/core/w_window2d_int.hh>
+# include <mln/display/show.hh>
+# include <mln/display/save.hh>
+# include <mln/display/remove.hh>
+# include <mln/display/color_pretty.hh>
+# include <mln/io/ppm/save.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ unsigned max = 51;
+
+
+ image2d<bool> input = io::pbm::load("../../img/toto.pbm");
+
+ // Create a weighted windows :
+ // 0 2 0
+ // 2 p 2
+ // 0 2 0
+ const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> ();
+
+ // Call chamfer for a distance image.
+ image2d<unsigned> tmp = geom::chamfer(input, w_win, max);
+
+ // Call color_pretty for sub_image.
+ for (unsigned i = 2; i < 6; i += 2)
+ {
+ image_if_value<image2d<unsigned> > t = inplace (tmp | i);
+ display::save (t);
+ display::show (t, "xv");
+ }
+ display::remove ();
+}
Index: trunk/milena/tests/display/Makefile.am
===================================================================
--- trunk/milena/tests/display/Makefile.am (revision 0)
+++ trunk/milena/tests/display/Makefile.am (revision 1501)
@@ -0,0 +1,14 @@
+## Process this file through Automake to create Makefile.in -*- Makefile -*-
+
+include $(top_srcdir)/milena/tests/tests.mk
+
+check_PROGRAMS = \
+ show \
+ save_and_show \
+ color_pretty
+
+show_SOURCES = show.cc
+save_and_show_SOURCES = save_and_show.cc
+color_pretty_SOURCES = color_pretty.cc
+
+TESTS = $(check_PROGRAMS)
Index: trunk/milena/tests/display/color_pretty.cc
===================================================================
--- trunk/milena/tests/display/color_pretty.cc (revision 0)
+++ trunk/milena/tests/display/color_pretty.cc (revision 1501)
@@ -0,0 +1,86 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/color_pretty.cc
+ *
+ * \brief Tests on mln::display::color::pretty.
+ */
+
+# include <mln/core/image2d.hh>
+# include <mln/io/pbm/load.hh>
+# include <mln/make/win_chamfer.hh>
+# include <mln/geom/chamfer.hh>
+# include <mln/value/rgb8.hh>
+# include <mln/core/sub_image.hh>
+# include <mln/core/image_if_value.hh>
+# include <mln/core/inplace.hh>
+# include <mln/core/w_window2d_int.hh>
+# include <mln/display/color_pretty.hh>
+# include <mln/io/ppm/save.hh>
+# include <mln/core/p_set.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ unsigned max = 51;
+
+
+ image2d<bool> input = io::pbm::load("../../img/toto.pbm");
+
+ // Create a weighted windows :
+ // 0 2 0
+ // 2 p 2
+ // 0 2 0
+ const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> ();
+
+ // Call chamfer for a distance image.
+ image2d<unsigned> tmp = geom::chamfer(input, w_win, max);
+
+ p_set<point2d > s1;
+ p_set<point2d > s2;
+ p_set<point2d > s3;
+
+ for (int i = 200; i < 300; ++i)
+ for (int j = 0; j < 100; ++j)
+ s2.insert(point2d(i, j));
+
+ for (int i = 0; i < 100; ++i)
+ for (int j = 200; j < 300; ++j)
+ s3.insert(point2d(i, j));
+
+
+
+// // Call color_pretty for sub_image.
+// image2d<value::rgb8> out = display::color_pretty_rgb(tmp, s1, s2, s3);
+
+// // Save output image from color in out.ppm.
+// io::ppm::save(out, "out.ppm");
+
+// std::cout << "out.ppm generate" << std::endl;
+}
Index: trunk/milena/tests/Makefile.am
===================================================================
--- trunk/milena/tests/Makefile.am (revision 1500)
+++ trunk/milena/tests/Makefile.am (revision 1501)
@@ -14,7 +14,6 @@
accu_min \
accu_nil \
\
- border_get \
border_resize_image1d_1 \
border_resize_image1d_2 \
border_resize_image1d_3 \
@@ -33,7 +32,6 @@
canvas_browsing_fwd \
cast_image \
chamfer \
- color_pretty \
convert_to_image \
convert_to_tiles \
convert_to_vec_p \
@@ -100,7 +98,6 @@
level_paste \
level_sort_points \
level_transform \
- line2d \
linear_convolve \
linear_gaussian \
linear_lap \
@@ -113,7 +110,6 @@
\
main \
mat \
- mesh_image \
metal_converts_to \
metal_is \
metal_mat \
@@ -157,7 +153,6 @@
safe_image \
seed2tiling \
set_p \
- show \
sparse_image \
stack \
sub_image \
@@ -204,7 +199,6 @@
accu_min_SOURCES = accu_min.cc
accu_nil_SOURCES = accu_nil.cc
-border_get_SOURCES = border_get.cc
border_resize_image1d_1_SOURCES = border_resize_image1d_1.cc
border_resize_image1d_2_SOURCES = border_resize_image1d_2.cc
border_resize_image1d_3_SOURCES = border_resize_image1d_3.cc
@@ -223,7 +217,6 @@
canvas_browsing_fwd_SOURCES = canvas_browsing_fwd.cc
cast_image_SOURCES = cast_image.cc
chamfer_SOURCES = chamfer.cc
-color_pretty_SOURCES = color_pretty.cc
convert_to_image_SOURCES = convert_to_image.cc
convert_to_tiles_SOURCES = convert_to_tiles.cc
convert_to_vec_p_SOURCES = convert_to_vec_p.cc
@@ -289,7 +282,6 @@
level_paste_SOURCES = level_paste.cc
level_sort_points_SOURCES = level_sort_points.cc
level_transform_SOURCES = level_transform.cc
-line2d_SOURCES = line2d.cc
linear_convolve_SOURCES = linear_convolve.cc
linear_gaussian_SOURCES = linear_gaussian.cc
linear_lap_SOURCES = linear_lap.cc
@@ -302,7 +294,6 @@
main_SOURCES = main.cc
mat_SOURCES = mat.cc
-mesh_image_SOURCES = mesh_image.cc
metal_converts_to_SOURCES = metal_converts_to.cc
metal_is_SOURCES = metal_is.cc
metal_mat_SOURCES = metal_mat.cc
@@ -346,7 +337,6 @@
safe_image_SOURCES = safe_image.cc
seed2tiling_SOURCES = seed2tiling.cc
set_p_SOURCES = set_p.cc
-show_SOURCES = show.cc
sparse_image_SOURCES = sparse_image.cc
stack_SOURCES = stack.cc
sub_image_SOURCES = sub_image.cc
Index: trunk/milena/mln/display/all.hh
===================================================================
--- trunk/milena/mln/display/all.hh (revision 1500)
+++ trunk/milena/mln/display/all.hh (revision 1501)
@@ -48,6 +48,7 @@
# include <mln/display/color_pretty.hh>
# include <mln/display/remove.hh>
+# include <mln/display/save_and_show.hh>
# include <mln/display/save.hh>
# include <mln/display/show.hh>
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-20 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Review draw, create tests subdirectory and fix bug in level.
Draw.
* mln/draw/line.hh
* mln/draw/mesh.hh: Fix doc and typo.
Tests.
* tests/Makefile.am: Update for draw.
* tests/draw: New subdirectory for draw tests.
* tests/draw/Makefile.am: New Makefile.am for draw.
* tests/line2d.cc: Remove ... .
* tests/draw/line.cc: and replace here and update test.
* tests/mesh_image.cc: Remove ... .
* tests/draw/mesh.cc: ... and replace here and update test.
Fix level bug.
* mln/level/fill.hh: Fix specialization bug.
---
mln/draw/line.hh | 15 ++++++++--
mln/draw/mesh.hh | 19 ++++++++++++
mln/level/fill.hh | 3 --
tests/Makefile.am | 1
tests/draw/Makefile.am | 12 ++++++++
tests/draw/line.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++
tests/draw/mesh.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 186 insertions(+), 5 deletions(-)
Index: trunk/milena/tests/line2d.cc (deleted)
===================================================================
Index: trunk/milena/tests/mesh_image.cc (deleted)
===================================================================
Index: trunk/milena/tests/Makefile.am
===================================================================
--- trunk/milena/tests/Makefile.am (revision 1499)
+++ trunk/milena/tests/Makefile.am (revision 1500)
@@ -6,6 +6,7 @@
level \
arith \
logical \
+ draw \
border
check_PROGRAMS = \
Index: trunk/milena/tests/draw/mesh.cc
===================================================================
--- trunk/milena/tests/draw/mesh.cc (revision 0)
+++ trunk/milena/tests/draw/mesh.cc (revision 1500)
@@ -0,0 +1,73 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/draw/mesh.cc
+ *
+ * \brief Tests on mln::draw::mesh.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/core/point2d.hh>
+#include <mln/debug/println.hh>
+#include <mln/util/graph.hh>
+#include <mln/core/mesh_p.hh>
+#include <mln/core/mesh_psite.hh>
+#include <mln/draw/mesh.hh>
+#include <mln/core/mesh_image.hh>
+#include <mln/level/compare.hh>
+
+int
+main (void)
+{
+ using namespace mln;
+
+ int vs[3][3] = {
+ {2, 0, 0},
+ {0, 1, 0},
+ {0, 0, 2}
+ };
+
+ image2d<int> ref (make::image2d(vs));
+
+ util::graph<void> g;
+
+ g.add_node ();
+ g.add_node ();
+ g.add_edge (0, 1);
+ g.consistency ();
+
+ std::vector<point2d> v;
+ v.push_back (make::point2d (0,0));
+ v.push_back (make::point2d (2,2));
+
+ mesh_p<point2d> m(g, v);
+
+ image2d<int> ima (3, 3);
+ draw::mesh (ima, m, 2, 1);
+
+ mln_assertion (ima == ref);
+}
Index: trunk/milena/tests/draw/Makefile.am
===================================================================
--- trunk/milena/tests/draw/Makefile.am (revision 0)
+++ trunk/milena/tests/draw/Makefile.am (revision 1500)
@@ -0,0 +1,12 @@
+## Process this file through Automake to create Makefile.in -*- Makefile -*-
+
+include $(top_srcdir)/milena/tests/tests.mk
+
+check_PROGRAMS = \
+ line \
+ mesh
+
+line_SOURCES = line.cc
+mesh_SOURCES = mesh.cc
+
+TESTS = $(check_PROGRAMS)
Index: trunk/milena/tests/draw/line.cc
===================================================================
--- trunk/milena/tests/draw/line.cc (revision 0)
+++ trunk/milena/tests/draw/line.cc (revision 1500)
@@ -0,0 +1,68 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/draw/line.cc
+ *
+ * \brief Tests on mln::draw::line.
+ */
+
+#include <iterator>
+
+#include <mln/core/image2d.hh>
+#include <mln/core/sub_image.hh>
+#include <mln/core/inplace.hh>
+
+#include <mln/level/fill.hh>
+#include <mln/level/compare.hh>
+#include <mln/draw/line.hh>
+#include <mln/debug/println.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ point2d b = make::point2d(0,0), e = make::point2d(6,9);
+ line2d l(b, e);
+ mln_assertion(l.npoints() == 10);
+
+ image2d<bool> ima(10,10);
+ level::fill(ima, false);
+ draw::line(ima, b, e, true);
+
+ image2d<bool> ima2(10,10);
+ level::fill(ima2, false);
+ level::paste(pw::cst(true) | l, ima2);
+
+ mln_assertion(ima2 == ima);
+
+ image2d<bool> ima3(10,10);
+ level::fill(ima3, false);
+ level::fill(inplace(ima3 | l), true);
+
+ mln_assertion(ima3 == ima);
+}
Index: trunk/milena/mln/draw/line.hh
===================================================================
--- trunk/milena/mln/draw/line.hh (revision 1499)
+++ trunk/milena/mln/draw/line.hh (revision 1500)
@@ -46,8 +46,19 @@
namespace draw
{
- /// Draw a line at level \p v in image \p ima between the points
- /// \p beg and \p end.
+ /*! Draw a line at level \p v in image \p ima between the points
+ * \p beg and \p end.
+ *
+ * \param[in,out] ima The image to be drawn.
+ * \param[in] beg The start point to drawn line.
+ * \param[in] end The end point to drawn line.
+ * \param[in] v The value to assign to all drawn pixels.
+ *
+ * \pre \p ima has to be initialized.
+ * \pre \p ima has \p beg.
+ * \pre \p ima has \p end.
+ *
+ */
template <typename I>
void line(Image<I>& ima,
const mln_point(I)& beg, const mln_point(I)& end,
Index: trunk/milena/mln/draw/mesh.hh
===================================================================
--- trunk/milena/mln/draw/mesh.hh (revision 1499)
+++ trunk/milena/mln/draw/mesh.hh (revision 1500)
@@ -30,7 +30,7 @@
/*! \file mln/draw/mesh.hh
*
- * \brief Draw an image of type mesh_image into anothor kind of image.
+ * \brief Draw an image from type mesh_image.
*
*/
@@ -45,12 +45,29 @@
namespace draw
{
+ /*! Draw an image \p ima from a mesh_p \p m, with value \p node_v
+ * for nodes, value \p link_v for links and 0 for the background.
+ *
+ * \param[in,out] ima The image to be drawn.
+ * \param[in] m The mesh_p which contains nodes and links positions.
+ * \param[in] node_v The value to assign to pixels which contains nodes.
+ * \param[in] link_v The value to assign to pixels which contains links.
+ *
+ */
template <typename I, typename P>
void
mesh(Image<I>& ima, const mesh_p<P>& m,
mln_value(I) node_v,
mln_value(I) link_v);
+ /*! Draw an image \p ima from a mesh_image \p mesh.
+ * The background is filled to value 0.
+ *
+ * \param[in,out] ima The image to be drawn.
+ * \param[in] mesh The mesh_image which contains nodes, links
+ * positions and the values of it.
+ *
+ */
template <typename I, typename P, typename V>
void
mesh(Image<I>& ima, const mesh_image<P, V>& mesh);
Index: trunk/milena/mln/level/fill.hh
===================================================================
--- trunk/milena/mln/level/fill.hh (revision 1499)
+++ trunk/milena/mln/level/fill.hh (revision 1500)
@@ -138,8 +138,7 @@
namespace generic
{
template <typename I>
- void fill_with_value(trait::image::speed::any, I& ima,
- const mln_value(I)& value)
+ void fill_with_value(I& ima, const mln_value(I)& value)
{
trace::entering("level::impl::generic::fill_with_value");
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Review logical subdirectory and add tests.
Update
* mln/logical/and.hh,
* mln/logical/and_not.hh,
* mln/logical/not.hh,
* mln/logical/or.hh: Add tracing, generic namespace, remove
specializations and check typo.
* mln/logical/and.spe.hh,
* mln/logical/and_not.spe.hh,
* mln/logical/not.spe.hh,
* mln/logical/or.spe.hh: New specializations for logical.
Tests
* tests/Makefile.am: Add logical subdirectory.
* tests/logical: New subdirectory for logical checking.
* tests/logical/Makefile.am: Add test to check.
* tests/logical/and.cc,
* tests/logical/and_not.cc,
* tests/logical/not.cc,
* tests/logical/or.cc: New tests for logical.
---
mln/logical/and.hh | 24 ++++++------
mln/logical/and.spe.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++
mln/logical/and_not.hh | 24 ++++++------
mln/logical/and_not.spe.hh | 88 +++++++++++++++++++++++++++++++++++++++++++++
mln/logical/not.hh | 19 +++++----
mln/logical/not.spe.hh | 84 ++++++++++++++++++++++++++++++++++++++++++
mln/logical/or.hh | 21 ++++------
mln/logical/or.spe.hh | 86 +++++++++++++++++++++++++++++++++++++++++++
tests/Makefile.am | 1
tests/logical/Makefile.am | 16 ++++++++
tests/logical/and.cc | 65 +++++++++++++++++++++++++++++++++
tests/logical/and_not.cc | 64 ++++++++++++++++++++++++++++++++
tests/logical/not.cc | 58 +++++++++++++++++++++++++++++
tests/logical/or.cc | 65 +++++++++++++++++++++++++++++++++
14 files changed, 657 insertions(+), 45 deletions(-)
Index: trunk/milena/tests/Makefile.am
===================================================================
--- trunk/milena/tests/Makefile.am (revision 1498)
+++ trunk/milena/tests/Makefile.am (revision 1499)
@@ -5,6 +5,7 @@
SUBDIRS = norm \
level \
arith \
+ logical \
border
check_PROGRAMS = \
Index: trunk/milena/tests/logical/not.cc
===================================================================
--- trunk/milena/tests/logical/not.cc (revision 0)
+++ trunk/milena/tests/logical/not.cc (revision 1499)
@@ -0,0 +1,58 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/logical/not.cc
+ *
+ * \brief Tests on mln::logical::not.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/logical/not.hh>
+#include <mln/level/compare.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ bool vs[3][3] = {
+ {1, 0, 1},
+ {0, 1, 0},
+ {1, 0, 1}
+ };
+
+ bool ws[3][3] = {
+ {0, 1, 0},
+ {1, 0, 1},
+ {0, 1, 0}
+ };
+
+ image2d<bool> ima (make::image2d(vs));
+ image2d<bool> ref (make::image2d(ws));
+
+ mln_assertion (logical::not_(ima) == ref);
+}
Index: trunk/milena/tests/logical/or.cc
===================================================================
--- trunk/milena/tests/logical/or.cc (revision 0)
+++ trunk/milena/tests/logical/or.cc (revision 1499)
@@ -0,0 +1,65 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/logical/or.cc
+ *
+ * \brief Tests on mln::logical::or.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/logical/or.hh>
+#include <mln/level/compare.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ bool vs[3][3] = {
+ {1, 0, 1},
+ {0, 1, 0},
+ {1, 0, 1}
+ };
+
+ bool us[3][3] = {
+ {1, 1, 1},
+ {0, 1, 0},
+ {1, 1, 1}
+ };
+
+ bool ws[3][3] = {
+ {1, 1, 1},
+ {0, 1, 0},
+ {1, 1, 1}
+ };
+
+ image2d<bool> ima1 (make::image2d(vs));
+ image2d<bool> ima2 (make::image2d(us));
+ image2d<bool> ref (make::image2d(ws));
+
+ mln_assertion (logical::or_(ima1, ima2) == ref);
+}
Index: trunk/milena/tests/logical/and.cc
===================================================================
--- trunk/milena/tests/logical/and.cc (revision 0)
+++ trunk/milena/tests/logical/and.cc (revision 1499)
@@ -0,0 +1,65 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/logical/and.cc
+ *
+ * \brief Tests on mln::logical::and.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/logical/and.hh>
+#include <mln/level/compare.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ bool vs[3][3] = {
+ {1, 0, 1},
+ {0, 1, 0},
+ {1, 0, 1}
+ };
+
+ bool us[3][3] = {
+ {1, 1, 1},
+ {0, 1, 0},
+ {1, 1, 1}
+ };
+
+ bool ws[3][3] = {
+ {1, 0, 1},
+ {0, 1, 0},
+ {1, 0, 1}
+ };
+
+ image2d<bool> ima1 (make::image2d(vs));
+ image2d<bool> ima2 (make::image2d(us));
+ image2d<bool> ref (make::image2d(ws));
+
+ mln_assertion (logical::and_(ima1, ima2) == ref);
+}
Index: trunk/milena/tests/logical/and_not.cc
===================================================================
--- trunk/milena/tests/logical/and_not.cc (revision 0)
+++ trunk/milena/tests/logical/and_not.cc (revision 1499)
@@ -0,0 +1,64 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/logical/and_not.cc
+ *
+ * \brief Tests on mln::logical::and_not.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/logical/and_not.hh>
+#include <mln/level/compare.hh>
+
+
+int main()
+{
+ using namespace mln;
+
+ bool vs[3][3] = {
+ {1, 0, 1},
+ {0, 1, 0},
+ {1, 0, 1}
+ };
+
+ bool us[3][3] = {
+ {1, 1, 1},
+ {0, 1, 0},
+ {0, 1, 0}
+ };
+
+ bool ws[3][3] = {
+ {0, 0, 0},
+ {0, 0, 0},
+ {1, 0, 1}
+ };
+
+ image2d<bool> ima1 (make::image2d(vs));
+ image2d<bool> ima2 (make::image2d(us));
+ image2d<bool> ref (make::image2d(ws));
+ mln_assertion (logical::and_not(ima1, ima2) == ref);
+}
Index: trunk/milena/tests/logical/Makefile.am
===================================================================
--- trunk/milena/tests/logical/Makefile.am (revision 0)
+++ trunk/milena/tests/logical/Makefile.am (revision 1499)
@@ -0,0 +1,16 @@
+## Process this file through Automake to create Makefile.in -*- Makefile -*-
+
+include $(top_srcdir)/milena/tests/tests.mk
+
+check_PROGRAMS = \
+ and \
+ and_not \
+ not \
+ or
+
+and_SOURCES = and.cc
+and_not_SOURCES = and_not.cc
+not_SOURCES = not.cc
+or_SOURCES = or.cc
+
+TESTS = $(check_PROGRAMS)
Index: trunk/milena/mln/logical/and_not.hh
===================================================================
--- trunk/milena/mln/logical/and_not.hh (revision 1498)
+++ trunk/milena/mln/logical/and_not.hh (revision 1499)
@@ -37,6 +37,9 @@
# include <mln/core/concept/image.hh>
+// Specializations are in:
+# include <mln/logical/and_not.spe.hh>
+
namespace mln
{
@@ -76,24 +79,19 @@
namespace impl
{
+ namespace generic
+ {
template <typename L, typename R, typename O>
- void and_not_(trait::image::speed::any, const L& lhs,
- trait::image::speed::any, const R& rhs, O& output)
+ void and_not_(const L& lhs, const R& rhs, O& output)
{
+ trace::entering("logical::impl::generic::and_not_");
+
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) && ! rhs(p);
- }
- template <typename L, typename R, typename O>
- void and_not_(trait::image::speed::fastest, const L& lhs,
- trait::image::speed::fastest, const R& rhs, O& output)
- {
- mln_pixter(const L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- mln_pixter(O) op(output);
- for_all_3(lp, rp, op)
- op.val() = lp.val() && ! rp.val();
+ trace::exiting("logical::impl::generic::and_not_");
+ }
}
} // end of namespace mln::logical::impl
@@ -105,6 +103,7 @@
mln_concrete(L) and_not(const Image<L>& lhs, const Image<R>& rhs)
{
trace::entering("logical::and_not");
+
mln_precondition(exact(rhs).domain() == exact(lhs).domain());
mln_concrete(L) output;
@@ -120,6 +119,7 @@
void and_not_inplace(Image<L>& lhs, const Image<R>& rhs)
{
trace::entering("logical::and_not_inplace");
+
mln_precondition(exact(rhs).domain() >= exact(lhs).domain());
impl::and_not_(mln_trait_image_speed(L)(), exact(lhs),
Index: trunk/milena/mln/logical/and.hh
===================================================================
--- trunk/milena/mln/logical/and.hh (revision 1498)
+++ trunk/milena/mln/logical/and.hh (revision 1499)
@@ -37,6 +37,9 @@
# include <mln/core/concept/image.hh>
+// Specializations are in:
+# include <mln/logical/and.spe.hh>
+
namespace mln
{
@@ -76,26 +79,23 @@
namespace impl
{
+ namespace generic
+ {
+
template <typename L, typename R, typename O>
- void and__(trait::image::speed::any, const L& lhs,
- trait::image::speed::any, const R& rhs, O& output)
+ void and__(const L& lhs, const R& rhs, O& output)
{
+ trace::entering("logical::impl::generic::and__");
+
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) && rhs(p);
- }
- template <typename L, typename R, typename O>
- void and__(trait::image::speed::fastest, const L& lhs,
- trait::image::speed::fastest, const R& rhs, O& output)
- {
- mln_pixter(const L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- mln_pixter(O) op(output);
- for_all_3(lp, rp, op)
- op.val() = lp.val() && rp.val();
+ trace::exiting("logical::impl::generic::and__");
}
+ } // end of namespace mln::logical::impl::generic
+
} // end of namespace mln::logical::impl
Index: trunk/milena/mln/logical/or.spe.hh
===================================================================
--- trunk/milena/mln/logical/or.spe.hh (revision 0)
+++ trunk/milena/mln/logical/or.spe.hh (revision 1499)
@@ -0,0 +1,86 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_LOGICAL_OR_SPE_HH
+# define MLN_LOGICAL_OR_SPE_HH
+
+/*! \file mln/logical/or.spe.hh
+ *
+ * \brief Specializations for mln::logical::or.
+ *
+ */
+
+# include <mln/core/concept/image.hh>
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace logical
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename L, typename R, typename O>
+ void or__(const L& lhs, const R& rhs, O& output);
+ }
+
+ template <typename L, typename R, typename O>
+ void or__(trait::image::speed::any, const L& lhs,
+ trait::image::speed::any, const R& rhs, O& output)
+ {
+ generic::or__(lhs, rhs, output);
+ }
+
+ template <typename L, typename R, typename O>
+ void or__(trait::image::speed::fastest, const L& lhs,
+ trait::image::speed::fastest, const R& rhs, O& output)
+ {
+ trace::entering("logical::impl::or__");
+
+ mln_pixter(const L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ mln_pixter(O) op(output);
+ for_all_3(lp, rp, op)
+ op.val() = lp.val() || rp.val();
+
+ trace::entering("logical::impl::or__");
+ }
+
+ } // end of namespace mln::logical::impl
+
+ } // end of namespace mln::logical
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_LOGICAL_OR_SPE_HH
Index: trunk/milena/mln/logical/not.spe.hh
===================================================================
--- trunk/milena/mln/logical/not.spe.hh (revision 0)
+++ trunk/milena/mln/logical/not.spe.hh (revision 1499)
@@ -0,0 +1,84 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_LOGICAL_NOT_SPE_HH
+# define MLN_LOGICAL_NOT_SPE_HH
+
+/*! \file mln/logical/not.spe.hh
+ *
+ * \brief Specializations for mln::logical::not.
+ *
+ */
+
+# include <mln/core/concept/image.hh>
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace logical
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename I, typename O>
+ void not__(const I& input, O& output);
+ }
+
+ template <typename I, typename O>
+ void not__(trait::image::speed::any, const I& input, O& output)
+ {
+ generic::not__(input, output);
+ }
+
+ template <typename I, typename O>
+ void not__(trait::image::speed::fastest, const I& input, O& output)
+ {
+ trace::entering("logical::impl::not__");
+
+ mln_pixter(const I) ip(input);
+ mln_pixter(O) op(output);
+ for_all_2(ip, op)
+ op.val() = ! ip.val();
+
+ trace::exiting("logical::impl::not__");
+ }
+
+ } // end of namespace mln::logical::impl
+
+ } // end of namespace mln::logical
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_LOGICAL_NOT_HH
Index: trunk/milena/mln/logical/and_not.spe.hh
===================================================================
--- trunk/milena/mln/logical/and_not.spe.hh (revision 0)
+++ trunk/milena/mln/logical/and_not.spe.hh (revision 1499)
@@ -0,0 +1,88 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_LOGICAL_AND_NOT_SPE_HH
+# define MLN_LOGICAL_AND_NOT_SPE_HH
+
+/*! \file mln/logical/and_not.spe.hh
+ *
+ * \brief Specializations for mln::logical::and_not.
+ *
+ */
+
+# include <mln/core/concept/image.hh>
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace logical
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename L, typename R, typename O>
+ void and_not_(const L& lhs, const R& rhs, O& output);
+ }
+
+
+ template <typename L, typename R, typename O>
+ void and_not_(trait::image::speed::any, const L& lhs,
+ trait::image::speed::any, const R& rhs, O& output)
+ {
+ generic::and_not_(lhs, rhs, output);
+ }
+
+ template <typename L, typename R, typename O>
+ void and_not_(trait::image::speed::fastest, const L& lhs,
+ trait::image::speed::fastest, const R& rhs, O& output)
+ {
+ trace::entering("logical::impl::and_not_");
+
+ mln_pixter(const L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ mln_pixter(O) op(output);
+ for_all_3(lp, rp, op)
+ op.val() = lp.val() && ! rp.val();
+
+ trace::exiting("logical::impl::and_not_");
+ }
+
+ } // end of namespace mln::logical::impl
+
+ } // end of namespace mln::logical
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_LOGICAL_AND_NOT_SPE_HH
Index: trunk/milena/mln/logical/and.spe.hh
===================================================================
--- trunk/milena/mln/logical/and.spe.hh (revision 0)
+++ trunk/milena/mln/logical/and.spe.hh (revision 1499)
@@ -0,0 +1,87 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_LOGICAL_AND_SPE_HH
+# define MLN_LOGICAL_AND_SPE_HH
+
+/*! \file mln/logical/and.spe.hh
+ *
+ * \brief Specializations for mln::logical::and.
+ *
+ */
+
+# include <mln/core/concept/image.hh>
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace logical
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename L, typename R, typename O>
+ void and__(const L& lhs, const R& rhs, O& output);
+ }
+
+ template <typename L, typename R, typename O>
+ void and__(trait::image::speed::any, const L& lhs,
+ trait::image::speed::any, const R& rhs, O& output)
+ {
+ generic::and__(lhs, rhs, output);
+ }
+
+ template <typename L, typename R, typename O>
+ void and__(trait::image::speed::fastest, const L& lhs,
+ trait::image::speed::fastest, const R& rhs, O& output)
+ {
+ trace::entering("logical::impl::and__");
+
+ mln_pixter(const L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ mln_pixter(O) op(output);
+ for_all_3(lp, rp, op)
+ op.val() = lp.val() && rp.val();
+
+ trace::exiting("logical::impl::and__");
+ }
+
+ } // end of namespace mln::logical::impl
+
+ } // end of namespace mln::logical
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_LOGICAL_AND_SPE_HH
Index: trunk/milena/mln/logical/not.hh
===================================================================
--- trunk/milena/mln/logical/not.hh (revision 1498)
+++ trunk/milena/mln/logical/not.hh (revision 1499)
@@ -37,6 +37,9 @@
# include <mln/core/concept/image.hh>
+// Specializations are in:
+# include <mln/logical/not.spe.hh>
+
namespace mln
{
@@ -72,21 +75,19 @@
namespace impl
{
+ namespace generic
+ {
template <typename I, typename O>
- void not__(trait::image::speed::any, const I& input, O& output)
+ void not__(const I& input, O& output)
{
+ trace::entering("logical::impl::generic::not__");
+
mln_piter(I) p(input.domain());
for_all(p)
output(p) = ! input(p);
- }
- template <typename I, typename O>
- void not__(trait::image::speed::fastest, const I& input, O& output)
- {
- mln_pixter(const I) ip(input);
- mln_pixter(O) op(output);
- for_all_2(ip, op)
- op.val() = ! ip.val();
+ trace::exiting("logical::impl::generic::not__");
+ }
}
} // end of namespace mln::logical::impl
Index: trunk/milena/mln/logical/or.hh
===================================================================
--- trunk/milena/mln/logical/or.hh (revision 1498)
+++ trunk/milena/mln/logical/or.hh (revision 1499)
@@ -37,6 +37,8 @@
# include <mln/core/concept/image.hh>
+// Specializations are in:
+# include <mln/logical/or.spe.hh>
namespace mln
{
@@ -76,24 +78,19 @@
namespace impl
{
+ namespace generic
+ {
template <typename L, typename R, typename O>
- void or__(trait::image::speed::any, const L& lhs,
- trait::image::speed::any, const R& rhs, O& output)
+ void or__(const L& lhs, const R& rhs, O& output)
{
+ trace::entering("logical::impl::generic::or__");
+
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) || rhs(p);
- }
- template <typename L, typename R, typename O>
- void or__(trait::image::speed::fastest, const L& lhs,
- trait::image::speed::fastest, const R& rhs, O& output)
- {
- mln_pixter(const L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- mln_pixter(O) op(output);
- for_all_3(lp, rp, op)
- op.val() = lp.val() || rp.val();
+ trace::exiting("logical::impl::generic::or__");
+ }
}
} // end of namespace mln::logical::impl
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Review arith subdirectory and add tests.
* mln/arith/min.hh,
* mln/arith/revert.hh,
* mln/arith/times.hh: Add tracing, and remove specializations.
* mln/arith/min.spe.hh,
* mln/arith/revert.spe.hh,
* mln/arith/times.spe.hh: New specializations file for arith
algorithms.
* tests/Makefile.am,
* tests/arith/Makefile.am: New Makefile for checking tests.
* tests/arith: New subdirectory for arith tests.
* tests/arith_plus.cc: Remove ...
* tests/arith/plus.cc: ... and replace here.
* tests/arith/minus.cc,
* tests/arith/revert.cc,
* tests/arith/times.cc: New tests for arith.
---
mln/arith/min.hh | 39 ++++++----------
mln/arith/min.spe.hh | 112 +++++++++++++++++++++++++++++++++++++++++++++++
mln/arith/revert.hh | 24 +++++-----
mln/arith/revert.spe.hh | 86 ++++++++++++++++++++++++++++++++++++
mln/arith/times.hh | 41 ++++++-----------
mln/arith/times.spe.hh | 114 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile.am | 1
tests/arith/Makefile.am | 16 ++++++
tests/arith/minus.cc | 60 +++++++++++++++++++++++++
tests/arith/plus.cc | 104 +++++++++++++++++++++++++++++++++++++++++++
tests/arith/revert.cc | 62 ++++++++++++++++++++++++++
tests/arith/times.cc | 60 +++++++++++++++++++++++++
12 files changed, 659 insertions(+), 60 deletions(-)
Index: trunk/milena/tests/arith_plus.cc (deleted)
===================================================================
Index: trunk/milena/tests/arith/minus.cc
===================================================================
--- trunk/milena/tests/arith/minus.cc (revision 0)
+++ trunk/milena/tests/arith/minus.cc (revision 1498)
@@ -0,0 +1,60 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/arith/minus.cc
+ *
+ * \brief Tests on mln::arith::minus.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/debug/iota.hh>
+#include <mln/arith/minus.hh>
+#include <mln/level/compare.hh>
+
+int main()
+{
+ using namespace mln;
+
+ // trace::quiet = false;
+
+ {
+ image2d<int> ima(3,3);
+ debug::iota(ima);
+
+ int vs[3][3] = {
+ {0, 1, 2},
+ {3, 4, 5},
+ {6, 7, 8}
+ };
+
+ image2d<int> ref(make::image2d(vs));
+
+ mln_assertion (ima - 1 == ref);
+ }
+
+}
+
Index: trunk/milena/tests/arith/times.cc
===================================================================
--- trunk/milena/tests/arith/times.cc (revision 0)
+++ trunk/milena/tests/arith/times.cc (revision 1498)
@@ -0,0 +1,60 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/arith/times.cc
+ *
+ * \brief Tests on mln::arith::times.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/debug/iota.hh>
+#include <mln/arith/times.hh>
+#include <mln/level/compare.hh>
+
+int main()
+{
+ using namespace mln;
+
+ // trace::quiet = false;
+
+ {
+ image2d<int> ima(3,3);
+ debug::iota(ima);
+
+ int vs[3][3] = {
+ { 2, 4, 6},
+ { 8, 10, 12},
+ {14, 16, 18}
+ };
+
+ image2d<int> ref(make::image2d(vs));
+
+ mln_assertion (ima * 2 == ref);
+ }
+
+}
+
Index: trunk/milena/tests/arith/plus.cc
===================================================================
--- trunk/milena/tests/arith/plus.cc (revision 0)
+++ trunk/milena/tests/arith/plus.cc (revision 1498)
@@ -0,0 +1,104 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/arith/plus.cc
+ *
+ * \brief Tests on mln::arith::plus.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/core/clone.hh>
+#include <mln/value/int_u8.hh>
+
+#include <mln/arith/plus.hh>
+#include <mln/arith/times.hh>
+#include <mln/level/compare.hh>
+#include <mln/fun/v2v/cast.hh>
+
+#include <mln/debug/iota.hh>
+#include <mln/debug/println.hh>
+
+
+
+int main()
+{
+ using namespace mln;
+
+ // trace::quiet = false;
+
+ {
+ image2d<int> ref(3,3);
+ debug::iota(ref);
+
+ image2d<int> ima_i = clone(ref);
+ ima_i += ima_i;
+ mln_assertion(ima_i == 2 * ref);
+
+ debug::println(ima_i);
+ ima_i += 1;
+ debug::println(ima_i);
+
+ image2d<float> ima_f(3,3);
+ debug::iota(ima_f);
+ debug::println(ima_i + ima_f);
+
+ point2d p(0, 0);
+ std::cout << arith::plus<float>(ima_i, ima_i)(p) / 5 << std::endl;
+ }
+
+}
+
+
+
+// Bench:
+
+// {
+// unsigned size = 5000;
+// image2d<unsigned char> ima_uc(size, size);
+// image2d<unsigned> ima_u;
+// ima_u = 2u + ima_uc;
+// }
+// {
+// unsigned size = 5000;
+// image2d<value::int_u8> ima_uc(size, size);
+// image2d<unsigned> ima_u;
+// ima_u = 2u + ima_uc;
+// }
+
+// {
+// unsigned size = 5000;
+// image2d<unsigned char> ima_uc(size, size);
+// image2d<unsigned> ima_u;
+// ima_u = ima_uc + ima_uc;
+// }
+// {
+// unsigned size = 5000;
+// image2d<value::int_u8> ima_u8(size, size);
+// image2d<unsigned> ima_u;
+// ima_u = ima_u8 + ima_u8;
+// }
+
Index: trunk/milena/tests/arith/Makefile.am
===================================================================
--- trunk/milena/tests/arith/Makefile.am (revision 0)
+++ trunk/milena/tests/arith/Makefile.am (revision 1498)
@@ -0,0 +1,16 @@
+## Process this file through Automake to create Makefile.in -*- Makefile -*-
+
+include $(top_srcdir)/milena/tests/tests.mk
+
+check_PROGRAMS = \
+ minus \
+ plus \
+ revert \
+ times
+
+minus_SOURCES = minus.cc
+plus_SOURCES = plus.cc
+revert_SOURCES = revert.cc
+times_SOURCES = times.cc
+
+TESTS = $(check_PROGRAMS)
Index: trunk/milena/tests/arith/revert.cc
===================================================================
--- trunk/milena/tests/arith/revert.cc (revision 0)
+++ trunk/milena/tests/arith/revert.cc (revision 1498)
@@ -0,0 +1,62 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/arith/revert.cc
+ *
+ * \brief Tests on mln::arith::revert.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/debug/iota.hh>
+#include <mln/arith/revert.hh>
+#include <mln/level/compare.hh>
+#include <mln/debug/println.hh>
+
+int main()
+{
+ using namespace mln;
+
+ // trace::quiet = false;
+
+ {
+ image2d<int> ima(3,3);
+ debug::iota(ima);
+
+ int vs[3][3] = {
+ { -2, -3, -4},
+ { -5, -6, -7},
+ { -8, -9, -10}
+ };
+
+ image2d<int> ref(make::image2d(vs));
+ arith::revert_inplace(ima);
+
+ mln_assertion (ima == ref);
+ }
+
+}
+
Index: trunk/milena/tests/Makefile.am
===================================================================
--- trunk/milena/tests/Makefile.am (revision 1497)
+++ trunk/milena/tests/Makefile.am (revision 1498)
@@ -4,6 +4,7 @@
SUBDIRS = norm \
level \
+ arith \
border
check_PROGRAMS = \
Index: trunk/milena/mln/arith/times.hh
===================================================================
--- trunk/milena/mln/arith/times.hh (revision 1497)
+++ trunk/milena/mln/arith/times.hh (revision 1498)
@@ -38,6 +38,9 @@
# include <mln/arith/includes.hh>
+// Specializations are in:
+# include <mln/arith/times.spe.hh>
+
namespace mln
{
@@ -181,47 +184,35 @@
namespace impl
{
+ namespace generic
+ {
+
template <typename L, typename R, typename O>
- void times_(trait::image::speed::any, const L& lhs,
- trait::image::speed::any, const R& rhs,
- trait::image::speed::any, O& output)
+ void times_(const L& lhs, const R& rhs, O& output)
{
+ trace::entering("arith::impl::generic::times_");
+
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) * rhs(p);
- }
- template <typename L, typename R, typename O>
- void times_(trait::image::speed::fastest, const L& lhs,
- trait::image::speed::fastest, const R& rhs,
- trait::image::speed::fastest, O& output)
- {
- mln_pixter(const L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- mln_pixter(O) op(output);
- for_all_3(lp, rp, op)
- op.val() = lp.val() * rp.val();
+ trace::exiting("arith::impl::generic::times_");
}
template <typename L, typename R>
- void times_inplace_(trait::image::speed::any, L& lhs,
- trait::image::speed::any, const R& rhs)
+ void times_inplace_(L& lhs, const R& rhs)
{
+ trace::entering("arith::impl::generic::times_inplace_");
+
mln_piter(R) p(rhs.domain());
for_all(p)
lhs(p) *= rhs(p);
- }
- template <typename L, typename R>
- void times_inplace_(trait::image::speed::fastest, L& lhs,
- trait::image::speed::fastest, const R& rhs)
- {
- mln_pixter(L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- for_all_2(rp, lp)
- lp.val() *= rp.val();
+ trace::exiting("arith::impl::generic::times_inplace_");
}
+ } // end of namespace mln::arith::impl::generic
+
} // end of namespace mln::arith::impl
Index: trunk/milena/mln/arith/min.hh
===================================================================
--- trunk/milena/mln/arith/min.hh (revision 1497)
+++ trunk/milena/mln/arith/min.hh (revision 1498)
@@ -36,6 +36,9 @@
# include <mln/core/concept/image.hh>
+// Specializations are in:
+# include <mln/arith/min.spe.hh>
+
namespace mln
{
@@ -71,47 +74,35 @@
namespace impl
{
+ namespace generic
+ {
template <typename L, typename R, typename O>
- void min_(trait::image::speed::any, const L& lhs,
- trait::image::speed::any, const R& rhs, O& output)
+ void min_(const L& lhs, const R& rhs, O& output)
{
+ trace::entering("level::arith::generic::min_");
+
mln_piter(L) p(lhs.domain());
for_all(p)
output(p) = lhs(p) < rhs(p) ? lhs(p) : rhs(p);
- }
- template <typename L, typename R, typename O>
- void min_(trait::image::speed::fastest, const L& lhs,
- trait::image::speed::fastest, const R& rhs, O& output)
- {
- mln_pixter(const L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- mln_pixter(O) op(output);
- for_all_3(lp, rp, op)
- op.val() = lp.val() < rp.val() ? lp.val() : rp.val();
+ trace::entering("level::arith::generic::min_");
}
template <typename L, typename R>
- void min_inplace_(trait::image::speed::any, L& lhs,
- trait::image::speed::any, const R& rhs)
+ void min_inplace_(L& lhs, const R& rhs)
{
+ trace::entering("level::arith::generic::min_inplace_");
+
mln_piter(L) p(lhs.domain());
for_all(p)
if (rhs(p) < lhs(p))
lhs(p) = rhs(p);
- }
- template <typename L, typename R>
- void min_inplace_(trait::image::speed::fastest, L& lhs,
- trait::image::speed::fastest, const R& rhs)
- {
- mln_pixter(L) lp(lhs);
- mln_pixter(const R) rp(rhs);
- for_all_2(lp, rp)
- if (rp.val() < lp.val())
- lp.val() = rp.val();
+ trace::exiting("level::arith::generic::min_inplace_");
}
+ } // end of namespace mln::arith::impl::generic
+
} // end of namespace mln::arith::impl
Index: trunk/milena/mln/arith/times.spe.hh
===================================================================
--- trunk/milena/mln/arith/times.spe.hh (revision 0)
+++ trunk/milena/mln/arith/times.spe.hh (revision 1498)
@@ -0,0 +1,114 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_ARITH_TIMES_SPE_HH
+# define MLN_ARITH_TIMES_SPE_HH
+
+/*! \file mln/arith/times.spe.hh
+ *
+ * \brief Specializations for mln::arith::times.
+ *
+ */
+
+# include <mln/arith/includes.hh>
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace arith
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename L, typename R, typename O>
+ void times_(const L& lhs, const R& rhs, O& output);
+
+ template <typename L, typename R>
+ void times_inplace_(L& lhs, const R& rhs);
+
+ }
+
+ template <typename L, typename R, typename O>
+ void times_(trait::image::speed::any, const L& lhs,
+ trait::image::speed::any, const R& rhs,
+ trait::image::speed::any, O& output)
+ {
+ generic::times_(lhs, rhs, output);
+ }
+
+ template <typename L, typename R, typename O>
+ void times_(trait::image::speed::fastest, const L& lhs,
+ trait::image::speed::fastest, const R& rhs,
+ trait::image::speed::fastest, O& output)
+ {
+ trace::entering("arith::impl::times_");
+
+ mln_pixter(const L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ mln_pixter(O) op(output);
+ for_all_3(lp, rp, op)
+ op.val() = lp.val() * rp.val();
+
+ trace::exiting("arith::impl::times_");
+ }
+
+ template <typename L, typename R>
+ void times_inplace_(trait::image::speed::any, L& lhs,
+ trait::image::speed::any, const R& rhs)
+ {
+ generic::times_inplace_(lhs, rhs);
+ }
+
+ template <typename L, typename R>
+ void times_inplace_(trait::image::speed::fastest, L& lhs,
+ trait::image::speed::fastest, const R& rhs)
+ {
+ trace::entering("arith::impl::times_inplace_");
+
+ mln_pixter(L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ for_all_2(rp, lp)
+ lp.val() *= rp.val();
+
+ trace::exiting("arith::impl::times_inplace_");
+ }
+
+ } // end of namespace mln::arith::impl
+
+ } // end of namespace mln::arith
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_ARITH_TIMES_SPE_HH
Index: trunk/milena/mln/arith/revert.hh
===================================================================
--- trunk/milena/mln/arith/revert.hh (revision 1497)
+++ trunk/milena/mln/arith/revert.hh (revision 1498)
@@ -38,11 +38,14 @@
# include <mln/core/concept/image.hh>
# include <mln/value/props.hh>
+// Specializations are in:
+# include <mln/arith/revert.spe.hh>
+
+
// FIXME: Rely instead on mln/fun/v2v/revert.hh.
// FIXME: Revert on int value 0 does not give 0 (since min != - max; idem for float etc.)
-
namespace mln
{
@@ -83,25 +86,24 @@
namespace impl
{
+ namespace generic
+ {
+
template <typename I, typename O>
- void revert_(trait::image::speed::any, const I& input, O& output)
+ void revert_(const I& input, O& output)
{
+ trace::entering("arith::impl::generic::revert_");
+
typedef mln_value(I) V;
mln_piter(I) p(input.domain());
for_all(p)
output(p) = mln_min(V) + (mln_max(V) - input(p));
- }
- template <typename I, typename O>
- void revert_(trait::image::speed::fastest, const I& input, O& output)
- {
- typedef mln_value(I) V;
- mln_pixter(const I) ip(input);
- mln_pixter(O) op(output);
- for_all_2(ip, op)
- op.val() = mln_min(V) + (mln_max(V) - ip.val());
+ trace::exiting("arith::impl::generic::revert_");
}
+ } // end of namespace mln::arith::impl::generic
+
} // end of namespace mln::arith::impl
Index: trunk/milena/mln/arith/min.spe.hh
===================================================================
--- trunk/milena/mln/arith/min.spe.hh (revision 0)
+++ trunk/milena/mln/arith/min.spe.hh (revision 1498)
@@ -0,0 +1,112 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_ARITH_MIN_SPE_HH
+# define MLN_ARITH_MIN_SPE_HH
+
+/*! \file mln/arith/min.spe.hh
+ *
+ * \brief Specializations for mln::arith::min.
+ */
+
+# include <mln/core/concept/image.hh>
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace arith
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename L, typename R, typename O>
+ void min_(const L& lhs, const R& rhs, O& output);
+
+ template <typename L, typename R>
+ void min_inplace_(L& lhs, const R& rhs);
+
+ }
+
+ template <typename L, typename R, typename O>
+ void min_(trait::image::speed::any, const L& lhs,
+ trait::image::speed::any, const R& rhs, O& output)
+ {
+ generic::min_(lhs, rhs, output);
+ }
+
+
+ template <typename L, typename R, typename O>
+ void min_(trait::image::speed::fastest, const L& lhs,
+ trait::image::speed::fastest, const R& rhs, O& output)
+ {
+ trace::entering("level::arith::min_");
+
+ mln_pixter(const L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ mln_pixter(O) op(output);
+ for_all_3(lp, rp, op)
+ op.val() = lp.val() < rp.val() ? lp.val() : rp.val();
+
+ trace::exiting("level::arith::min_");
+ }
+
+ template <typename L, typename R>
+ void min_inplace_(trait::image::speed::any, L& lhs,
+ trait::image::speed::any, const R& rhs)
+ {
+ generic::min_inplace_(lhs, rhs);
+ }
+
+ template <typename L, typename R>
+ void min_inplace_(trait::image::speed::fastest, L& lhs,
+ trait::image::speed::fastest, const R& rhs)
+ {
+ trace::entering("level::arith::min_inplace_");
+
+ mln_pixter(L) lp(lhs);
+ mln_pixter(const R) rp(rhs);
+ for_all_2(lp, rp)
+ if (rp.val() < lp.val())
+ lp.val() = rp.val();
+
+ trace::exiting("level::arith::min_inplace_");
+ }
+
+ } // end of namespace mln::arith::impl
+
+ } // end of namespace mln::arith
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_ARITH_MIN_SPE_HH
Index: trunk/milena/mln/arith/revert.spe.hh
===================================================================
--- trunk/milena/mln/arith/revert.spe.hh (revision 0)
+++ trunk/milena/mln/arith/revert.spe.hh (revision 1498)
@@ -0,0 +1,86 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_ARITH_REVERT_SPE_HH
+# define MLN_ARITH_REVERT_SPE_HH
+
+/*! \file mln/arith/revert.spe.hh
+ *
+ * \brief Specializations for mln::arith::revert.
+ *
+ */
+
+# include <mln/core/concept/image.hh>
+# include <mln/value/props.hh>
+
+
+# ifndef MLN_INCLUDE_ONLY
+
+namespace mln
+{
+
+ namespace arith
+ {
+
+ namespace impl
+ {
+
+ namespace generic
+ {
+ template <typename I, typename O>
+ void revert_(const I& input, O& output);
+ }
+
+ template <typename I, typename O>
+ void revert_(trait::image::speed::any, const I& input, O& output)
+ {
+ generic::revert_(input, output);
+ }
+
+ template <typename I, typename O>
+ void revert_(trait::image::speed::fastest, const I& input, O& output)
+ {
+ trace::entering("arith::impl::revert_");
+
+ typedef mln_value(I) V;
+ mln_pixter(const I) ip(input);
+ mln_pixter(O) op(output);
+ for_all_2(ip, op)
+ op.val() = mln_min(V) + (mln_max(V) - ip.val());
+
+ trace::entering("arith::impl::revert_");
+ }
+
+ } // end of namespace mln::arith::impl
+
+ } // end of namespace mln::arith
+
+} // end of namespace mln
+
+# endif // ! MLN_INCLUDE_ONLY
+
+#endif // ! MLN_ARITH_REVERT_SPE_HH
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Update level tree test.
* tests/border/adjust.cc: New file to test adjsut.
* tests/border/find.cc: New.
Update
* tests/border/get.cc,
* tests/border/resize.cc: Update these tests.
---
adjust.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
find.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
get.cc | 2 +-
resize.cc | 30 +++++-------------------------
4 files changed, 104 insertions(+), 26 deletions(-)
Index: trunk/milena/tests/border/get.cc
===================================================================
--- trunk/milena/tests/border/get.cc (revision 1496)
+++ trunk/milena/tests/border/get.cc (revision 1497)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/border_get.cc
+/*! \file tests/border/get.cc
*
* \brief Tests on mln::border::get.
*/
Index: trunk/milena/tests/border/find.cc
===================================================================
--- trunk/milena/tests/border/find.cc (revision 0)
+++ trunk/milena/tests/border/find.cc (revision 1497)
@@ -0,0 +1,50 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border/find.cc
+ *
+ * \brief Tests on mln::border::find.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/core/sub_image.hh>
+
+#include <mln/debug/iota.hh>
+#include <mln/border/find.hh>
+#include <mln/core/clone.hh>
+
+
+
+int main()
+{
+ using namespace mln;
+ image2d<int> ima(3, 3, 51);
+ debug::iota(ima);
+
+ box2d b = make::box2d(2,2);
+ mln_assertion(border::find( clone(ima | b)) == 51);
+}
Index: trunk/milena/tests/border/resize.cc
===================================================================
--- trunk/milena/tests/border/resize.cc (revision 1496)
+++ trunk/milena/tests/border/resize.cc (revision 1497)
@@ -32,11 +32,9 @@
#include <mln/core/image2d.hh>
-#include <mln/debug/iota.hh>
#include <mln/value/int_u8.hh>
#include <mln/border/resize.hh>
-#include <mln/debug/println_with_border.hh>
-#include <mln/border/fill.hh>
+#include <mln/border/get.hh>
using namespace mln;
@@ -46,28 +44,10 @@
unsigned border = 1;
unsigned new_border = 3;
- std::cout << std::endl
- << "Test 2d resize"
- << std::endl
- << std::endl;
image2d<value::int_u8> ima(3, 2, border);
- debug::iota(ima);
- border::fill(ima, 8);
-
- std::cout << "before resize ("
- << border
- << ")"
- << std::endl;
- debug::println_with_border(ima);
- std::cout << std::endl;
-
-
+ mln_assertion(border::get(ima) == border);
border::resize (ima, new_border);
- std::cout << "after resize ("
- << new_border
- << ")"
- << std::endl;
- debug::println_with_border(ima);
- std::cout << std::endl;
-
+ mln_assertion(border::get(ima) == new_border);
+ border::resize (ima, border);
+ mln_assertion(border::get(ima) == border);
}
Index: trunk/milena/tests/border/adjust.cc
===================================================================
--- trunk/milena/tests/border/adjust.cc (revision 0)
+++ trunk/milena/tests/border/adjust.cc (revision 1497)
@@ -0,0 +1,48 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border/adjust.cc
+ *
+ * \brief Tests on mln::border::adjust.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/border/get.hh>
+#include <mln/border/adjust.hh>
+
+int main()
+{
+ using namespace mln;
+
+ typedef image2d<int> I;
+
+ I ima(3,3, 51);
+ border::adjust(ima, 51);
+ mln_assertion(border::get(ima) == 51);
+ border::adjust(ima, 2);
+ mln_assertion(border::get(ima) == 51);
+}
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-16 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Add border subdirectory in test and add/update test.
* tests/border: New subdirectory for border test.
* tests/Makefile.am: Add border subdirectory.
* tests/border/duplicate.cc: New test for duplicate.
* tests/border/fill.cc: New test for duplicate.
* tests/border_get.cc: Remove ...
* tests/border/get.cc: ... and replace here.
* tests/border/resize.cc: Move test for resize.
* tests/level/median_dir.cc,
* tests/level/median_fast.cc,
* tests/level/median_hline2d.cc: Fix path for image.
---
Makefile.am | 3 +
border/duplicate.cc | 75 +++++++++++++++++++++++++++++++++++++++++++
border/fill.cc | 64 +++++++++++++++++++++++++++++++++++++
border/get.cc | 82 ++++++++++++++++++++++++++++++++++++++++++++++++
border/resize.cc | 73 ++++++++++++++++++++++++++++++++++++++++++
level/median_dir.cc | 2 -
level/median_fast.cc | 2 -
level/median_hline2d.cc | 2 -
8 files changed, 299 insertions(+), 4 deletions(-)
Index: trunk/milena/tests/border_get.cc (deleted)
===================================================================
Index: trunk/milena/tests/level/median_dir.cc
===================================================================
--- trunk/milena/tests/level/median_dir.cc (revision 1495)
+++ trunk/milena/tests/level/median_dir.cc (revision 1496)
@@ -47,7 +47,7 @@
border::thickness = 7;
image2d<int_u8>
- lena = io::pgm::load("../img/lena.pgm"),
+ lena = io::pgm::load("../../img/lena.pgm"),
out(lena.domain());
level::median_dir(lena, 1, 15, out);
Index: trunk/milena/tests/level/median_hline2d.cc
===================================================================
--- trunk/milena/tests/level/median_hline2d.cc (revision 1495)
+++ trunk/milena/tests/level/median_hline2d.cc (revision 1496)
@@ -51,7 +51,7 @@
border::thickness = 0;
image2d<int_u8>
- lena = io::pgm::load("../img/lena.pgm"),
+ lena = io::pgm::load("../../img/lena.pgm"),
out(lena.domain()),
ref(lena.domain());
Index: trunk/milena/tests/level/median_fast.cc
===================================================================
--- trunk/milena/tests/level/median_fast.cc (revision 1495)
+++ trunk/milena/tests/level/median_fast.cc (revision 1496)
@@ -94,7 +94,7 @@
border::thickness = 52;
image2d<int_u8>
- lena = io::pgm::load("../img/lena.pgm"),
+ lena = io::pgm::load("../../img/lena.pgm"),
out(lena.domain());
level::fast_median(lena, rect, out);
Index: trunk/milena/tests/Makefile.am
===================================================================
--- trunk/milena/tests/Makefile.am (revision 1495)
+++ trunk/milena/tests/Makefile.am (revision 1496)
@@ -3,7 +3,8 @@
include $(top_srcdir)/milena/tests/tests.mk
SUBDIRS = norm \
- level
+ level \
+ border
check_PROGRAMS = \
accu_all \
Index: trunk/milena/tests/border/get.cc
===================================================================
--- trunk/milena/tests/border/get.cc (revision 0)
+++ trunk/milena/tests/border/get.cc (revision 1496)
@@ -0,0 +1,82 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border_get.cc
+ *
+ * \brief Tests on mln::border::get.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/core/sub_image.hh>
+#include <mln/core/image_if.hh>
+#include <mln/fun/p2b/chess.hh>
+
+#include <mln/border/get.hh>
+#include <mln/literal/origin.hh>
+
+
+struct f_box2d_t : mln::Function_p2b< f_box2d_t >
+{
+ f_box2d_t(const mln::box2d& b)
+ : b_(b)
+ {
+ }
+ mln::box2d b_;
+ bool operator()(const mln::point2d& p) const
+ {
+ return b_.has(p);
+ }
+};
+
+
+
+int main()
+{
+ using namespace mln;
+
+ typedef image2d<int> I;
+
+ box2d b(literal::origin, point2d(1,1));
+ f_box2d_t f_b(b);
+
+ I ima(3,3, 51);
+
+ mln_assertion(border::get(ima) == 51);
+ mln_assertion( ima.has(point2d(2,2)) == true );
+
+ sub_image<I, box2d> sub(ima, b);
+ mln_assertion( sub.has (point2d(2,2)) == false &&
+ sub.owns_(point2d(2,2)) == false );
+ mln_assertion(border::get(sub) == 0);
+
+ image_if<I, f_box2d_t> imaif(ima, f_b);
+ mln_assertion( imaif.has (point2d(2,2)) == false &&
+ imaif.owns_(point2d(2,2)) == true );
+ mln_assertion(border::get(imaif) == 51);
+
+ mln_assertion(border::get( (ima | b) | f_b ) == 0);
+}
Index: trunk/milena/tests/border/resize.cc
===================================================================
--- trunk/milena/tests/border/resize.cc (revision 0)
+++ trunk/milena/tests/border/resize.cc (revision 1496)
@@ -0,0 +1,73 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border_resize_image2d_1.cc
+ *
+ * \brief Tests on mln::border::resize.
+ */
+
+
+#include <mln/core/image2d.hh>
+#include <mln/debug/iota.hh>
+#include <mln/value/int_u8.hh>
+#include <mln/border/resize.hh>
+#include <mln/debug/println_with_border.hh>
+#include <mln/border/fill.hh>
+
+using namespace mln;
+
+int
+main (void)
+{
+ unsigned border = 1;
+ unsigned new_border = 3;
+
+ std::cout << std::endl
+ << "Test 2d resize"
+ << std::endl
+ << std::endl;
+ image2d<value::int_u8> ima(3, 2, border);
+ debug::iota(ima);
+ border::fill(ima, 8);
+
+ std::cout << "before resize ("
+ << border
+ << ")"
+ << std::endl;
+ debug::println_with_border(ima);
+ std::cout << std::endl;
+
+
+ border::resize (ima, new_border);
+ std::cout << "after resize ("
+ << new_border
+ << ")"
+ << std::endl;
+ debug::println_with_border(ima);
+ std::cout << std::endl;
+
+}
Index: trunk/milena/tests/border/fill.cc
===================================================================
--- trunk/milena/tests/border/fill.cc (revision 0)
+++ trunk/milena/tests/border/fill.cc (revision 1496)
@@ -0,0 +1,64 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border_fill/test_border_fill_image2d_1.cc
+ *
+ * \brief Tests on mln::border::fill.
+ */
+
+#include <mln/border/fill.hh>
+#include <mln/core/image2d.hh>
+#include <mln/value/int_u8.hh>
+#include <mln/debug/println_with_border.hh>
+
+using namespace mln;
+
+
+int
+check(int size, int border)
+{
+ int w = size + 2 * border;
+ int ww = w *w;
+
+ image2d<value::int_u8> ima(size, size, border);
+ border::fill (ima, 42);
+ for(int i = 0; i < ww; ++i)
+ if ((i / w < border) || (i / w > border + size))
+ mln_assertion (ima[i] == 42);
+ else
+ if ((i % w < border) &&
+ (border + size <= i % w))
+ mln_assertion (ima[i] == 42);
+}
+
+int
+main (void)
+{
+ for (int i = 1; i < 42; ++i)
+ for (int j = 1; j < 42; ++j)
+ check(i, j);
+}
Index: trunk/milena/tests/border/duplicate.cc
===================================================================
--- trunk/milena/tests/border/duplicate.cc (revision 0)
+++ trunk/milena/tests/border/duplicate.cc (revision 1496)
@@ -0,0 +1,75 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/border_duplicate/test_border_duplicate_image2d_1.cc
+ *
+ * \brief Tests on mln::border::duplicate.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/debug/iota.hh>
+#include <mln/border/duplicate.hh>
+
+
+using namespace mln;
+
+int
+main (void)
+{
+ image2d<int> ima(3, 3, 1);
+
+ debug::iota (ima);
+ border::duplicate (ima);
+
+ mln_assertion(ima[ 0] == 1);
+ mln_assertion(ima[ 1] == 1);
+ mln_assertion(ima[ 2] == 2);
+ mln_assertion(ima[ 3] == 3);
+ mln_assertion(ima[ 4] == 3);
+ mln_assertion(ima[ 5] == 1);
+ mln_assertion(ima[ 6] == 1);
+ mln_assertion(ima[ 7] == 2);
+ mln_assertion(ima[ 8] == 3);
+ mln_assertion(ima[ 9] == 3);
+ mln_assertion(ima[10] == 4);
+ mln_assertion(ima[11] == 4);
+ mln_assertion(ima[12] == 5);
+ mln_assertion(ima[13] == 6);
+ mln_assertion(ima[14] == 6);
+ mln_assertion(ima[15] == 7);
+ mln_assertion(ima[16] == 7);
+ mln_assertion(ima[17] == 8);
+ mln_assertion(ima[18] == 9);
+ mln_assertion(ima[19] == 9);
+ mln_assertion(ima[20] == 7);
+ mln_assertion(ima[21] == 7);
+ mln_assertion(ima[22] == 8);
+ mln_assertion(ima[23] == 9);
+ mln_assertion(ima[24] == 9);
+
+}
+
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-11-16 Simon Nivault <simon.nivault(a)lrde.epita.fr>
Review the mln/canvas/browsing directory.
* mln/canvas/browsing/dir_ricard51.hh: Rename as...
* mln/canvas/browsing/dir_struct_elt_incr_update.hh: ...this, Document.
* mln/canvas/browsing/directional.hh: Document.
* mln/canvas/browsing/fwd.hh: Document.
* mln/canvas/browsing/snake_fwd.hh: Document.
* tests/canvas/browsing/dir_struct_elt_incr_update.cc: New.
* tests/canvas/browsing/directional.cc: New.
* tests/canvas/browsing/fwd.cc: New.
* tests/canvas/browsing/snake_fwd.cc: New.
* tests/canvas/browsing: New.
* tests/canvas: New.
* tests/canvas_browsing_fwd.cc: Remove.
---
mln/canvas/browsing/dir_struct_elt_incr_update.hh | 227 ++++++++++++++++++++
mln/canvas/browsing/directional.hh | 27 ++
mln/canvas/browsing/fwd.hh | 23 +-
mln/canvas/browsing/snake_fwd.hh | 39 +++
tests/canvas/browsing/dir_struct_elt_incr_update.cc | 37 +++
tests/canvas/browsing/directional.cc | 120 ++++++++++
tests/canvas/browsing/fwd.cc | 93 ++++++++
tests/canvas/browsing/snake_fwd.cc | 96 ++++++++
8 files changed, 653 insertions(+), 9 deletions(-)
Index: trunk/milena/tests/canvas_browsing_fwd.cc (deleted)
===================================================================
Index: trunk/milena/tests/canvas/browsing/directional.cc
===================================================================
--- trunk/milena/tests/canvas/browsing/directional.cc (revision 0)
+++ trunk/milena/tests/canvas/browsing/directional.cc (revision 1495)
@@ -0,0 +1,120 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/canvas/browsing/directional.cc
+ *
+ * \brief Tests on mln::canvas::browsing::directional.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/core/image3d.hh>
+#include <mln/canvas/browsing/directional.hh>
+#include <mln/fun/p2v/iota.hh>
+#include <mln/debug/println.hh>
+#include <mln/level/fill.hh>
+
+// FIXME: Move code below into mln/canvas/browsing/iota.hh.
+
+
+template <typename I_, typename F>
+struct assign_browsing_functor
+{
+ typedef I_ I;
+ enum { dim = I::point::dim };
+
+
+ I input;
+ F f;
+ int dir;
+
+ assign_browsing_functor(I& input, F f = F(), int dir_ = 0)
+ : input(input),
+ f(f),
+ dir(dir_)
+ {}
+
+ mln_psite(I) p;
+
+ void init() {}
+ void final() {}
+ void next()
+ {
+ input(p) = f(p);
+ mln_assertion(p[dir] == 0);
+ }
+ void fwd() { next(); }
+ void bkd() { next(); }
+ void down() { next(); }
+};
+
+namespace mln
+{
+
+ template <typename I, typename F, typename B>
+ void my_test(Image<I>& ima_,
+ const Function_p2v<F>& f_,
+ const Browsing<B>& browse_,
+ int dir = 0)
+ {
+ I& ima = exact(ima_);
+ const F& f = exact(f_);
+ const B& browse = exact(browse_);
+
+ assign_browsing_functor<I, F> fun(ima, f, dir);
+ browse(fun);
+ }
+
+}
+
+
+int main()
+{
+ using namespace mln;
+ image2d<unsigned> ima2(3, 3);
+ image3d<unsigned> ima3(3, 3, 3);
+
+ level::fill(ima2, 0);
+ my_test(ima2, fun::p2v::iota, canvas::browsing::directional, 0);
+ debug::println(ima2);
+
+ level::fill(ima2, 0);
+ my_test(ima2, fun::p2v::iota, canvas::browsing::directional, 1);
+ debug::println(ima2);
+
+
+ level::fill(ima3, 0);
+ my_test(ima3, fun::p2v::iota, canvas::browsing::directional, 0);
+ debug::println(ima3);
+
+ level::fill(ima3, 0);
+ my_test(ima3, fun::p2v::iota, canvas::browsing::directional, 1);
+ debug::println(ima3);
+
+ level::fill(ima3, 0);
+ my_test(ima3, fun::p2v::iota, canvas::browsing::directional, 2);
+ debug::println(ima3);
+}
Index: trunk/milena/tests/canvas/browsing/fwd.cc
===================================================================
--- trunk/milena/tests/canvas/browsing/fwd.cc (revision 0)
+++ trunk/milena/tests/canvas/browsing/fwd.cc (revision 1495)
@@ -0,0 +1,93 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/canvas/browsing/fwd.cc
+ *
+ * \brief Tests on mln::canvas::browsing::fwd.hh
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/canvas/browsing/fwd.hh>
+#include <mln/fun/p2v/iota.hh>
+#include <mln/debug/println.hh>
+
+// FIXME: Move code below into mln/canvas/browsing/iota.hh.
+
+
+template <typename I_, typename F>
+struct assign_browsing_functor
+{
+ typedef I_ I;
+ enum { dim = I::point::dim };
+
+
+ I input;
+ F f;
+
+ assign_browsing_functor(I& input, F f = F())
+ : input(input),
+ f(f)
+ {}
+
+ mln_psite(I) p;
+
+ void init() {}
+ void final() {}
+ void next()
+ {
+ input(p) = f(p);
+ mln_assertion(input(p) - 1 == p[0] * input.domain().ncols() + p[1]);
+ }
+};
+
+namespace mln
+{
+
+ template <typename I, typename F, typename B>
+ void my_test(Image<I>& ima_,
+ const Function_p2v<F>& f_,
+ const Browsing<B>& browse_)
+ {
+ I& ima = exact(ima_);
+ const F& f = exact(f_);
+ const B& browse = exact(browse_);
+
+ assign_browsing_functor<I, F> fun(ima, f);
+ browse(fun);
+ }
+
+}
+
+
+int main()
+{
+ using namespace mln;
+ image2d<unsigned> ima2(3, 3);
+
+ my_test(ima2, fun::p2v::iota, canvas::browsing::fwd);
+ debug::println(ima2);
+}
Index: trunk/milena/tests/canvas/browsing/snake_fwd.cc
===================================================================
--- trunk/milena/tests/canvas/browsing/snake_fwd.cc (revision 0)
+++ trunk/milena/tests/canvas/browsing/snake_fwd.cc (revision 1495)
@@ -0,0 +1,96 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/canvas/browsing/snake_fwd.cc
+ *
+ * \brief Tests on mln::canvas::browsing::snake_fwd.
+ */
+
+#include <mln/core/image2d.hh>
+#include <mln/canvas/browsing/snake_fwd.hh>
+#include <mln/fun/p2v/iota.hh>
+#include <mln/debug/println.hh>
+
+// FIXME: Move code below into mln/canvas/browsing/iota.hh.
+
+
+template <typename I, typename F>
+struct assign_browsing_functor
+{
+ enum { dim = I::point::dim };
+
+
+ I input;
+ F f;
+
+ assign_browsing_functor(I& input, F f = F())
+ : input(input),
+ f(f)
+ {}
+
+ mln_psite(I) p;
+
+ void init() {}
+ void final() {}
+ void next()
+ {
+ input(p) = f(p);
+ mln_assertion(input(p) - 1 == p[0] * input.domain().ncols()
+ + ( (p[0] % 2) ? input.domain().ncols() - 1 - p[1] : p[1]));
+ }
+ void fwd() { next(); }
+ void bkd() { next(); }
+ void down() { next(); }
+};
+
+namespace mln
+{
+
+ template <typename I, typename F, typename B>
+ void my_test(Image<I>& ima_,
+ const Function_p2v<F>& f_,
+ const Browsing<B>& browse_)
+ {
+ I& ima = exact(ima_);
+ const F& f = exact(f_);
+ const B& browse = exact(browse_);
+
+ assign_browsing_functor<I, F> fun(ima, f);
+ browse(fun);
+ }
+
+}
+
+
+int main()
+{
+ using namespace mln;
+ image2d<unsigned> ima2(3, 3);
+
+ my_test(ima2, fun::p2v::iota, canvas::browsing::snake_fwd);
+ debug::println(ima2);
+}
Index: trunk/milena/tests/canvas/browsing/dir_struct_elt_incr_update.cc
===================================================================
--- trunk/milena/tests/canvas/browsing/dir_struct_elt_incr_update.cc (revision 0)
+++ trunk/milena/tests/canvas/browsing/dir_struct_elt_incr_update.cc (revision 1495)
@@ -0,0 +1,37 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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/canvas/browsing/dir_struct_elt_incr_update.cc
+ *
+ * \brief Tests on mln::canvas::browsing::dir_struct_elt_incr_update
+ */
+
+
+int main()
+{
+ //FIXME: Make a more relevant test.
+}
Index: trunk/milena/mln/canvas/browsing/dir_ricard51.hh (deleted)
===================================================================
Index: trunk/milena/mln/canvas/browsing/snake_fwd.hh
===================================================================
--- trunk/milena/mln/canvas/browsing/snake_fwd.hh (revision 1494)
+++ trunk/milena/mln/canvas/browsing/snake_fwd.hh (revision 1495)
@@ -34,7 +34,6 @@
*/
# include <mln/core/concept/browsing.hh>
-# include <mln/core/dpoint2d.hh> // for "up"
# include <mln/geom/size2d.hh>
@@ -47,8 +46,29 @@
namespace browsing
{
- /*! FIXME: Doc!
+ /*!
+ * \brief Browsing in a snake-way, forward.
*
+ * This canvas browse all the point of an image 'input' like
+ * this :
+ *
+ * ------->
+ * <------'
+ * '------>
+ *
+ * The fonctor should provide (In addition to 'input') four
+ * methods :
+ *
+ * - init() : Will be called at the beginning.
+ * - down() : Will be called after each moving down. (will
+ * also be called once at the first point).
+ * - fwd() : Will be called after each moving right.
+ * - bwd() : Will ba called after each moving left.
+ *
+ * This methods should acces to the current working point 'p'
+ * also provided by the functor.
+ *
+ * Warning: This canvas works only on 2D.
*
* F shall feature: \n
* { \n
@@ -73,49 +93,62 @@
snake_fwd;
+
# ifndef MLN_INCLUDE_ONLY
template <typename F>
void
snake_fwd_t::operator()(F& f) const
{
+ // FIXME: Check the dimension (2D) or generalize.
+ trace::entering("canvas::browsing::snake_fwd");
mln_precondition(f.input.has_data());
int
min_row = geom::min_row(f.input), max_row = geom::max_row(f.input),
min_col = geom::min_col(f.input), max_col = geom::max_col(f.input);
// p
- f.p = f.input.bbox().pmin() + up;
+ f.p = f.input.bbox().pmin();
int& row = f.p.row();
int& col = f.p.col();
// initialization
+ trace::entering("canvas::browsing::snake_fwd::init");
f.init();
+ trace::exiting("canvas::browsing::snake_fwd::init");
bool fwd = true;
for (row = min_row; row <= max_row; ++row)
+ // FIXME: Add "if (f.input.has(p))"?
{
// go down
+ trace::entering("canvas::browsing::snake_fwd::init");
f.down();
+ trace::exiting("canvas::browsing::snake_fwd::init");
if (fwd)
// browse line fwd
while (col < max_col)
{
++col;
+ trace::entering("canvas::browsing::snake_fwd::fwd");
f.fwd();
+ trace::exiting("canvas::browsing::snake_fwd::fwd");
}
else
// browse line bkd
while (col > min_col)
{
--col;
+ trace::entering("canvas::browsing::snake_fwd");
f.bkd();
+ trace::exiting("canvas::browsing::snake_fwd");
}
// change browsing
fwd = ! fwd;
}
+ trace::exiting("canvas::browsing::snake_fwd");
}
# endif // ! MLN_INCLUDE_ONLY
Index: trunk/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh
===================================================================
--- trunk/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh (revision 0)
+++ trunk/milena/mln/canvas/browsing/dir_struct_elt_incr_update.hh (revision 1495)
@@ -0,0 +1,227 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// 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_CANVAS_BROWSING_DIR_STRUCT_ELT_INCR_UPDATE_HH
+# define MLN_CANVAS_BROWSING_DIR_STRUCT_ELT_INCR_UPDATE_HH
+
+/*! \file mln/canvas/browsing/dir_struct_elt_incr_update.hh
+ *
+ * \brief Directional browsing of an image with structuring element.
+ */
+
+# include <mln/core/concept/browsing.hh>
+# include <mln/core/concept/image.hh>
+
+namespace mln
+{
+
+ namespace canvas
+ {
+
+ namespace browsing
+ {
+
+ /*!
+ * \brief Browsing in a certain direction with a segment.
+ *
+ * This canvas browse all the point of an image 'input' of type
+ * 'I', of dimension 'dim' in the direction 'dir' with
+ * considering weigh the 'length' nearest points.
+ *
+ * The functor should provide (In addition to 'input', 'I',
+ * 'dim', 'dir' and 'length') six methods :
+ *
+ * - init() : Will be called at the beginning.
+ * - init_line() : Will be called at the beginning of each
+ * line.
+ * - add_point(q) : Will be called for taking the new point
+ * 'q' into account.
+ * - remove_point(q): Will be called for untaking the new point
+ * 'q' into account.
+ * - next() : Will be called at each point 'p' (also
+ * provided by the functor).
+ * - final() : Will be called at the end.
+ *
+ * F shall features : \n
+ * { \n
+ * --- as types: \n
+ * I; \n
+ * --- as attributes: \n
+ * dim; \n
+ * dir; // and test dir < dim \n
+ * input; \n
+ * p; \n
+ * length; \n
+ * --- as methods: \n
+ * void init(); \n
+ * void init_line(); \n
+ * void add_point(q) \n
+ * void remove_point(q) \n
+ * void next(); \n
+ * void final(); \n
+ * } \n
+ *
+ */
+ struct dir_struct_elt_incr_update_t : public Browsing< dir_struct_elt_incr_update_t >
+ {
+ template <typename F>
+ void operator()(F& f) const;
+ }
+
+ dir_struct_elt_incr_update;
+
+# ifndef MLN_INCLUDE_ONLY
+
+ template <typename F>
+ void
+ dir_struct_elt_incr_update_t::operator()(F& f) const
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update");
+ mln_precondition(f.dir < f.dim);
+ typedef typename F::I I;
+
+ const mln_point(I)
+ pmin = f.input.domain().pmin(),
+ pmax = f.input.domain().pmax();
+
+ const mln_coord(I)
+ pmin_dir = pmin[f.dir],
+ pmax_dir = pmax[f.dir],
+ pmin_dir_plus_half_length = pmin_dir + f.length / 2,
+ pmax_dir_minus_half_length = pmax_dir - f.length / 2;
+
+ mln_point(I) pt, pu;
+
+ typedef mln_coord(I)& coord_ref;
+ coord_ref
+ ct = pt[f.dir],
+ cu = pu[f.dir],
+ p_dir = f.p[f.dir];
+
+ f.p = pmin;
+
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::init");
+ f.init();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::init");
+
+ do
+ {
+ pt = f.p;
+ pu = f.p;
+
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::init_line");
+ f.init_line();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::init_line");
+
+ // initialization (before first point of the line)
+ for (ct = pmin_dir; ct < pmin_dir_plus_half_length; ++ ct)
+ if (f.input.has(pt))
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ f.add_point(pt);
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ }
+
+ // left columns (just take new points)
+ for (p_dir = pmin_dir; p_dir <= pmin_dir_plus_half_length; ++p_dir, ++ct)
+ {
+ if (f.input.has(pt))
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ f.add_point(pt);
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ }
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::next");
+ f.next();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::next");
+ }
+
+ // middle columns (both take and untake)
+ cu = pmin_dir;
+ for (; p_dir <= pmax_dir_minus_half_length; ++cu, ++p_dir, ++ct)
+ {
+ if (f.input.has(pt))
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ f.add_point(pt);
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::add_point");
+ }
+ if (f.input.has(pu))
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::remove_point");
+ f.remove_point(pu);
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::remove_point");
+ }
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::next");
+ f.next();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::next");
+ }
+
+ // right columns (now just untake old points)
+ for (; p_dir <= pmax_dir; ++cu, ++p_dir)
+ {
+ if (f.input.has(pu))
+ {
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::remove_point");
+ f.remove_point(pu);
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::remove_point");
+ }
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::next");
+ f.next();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::next");
+ }
+
+ p_dir = pmin_dir;
+
+ for (int c = F::dim - 1; c >= 0; --c)
+ {
+ if (c == int(f.dir))
+ continue;
+ if (f.p[c] != pmax[c])
+ {
+ ++f.p[c];
+ break;
+ }
+ f.p[c] = pmin[c];
+ }
+ } while (f.p != pmin);
+
+ trace::entering("canvas::browsing::dir_struct_elt_incr_update::final");
+ f.final();
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update::final");
+ trace::exiting("canvas::browsing::dir_struct_elt_incr_update");
+ }
+
+# endif // ! MLN_INCLUDE_ONLY
+
+ } // end of namespace mln::canvas::browsing
+
+ } // end of namespace mln::canvas
+
+} // end of namespace mln
+
+#endif // ! MLN_CANVAS_BROWSING_DIR_STRUCT_ELT_INCR_UPDATE_HH
Index: trunk/milena/mln/canvas/browsing/directional.hh
===================================================================
--- trunk/milena/mln/canvas/browsing/directional.hh (revision 1494)
+++ trunk/milena/mln/canvas/browsing/directional.hh (revision 1495)
@@ -45,7 +45,20 @@
namespace browsing
{
- /*! FIXME : DOC
+ /*!
+ * \brief Browsing in a certain direction.
+ *
+ * This canvas browse all the point of an image 'input' of type
+ * 'I' and of dimension 'dim' in the direction 'dir'.
+ *
+ * The functor should provide (In addition to 'input', 'I',
+ * 'dim' and 'dir') three methods :
+ *
+ * - init() : Will be called at the beginning.
+ * - next() : Will be called at each point 'p' (also provided by
+ * the fonctor).
+ * - final(): Will be called at the end.
+ *
* F shall features : \n
* { \n
* --- as types: \n
@@ -57,8 +70,8 @@
* p; \n
* --- as methods: \n
* void init(); \n
- * void next() \n
- * void final() \n
+ * void next(); \n
+ * void final(); \n
* } \n
*
*/
@@ -76,6 +89,7 @@
void
directional_t::operator()(F& f) const
{
+ trace::entering("canvas::browsing::directional");
mln_precondition(f.dir < f.dim);
typedef typename F::I I;
@@ -85,11 +99,15 @@
f.p = pmin;
+ trace::entering("canvas::browsing::directional::init");
f.init();
+ trace::exiting("canvas::browsing::directional::init");
do
{
+ trace::entering("canvas::browsing::directional::next");
f.next();
+ trace::exiting("canvas::browsing::directional::next");
for (int c = F::dim - 1; c >= 0; --c)
{
@@ -104,7 +122,10 @@
}
} while (f.p != pmin);
+ trace::entering("canvas::browsing::directional::final");
f.final();
+ trace::exiting("canvas::browsing::directional::final");
+ trace::exiting("canvas::browsing::directional");
}
# endif // ! MLN_INCLUDE_ONLY
Index: trunk/milena/mln/canvas/browsing/fwd.hh
===================================================================
--- trunk/milena/mln/canvas/browsing/fwd.hh (revision 1494)
+++ trunk/milena/mln/canvas/browsing/fwd.hh (revision 1495)
@@ -30,7 +30,7 @@
/*! \file mln/canvas/browsing/fwd.hh
*
- * \brief Canvas for browsing forward.
+ * \brief Canvas for forward browsing.
*/
# include <mln/core/concept/browsing.hh>
@@ -46,8 +46,18 @@
namespace browsing
{
- /*! FIXME: Doc!
+ /*!
+ * \brief Canvas for forward browsing
*
+ * This canvas browse all the points of an image 'input' of type
+ * 'I' from left to right and from top to bottom
+ *
+ * The fonctor should provide (In addition of 'I' and 'input')
+ * three methods :
+ * - init() : Will be called at the beginning.
+ * - next() : Will be called at each point 'p' (also provided by
+ * the functor).
+ * - final(): Will be called at the end.
*
* F shall feature: \n
* { \n
@@ -63,7 +73,6 @@
* } \n
*
*/
-
struct fwd_t : public Browsing< fwd_t >
{
template <typename F>
@@ -79,16 +88,24 @@
void
fwd_t::operator()(F& f) const
{
+ trace::entering("canvas::browsing::fwd");
mln_precondition(f.input.has_data());
typedef typename F::I I;
mln_fwd_piter(I) p(f.input.domain());
+ trace::entering("canvas::browsing::fwd::init");
f.init();
+ trace::exiting("canvas::browsing::fwd::init");
for_all(p)
{
f.p = p;
+ trace::entering("canvas::browsing::fwd::next");
f.next();
+ trace::exiting("canvas::browsing::fwd::next");
}
+ trace::entering("canvas::browsing::fwd::final");
f.final();
+ trace::exiting("canvas::browsing::fwd::final");
+ trace::exiting("canvas::browsing::fwd");
}
# endif // ! MLN_INCLUDE_ONLY