URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-11 Simon Nivault <simon.nivault@lrde.epita.fr> Add some 2d windows and tests * mln/core/win/backdiag2d.hh: New. * mln/core/win/diag2d.hh: New. * mln/core/win/disk2d.hh: New. * mln/core/win/octagon2d.hh: New. * tests/win_backdiag2d.cc: New. * tests/win_diag2d.cc: New. --- mln/core/win/backdiag2d.hh | 185 ++++++++++++++++++++++++++++++++++++++++++++ mln/core/win/diag2d.hh | 185 ++++++++++++++++++++++++++++++++++++++++++++ mln/core/win/disk2d.hh | 174 ++++++++++++++++++++++++++++++++++++++++++ mln/core/win/octagon2d.hh | 186 +++++++++++++++++++++++++++++++++++++++++++++ tests/win_backdiag2d.cc | 48 +++++++++++ tests/win_diag2d.cc | 48 +++++++++++ 6 files changed, 826 insertions(+) Index: trunk/milena/tests/win_diag2d.cc =================================================================== --- trunk/milena/tests/win_diag2d.cc (revision 0) +++ trunk/milena/tests/win_diag2d.cc (revision 1101) @@ -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/win_diag2d.cc + * + * \brief Tests on mln::win::diag2d. + */ + +#include <mln/core/win/diag2d.hh> + +#include <mln/convert/to_image.hh> + +#include <mln/debug/println.hh> + +int main() +{ + using namespace mln; + + const unsigned l = 5; + win::diag2d diag(l); + + debug::println(convert::to_image(diag)); +} + Index: trunk/milena/tests/win_backdiag2d.cc =================================================================== --- trunk/milena/tests/win_backdiag2d.cc (revision 0) +++ trunk/milena/tests/win_backdiag2d.cc (revision 1101) @@ -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/win_backdiag2d.cc + * + * \brief Tests on mln::win::backdiag2d. + */ + +#include <mln/core/win/backdiag2d.hh> + +#include <mln/convert/to_image.hh> + +#include <mln/debug/println.hh> + +int main() +{ + using namespace mln; + + const unsigned l = 9; + win::backdiag2d diag(l); + + debug::println(convert::to_image(diag)); +} + Index: trunk/milena/mln/core/win/diag2d.hh =================================================================== --- trunk/milena/mln/core/win/diag2d.hh (revision 0) +++ trunk/milena/mln/core/win/diag2d.hh (revision 1101) @@ -0,0 +1,185 @@ +// 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_CORE_WIN_DIAG2D_HH +# define MLN_CORE_WIN_DIAG2D_HH + +/*! \file mln/core/win/diag2d.hh + * + * \brief Definition of the mln::win::diag2d window. + */ + +# include <mln/core/concept/window.hh> +# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/dpoint2d.hh> +# include <mln/core/dpoints_piter.hh> + + +namespace mln +{ + + namespace win + { + + /*! \brief Diagonal line window defined on the 2D square grid. + * + * An diag2d is centered and symmetrical. + * its width (length) is odd. + * + * For instance: \n + * o \n + * o \n + * x \n + * o \n + * o \n + * is defined with length = 5. + */ + struct diag2d : public Window< diag2d >, + public internal::dpoints_base_< dpoint2d, diag2d > + { + /// Point associated type. + typedef point2d point; + + /// Dpoint associated type. + typedef dpoint2d dpoint; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (increasing), for each column (increasing)." + */ + typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (decreasing), for each column (decreasing)." + */ + typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; + + /*! \brief Same as fwd_qiter. + */ + typedef fwd_qiter qiter; + + /*! \brief Constructor. + * + * \param[in] length Length, thus width, of the diagonal line. + * + * \pre \p length is odd. + */ + diag2d(unsigned length); + + /*! \brief Test if the window is centered. + * + * \return True. + */ + bool is_centered() const; + + /*! \brief Test if the window is symmetric. + * + * \return true. + */ + bool is_symmetric() const; + + /*! \brief Give the diagonal length, that is, its width. + */ + unsigned length() const; + + /*! \brief Give the maximum coordinate gap between the window + * center and a window point. + */ + unsigned delta() const; + + /// Apply a central symmetry to the target window. + diag2d& sym(); + + protected: + unsigned length_; + }; + + + /*! \brief Print an diagonal line window \p win into the output + * stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] win A diagonal line window. + * + * \return The modified output stream \p ostr. + * + * \relates mln::win::diag2d + */ + std::ostream& operator<<(std::ostream& ostr, const diag2d& win); + + + +# ifndef MLN_INCLUDE_ONLY + + diag2d::diag2d(unsigned length) + : length_(length) + { + mln_precondition(length % 2 == 1); + const int dcol = length / 2; + for (int col = - dcol; col <= dcol; ++col) + insert(make::dpoint2d(-col, col)); + } + + bool diag2d::is_centered() const + { + return true; + } + + bool diag2d::is_symmetric() const + { + return true; + } + + unsigned diag2d::length() const + { + return length_; + } + + unsigned diag2d::delta() const + { + return length_ / 2; + } + + diag2d& diag2d::sym() + { + return *this; + } + + std::ostream& operator<<(std::ostream& ostr, const diag2d& win) + { + ostr << "[diag 2d: length=" << win.length() << ']'; + return ostr; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_CORE_WIN_DIAG2D_HH Index: trunk/milena/mln/core/win/backdiag2d.hh =================================================================== --- trunk/milena/mln/core/win/backdiag2d.hh (revision 0) +++ trunk/milena/mln/core/win/backdiag2d.hh (revision 1101) @@ -0,0 +1,185 @@ +// 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_CORE_WIN_BACKDIAG2D_HH +# define MLN_CORE_WIN_BACKDIAG2D_HH + +/*! \file mln/core/win/backdiag2d.hh + * + * \brief Definition of the mln::win::backdiag2d window. + */ + +# include <mln/core/concept/window.hh> +# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/dpoint2d.hh> +# include <mln/core/dpoints_piter.hh> + + +namespace mln +{ + + namespace win + { + + /*! \brief Diagonal line window defined on the 2D square grid. + * + * An backdiag2d is centered and symmetrical. + * its width (length) is odd. + * + * For instance: \n + * o \n + * o \n + * x \n + * o \n + * o \n + * is defined with length = 5. + */ + struct backdiag2d : public Window< backdiag2d >, + public internal::dpoints_base_< dpoint2d, backdiag2d > + { + /// Point associated type. + typedef point2d point; + + /// Dpoint associated type. + typedef dpoint2d dpoint; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (increasing), for each column (increasing)." + */ + typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (decreasing), for each column (decreasing)." + */ + typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; + + /*! \brief Same as fwd_qiter. + */ + typedef fwd_qiter qiter; + + /*! \brief Constructor. + * + * \param[in] length Length, thus width, of the diagonal line. + * + * \pre \p length is odd. + */ + backdiag2d(unsigned length); + + /*! \brief Test if the window is centered. + * + * \return True. + */ + bool is_centered() const; + + /*! \brief Test if the window is symmetric. + * + * \return true. + */ + bool is_symmetric() const; + + /*! \brief Give the diagonal length, that is, its width. + */ + unsigned length() const; + + /*! \brief Give the maximum coordinate gap between the window + * center and a window point. + */ + unsigned delta() const; + + /// Apply a central symmetry to the target window. + backdiag2d& sym(); + + protected: + unsigned length_; + }; + + + /*! \brief Print an diagonal line window \p win into the output + * stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] win A diagonal line window. + * + * \return The modified output stream \p ostr. + * + * \relates mln::win::backdiag2d + */ + std::ostream& operator<<(std::ostream& ostr, const backdiag2d& win); + + + +# ifndef MLN_INCLUDE_ONLY + + backdiag2d::backdiag2d(unsigned length) + : length_(length) + { + mln_precondition(length % 2 == 1); + const int dcol = length / 2; + for (int col = - dcol; col <= dcol; ++col) + insert(make::dpoint2d(col, col)); + } + + bool backdiag2d::is_centered() const + { + return true; + } + + bool backdiag2d::is_symmetric() const + { + return true; + } + + unsigned backdiag2d::length() const + { + return length_; + } + + unsigned backdiag2d::delta() const + { + return length_ / 2; + } + + backdiag2d& backdiag2d::sym() + { + return *this; + } + + std::ostream& operator<<(std::ostream& ostr, const backdiag2d& win) + { + ostr << "[diag 2d: length=" << win.length() << ']'; + return ostr; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_CORE_WIN_BACKDIAG2D_HH Index: trunk/milena/mln/core/win/octagon2d.hh =================================================================== --- trunk/milena/mln/core/win/octagon2d.hh (revision 0) +++ trunk/milena/mln/core/win/octagon2d.hh (revision 1101) @@ -0,0 +1,186 @@ +// 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_CORE_WIN_OCTAGON2D_HH +# define MLN_CORE_WIN_OCTAGON2D_HH + +/*! \file mln/core/win/octagon2d.hh + * + * \brief Definition of the mln::win::octagon2d window. + */ + +# include <mln/core/concept/window.hh> +# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/dpoint2d.hh> +# include <mln/core/dpoints_piter.hh> + + +namespace mln +{ + + namespace win + { + + /*! \brief Octagon window defined on the 2D square grid. + * + * An octagon2d is centered and symmetrical. + * The length l of the octagon is such as l = 2*x + 1 + * where x is odd; + * + * For instance: \n + * o o o \n + * o o o o o \n + * o o o o o o o \n + * o o o x o o o \n + * o o o o o o o \n + * o o o o o \n + * o o o \n + * is defined with length = 7 (x = 3). + */ + struct octagon2d : public Window< octagon2d >, + public internal::dpoints_base_< dpoint2d, octagon2d > + { + /// Point associated type. + typedef point2d point; + + /// Dpoint associated type. + typedef dpoint2d dpoint; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (increasing), for each column (increasing)." + */ + typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (decreasing), for each column (decreasing)." + */ + typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; + + /*! \brief Same as fwd_qiter. + */ + typedef fwd_qiter qiter; + + /*! \brief Constructor. + * + * \param[in] lenght Length, of the octagon. + * + * \pre \p length is such as length = 2*x + 1 where x is odd. + */ + octagon2d(unsigned length); + + /*! \brief Test if the window is centered. + * + * \return True. + */ + bool is_centered() const; + + /*! \brief Test if the window is symmetric. + * + * \return true. + */ + bool is_symmetric() const; + + /*! \brief Give the octagon length, that is, its width. + */ + unsigned length() const; + + /*! \brief Give the maximum coordinate gap between the window + * center and a window point. + */ + unsigned delta() const; + + /// Apply a central symmetry to the target window. + octagon2d& sym(); + + protected: + unsigned length_; + }; + + + /*! \brief Print an octagon window \p win into the output + * stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] win An octagon window. + * + * \return The modified output stream \p ostr. + * + * \relates mln::win::octagon2d + */ + std::ostream& operator<<(std::ostream& ostr, const octagon2d& win); + + + +# ifndef MLN_INCLUDE_ONLY + + octagon2d::octagon2d(unsigned length) + : length_(length) + { + mln_precondition(length % 2 == 1 && (length / 2) % 2 == 1); + insert(dpoint2d::zero); // FIXME : Do the right insert. + } + + bool octagon2d::is_centered() const + { + return true; + } + + bool octagon2d::is_symmetric() const + { + return true; + } + + unsigned octagon2d::length() const + { + return length_; + } + + unsigned octagon2d::delta() const + { + return length_ / 2; + } + + octagon2d& octagon2d::sym() + { + return *this; + } + + std::ostream& operator<<(std::ostream& ostr, const octagon2d& win) + { + ostr << "[octagon2d: length=" << win.length() << ']'; + return ostr; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_CORE_WIN_OCTAGON2D_HH Index: trunk/milena/mln/core/win/disk2d.hh =================================================================== --- trunk/milena/mln/core/win/disk2d.hh (revision 0) +++ trunk/milena/mln/core/win/disk2d.hh (revision 1101) @@ -0,0 +1,174 @@ +// 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_CORE_WIN_DISK2D_HH +# define MLN_CORE_WIN_DISK2D_HH + +/*! \file mln/core/win/disk2d.hh + * + * \brief Definition of the mln::win::disk2d window. + */ + +# include <mln/core/concept/window.hh> +# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/dpoint2d.hh> +# include <mln/core/dpoints_piter.hh> + + +namespace mln +{ + + namespace win + { + + /*! \brief Disk window defined on the 2D square grid. + * + * An disk2d is centered and symmetrical. + * + */ + struct disk2d : public Window< disk2d >, + public internal::dpoints_base_< dpoint2d, disk2d > + { + /// Point associated type. + typedef point2d point; + + /// Dpoint associated type. + typedef dpoint2d dpoint; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (increasing), for each column (increasing)." + */ + typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; + + /*! \brief Point_Iterator type to browse a hline such as: "for each row + * (decreasing), for each column (decreasing)." + */ + typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; + + /*! \brief Same as fwd_qiter. + */ + typedef fwd_qiter qiter; + + /*! \brief Constructor. + * + * \param[in] length Length, thus diameter. + * + */ + disk2d(unsigned length); + + /*! \brief Test if the window is centered. + * + * \return True. + */ + bool is_centered() const; + + /*! \brief Test if the window is symmetric. + * + * \return true. + */ + bool is_symmetric() const; + + /*! \brief Give the disk length, that is, its width. + */ + unsigned length() const; + + /*! \brief Give the maximum coordinate gap between the window + * center and a window point. + */ + unsigned delta() const; + + /// Apply a central symmetry to the target window. + disk2d& sym(); + + protected: + unsigned length_; + }; + + + /*! \brief Print an disk window \p win into the output + * stream \p ostr. + * + * \param[in,out] ostr An output stream. + * \param[in] win A disk window. + * + * \return The modified output stream \p ostr. + * + * \relates mln::win::disk2d + */ + std::ostream& operator<<(std::ostream& ostr, const disk2d& win); + + + +# ifndef MLN_INCLUDE_ONLY + + disk2d::disk2d(unsigned length) + : length_(length) + { + mln_precondition(length % 2 == 1); + insert(dpoint2d::zero); //FIXME : Do the right insert. + } + + bool disk2d::is_centered() const + { + return true; + } + + bool disk2d::is_symmetric() const + { + return true; + } + + unsigned disk2d::length() const + { + return length_; + } + + unsigned disk2d::delta() const + { + return length_ / 2; + } + + disk2d& disk2d::sym() + { + return *this; + } + + std::ostream& operator<<(std::ostream& ostr, const disk2d& win) + { + ostr << "[disk2d: length=" << win.length() << ']'; + return ostr; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_CORE_WIN_DISK2D_HH