- Olena-patches

3072: Have site sets comparisons work again.
by Thierry Geraud 19 Dec '08

19 Dec '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Have site sets comparisons work again. * mln/core/site_set/box.hh: Layout. * mln/core/site_set/operators.hh: Have it work. * mln/core/concept/box.hh (is_empty): New. * mln/core/concept/site_set.hh: Layout. * mln/geom/nsites.hh (nistes): Rename site set overload as... * mln/set/card.hh (card): ...this... ...in this new file. * mln/set/sym_diff.hh: Add fwd decl. * mln/set/unique.hh: New. * mln/set/all.hh: Update. * tests/core/site_set/operators.cc: Revamp. * tests/geom/nsites.cc: New. * tests/geom/Makefile.am: Update. * tests/set/uni.cc: Fix include. * tests/set/sym_diff.cc: Likewise. * tests/set/inter.cc: Likewise. * tests/set/unique.cc: New. * tests/set/card.cc: New. * tests/set/Makefile.am: Update. mln/core/concept/box.hh | 44 ++-- mln/core/concept/site_set.hh | 1 mln/core/site_set/box.hh | 3 mln/core/site_set/operators.hh | 368 ++++++++++++++++++++++++++++++++++----- mln/geom/nsites.hh | 107 ----------- mln/set/all.hh | 5 mln/set/card.hh | 81 +++----- mln/set/sym_diff.hh | 3 mln/set/unique.hh | 84 ++++++++ tests/core/site_set/operators.cc | 67 +++---- tests/geom/Makefile.am | 4 tests/geom/nsites.cc | 44 ++++ tests/set/Makefile.am | 6 tests/set/card.cc | 49 +++++ tests/set/inter.cc | 3 tests/set/sym_diff.cc | 6 tests/set/uni.cc | 2 tests/set/unique.cc | 50 +++++ 18 files changed, 667 insertions(+), 260 deletions(-) Index: mln/core/site_set/box.hh --- mln/core/site_set/box.hh (revision 3071) +++ mln/core/site_set/box.hh (working copy) @@ -174,7 +174,6 @@ template <typename P> std::ostream& operator<<(std::ostream& ostr, const box<P>& b); - // Procedures /// Return the minimum box including box \p a and box \p b template <typename P> @@ -182,6 +181,8 @@ box<P> larger_than(const box<P> a, const box<P> b); + + # ifndef MLN_INCLUDE_ONLY template <typename P> Index: mln/core/site_set/operators.hh --- mln/core/site_set/operators.hh (revision 3071) +++ mln/core/site_set/operators.hh (working copy) @@ -36,7 +36,9 @@ /// \todo Re-vamp this file now! +# include <algorithm> # include <mln/core/concept/site_set.hh> +# include <mln/set/card.hh> # include <mln/util/yes.hh> // Temporary include. @@ -45,10 +47,12 @@ namespace mln { + template <typename E> struct Box; template <typename Sl, typename Sr> - Sl& operator+=(Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); + Sl& + operator+=(Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); /// Equality test between site sets \p lhs and \p rhs. @@ -59,7 +63,8 @@ /// \relates mln::Site_Set /// template <typename Sl, typename Sr> - bool operator==(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); + bool + operator==(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); @@ -71,7 +76,8 @@ /// \relates mln::Site_Set /// template <typename Sl, typename Sr> - bool operator<=(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); + bool + operator<=(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); @@ -84,7 +90,8 @@ /// \relates mln::Site_Set /// template <typename Sl, typename Sr> - bool operator<(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); + bool + operator<(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs); @@ -99,13 +106,314 @@ /// \relates mln::Site_Set /// template <typename S> - std::ostream& operator<<(std::ostream& ostr, const Site_Set<S>& set); + std::ostream& + operator<<(std::ostream& ostr, const Site_Set<S>& set); # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + template <typename Sl, typename Sr> + inline + std::set< mln_site(Sl), util::ord<mln_site(Sl)> > + sym_diff_std_set(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) + { + typedef mln_site(Sl) P; + mlc_converts_to(mln_psite(Sr), P)::check(); + std::set< P, util::ord<P> > sl, sr, sd; + convert::from_to(lhs, sl); + convert::from_to(rhs, sr); + std::set_symmetric_difference(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(sd, sd.begin()), + util::ord<P>()); + return sd; + } + + template <typename S> + inline + std::set< mln_site(S), util::ord<mln_site(S)> > + to_std_set(const Site_Set<S>& s) + { + std::set< mln_site(S), util::ord<mln_site(S)> > std_s; + convert::from_to(s, std_s); + return std_s; + } + + template <typename Sl, typename Sr> + inline + bool + leq_std_set(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) + { + typedef mln_site(Sl) P; + mlc_converts_to(mln_psite(Sr), P)::check(); + std::set< P, util::ord<P> > sl, sr; + convert::from_to(lhs, sl); + convert::from_to(rhs, sr); + return std::includes(sr.begin(), sr.end(), + sl.begin(), sl.end(), + util::ord<P>()); + } + + } // end of namespace mln::internal + + + namespace impl + { + + // Implementations for "operator ==" between site sets. + + template <typename Bl, typename Br> + inline + bool + operator_equal_boxes(const Box<Bl>& lhs_, const Box<Br>& rhs_) + { + const Bl& lhs = exact(lhs_); + const Br& rhs = exact(rhs_); + if (lhs.is_empty() != rhs.is_empty()) + return false; + if (lhs.is_empty() && rhs.is_empty()) + return true; + return lhs.pmin() == rhs.pmin() && lhs.pmax() == rhs.pmax(); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_uniques(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + if (set::card(lhs) != set::card(rhs)) + return false; + return mln::internal::sym_diff_std_set(lhs, rhs).empty(); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_unique_multiple(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + if (set::card(lhs) != set::card(rhs)) + return false; + return mln::internal::to_std_set(lhs) == mln::internal::to_std_set(rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_multiples(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + // FIXME: Approximate code... + if (set::card(lhs) != set::card(rhs)) + return false; + return mln::internal::to_std_set(lhs) == mln::internal::to_std_set(rhs); + } + + + // Implementations for "operator <" between site sets. + + template <typename Bl, typename Br> + inline + bool + operator_less_boxes(const Box<Bl>& lhs_, const Box<Br>& rhs_) + { + const Bl& lhs = exact(lhs_); + const Br& rhs = exact(rhs_); + if (rhs.is_empty()) + return false; // We cannot have "lhs < empty_set". + // From this line, rhs is not empty. + if (lhs.is_empty()) + return true; // We have "empty set < a non empty set". + // From here, both lhs and rhs are not empty. + if (set::card(lhs) >= set::card(rhs)) + return false; + return lhs.crop_wrt(rhs) == lhs; + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_uniques(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + if (set::card(lhs) >= set::card(rhs)) + return false; + return mln::internal::leq_std_set(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_unique_multiple(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + if (set::card(lhs) >= set::card(rhs)) + return false; + return mln::internal::leq_std_set(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_multiples(const Site_Set<Sl>& lhs, + const Site_Set<Sr>& rhs) + { + // FIXME: Approximate code... + if (set::card(lhs) >= set::card(rhs)) + return false; + return mln::internal::leq_std_set(lhs, rhs); + } + + } // end of namespace mln::impl + + + + + namespace internal + { + + // Dispatch for "operator ==" between site sets. + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(trait::site_set::arity::unique, + const Box<Sl>& lhs, + trait::site_set::arity::unique, + const Box<Sr>& rhs) + { + return impl::operator_equal_boxes(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(trait::site_set::arity::unique, + const Site_Set<Sl>& lhs, + trait::site_set::arity::unique, + const Site_Set<Sr>& rhs) + { + return impl::operator_equal_uniques(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(trait::site_set::arity::unique, + const Site_Set<Sl>& lhs, + trait::site_set::arity::multiple, + const Site_Set<Sr>& rhs) + { + return impl::operator_equal_unique_multiple(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(trait::site_set::arity::multiple, + const Site_Set<Sl>& lhs, + trait::site_set::arity::unique, + const Site_Set<Sr>& rhs) + { + return impl::operator_equal_unique_multiple(rhs, lhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(trait::site_set::arity::multiple, + const Site_Set<Sl>& lhs, + trait::site_set::arity::multiple, + const Site_Set<Sr>& rhs) + { + return impl::operator_equal_multiples(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_equal_dispatch(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) + { + return operator_equal_dispatch(mln_trait_site_set_arity(Sl)(), exact(lhs), + mln_trait_site_set_arity(Sr)(), exact(rhs)); + } + + + // Dispatch for "operator <" between site sets. + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(trait::site_set::arity::unique, + const Box<Sl>& lhs, + trait::site_set::arity::unique, + const Box<Sr>& rhs) + { + return impl::operator_less_boxes(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(trait::site_set::arity::unique, + const Site_Set<Sl>& lhs, + trait::site_set::arity::unique, + const Site_Set<Sr>& rhs) + { + return impl::operator_less_uniques(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(trait::site_set::arity::unique, + const Site_Set<Sl>& lhs, + trait::site_set::arity::multiple, + const Site_Set<Sr>& rhs) + { + return impl::operator_less_unique_multiple(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(trait::site_set::arity::multiple, + const Site_Set<Sl>& lhs, + trait::site_set::arity::unique, + const Site_Set<Sr>& rhs) + { + return impl::operator_less_unique_multiple(rhs, lhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(trait::site_set::arity::multiple, + const Site_Set<Sl>& lhs, + trait::site_set::arity::multiple, + const Site_Set<Sr>& rhs) + { + return impl::operator_less_multiples(lhs, rhs); + } + + template <typename Sl, typename Sr> + inline + bool + operator_less_dispatch(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) + { + return operator_less_dispatch(mln_trait_site_set_arity(Sl)(), exact(lhs), + mln_trait_site_set_arity(Sr)(), exact(rhs)); + } + + } // end of namespace mln::internal + + // Operator +=. template <typename Sl, typename Sr> @@ -129,60 +437,36 @@ template <typename Sl, typename Sr> inline bool - operator==(const Site_Set<Sl>&, const Site_Set<Sr>&) + operator==(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) { -// // FIXME: Same grid! -// const Sl& lhs = exact(lhs_); -// const Sr& rhs = exact(rhs_); - -// // exhaustive test: -// mln_fwd_piter(Sl) pl(lhs); -// mln_fwd_piter(Sr) pr(rhs); -// for (pl.start(), pr.start(); -// pl.is_valid() && pr.is_valid(); -// pl.next(), pr.next()) -// if (pl != pr) -// return false; // difference found - -// // both sets are equal only if both browsings are completed -// // at the same time: -// return ! pl.is_valid() && ! pr.is_valid(); - return util::yes(true); + mlc_equal(mln_site(Sl), mln_site(Sr))::check(); + return internal::operator_equal_dispatch(lhs, rhs); } - // Operator <=. + // Operator <. template <typename Sl, typename Sr> inline bool - operator<=(const Site_Set<Sl>&, const Site_Set<Sr>&) + operator<(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) { -// // FIXME: Same grid! -// const Sl& lhs = exact(lhs_); -// const Sr& rhs = exact(rhs_); - -// // exhaustive test: -// mln_piter(Sl) pl(lhs); -// for_all(pl) -// if (! rhs.has(pl)) -// return false; - return util::yes(true); + mlc_equal(mln_site(Sl), mln_site(Sr))::check(); + return internal::operator_less_dispatch(lhs, rhs); } - // Operator <. + // Operator <=. template <typename Sl, typename Sr> inline bool - operator<(const Site_Set<Sl>&, const Site_Set<Sr>&) + operator<=(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) { -// // FIXME: Same grid! -// const Sl& lhs = exact(lhs_); -// const Sr& rhs = exact(rhs_); -// return lhs <= rhs && lhs != rhs; - return util::yes(true); + mlc_equal(mln_site(Sl), mln_site(Sr))::check(); + if (set::card(lhs) > set::card(rhs)) + return false; + return lhs < rhs || lhs == rhs; } Index: mln/core/concept/box.hh --- mln/core/concept/box.hh (revision 3071) +++ mln/core/concept/box.hh (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_CORE_CONCEPT_BOX_HH # define MLN_CORE_CONCEPT_BOX_HH -/*! \file mln/core/concept/box.hh - * - * \brief Definition of the concept of mln::Box. - */ +/// \file mln/core/concept/box.hh +/// +/// Definition of the concept of mln::Box. # include <mln/core/concept/site_set.hh> @@ -84,23 +84,15 @@ */ unsigned nsites() const; + /// Test if this box is empty. + bool is_empty() const; + protected: Box(); }; - /*! \brief Equality test between boxes \p lhs and \p rhs. - * - * \param[in] lhs A box. - * \param[in] rhs Another box. - * - * \relates mln::Box - */ - template <typename Bl, typename Br> - bool operator==(const Box<Bl>& lhs, const Box<Br>& rhs); - - /*! \brief Inclusion test between boxes \p lhs and \p rhs. * @@ -141,7 +133,10 @@ inline unsigned Box<E>::len(unsigned i) const { - return 1 + exact(this)->pmax()[i] - exact(this)->pmin()[i]; + return + exact(this)->is_valid() + ? 1 + exact(this)->pmax()[i] - exact(this)->pmin()[i] + : 0u; } template <typename E> @@ -169,19 +164,18 @@ return count; } - - // Operators. - - template <typename Bl, typename Br> + template <typename E> inline - bool operator==(const Box<Bl>& lhs_, const Box<Br>& rhs_) + bool + Box<E>::is_empty() const { - // FIXME: Same grid! - const Bl& lhs = exact(lhs_); - const Br& rhs = exact(rhs_); - return lhs.pmin() == rhs.pmin() && lhs.pmax() == rhs.pmax(); + // A non-valid box is empty. + return ! exact(this)->is_valid(); } + + // Operators. + template <typename Bl, typename Br> inline bool operator<=(const Box<Bl>& lhs_, const Box<Br>& rhs_) Index: mln/core/concept/site_set.hh --- mln/core/concept/site_set.hh (revision 3071) +++ mln/core/concept/site_set.hh (working copy) @@ -128,6 +128,7 @@ # ifndef MLN_INCLUDE_ONLY + namespace convert { Index: mln/geom/nsites.hh --- mln/geom/nsites.hh (revision 3071) +++ mln/geom/nsites.hh (working copy) @@ -29,10 +29,11 @@ # define MLN_GEOM_NSITES_HH /// \file mln/geom/nsites.hh +/// /// Compute the number of sites of an image or a site set. -# include <mln/core/concept/site_set.hh> # include <mln/core/concept/image.hh> +# include <mln/set/card.hh> namespace mln @@ -41,10 +42,6 @@ namespace geom { - /// Compute the number of sites of the site set \p input. - template <typename S> - unsigned nsites(const Site_Set<S>& s); - /// Compute the number of sites of the image \p input. template <typename I> unsigned nsites(const Image<I>& input); @@ -52,102 +49,6 @@ # ifndef MLN_INCLUDE_ONLY - - // Implementations. - - namespace impl - { - - // Generic version. - - namespace generic - { - - template <typename S> - unsigned nsites(const Site_Set<S>& s_) - { - trace::entering("geom::impl::generic::nsites"); - const S& s = exact(s_); - mln_precondition(s.is_valid()); - - unsigned n = 0; - mln_piter(S) p(s); - for_all(p) - ++n; - - trace::exiting("geom::impl::generic::nsites"); - return n; - } - - } // end of namespace mln::geom::impl::generic - - - // A single specialization. - - template <typename S> - inline - unsigned nsites_method(const Site_Set<S>& s) - { - trace::entering("geom::impl::nsites_method"); - unsigned n = exact(s).nsites(); - trace::exiting("geom::impl::nsites_method"); - return n; - } - - } // end of namespace mln::geom::impl - - - - // Dispatch. - - namespace internal - { - - template <typename S> - inline - unsigned nsites_dispatch(mln::trait::site_set::nsites::any, - const Site_Set<S>& s) - { - return impl::generic::nsites(s); - } - - template <typename S> - inline - unsigned nsites_dispatch(mln::trait::site_set::nsites::known, - const Site_Set<S>& s) - { - return impl::nsites_method(s); - } - - // Dispatch facade. - - template <typename S> - inline - unsigned nsites_dispatch(const Site_Set<S>& s) - { - return nsites_dispatch(mln_trait_site_set_nsites(S)(), - s); - } - - } // end of namespace mln::geom::internal - - - - // Facades. - - template <typename S> - inline - unsigned nsites(const Site_Set<S>& s) - { - trace::entering("geom::nsites"); - mln_precondition(exact(s).is_valid()); - - unsigned n = internal::nsites_dispatch(s); - - trace::exiting("geom::nsites"); - return n; - } - template <typename I> inline unsigned nsites(const Image<I>& input_) @@ -158,8 +59,8 @@ mln_precondition(input.has_data()); mln_precondition(input.domain().is_valid()); - // Relies on the nsites routines on a site set. - unsigned n = internal::nsites_dispatch(input.domain()); + // Relies on the card routine on a site set. + unsigned n = mln::set::internal::card_dispatch(input.domain()); trace::exiting("geom::nsites"); return n; Index: mln/set/unique.hh --- mln/set/unique.hh (revision 0) +++ mln/set/unique.hh (revision 0) @@ -0,0 +1,84 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_SET_UNIQUE_HH +# define MLN_SET_UNIQUE_HH + +/// \file mln/set/unique.hh +/// +/// Give the unique set. + +# include <algorithm> +# include <iterator> + +# include <mln/core/site_set/p_set.hh> +# include <mln/convert/from_to.hh> +# include <mln/util/ord.hh> + + +namespace mln +{ + + namespace set + { + + /// Give the unique set of \p s. + /// + /// \relates mln::Site_Set + /// + template <typename S> + p_set<mln_site(S)> + unique(const Site_Set<S>& s); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename S> + inline + p_set<mln_site(S)> + unique(const Site_Set<S>& s) + { + trace::entering("set::unique"); + + typedef mln_site(S) P; + std::set< P, util::ord<P> > s_; + convert::from_to(s, s_); + p_set<P> su; + convert::from_to(s_, su); + + trace::exiting("set::unique"); + return su; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::set + +} // end of namespace mln + + +#endif // ! MLN_SET_UNIQUE_HH Index: mln/set/all.hh --- mln/set/all.hh (revision 3071) +++ mln/set/all.hh (working copy) @@ -32,7 +32,8 @@ /// \file mln/set/all.hh /// /// File that includes all set-related routines. - +/// +/// \todo Move geom::sites here (set::nsites). namespace mln { @@ -43,6 +44,7 @@ } +# include <mln/set/card.hh> # include <mln/set/compute.hh> # include <mln/set/diff.hh> # include <mln/set/inter.hh> @@ -50,6 +52,7 @@ # include <mln/set/has.hh> # include <mln/set/sym_diff.hh> # include <mln/set/uni.hh> +# include <mln/set/unique.hh> #endif // ! MLN_SET_ALL_HH Index: mln/set/card.hh --- mln/set/card.hh (revision 3064) +++ mln/set/card.hh (working copy) @@ -25,29 +25,25 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_GEOM_NSITES_HH -# define MLN_GEOM_NSITES_HH +#ifndef MLN_SET_CARD_HH +# define MLN_SET_CARD_HH -/// \file mln/geom/nsites.hh -/// Compute the number of sites of an image or a site set. +/// \file mln/set/card.hh +/// +/// Compute the cardinality of a site set. # include <mln/core/concept/site_set.hh> -# include <mln/core/concept/image.hh> namespace mln { - namespace geom + namespace set { - /// Compute the number of sites of the site set \p input. + /// Compute the cardinality of the site set \p s. template <typename S> - unsigned nsites(const Site_Set<S>& s); - - /// Compute the number of sites of the image \p input. - template <typename I> - unsigned nsites(const Image<I>& input); + unsigned card(const Site_Set<S>& s); # ifndef MLN_INCLUDE_ONLY @@ -64,9 +60,9 @@ { template <typename S> - unsigned nsites(const Site_Set<S>& s_) + unsigned card(const Site_Set<S>& s_) { - trace::entering("geom::impl::generic::nsites"); + trace::entering("set::impl::generic::card"); const S& s = exact(s_); mln_precondition(s.is_valid()); @@ -75,26 +71,26 @@ for_all(p) ++n; - trace::exiting("geom::impl::generic::nsites"); + trace::exiting("set::impl::generic::card"); return n; } - } // end of namespace mln::geom::impl::generic + } // end of namespace mln::set::impl::generic // A single specialization. template <typename S> inline - unsigned nsites_method(const Site_Set<S>& s) + unsigned card_from_method(const Site_Set<S>& s) { - trace::entering("geom::impl::nsites_method"); + trace::entering("set::impl::card_from_method"); unsigned n = exact(s).nsites(); - trace::exiting("geom::impl::nsites_method"); + trace::exiting("set::impl::card_from_method"); return n; } - } // end of namespace mln::geom::impl + } // end of namespace mln::set::impl @@ -105,71 +101,54 @@ template <typename S> inline - unsigned nsites_dispatch(mln::trait::site_set::nsites::any, + unsigned card_dispatch(mln::trait::site_set::nsites::any, const Site_Set<S>& s) { - return impl::generic::nsites(s); + return impl::generic::card(s); } template <typename S> inline - unsigned nsites_dispatch(mln::trait::site_set::nsites::known, + unsigned card_dispatch(mln::trait::site_set::nsites::known, const Site_Set<S>& s) { - return impl::nsites_method(s); + return impl::card_from_method(s); } // Dispatch facade. template <typename S> inline - unsigned nsites_dispatch(const Site_Set<S>& s) + unsigned card_dispatch(const Site_Set<S>& s) { - return nsites_dispatch(mln_trait_site_set_nsites(S)(), + return card_dispatch(mln_trait_site_set_nsites(S)(), s); } - } // end of namespace mln::geom::internal + } // end of namespace mln::set::internal - // Facades. + // Facade. template <typename S> inline - unsigned nsites(const Site_Set<S>& s) + unsigned card(const Site_Set<S>& s) { - trace::entering("geom::nsites"); + trace::entering("set::card"); mln_precondition(exact(s).is_valid()); - unsigned n = internal::nsites_dispatch(s); - - trace::exiting("geom::nsites"); - return n; - } - - template <typename I> - inline - unsigned nsites(const Image<I>& input_) - { - trace::entering("geom::nsites"); - const I& input = exact(input_); - - mln_precondition(input.has_data()); - mln_precondition(input.domain().is_valid()); - - // Relies on the nsites routines on a site set. - unsigned n = internal::nsites_dispatch(input.domain()); + unsigned n = internal::card_dispatch(s); - trace::exiting("geom::nsites"); + trace::exiting("set::card"); return n; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::geom + } // end of namespace mln::set } // end of namespace mln -#endif // ! MLN_GEOM_NSITES_HH +#endif // ! MLN_SET_CARD_HH Property changes on: mln/set/card.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/set/sym_diff.hh --- mln/set/sym_diff.hh (revision 3071) +++ mln/set/sym_diff.hh (working copy) @@ -45,6 +45,9 @@ namespace mln { + template <typename P> class p_set; + + namespace set { Index: tests/core/site_set/operators.cc --- tests/core/site_set/operators.cc (revision 3071) +++ tests/core/site_set/operators.cc (working copy) @@ -31,42 +31,49 @@ /// Tests of operators on mln::Site_Set. #include <mln/core/site_set/p_set.hh> +#include <mln/core/routine/ops.hh> #include <mln/core/alias/point2d.hh> +#include <mln/core/alias/box2d.hh> int main() { using namespace mln; - p_set<point2d> pst1, pst2, pst3, pst4; - pst1.insert(point2d( 2, 7)); - pst1.insert(point2d( 2, 1)); - pst1.insert(point2d(-4, 0)); - pst1.insert(point2d( 0, 0)); - pst1.insert(point2d( 1, 1)); - pst1.insert(point2d( 6, 5)); - pst2.insert(point2d( 2, 7)); - pst2.insert(point2d(-2, 1)); - pst2.insert(point2d(-4, 0)); - pst2.insert(point2d( 1,-1)); - pst2.insert(point2d( 6, 5)); - pst3.insert(point2d( 2, 7)); - pst3.insert(point2d( 2, 1)); - pst3.insert(point2d(-4, 0)); - pst3.insert(point2d( 0, 0)); - pst3.insert(point2d( 1, 1)); - pst3.insert(point2d( 6, 5)); - pst3.insert(point2d(-2, 1)); - pst3.insert(point2d( 1,-1)); - - mln_assertion(pst1 <= pst3); - mln_assertion(pst2 <= pst3); - mln_assertion(pst3 <= pst3); - mln_assertion(pst4 <= pst1); - mln_assertion(pst4 <= pst2); - mln_assertion(pst4 <= pst3); - mln_assertion(pst4 <= pst4); + point2d a(0,0), b(1,1), c(2,2); -// mln_assertion(! (pst3 <= pst1)); -// mln_assertion(! (pst3 <= pst2)); + { + p_set<point2d> s1, s2; + s1.insert(a); + s2.insert(b); + mln_assertion(s1 != s2); + mln_assertion(! (s1 == s2)); + mln_assertion(! (s1 < s2)); + mln_assertion(! (s1 <= s2)); + mln_assertion(! (s1 > s2)); + mln_assertion(! (s1 >= s2)); + } + + { + p_set<point2d> s1, s2; + s1.insert(a); + s2.insert(b); + s2.insert(a); + mln_assertion(s1 != s2); + mln_assertion(s1 < s2); + mln_assertion(s1 <= s2); + mln_assertion(s2 > s1); + mln_assertion(! (s1 == s2)); + mln_assertion(! (s1 > s2)); + mln_assertion(! (s1 >= s2)); + } + + { + box2d + b1 = make::box2d(0,0, 1,1), + b2 = make::box2d(0,0, 1,2); + mln_assertion(b1 < b2); + mln_assertion(! (b1 < b1)); + mln_assertion(! (b2 < b1)); + } } Index: tests/geom/nsites.cc --- tests/geom/nsites.cc (revision 0) +++ tests/geom/nsites.cc (revision 0) @@ -0,0 +1,44 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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/geom/nsites.cc +/// +/// Tests on mln::geom::nsites. + +#include <mln/core/image/image2d.hh> +#include <mln/geom/nsites.hh> + + +int main() +{ + using namespace mln; + + // trace::quiet = false; + image2d<int> ima(make::box2d(-1,-4, 2,6)); + mln_assertion(geom::nsites(ima) == ((2 - (-1) + 1) * (6 - (-4) + 1))); +} Index: tests/geom/Makefile.am --- tests/geom/Makefile.am (revision 3071) +++ tests/geom/Makefile.am (working copy) @@ -15,12 +15,14 @@ ncols \ ninds \ nrows \ +nsites \ nslis \ pmin_pmax \ resize \ seed2tiling \ seed2tiling_roundness + bbox_SOURCES = bbox.cc max_col_SOURCES = max_col.cc max_ind_SOURCES = max_ind.cc @@ -33,10 +35,12 @@ ncols_SOURCES = ncols.cc ninds_SOURCES = ninds.cc nrows_SOURCES = nrows.cc +nsites_SOURCES = nsites.cc nslis_SOURCES = nslis.cc pmin_pmax_SOURCES = pmin_pmax.cc resize_SOURCES = resize.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc + TESTS = $(check_PROGRAMS) Index: tests/set/uni.cc --- tests/set/uni.cc (revision 3071) +++ tests/set/uni.cc (working copy) @@ -31,7 +31,7 @@ /// Tests on mln::set::uni. #include <mln/set/uni.hh> -#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/point2d.hh> int main() Index: tests/set/sym_diff.cc --- tests/set/sym_diff.cc (revision 3071) +++ tests/set/sym_diff.cc (working copy) @@ -31,7 +31,7 @@ /// Tests on mln::set::sym_diff. #include <mln/set/sym_diff.hh> -#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/alias/point2d.hh> int main() @@ -56,9 +56,9 @@ mln_assertion(pst3.has(point2d( 2, 1))); mln_assertion(pst3.has(point2d( 0, 0))); mln_assertion(pst3.has(point2d( 1, 1))); - mln_assertion(!pst3.has(point2d( 2, 7))); mln_assertion(pst3.has(point2d(-2, 1))); - mln_assertion(!pst3.has(point2d(-4, 0))); mln_assertion(pst3.has(point2d( 1,-1))); + mln_assertion(! pst3.has(point2d( 2, 7))); + mln_assertion(! pst3.has(point2d(-4, 0))); mln_assertion(!pst3.has(point2d( 6, 5))); } Index: tests/set/inter.cc --- tests/set/inter.cc (revision 3071) +++ tests/set/inter.cc (working copy) @@ -31,8 +31,7 @@ /// Tests on mln::set::inter. #include <mln/set/inter.hh> -#include <mln/core/alias/dpoint2d.hh> -#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/point2d.hh> int main() Index: tests/set/Makefile.am --- tests/set/Makefile.am (revision 3071) +++ tests/set/Makefile.am (working copy) @@ -3,16 +3,20 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + card \ compute \ diff \ inter \ sym_diff \ - uni + uni \ + unique +card_SOURCES = card.cc compute_SOURCES = compute.cc diff_SOURCES = diff.cc inter_SOURCES = inter.cc sym_diff_SOURCES = sym_diff.cc uni_SOURCES = uni.cc +unique_SOURCES = unique.cc TESTS = $(check_PROGRAMS) Index: tests/set/unique.cc --- tests/set/unique.cc (revision 0) +++ tests/set/unique.cc (revision 0) @@ -0,0 +1,50 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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/set/unique.cc +/// +/// Tests on mln::set::unique. + +#include <mln/set/unique.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/core/alias/point2d.hh> + + +int main() +{ + using namespace mln; + + p_array<point2d> a; + a.insert(point2d(1, 1)); + a.insert(point2d(0, 0)); + a.insert(point2d(0, 0)); + a.insert(point2d(1, 1)); + a.insert(point2d(1, 1)); + mln_assertion(a.nsites() == 5); + mln_assertion(set::unique(a).nsites() == 2); +} Index: tests/set/card.cc --- tests/set/card.cc (revision 0) +++ tests/set/card.cc (revision 0) @@ -0,0 +1,49 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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/set/card.cc +/// +/// Tests on mln::set::card. + +#include <mln/core/site_set/p_array.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/set/card.hh> + + +int main() +{ + using namespace mln; + + p_array<point2d> a; + a.insert(point2d(1, 1)); + a.insert(point2d(0, 0)); + a.insert(point2d(0, 0)); + a.insert(point2d(1, 1)); + a.insert(point2d(1, 1)); + mln_assertion(set::card(a) == a.nsites()); +}

