December 2007 - Olena-patches

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena
by Olena 19 Dec '07

19 Dec '07

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: nivault Type: task | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by nivault): * status: assigned => new * owner: anonymous => nivault -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

milena r1618: Reduce warnings for Doxygen
by Guillaume Duhamel 18 Dec '07

18 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena $ make user-doc 2> err.log $ cat err.log | wc -l 131 ChangeLog: 2007-12-18 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Reduce warnings for Doxygen. * doc/examples/labeling_algo.cc, * mln/core/mesh_image.hh, * mln/core/mesh_psite.hh, * mln/debug/iota.hh, * mln/geom/seeds2tiling.hh, * mln/geom/seeds2tiling_roundness.hh, * mln/morpho/top_hat.hh, * mln/pw/image.hh, * mln/util/tree.hh, * mln/util/tree_to_image.hh, * tests/fun/v2v/norm.cc: Fix some Doxygen warnings for these files. --- doc/examples/labeling_algo.cc | 2 +- mln/core/mesh_image.hh | 2 +- mln/core/mesh_psite.hh | 7 +++++-- mln/debug/iota.hh | 2 +- mln/geom/seeds2tiling.hh | 4 ++-- mln/geom/seeds2tiling_roundness.hh | 4 ++-- mln/pw/image.hh | 2 +- mln/util/tree.hh | 3 ++- mln/util/tree_to_image.hh | 6 +++--- tests/fun/v2v/norm.cc | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) Index: trunk/milena/tests/fun/v2v/norm.cc =================================================================== --- trunk/milena/tests/fun/v2v/norm.cc (revision 1617) +++ trunk/milena/tests/fun/v2v/norm.cc (revision 1618) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l1.hh +/*! \file tests/fun/v2v/norm.cc * * \brief Test the norm functors. */ Index: trunk/milena/doc/examples/labeling_algo.cc =================================================================== --- trunk/milena/doc/examples/labeling_algo.cc (revision 1617) +++ trunk/milena/doc/examples/labeling_algo.cc (revision 1618) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling_algo.cc +/*! \file doc/examples/labeling_algo.cc * * \brief Test on mln::geom::seeds2tiling. */ Index: trunk/milena/mln/debug/iota.hh =================================================================== --- trunk/milena/mln/debug/iota.hh (revision 1617) +++ trunk/milena/mln/debug/iota.hh (revision 1618) @@ -47,7 +47,7 @@ /*! Fill the image \p input with successive values. * - * \param[in,out] destination The image in which values are + * \param[in,out] input The image in which values are * assigned. */ template <typename I> Index: trunk/milena/mln/core/mesh_psite.hh =================================================================== --- trunk/milena/mln/core/mesh_psite.hh (revision 1617) +++ trunk/milena/mln/core/mesh_psite.hh (revision 1618) @@ -45,8 +45,11 @@ template<typename P> class mesh_p; - // FIXME: Doc! - // FIXME: Fix access to member. + /*! + * \brief Point site associate to mesh_image. + * + * \todo Fix access to member. + */ template<typename P> class mesh_psite : public Point_Site< mesh_psite > { Index: trunk/milena/mln/core/mesh_image.hh =================================================================== --- trunk/milena/mln/core/mesh_image.hh (revision 1617) +++ trunk/milena/mln/core/mesh_image.hh (revision 1618) @@ -86,7 +86,7 @@ } // end of namespace mln::trait - /*! \brief FIXME + /*! \brief Kind of image based on graph structure. * */ template <typename P, typename V> Index: trunk/milena/mln/pw/image.hh =================================================================== --- trunk/milena/mln/pw/image.hh (revision 1617) +++ trunk/milena/mln/pw/image.hh (revision 1618) @@ -168,7 +168,7 @@ namespace internal { - + /// \internal template <typename F, typename S> inline data_< pw::image<F,S> >::data_(const F& f, const S& ps) Index: trunk/milena/mln/geom/seeds2tiling_roundness.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1617) +++ trunk/milena/mln/geom/seeds2tiling_roundness.hh (revision 1618) @@ -53,12 +53,12 @@ /*! Take a labeled image \p ima_ with seeds and extend them until * creating tiles nore roundness that the primary version. * - * \param[in,out] ima The labeled image with seed. + * \param[in,out] ima_ The labeled image with seed. * \param[in] win_w The weight window using by geom::chamfer to compute distance. * \param[in] max Unsigned using by geom::chamfer to compute distance. * \param[in] nbh The neighborhood to use on this algorithm. * - * \pre \p ima has to be initialized. + * \pre \p ima_ has to be initialized. * */ template <typename I, typename N> Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 1617) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1618) @@ -50,10 +50,10 @@ /*! Take a labeled image \p ima_ with seeds and extend them * until creating tiles. * - * \param[in,out] ima The labeled image with seed. + * \param[in,out] ima_ The labeled image with seed. * \param[in] nbh The neighborhood to use on this algorithm. * - * \pre \p ima has to be initialized. + * \pre \p ima_ has to be initialized. * */ template <typename I, typename N> Index: trunk/milena/mln/morpho/top_hat.hh =================================================================== Index: trunk/milena/mln/util/tree.hh =================================================================== --- trunk/milena/mln/util/tree.hh (revision 1617) +++ trunk/milena/mln/util/tree.hh (revision 1618) @@ -130,7 +130,7 @@ /*! \brief Bind \p node to the current node and become its * parent. * - * \param[in] node The new parent node. + * \param[in] parent The new parent node. * */ void set_parent(node<T>* parent); @@ -144,6 +144,7 @@ * node as root. * * \param[in] ostr The output stream. + * \param[in] level The deep level * */ void print(std::ostream& ostr, int level = 0); Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1617) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1618) @@ -45,7 +45,7 @@ namespace util { - /*! Convert a tree into an image. + /*! \brief Convert a tree into an image. * * \param[in] tree The tree to convert. * \param[out] output_ The image containing tree informations. @@ -57,7 +57,7 @@ /*! Display a tree. * - * \param[in] ima The domain of output image. + * \param[in] ima_ The domain of output image. * \param[in] tree The tree to display. * */ @@ -68,7 +68,7 @@ /*! Display an arborescence from \p node. * - * \param[in] ima The domain of output image. + * \param[in] ima_ The domain of output image. * \param[in] node The root node to display. * */

1 0

milena r1617: Review queue in core and fix some warnings in tests directory
by Guillaume Duhamel 18 Dec '07

18 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-18 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review queue in core and fix some warnings in tests directory. Review queue files. * mln/core/p_priority_queue.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/p_priority_queue_fast_with_array.hh, * mln/core/p_queue_fast.hh: Review queue. Update tests. * tests/core/mesh_elt_window.cc, * tests/core/mesh_image.cc, * tests/debug/iota.cc, * tests/debug/println.cc, * tests/debug/println_with_border.cc, * tests/io/fits/fits.cc, * tests/io/pbm/pbm.cc, * tests/io/pgm/pgm.cc, * tests/io/pgm/pgm16.cc, * tests/io/pgm/pgm19.cc, * tests/io/pgm/pgm27.cc, * tests/io/ppm/ppm.cc, * tests/io/ppm/ppm16.cc, * tests/io/ppm/ppm23.cc, * tests/norm/l1.cc, * tests/norm/l2.cc, * tests/norm/linfty.cc, * tests/value/macros.hh, * tests/value/rgb_full.cc, * tests/core/t_image.cc: Fix doxygen warnings. Move tests. * tests/core_p_priority_queue.cc: Remove ... * tests/core/p_priority_queue.cc: ... replace here. * tests/core_p_priority_queue_fast.cc: Remove ... * tests/core/p_priority_queue_fast.cc: ... replace here. * tests/core_p_priority_queue_fast_with_array.cc: Remove ... * tests/core/p_priority_queue_fast_with_array.cc: ... replace here. * tests/core_p_queue.cc: Remove ... * tests/core/p_queue.cc: ... replace here. * tests/core_p_queue_fast.cc: Remove ... * tests/core/p_queue_fast.cc: ... replace here. * tests/canvas/Makefile.am, * tests/core/Makefile.am: Update Makefile for these tests. --- mln/core/p_priority_queue.hh | 4 mln/core/p_priority_queue_fast.hh | 4 mln/core/p_priority_queue_fast_with_array.hh | 4 mln/core/p_queue_fast.hh | 2 tests/canvas/Makefile.am | 6 + tests/core/Makefile.am | 14 +++ tests/core/mesh_elt_window.cc | 2 tests/core/mesh_image.cc | 2 tests/core/p_priority_queue.cc | 98 +++++++++++++++++++++++ tests/core/p_priority_queue_fast.cc | 98 +++++++++++++++++++++++ tests/core/p_priority_queue_fast_with_array.cc | 105 +++++++++++++++++++++++++ tests/core/p_queue.cc | 57 +++++++++++++ tests/core/p_queue_fast.cc | 57 +++++++++++++ tests/core/t_image.cc | 2 tests/debug/iota.cc | 2 tests/debug/println.cc | 2 tests/debug/println_with_border.cc | 2 tests/io/fits/fits.cc | 2 tests/io/pbm/pbm.cc | 2 tests/io/pgm/pgm.cc | 2 tests/io/pgm/pgm16.cc | 2 tests/io/pgm/pgm19.cc | 2 tests/io/pgm/pgm27.cc | 2 tests/io/ppm/ppm.cc | 2 tests/io/ppm/ppm16.cc | 2 tests/io/ppm/ppm23.cc | 2 tests/norm/l1.cc | 2 tests/norm/l2.cc | 2 tests/norm/linfty.cc | 2 tests/value/macros.hh | 2 tests/value/rgb_full.cc | 2 31 files changed, 457 insertions(+), 32 deletions(-) Index: trunk/milena/tests/core_p_queue.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue_fast.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_priority_queue_fast_with_array.cc (deleted) =================================================================== Index: trunk/milena/tests/core_p_queue_fast.cc (deleted) =================================================================== Index: trunk/milena/tests/debug/iota.cc =================================================================== --- trunk/milena/tests/debug/iota.cc (revision 1616) +++ trunk/milena/tests/debug/iota.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_iota.cc +/*! \file tests/debug/iota.cc * * \brief Tests on mln::debug::iota. */ Index: trunk/milena/tests/debug/println_with_border.cc =================================================================== --- trunk/milena/tests/debug/println_with_border.cc (revision 1616) +++ trunk/milena/tests/debug/println_with_border.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_println_with_border.cc +/*! \file tests/debug/println_with_border.cc * * \brief Test on mln::debug::println_with_border. */ Index: trunk/milena/tests/debug/println.cc =================================================================== --- trunk/milena/tests/debug/println.cc (revision 1616) +++ trunk/milena/tests/debug/println.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/debug_println.cc +/*! \file tests/debug/println.cc * * \brief Test on mln::debug::println. */ Index: trunk/milena/tests/value/rgb_full.cc =================================================================== --- trunk/milena/tests/value/rgb_full.cc (revision 1616) +++ trunk/milena/tests/value/rgb_full.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value/rgb.cc +/*! \file tests/value/rgb_full.cc * * \brief Tests on mln::value::rgb. */ Index: trunk/milena/tests/value/macros.hh =================================================================== --- trunk/milena/tests/value/macros.hh (revision 1616) +++ trunk/milena/tests/value/macros.hh (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value_macros.hh +/*! \file tests/value/macros.hh * * \brief Utilities to tests value types. */ Index: trunk/milena/tests/canvas/Makefile.am =================================================================== --- trunk/milena/tests/canvas/Makefile.am (revision 1616) +++ trunk/milena/tests/canvas/Makefile.am (revision 1617) @@ -3,3 +3,9 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = browsing + +check_PROGRAMS = \ + chamfer + +chamfer_SOURCES = chamfer.cc + Index: trunk/milena/tests/core/mesh_image.cc =================================================================== --- trunk/milena/tests/core/mesh_image.cc (revision 1616) +++ trunk/milena/tests/core/mesh_image.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mesh_image.cc +/*! \file tests/core/mesh_image.cc * * \brief Tests on mln::mesh_image. */ Index: trunk/milena/tests/core/p_queue.cc =================================================================== --- trunk/milena/tests/core/p_queue.cc (revision 0) +++ trunk/milena/tests/core/p_queue.cc (revision 1617) @@ -0,0 +1,57 @@ +// 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/core/p_queue.cc + * + * \brief Tests on mln::p_queue. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_queue.hh> + + + +int main() +{ + using namespace mln; + + p_queue<point2d> q; + q + .push(make::point2d(6, 9)) + .push(make::point2d(5, 1)) + .push(make::point2d(4, 2)); + mln_assertion(q.npoints() == 3); + + std::cout << q.bbox() << std::endl; + std::cout << q << std::endl; + + q.pop(); + mln_assertion(q.npoints() == 2); + point2d p = q.front(); + mln_assertion(q.npoints() == 2); + mln_assertion(p == make::point2d(5, 1)); +} Index: trunk/milena/tests/core/p_priority_queue.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue.cc (revision 1617) @@ -0,0 +1,98 @@ +// 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/core/p_priority_queue.cc + * + * \brief Tests on mln::p_priority_queue. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue.hh> + +int main () +{ + using namespace mln; + + p_priority_queue<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/t_image.cc =================================================================== --- trunk/milena/tests/core/t_image.cc (revision 1616) +++ trunk/milena/tests/core/t_image.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/t_image.cc +/*! \file tests/core/t_image.cc * * \brief Tests on mln::t_image. */ Index: trunk/milena/tests/core/p_priority_queue_fast_with_array.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 1617) @@ -0,0 +1,105 @@ +// 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/core/p_priority_queue_fast_with_array.cc + * + * \brief Tests on mln::p_priority_queue_fast_with_array. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue_fast_with_array.hh> + +int main () +{ + using namespace mln; + + p_priority_queue_fast_with_array<point2d, unsigned, 20> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 1); + + q.push_force (p1, 3); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 2); + + q.push_force (p2, 5); + mln_assertion (!q.is_empty ()); + mln_assertion (q.npoints () == 3); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/p_queue_fast.cc =================================================================== --- trunk/milena/tests/core/p_queue_fast.cc (revision 0) +++ trunk/milena/tests/core/p_queue_fast.cc (revision 1617) @@ -0,0 +1,57 @@ +// 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/core/p_queue_fast.cc + * + * \brief Tests on mln::p_queue_fast. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_queue_fast.hh> + + + +int main() +{ + using namespace mln; + + p_queue_fast<point2d> q; + q + .push(make::point2d(6, 9)) + .push(make::point2d(5, 1)) + .push(make::point2d(4, 2)); + mln_assertion(q.npoints() == 3); + + std::cout << q.bbox() << std::endl; + std::cout << q << std::endl; + + q.pop(); + mln_assertion(q.npoints() == 2); + point2d p = q.front(); + mln_assertion(q.npoints() == 2); + mln_assertion(p == make::point2d(5, 1)); +} Index: trunk/milena/tests/core/p_priority_queue_fast.cc =================================================================== --- trunk/milena/tests/core/p_priority_queue_fast.cc (revision 0) +++ trunk/milena/tests/core/p_priority_queue_fast.cc (revision 1617) @@ -0,0 +1,98 @@ +// 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/core/p_priority_queue_fast.cc + * + * \brief Tests on mln::p_priority_queue_fast. + */ + +#include <mln/core/point2d.hh> +#include <mln/core/p_priority_queue_fast.hh> + +int main () +{ + using namespace mln; + + mln::p_priority_queue_fast<point2d, unsigned> q; + point2d p1 (6, 9); + point2d p2 (5, 1); + point2d p3 (4, 2); + + mln_assertion (q.is_empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + std::cout << q.bbox () << std::endl; + std::cout << q << std::endl; + + mln_assertion (!q.is_empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.is_empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[2] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[0] == p2); + q.clear (); + mln_assertion (q.is_empty ()); +} Index: trunk/milena/tests/core/Makefile.am =================================================================== --- trunk/milena/tests/core/Makefile.am (revision 1616) +++ trunk/milena/tests/core/Makefile.am (revision 1617) @@ -15,7 +15,12 @@ p_runs \ rle_image \ sparse_image \ - t_image + t_image \ + p_priority_queue \ + p_priority_queue_fast \ + p_priority_queue_fast_with_array \ + p_queue \ + p_queue_fast category_SOURCES = category.cc clone_SOURCES = clone.cc @@ -30,5 +35,12 @@ rle_image_SOURCES = rle_image.cc sparse_image_SOURCES = sparse_image.cc t_image_SOURCES = t_image.cc +p_priority_queue_SOURCES = p_priority_queue.cc +p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc +p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc +p_queue_SOURCES = p_priority_queue_fast.cc +p_queue_fast_SOURCES = p_priority_queue_fast.cc + + TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/core/mesh_elt_window.cc =================================================================== --- trunk/milena/tests/core/mesh_elt_window.cc (revision 1616) +++ trunk/milena/tests/core/mesh_elt_window.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mesh_elt_window.cc +/*! \file tests/core/mesh_elt_window.cc * * \brief Tests on mln::win::mesh_elt_window. */ Index: trunk/milena/tests/io/pgm/pgm27.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm27.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm27.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm27.cc +/*! \file tests/io/pgm/pgm27.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm19.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm19.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm19.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm19.cc +/*! \file tests/io/pgm/pgm19.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm.cc +/*! \file tests/io/pgm/pgm.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/pgm/pgm16.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm16.cc (revision 1616) +++ trunk/milena/tests/io/pgm/pgm16.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pgm16.cc +/*! \file tests/io/pgm/pgm16.cc * * \brief Test on mln::io::pgm::load and mln::io::pgm::save. */ Index: trunk/milena/tests/io/fits/fits.cc =================================================================== --- trunk/milena/tests/io/fits/fits.cc (revision 1616) +++ trunk/milena/tests/io/fits/fits.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fits_load.cc +/*! \file tests/io/fits/fits.cc * * \brief Test on mln::io::fits::load. */ Index: trunk/milena/tests/io/ppm/ppm.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm.cc +/*! \file tests/io/ppm/ppm.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/ppm/ppm23.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm23.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm23.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm23.cc +/*! \file tests/io/ppm/ppm23.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/ppm/ppm16.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm16.cc (revision 1616) +++ trunk/milena/tests/io/ppm/ppm16.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_ppm16.cc +/*! \file tests/io/ppm/ppm16.cc * * \brief Test on mln::io::ppm::load and mln::io::ppm::save. */ Index: trunk/milena/tests/io/pbm/pbm.cc =================================================================== --- trunk/milena/tests/io/pbm/pbm.cc (revision 1616) +++ trunk/milena/tests/io/pbm/pbm.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/io_pbm.cc +/*! \file tests/io/pbm/pbm.cc * * \brief Test on mln::io::pbm::. */ Index: trunk/milena/tests/norm/l1.cc =================================================================== --- trunk/milena/tests/norm/l1.cc (revision 1616) +++ trunk/milena/tests/norm/l1.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l1.hh +/*! \file tests/norm/l1.cc * * \brief Test the L1-norm. */ Index: trunk/milena/tests/norm/l2.cc =================================================================== --- trunk/milena/tests/norm/l2.cc (revision 1616) +++ trunk/milena/tests/norm/l2.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/l2.hh +/*! \file tests/norm/l2.cc * * \brief Test the L2-norm. */ Index: trunk/milena/tests/norm/linfty.cc =================================================================== --- trunk/milena/tests/norm/linfty.cc (revision 1616) +++ trunk/milena/tests/norm/linfty.cc (revision 1617) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/norm/linfty.hh +/*! \file tests/norm/linfty.cc * * \brief Test the L-infinity-norm. */ Index: trunk/milena/mln/core/p_priority_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point fast queue class (based on std::map and p_queue_fast). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_priority_queue.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point priority queue class (based on p_queue and std::map). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_priority_queue_fast_with_array.hh =================================================================== --- trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1616) +++ trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1617) @@ -53,13 +53,11 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point queue class (based on std::deque). + /*! \brief Point queue class (based on std::vector and p_queue_fast). * * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple. Index: trunk/milena/mln/core/p_queue_fast.hh =================================================================== --- trunk/milena/mln/core/p_queue_fast.hh (revision 1616) +++ trunk/milena/mln/core/p_queue_fast.hh (revision 1617) @@ -57,8 +57,6 @@ * This is a mathematical set of points (unique insertion). * * \todo Make it work with P being a Point_Site. - * \todo Add a parameter flag to choose another policy for "push" - * (i.e., no-op if multiple or allow multiple insertions). * * \warning We have some troubles with point set comparison based on * a call to npoints() when this container is multiple.

1 0

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena
by Olena 18 Dec '07

18 Dec '07

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: anonymous Type: task | Status: assigned Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by anonymous): * status: new => assigned * owner: Olena Team => anonymous -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