1 0

3071: Enable the generation of version.hh.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* configure.ac: set the proper variables. * Makefile.am: add doc target. --- ChangeLog | 8 ++++++++ Makefile.am | 4 ++++ configure.ac | 13 ++++++++++++- 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8613740..25aeb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Enable the generation of version.hh. + + * configure.ac: set the proper variables. + + * Makefile.am: add doc target. + 2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing INSTALL and README. diff --git a/Makefile.am b/Makefile.am index 161918a..175def0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,10 @@ ACLOCAL_AMFLAGS = -I build-aux SUBDIRS = build-aux external milena +.PHONY: doc +doc: + $(MAKE) -C milena doc + if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA diff --git a/configure.ac b/configure.ac index ee54879..1d5ca57 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,18 @@ AC_CONFIG_FILES([build-aux/Makefile]) # Automake. AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 nostdinc -Wall]) -AC_CONFIG_HEADERS([config.h] [milena/mln/version.hh]) +AC_CONFIG_HEADERS([config.h:config.hin] [milena/mln/version.hh]) + +# Misc. variables. +AC_DEFINE_UNQUOTED([MLN_PACKAGE_NAME], ["$PACKAGE_NAME"], + [Package Full name.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], + [Bug report address.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_STRING], ["$PACKAGE_STRING"], + [Full name and version.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], + [Package Version.]) + ## --------------------- ## ## C++ compiler set up. ## -- 1.5.6.5

1 0

3070: Add version.hh.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* headers.mk, * generate_dist_headers.sh: make version.hh part of the distribution. * mln/version.hh.in: base file used by autotools to generate version.hh. --- milena/ChangeLog | 16 +++++++++++++--- milena/generate_dist_headers.sh | 3 ++- milena/headers.mk | 1 + milena/mln/version.hh.in | 11 +++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 milena/mln/version.hh.in diff --git a/milena/ChangeLog b/milena/ChangeLog index dcf963a..19ae6b7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,14 +1,24 @@ 2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Add version.hh. + + * headers.mk, + * generate_dist_headers.sh: make version.hh part of the distribution. + + * mln/version.hh.in: base file used by autotools to generate + version.hh. + +2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Make the doc part of the distribution. * doc/Doxyfile.in: make the user doc lighter. * doc/Makefile.am: add the doc as extra dist. - * mln/core/internal/graph_window_base.hh - * mln/core/site_set/box.hh - * mln/core/site_set/p_complex.hh + * mln/core/internal/graph_window_base.hh, + * mln/core/site_set/box.hh, + * mln/core/site_set/p_complex.hh, * tests/morpho/complex_image_wst.cc, * tests/morpho/tree/data.cc, * trash/display_color_pretty.cc, diff --git a/milena/generate_dist_headers.sh b/milena/generate_dist_headers.sh index bb5bb30..7b9fb6a 100755 --- a/milena/generate_dist_headers.sh +++ b/milena/generate_dist_headers.sh @@ -7,9 +7,10 @@ echo "## Generated by ./generate_dist_headers, do not modify ##" > headers.mk echo "" >> headers.mk echo "nobase_include_HEADERS = \\" >> headers.mk +echo "mln/version.hh \\" >> headers.mk echo "generating headers.mk" -find mln -type f | grep -v "\.svn" | sed -e 's/$/ \\/g' >> headers.mk +find mln -type f | grep -v "\.svn" | sed -e 's/$/ \\/g' | grep -v "version.hh.in" >> headers.mk last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line sed '$d' < headers.mk > headers.mk.tmp # remove last line diff --git a/milena/headers.mk b/milena/headers.mk index 895ce0e..39fb190 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -1,6 +1,7 @@ ## Generated by ./generate_dist_headers, do not modify ## nobase_include_HEADERS = \ +mln/version.hh \ mln/histo/all.hh \ mln/histo/data.hh \ mln/histo/compute.hh \ diff --git a/milena/mln/version.hh.in b/milena/mln/version.hh.in new file mode 100644 index 0000000..1b0cf19 --- /dev/null +++ b/milena/mln/version.hh.in @@ -0,0 +1,11 @@ +/** The address where bug reports should be sent. */ +#undef MLN_PACKAGE_BUGREPORT + +/** The full name of this package. */ +#undef MLN_PACKAGE_NAME + +/** The full name and version of this package. */ +#undef MLN_PACKAGE_STRING + +/** The version of this package. */ +#undef MLN_PACKAGE_VERSION -- 1.5.6.5

1 0

3069: Make the doc part of the distribution.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* doc/Doxyfile.in: make the user doc lighter. * doc/Makefile.am: add the doc as extra dist. * mln/core/internal/graph_window_base.hh * mln/core/site_set/box.hh * mln/core/site_set/p_complex.hh * tests/morpho/complex_image_wst.cc, * tests/morpho/tree/data.cc, * trash/display_color_pretty.cc, * doc/benchmark/canvas.cc, * doc/examples/erosion.cc: fix doxygen warnings. * doc/tutorial/samples/Makefile.am: do not install sample programs. * mln/fun/l2l/relabel.hh: fix wrong guards. --- milena/ChangeLog | 21 +++++++++++++++++++ milena/doc/Doxyfile.in | 27 +++++++++++++----------- milena/doc/Makefile.am | 7 +++-- milena/doc/benchmark/canvas.cc | 2 +- milena/doc/examples/erosion.cc | 2 +- milena/doc/tutorial/samples/Makefile.am | 6 ++-- milena/mln/core/internal/graph_window_base.hh | 2 +- milena/mln/core/site_set/box.hh | 2 +- milena/mln/core/site_set/p_complex.hh | 14 +++++++----- milena/mln/fun/l2l/relabel.hh | 8 +++--- milena/tests/morpho/complex_image_wst.cc | 2 +- milena/tests/morpho/tree/data.cc | 4 +- milena/trash/display_color_pretty.cc | 7 ++--- 13 files changed, 65 insertions(+), 39 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 35b9b75..dcf963a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,24 @@ +2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make the doc part of the distribution. + + * doc/Doxyfile.in: make the user doc lighter. + + * doc/Makefile.am: add the doc as extra dist. + + * mln/core/internal/graph_window_base.hh + * mln/core/site_set/box.hh + * mln/core/site_set/p_complex.hh + * tests/morpho/complex_image_wst.cc, + * tests/morpho/tree/data.cc, + * trash/display_color_pretty.cc, + * doc/benchmark/canvas.cc, + * doc/examples/erosion.cc: fix doxygen warnings. + + * doc/tutorial/samples/Makefile.am: do not install sample programs. + + * mln/fun/l2l/relabel.hh: fix wrong guards. + 2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> Make the tutorial part of the distribution. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 64fd5b8..6209339 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -28,6 +28,7 @@ ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO BUILTIN_STL_SUPPORT = YES +IDL_PROPERTY_SUPPORT = NO DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES #--------------------------------------------------------------------------- @@ -48,16 +49,18 @@ HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO +SORT_BRIEF_DOCS = YES +SORT_BY_SCOPE_NAME = YES GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = YES +SHOW_USED_FILES = NO # Disabled for light doc +SHOW_DIRECTORIES = NO # Disabled for light doc +SHOW_FILES = NO # Disabled for light doc +SHOW_NAMESPACES = YES FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages @@ -84,7 +87,7 @@ EXCLUDE = @top_srcdir@/milena/sandbox \ @top_srcdir@/milena/doc/tutorial/samples EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = EXAMPLE_PATH = @top_srcdir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/outputs \ @@ -105,7 +108,7 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES +REFERENCES_LINK_SOURCE = NO USE_HTAGS = NO VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- @@ -300,23 +303,23 @@ CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES +COLLABORATION_GRAPH = NO # Disabled for light doc +GROUP_GRAPHS = NO # Disabled for light doc UML_LOOK = NO TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES +INCLUDE_GRAPH = NO # Disabled for light doc +INCLUDED_BY_GRAPH = NO # Disabled for light doc CALL_GRAPH = NO CALLER_GRAPH = NO GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES +DIRECTORY_GRAPH = NO # Disabled for light doc DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES +GENERATE_LEGEND = NO # Disabled for light doc DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 39b52fd..aa1b30c 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -51,12 +51,13 @@ edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' \ - -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal*,g' + -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g' -EXTRA_DIST = \ -Doxyfile.in +EXTRA_DIST = \ +Doxyfile.in \ +$(top_builddir)/milena/doc/user CLEANFILES = \ Doxyfile_complete \ diff --git a/milena/doc/benchmark/canvas.cc b/milena/doc/benchmark/canvas.cc index 5b6b294..b40a6c3 100644 --- a/milena/doc/benchmark/canvas.cc +++ b/milena/doc/benchmark/canvas.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file doc/bench/canvas.cc +/// \file doc/benchmark/canvas.cc /// /// Test on mln::labeling::level. diff --git a/milena/doc/examples/erosion.cc b/milena/doc/examples/erosion.cc index b11d574..8d0d51c 100644 --- a/milena/doc/examples/erosion.cc +++ b/milena/doc/examples/erosion.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file doc/examples/my_test.cc +/// \file doc/examples/erosion.cc /// /// Test on mln::morpho::hit_or_miss. diff --git a/milena/doc/tutorial/samples/Makefile.am b/milena/doc/tutorial/samples/Makefile.am index 6e61992..c15db7c 100644 --- a/milena/doc/tutorial/samples/Makefile.am +++ b/milena/doc/tutorial/samples/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/milena/doc/doc.mk -bin_PROGRAMS = \ +noinst_PROGRAMS = \ accu-right-instanciation \ borderthickness \ box2d-bbox \ @@ -44,7 +44,7 @@ bin_PROGRAMS = \ win-create-1 \ win-create-2 -bin_PROGRAMS += \ +noinst_PROGRAMS += \ tuto1_first_image accu_right_instanciation_SOURCES = accu-right-instanciation.cc @@ -96,7 +96,7 @@ all: clean-figures run-samples: all @failcom='exit 1'; \ - list='$(bin_PROGRAMS)'; for bin in $$list; do \ + list='$(noinst_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ ./$$bin > $(OUTPUTS_BUILDDIR)/$$bin.txt || eval $$failcom; \ done diff --git a/milena/mln/core/internal/graph_window_base.hh b/milena/mln/core/internal/graph_window_base.hh index d2ecfd5..a72472c 100644 --- a/milena/mln/core/internal/graph_window_base.hh +++ b/milena/mln/core/internal/graph_window_base.hh @@ -30,7 +30,7 @@ # include <mln/core/concept/window.hh> -/// \file mln/internal/graph_window_base.hh +/// \file mln/core/internal/graph_window_base.hh /// /// FIXME: doc diff --git a/milena/mln/core/site_set/box.hh b/milena/mln/core/site_set/box.hh index 93973fe..469655c 100644 --- a/milena/mln/core/site_set/box.hh +++ b/milena/mln/core/site_set/box.hh @@ -176,7 +176,7 @@ namespace mln // Procedures - /// Return the minimum box including box \p a and box \b + /// Return the minimum box including box \p a and box \p b template <typename P> inline box<P> diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 3fcb7da..f071f6a 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -29,7 +29,8 @@ # define MLN_CORE_SITE_SET_P_COMPLEX_HH /// \file mln/core/site_set/p_complex.hh -/// \brief Definition of a point set based on a complex. +/// +/// Definition of a point set based on a complex. # include <mln/core/internal/site_set_base.hh> @@ -103,7 +104,7 @@ namespace mln /* FIXME: Aggregate site data (location). */ - /** \brief A complex psite set based on the N-faces of a complex + /** A complex psite set based on the N-faces of a complex of dimension \tparam D (a \p D-complex). \arg \p D The dimension of the complex. @@ -118,9 +119,10 @@ namespace mln typedef internal::site_set_base_< complex_psite<D, G>, self_ > super_; public: - /// \brief Construct a complex psite set from a complex. + /// Construct a complex psite set from a complex. /// /// \param cplx The complex upon which the complex psite set is built. + /// \param geom FIXME p_complex(const topo::complex<D>& cplx, const G& geom); /// Associated types. @@ -141,7 +143,7 @@ namespace mln typedef fwd_piter piter; /// \} - /// \brief Return The number of sites of the set, i.e., the number + /// Return The number of sites of the set, i.e., the number /// of \em faces. /// /// (Required by the mln::Site_Set concept, since the property @@ -201,7 +203,7 @@ namespace mln }; - /// \brief Comparison between two mln::p_complex's. + /// Comparison between two mln::p_complex's. /// /// Two mln::p_complex's are considered equal if they share the /// same complex. @@ -209,7 +211,7 @@ namespace mln bool operator==(const p_complex<D, G>& lhs, const p_complex<D, G>& rhs); - /// \brief Inclusion of a mln::p_complex in another one. + /// Inclusion of a mln::p_complex in another one. /// /// This inclusion relation is very strict for the moment, since our /// infrastrure for complexs is simple: a mln::p_complex is included diff --git a/milena/mln/fun/l2l/relabel.hh b/milena/mln/fun/l2l/relabel.hh index 8435e1e..6e8eb9b 100644 --- a/milena/mln/fun/l2l/relabel.hh +++ b/milena/mln/fun/l2l/relabel.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_L2L_ARRAY_HH -# define MLN_FUN_L2L_ARRAY_HH +#ifndef MLN_FUN_L2L_RELABEL_HH +# define MLN_FUN_L2L_RELABEL_HH -/// \file mln/fun/l2l/array.hh +/// \file mln/fun/l2l/relabel.hh /// /// Function mapping a label to a new one. /// \sa mln::labeling::relabel @@ -204,4 +204,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_FUN_L2L_ARRAY_HH +#endif // ! MLN_FUN_L2L_RELABEL_HH diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc index a1e7cf6..3d53982 100644 --- a/milena/tests/morpho/complex_image_wst.cc +++ b/milena/tests/morpho/complex_image_wst.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/complex_image_swt.cc +/// \file tests/morpho/complex_image_wst.cc /// /// Testing Meyer's Watershed Transform on mln::complex_image. diff --git a/milena/tests/morpho/tree/data.cc b/milena/tests/morpho/tree/data.cc index 6fccab0..e341423 100644 --- a/milena/tests/morpho/tree/data.cc +++ b/milena/tests/morpho/tree/data.cc @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/tree/parent.cc +/// \file tests/morpho/tree/data.cc /// -/// Tests on mln::morpho::tree::parent. +/// Tests on mln::morpho::tree::data. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> diff --git a/milena/trash/display_color_pretty.cc b/milena/trash/display_color_pretty.cc index b9de1ca..d41ee2a 100644 --- a/milena/trash/display_color_pretty.cc +++ b/milena/trash/display_color_pretty.cc @@ -25,10 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/display/color_pretty.cc - * - * \brief Tests on mln::display::color::pretty. - */ +/// \file tests/display/color_pretty.cc +/// +/// Tests on mln::display::color::pretty. # include <mln/core/image/image2d.hh> # include <mln/value/int_u8.hh> -- 1.5.6.5

1 0