milena ba883be: Add a missing include
by Benoit Sigoure 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln Git branch: master (HEAD: 0ef3c80) ChangeLog: 2007-12-17 Benoit Sigoure <tsuna(a)lrde.epita.fr> Add a missing include. * milena/mln/accu/max.hh: Here. --- milena/ChangeLog | 5 +++++ milena/mln/accu/max.hh | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 87b2ed6..b5381ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Add a missing include. + * milena/mln/accu/max.hh: Here. + 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review chamfer and labeling in canvas. diff --git a/milena/mln/accu/max.hh b/milena/mln/accu/max.hh index 22b13be..3d57c12 100644 --- a/milena/mln/accu/max.hh +++ b/milena/mln/accu/max.hh @@ -34,6 +34,7 @@ */ # include <mln/core/concept/meta_accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/trait/value_.hh> # include <mln/util/pix.hh> -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "Jesus saves, but only Buddha /EPITA\ Promo 2008.CSI/ACU/YAKA makes incremental backups"

1 0

milena r1615: Review chamfer and labeling in canvas
by Guillaume Duhamel 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Review chamfer and labeling in canvas. * mln/canvas/chamfer.hh, * mln/canvas/labeling.hh: Review this files split declaration and implementation, fix typo. Tests. * tests/chamfer.cc: Remove ... * tests/canvas/chamfer.cc: ... replace it and modify tests. --- mln/canvas/chamfer.hh | 29 +++++++-- mln/canvas/labeling.hh | 151 +++++++++++++++++++++++++++++++++--------------- tests/canvas/chamfer.cc | 128 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+), 52 deletions(-) Index: trunk/milena/tests/chamfer.cc (deleted) =================================================================== Index: trunk/milena/tests/canvas/chamfer.cc =================================================================== --- trunk/milena/tests/canvas/chamfer.cc (revision 0) +++ trunk/milena/tests/canvas/chamfer.cc (revision 1615) @@ -0,0 +1,128 @@ +// 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/chamfer.cc + * + * \brief Tests on mln::geom::chamfer. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if_value.hh> +#include <mln/core/inplace.hh> + +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> +#include <mln/core/w_window2d_int.hh> +#include <mln/core/w_window2d_float.hh> +#include <mln/core/image_if_interval.hh> + +#include <mln/make/win_chamfer.hh> +#include <mln/geom/chamfer.hh> +#include <mln/level/compare.hh> + + +int main() +{ + using namespace mln; + unsigned max = 51; + + image2d<bool> ima(9, 9); + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + unsigned r[9][9] = + { + {16, 14, 12, 10, 8, 10, 12, 14, 16}, + {14, 12, 10, 8, 6, 8, 10, 12, 14}, + {12, 10, 8, 6, 4, 6, 8, 10, 12}, + {10, 8, 6, 4, 2, 4, 6, 8, 10}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + {10, 8, 6, 4, 2, 4, 6, 8, 10}, + {12, 10, 8, 6, 4, 6, 8, 10, 12}, + {14, 12, 10, 8, 6, 8, 10, 12, 14}, + {16, 14, 12, 10, 8, 10, 12, 14, 16} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + } + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 3> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + + unsigned r[9][9] = + { + {12, 11, 10, 9, 8, 9, 10, 11, 12}, + {11, 9, 8, 7, 6, 7, 8, 9, 11}, + {10, 8, 6, 5, 4, 5, 6, 8, 10}, + { 9, 7, 5, 3, 2, 3, 5, 7, 9}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + { 9, 7, 5, 3, 2, 3, 5, 7, 9}, + {10, 8, 6, 5, 4, 5, 6, 8, 10}, + {11, 9, 8, 7, 6, 7, 8, 9, 11}, + {12, 11, 10, 9, 8, 9, 10, 11, 12} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + } + + { + level::fill(ima, false); + ima.at(4,4) = true; + const w_window2d_int& w_win = make::mk_chamfer_5x5_int<4, 6, 9> (); + image2d<unsigned> out = geom::chamfer(ima, w_win, max); + image2d<unsigned>::fwd_piter p(out.domain()); + for_all(p) + out(p) = out(p) / 2; + + unsigned r[9][9] = + { + {12, 10, 9, 8, 8, 8, 9, 10, 12}, + {10, 9, 7, 6, 6, 6, 7, 9, 10}, + { 9, 7, 6, 4, 4, 4, 6, 7, 9}, + { 8, 6, 4, 3, 2, 3, 4, 6, 8}, + { 8, 6, 4, 2, 0, 2, 4, 6, 8}, + { 8, 6, 4, 3, 2, 3, 4, 6, 8}, + { 9, 7, 6, 4, 4, 4, 6, 7, 9}, + {10, 9, 7, 6, 6, 6, 7, 9, 10}, + {12, 10, 9, 8, 8, 8, 9, 10, 12} + }; + + image2d<unsigned> ref (make::image2d(r)); + mln_assertion (out == ref); + + } + +} Index: trunk/milena/mln/canvas/chamfer.hh =================================================================== --- trunk/milena/mln/canvas/chamfer.hh (revision 1614) +++ trunk/milena/mln/canvas/chamfer.hh (revision 1615) @@ -38,23 +38,40 @@ namespace canvas { + /*! + * \brief Compute chamfer distance. + * + */ template <typename F> struct chamfer { - F& f; - typedef typename F::I I; typedef typename F::W W; typedef mln_point(I) point; - chamfer(F& f) + F& f; + + chamfer(F& f); + + void run(); + }; + +# ifndef MLN_INCLUDE_ONLY + + template<typename F> + inline + chamfer<F>::chamfer(F& f) : f(f) { run(); } - void run() + template<typename F> + inline + void + chamfer<F>::run() { + /// Init. { f.init(); @@ -86,9 +103,9 @@ f.output(p) = f.output(q) + q.w(); f.status = true; } - } - }; + +# endif // ! MLN_INCLUDE_ONLY } // end of mln::canvas Index: trunk/milena/mln/canvas/labeling.hh =================================================================== --- trunk/milena/mln/canvas/labeling.hh (revision 1614) +++ trunk/milena/mln/canvas/labeling.hh (revision 1615) @@ -71,7 +71,69 @@ bool status; // Ctor. - labeling(F& f) + labeling(F& f); + + void init(); + + void pass_1(); + + void pass_2(); + + + // Auxiliary methods. + + void make_set(const point& p); + + bool is_root(const point& p) const; + + point find_root(const point& x); + + void do_union(const point& n, const point& p); + + }; + + + template <typename F> + struct labeling_fastest + { + // Functor. + F& f; + + typedef typename F::I I; + typedef typename F::N N; + typedef typename F::L L; + + // Auxiliary data. + mln_ch_value(I, unsigned) parent; + + // Output. + mln_ch_value(I, L) output; + L nlabels; + bool status; + + // Ctor. + labeling_fastest(F& f); + + void init(); + + void pass_1(); + + void pass_2(); + + // Auxiliary methods. + + bool is_root(unsigned p) const; + + unsigned find_root(unsigned x); + + void do_union(unsigned n, unsigned p); + + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + labeling<F>::labeling(F& f) : f(f) { trace::entering("canvas::labeling"); @@ -84,8 +146,9 @@ trace::exiting("canvas::labeling"); } - - void init() + template <typename F> + void + labeling<F>::init() { initialize(deja_vu, f.input); mln::level::fill(deja_vu, false); @@ -95,7 +158,9 @@ nlabels = 0; } - void pass_1() + template <typename F> + void + labeling<F>::pass_1() { mln_fwd_piter(S) p(f.s); mln_niter(N) n(f.nbh, p); @@ -112,7 +177,9 @@ } } - void pass_2() + template <typename F> + void + labeling<F>::pass_2() { mln_bkd_piter(S) p(f.s); for_all(p) if (f.handles(p)) @@ -135,21 +202,24 @@ status = true; } - - // Auxiliary methods. - - void make_set(const point& p) + template <typename F> + void + labeling<F>::make_set(const point& p) { parent(p) = p; f.init_attr(p); } - bool is_root(const point& p) const + template <typename F> + bool + labeling<F>::is_root(const point& p) const { return parent(p) == p; } - point find_root(const point& x) + template <typename F> + typename labeling<F>::point + labeling<F>::find_root(const point& x) { if (parent(x) == x) return x; @@ -157,7 +227,9 @@ return parent(x) = find_root(parent(x)); } - void do_union(const point& n, const point& p) + template <typename F> + void + labeling<F>::do_union(const point& n, const point& p) { point r = find_root(n); if (r != p) @@ -167,31 +239,8 @@ } } - }; - - - - template <typename F> - struct labeling_fastest - { - // Functor. - F& f; - - typedef typename F::I I; - typedef typename F::N N; - typedef typename F::L L; - - // Auxiliary data. - mln_ch_value(I, unsigned) parent; - - // Output. - mln_ch_value(I, L) output; - L nlabels; - bool status; - - // Ctor. - labeling_fastest(F& f) + labeling_fastest<F>::labeling_fastest(F& f) : f(f) { trace::entering("canvas::labeling_fastest"); @@ -204,8 +253,9 @@ trace::exiting("canvas::labeling_fastest"); } - - void init() + template <typename F> + void + labeling_fastest<F>::init() { initialize(parent, f.input); for (unsigned p = 0; p < parent.ncells(); ++p) @@ -215,7 +265,9 @@ nlabels = 0; } - void pass_1() + template <typename F> + void + labeling_fastest<F>::pass_1() { mln_bkd_pixter(const I) p(f.input); @@ -234,7 +286,9 @@ } } - void pass_2() + template <typename F> + void + labeling_fastest<F>::pass_2() { mln_fwd_pixter(const I) p(f.input); @@ -258,14 +312,16 @@ status = true; } - // Auxiliary methods. - - bool is_root(unsigned p) const + template <typename F> + bool + labeling_fastest<F>::is_root(unsigned p) const { return parent[p] == p; } - unsigned find_root(unsigned x) + template <typename F> + unsigned + labeling_fastest<F>::find_root(unsigned x) { if (parent[x] == x) return x; @@ -273,7 +329,9 @@ return parent[x] = find_root(parent[x]); } - void do_union(unsigned n, unsigned p) + template <typename F> + void + labeling_fastest<F>::do_union(unsigned n, unsigned p) { unsigned r = find_root(n); if (r != p) @@ -283,7 +341,8 @@ } } - }; + +# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::canvas

1 0

milena r1614: Add main page for Doxygen documentation
by Guillaume Duhamel 17 Dec '07

17 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add main page for Doxygen documentation. * mln/convert/all.hh, * mln/level/all.hh, * mln/level/paste.hh, * tests/level/paste_full.cc: Fix typo. * mln/core/concept/object.hh: Add main page for Doxygen. --- mln/convert/all.hh | 2 - mln/core/concept/object.hh | 78 +++++++++++++++++++++++++++++++++++++++++++++ mln/level/all.hh | 2 - mln/level/paste.hh | 4 +- tests/level/paste_full.cc | 3 + 5 files changed, 86 insertions(+), 3 deletions(-) Index: trunk/milena/tests/level/paste_full.cc =================================================================== --- trunk/milena/tests/level/paste_full.cc (revision 1613) +++ trunk/milena/tests/level/paste_full.cc (revision 1614) @@ -142,6 +142,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image1d in (cols); // image_if<image1d, f_box1d_t> input(in, f_b1); @@ -173,6 +174,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image2d in (rows, cols); // image_if<image2d, f_box2d_t> input(in, f_b2); @@ -204,6 +206,7 @@ chck(input, output); } + /// FIXME : Uncomment this when it will be possible // { // image3d in (slis, rows, cols); // image_if<image3d, f_box3d_t> input(in, f_b3); Index: trunk/milena/mln/core/concept/object.hh =================================================================== --- trunk/milena/mln/core/concept/object.hh (revision 1613) +++ trunk/milena/mln/core/concept/object.hh (revision 1614) @@ -46,6 +46,84 @@ # include <mln/metal/ret.hh> +/*! \mainpage Documentation of milena + * + * \section intro_sec Introduction + * + * This is the documentation of milena. + * + * \section tools_subsec Tools required. + * FIXME. + * + * \section mln_sec Overview of milena. + * + * <UL> + * <LI> \ref mln + * <LI> \ref mln::accu + * <LI> \ref mln::arith + * <LI> \ref mln::border + * <LI> \ref mln::canvas + * <LI> \ref mln::convert + * <LI> \ref mln::debug + * <LI> \ref mln::display + * <LI> \ref mln::draw + * <LI> \ref mln::estim + * <LI> \ref mln::fun + * <LI> \ref mln::geom + * <LI> \ref mln::histo + * <LI> \ref mln::io + * <LI> \ref mln::labeling + * <LI> \ref mln::level + * <LI> \ref mln::linear + * <LI> \ref mln::literal + * <LI> \ref mln::logical + * <LI> \ref mln::make + * <LI> \ref mln::math + * <LI> \ref mln::metal + * <LI> \ref mln::morpho + * <LI> \ref mln::norm + * <LI> \ref mln::pw + * <LI> \ref mln::set + * <LI> \ref mln::tag + * <LI> \ref mln::test + * <LI> \ref mln::trace + * <LI> \ref mln::trait + * <LI> \ref mln::util + * <LI> \ref mln::value + * <LI> \ref mln::win + * + * \section copyright Copyright and License. + * 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. + * + */ + + + /*! \namespace mln * \brief The namespace mln corresponds to the Milena (mini-Olena) project. * Index: trunk/milena/mln/level/all.hh =================================================================== --- trunk/milena/mln/level/all.hh (revision 1613) +++ trunk/milena/mln/level/all.hh (revision 1614) @@ -31,6 +31,7 @@ /*! \file mln/level/all.hh * * \brief File that includes all level-related routines. + * */ @@ -66,7 +67,6 @@ # include <mln/level/memset_.hh> # include <mln/level/naive/all.hh> # include <mln/level/paste.hh> -# include <mln/level/paste.spe.hh> # include <mln/level/saturate.hh> # include <mln/level/sort_points.hh> # include <mln/level/stretch.hh> Index: trunk/milena/mln/level/paste.hh =================================================================== --- trunk/milena/mln/level/paste.hh (revision 1613) +++ trunk/milena/mln/level/paste.hh (revision 1614) @@ -31,6 +31,7 @@ /*! \file mln/level/paste.hh * * \brief Paste the contents of an image into another one. + * */ # include <mln/core/concept/image.hh> @@ -48,7 +49,8 @@ namespace level { - /*! Paste the contents of image \p data into the image \p + /*! + * \brief Paste the contents of image \p data into the image \p * destination. * * \param[in] data The input image providing pixels values. Index: trunk/milena/mln/convert/all.hh =================================================================== --- trunk/milena/mln/convert/all.hh (revision 1613) +++ trunk/milena/mln/convert/all.hh (revision 1614) @@ -36,7 +36,7 @@ namespace mln { - /// \internal Namespace of convertion routines. + /// Namespace of convertion routines. namespace convert {} }