3068: Make the tutorial part of the distribution.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* milena/Makefile.am: add target `tutorial'. * milena/doc/Doxyfile.in: Use short file names. * milena/doc/Makefile.am, * milena/doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. --- milena/ChangeLog | 11 ++ milena/Makefile.am | 5 +- milena/doc/Doxyfile.in | 4 +- milena/doc/Makefile.am | 18 ++- milena/doc/tutorial/Makefile.am | 268 ++++++++++++++++++++------------------- 5 files changed, 162 insertions(+), 144 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 43bf51d..35b9b75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Make the tutorial part of the distribution. + + * milena/Makefile.am: add target `tutorial'. + + * milena/doc/Doxyfile.in: Use short file names. + + * milena/doc/Makefile.am, + * milena/doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. + +2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix few tests. * doc/tutorial/tutorial.tex: add copyright and improve input code diff --git a/milena/Makefile.am b/milena/Makefile.am index 485c4bd..8e71f41 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -8,10 +8,13 @@ SUBDIRS = \ tools # apps -.PHONY: doc +.PHONY: doc tutorial doc: $(MAKE) -C doc doc +tutorial: + $(MAKE) -C doc tutorial + include $(top_srcdir)/milena/headers.mk EXTRA_DIST = \ diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index bc28c77..64fd5b8 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -13,11 +13,11 @@ REPEAT_BRIEF = YES ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO STRIP_FROM_PATH = @top_srcdir@/milena \ @top_builddir@/milena STRIP_FROM_INC_PATH = -SHORT_NAMES = NO +SHORT_NAMES = YES JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 91a9700..39b52fd 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -6,13 +6,13 @@ SUBDIRS = tutorial DOXYGEN = doxygen -.PHONY: doc user-doc complete-doc html_complete html_user tuto +.PHONY: doc user-doc complete-doc html_complete html_user tutorial -doc: complete-doc +doc: user-doc complete-doc: html_complete -user-doc: html_user tuto +user-doc: html_user html_complete: Doxyfile tuto_html $(DOXYGEN) Doxyfile_complete @@ -23,8 +23,8 @@ html_user: Doxyfile tuto_html tuto_html: $(MAKE) -C tutorial tuto_html -tuto: all - $(MAKE) -C tutorial tuto +tutorial: all + $(MAKE) -C tutorial tutorial fix-refdata: $(MAKE) -C tutorial fix-refdata @@ -55,10 +55,12 @@ edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY -EXTRA_DIST = Doxyfile.in +EXTRA_DIST = \ +Doxyfile.in -CLEANFILES = Doxyfile_complete \ - Doxyfile_user +CLEANFILES = \ +Doxyfile_complete \ +Doxyfile_user # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 1ce13a1..ba26fe4 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = samples -.PHONY: tuto tuto_html +.PHONY: tutorial tuto_html include $(top_srcdir)/milena/doc/doc.mk TEXINPUTS = $(TUTORIAL_SRCDIR):$(TUTORIAL_BUILDDIR):$(OUTPUTS_SRCDIR): -tuto: data fig-convert +tutorial: data fig-convert TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex @@ -36,146 +36,148 @@ clean-local: rm -f tutorial.pdf rm -f *.haux *.hh *.html *.htoc -EXTRA_DIST = tutorial.tex +EXTRA_DIST = \ +tutorial.tex \ +tutorial.pdf -EXTRA_DIST += \ -examples/cpp_issue.cc \ -examples/sub_image.cc \ -examples/sub_image_if.cc \ -examples/p_vaccess.cc \ -examples/win_multiple.cc \ -examples/image2d.cc \ -examples/image_plain.cc \ -examples/p_run.cc \ -examples/proxy.cc \ -examples/p_array.2.cc \ -examples/for_Z.cc \ -examples/image_if.cc \ -examples/p_key.cc \ -examples/p_mutable_array_of.cc \ -examples/p_queue.cc \ -examples/image_flat.cc \ -examples/p_image.cc \ -examples/box.cc \ -examples/p_line2d.cc \ -examples/p_array.cc \ -examples/accu.cc \ -examples/p_key.2.cc \ -examples/window.cc \ -examples/image_safe.cc \ +EXTRA_DIST += \ +examples/cpp_issue.cc \ +examples/sub_image.cc \ +examples/sub_image_if.cc \ +examples/p_vaccess.cc \ +examples/win_multiple.cc \ +examples/image2d.cc \ +examples/image_plain.cc \ +examples/p_run.cc \ +examples/proxy.cc \ +examples/p_array.2.cc \ +examples/for_Z.cc \ +examples/image_if.cc \ +examples/p_key.cc \ +examples/p_mutable_array_of.cc \ +examples/p_queue.cc \ +examples/image_flat.cc \ +examples/p_image.cc \ +examples/box.cc \ +examples/p_line2d.cc \ +examples/p_array.cc \ +examples/accu.cc \ +examples/p_key.2.cc \ +examples/window.cc \ +examples/image_safe.cc \ examples/vec.cc -EXTRA_DIST += \ -figures/ima2d-rot-2.ppm \ -figures/logical-not-2.pbm \ -figures/fill-subdomain-2.ppm \ -figures/labeling-compute-2.ppm \ -figures/ima2d-rot-1.ppm \ -figures/fill-subdomain-3.ppm \ -figures/logical-not-1.pbm \ -figures/ima_save.pbm \ +EXTRA_DIST += \ +figures/ima2d-rot-2.ppm \ +figures/logical-not-2.pbm \ +figures/fill-subdomain-2.ppm \ +figures/labeling-compute-2.ppm \ +figures/ima2d-rot-1.ppm \ +figures/fill-subdomain-3.ppm \ +figures/logical-not-1.pbm \ +figures/ima_save.pbm \ figures/fill-subimage-cfun-1.ppm \ -figures/fill-subdomain-4.ppm \ -figures/logical-not-3.pbm \ -figures/labeling-compute-1.pbm \ +figures/fill-subdomain-4.ppm \ +figures/logical-not-3.pbm \ +figures/labeling-compute-1.pbm \ figures/fill-subdomain-1.pbm -EXTRA_DIST += \ -outputs/win-create-1-display.txt \ -outputs/win-create-2.txt \ -outputs/accu-right-instanciation.txt \ -outputs/ima2d-1.txt \ -outputs/borderthickness.txt \ -outputs/ima-save.txt \ -outputs/fill-subimage-cfun.txt \ -outputs/labeling-compute.txt \ -outputs/parray-display-1.txt \ -outputs/fill-subdomain-shorter.txt \ -outputs/dpoint-1.txt \ -outputs/forall-piter.txt \ -outputs/predicate-1.txt \ -outputs/box2d-bbox.txt \ -outputs/graph-iter.txt \ -outputs/graph-output-1.txt \ -outputs/fill-call-1.txt \ -outputs/ima2d-rot.txt \ -outputs/paste-call-1.txt \ -outputs/fun-p2v-1.txt \ -outputs/estim-sites.txt \ -outputs/parray-append.txt \ -outputs/fill-subdomain.txt \ -outputs/ima-size.txt \ -outputs/logical-not.txt \ -outputs/ima2d-display-output-2.txt \ -outputs/ima2d-decl-2.txt \ -outputs/paste.txt \ -outputs/ima2d-6-clone.txt \ -outputs/ima2d-7.txt \ -outputs/parray-bbox.txt \ -outputs/domain-display.txt \ -outputs/ima2d-display-1.txt \ -outputs/win-create-1.txt \ -outputs/ima2d-display-2.txt \ -outputs/ima2d-display-output-1.txt \ -outputs/fill-part-image.txt \ -outputs/ima2d-3-output.txt \ -outputs/ima-has.txt \ -outputs/ima2d-5.txt \ -outputs/ima2d-4.txt \ -outputs/mln_var.txt \ -outputs/fill.txt \ -outputs/point-1.txt \ -outputs/extension-ignore.txt \ -outputs/graph-data.txt \ -outputs/ima2d-2.txt \ +EXTRA_DIST += \ +outputs/win-create-1-display.txt \ +outputs/win-create-2.txt \ +outputs/accu-right-instanciation.txt \ +outputs/ima2d-1.txt \ +outputs/borderthickness.txt \ +outputs/ima-save.txt \ +outputs/fill-subimage-cfun.txt \ +outputs/labeling-compute.txt \ +outputs/parray-display-1.txt \ +outputs/fill-subdomain-shorter.txt \ +outputs/dpoint-1.txt \ +outputs/forall-piter.txt \ +outputs/predicate-1.txt \ +outputs/box2d-bbox.txt \ +outputs/graph-iter.txt \ +outputs/graph-output-1.txt \ +outputs/fill-call-1.txt \ +outputs/ima2d-rot.txt \ +outputs/paste-call-1.txt \ +outputs/fun-p2v-1.txt \ +outputs/estim-sites.txt \ +outputs/parray-append.txt \ +outputs/fill-subdomain.txt \ +outputs/ima-size.txt \ +outputs/logical-not.txt \ +outputs/ima2d-display-output-2.txt \ +outputs/ima2d-decl-2.txt \ +outputs/paste.txt \ +outputs/ima2d-6-clone.txt \ +outputs/ima2d-7.txt \ +outputs/parray-bbox.txt \ +outputs/domain-display.txt \ +outputs/ima2d-display-1.txt \ +outputs/win-create-1.txt \ +outputs/ima2d-display-2.txt \ +outputs/ima2d-display-output-1.txt \ +outputs/fill-part-image.txt \ +outputs/ima2d-3-output.txt \ +outputs/ima-has.txt \ +outputs/ima2d-5.txt \ +outputs/ima2d-4.txt \ +outputs/mln_var.txt \ +outputs/fill.txt \ +outputs/point-1.txt \ +outputs/extension-ignore.txt \ +outputs/graph-data.txt \ +outputs/ima2d-2.txt \ outputs/ima2d-3.txt -EXTRA_DIST += \ -samples/paste-call-1.cc \ -samples/dpoint-1.cc \ -samples/parray-append.cc \ -samples/ima-load.cc.raw \ -samples/ima2d-restricted-1.cc.raw \ -samples/graph-iter.cc \ -samples/labeling-compute.cc \ -samples/ima2d-7.cc \ -samples/ima2d-restricted-2.cc.raw \ -samples/fill-subimage-cfun.cc \ -samples/ima-save.cc \ -samples/point-1.cc \ -samples/box2d-bbox.cc \ -samples/forall-piter.cc \ -samples/ima-size.cc \ -samples/borderthickness.cc \ -samples/Makefile.in \ -samples/ima-has.cc \ -samples/win-create-1.cc \ +EXTRA_DIST += \ +samples/paste-call-1.cc \ +samples/dpoint-1.cc \ +samples/parray-append.cc \ +samples/ima-load.cc.raw \ +samples/ima2d-restricted-1.cc.raw \ +samples/graph-iter.cc \ +samples/labeling-compute.cc \ +samples/ima2d-7.cc \ +samples/ima2d-restricted-2.cc.raw \ +samples/fill-subimage-cfun.cc \ +samples/ima-save.cc \ +samples/point-1.cc \ +samples/box2d-bbox.cc \ +samples/forall-piter.cc \ +samples/ima-size.cc \ +samples/borderthickness.cc \ +samples/Makefile.in \ +samples/ima-has.cc \ +samples/win-create-1.cc \ samples/accu-wrong-instanciation.cc.raw \ -samples/accu-right-instanciation.cc \ -samples/ima2d-5.cc \ -samples/fill-subdomain.cc \ -samples/fill-subdomain-shorter.cc \ -samples/ima2d-2.cc \ -samples/extension-ignore.cc \ -samples/Makefile.am \ -samples/parray-bbox.cc \ -samples/graph-data.cc \ -samples/mln_var.cc \ -samples/ima2d-4.cc \ -samples/predicate-1.cc \ -samples/ima2d-3.cc \ -samples/ima2d-1.cc \ -samples/estim-sites.cc \ -samples/ima2d-6-clone.cc \ -samples/ima2d-restricted-3.cc.raw \ -samples/logical-not.cc \ -samples/fun-p2v-1.cc \ -samples/ima2d-rot.cc \ -samples/fill-part-image.cc \ -samples/domain-display.cc \ -samples/paste.cc \ -samples/fill.cc \ -samples/fill-call-1.cc \ +samples/accu-right-instanciation.cc \ +samples/ima2d-5.cc \ +samples/fill-subdomain.cc \ +samples/fill-subdomain-shorter.cc \ +samples/ima2d-2.cc \ +samples/extension-ignore.cc \ +samples/Makefile.am \ +samples/parray-bbox.cc \ +samples/graph-data.cc \ +samples/mln_var.cc \ +samples/ima2d-4.cc \ +samples/predicate-1.cc \ +samples/ima2d-3.cc \ +samples/ima2d-1.cc \ +samples/estim-sites.cc \ +samples/ima2d-6-clone.cc \ +samples/ima2d-restricted-3.cc.raw \ +samples/logical-not.cc \ +samples/fun-p2v-1.cc \ +samples/ima2d-rot.cc \ +samples/fill-part-image.cc \ +samples/domain-display.cc \ +samples/paste.cc \ +samples/fill.cc \ +samples/fill-call-1.cc \ samples/win-create-2.cc EXTRA_DIST += \ -- 1.5.6.5

1 0

3067: Fix few tests.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* doc/tutorial/tutorial.tex: add copyright and improve input code style. * tests/Makefile.am: enable registration test. * tests/core/routine/clone.cc, * tests/geom/seed2tiling_roundness.cc: update comments. * tests/draw/graph.cc, * tests/registration/registration.cc: fix test. * headers.mk: add new includes in distributed headers. * tests/unit_test/Makefile.am, * tests/unit_test/mln_core_concept_meta_fun.cc, * tests/unit_test/mln_core_image_violent_cast_image.cc, * tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc, * tests/unit_test/mln_math_acos.cc, * tests/unit_test/mln_math_cos.cc, * tests/unit_test/mln_opt_at.cc, * tests/unit_test/mln_value_hsl.cc, * tests/unit_test/mln_value_mixin.cc, * tests/unit_test/mln_value_shell.cc: add new unit tests. * tests/value/Makefile.am: disable graylevel and float related tests. * tests/core/image/Makefile.am: disable tr_image test. --- milena/ChangeLog | 32 ++++++++++++ milena/doc/tutorial/tutorial.tex | 53 ++++++++++++++------ milena/headers.mk | 10 ++++ milena/tests/Makefile.am | 1 + milena/tests/core/image/Makefile.am | 6 +- milena/tests/core/routine/clone.cc | 10 ++-- milena/tests/draw/graph.cc | 9 ++-- milena/tests/geom/seed2tiling_roundness.cc | 10 ++-- milena/tests/registration/registration.cc | 15 +++--- milena/tests/unit_test/Makefile.am | 18 +++++++ .../tests/unit_test/mln_core_concept_meta_fun.cc | 11 ++++ .../unit_test/mln_core_image_violent_cast_image.cc | 11 ++++ milena/tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc | 11 ++++ milena/tests/unit_test/mln_math_acos.cc | 11 ++++ milena/tests/unit_test/mln_math_cos.cc | 11 ++++ milena/tests/unit_test/mln_opt_at.cc | 11 ++++ milena/tests/unit_test/mln_value_hsl.cc | 11 ++++ milena/tests/unit_test/mln_value_mixin.cc | 11 ++++ milena/tests/unit_test/mln_value_shell.cc | 11 ++++ milena/tests/value/Makefile.am | 21 ++++---- 20 files changed, 234 insertions(+), 50 deletions(-) create mode 100644 milena/tests/unit_test/mln_core_concept_meta_fun.cc create mode 100644 milena/tests/unit_test/mln_core_image_violent_cast_image.cc create mode 100644 milena/tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc create mode 100644 milena/tests/unit_test/mln_math_acos.cc create mode 100644 milena/tests/unit_test/mln_math_cos.cc create mode 100644 milena/tests/unit_test/mln_opt_at.cc create mode 100644 milena/tests/unit_test/mln_value_hsl.cc create mode 100644 milena/tests/unit_test/mln_value_mixin.cc create mode 100644 milena/tests/unit_test/mln_value_shell.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b310e2..43bf51d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,35 @@ +2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix few tests. + + * doc/tutorial/tutorial.tex: add copyright and improve input code + style. + + * tests/Makefile.am: enable registration test. + + * tests/core/routine/clone.cc, + * tests/geom/seed2tiling_roundness.cc: update comments. + + * tests/draw/graph.cc, + * tests/registration/registration.cc: fix test. + + * headers.mk: add new includes in distributed headers. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_core_concept_meta_fun.cc, + * tests/unit_test/mln_core_image_violent_cast_image.cc, + * tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc, + * tests/unit_test/mln_math_acos.cc, + * tests/unit_test/mln_math_cos.cc, + * tests/unit_test/mln_opt_at.cc, + * tests/unit_test/mln_value_hsl.cc, + * tests/unit_test/mln_value_mixin.cc, + * tests/unit_test/mln_value_shell.cc: add new unit tests. + + * tests/value/Makefile.am: disable graylevel and float related tests. + + * tests/core/image/Makefile.am: disable tr_image test. + 2008-12-18 Nicolas Ballas <ballas(a)lrde.epita.fr> Replace some remaining .at by opt::at. diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 5e36f28..f8e758b 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -17,9 +17,10 @@ \end{figure} } -\title{Olena - Quick Reference Guide} +\title{Olena -- Quick Reference Guide} \author{LRDE} \date{} +\makeindex \definecolor{ccomment}{rgb}{0.5,0,0} \definecolor{cstring}{rgb}{0,0.32,0.5} @@ -27,18 +28,22 @@ \definecolor{cbg}{rgb}{0.95,0.95,0.95} %%%LISTINGS SETTINGS -%begin{latexonly} +%\begin{latexonly} \lstset{frameround=fttt} -\lstloadlanguages{C++} -\lstset{language=C++} - -\lstset{backgroundcolor=\color{cbg}, -basicstyle=\bfseries\color{black}, -identifierstyle=\color{black}, -stringstyle=\color{cstring}, -commentstyle=\color{ccomment}, -showstringspaces=false,linewidth=14cm} -%end{latexonly} +\lstloadlanguages{[ISO]C++} +\lstset{language=[ISO]C++, + captionpos=b, + basicstyle={\small\sffamily}, % normal small footnotesize scriptsize tiny + commentstyle=\itshape, + showstringspaces=false, + numberstyle=\tiny, + morekeywords={where, auto, concept, concept_map, axiom, late_check, final, abstract}, + morecomment=[s]{/*}{*/}, + backgroundcolor=\color{cbg}, + identifierstyle=\color{black}, + stringstyle=\color{cstring} +} +%\end{latexonly} % #1 : sub page name % #2 : sub page title @@ -112,7 +117,9 @@ showstringspaces=false,linewidth=14cm} } \newcommand{\tutotoc}[2]{% -\longleftarrow ~Go to \doxyref{#1} Go to \doxyref{#2}~ \longrightarrow% +\begin{center}% + \longleftarrow ~Go to \doxyref{#1} \hspace{1cm} | \hspace{1cm} Go to \doxyref{#2}~ \longrightarrow% +\end{center}% } \newenvironment{doxymath} @@ -312,9 +319,23 @@ $$ \end{htmlonly} \begin{latexonly} +\maketitle + +\section*{Copying this document} +Copyright \copyright{} 2006 LRDE. + +Permission is granted to copy, distribute and/or modify this document under +the terms of the GNU Free Documentation License, Version 1.2 or any later +version published by the Free Software Foundation; with the Invariant Sections +being just ``Copying this document'', no Front-Cover Texts, and no Back-Cover +Texts. + +A copy of the license is provided in the file COPYING.DOC. + \tableofcontents \end{latexonly} +\begin{htmlonly} %==================================== \doxychapter{tutoforeword}{Step 0: Foreword} @@ -380,6 +401,8 @@ The supported file formats are listed in section \doxyref{imaio}. %==================================== \doxychapter{tutograph}{Step 6: Handle graphes with an image} +\end{htmlonly} + %==================================== \doxychapter{installation}{Installation} @@ -502,11 +525,11 @@ Intersection == point 2d == milieu d'un pixel \\ %FIXME: Find a way to get that figure in HTML output. \begin{latexonly} -\begin{tikzpicture}[scale=2] +\begin{tikzpicture}[scale=1] \draw[blue!20, thick] (-2, -2) grid [right=0.5cm,above=0.5cm,step=1cm] (3, 3); \draw[line width=1mm] (-1, -1) grid [step=1cm] (3, 3); -\draw[black,line width=2mm,->] (0, -2) node {y} -- (0, 4); +\draw[black,line width=2mm,<-] (0, -2) node {y} -- (0, 4); \draw[black,line width=2mm,->] (-2, 3) node {x} -- (4, 3); \foreach \x in {-0.5, 0.5, 1.5, 2.5} diff --git a/milena/headers.mk b/milena/headers.mk index 146e616..895ce0e 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -199,6 +199,7 @@ mln/fun/v2v/inc.hh \ mln/fun/v2v/all.hh \ mln/fun/v2v/dec.hh \ mln/fun/v2v/abs.hh \ +mln/fun/v2v/rgb_to_hsl.hh \ mln/fun/v2v/cast.hh \ mln/fun/v2v/ch_function_value.hh \ mln/fun/v2v/rgb_to_hsi.hh \ @@ -254,6 +255,7 @@ mln/convert/to_p_array.hh \ mln/convert/from_to.hxx \ mln/convert/to_rgb.hh \ mln/convert/essential.hh \ +mln/value/shell.hh \ mln/value/float01_f.hh \ mln/value/float01_16.hh \ mln/value/lut_vec.hh \ @@ -279,6 +281,7 @@ mln/value/internal/gray_.hh \ mln/value/internal/essential.hh \ mln/value/proxy.hh \ mln/value/viter.hh \ +mln/value/hsl.hh \ mln/value/graylevel.hh \ mln/value/all.hh \ mln/value/super_value.hh \ @@ -301,6 +304,7 @@ mln/value/int_s8.hh \ mln/value/int_s16.hh \ mln/value/int_u16.hh \ mln/value/label.hh \ +mln/value/mixin.hh \ mln/value/rgb.hh \ mln/value/stack.hh \ mln/value/concept/integer.hh \ @@ -406,12 +410,15 @@ mln/math/sqr.hh \ mln/math/all.hh \ mln/math/sign.hh \ mln/math/abs.hh \ +mln/math/cos.hh \ mln/math/diff_abs.hh \ mln/math/round.hh \ mln/math/min.hh \ mln/math/sqrt.hh \ mln/math/essential.hh \ +mln/math/acos.hh \ mln/math/round_sat.hh \ +mln/opt/at.hh \ mln/binarization/includes.hh \ mln/binarization/all.hh \ mln/binarization/binarization.hh \ @@ -758,6 +765,7 @@ mln/core/routine/all.hh \ mln/core/routine/clone.hh \ mln/core/routine/exact.hh \ mln/core/routine/extend.hh \ +mln/core/routine/init.hxx \ mln/core/routine/essential.hh \ mln/core/trait/op_mult.hh \ mln/core/trait/all.hh \ @@ -849,6 +857,7 @@ mln/core/concept/accumulator.hh \ mln/core/concept/site_set.hh \ mln/core/concept/proxy.hxx \ mln/core/concept/object.hh \ +mln/core/concept/meta_fun.hh \ mln/core/concept/delta_point_site.hh \ mln/core/concept/status.txt \ mln/core/concept/neighborhood.hh \ @@ -902,6 +911,7 @@ mln/core/image/image2d_h.hh \ mln/core/image/image2d.hh \ mln/core/image/ch_piter.hh \ mln/core/image/complex_windows.hh \ +mln/core/image/violent_cast_image.hh \ mln/core/image/mono_obased_rle_encode.hh \ mln/core/image/status.txt \ mln/core/image/value_encode.hh \ diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 0c9a02a..6c69c7e 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -32,6 +32,7 @@ SUBDIRS = \ norm \ opt \ pw \ + registration \ set \ subsampling \ tag \ diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index a28dc4e..cfbba60 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -26,8 +26,8 @@ check_PROGRAMS = \ safe_image \ ## sparse_image \ sub_image \ - t_image \ - tr_image + t_image +## tr_image ## value_enc_image ##bgraph_image_SOURCES = bgraph_image.cc @@ -53,7 +53,7 @@ safe_image_SOURCES = safe_image.cc ##sparse_image_SOURCES = sparse_image.cc sub_image_SOURCES = sub_image.cc t_image_SOURCES = t_image.cc -tr_image_SOURCES = tr_image.cc +##tr_image_SOURCES = tr_image.cc ##value_enc_image_SOURCES = value_enc_image.cc # Tests depending on the FreeImagePlus library. diff --git a/milena/tests/core/routine/clone.cc b/milena/tests/core/routine/clone.cc index 63734a4..5390e04 100644 --- a/milena/tests/core/routine/clone.cc +++ b/milena/tests/core/routine/clone.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/routine/clone.cc - * - * \brief Tests on mln::clone. - */ +/// \file tests/core/routine/clone.cc +/// +/// Tests on mln::clone. #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> diff --git a/milena/tests/draw/graph.cc b/milena/tests/draw/graph.cc index ec13158..97410a0 100644 --- a/milena/tests/draw/graph.cc +++ b/milena/tests/draw/graph.cc @@ -54,9 +54,8 @@ using namespace mln; // FIXME: We might want to extract NROWS and NCOLS from REF instead of // getting them from the caller. -void -test(points_type& points, const edges_type& edges, - unsigned nrows, unsigned ncols, const mln::image2d<int>& ref) +void do_test(points_type& points, const edges_type& edges, + unsigned nrows, unsigned ncols, const mln::image2d<int>& ref) { // Graph. typedef util::graph G; @@ -104,7 +103,7 @@ main() edges_type edges; edges.push_back(std::make_pair(0, 1)); - test(points, edges, 3, 3, ref); + do_test(points, edges, 3, 3, ref); } @@ -138,6 +137,6 @@ main() edges.push_back(std::make_pair(3, 4)); edges.push_back(std::make_pair(4, 2)); - test(points, edges, 5, 5, ref); + do_test(points, edges, 5, 5, ref); } } diff --git a/milena/tests/geom/seed2tiling_roundness.cc b/milena/tests/geom/seed2tiling_roundness.cc index 2c1a776..29f8b2e 100644 --- a/milena/tests/geom/seed2tiling_roundness.cc +++ b/milena/tests/geom/seed2tiling_roundness.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/geom/seed2tiling_roundness.cc - * - * \brief Tests on mln::geom::seed2tiling_roundness. - */ +/// \file tests/geom/seed2tiling_roundness.cc +/// +/// Tests on mln::geom::seed2tiling_roundness. # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> diff --git a/milena/tests/registration/registration.cc b/milena/tests/registration/registration.cc index d7e8de4..e7de850 100644 --- a/milena/tests/registration/registration.cc +++ b/milena/tests/registration/registration.cc @@ -25,15 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/registration/registration.cc - * - * \brief Test on mln::registration::registration.cc - */ +/// \file tests/registration/registration.cc +/// +/// Test on mln::registration::registration.cc +/// +#include "tests/data.hh" #include <mln/io/pbm/all.hh> #include <mln/registration/registration.hh> -int main(int argc, char **argv) +int main() { using namespace mln; @@ -41,8 +42,8 @@ int main(int argc, char **argv) image2d< bool > img2; //load images - io::pbm::load(img1, MLN_IMG_DIR "/lena.pbm"); - io::pbm::load(img2, MLN_IMG_DIR "/lena.pbm"); + io::pbm::load(img1, MLN_IMG_DIR "/tiny.pbm"); + io::pbm::load(img2, MLN_IMG_DIR "/tiny.pbm"); registration::registration(img1,img2); //FIXME: Auto test result diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index a740cc1..d77cdde 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -200,6 +200,7 @@ mln_fun_v2v_inc \ mln_fun_v2v_all \ mln_fun_v2v_dec \ mln_fun_v2v_abs \ +mln_fun_v2v_rgb_to_hsl \ mln_fun_v2v_cast \ mln_fun_v2v_ch_function_value \ mln_fun_v2v_rgb_to_hsi \ @@ -254,6 +255,7 @@ mln_convert_to_dpoint \ mln_convert_to_p_array \ mln_convert_to_rgb \ mln_convert_essential \ +mln_value_shell \ mln_value_float01_f \ mln_value_float01_16 \ mln_value_lut_vec \ @@ -279,6 +281,7 @@ mln_value_internal_gray_ \ mln_value_internal_essential \ mln_value_proxy \ mln_value_viter \ +mln_value_hsl \ mln_value_graylevel \ mln_value_all \ mln_value_super_value \ @@ -301,6 +304,7 @@ mln_value_int_s8 \ mln_value_int_s16 \ mln_value_int_u16 \ mln_value_label \ +mln_value_mixin \ mln_value_rgb \ mln_value_stack \ mln_value_concept_integer \ @@ -400,12 +404,15 @@ mln_math_sqr \ mln_math_all \ mln_math_sign \ mln_math_abs \ +mln_math_cos \ mln_math_diff_abs \ mln_math_round \ mln_math_min \ mln_math_sqrt \ mln_math_essential \ +mln_math_acos \ mln_math_round_sat \ +mln_opt_at \ mln_binarization_includes \ mln_binarization_all \ mln_binarization_binarization \ @@ -822,6 +829,7 @@ mln_core_concept_value \ mln_core_concept_accumulator \ mln_core_concept_site_set \ mln_core_concept_object \ +mln_core_concept_meta_fun \ mln_core_concept_delta_point_site \ mln_core_concept_neighborhood \ mln_core_concept_browsing \ @@ -874,6 +882,7 @@ mln_core_image_image2d_h \ mln_core_image_image2d \ mln_core_image_ch_piter \ mln_core_image_complex_windows \ +mln_core_image_violent_cast_image \ mln_core_image_mono_obased_rle_encode \ mln_core_image_value_encode \ mln_core_image_essential \ @@ -1192,6 +1201,7 @@ mln_fun_v2v_inc_SOURCES = mln_fun_v2v_inc.cc mln_fun_v2v_all_SOURCES = mln_fun_v2v_all.cc mln_fun_v2v_dec_SOURCES = mln_fun_v2v_dec.cc mln_fun_v2v_abs_SOURCES = mln_fun_v2v_abs.cc +mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc mln_fun_v2v_cast_SOURCES = mln_fun_v2v_cast.cc mln_fun_v2v_ch_function_value_SOURCES = mln_fun_v2v_ch_function_value.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc @@ -1246,6 +1256,7 @@ mln_convert_to_dpoint_SOURCES = mln_convert_to_dpoint.cc mln_convert_to_p_array_SOURCES = mln_convert_to_p_array.cc mln_convert_to_rgb_SOURCES = mln_convert_to_rgb.cc mln_convert_essential_SOURCES = mln_convert_essential.cc +mln_value_shell_SOURCES = mln_value_shell.cc mln_value_float01_f_SOURCES = mln_value_float01_f.cc mln_value_float01_16_SOURCES = mln_value_float01_16.cc mln_value_lut_vec_SOURCES = mln_value_lut_vec.cc @@ -1271,6 +1282,7 @@ mln_value_internal_gray__SOURCES = mln_value_internal_gray_.cc mln_value_internal_essential_SOURCES = mln_value_internal_essential.cc mln_value_proxy_SOURCES = mln_value_proxy.cc mln_value_viter_SOURCES = mln_value_viter.cc +mln_value_hsl_SOURCES = mln_value_hsl.cc mln_value_graylevel_SOURCES = mln_value_graylevel.cc mln_value_all_SOURCES = mln_value_all.cc mln_value_super_value_SOURCES = mln_value_super_value.cc @@ -1293,6 +1305,7 @@ mln_value_int_s8_SOURCES = mln_value_int_s8.cc mln_value_int_s16_SOURCES = mln_value_int_s16.cc mln_value_int_u16_SOURCES = mln_value_int_u16.cc mln_value_label_SOURCES = mln_value_label.cc +mln_value_mixin_SOURCES = mln_value_mixin.cc mln_value_rgb_SOURCES = mln_value_rgb.cc mln_value_stack_SOURCES = mln_value_stack.cc mln_value_concept_integer_SOURCES = mln_value_concept_integer.cc @@ -1392,12 +1405,15 @@ mln_math_sqr_SOURCES = mln_math_sqr.cc mln_math_all_SOURCES = mln_math_all.cc mln_math_sign_SOURCES = mln_math_sign.cc mln_math_abs_SOURCES = mln_math_abs.cc +mln_math_cos_SOURCES = mln_math_cos.cc mln_math_diff_abs_SOURCES = mln_math_diff_abs.cc mln_math_round_SOURCES = mln_math_round.cc mln_math_min_SOURCES = mln_math_min.cc mln_math_sqrt_SOURCES = mln_math_sqrt.cc mln_math_essential_SOURCES = mln_math_essential.cc +mln_math_acos_SOURCES = mln_math_acos.cc mln_math_round_sat_SOURCES = mln_math_round_sat.cc +mln_opt_at_SOURCES = mln_opt_at.cc mln_binarization_includes_SOURCES = mln_binarization_includes.cc mln_binarization_all_SOURCES = mln_binarization_all.cc mln_binarization_binarization_SOURCES = mln_binarization_binarization.cc @@ -1814,6 +1830,7 @@ mln_core_concept_value_SOURCES = mln_core_concept_value.cc mln_core_concept_accumulator_SOURCES = mln_core_concept_accumulator.cc mln_core_concept_site_set_SOURCES = mln_core_concept_site_set.cc mln_core_concept_object_SOURCES = mln_core_concept_object.cc +mln_core_concept_meta_fun_SOURCES = mln_core_concept_meta_fun.cc mln_core_concept_delta_point_site_SOURCES = mln_core_concept_delta_point_site.cc mln_core_concept_neighborhood_SOURCES = mln_core_concept_neighborhood.cc mln_core_concept_browsing_SOURCES = mln_core_concept_browsing.cc @@ -1866,6 +1883,7 @@ mln_core_image_image2d_h_SOURCES = mln_core_image_image2d_h.cc mln_core_image_image2d_SOURCES = mln_core_image_image2d.cc mln_core_image_ch_piter_SOURCES = mln_core_image_ch_piter.cc mln_core_image_complex_windows_SOURCES = mln_core_image_complex_windows.cc +mln_core_image_violent_cast_image_SOURCES = mln_core_image_violent_cast_image.cc mln_core_image_mono_obased_rle_encode_SOURCES = mln_core_image_mono_obased_rle_encode.cc mln_core_image_value_encode_SOURCES = mln_core_image_value_encode.cc mln_core_image_essential_SOURCES = mln_core_image_essential.cc diff --git a/milena/tests/unit_test/mln_core_concept_meta_fun.cc b/milena/tests/unit_test/mln_core_concept_meta_fun.cc new file mode 100644 index 0000000..54201d8 --- /dev/null +++ b/milena/tests/unit_test/mln_core_concept_meta_fun.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/concept/meta_fun.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/concept/meta_fun.hh> +#include <mln/core/concept/meta_fun.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_core_image_violent_cast_image.cc b/milena/tests/unit_test/mln_core_image_violent_cast_image.cc new file mode 100644 index 0000000..f271a6a --- /dev/null +++ b/milena/tests/unit_test/mln_core_image_violent_cast_image.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/image/violent_cast_image.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/image/violent_cast_image.hh> +#include <mln/core/image/violent_cast_image.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc b/milena/tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc new file mode 100644 index 0000000..dc517ac --- /dev/null +++ b/milena/tests/unit_test/mln_fun_v2v_rgb_to_hsl.cc @@ -0,0 +1,11 @@ +// Unit test for mln/fun/v2v/rgb_to_hsl.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/fun/v2v/rgb_to_hsl.hh> +#include <mln/fun/v2v/rgb_to_hsl.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_math_acos.cc b/milena/tests/unit_test/mln_math_acos.cc new file mode 100644 index 0000000..41d41fd --- /dev/null +++ b/milena/tests/unit_test/mln_math_acos.cc @@ -0,0 +1,11 @@ +// Unit test for mln/math/acos.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/math/acos.hh> +#include <mln/math/acos.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_math_cos.cc b/milena/tests/unit_test/mln_math_cos.cc new file mode 100644 index 0000000..d77093a --- /dev/null +++ b/milena/tests/unit_test/mln_math_cos.cc @@ -0,0 +1,11 @@ +// Unit test for mln/math/cos.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/math/cos.hh> +#include <mln/math/cos.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_opt_at.cc b/milena/tests/unit_test/mln_opt_at.cc new file mode 100644 index 0000000..840e371 --- /dev/null +++ b/milena/tests/unit_test/mln_opt_at.cc @@ -0,0 +1,11 @@ +// Unit test for mln/opt/at.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/opt/at.hh> +#include <mln/opt/at.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_value_hsl.cc b/milena/tests/unit_test/mln_value_hsl.cc new file mode 100644 index 0000000..d3134aa --- /dev/null +++ b/milena/tests/unit_test/mln_value_hsl.cc @@ -0,0 +1,11 @@ +// Unit test for mln/value/hsl.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/value/hsl.hh> +#include <mln/value/hsl.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_value_mixin.cc b/milena/tests/unit_test/mln_value_mixin.cc new file mode 100644 index 0000000..9ce90c5 --- /dev/null +++ b/milena/tests/unit_test/mln_value_mixin.cc @@ -0,0 +1,11 @@ +// Unit test for mln/value/mixin.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/value/mixin.hh> +#include <mln/value/mixin.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_value_shell.cc b/milena/tests/unit_test/mln_value_shell.cc new file mode 100644 index 0000000..ae01f9b --- /dev/null +++ b/milena/tests/unit_test/mln_value_shell.cc @@ -0,0 +1,11 @@ +// Unit test for mln/value/shell.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/value/shell.hh> +#include <mln/value/shell.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 4fa0d36..f96a17d 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -10,14 +10,10 @@ SUBDIRS = \ builtin \ concept +#FIXME: re-enable all the tests. check_PROGRAMS = \ bool \ equiv \ - float01 \ - float01_bis \ - float01_f \ - graylevel \ - graylevel_f \ int_s \ int_s16 \ int_u8 \ @@ -29,6 +25,11 @@ check_PROGRAMS = \ set \ sign \ stack +# float01 +# float01_bis +# float01_f +# graylevel +# graylevel_f # FIXME: Enable when make check_full works. # check_full_PROGRAMS = \ @@ -38,11 +39,11 @@ check_PROGRAMS = \ bool_SOURCES = bool.cc equiv_SOURCES = equiv.cc -float01_SOURCES = float01.cc -float01_bis_SOURCES = float01_bis.cc -float01_f_SOURCES = float01_f.cc -graylevel_SOURCES = graylevel.cc -graylevel_f_SOURCES = graylevel_f.cc +#float01_SOURCES = float01.cc +#float01_bis_SOURCES = float01_bis.cc +#float01_f_SOURCES = float01_f.cc +#graylevel_SOURCES = graylevel.cc +#graylevel_f_SOURCES = graylevel_f.cc interop_SOURCES = interop.cc int_s_SOURCES = int_s.cc int_s16_SOURCES = int_s16.cc -- 1.5.6.5

1 0

3066: Add missing INSTALL and README.
by Guillaume Lazzara 19 Dec '08

19 Dec '08