1 0

milena r1613: Fix typo
by nivaul_s＠lrde.epita.fr 14 Dec '07

14 Dec '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-12-14 Simon Nivault <simon.nivault(a)lrde.epita.fr> Fix typo. * mln/core/interpolated.hh, * mln/core/mono_obased_rle_encode.hh, * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_encode.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_encode.hh, * mln/core/obased_rle_image.hh, * mln/core/rle_encode.hh, * mln/core/rle_image.hh, * mln/core/sparse_encode.hh, * mln/core/sparse_image.hh, * mln/util/lazy_set.hh, * tests/core/mono_rle_image.cc, * tests/fun/x2x/composed.cc, * tests/fun/x2x/rotation.cc, * tests/fun/x2x/translation.cc: Fix. --- mln/core/interpolated.hh | 2 +- mln/core/mono_obased_rle_encode.hh | 5 +++-- mln/core/mono_obased_rle_image.hh | 15 +++++++-------- mln/core/mono_rle_encode.hh | 1 + mln/core/mono_rle_image.hh | 10 +++++----- mln/core/obased_rle_encode.hh | 1 + mln/core/obased_rle_image.hh | 10 +++++----- mln/core/rle_encode.hh | 1 + mln/core/rle_image.hh | 8 ++++---- mln/core/sparse_encode.hh | 1 + mln/core/sparse_image.hh | 10 +++++----- mln/util/lazy_set.hh | 18 +----------------- tests/core/mono_rle_image.cc | 2 +- tests/fun/x2x/composed.cc | 2 +- tests/fun/x2x/rotation.cc | 2 +- tests/fun/x2x/translation.cc | 2 +- 16 files changed, 39 insertions(+), 51 deletions(-) Index: trunk/milena/tests/fun/x2x/translation.cc =================================================================== --- trunk/milena/tests/fun/x2x/translation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/translation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_translation.cc +/*! \file tests/fun/x2x/translation.cc * * \brief Tests on mln::fun::x2x::translation. */ Index: trunk/milena/tests/fun/x2x/rotation.cc =================================================================== --- trunk/milena/tests/fun/x2x/rotation.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/rotation.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_rotation.cc +/*! \file tests/fun/x2x/rotation.cc * * \brief Tests on mln::fun::x2x::rotation. */ Index: trunk/milena/tests/fun/x2x/composed.cc =================================================================== --- trunk/milena/tests/fun/x2x/composed.cc (revision 1612) +++ trunk/milena/tests/fun/x2x/composed.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/fun_x2x_composed.cc +/*! \file tests/fun/x2x/composed.cc * * \brief Tests on mln::fun::x2x::composed. */ Index: trunk/milena/tests/core/mono_rle_image.cc =================================================================== --- trunk/milena/tests/core/mono_rle_image.cc (revision 1612) +++ trunk/milena/tests/core/mono_rle_image.cc (revision 1613) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/mono_rle_iimage.cc +/*! \file tests/core/mono_rle_image.cc * * \brief Test on mln::labeling::blobs. */ Index: trunk/milena/mln/core/mono_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a mono_rle_image ** ** @param input has to respect the Image concept + ** @param val specify the value which has to be considered ** ** @return mono_rle_image */ Index: trunk/milena/mln/core/sparse_encode.hh =================================================================== --- trunk/milena/mln/core/sparse_encode.hh (revision 1612) +++ trunk/milena/mln/core/sparse_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a sparse_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return sparse_image */ Index: trunk/milena/mln/core/rle_image.hh =================================================================== --- trunk/milena/mln/core/rle_image.hh (revision 1612) +++ trunk/milena/mln/core/rle_image.hh (revision 1613) @@ -122,10 +122,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::rvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename rle_image<P, T>::lvalue - rle_image<P, T>::operator() (const typename rle_image<P, T>::psite& site) + rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1612) +++ trunk/milena/mln/core/interpolated.hh (revision 1613) @@ -59,7 +59,7 @@ } // end of namespace mln::internal - /*! \brief FIXME + /*! \brief Morpher that makes underlaying image being accessed with floating coordinate. * */ template <typename I> Index: trunk/milena/mln/core/obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a obased_rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return obased_rle_image */ Index: trunk/milena/mln/core/mono_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_rle_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief Mono RLE image. + /*! \brief Monochrome RLE image. * * RLE image with only one colour. * @@ -123,10 +123,10 @@ void insert(const p_run& pr); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -211,7 +211,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::rvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) const + mono_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); return this->data_->value_; @@ -220,7 +220,7 @@ template <typename P, typename T> inline typename mono_rle_image<P, T>::lvalue - mono_rle_image<P, T>::operator() (const typename mono_rle_image<P, T>::psite& site) + mono_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->value_; Index: trunk/milena/mln/core/obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/obased_rle_image.hh (revision 1613) @@ -103,7 +103,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects. * * * Parameter \c P is the type of the image points. @@ -132,10 +132,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -237,7 +237,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::rvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -247,7 +247,7 @@ template <typename P, typename T> inline typename obased_rle_image<P, T>::lvalue - obased_rle_image<P, T>::operator() (const typename obased_rle_image<P, T>::psite& site) + obased_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/mono_obased_rle_encode.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_encode.hh (revision 1613) @@ -39,11 +39,12 @@ { /*! - ** encode an image class to a mono_obased_rle_image + ** Encode an image class to a mono_obased_rle_image. ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** - ** @return mono_obased_rle_image + ** @return mono_obased_rle_image. */ template <typename I> mono_obased_rle_image<mln_point(I), mln_value(I)> Index: trunk/milena/mln/core/mono_obased_rle_image.hh =================================================================== --- trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1612) +++ trunk/milena/mln/core/mono_obased_rle_image.hh (revision 1613) @@ -98,7 +98,7 @@ } // end of namespace mln::trait - /*! \brief RLE image. + /*! \brief RLE image with objects based on mln::mono_rle_image. * * * Parameter \c P is the type of the image points. @@ -127,10 +127,10 @@ void insert(const p_run& pr, T value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + const T operator()(const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + T& operator()(const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -224,9 +224,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::rvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) - const + const T + mono_obased_rle_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; @@ -234,8 +233,8 @@ template <typename P, typename T> inline - typename mono_obased_rle_image<P, T>::lvalue - mono_obased_rle_image<P, T>::operator() (const typename mono_obased_rle_image<P, T>::psite& site) + T& + mono_obased_rle_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()]; Index: trunk/milena/mln/core/sparse_image.hh =================================================================== --- trunk/milena/mln/core/sparse_image.hh (revision 1612) +++ trunk/milena/mln/core/sparse_image.hh (revision 1613) @@ -93,7 +93,7 @@ } // end of namespace mln::trait - /*! \brief SPARSE image. + /*! \brief RLE image with different value in runs. * * * Parameter \c P is the type of the image points. @@ -122,10 +122,10 @@ void insert(const p_run& pr, const std::vector<T>& value); /// Read-only access to the image value located at point \p p. - rvalue operator() (const psite& site) const; + rvalue operator() (const runs_psite& site) const; /// Read-write access to the image value located at point \p p. - lvalue operator() (const psite& site); + lvalue operator() (const runs_psite& site); /// Test if this image has been initialized. bool has_data() const; @@ -209,7 +209,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::rvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite& site) const { mln_precondition(this->has(site)); @@ -219,7 +219,7 @@ template <typename P, typename T> inline typename sparse_image<P, T>::lvalue - sparse_image<P, T>::operator() (const typename sparse_image<P, T>::psite& site) + sparse_image<P, T>::operator() (const runs_psite& site) { mln_precondition(this->has(site)); return this->data_->values_[site.p_of_run()][site.p_in_run()]; Index: trunk/milena/mln/core/rle_encode.hh =================================================================== --- trunk/milena/mln/core/rle_encode.hh (revision 1612) +++ trunk/milena/mln/core/rle_encode.hh (revision 1613) @@ -42,6 +42,7 @@ ** encode an image class to a rle_image ** ** @param input has to respect the Image concept + ** @param ignore_zero says if zero has to be considered as a valid value ** ** @return rle_image */ Index: trunk/milena/mln/util/lazy_set.hh =================================================================== --- trunk/milena/mln/util/lazy_set.hh (revision 1612) +++ trunk/milena/mln/util/lazy_set.hh (revision 1613) @@ -28,7 +28,7 @@ #ifndef MLN_UTIL_LAZY_SET_HH # define MLN_UTIL_LAZY_SET_HH -/*! \file mln/core/internal/lazy_set.hh +/*! \file mln/util/lazy_set.hh * * \brief Definition of mln::lazy_set_ for internal use only. */ @@ -201,22 +201,6 @@ }; - /*! \brief Print a set \p s into the output stream \p - * ostr. - * - * \param[in,out] ostr An output stream. - * \param[in] s A set. - * - * \return The modified output stream \p ostr. - * - * \relates mln::internal::lazy_set_ - */ - // FIXME : ambiguous with point_set operator << - // template <typename E> - // std::ostream& operator<<(std::ostream& ostr, const lazy_set_<E>& s); - - - # ifndef MLN_INCLUDE_ONLY template <typename E>