* configure.ac: add missing Makefile entry. * INSTALL, * README: new files. --- ChangeLog | 9 ++ INSTALL | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ NEWS | 2 +- README | 83 ++++++++++++++++++++ configure.ac | 9 ++- 5 files changed, 342 insertions(+), 4 deletions(-) create mode 100644 INSTALL create mode 100644 README diff --git a/ChangeLog b/ChangeLog index f10f343..8613740 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing INSTALL and README. + + * configure.ac: add missing Makefile entry. + + * INSTALL, + * README: new files. + 2008-12-18 Nicolas Ballas <ballas(a)lrde.epita.fr> Add milena/tests/opt/Makefile in configure.ac. diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..354f7c0 --- /dev/null +++ b/INSTALL @@ -0,0 +1,243 @@ +This file contains information about the installation process of Olena. + + You can read the `README' file for general information about Olena. + +1.1 Required software +===================== + +Here is a non-exhaustive list of required software required to build +Olena successfully. + + * to compile the user examples: + - a POSIX shell, like Bash + + - a decent C++ compiler, like GNU C++ + + - a `make' utility, like GNU or BSD `make' + +Optional: + + * to compile the documentation: + - a LaTeX distribution + + - the `listings' TeX package + + - the utility `convert' from ImageMagick + + - GNU Autogen + + - `hevea', a TeX to HTML conversion tool + + - the `texinfo' utilities from GNU + + * to develop _in_ Olena: + - GNU Autotools (Autoconf 2.54, Automake 1.7) + + +1.2 Configuration +================= + +In order to prepare the build process, you need to configure the source +tree. + + Assuming your Olena distribution is uncompressed in directory +`olena-1.0', follow these steps: + + $ mkdir ../build + $ cd ../build && ../olena-1.0/configure CXXFLAGS='' + + *Note:* take care to set `CXXFLAGS' always when running `configure', +for the default value computed by `configure' may yield to compilation +issues (conflicts between optimization and debugging). + + The build process can be altered by a number of options you can pass +to the `configure' script. The following sections describe them. + + Additionally, if you are an Olena maintainer (a person who runs +`make distcheck'), _prefer setting `CXXFLAGS' as an environment +variable_: the flags given on the commandline to `configure' are not +propagated to recursive runs by `make distcheck'. + + +1.2.1 Installation path +----------------------- + +By default, Olena is installed in the standard "local" directory of +your system. This is usually `/usr/local' under Unix. + + You can change this path with the following flag: + + --prefix=<installation prefix> + + +1.2.2 Compiler selection and compilation flags +---------------------------------------------- + +By default, `configure' will try to use the first C++ compiler it +encounters on your system. If `CXX' is not set, it will look, in order, +for: + + - the value of the `CCC' environment variable, + + - the GNU C++ compiler (`g++'), + + - the `c++' or `gpp' commands on your system, + + - `aCC', the HP-UX standard C++ compiler, + + - the `CC', `cxx', `cc++' or `cl' commands on your system, + + - KAI's C++ compiler (`KCC'), + + - `RCC', `xlC_r' or `xlC'. + + You can override the detection system by passing your favorite +compiler name to `configure', as follows: + + $ .../configure CXX=<your-favorite-C++-compiler> + + As an alternative, you can also set the environment variable `CXX'. + + + + For most compilers, `configure' will select debugging and minimal +optimization (`-g -O2' with g++), which is wrong. You should override +the default C++ flags by giving `configure' your selection of flags: + + $ .../configure CXXFLAGS="<your-favorite-flags>" + + This is especially useful to solve a number of problems, described +in the following section. + + +1.3 Using `CXXFLAGS' to solve compilation problems +================================================== + +1.3.1 Olena needs C99 +--------------------- + +While Olena is written in C++, it uses a number of features (math +functions) from ISO C99. However most C++ compilers do not enable these +features by default. If your compilation fails with (e.g.) undefined +references to `roundf', but you know what flags can activate these +functions, add them to `CXXFLAGS'. + + In case your system does not provide some math functions necessary +for Olena, you can force the use of a local, overloaded, implementation, +by using macros of the form `-DOLN_NEED_xxx', where `xxx' stands for +the name of the missing function, in uppercase. For example, on Darwin +(MacOS X), the flag `-DOLN_NEED_SQRTF' is needed (but `configure' +should add it anyway). + + +1.3.2 Olena needs deep template recursion +----------------------------------------- + +The C++ design patterns used in Olena use deep template nesting and +recursion. However, the C++ standard specifies that C++ compiler need +only handle template recursion up to 19 levels, which is insufficient +for Olena. This is a problem for GCC 2.95 and probably other compilers. + + Hopefully, `configure' tries to fix this automatically by adding +`-ftemplate-depth-NN' when necessary, but other compilers than GCC may +need other flags. If you know these flags, add them to `CXXFLAGS'. + + +1.3.3 Debugging flags make Olena slow +------------------------------------- + +Because Olena depends on C++ optimizations to provide the best +performance, and enabling debugging flags often disable optimizations, +you are advised to override the `CXXFLAGS_OPTIMIZE' with any options +that gives the best optimization/conformance tradeoff. However, note +that passing `-DNDEBUG' disable many sanity checks, while providing +only a poor performance improvement. + + + +1.3.4 Speeding up the compilation +--------------------------------- + +When using GCC, by default separate phases of the compilation of each +file are run sequentially (compilation then assembly). Using `-pipe' in +`CXXFLAGS' allows GCC to fork processes and run compilation phases in +parallel, which brings a compilation speedup on multiprocessor machines +or machines with slow storage access (when using `-pipe', no +intermediary data is saved). + + +1.4 Speeding up the configuration process +========================================= + +`configure' can manage a cache of autodetected features and values. +This cache speeds up `configure' runs and can be activated with the +`-C' option. + + _NOTE_: the effects of many of the flags passed to `configure' are +stored in the cache. If you decide to re-run `configure' with other +flags, delete the `config.cache' file first. + + +1.5 Elidable components +======================= + +Several build targets can be disabled, in case you are only interested +in "parts" of the full Olena distribution. + + The elidable parts are so-called "components", and you can obtain a +list of them by running: + + $ .../configure --help + + +1.6 Building +============ + +Once your build directory is `configure'd, you can run + + $ make + + to recursively build all selected components. + + + Additionally, you can build and run the testsuite and demonstration +programs with: + + $ make check + + However, this process is very time- and memory- consuming. + + +1.7 Compiler notes +================== + +Olena has been tested on the following configurations : + +System Compiler +Linux g++ 4.0, 4.1, 4.2 +MacOS X g++ 4.0.1 + + +2.1 Installing +============== + +To install the Olena headers and additional files on your system, run: + + $ make install + + from the build directory. + + If not overridden with `--prefix' (see the BUILD file) , this will +install: + + * the headers in `/usr/local/include/mln', + + * sample images in `/usr/local/share/milena', + + + You can later remove Olena from your system by running + + $ make uninstall + + from the build directory. + diff --git a/NEWS b/NEWS index 81ecb85..766cbac 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Olena 1.0 +Olena 1.0beta * Rewritten from scratch. * First release of the Olena Platform with Milena as the diff --git a/README b/README new file mode 100644 index 0000000..d9a09cb --- /dev/null +++ b/README @@ -0,0 +1,83 @@ +Abstract +******** + +This is a public testing version of Olena, a generic image processing +library in C++. + + Please read the files INSTALL for information about building and +installing Olena. + + Olena is a project developed by the EPITA Research and Development +Laboratory (<http://www.lrde.epita.fr>) since 1997. We did numerous +prototypes and throwaway experiments before settling into the kind of +programming paradigm which is finally here. + + The documentation does not cover the whole project yet. In the `doc/' +directory you will find the first draft of a reference manual. It +includes a quick reference guide and a tutorial. This is a good start. +In `milena/tools', `milena/doc/tutorial/samples' and `milena/doc/examples' +few sample programs are available. Most of them are already used to +illustrate the tutorial. +For the rest, we're afraid you will have to dig the code or e-mail us. + + Please direct any question or comments to <olena(a)lrde.epita.fr>, or +<olena-bugs(a)lrde.epita.fr>. + + Olena also has a web page, located at +<http://www.lrde.epita.fr/Olena>. + +Bibliography +============ + +Further information about Olena can be found into the following related +papers: + + * Thierry Géraud, Yoann Fabre, Dimitri Papadopoulos-Orfanos, and + Jean-François Mangin. `Vers une réutilisabilité totale des + algorithmes de traitement d'images'. In the Proceedings of the + 17th Symposium GRETSI on Signal and Image Processing, vol. 2, + pages 331-334, Vannes, France, September 1999. In French + (available in English as Technical Report 9902: `Towards a Total + Reusability of Image Processing Algorithms'). + + * Thierry Géraud, Yoann Fabre, Alexandre Duret-Lutz, Dimitri + Papadopoulos-Orfanos, and Jean-François Mangin. `Obtaining + Genericity for Image Processing and Pattern Recognition + Algorithms'. In the Proceedings of the 15th International + Conference on Pattern Recognition (ICPR'2000), IEEE Computer + Society, vol. 4, pages 816-819, Barcelona, Spain, September 2000. + + * Alexandre Duret-Lutz. `Olena: a Component-Based Platform for + Image Processing, mixing Generic, Generative and OO + Programming'. In the Proceedings of the 2nd International + Symposium on Generative and Component-Based Software Engineering + (GCSE 2000), Young Researchers Workshop (published in + "Net.ObjectDays2000"; ISBN 3-89683-932-2), pages 653-659, + Erfurt, Germany, October 2000. + + * Alexandre Duret-Lutz, Thierry Géraud, and Akim Demaille. `Generic + Design Patterns in C++'. In the Proceedings of the 6th USENIX + Conference on Object-Oriented Technologies and Systems + (COOTS'2001), pages 189-202, San Antonio, Texas, USA, + January-February 2001. + + * Thierry Géraud, Yoann Fabre, and Alexandre Duret-Lutz. `Applying + Generic Programming to Image Processing'. In the Proceedings of + the IASTED International Conference on Applied Informatics + (AI'2001) - Symposium Advances in Computer Applications, ACTA + Press, pages 577-581, Innsbruck, Austria, February 2001. + + * `Generic Implementation of Morphological Image Operators', + Jérôme Darbon, Thierry Géraud, and Alexandre Duret-Lutz, + submitted to International Symposium On Mathematical Morphology VI + (ISMM 2002), April 3-5, 2002, Sydney, Australia. + + * `Static C++ Object-Oriented Programming (SCOOP)' Nicolas + Burrus, Alexandre Duret-Lutz, Thierry Géraud, David Lesage, and + Raphaël Poss. In the Proceedings of the Workshop on Multiple + Paradigm with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. + + You can download these papers and related materials from +<http://www.lrde.epita.fr/cgi-bin/twiki/view/Publications> + + diff --git a/configure.ac b/configure.ac index 24e7ad3..ee54879 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. +m4_pattern_forbid([^MLN_]) + AC_PREREQ([2.61]) @@ -8,7 +10,7 @@ AC_PREREQ([2.61]) ## Package set up. ## ## ---------------- ## -AC_INIT([Olena], [1.0], [olena(a)lrde.epita.fr] [olena]) +AC_INIT([Olena], [1.0beta], [olena(a)lrde.epita.fr] [olena]) # Auxiliary files. AC_CONFIG_AUX_DIR([build-aux]) @@ -16,7 +18,7 @@ AC_CONFIG_FILES([build-aux/Makefile]) # Automake. AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 nostdinc -Wall]) - +AC_CONFIG_HEADERS([config.h] [milena/mln/version.hh]) ## --------------------- ## ## C++ compiler set up. ## @@ -136,7 +138,7 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local], ## --------------- ## # Ask for config.h. -AM_CONFIG_HEADER([config.h]) +#AM_CONFIG_HEADER([config.h]) # Ask for the Makefile creations. AC_CONFIG_FILES([ @@ -219,6 +221,7 @@ AC_CONFIG_FILES([ milena/tests/norm/Makefile milena/tests/opt/Makefile milena/tests/pw/Makefile + milena/tests/registration/Makefile milena/tests/set/Makefile milena/tests/subsampling/Makefile milena/tests/tag/Makefile -- 1.5.6.5

1 0

3065: Replace some remaining .at by opt::at.
by Nicolas Ballas 18 Dec '08

18 Dec '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Replace some remaining .at by opt::at. * sandbox/aroumougame/skeleton/sedt.hh, * sandbox/dalila/demat.hh, * sandbox/abraham/mln/transform/fft.hh, * sandbox/ballas/color/min_tree_volume_filter.cc, * sandbox/ballas/color/reference.cc, * sandbox/ballas/color/min_tree_area_filter.cc, * sandbox/ballas/color/min_tree_height_filter.cc, * sandbox/ballas/color/min_tree_color.cc, * sandbox/ballas/color/reference2.cc, * sandbox/ballas/color/src/graph.hh, * sandbox/ballas/color/min_tree_color_v2.cc, * sandbox/geraud/wst_edge.cc, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt.svg.6.cc: Update. abraham/mln/transform/fft.hh | 2 +- aroumougame/skeleton/sedt.hh | 6 +++--- ballas/color/min_tree_area_filter.cc | 4 ++-- ballas/color/min_tree_color.cc | 6 ++++-- ballas/color/min_tree_color_v2.cc | 6 ++++-- ballas/color/min_tree_height_filter.cc | 6 ++++-- ballas/color/min_tree_volume_filter.cc | 4 ++-- ballas/color/reference.cc | 4 ++-- ballas/color/reference2.cc | 4 ++-- ballas/color/src/graph.hh | 3 ++- dalila/demat.hh | 22 ++++++++++++---------- geraud/fllt.svg.6.cc | 3 ++- geraud/fllt/fllt.svg.2.cc | 3 ++- geraud/fllt/fllt.svg.3.cc | 3 ++- geraud/fllt/fllt.svg.4.cc | 3 ++- geraud/fllt/fllt.svg.5.cc | 3 ++- geraud/fllt/fllt.svg.6.cc | 2 +- geraud/wst_edge.cc | 5 +++-- 18 files changed, 52 insertions(+), 37 deletions(-) Index: sandbox/aroumougame/skeleton/sedt.hh --- sandbox/aroumougame/skeleton/sedt.hh (revision 3064) +++ sandbox/aroumougame/skeleton/sedt.hh (working copy) @@ -92,7 +92,7 @@ } else { - v=1+(j*j-s[q]*s[q]+g.at(j,i)*g.at(j,i)-g.at(s[q],i)*opt::at(g, s[q],i))/(2*(j-s[q])); + v=1+(j*j-s[q]*s[q]+opt::at(g,j,i)*opt::at(g,j,i)-opt::at(g,s[q],i)*opt::at(g, s[q],i))/(2*(j-s[q])); if(v<h) { q++; @@ -104,7 +104,7 @@ for(int j= h-1; j>=0; j--) { - dt.at(j,i)= opt::at(g, s[q],i)*opt::at(g, s[q],i)+(j-s[q])*(j-s[q]); + opt::at(dt,j,i)= opt::at(g, s[q],i)*opt::at(g, s[q],i)+(j-s[q])*(j-s[q]); if(j==t[q]) q--; } @@ -184,7 +184,7 @@ { for( int j=0; j<L; j++) { - dt.at(i,j) = opt::at(DTg, i,j); + opt::at(dt,i,j) = opt::at(DTg, i,j); } } return dt; Index: sandbox/dalila/demat.hh --- sandbox/dalila/demat.hh (revision 3064) +++ sandbox/dalila/demat.hh (working copy) @@ -45,6 +45,8 @@ # include <mln/core/site_set/p_vaccess.hh> # include <mln/core/site_set/p_set.hh> +# include <mln/opt/at.hh> + # include <mln/accu/bbox.hh> # include <mln/accu/count.hh> @@ -199,16 +201,16 @@ for (unsigned i = 1; i < tboxes.first.nelements(); ++i) { - ++vend.at(tboxes.first[i].pmin().row()); - ++vend.at(tboxes.first[i].pmax().row()); - ++vcol.at(tboxes.first[i].center().col()); + opt::at(++vend, tboxes.first[i].pmin().row()); + opt::at(++vend, tboxes.first[i].pmax().row()); + opt::at(++vcol, tboxes.first[i].center().col()); } for (unsigned i = 1; i < tboxes.second.nelements(); ++i) { - ++hend.at(tboxes.second[i].pmin().col()); - ++hend.at(tboxes.second[i].pmax().col()); - ++hrow.at(tboxes.second[i].center().row()); + opt::at(++hend, tboxes.second[i].pmin().col()); + opt::at(++hend, tboxes.second[i].pmax().col()); + opt::at(++hrow, tboxes.second[i].center().row()); } #ifndef NOUT @@ -217,17 +219,17 @@ for (unsigned i = 1; i < in.ncols(); ++i) { - if (hend.at(i) > 0) + if (opt::at(hend, i) > 0) draw_col(tmp, i, literal::orange); - if (vcol.at(i) > 0) + if (opt::at(vcol, i) > 0) draw_col(tmp, i, literal::orange); } for (unsigned i = 1; i < in.nrows(); ++i) { - if (hrow.at(i) > 0) + if (opt::at(hrow, i) > 0) draw_row(tmp, i, literal::magenta); - if (vend.at(i) > 0) + if (opt::at(vend, i) > 0) draw_row(tmp, i, literal::magenta); } Index: sandbox/abraham/mln/transform/fft.hh --- sandbox/abraham/mln/transform/fft.hh (revision 3064) +++ sandbox/abraham/mln/transform/fft.hh (working copy) @@ -442,7 +442,7 @@ } for (unsigned row = 0; row < this->trans_im.nrows(); ++row) for (unsigned col = this->trans_im.ncols() - 1; col > this->trans_im.ncols() / 2; --col) - this->trans_im.at(row, col) = opt::at(this->trans_im, this->trans_im.nrows() - row - 1, + at(this->trans_im, row, col) = opt::at(this->trans_im, this->trans_im.nrows() - row - 1, this->trans_im.ncols() - col - 1); return this->trans_im; } Index: sandbox/ballas/color/min_tree_volume_filter.cc --- sandbox/ballas/color/min_tree_volume_filter.cc (revision 3064) +++ sandbox/ballas/color/min_tree_volume_filter.cc (working copy) @@ -387,7 +387,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -400,7 +400,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/reference.cc --- sandbox/ballas/color/reference.cc (revision 3064) +++ sandbox/ballas/color/reference.cc (working copy) @@ -351,7 +351,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -417,7 +417,7 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_area_filter.cc --- sandbox/ballas/color/min_tree_area_filter.cc (revision 3064) +++ sandbox/ballas/color/min_tree_area_filter.cc (working copy) @@ -364,7 +364,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -377,7 +377,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_height_filter.cc --- sandbox/ballas/color/min_tree_height_filter.cc (revision 3064) +++ sandbox/ballas/color/min_tree_height_filter.cc (working copy) @@ -387,7 +387,8 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = + mln::opt::at(input, row, col); return output; } @@ -400,7 +401,8 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = + mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_color.cc --- sandbox/ballas/color/min_tree_color.cc (revision 3064) +++ sandbox/ballas/color/min_tree_color.cc (working copy) @@ -381,7 +381,8 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = + mln::opt::at(input, row, col); return output; } @@ -394,7 +395,8 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = + mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/reference2.cc --- sandbox/ballas/color/reference2.cc (revision 3064) +++ sandbox/ballas/color/reference2.cc (working copy) @@ -295,7 +295,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -308,7 +308,7 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/src/graph.hh --- sandbox/ballas/color/src/graph.hh (revision 3064) +++ sandbox/ballas/color/src/graph.hh (working copy) @@ -10,6 +10,7 @@ # include <mln/value/rgb8.hh> # include <mln/level/fill.hh> +# include <mln/opt/at.hh> # include <mln/core/image/image2d.hh> @@ -54,7 +55,7 @@ mln_piter(I) p(ima.domain()); for_all(p) - graph.at(p.row() * 2, p.col() * 2) = ima(p); + mln::opt::at(graph, p.row() * 2, p.col() * 2) = ima(p); } Index: sandbox/ballas/color/min_tree_color_v2.cc --- sandbox/ballas/color/min_tree_color_v2.cc (revision 3064) +++ sandbox/ballas/color/min_tree_color_v2.cc (working copy) @@ -370,7 +370,8 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = + mln::opt::at(input, row, col); return output; } @@ -383,7 +384,8 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = + mln::opt::at(input, row, col); return output; } Index: sandbox/geraud/wst_edge.cc --- sandbox/geraud/wst_edge.cc (revision 3064) +++ sandbox/geraud/wst_edge.cc (working copy) @@ -242,7 +242,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); + mln::opt::at(output, 2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -255,7 +255,8 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = mln::opt::at(input, row, col); + mln::opt::at(output, row / 2, col / 2) = + mln::opt::at(input, row, col); return output; } Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 3064) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -179,7 +179,8 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = mln::opt::at(input, row / coef, col / coef); + mln::opt::at(output, row, col) = + mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 3064) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -102,7 +102,8 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = mln::opt::at(input, row / coef, col / coef); + opt::at(output, row, col) = + mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 3064) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -103,7 +103,8 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = mln::opt::at(input, row / coef, col / coef); + mln::opt::at(output, row, col) = + mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 3064) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -105,7 +105,8 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = mln::opt::at(input, row / coef, col / coef); + mln::opt::at(output, row, col) = + mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 3064) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -105,7 +105,8 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = mln::opt::at(input, row / coef, col / coef); + opt::at(output, row, col) = + mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.6.cc --- sandbox/geraud/fllt/fllt.svg.6.cc (revision 3064) +++ sandbox/geraud/fllt/fllt.svg.6.cc (working copy) @@ -177,7 +177,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + opt::at(output, row, col) = opt::at(input, row / coef, col / coef); return output; }

1 0

3064: Add milena/tests/opt/Makefile in configure.ac.
by Nicolas Ballas 18 Dec '08

18 Dec '08

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Add milena/tests/opt/Makefile in configure.ac. * configure.ac: Update. configure.ac | 1 + 1 file changed, 1 insertion(+) Index: configure.ac --- configure.ac (revision 3063) +++ configure.ac (working copy) @@ -217,6 +217,7 @@ milena/tests/morpho/elementary/Makefile milena/tests/morpho/tree/Makefile milena/tests/norm/Makefile + milena/tests/opt/Makefile milena/tests/pw/Makefile milena/tests/set/Makefile milena/tests/subsampling/Makefile

1 0

3063: Replace calls of the method .at by the function opt::at.
by Nicolas Ballas 18 Dec '08

18 Dec '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Replace calls of the method .at by the function opt::at. * mln/debug/println.spe.hh, * mln/core/pixter2d.hh, * mln/core/pixter3d.hh, * mln/level/was.median.hh, * mln/make/image.hh, * sandbox/duhamel/chamfer.cc, * sandbox/scribo/demat.hh, * sandbox/aroumougame/skeleton/miscellenous.hh, * sandbox/aroumougame/skeleton/sedt.hh, * sandbox/jardonnet/n_cmpt/fused_filter.cc, * sandbox/jardonnet/n_cmpt/ref_filter.cc, * sandbox/garrigues/ocr/skeleton.old.hh, * sandbox/garrigues/ocr/enlarge.hh, * sandbox/abraham/tests/transform/fft_.cc, * sandbox/abraham/mln/transform/fft.hh, * sandbox/inim/classif/src/proj.hh, * sandbox/inim/binarization/proof-of-concept/src/gradient.cc, * sandbox/inim/binarization/binarization.hh, * sandbox/nature/nature.cc, * sandbox/nature/co_occurence.hh, * sandbox/nature/proj.hh, * sandbox/ballas/color/min_tree_volume_filter.cc, * sandbox/ballas/color/reference.cc, * sandbox/ballas/color/min_tree_area_filter.cc, * sandbox/ballas/color/min_tree_height_filter.cc, * sandbox/ballas/color/min_tree_color.cc, * sandbox/ballas/color/reference2.cc, * sandbox/ballas/color/min_tree_color_v2.cc, * sandbox/ballas/color/laplacien.cc, * sandbox/geraud/wst_edge.cc, * sandbox/geraud/fllt.svg.6.cc, * sandbox/geraud/browsing/fwd.cc, * sandbox/geraud/fllt/fllt.hh, * sandbox/geraud/fllt/fllt.svg.7.hh, * sandbox/geraud/fllt/fllt.svg.2.cc, * sandbox/geraud/fllt/fllt.svg.3.cc, * sandbox/geraud/fllt/fllt.svg.4.cc, * sandbox/geraud/fllt/fllt.svg.5.cc, * sandbox/geraud/fllt/fllt_test.hh, * sandbox/geraud/fllt.svg.7.hh, * sandbox/geraud/dmap.cc, * sandbox/geraud/tufa_2008/steps.0.cc, * sandbox/geraud/tufa_2008/steps.1.cc, * sandbox/geraud/tufa_2008/steps.2.cc, * sandbox/geraud/tufa_2008/steps.3.cc, * sandbox/geraud/tufa_2008/steps.2b.cc, * sandbox/geraud/tufa_2008/compute_a.cc, * sandbox/geraud/tufa_2008/fz_count.cc, * sandbox/geraud/tufa_2008/regmin_count.cc, * tests/debug/println_with_border.cc, * tests/debug/println.cc, * tests/histo/compute.cc, * tests/core/other/pixel.cc, * tests/level/convert.cc, * tests/level/memset_.cc, * tests/transform/distance_geodesic.cc, * tests/transform/distance_front.cc, * tests/make/dual_neighb.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/canvas/chamfer.cc, * doc/tutorial/samples/ima2d-3.cc, * doc/tutorial/examples/image_plain.cc, * doc/benchmark/image2d.cc, * doc/examples/labeling_algo.cc: Replace .at by opt::add. * tests/opt/Makefile.am: New Makefile.am for opt test dir. * tests/Makefile.am: Add opt subdir. doc/benchmark/image2d.cc | 5 doc/examples/labeling_algo.cc | 4 doc/tutorial/examples/image_plain.cc | 9 - doc/tutorial/samples/ima2d-3.cc | 8 - mln/core/pixter2d.hh | 5 mln/core/pixter3d.hh | 9 - mln/debug/println.spe.hh | 5 mln/level/was.median.hh | 12 + mln/make/image.hh | 5 sandbox/abraham/mln/transform/fft.hh | 27 ++-- sandbox/abraham/tests/transform/fft_.cc | 5 sandbox/aroumougame/skeleton/miscellenous.hh | 7 - sandbox/aroumougame/skeleton/sedt.hh | 81 ++++++------ sandbox/ballas/color/laplacien.cc | 3 sandbox/ballas/color/min_tree_area_filter.cc | 16 +- sandbox/ballas/color/min_tree_color.cc | 15 +- sandbox/ballas/color/min_tree_color_v2.cc | 15 +- sandbox/ballas/color/min_tree_height_filter.cc | 15 +- sandbox/ballas/color/min_tree_volume_filter.cc | 15 +- sandbox/ballas/color/reference.cc | 31 ++-- sandbox/ballas/color/reference2.cc | 18 +- sandbox/duhamel/chamfer.cc | 8 - sandbox/garrigues/ocr/enlarge.hh | 85 ++++++------- sandbox/garrigues/ocr/skeleton.old.hh | 7 - sandbox/geraud/browsing/fwd.cc | 37 ++--- sandbox/geraud/dmap.cc | 3 sandbox/geraud/fllt.svg.6.cc | 4 sandbox/geraud/fllt.svg.7.hh | 3 sandbox/geraud/fllt/fllt.hh | 3 sandbox/geraud/fllt/fllt.svg.2.cc | 4 sandbox/geraud/fllt/fllt.svg.3.cc | 4 sandbox/geraud/fllt/fllt.svg.4.cc | 4 sandbox/geraud/fllt/fllt.svg.5.cc | 4 sandbox/geraud/fllt/fllt.svg.7.hh | 4 sandbox/geraud/fllt/fllt_test.hh | 4 sandbox/geraud/tufa_2008/compute_a.cc | 5 sandbox/geraud/tufa_2008/fz_count.cc | 5 sandbox/geraud/tufa_2008/regmin_count.cc | 6 sandbox/geraud/tufa_2008/steps.0.cc | 5 sandbox/geraud/tufa_2008/steps.1.cc | 5 sandbox/geraud/tufa_2008/steps.2.cc | 5 sandbox/geraud/tufa_2008/steps.2b.cc | 5 sandbox/geraud/tufa_2008/steps.3.cc | 6 sandbox/geraud/wst_edge.cc | 18 +- sandbox/inim/binarization/binarization.hh | 7 - sandbox/inim/binarization/proof-of-concept/src/gradient.cc | 3 sandbox/inim/classif/src/proj.hh | 7 - sandbox/jardonnet/n_cmpt/fused_filter.cc | 6 sandbox/jardonnet/n_cmpt/ref_filter.cc | 6 sandbox/nature/co_occurence.hh | 3 sandbox/nature/nature.cc | 14 +- sandbox/nature/proj.hh | 3 sandbox/scribo/demat.hh | 11 - tests/Makefile.am | 1 tests/canvas/chamfer.cc | 8 - tests/core/other/pixel.cc | 5 tests/debug/println.cc | 3 tests/debug/println_with_border.cc | 29 ++-- tests/histo/compute.cc | 4 tests/level/convert.cc | 9 - tests/level/memset_.cc | 5 tests/make/dual_neighb.cc | 5 tests/morpho/artificial_line_graph_image_wst.cc | 4 tests/opt/Makefile.am | 10 + tests/transform/distance_front.cc | 3 tests/transform/distance_geodesic.cc | 3 66 files changed, 395 insertions(+), 298 deletions(-) Index: mln/debug/println.spe.hh --- mln/debug/println.spe.hh (revision 3062) +++ mln/debug/println.spe.hh (working copy) @@ -46,6 +46,7 @@ # include <mln/debug/put_word.hh> # include <mln/level/fill.hh> # include <mln/accu/max.hh> +# include <mln/opt/at.hh> //FIXME: do not include all these headers # include <mln/core/alias/box2d.hh> @@ -86,7 +87,7 @@ for (int row = b.min_row(); row <= b.max_row(); ++row) { for (int col = b.min_col(); col <= b.max_col(); ++col) - std::cout << input.at(row, col) << ' '; + std::cout << opt::at(input, row, col) << ' '; std::cout << std::endl; } std::cout << std::endl; @@ -122,7 +123,7 @@ for (unsigned row = 0; row < b.nrows(); ++row) { for (unsigned col = 0; col < b.ncols() * len; ++col) - std::cout << output.at(row, col); + std::cout << opt::at(output, row, col); std::cout << std::endl; } std::cout << std::endl; Index: mln/core/pixter2d.hh --- mln/core/pixter2d.hh (revision 3062) +++ mln/core/pixter2d.hh (working copy) @@ -35,6 +35,7 @@ # include <mln/core/internal/pixel_iterator_base.hh> # include <mln/core/alias/point2d.hh> # include <mln/geom/size2d.hh> +# include <mln/opt/at.hh> namespace mln { @@ -117,7 +118,7 @@ : super_(image), border_x2_(2 * image.border()), row_offset_(image.bbox().ncols() + border_x2_), - eor_(& image.at(geom::min_row(image), geom::max_col(image)) + 1) + eor_(& opt::at(image, geom::min_row(image), geom::max_col(image)) + 1) { mln_precondition(image.has_data()); } @@ -146,7 +147,7 @@ : super_(image), border_x2_(2 * image.border()), row_offset_(image.bbox().ncols() + border_x2_), - bor_(& image.at(geom::max_row(image), geom::min_col(image)) - 1) + bor_(& opt::at(image, geom::max_row(image), geom::min_col(image)) - 1) { mln_precondition(image.has_data()); } Index: mln/core/pixter3d.hh --- mln/core/pixter3d.hh (revision 3062) +++ mln/core/pixter3d.hh (working copy) @@ -35,6 +35,7 @@ # include <mln/core/internal/pixel_iterator_base.hh> # include <mln/core/alias/point3d.hh> # include <mln/geom/size3d.hh> +# include <mln/opt/at.hh> namespace mln { @@ -133,14 +134,14 @@ : super_(image), border_x2_(2 * image.border()), row_offset_(image.bbox().ncols() + border_x2_), - eor_(& image.at(geom::min_sli(image), + eor_(& opt::at(image, geom::min_sli(image), geom::min_row(image), geom::max_col(image)) + 1), next_sli_offset_(row_offset_ * border_x2_ + border_x2_), next_srow_offset_(next_sli_offset_ + image.bbox().ncols()), sli_offset_((image.bbox().ncols() + border_x2_) * (image.bbox().nrows() + border_x2_)), - eos_(& image.at(geom::min_sli(image), + eos_(& opt::at(image, geom::min_sli(image), geom::max_row(image), geom::max_col(image)) + 1) { @@ -177,14 +178,14 @@ : super_(image), border_x2_(2 * image.border()), row_offset_(image.bbox().ncols() + border_x2_), - bor_(& image.at(geom::max_sli(image), + bor_(& opt::at(image, geom::max_sli(image), geom::max_row(image), geom::min_col(image)) - 1), next_sli_offset_(row_offset_ * border_x2_ + border_x2_), next_srow_offset_(next_sli_offset_ + image.bbox().ncols()), sli_offset_((image.bbox().ncols() + border_x2_) * (image.bbox().nrows() + border_x2_)), - bos_(& image.at(geom::max_sli(image), + bos_(& opt::at(image, geom::max_sli(image), geom::min_row(image), geom::min_col(image)) - 1) { Index: mln/level/was.median.hh --- mln/level/was.median.hh (revision 3062) +++ mln/level/was.median.hh (working copy) @@ -47,6 +47,8 @@ # include <mln/level/median.hh> # include <mln/win/hline2d.hh> +# include <mln/opt/at.hh> + namespace mln { @@ -167,12 +169,12 @@ // initialization (before first point of the row) med.init(); for (ct = min_col; ct < min_col + half; ++ct) - med.take(input.at(row, ct)); + med.take(opt::at(input, row, ct)); // left columns (just take new points) for (col = min_col; col <= min_col + half; ++col, ++ct) { - med.take(input.at(row, ct)); + med.take(opt::at(input, row, ct)); output(p) = med; } @@ -180,15 +182,15 @@ cu = min_col; for (; col <= max_col - half; ++cu, ++col, ++ct) { - med.take(input.at(row, ct)); - med.untake(input.at(row, cu)); + med.take(opt::at(input, row, ct)); + med.untake(opt::at(input, row, cu)); output(p) = med; } // right columns (now just untake old points) for (; col <= max_col; ++cu, ++col) { - med.untake(input.at(row, cu)); + med.untake(opt::at(input, row, cu)); output(p) = med; } } Index: mln/make/image.hh --- mln/make/image.hh (revision 3062) +++ mln/make/image.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> # include <mln/core/image/image3d.hh> +# include <mln/opt/at.hh> @@ -97,7 +98,7 @@ mln::image2d<V> tmp(R, C); for (unsigned row = 0; row < R; ++row) for (unsigned col = 0; col < C; ++col) - tmp.at(row, col) = values[row][col]; + opt::at(tmp, row, col) = values[row][col]; return tmp; } @@ -110,7 +111,7 @@ for (unsigned sli = 0; sli < S; ++sli) for (unsigned row = 0; row < R; ++row) for (unsigned col = 0; col < C; ++col) - tmp.at(sli, row, col) = values[sli][row][col]; + opt::at(tmp, sli, row, col) = values[sli][row][col]; return tmp; } Index: sandbox/duhamel/chamfer.cc --- sandbox/duhamel/chamfer.cc (revision 3062) +++ sandbox/duhamel/chamfer.cc (working copy) @@ -9,6 +9,8 @@ # include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image_if_interval.hh> +# include <mln/opt/at.hh> + # include "win_chamfer.hh" # include "chamfer.hh" @@ -21,7 +23,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); @@ -29,7 +31,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 3> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); @@ -37,7 +39,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 4,4) = true; const w_window2d_int& w_win = win_chamfer::mk_chamfer_5x5_int<4, 6, 9> (); image2d_b<unsigned> out = geom::chamfer(ima, w_win, max); image2d_b<unsigned>::fwd_piter p(out.domain()); Index: sandbox/scribo/demat.hh --- sandbox/scribo/demat.hh (revision 3062) +++ sandbox/scribo/demat.hh (working copy) @@ -50,6 +50,7 @@ # include <mln/make/graph.hh> # include <mln/util/graph.hh> # include <mln/util/line_graph.hh> +# include <mln/opt/at.hh> # include <mln/canvas/browsing/depth_first_search.hh> @@ -337,7 +338,7 @@ level::fill(l, -1); for_all_elements(i, aligned_lines) - l.at(aligned_lines[i]) = i; + opt::at(l, aligned_lines[i]) = i; for (unsigned i = 0; i < settings.max_dist_lines; ++i) l = morpho::elementary::dilation(l, c2()); @@ -345,10 +346,10 @@ for_all_components(i, boxes) { std::pair<point2d, point2d> cp = central_sites(boxes[i], dim); - if (l.at(cp.first[dim]) != -1) - boxes[i].pmin()[dim] = aligned_lines[l.at(cp.first[dim])]; - if (l.at(cp.second[dim]) != -1) - boxes[i].pmax()[dim] = aligned_lines[l.at(cp.second[dim])]; + if (opt::at(l, cp.first[dim]) != -1) + boxes[i].pmin()[dim] = aligned_lines[opt::at(l, cp.first[dim])]; + if (opt::at(l, cp.second[dim]) != -1) + boxes[i].pmax()[dim] = aligned_lines[opt::at(l, cp.second[dim])]; } } Index: sandbox/aroumougame/skeleton/miscellenous.hh --- sandbox/aroumougame/skeleton/miscellenous.hh (revision 3062) +++ sandbox/aroumougame/skeleton/miscellenous.hh (working copy) @@ -1,6 +1,7 @@ #include <mln/core/site_set/p_set.hh> #include <mln/core/image/image2d.hh> #include <mln/value/int_u.hh> +#include <mln/opt/at.hh> #include <vector> using namespace mln; @@ -78,10 +79,10 @@ for(int i=0; i<w; i++) for(int j=0; j<h; j++) { - if(pic.at(j,i)) - out.at(j,i) = 1; + if(opt::at(pic, j,i)) + opt::at(out, j,i) = 1; else - out.at(j,i) = 0; + opt::at(out, j,i) = 0; } return out; } Index: sandbox/aroumougame/skeleton/sedt.hh --- sandbox/aroumougame/skeleton/sedt.hh (revision 3062) +++ sandbox/aroumougame/skeleton/sedt.hh (working copy) @@ -15,6 +15,7 @@ #include <mln/geom/max_col.hh> #include <mln/geom/max_ind.hh> #include <mln/debug/println.hh> +#include <mln/opt/at.hh> using namespace mln; @@ -31,31 +32,31 @@ for(int j=0; j<h; j++) { - if(!pic.at(j,0)) + if(!opt::at(pic, j,0)) { - g.at(j,0)=0; + opt::at(g, j,0)=0; } else { - g.at(j,0)=1023; + opt::at(g, j,0)=1023; } for(int i=1; i<w; i++) { - if(!pic.at(j,i)) + if(!opt::at(pic, j,i)) { - g.at(j,i)=0; + opt::at(g, j,i)=0; } else { - g.at(j,i)=g.at(j,i-1)+1; + opt::at(g, j,i)=opt::at(g, j,i-1)+1; } } for(int i=w-2; i>=0; i--) { - if(g.at(j,i+1)<g.at(j,i)) - g.at(j,i)=1+g.at(j,i+1); + if(opt::at(g, j,i+1)<opt::at(g, j,i)) + opt::at(g, j,i)=1+opt::at(g, j,i+1); } } @@ -76,13 +77,13 @@ for(int j=1; j<h; j++) { - tmp1 = g.at(s[q],i)*g.at(s[q],i)+(t[q]-s[q])*(t[q]-s[q]); - tmp2 = g.at(j,i)*g.at(j,i)+(t[q]-j)*(t[q]-j); + tmp1 = opt::at(g, s[q],i)*opt::at(g, s[q],i)+(t[q]-s[q])*(t[q]-s[q]); + tmp2 = opt::at(g, j,i)*opt::at(g, j,i)+(t[q]-j)*(t[q]-j); while((q>=0)&&( tmp1>tmp2 )) { q--; - tmp1 = g.at(s[q],i)*g.at(s[q],i)+(t[q]-s[q])*(t[q]-s[q]); - tmp2 = g.at(j,i)*g.at(j,i)+(t[q]-j)*(t[q]-j); + tmp1 = opt::at(g, s[q],i)*opt::at(g, s[q],i)+(t[q]-s[q])*(t[q]-s[q]); + tmp2 = opt::at(g, j,i)*opt::at(g, j,i)+(t[q]-j)*(t[q]-j); } if(q<0) { @@ -91,7 +92,7 @@ } else { - v=1+(j*j-s[q]*s[q]+g.at(j,i)*g.at(j,i)-g.at(s[q],i)*g.at(s[q],i))/(2*(j-s[q])); + v=1+(j*j-s[q]*s[q]+g.at(j,i)*g.at(j,i)-g.at(s[q],i)*opt::at(g, s[q],i))/(2*(j-s[q])); if(v<h) { q++; @@ -103,7 +104,7 @@ for(int j= h-1; j>=0; j--) { - dt.at(j,i)= g.at(s[q],i)*g.at(s[q],i)+(j-s[q])*(j-s[q]); + dt.at(j,i)= opt::at(g, s[q],i)*opt::at(g, s[q],i)+(j-s[q])*(j-s[q]); if(j==t[q]) q--; } @@ -125,7 +126,7 @@ image2d<int> DTg(L, L); /* compute bound xM[ and verify that xM < L */ - for (xM = 0; xM < L; xM++) if (CTg.at(0,xM) > R) break; + for (xM = 0; xM < L; xM++) if (opt::at(CTg, 0,xM) > R) break; if (xM >= L) printf ("WARNING xM is not < L\n"); /* First scan: x++, y-- */ @@ -134,11 +135,11 @@ k = 0; propag = 0; for (y = x; y >= 0; y--) { - if (CTg.at(y,x) > R) /* outside the ball : background */ + if (opt::at(CTg, y,x) > R) /* outside the ball : background */ propag = 1; else if (propag) /* inside the ball, mark to dist. k*k from bg */ - { k++; DTg.at(y,x) = k*k; } - else DTg.at(y,x) = -1; /* inside the ball, no distance propagated */ + { k++; opt::at(DTg, y,x) = k*k; } + else opt::at(DTg, y,x) = -1; /* inside the ball, no distance propagated */ } } @@ -150,11 +151,11 @@ /* Compute stacks indices Si[Sn]=x and values Sv[Sn]=DTg[x,y] */ for (x = y; x <= xM; x++) { - dp = DTg.at(y,x); + dp = opt::at(DTg, y,x); if (dp < 0) continue; /* Non propagated value */ /* To speedup algorithm, stop at the second consecutive 0 */ - if (dp == 0 && x > y && DTg.at(y,x-1)==0) break; + if (dp == 0 && x > y && opt::at(DTg, y,x-1)==0) break; while (Sn >= 2 && D_Intersec (Si[Sn-1], Sv[Sn-1], x, dp) < Sr[Sn-1]) Sn--; /* pop */ @@ -170,11 +171,11 @@ /* Compute new DTg values using stacks */ for (x = xM; x >= y; x--) { - if (DTg.at(y,x)==0) continue; + if (opt::at(DTg, y,x)==0) continue; while (Sn >= 2 && x < Sr[Sn-1]) Sn--; /* pop */ - DTg.at(y,x) = (x-Si[Sn-1])*(x-Si[Sn-1]) + Sv[Sn-1]; + opt::at(DTg, y,x) = (x-Si[Sn-1])*(x-Si[Sn-1]) + Sv[Sn-1]; } } @@ -183,7 +184,7 @@ { for( int j=0; j<L; j++) { - dt.at(i,j) = DTg.at(i,j); + dt.at(i,j) = opt::at(DTg, i,j); } } return dt; @@ -197,7 +198,7 @@ { for(int j=0; j <= i; j++) { - CTg.at(j,i) = i*i + j*j; + opt::at(CTg, j,i) = i*i + j*j; } } @@ -230,9 +231,9 @@ for (y = 0; y <= x; y++) { - r1 = CTg.at(y,x) +1; + r1 = opt::at(CTg, y,x) +1; - r2 = CTg.at(y+Mlut[ind][1], x+Mlut[ind][0]) +1; + r2 = opt::at(CTg, y+Mlut[ind][1], x+Mlut[ind][0]) +1; if (r1 <= Rmax && r2 > Lut[ind][r1]) Lut[ind][r1] = r2; } @@ -252,7 +253,7 @@ { int xx, yy, val; - val = DTg.at(y, x); + val = opt::at(DTg, y, x); for (uint i = 0; i < Mlut.size(); i++) { @@ -261,7 +262,7 @@ if (0 <= yy && yy <= xx) { - if ( DTg.at(yy, xx) >= Lut[i][val] ) + if ( opt::at(DTg, yy, xx) >= Lut[i][val] ) return false; } } @@ -288,7 +289,7 @@ { for(int y=0; y<=x; y++) { - if(DTg.at(y,x) > 0 && isMAg(x, y, Mgl, DTg, Lut)) + if(opt::at(DTg, y,x) > 0 && isMAg(x, y, Mgl, DTg, Lut)) { std::vector<int> tmp(3); tmp[0] = x; @@ -314,7 +315,7 @@ { int Vx, Vy, val, h, w; - val = DTg.at(y, x); + val = opt::at(DTg, y, x); h = geom::nrows(DTg); w = geom::ncols(DTg); @@ -325,42 +326,42 @@ if((0 <= y-Vy) && (0 <= x-Vx)) { - if ( DTg.at(y-Vy, x-Vx) >= Lut[i][val] ) + if ( opt::at(DTg, y-Vy, x-Vx) >= Lut[i][val] ) return false; } if((y+Vy < h) && (x+Vx < w)) { - if ( DTg.at(y+Vy, x+Vx) >= Lut[i][val] ) + if ( opt::at(DTg, y+Vy, x+Vx) >= Lut[i][val] ) return false; } if((0 <= y-Vy) && (x+Vx < w)) { - if ( DTg.at(y-Vy, x+Vx) >= Lut[i][val] ) + if ( opt::at(DTg, y-Vy, x+Vx) >= Lut[i][val] ) return false; } if((y+Vy < h) && (0 <= x-Vx)) { - if ( DTg.at(y+Vy, x-Vx) >= Lut[i][val] ) + if ( opt::at(DTg, y+Vy, x-Vx) >= Lut[i][val] ) return false; } if((0 <= x-Vy) && (0 <= y-Vx)) { - if ( DTg.at(y-Vx, x-Vy) >= Lut[i][val] ) + if ( opt::at(DTg, y-Vx, x-Vy) >= Lut[i][val] ) return false; } if((x+Vy < w) && (y+Vx < h)) { - if ( DTg.at(y+Vx, x+Vy) >= Lut[i][val] ) + if ( opt::at(DTg, y+Vx, x+Vy) >= Lut[i][val] ) return false; } if((0 <= x-Vy) && (y+Vx < h)) { - if ( DTg.at(y+Vx, x-Vy) >= Lut[i][val] ) + if ( opt::at(DTg, y+Vx, x-Vy) >= Lut[i][val] ) return false; } if((x+Vy < w) && (0 <= y-Vx)) { - if ( DTg.at(y-Vx, x+Vy) >= Lut[i][val] ) + if ( opt::at(DTg, y-Vx, x+Vy) >= Lut[i][val] ) return false; } @@ -378,11 +379,11 @@ { for(int j=0; j<h; j++) { - if(pic.at(j,i)) + if(opt::at(pic, j,i)) { if(!isMA(i, j, Mgl, dt, Lut)) { - pic.at(j,i) = false; + opt::at(pic, j,i) = false; } } } Index: sandbox/jardonnet/n_cmpt/fused_filter.cc --- sandbox/jardonnet/n_cmpt/fused_filter.cc (revision 3062) +++ sandbox/jardonnet/n_cmpt/fused_filter.cc (working copy) @@ -21,6 +21,8 @@ #include <mln/pw/all.hh> #include <mln/core/image/image_if.hh> +#include <mln/opt/at.hh> + namespace mln { @@ -31,10 +33,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (mln::opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << mln::opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/jardonnet/n_cmpt/ref_filter.cc --- sandbox/jardonnet/n_cmpt/ref_filter.cc (revision 3062) +++ sandbox/jardonnet/n_cmpt/ref_filter.cc (working copy) @@ -16,6 +16,8 @@ #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> + namespace mln { @@ -27,10 +29,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/garrigues/ocr/skeleton.old.hh --- sandbox/garrigues/ocr/skeleton.old.hh (revision 3062) +++ sandbox/garrigues/ocr/skeleton.old.hh (working copy) @@ -33,6 +33,7 @@ #include <mln/core/site_set/p_set.hh> #include <mln/math/sqrt.hh> +#include <mln/opt/at.hh> namespace mln { @@ -486,10 +487,10 @@ for(int i=0; i<w; i++) for(int j=0; j<h; j++) { - if(pic.at(j,i)) - out.at(j,i) = 1; + if(opt::at(pic, j,i)) + opt::at(out, j,i) = 1; else - out.at(j,i) = 0; + opt::at(out, j,i) = 0; } return out; } Index: sandbox/garrigues/ocr/enlarge.hh --- sandbox/garrigues/ocr/enlarge.hh (revision 3062) +++ sandbox/garrigues/ocr/enlarge.hh (working copy) @@ -9,6 +9,7 @@ # include <mln/pw/image.hh> # include <mln/pw/cst.hh> # include <mln/pw/value.hh> +# include <mln/opt/at.hh> # include <mln/core/routine/clone.hh> @@ -38,29 +39,29 @@ // row 0 - output.at(0, 0) = do_threshold(input.at(0, 0)); + opt::at(output, 0, 0) = do_threshold(opt::at(input, 0, 0)); for (int col = 2; col < output.ncols(); col += 2) { - value = val(input.at(0, col / 2)); - value += val(input.at(0, col / 2 - 1)); - output.at(0, col) = do_threshold(value / 2); + value = val(opt::at(input, 0, col / 2)); + value += val(opt::at(input, 0, col / 2 - 1)); + opt::at(output, 0, col) = do_threshold(value / 2); } for (int col = 1; col < output.ncols(); col += 2) - output.at(0, col) = do_threshold(input.at(0, col / 2)); + opt::at(output, 0, col) = do_threshold(opt::at(input, 0, col / 2)); // col 0 for (int row = 2; row < output.nrows(); row += 2) { - value = val(input.at(row / 2, 0)); - value += val(input.at(row / 2 - 1, 0)); - output.at(row, 0) = do_threshold(value / 2); + value = val(opt::at(input, row / 2, 0)); + value += val(opt::at(input, row / 2 - 1, 0)); + opt::at(output, row, 0) = do_threshold(value / 2); } for (int row = 1; row < output.nrows(); row += 2) - output.at(row, 0) = do_threshold(input.at(row / 2, 0)); + opt::at(output, row, 0) = do_threshold(opt::at(input, row / 2, 0)); // others @@ -68,17 +69,17 @@ { for (int col = 2; col < output.ncols(); col += 2) { - value = val(input.at(row / 2, col / 2)); - value += val(input.at(row / 2 - 1, col / 2)); - value += val(input.at(row / 2, col / 2 - 1)); - value += val(input.at(row / 2 - 1, col / 2 - 1)); - output.at(row, col) = do_threshold(value / 4); + value = val(opt::at(input, row / 2, col / 2)); + value += val(opt::at(input, row / 2 - 1, col / 2)); + value += val(opt::at(input, row / 2, col / 2 - 1)); + value += val(opt::at(input, row / 2 - 1, col / 2 - 1)); + opt::at(output, row, col) = do_threshold(value / 4); } for (int col = 1; col < output.ncols(); col += 2) { - value = val(input.at(row / 2, col / 2)); - value += val(input.at(row / 2 - 1, col / 2)); - output.at(row, col) = do_threshold(value / 2); + value = val(opt::at(input, row / 2, col / 2)); + value += val(opt::at(input, row / 2 - 1, col / 2)); + opt::at(output, row, col) = do_threshold(value / 2); } } @@ -86,12 +87,12 @@ { for (int col = 2; col < output.ncols(); col += 2) { - value = val(input.at(row / 2, col / 2)); - value += val(input.at(row / 2, col / 2 - 1)); - output.at(row, col) = do_threshold(value / 2); + value = val(opt::at(input, row / 2, col / 2)); + value += val(opt::at(input, row / 2, col / 2 - 1)); + opt::at(output, row, col) = do_threshold(value / 2); } for (int col = 1; col < output.ncols(); col += 2) - output.at(row, col) = do_threshold(input.at(row / 2, col / 2)); + opt::at(output, row, col) = do_threshold(opt::at(input, row / 2, col / 2)); } return output; @@ -114,29 +115,29 @@ // row 0 - output.at(0, 0) = (input.at(0, 0)); + opt::at(output, 0, 0) = (opt::at(input, 0, 0)); for (int col = 2; col < output.ncols(); col += 2) { - value = (input.at(0, col / 2)); - value += (input.at(0, col / 2 - 1)); - output.at(0, col) = (value / 2); + value = (opt::at(input, 0, col / 2)); + value += (opt::at(input, 0, col / 2 - 1)); + opt::at(output, 0, col) = (value / 2); } for (int col = 1; col < output.ncols(); col += 2) - output.at(0, col) = (input.at(0, col / 2)); + opt::at(output, 0, col) = (opt::at(input, 0, col / 2)); // col 0 for (int row = 2; row < output.nrows(); row += 2) { - value = (input.at(row / 2, 0)); - value += (input.at(row / 2 - 1, 0)); - output.at(row, 0) = (value / 2); + value = (opt::at(input, row / 2, 0)); + value += (opt::at(input, row / 2 - 1, 0)); + opt::at(output, row, 0) = (value / 2); } for (int row = 1; row < output.nrows(); row += 2) - output.at(row, 0) = (input.at(row / 2, 0)); + opt::at(output, row, 0) = (opt::at(input, row / 2, 0)); // others @@ -144,17 +145,17 @@ { for (int col = 2; col < output.ncols(); col += 2) { - value = (input.at(row / 2, col / 2)); - value += (input.at(row / 2 - 1, col / 2)); - value += (input.at(row / 2, col / 2 - 1)); - value += (input.at(row / 2 - 1, col / 2 - 1)); - output.at(row, col) = ((unsigned(value)+2) / 4); + value = (opt::at(input, row / 2, col / 2)); + value += (opt::at(input, row / 2 - 1, col / 2)); + value += (opt::at(input, row / 2, col / 2 - 1)); + value += (opt::at(input, row / 2 - 1, col / 2 - 1)); + opt::at(output, row, col) = ((unsigned(value)+2) / 4); } for (int col = 1; col < output.ncols(); col += 2) { - value = (input.at(row / 2, col / 2)); - value += (input.at(row / 2 - 1, col / 2)); - output.at(row, col) = (value / 2); + value = (opt::at(input, row / 2, col / 2)); + value += (opt::at(input, row / 2 - 1, col / 2)); + opt::at(output, row, col) = (value / 2); } } @@ -162,12 +163,12 @@ { for (int col = 2; col < output.ncols(); col += 2) { - value = (input.at(row / 2, col / 2)); - value += (input.at(row / 2, col / 2 - 1)); - output.at(row, col) = (value / 2); + value = (opt::at(input, row / 2, col / 2)); + value += (opt::at(input, row / 2, col / 2 - 1)); + opt::at(output, row, col) = (value / 2); } for (int col = 1; col < output.ncols(); col += 2) - output.at(row, col) = (input.at(row / 2, col / 2)); + opt::at(output, row, col) = (opt::at(input, row / 2, col / 2)); } return output; Index: sandbox/abraham/tests/transform/fft_.cc --- sandbox/abraham/tests/transform/fft_.cc (revision 3062) +++ sandbox/abraham/tests/transform/fft_.cc (working copy) @@ -30,6 +30,7 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> +#include <mln/opt/at.hh> #include <mln/debug/println.hh> #define CHECK(Condition) \ @@ -77,11 +78,11 @@ for (int row = 40; row < im2.nrows() - 40; ++row) for (int col = 0; col < im2.ncols(); ++col) - im2.at(row, col) = 0; + opt::at(im2, row, col) = 0; for (int row = 0; row < im2.nrows(); ++row) for (int col = 40; col < im2.ncols() - 40; ++col) - im2.at(row, col) = 0; + opt::at(im2, row, col) = 0; out = fourier.transform_inv<int_u8>(); Index: sandbox/abraham/mln/transform/fft.hh --- sandbox/abraham/mln/transform/fft.hh (revision 3062) +++ sandbox/abraham/mln/transform/fft.hh (working copy) @@ -30,6 +30,7 @@ # include <mln/core/image/image2d.hh> # include <mln/estim/min_max.hh> +# include <mln/opt/at.hh> # include <complex> @@ -116,8 +117,8 @@ if (ordered) for (unsigned row = 0; row < new_im.nrows(); ++row) for (unsigned col = 0; col < new_im.ncols(); ++col) - new_im.at(row, col) = - std::norm(trans_im.at((row + trans_im.nrows() / 2) % trans_im.nrows(), + opt::at(new_im, row, col) = + std::norm(opt::at(trans_im, (row + trans_im.nrows() / 2) % trans_im.nrows(), (col + trans_im.ncols() / 2) % trans_im.ncols())); else { @@ -174,14 +175,14 @@ for (unsigned row = 0; row < new_im.nrows(); ++row) for (unsigned col = 0; col < new_im.ncols(); ++col) { - if (std::norm(trans_im.at((row + trans_im.nrows() / 2) % trans_im.nrows(), + if (std::norm(opt::at(trans_im, (row + trans_im.nrows() / 2) % trans_im.nrows(), (col + trans_im.ncols() / 2) % trans_im.ncols())) >= max * clip) - new_im.at(row, col) = mln_max(R); + opt::at(new_im, row, col) = mln_max(R); else - new_im.at(row, col) = + opt::at(new_im, row, col) = (double) mln_max(R) * - std::norm(trans_im.at((row + trans_im.nrows() / 2) % trans_im.nrows(), + std::norm(opt::at(trans_im, (row + trans_im.nrows() / 2) % trans_im.nrows(), (col + trans_im.ncols() / 2) % trans_im.ncols())) / (max * clip); } @@ -282,8 +283,8 @@ if (ordered) for (unsigned row = 0; row < new_im.nrows(); ++row) for (unsigned col = 0; col < new_im.ncols(); ++col) - new_im.at(row, col) = - log(a + b * std::norm(trans_im.at((row + trans_im.nrows() / 2) % trans_im.nrows(), + opt::at(new_im, row, col) = + log(a + b * std::norm(opt::at(trans_im, (row + trans_im.nrows() / 2) % trans_im.nrows(), (col + trans_im.ncols() / 2) % trans_im.ncols()))) / log (a + b * max) * mln_max(R); else @@ -413,7 +414,7 @@ for (unsigned row = 0; row < original_im.nrows(); ++row) for (unsigned col = 0; col < original_im.ncols(); ++col) - this->in[row * original_im.ncols() + col] = original_im.at(row, col); + this->in[row * original_im.ncols() + col] = opt::at(original_im, row, col); this->p = fftw_plan_dft_r2c_2d (original_im.nrows(), original_im.ncols(), this->in, reinterpret_cast<fftw_complex*>(this->out), FFTW_ESTIMATE); @@ -436,12 +437,12 @@ for (unsigned col = 0; col <= this->trans_im.ncols() / 2; ++col) { this->out[i] = std::complex<T> (this->out[i].real() / denom, this->out[i].imag() / denom); - this->trans_im.at(row, col) = this->out[i]; + opt::at(this->trans_im, row, col) = this->out[i]; ++i; } for (unsigned row = 0; row < this->trans_im.nrows(); ++row) for (unsigned col = this->trans_im.ncols() - 1; col > this->trans_im.ncols() / 2; --col) - this->trans_im.at(row, col) = this->trans_im.at(this->trans_im.nrows() - row - 1, + this->trans_im.at(row, col) = opt::at(this->trans_im, this->trans_im.nrows() - row - 1, this->trans_im.ncols() - col - 1); return this->trans_im; } @@ -459,7 +460,7 @@ for (unsigned row = 0; row < this->trans_im.nrows(); ++row) for (unsigned col = 0; col <= this->trans_im.ncols() / 2; ++col) this->out[row * (this->trans_im.ncols() / 2 + 1) + col] = - this->trans_im.at(row, col).real(); + opt::at(this->trans_im, row, col).real(); fftw_execute(this->p_inv); @@ -468,7 +469,7 @@ for (unsigned row = 0; row < this->trans_im.nrows(); ++row) for (unsigned col = 0; col < this->trans_im.ncols(); ++col) { - new_im.at(row, col) = (this->in[i] >= mln_min(R) ? + opt::at(new_im, row, col) = (this->in[i] >= mln_min(R) ? (this->in[i] <= mln_max(R) ? (R)this->in [i] : mln_min(R)) : Index: sandbox/inim/classif/src/proj.hh --- sandbox/inim/classif/src/proj.hh (revision 3062) +++ sandbox/inim/classif/src/proj.hh (working copy) @@ -35,7 +35,8 @@ #include <mln/accu/maj_h.hh> #include <mln/literal/white.hh> #include <mln/literal/colors.hh> -#include <mln/make/vec.hh> +#include <mln/make/vec.hh +#include <mln/opt/at.hh> namespace mln { @@ -48,7 +49,7 @@ mln_piter(image3d<T>) p(input.domain()); for_all(p) // 3d if (input(p) != literal::zero) - acc.at(p.sli(), p.row()).take(input(p)); + opt::at(acc, p.sli(), p.row()).take(input(p)); image2d<mln_result(A)> output(acc.domain()); level::paste(acc, output); @@ -91,7 +92,7 @@ mln_piter(image3d<T>) p(input.domain()); for_all(p) // 3d if (histo(p) != literal::zero) - acc.at(p.sli(), p.row()).take(input(p)); + opt::at(acc, p.sli(), p.row()).take(input(p)); image2d<mln_result(A)> output(acc.domain()); level::paste(acc, output); Index: sandbox/inim/binarization/proof-of-concept/src/gradient.cc --- sandbox/inim/binarization/proof-of-concept/src/gradient.cc (revision 3062) +++ sandbox/inim/binarization/proof-of-concept/src/gradient.cc (working copy) @@ -25,6 +25,7 @@ #include <mln/morpho/closing_area.hh> #include <mln/morpho/gradient.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> // DEBUG #include <mln/debug/all.hh> @@ -81,7 +82,7 @@ level::fill(hist, 0); image2d<value::int_u8>::fwd_piter p (in.domain ()); for_all (p) - hist.at(in(p)) += (unsigned) strength_of<2> (grad (p)); + opt::at(hist, in(p)) += (unsigned) strength_of<2> (grad (p)); // Histo print_histo (hist, file_hist + "_1.histo"); Index: sandbox/inim/binarization/binarization.hh --- sandbox/inim/binarization/binarization.hh (revision 3062) +++ sandbox/inim/binarization/binarization.hh (working copy) @@ -7,6 +7,7 @@ #include <mln/morpho/meyer_wst.hh> #include <mln/border/resize.hh> #include <mln/accu/maj_h.hh> +#include <mln/opt/at.hh> #include "snake2d.hh" namespace mln @@ -41,10 +42,10 @@ initialize(cla, input); typename I::fwd_piter q (input.domain()); for_all (q) - if (wst.at(input(q)) == 0) - cla(q) = wst.at(input(q) + 1); + if (opt::at(wst, input(q)) == 0) + cla(q) = opt::at(wst, input(q) + 1); else - cla(q) = wst.at(input(q)); + cla(q) = opt::at(wst, input(q)); border::resize(cla, 0); I maj = snake2d(accu::meta::maj_h(), cla, win); typename I::fwd_piter r (cla.domain()); Index: sandbox/nature/nature.cc --- sandbox/nature/nature.cc (revision 3062) +++ sandbox/nature/nature.cc (working copy) @@ -61,6 +61,8 @@ #include <mln/transform/fft.hh> +#include <mln/opt/at.hh> + #include "co_occurence.hh" #include <math.h> @@ -174,14 +176,14 @@ // If there is a plain background, there will be a massive peak in the diagonal of the matrix unsigned max = 0; for (unsigned i = 0; i < mco.nrows(); i++) - if (mco.at(i, i) > max) - max = mco.at(i, i); + if (opt::at(mco, i, i) > max) + max = opt::at(mco, i, i); for (unsigned i = 0; i < mco.nrows() - 1; i++) { - if (mco.at(i + 1, i) > max) - max = mco.at(i + 1, i); - if (mco.at(i, i + 1) > max) - max = mco.at(i, i + 1); + if (opt::at(mco, i + 1, i) > max) + max = opt::at(mco, i + 1, i); + if (opt::at(mco, i, i + 1) > max) + max = opt::at(mco, i, i + 1); } max = max * 100 / input.nelements(); Index: sandbox/nature/co_occurence.hh --- sandbox/nature/co_occurence.hh (revision 3062) +++ sandbox/nature/co_occurence.hh (working copy) @@ -37,6 +37,7 @@ # include <mln/core/dpoint.hh> # include <mln/core/image/image2d.hh> # include <mln/level/fill.hh> +# include <mln/opt/at.hh> namespace mln @@ -64,7 +65,7 @@ mln_piter(I) p(ima.domain()); for_all(p) if (ima.domain().has(p + dp)) - mco.at(ima(p), ima(p + dp))++; + opt::at(mco, ima(p), ima(p + dp))++; return mco; } Index: sandbox/nature/proj.hh --- sandbox/nature/proj.hh (revision 3062) +++ sandbox/nature/proj.hh (working copy) @@ -35,6 +35,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/image1d.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln { @@ -47,7 +48,7 @@ mln_piter(image2d<T>) p(input.domain()); for_all(p) // 2d - out.at(p.row()) += input(p); + opt::at(out, p.row()) += input(p); mln_piter(image1d<T>) p2(out.domain()); unsigned count = geom::ncols(input); Index: sandbox/ballas/color/min_tree_volume_filter.cc --- sandbox/ballas/color/min_tree_volume_filter.cc (revision 3062) +++ sandbox/ballas/color/min_tree_volume_filter.cc (working copy) @@ -33,6 +33,7 @@ # include <mln/extension/fill.hh> # include <mln/morpho/closing_area.hh> +# include <mln/opt/at.hh> # include <mln/debug/println.hh> @@ -297,14 +298,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -326,7 +327,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -337,14 +338,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -386,7 +387,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -399,7 +400,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/reference.cc --- sandbox/ballas/color/reference.cc (revision 3062) +++ sandbox/ballas/color/reference.cc (working copy) @@ -40,6 +40,7 @@ # include <mln/morpho/closing_volume.hh> # include <mln/make/w_window2d.hh> +# include <mln/opt/at.hh> # include <mln/debug/println.hh> @@ -163,13 +164,13 @@ const int ncols = ima.ncols(); for (int r = -1; r <= nrows; ++r) { - ima.at(r, -1) = v; - ima.at(r, ncols) = v; + opt::at(ima, r, -1) = v; + opt::at(ima, r, ncols) = v; } for (int c = -1; c <= ncols; ++c) { - ima.at(-1, c) = v; - ima.at(nrows, c) = v; + opt::at(ima, -1, c) = v; + opt::at(ima, nrows, c) = v; } } @@ -287,14 +288,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -315,7 +316,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -326,14 +327,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -350,7 +351,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -416,7 +417,7 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } @@ -491,15 +492,15 @@ { if (is_row_odd(p)) { - mln_value(image2d<float>) t = ima.at(p.row() - 1, p.col()); - mln_value(image2d<float>) b = ima.at(p.row() + 1, p.col()); + mln_value(image2d<float>) t = opt::at(ima, p.row() - 1, p.col()); + mln_value(image2d<float>) b = opt::at(ima, p.row() + 1, p.col()); if ((t > 0 && b < 0) || (t < 0 && b > 0)) output(p) = value::rgb8(255,0,0); } else { - mln_value(image2d<float>) r = ima.at(p.row(), p.col() - 1); - mln_value(image2d<float>) d = ima.at(p.row(), p.col() + 1); + mln_value(image2d<float>) r = opt::at(ima, p.row(), p.col() - 1); + mln_value(image2d<float>) d = opt::at(ima, p.row(), p.col() + 1); if ((r > 0 && d < 0) || (r < 0 && d > 0)) output(p) = value::rgb8(255,0,0); } Index: sandbox/ballas/color/min_tree_area_filter.cc --- sandbox/ballas/color/min_tree_area_filter.cc (revision 3062) +++ sandbox/ballas/color/min_tree_area_filter.cc (working copy) @@ -36,6 +36,8 @@ # include <mln/morpho/meyer_wst.hh> # include <mln/morpho/closing_area.hh> +# include <mln/opt/at.hh> + # include <mln/debug/println.hh> # if 0 @@ -273,14 +275,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -301,7 +303,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -312,14 +314,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -362,7 +364,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -375,7 +377,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_height_filter.cc --- sandbox/ballas/color/min_tree_height_filter.cc (revision 3062) +++ sandbox/ballas/color/min_tree_height_filter.cc (working copy) @@ -31,6 +31,7 @@ # include <mln/level/fill.hh> # include <mln/level/transform.hh> # include <mln/extension/fill.hh> +# include <mln/opt/at.hh> # include <mln/morpho/closing_area.hh> @@ -297,14 +298,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -326,7 +327,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -337,14 +338,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -386,7 +387,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -399,7 +400,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_color.cc --- sandbox/ballas/color/min_tree_color.cc (revision 3062) +++ sandbox/ballas/color/min_tree_color.cc (working copy) @@ -34,6 +34,7 @@ # include <mln/extension/fill.hh> # include <mln/morpho/closing_area.hh> +# include <mln/opt/at.hh> # include <mln/debug/println.hh> @@ -292,14 +293,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -320,7 +321,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -331,14 +332,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -380,7 +381,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -393,7 +394,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/reference2.cc --- sandbox/ballas/color/reference2.cc (revision 3062) +++ sandbox/ballas/color/reference2.cc (working copy) @@ -39,6 +39,8 @@ # include <mln/linear/convolve.hh> # include <mln/make/w_window2d.hh> +# include <mln/opt/at.hh> + # include <mln/debug/println.hh> namespace mln @@ -145,13 +147,13 @@ const int ncols = ima.ncols(); for (int r = -1; r <= nrows; ++r) { - ima.at(r, -1) = v; - ima.at(r, ncols) = v; + opt::at(ima, r, -1) = v; + opt::at(ima, r, ncols) = v; } for (int c = -1; c <= ncols; ++c) { - ima.at(-1, c) = v; - ima.at(nrows, c) = v; + opt::at(ima, -1, c) = v; + opt::at(ima, nrows, c) = v; } } @@ -269,14 +271,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -293,7 +295,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -306,7 +308,7 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/min_tree_color_v2.cc --- sandbox/ballas/color/min_tree_color_v2.cc (revision 3062) +++ sandbox/ballas/color/min_tree_color_v2.cc (working copy) @@ -33,6 +33,7 @@ # include <mln/extension/fill.hh> # include <mln/morpho/closing_area.hh> +# include <mln/opt/at.hh> # include <mln/debug/println.hh> @@ -281,14 +282,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -309,7 +310,7 @@ unsigned col = (q.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) for (unsigned j = 0; j < zoom; ++j) - output.at(row + i, col + j) = ima(q); + opt::at(output, row + i, col + j) = ima(q); } mln_VAR( edge, ima | is_edge ); @@ -320,14 +321,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -369,7 +370,7 @@ 2 * input.ncols() - 1); for (unsigned row = 0; row < input.nrows(); ++row) for (unsigned col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -382,7 +383,7 @@ (input.ncols() + 1) / 2); for (unsigned row = 0; row < input.nrows(); row += 2) for (unsigned col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/ballas/color/laplacien.cc --- sandbox/ballas/color/laplacien.cc (revision 3062) +++ sandbox/ballas/color/laplacien.cc (working copy) @@ -13,6 +13,7 @@ #include <mln/core/var.hh> #include <mln/debug/println.hh> +#include <mln/opt/at.hh> #include "src/io.hh" #include "src/graph.hh" @@ -92,7 +93,7 @@ // if (laplacian(p) == 0u) // { // std::cout << "I'm here" << std::endl; -// graph.at(p.row() * 2, p.col() * 2) = value::rgb<8>(255, 0, 0); +// opt::at(graph, p.row() * 2, p.col() * 2) = value::rgb<8>(255, 0, 0); // } } Index: sandbox/geraud/wst_edge.cc --- sandbox/geraud/wst_edge.cc (revision 3062) +++ sandbox/geraud/wst_edge.cc (working copy) @@ -35,6 +35,8 @@ # include <mln/morpho/meyer_wst.hh> # include <mln/morpho/closing_volume.hh> +# include <mln/opt/at.hh> + # include <mln/debug/println.hh> @@ -88,13 +90,13 @@ const int ncols = ima.ncols(); for (int r = -1; r <= nrows; ++r) { - ima.at(r, -1) = v; - ima.at(r, ncols) = v; + opt::at(ima, r, -1) = v; + opt::at(ima, r, ncols) = v; } for (int c = -1; c <= ncols; ++c) { - ima.at(-1, c) = v; - ima.at(nrows, c) = v; + opt::at(ima, -1, c) = v; + opt::at(ima, nrows, c) = v; } } @@ -216,14 +218,14 @@ unsigned row = (p.row() / 2 + 1) * (zoom + 1) - 1; unsigned col = (p.col() / 2) * (zoom + 1); for (unsigned i = 0; i < zoom; ++i) - output.at(row, col + i) = ima(p); + opt::at(output, row, col + i) = ima(p); } else // vertical edge { unsigned row = (p.row() / 2) * (zoom + 1); unsigned col = (p.col() / 2 + 1) * (zoom + 1) - 1; for (unsigned i = 0; i < zoom; ++i) - output.at(row + i, col) = ima(p); + opt::at(output, row + i, col) = ima(p); } return output; } @@ -240,7 +242,7 @@ 2 * input.ncols() - 1); for (int row = 0; row < input.nrows(); ++row) for (int col = 0; col < input.ncols(); ++col) - output.at(2 * row, 2 * col) = input.at(row, col); + output.at(2 * row, 2 * col) = mln::opt::at(input, row, col); return output; } @@ -253,7 +255,7 @@ (input.ncols() + 1) / 2); for (int row = 0; row < input.nrows(); row += 2) for (int col = 0; col < input.ncols(); col += 2) - output.at(row / 2, col / 2) = input.at(row, col); + output.at(row / 2, col / 2) = mln::opt::at(input, row, col); return output; } Index: sandbox/geraud/fllt.svg.6.cc --- sandbox/geraud/fllt.svg.6.cc (revision 3062) +++ sandbox/geraud/fllt.svg.6.cc (working copy) @@ -60,6 +60,8 @@ #include <mln/util/branch_iter_ind.hh> #include <mln/util/branch_iter.hh> +#include <mln/opt/at.hh> + #include <sstream> @@ -177,7 +179,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + output.at(row, col) = mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/browsing/fwd.cc --- sandbox/geraud/browsing/fwd.cc (revision 3062) +++ sandbox/geraud/browsing/fwd.cc (working copy) @@ -3,6 +3,7 @@ # include <mln/value/int_u8.hh> # include <mln/accu/min_h.hh> # include <mln/accu/max_h.hh> +# include <mln/opt/at.hh> # include <mln/debug/println.hh> # include <mln/debug/iota.hh> @@ -104,10 +105,10 @@ // << std::endl; // for (unsigned c = 0; c <= half; ++c) - // std::cout << " take " << ima.at(row, c) << " "; + // std::cout << " take " << opt::at(ima, row, c) << " "; // std::cout << std::endl; - // std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // // ok (row, col) at line start @@ -122,8 +123,8 @@ // { // ++col; // ++col_plus; - // std::cout << " take " << ima.at(row, col_plus) << " "; - // std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // std::cout << " take " << opt::at(ima, row, col_plus) << " "; + // std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // } // std::cout << std::endl @@ -138,9 +139,9 @@ // ++col; // ++col_plus; // ++col_minus; - // std::cout << " take " << ima.at(row, col_plus) << " "; - // std::cout << " untake " << ima.at(row, col_minus) << " "; - // std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // std::cout << " take " << opt::at(ima, row, col_plus) << " "; + // std::cout << " untake " << opt::at(ima, row, col_minus) << " "; + // std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // // ok (row, col) at line middle // } // std::cout << std::endl; @@ -155,8 +156,8 @@ // { // ++col; // ++col_minus; - // std::cout << " untake " << ima.at(row, col_minus) << " "; - // std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // std::cout << " untake " << opt::at(ima, row, col_minus) << " "; + // std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // } // std::cout << std::endl; @@ -185,10 +186,10 @@ unsigned col = col_start; for (unsigned c = 0; c <= half && c < len; ++c) - std::cout << " take " << ima.at(row, col + c) << " "; + std::cout << " take " << opt::at(ima, row, col + c) << " "; std::cout << std::endl; - std::cout << " --> OK at " << ima.at(row, col) << std::endl; + std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // ok (row, col) at line start if (col == col_last) @@ -206,8 +207,8 @@ ++col; ++col_plus; if (col_plus <= col_last) - std::cout << " take " << ima.at(row, col_plus) << " "; - std::cout << " --> OK at " << ima.at(row, col) << std::endl; + std::cout << " take " << opt::at(ima, row, col_plus) << " "; + std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; } if (col == col_last) @@ -227,10 +228,10 @@ ++col_plus; ++col_minus; mln_invariant(col_plus >= col_start && col_plus <= col_last); - std::cout << " take " << ima.at(row, col_plus) << " "; + std::cout << " take " << opt::at(ima, row, col_plus) << " "; mln_invariant(col_minus >= col_start && col_minus <= col_last); - std::cout << " untake " << ima.at(row, col_minus) << " "; - std::cout << " --> OK at " << ima.at(row, col) << std::endl; + std::cout << " untake " << opt::at(ima, row, col_minus) << " "; + std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; // ok (row, col) at line middle } std::cout << std::endl; @@ -248,8 +249,8 @@ ++col; ++col_minus; mln_invariant(col_minus >= col_start && col_minus <= col_last); - std::cout << " untake " << ima.at(row, col_minus) << " "; - std::cout << " --> OK at " << ima.at(row, col) << std::endl; + std::cout << " untake " << opt::at(ima, row, col_minus) << " "; + std::cout << " --> OK at " << opt::at(ima, row, col) << std::endl; } std::cout << std::endl; Index: sandbox/geraud/fllt/fllt.hh --- sandbox/geraud/fllt/fllt.hh (revision 3062) +++ sandbox/geraud/fllt/fllt.hh (working copy) @@ -36,6 +36,7 @@ #include <mln/core/image/sub_image.hh> #include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/image/cast_image.hh> +#include <mln/opt/at.hh> #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> @@ -186,7 +187,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + opt::at(output, row, col) = opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.7.hh --- sandbox/geraud/fllt/fllt.svg.7.hh (revision 3062) +++ sandbox/geraud/fllt/fllt.svg.7.hh (working copy) @@ -40,6 +40,8 @@ #include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/image/cast_image.hh> +#include <mln/opt/at.hh> + #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> @@ -178,7 +180,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + opt::at(output, row, col) = opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.2.cc --- sandbox/geraud/fllt/fllt.svg.2.cc (revision 3062) +++ sandbox/geraud/fllt/fllt.svg.2.cc (working copy) @@ -48,6 +48,8 @@ #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <sstream> @@ -100,7 +102,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + output.at(row, col) = mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.3.cc --- sandbox/geraud/fllt/fllt.svg.3.cc (revision 3062) +++ sandbox/geraud/fllt/fllt.svg.3.cc (working copy) @@ -49,6 +49,8 @@ #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <sstream> @@ -101,7 +103,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + output.at(row, col) = mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.4.cc --- sandbox/geraud/fllt/fllt.svg.4.cc (revision 3062) +++ sandbox/geraud/fllt/fllt.svg.4.cc (working copy) @@ -51,6 +51,8 @@ #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <sstream> @@ -103,7 +105,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + output.at(row, col) = mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt.svg.5.cc --- sandbox/geraud/fllt/fllt.svg.5.cc (revision 3062) +++ sandbox/geraud/fllt/fllt.svg.5.cc (working copy) @@ -51,6 +51,8 @@ #include <mln/literal/white.hh> #include <mln/literal/colors.hh> +#include <mln/opt/at.hh> + #include <sstream> @@ -103,7 +105,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + output.at(row, col) = mln::opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt/fllt_test.hh --- sandbox/geraud/fllt/fllt_test.hh (revision 3062) +++ sandbox/geraud/fllt/fllt_test.hh (working copy) @@ -36,6 +36,8 @@ #include <mln/core/site_set/p_queue_fast.hh> #include <mln/core/image/cast_image.hh> +#include <mln/opt/at.hh> + #include <mln/value/int_u8.hh> #include <mln/value/rgb8.hh> @@ -181,7 +183,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + opt::at(output, row, col) = opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/fllt.svg.7.hh --- sandbox/geraud/fllt.svg.7.hh (revision 3062) +++ sandbox/geraud/fllt.svg.7.hh (working copy) @@ -63,6 +63,7 @@ #include <mln/util/tree.hh> #include <mln/util/branch_iter_ind.hh> #include <mln/util/branch_iter.hh> +#include <mln/opt/at.hh> #include <sstream> @@ -178,7 +179,7 @@ image2d<T> output(nrows_, ncols_); for (int row = 0; row < nrows_; ++row) for (int col = 0; col < ncols_; ++col) - output.at(row, col) = input.at(row / coef, col / coef); + opt::at(output, row, col) = opt::at(input, row / coef, col / coef); return output; } Index: sandbox/geraud/dmap.cc --- sandbox/geraud/dmap.cc (revision 3062) +++ sandbox/geraud/dmap.cc (working copy) @@ -8,6 +8,7 @@ #include <mln/accu/max.hh> #include <mln/io/pbm/load.hh> #include <mln/io/pgm/save.hh> +#include <mln/opt/at.hh> namespace mln @@ -107,7 +108,7 @@ const unsigned n = 9; image2d<bool> ima(n, n); level::fill(ima, false); - ima.at(n / 2, n / 2) = true; + opt::at(ima, n / 2, n / 2) = true; // int ws[] = { 3, 2, 3, // 2, 0, 2, Index: sandbox/geraud/tufa_2008/steps.0.cc --- sandbox/geraud/tufa_2008/steps.0.cc (revision 3062) +++ sandbox/geraud/tufa_2008/steps.0.cc (working copy) @@ -42,6 +42,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln @@ -54,10 +55,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/steps.1.cc --- sandbox/geraud/tufa_2008/steps.1.cc (revision 3062) +++ sandbox/geraud/tufa_2008/steps.1.cc (working copy) @@ -44,6 +44,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln @@ -56,10 +57,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/steps.2.cc --- sandbox/geraud/tufa_2008/steps.2.cc (revision 3062) +++ sandbox/geraud/tufa_2008/steps.2.cc (working copy) @@ -44,6 +44,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln @@ -56,10 +57,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/steps.3.cc --- sandbox/geraud/tufa_2008/steps.3.cc (revision 3062) +++ sandbox/geraud/tufa_2008/steps.3.cc (working copy) @@ -45,6 +45,8 @@ #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> + namespace mln { @@ -56,10 +58,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/steps.2b.cc --- sandbox/geraud/tufa_2008/steps.2b.cc (revision 3062) +++ sandbox/geraud/tufa_2008/steps.2b.cc (working copy) @@ -44,6 +44,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/closing_area.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln @@ -56,10 +57,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/compute_a.cc --- sandbox/geraud/tufa_2008/compute_a.cc (revision 3062) +++ sandbox/geraud/tufa_2008/compute_a.cc (working copy) @@ -46,6 +46,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/accu/count.hh> +#include <mln/opt/at.hh> @@ -59,10 +60,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/fz_count.cc --- sandbox/geraud/tufa_2008/fz_count.cc (revision 3062) +++ sandbox/geraud/tufa_2008/fz_count.cc (working copy) @@ -39,6 +39,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/labeling/flat_zones.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> namespace mln @@ -51,10 +52,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: sandbox/geraud/tufa_2008/regmin_count.cc --- sandbox/geraud/tufa_2008/regmin_count.cc (revision 3062) +++ sandbox/geraud/tufa_2008/regmin_count.cc (working copy) @@ -40,6 +40,8 @@ #include <mln/labeling/flat_zones.hh> #include <mln/level/fill.hh> +#include <mln/opt/at.hh> + namespace mln { @@ -51,10 +53,10 @@ for (int r = 0; r < nr; ++r) { for (int c = 0; c < nc; ++c) - if (par.at(r,c) == point2d(r,c)) + if (opt::at(par, r,c) == point2d(r,c)) std::cout << "( ) "; else - std::cout << par.at(r,c) << ' '; + std::cout << opt::at(par, r,c) << ' '; std::cout << std::endl; } } Index: tests/debug/println_with_border.cc --- tests/debug/println_with_border.cc (revision 3062) +++ tests/debug/println_with_border.cc (working copy) @@ -35,6 +35,7 @@ #include <mln/level/fill.hh> #include <mln/debug/println.hh> #include <mln/debug/println_with_border.hh> +#include <mln/opt/at.hh> using namespace mln; @@ -46,17 +47,17 @@ { image2d<bool> msk(3, 3); - msk.at(0, 0) = true; - msk.at(1, 0) = true; - msk.at(2, 0) = true; - - msk.at(0, 1) = true; - msk.at(1, 1) = false; - msk.at(2, 1) = true; - - msk.at(0, 2) = true; - msk.at(1, 2) = true; - msk.at(2, 2) = true; + opt::at(msk, 0, 0) = true; + opt::at(msk, 1, 0) = true; + opt::at(msk, 2, 0) = true; + + opt::at(msk, 0, 1) = true; + opt::at(msk, 1, 1) = false; + opt::at(msk, 2, 1) = true; + + opt::at(msk, 0, 2) = true; + opt::at(msk, 1, 2) = true; + opt::at(msk, 2, 2) = true; debug::println(msk); debug::println_with_border(msk); @@ -64,9 +65,9 @@ { image1d<bool> msk(3); - msk.at(0) = false; - msk.at(1) = true; - msk.at(2) = false; + opt::at(msk, 0) = false; + opt::at(msk, 1) = true; + opt::at(msk, 2) = false; debug::println(msk); debug::println_with_border(msk); Index: tests/debug/println.cc --- tests/debug/println.cc (revision 3062) +++ tests/debug/println.cc (working copy) @@ -33,6 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> +#include <mln/opt/at.hh> using namespace mln; @@ -41,6 +42,6 @@ int main() { image2d<bool> msk(3, 3); - msk.at(1, 1) = true; + opt::at(msk, 1, 1) = true; debug::println(msk); } Index: tests/histo/compute.cc --- tests/histo/compute.cc (revision 3062) +++ tests/histo/compute.cc (working copy) @@ -42,6 +42,8 @@ #include <mln/accu/histo.hh> #include <mln/histo/compute.hh> +#include <mln/opt/at.hh> + int main() { @@ -66,7 +68,7 @@ { image2d<int_u8> ima(3, 3); debug::iota(ima); - ima.at(0,0) = 2; + opt::at(ima, 0,0) = 2; histo::data<int_u8> h = histo::compute(ima); std::ostringstream oss; Index: tests/core/other/pixel.cc --- tests/core/other/pixel.cc (revision 3062) +++ tests/core/other/pixel.cc (working copy) @@ -33,6 +33,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/pixel.hh> #include <mln/metal/equal.hh> +#include <mln/opt/at.hh> int main() @@ -47,12 +48,12 @@ { pixel<I> pxl(ima, point2d(1, 1)); pxl.val() = 51; - mln_assertion(ima.at(1, 1) == 51); + mln_assertion(opt::at(ima, 1, 1) == 51); } { pixel<const I> pxl(ima, point2d(1, 1)); - ima.at(1, 1) = 51; + opt::at(ima, 1, 1) = 51; mln_assertion(unsigned(pxl) == 4); mln_assertion(pxl.val() == 51); Index: tests/opt/Makefile.am --- tests/opt/Makefile.am (revision 0) +++ tests/opt/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + at + +at_SOURCES = at.cc + +TESTS = $(check_PROGRAMS) Index: tests/level/convert.cc --- tests/level/convert.cc (revision 3062) +++ tests/level/convert.cc (working copy) @@ -35,6 +35,7 @@ #include <mln/value/rgb8.hh> #include <mln/literal/grays.hh> +#include <mln/opt/at.hh> int main() @@ -47,10 +48,10 @@ // bool -> rgb8 { image2d<bool> ima(1, 2); - ima.at(0, 0) = false; - ima.at(0, 1) = true; + opt::at(ima, 0, 0) = false; + opt::at(ima, 0, 1) = true; image2d<rgb8> out = level::convert(rgb8(), ima); - mln_assertion(out.at(0, 0) == literal::black); - mln_assertion(out.at(0, 1) == literal::white); + mln_assertion(opt::at(out, 0, 0) == literal::black); + mln_assertion(opt::at(out, 0, 1) == literal::white); } } Index: tests/level/memset_.cc --- tests/level/memset_.cc (revision 3062) +++ tests/level/memset_.cc (working copy) @@ -34,6 +34,7 @@ #include <mln/geom/ncols.hh> #include <mln/level/fill.hh> #include <mln/level/memset_.hh> +#include <mln/opt/at.hh> int main() @@ -48,6 +49,6 @@ geom::ncols(ima) + 2 * ima.border() + 1); // ^ // | - mln_assertion(ima.at(1,0) == X); // <----------------+ - mln_assertion(ima.at(1,1) != X); + mln_assertion(opt::at(ima, 1,0) == X); // <----------------+ + mln_assertion(opt::at(ima, 1,1) != X); } Index: tests/transform/distance_geodesic.cc --- tests/transform/distance_geodesic.cc (revision 3062) +++ tests/transform/distance_geodesic.cc (working copy) @@ -34,6 +34,7 @@ #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> +#include <mln/opt/at.hh> #include <mln/transform/distance_geodesic.hh> @@ -45,7 +46,7 @@ image2d<bool> input(9, 9); level::fill(input, false); - input.at(4, 4) = true; + opt::at(input, 4, 4) = true; image2d<int_u8> output = transform::distance_geodesic(input, c4(), int_u8(4)); debug::println(output); Index: tests/transform/distance_front.cc --- tests/transform/distance_front.cc (revision 3062) +++ tests/transform/distance_front.cc (working copy) @@ -35,6 +35,7 @@ #include <mln/value/int_u8.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> +#include <mln/opt/at.hh> #include <mln/transform/distance_front.hh> @@ -46,7 +47,7 @@ image2d<bool> input(9, 9); level::fill(input, false); - input.at(4, 4) = true; + opt::at(input, 4, 4) = true; int ws[] = { 0, 9, 0, 9, 0, 9, 6, 4, 6, 9, Index: tests/make/dual_neighb.cc --- tests/make/dual_neighb.cc (revision 3062) +++ tests/make/dual_neighb.cc (working copy) @@ -32,6 +32,7 @@ #include <mln/make/dual_neighb.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image2d.hh> +#include <mln/opt/at.hh> @@ -53,8 +54,8 @@ using namespace mln; image2d<bool> ima(1, 2, 1); - ima.at(0, 0) = true; - ima.at(0, 1) = false; + opt::at(ima, 0, 0) = true; + opt::at(ima, 0, 1) = false; mln_assertion( count(ima, make::dual_neighb(ima, c4(), c8())) == c4().size() + c8().size() ); Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 3062) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -76,6 +76,8 @@ #include <mln/math/max.hh> #include <mln/math/abs.hh> +#include <mln/opt/at.hh> + #include "tests/data.hh" @@ -100,7 +102,7 @@ image2d<input_val_t> input (nrows, ncols); for (unsigned r = 0; r < nrows; ++r) for (unsigned c = 0; c < ncols; ++c) - input.at(r,c) = + opt::at(input, r,c) = ((r / square_length) % 2 == (c / square_length) % 2) ? mln_min(input_val_t) : mln_max(input_val_t); Index: tests/Makefile.am --- tests/Makefile.am (revision 3062) +++ tests/Makefile.am (working copy) @@ -30,6 +30,7 @@ metal \ morpho \ norm \ + opt \ pw \ set \ subsampling \ Index: tests/canvas/chamfer.cc --- tests/canvas/chamfer.cc (revision 3062) +++ tests/canvas/chamfer.cc (working copy) @@ -43,6 +43,8 @@ #include <mln/geom/chamfer.hh> #include <mln/level/compare.hh> +#include <mln/opt/at.hh> + int main() { @@ -53,7 +55,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 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] = @@ -75,7 +77,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 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); @@ -98,7 +100,7 @@ { level::fill(ima, false); - ima.at(4,4) = true; + opt::at(ima, 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()); Index: doc/tutorial/samples/ima2d-3.cc --- doc/tutorial/samples/ima2d-3.cc (revision 3062) +++ doc/tutorial/samples/ima2d-3.cc (working copy) @@ -1,5 +1,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/box2d.hh> +#include <mln/opt/at.hh> + int main() { using namespace mln; @@ -13,8 +15,8 @@ // Associate '9' as value for the site/point2d (1,2). // The value is returned by reference and can be changed. - ima.at(1,2) = 9; - std::cout << "ima.at(1,2) = " << ima.at(1,2) + opt::at(ima, 1,2) = 9; + std::cout << "ima.at(1,2) = " << opt::at(ima, 1,2) << std::endl; std::cout << "ima(p) = " << ima(p) << std::endl; @@ -25,7 +27,7 @@ // The value is returned by reference // and can be changed as well. ima(p) = 2; - std::cout << "ima.at(1,2) = " << ima.at(1,2) + std::cout << "ima.at(1,2) = " << opt::at(ima, 1,2) << std::endl; std::cout << "ima(p) = " << ima(p) << std::endl; // \} Index: doc/tutorial/examples/image_plain.cc --- doc/tutorial/examples/image_plain.cc (revision 3062) +++ doc/tutorial/examples/image_plain.cc (working copy) @@ -3,6 +3,7 @@ # include <mln/debug/println.hh> # include <mln/debug/iota.hh> # include <mln/level/fill_with_value.hh> +# include <mln/opt/at.hh> template <typename I> @@ -10,14 +11,14 @@ { using namespace mln; const unsigned - nr = ima.at(0,0).domain().nrows(), - nc = ima.at(0,0).domain().ncols(); + nr = opt::at(ima, 0,0).domain().nrows(), + nc = opt::at(ima, 0,0).domain().ncols(); for (unsigned row = 0; row < ima.nrows(); ++row) for (unsigned r = 0; r < nr; ++r) { for (unsigned col = 0; col < ima.ncols(); ++col) for (unsigned c = 0; c < nc; ++c) - std::cout << ima.at(row, col)(point2d(r,c)) << ' '; + std::cout << opt::at(ima, row, col)(point2d(r,c)) << ' '; std::cout << std::endl; } } @@ -36,6 +37,6 @@ image2d<I_> mos(2, 2); level::fill_with_value(mos, ima); - level::fill_with_value(mos.at(1,1), 0); + level::fill_with_value(opt::at(mos, 1,1), 0); picture(mos); } Index: doc/benchmark/image2d.cc --- doc/benchmark/image2d.cc (revision 3062) +++ doc/benchmark/image2d.cc (working copy) @@ -2,6 +2,7 @@ # include <mln/util/timer.hh> # include <mln/core/pixter2d.hh> +# include <mln/opt/at.hh> int size; @@ -45,7 +46,7 @@ t.start(); for (int row = 0; row < size; ++row) for (int col = 0; col < size; ++col) - ima.at(row, col) = 0; + mln::opt::at(ima, row, col) = 0; return t.read(); } @@ -80,7 +81,7 @@ mln::def::coord & row = p.row(), & col = p.col(); for (row = 0; row < size; ++row) for (col = 0; col < size; ++col) - ima.at(row, col) = 0; + mln::opt::at(ima, row, col) = 0; return t.read(); } Index: doc/examples/labeling_algo.cc --- doc/examples/labeling_algo.cc (revision 3062) +++ doc/examples/labeling_algo.cc (working copy) @@ -43,6 +43,8 @@ # include <mln/draw/mesh.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/make/voronoi.hh> +# include <mln/make/voronoi.hh> +# include <mln/opt/at.hh> int main() { @@ -59,7 +61,7 @@ image2d<int> input(in.domain()); level::fill(input, lab); - lab.at(0,0) = 0; + opt::at(lab, 0,0) = 0; image2d<unsigned> inte = geom::seeds2tiling(lab, c4 ()); border::fill(inte, 0);

1 0