1 0

Re: [Olena-patches] [Olena] #78: Enable Trac notifications (by e-mail)
by Olena 13 Dec '07

13 Dec '07

#78: Enable Trac notifications (by e-mail) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: closed Priority: critical | Milestone: Olena 1.0ß Component: Olena | Version: 1.0 Resolution: fixed | Keywords: Trac -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Done on Dec. 13, along with other Trac notification set-ups. Drop me (Roland) a line if it doesn't work as expected. -- Ticket URL: <https://trac.lrde.org/olena/ticket/78#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0

Re: [Olena-patches] [Olena] #70: Complete the definition of the legend of the synthetic progression views for the release of Olena 1.0ß
by Olena 13 Dec '07

13 Dec '07

#70: Complete the definition of the legend of the synthetic progression views for the release of Olena 1.0ß -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: closed Priority: critical | Milestone: Olena 1.0ß Component: other | Version: 1.0 Resolution: fixed | Keywords: Trac -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => fixed Comment: Done two weeks before in these revisions of these Wiki pages: * https://trac.lrde.org/olena/wiki/Olena/Release1.0beta?version=29 * https://trac.lrde.org/olena/wiki/Olena/Release1.0beta/DetailedView?version=… -- Ticket URL: <https://trac.lrde.org/olena/ticket/70#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 0