Olena-patches October 2007

olena-patches@lrde.epita.fr

8 participants
229 discussions

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add new kind of queue. * queue_p_fast.hh, * queue_p_fast_priority.hh, * queue_p_priority.hh: New kind of queue. * internal/image_base.hh: Add (id_). --- internal/image_base.hh | 2 queue_p_fast.hh | 275 ++++++++++++++++++++++++++++++++++++++++ queue_p_fast_priority.hh | 322 +++++++++++++++++++++++++++++++++++++++++++++++ queue_p_priority.hh | 321 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 920 insertions(+) Index: trunk/milena/mln/core/internal/image_base.hh =================================================================== --- trunk/milena/mln/core/internal/image_base.hh (revision 1323) +++ trunk/milena/mln/core/internal/image_base.hh (revision 1324) @@ -156,6 +156,8 @@ const util::tracked_ptr< internal::data_<E> >& hook_data_() const { return data_; } + const void* id_() const { return data_.ptr_; } + protected: image_base_(); Index: trunk/milena/mln/core/queue_p_fast.hh =================================================================== --- trunk/milena/mln/core/queue_p_fast.hh (revision 0) +++ trunk/milena/mln/core/queue_p_fast.hh (revision 1324) @@ -0,0 +1,275 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_QUEUE_P_FAST_HH +# define MLN_CORE_QUEUE_P_FAST_HH + +/*! \file mln/core/queue_p_fast.hh + * + * \brief Definition of a point set class based on std::deque. + */ + +# include <vector> +# include <deque> +# include <algorithm> +# include <iterator> + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/vec_p_piter.hh> +# include <mln/accu/bbox.hh> + + +namespace mln +{ + + // Fwd decls. + template <typename P> struct vec_p_fwd_piter_; + template <typename P> struct vec_p_bkd_piter_; + + + /*! \brief Point queue class (based on std::deque). + * + * This is a mathematical set of points (unique insertion). + * + * \todo Make it work with P being a Point_Site. + * \todo Add a parameter flag to choose another policy for "push" + * (i.e., no-op if multiple or allow multiple insertions). + * + * \warning We have some troubles with point set comparison based on + * a call to npoints() when this container is multiple. + */ + template <typename P> + class queue_p_fast : public internal::point_set_base_< P, queue_p_fast > + { + public: + + /// Forward Point_Iterator associated type. + typedef vec_p_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef vec_p_bkd_piter_ bkd_piter; + + /// Constructor. + queue_p_fast(); + + /// Test is \p p belongs to this point set. + bool has(const P& p) const; + + /// Test if queue is empty or not. + bool empty() const; + + /// Give the number of points. + std::size_t npoints() const; + + /// Give the exact bounding box. + const box_& bbox() const; + + /// Push force a point \p p in the queue. + queue_p_fast& push_force(const P& p); + + /// Push a point \p p in the queue. + queue_p_fast& push(const P& p); + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point. + void pop(); + + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point. + const P& front() const; + + /// Clear the queue. + void clear(); + + /// Return the corresponding std::vector of points. + const std::vector& vect() const; + + /// Return the \p i-th point. + const P& operator[](unsigned i) const; + + protected: + + std::vector q_; + std::size_t begin_; + std::size_t end_; + + mutable std::vector vect_; + mutable bool vect_needs_update_; + void vect_update_() const; + + mutable accu::bbox bb_; + mutable bool bb_needs_update_; + void bb_update_() const; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + queue_p_fast::queue_p_fast() + { + // vect_needs_update_ = false; + bb_needs_update_ = false; + begin_ = 0; + end_ = 0; + } + + template <typename P> + void + queue_p_fast::vect_update_() const + { + vect_.clear(); + vect_.reserve(q_.size()); + std::copy(q_.begin(), q_.end(), + std::back_inserter(vect_)); + vect_needs_update_ = false; + } + + template <typename P> + void + queue_p_fast::bb_update_() const + { + bb_.init(); + for (std::size_t i = this->begin_; i < this->end_; ++i) + bb_.take(q_[i]); + bb_needs_update_ = false; + } + + template <typename P> + bool + queue_p_fast::has(const P& p) const + { + for (unsigned i = this->begin_; i < this->end_; ++i) + if (q_[i] == p) + return true; + return false; + } + + template <typename P> + bool + queue_p_fast::empty() const + { + return (this->begin_ == this->end_); + } + + template <typename P> + std::size_t + queue_p_fast::npoints() const + { + mln_precondition(this->end_ >= this->begin_); + return (this->end_ - this->begin_); + } + + template <typename P> + const box_& + queue_p_fast::bbox() const + { + mln_precondition(npoints() != 0); + if (bb_needs_update_) + bb_update_(); + return bb_.to_result(); + } + + template <typename P> + queue_p_fast& + queue_p_fast::push_force(const P& p) + { + q_.push_back(p); + ++this->end_; + if (! vect_needs_update_) + { + // vect_needs_update_ = true; + bb_needs_update_ = true; + } + return *this; + } + + template <typename P> + queue_p_fast& + queue_p_fast::push(const P& p) + { + mln_precondition(! this->has(p)); + // FIXME: Our choice is "error if multiple insertions" + return this->push_force(p); + } + + template <typename P> + void + queue_p_fast::pop() + { + ++this->begin_; +// q_.pop_front(); +// if (! vect_needs_update_) +// { +// vect_needs_update_ = true; +// bb_needs_update_ = true; +// } + } + + template <typename P> + const P& + queue_p_fast::front() const + { + mln_precondition(! this->empty()); + return q_[begin_]; + } + + template <typename P> + void + queue_p_fast::clear() + { + this->end_ = begin_; +// q_.clear(); +// vect_.clear(); +// vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P> + const std::vector& + queue_p_fast::vect() const + { + if (vect_needs_update_) + vect_update_(); + return vect_; + } + + template <typename P> + const P& + queue_p_fast::operator[](unsigned i) const + { + mln_precondition(i < npoints()); + return q_[begin_ + i]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_QUEUE_P_FAST_HH Index: trunk/milena/mln/core/queue_p_fast_priority.hh =================================================================== --- trunk/milena/mln/core/queue_p_fast_priority.hh (revision 0) +++ trunk/milena/mln/core/queue_p_fast_priority.hh (revision 1324) @@ -0,0 +1,322 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_QUEUE_P_FAST_PRIORITY_HH +# define MLN_CORE_QUEUE_P_FAST_PRIORITY_HH + +/*! \file mln/core/queue_p_fast_priority.hh + * + * \brief Definition of a point set class based on std::deque + * and std::map. + */ + +# include <vector> +# include <deque> +# include <map> +# include <algorithm> +# include <iterator> + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/vec_p_piter.hh> +# include <mln/accu/bbox.hh> +# include <mln/core/queue_p_fast.hh> + +namespace mln +{ + + // Fwd decls. + template <typename P> struct vec_p_fwd_piter_; + template <typename P> struct vec_p_bkd_piter_; + + + /*! \brief Point queue class (based on std::deque). + * + * This is a mathematical set of points (unique insertion). + * + * \todo Make it work with P being a Point_Site. + * \todo Add a parameter flag to choose another policy for "push" + * (i.e., no-op if multiple or allow multiple insertions). + * + * \warning We have some troubles with point set comparison based on + * a call to npoints() when this container is multiple. + */ + template <typename P, typename T> + class queue_p_fast_priority : public internal::point_set_base_< P, queue_p_fast_priority<P, T> > + { + public: + + /// Forward Point_Iterator associated type. + typedef vec_p_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef vec_p_bkd_piter_ bkd_piter; + + /// Constructor. + queue_p_fast_priority(); + + /// Test is \p p belongs to this point set. + bool has(const P& p) const; + + /// Test if queue is empty or not. + bool empty() const; + + /// Give the number of points. + unsigned npoints() const; + + /// Give the exact bounding box. + const box_& bbox() const; + + /// Push force a point \p p in the queue. + queue_p_fast_priority<P, T>& push_force(const P& p, T prio = 0); + + /// Push a point \p p in the queue. + queue_p_fast_priority<P, T>& push(const P& p, T prio = 0); + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point. + void pop(); + + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point. + const P& front() const; + + /// Clear the queue. + void clear(); + + /// Return the corresponding std::vector of points. + const std::vector& vect() const; + + /// Return the \p i-th point. + const P& operator[](unsigned i) const; + + protected: + + std::map<const T, queue_p_fast > q_; + + mutable std::vector vect_; + mutable bool vect_needs_update_; + void vect_update_() const; + + mutable accu::bbox bb_; + mutable bool bb_needs_update_; + void bb_update_() const; + + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, typename T> + queue_p_fast_priority<P, T>::queue_p_fast_priority() + { + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T> + void + queue_p_fast_priority<P, T>::vect_update_() const + { + vect_.clear(); + vect_.reserve(npoints()); + + typename std::map<T, queue_p_fast >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + std::copy((*it).second.vect().begin(), (*it).second.vect().end(), + std::back_inserter(vect_)); + vect_needs_update_ = false; + } + + template <typename P, typename T> + void + queue_p_fast_priority<P, T>::bb_update_() const + { + bb_.init(); + + typename std::map<T, queue_p_fast >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + for (unsigned i = 0; i < (*it).second.npoints (); ++i) + bb_.take((*it).second[i]); + bb_needs_update_ = false; + } + + + template <typename P, typename T> + bool + queue_p_fast_priority<P, T>::has(const P& p) const + { + typename std::map<T, queue_p_fast >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if ((*it).second.has (p)) + return true; + return false; + } + + template <typename P, typename T> + bool + queue_p_fast_priority<P, T>::empty() const + { + typename std::map<T, queue_p_fast >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!(*it).second.empty ()) + return false; + return true; + } + + template <typename P, typename T> + unsigned + queue_p_fast_priority<P, T>::npoints() const + { + unsigned res = 0; + + typename std::map<T, queue_p_fast >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!(*it).second.empty ()) + res += (*it).second.npoints(); + return res; + } + + template <typename P, typename T> + const box_& + queue_p_fast_priority<P, T>::bbox() const + { + mln_precondition(npoints() != 0); + if (bb_needs_update_) + bb_update_(); + return bb_.to_result(); + } + + template <typename P, typename T> + queue_p_fast_priority<P, T>& + queue_p_fast_priority<P, T>::push_force(const P& p, T prio) + { + q_[prio].push_force (p); + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + return *this; + } + + template <typename P, typename T> + queue_p_fast_priority<P, T>& + queue_p_fast_priority<P, T>::push(const P& p, T prio) + { + if (! has(p)) + return this->push_force(p, prio); + else + return *this; + } + + template <typename P, typename T> + void + queue_p_fast_priority<P, T>::pop() + { + typename std::map<T, queue_p_fast >::reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!(*it).second.empty ()) + return (*it).second.pop (); + + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + } + + template <typename P, typename T> + const P& + queue_p_fast_priority<P, T>::front() const + { + mln_precondition(! q_.empty()); + + typename std::map<T, queue_p_fast >::const_reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!(*it).second.empty ()) + break; + return (*it).second.front (); + } + + template <typename P, typename T> + void + queue_p_fast_priority<P, T>::clear() + { + typename std::map<T, queue_p_fast >::iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + (*it).second.clear (); + q_.clear(); + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T> + const std::vector& + queue_p_fast_priority<P, T>::vect() const + { + if (vect_needs_update_) + vect_update_(); + return vect_; + } + + template <typename P, typename T> + const P& + queue_p_fast_priority<P, T>::operator[](unsigned i) const + { + mln_precondition(i < npoints()); + + typename std::map<T, queue_p_fast >::const_reverse_iterator it = q_.rbegin (); + unsigned cpt = 0; + + for (; it != q_.rend (); ++it) + { + if (!(*it).second.empty ()) + for (cpt = 0; cpt < (*it).second.npoints (); ++cpt) + { + if (i == 0) + return (*it).second[cpt]; + --i; + } + } + return (*it).second[cpt]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_QUEUE_P_FAST_PRIORITY_HH Index: trunk/milena/mln/core/queue_p_priority.hh =================================================================== --- trunk/milena/mln/core/queue_p_priority.hh (revision 0) +++ trunk/milena/mln/core/queue_p_priority.hh (revision 1324) @@ -0,0 +1,321 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_QUEUE_P_PRIORITY_HH +# define MLN_CORE_QUEUE_P_PRIORITY_HH + +/*! \file mln/core/queue_p_priority.hh + * + * \brief Definition of a point set class based on std::deque. + */ + +# include <vector> +# include <deque> +# include <map> +# include <algorithm> +# include <iterator> + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/vec_p_piter.hh> +# include <mln/accu/bbox.hh> +# include <mln/core/queue_p.hh> + +namespace mln +{ + + // Fwd decls. + template <typename P> struct vec_p_fwd_piter_; + template <typename P> struct vec_p_bkd_piter_; + + + /*! \brief Point queue class (based on std::deque). + * + * This is a mathematical set of points (unique insertion). + * + * \todo Make it work with P being a Point_Site. + * \todo Add a parameter flag to choose another policy for "push" + * (i.e., no-op if multiple or allow multiple insertions). + * + * \warning We have some troubles with point set comparison based on + * a call to npoints() when this container is multiple. + */ + template <typename P, typename T> + class queue_p_priority : public internal::point_set_base_< P, queue_p_priority<P, T> > + { + public: + + /// Forward Point_Iterator associated type. + typedef vec_p_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef vec_p_bkd_piter_ bkd_piter; + + /// Constructor. + queue_p_priority(); + + /// Test is \p p belongs to this point set. + bool has(const P& p) const; + + /// Test if queue is empty or not. + bool empty() const; + + /// Give the number of points. + unsigned npoints() const; + + /// Give the exact bounding box. + const box_& bbox() const; + + /// Push force a point \p p in the queue. + queue_p_priority<P, T>& push_force(const P& p, T prio = 0); + + /// Push a point \p p in the queue. + queue_p_priority<P, T>& push(const P& p, T prio = 0); + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point. + void pop(); + + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point. + const P& front() const; + + /// Clear the queue. + void clear(); + + /// Return the corresponding std::vector of points. + const std::vector& vect() const; + + /// Return the \p i-th point. + const P& operator[](unsigned i) const; + + protected: + + std::map<const T, queue_p > q_; + + mutable std::vector vect_; + mutable bool vect_needs_update_; + void vect_update_() const; + + mutable accu::bbox bb_; + mutable bool bb_needs_update_; + void bb_update_() const; + + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, typename T> + queue_p_priority<P, T>::queue_p_priority() + { + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::vect_update_() const + { + vect_.clear(); + vect_.reserve(npoints()); + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + std::copy((*it).second.vect().begin(), (*it).second.vect().end(), + std::back_inserter(vect_)); + vect_needs_update_ = false; + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::bb_update_() const + { + bb_.init(); + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + for (unsigned i = 0; i < (*it).second.npoints (); ++i) + bb_.take((*it).second[i]); + bb_needs_update_ = false; + } + + + template <typename P, typename T> + bool + queue_p_priority<P, T>::has(const P& p) const + { + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if ((*it).second.has (p)) + return true; + return false; + } + + template <typename P, typename T> + bool + queue_p_priority<P, T>::empty() const + { + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!(*it).second.empty ()) + return false; + return true; + } + + template <typename P, typename T> + unsigned + queue_p_priority<P, T>::npoints() const + { + unsigned res = 0; + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!(*it).second.empty ()) + res += (*it).second.npoints(); + return res; + } + + template <typename P, typename T> + const box_& + queue_p_priority<P, T>::bbox() const + { + mln_precondition(npoints() != 0); + if (bb_needs_update_) + bb_update_(); + return bb_.to_result(); + } + + template <typename P, typename T> + queue_p_priority<P, T>& + queue_p_priority<P, T>::push_force(const P& p, T prio) + { + q_[prio].push_force (p); + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + return *this; + } + + template <typename P, typename T> + queue_p_priority<P, T>& + queue_p_priority<P, T>::push(const P& p, T prio) + { + if (! has(p)) + return this->push_force(p, prio); + else + return *this; + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::pop() + { + typename std::map<T, queue_p >::reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!(*it).second.empty ()) + return (*it).second.pop (); + + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + } + + template <typename P, typename T> + const P& + queue_p_priority<P, T>::front() const + { + mln_precondition(! q_.empty()); + + typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!(*it).second.empty ()) + break; + return (*it).second.front (); + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::clear() + { + typename std::map<T, queue_p >::iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + (*it).second.clear (); + q_.clear(); + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T> + const std::vector& + queue_p_priority<P, T>::vect() const + { + if (vect_needs_update_) + vect_update_(); + return vect_; + } + + template <typename P, typename T> + const P& + queue_p_priority<P, T>::operator[](unsigned i) const + { + mln_precondition(i < npoints()); + + typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); + unsigned cpt = 0; + + for (; it != q_.rend (); ++it) + { + if (!(*it).second.empty ()) + for (cpt = 0; cpt < (*it).second.npoints (); ++cpt) + { + if (i == 0) + return (*it).second[cpt]; + --i; + } + } + return (*it).second[cpt]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_QUEUE_P_PRIORITY_HH

17 years, 2 months

milena r1323: Update queue_p_priority

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update queue_p_priority. * queue_p_priority.hh: Update. --- queue_p_priority.hh | 72 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) Index: trunk/milena/sandbox/duhamel/queue_p_priority.hh =================================================================== --- trunk/milena/sandbox/duhamel/queue_p_priority.hh (revision 1322) +++ trunk/milena/sandbox/duhamel/queue_p_priority.hh (revision 1323) @@ -64,7 +64,7 @@ * a call to npoints() when this container is multiple. */ template <typename P, typename T> - class queue_p_priority// : public internal::point_set_base_< P, queue_p_priority > + class queue_p_priority : public internal::point_set_base_< P, queue_p_priority<P, T> > { public: @@ -78,16 +78,16 @@ queue_p_priority(); /// Test is \p p belongs to this point set. - bool has(const P& p); + bool has(const P& p) const; /// Test if queue is empty or not. - bool empty(); + bool empty() const; /// Give the number of points. - unsigned npoints(); + unsigned npoints() const; /// Give the exact bounding box. - const box_& bbox(); + const box_& bbox() const; /// Push force a point \p p in the queue. queue_p_priority<P, T>& push_force(const P& p, T prio = 0); @@ -101,7 +101,7 @@ /// Give the front point \p p of the queue; \p p is the least /// recently inserted point. - const P& front(); + const P& front() const; /// Clear the queue. void clear(); @@ -110,7 +110,7 @@ const std::vector& vect() const; /// Return the \p i-th point. - const P& operator[](unsigned i); + const P& operator[](unsigned i) const; protected: @@ -118,11 +118,11 @@ mutable std::vector vect_; mutable bool vect_needs_update_; - void vect_update_(); + void vect_update_() const; mutable accu::bbox bb_; mutable bool bb_needs_update_; - void bb_update_(); + void bb_update_() const; }; @@ -133,11 +133,13 @@ template <typename P, typename T> queue_p_priority<P, T>::queue_p_priority() { + vect_needs_update_ = false; + bb_needs_update_ = false; } template <typename P, typename T> void - queue_p_priority<P, T>::vect_update_() + queue_p_priority<P, T>::vect_update_() const { vect_.clear(); vect_.reserve(npoints()); @@ -145,66 +147,66 @@ typename std::map<T, queue_p >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - std::copy(q_[(*it).first].begin(), q_[(*it).first].end(), + std::copy((*it).second.begin(), (*it).second.end(), std::back_inserter(vect_)); vect_needs_update_ = false; } template <typename P, typename T> void - queue_p_priority<P, T>::bb_update_() + queue_p_priority<P, T>::bb_update_() const { bb_.init(); typename std::map<T, queue_p >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - for (unsigned i = 0; i < q_[(*it).first].npoints (); ++i) - bb_.take(q_[(*it).first][i]); + for (unsigned i = 0; i < (*it).second.npoints (); ++i) + bb_.take((*it).second[i]); } template <typename P, typename T> bool - queue_p_priority<P, T>::has(const P& p) + queue_p_priority<P, T>::has(const P& p) const { typename std::map<T, queue_p >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (q_[(*it).first].has (p)) + if ((*it).second.has (p)) return true; return false; } template <typename P, typename T> bool - queue_p_priority<P, T>::empty() + queue_p_priority<P, T>::empty() const { typename std::map<T, queue_p >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!q_[(*it).first].empty ()) + if (!(*it).second.empty ()) return false; return true; } template <typename P, typename T> unsigned - queue_p_priority<P, T>::npoints() + queue_p_priority<P, T>::npoints() const { unsigned res = 0; typename std::map<T, queue_p >::const_iterator it = q_.begin (); for (; it != q_.end (); ++it) - if (!q_[(*it).first].empty ()) - res += q_[(*it).first].npoints(); + if (!(*it).second.empty ()) + res += (*it).second.npoints(); return res; } template <typename P, typename T> const box_& - queue_p_priority<P, T>::bbox() + queue_p_priority<P, T>::bbox() const { mln_precondition(npoints() != 0); if (bb_needs_update_) @@ -235,11 +237,11 @@ void queue_p_priority<P, T>::pop() { - typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); + typename std::map<T, queue_p >::reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!q_[(*it).first].empty ()) - return q_[(*it).first].pop (); + if (!(*it).second.empty ()) + return (*it).second.pop (); if (! vect_needs_update_) { @@ -250,26 +252,26 @@ template <typename P, typename T> const P& - queue_p_priority<P, T>::front() + queue_p_priority<P, T>::front() const { mln_precondition(! q_.empty()); typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); for (; it != q_.rend (); ++it) - if (!q_[(*it).first].empty ()) + if (!(*it).second.empty ()) break; - return q_[(*it).first].front (); + return (*it).second.front (); } template <typename P, typename T> void queue_p_priority<P, T>::clear() { - typename std::map<T, queue_p >::const_iterator it = q_.begin (); + typename std::map<T, queue_p >::iterator it = q_.begin (); for (; it != q_.end (); ++it) - q_[(*it).first].clear (); + (*it).second.clear (); q_.clear(); vect_needs_update_ = false; bb_needs_update_ = false; @@ -286,7 +288,7 @@ template <typename P, typename T> const P& - queue_p_priority<P, T>::operator[](unsigned i) + queue_p_priority<P, T>::operator[](unsigned i) const { mln_precondition(i < npoints()); @@ -295,15 +297,15 @@ for (; it != q_.end (); ++it) { - if (!q_[(*it).first].empty ()) - for (cpt = 0; cpt < q_[(*it).first].npoints (); ++cpt) + if (!(*it).second.empty ()) + for (cpt = 0; cpt < (*it).second.npoints (); ++cpt) { if (i == 0) - return q_[(*it).first][cpt]; + return (*it).second[cpt]; --i; } } - return q_[(*it).first][cpt]; + return (*it).second[cpt]; } # endif // ! MLN_INCLUDE_ONLY

17 years, 2 months

milena r1322: Update composed transformation. (does not work)

by Simon Nivault

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-12 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update composed transformation. (does not work). * mln/core/macros.hh, * mln/fun/x2x/composed.hh, * mln/metal/bool.hh: Update. --- core/macros.hh | 4 ++ fun/x2x/composed.hh | 80 +++++++++++++++++++++++++++------------------------- metal/bool.hh | 2 + 3 files changed, 48 insertions(+), 38 deletions(-) Index: trunk/milena/mln/core/macros.hh =================================================================== --- trunk/milena/mln/core/macros.hh (revision 1321) +++ trunk/milena/mln/core/macros.hh (revision 1322) @@ -103,6 +103,10 @@ # define mln_image(T) typename T::image # define mln_image_(T) T::image +/// Shortcut to access the invert type associated to T. +# define mln_invert(T) typename T::invert +# define mln_invert_(T) T::invert + // l Index: trunk/milena/mln/metal/bool.hh =================================================================== --- trunk/milena/mln/metal/bool.hh (revision 1321) +++ trunk/milena/mln/metal/bool.hh (revision 1322) @@ -50,6 +50,7 @@ template <> struct bool_< true > { + typedef bool_<true> check_t; static const bool value = true; typedef bool_<true> eval; static void check(); @@ -63,6 +64,7 @@ template <> struct bool_< false > { + typedef bool_<false> check_not_t; static const bool value = false; typedef bool_<false> eval; static void check_not(); Index: trunk/milena/mln/fun/x2x/composed.hh =================================================================== --- trunk/milena/mln/fun/x2x/composed.hh (revision 1321) +++ trunk/milena/mln/fun/x2x/composed.hh (revision 1322) @@ -36,6 +36,8 @@ # include <mln/core/concept/function.hh> # include <mln/fun/internal/x2x_impl.hh> # include <mln/metal/vec.hh> +# include <mln/metal/is.hh> +# include <mln/metal/bexpr.hh> # include <mln/core/h_mat.hh> @@ -54,9 +56,12 @@ namespace internal { + template <unsigned n, typename F, typename G, typename E, bool is_bij> + struct helper_composed_; - template <typename F, typename G, typename E, bool is_bij = true> - struct helper_composed_ + + template <unsigned n, typename F, typename G, typename E> + struct helper_composed_<n, F, G, E, true> : public fun::internal::x2x_impl_<mln_result(F), E >, public Bijection_x2x<E> { @@ -68,8 +73,8 @@ helper_composed_(const F& f, const G& g); using super_::operator(); - metal::vec<dim,mln_result(F)> - operator()(const metal::vec<dim,mln_result(F)>& v) const; + metal::vec<n,mln_result(F)> + operator()(const metal::vec<n,mln_result(F)>& v) const; void set_first(const F& f); void set_second(const G& g); @@ -84,8 +89,8 @@ invert inv() const; }; - template <typename F, typename G, typename E> - struct helper_composed_<F, G, E, false> + template <unsigned n, typename F, typename G, typename E> + struct helper_composed_<n, F, G, E, false> : public fun::internal::x2x_impl_<mln_result(F), E >, public Function_x2x<E> { @@ -97,8 +102,8 @@ helper_composed_(const F& f, const G& g); using super_::operator(); - metal::vec<dim,mln_result(F)> - operator()(const metal::vec<dim,mln_result(F)>& v) const; + metal::vec<n,mln_result(F)> + operator()(const metal::vec<n,mln_result(F)>& v) const; void set_first(const F& f); void set_second(const G& g); @@ -115,20 +120,19 @@ template <typename F, typename G> struct composed - : public internal::helper_composed_<F, G, composed<F,G>, + : public internal::helper_composed_<F::dim, F, G, composed<F,G>, mlc_is(F, Bijection_x2x<F>)::value && mlc_is(G, Bijection_x2x<G>)::value>, - private metal::bool_<(F::dim == G::dim)>::check_t, - private metal::is<mln_argument(F), mln_result(G)>::check_t - { - typedef internal::helper_composed_<F, G, composed<F,G>, - mlc_is(F, Bijection_x2x<F>)::value && - mlc_is(G, Bijection_x2x<G>)::value> super_; + + private metal::and_< metal::bool_<(F::dim == G::dim)>, + metal::is<mln_argument(F), mln_result(G)> + >::check_t + { composed() {} composed(const F& f, const G& g) - : helper_composed_<F, G, composed<F,G>, + : internal::helper_composed_<F::dim, F, G, composed<F,G>, mlc_is(F, Bijection_x2x<F>)::value && mlc_is(G, Bijection_x2x<G>)::value>(f, g) { @@ -155,38 +159,38 @@ // Implementation of the bijective version. - template <typename F, typename G> - helper_composed_<F,G,E,true>::helper_composed_() + template <unsigned n, typename F, typename G, typename E> + helper_composed_<n,F,G,E,true>::helper_composed_() { this->m_ = h_mat<dim,mln_result(F)>::Id; } - template <typename F, typename G> - helper_composed_<F,G,E,true>::helper_composed_(const F& f, const G& g) + template <unsigned n, typename F, typename G, typename E> + helper_composed_<n,F,G,E,true>::helper_composed_(const F& f, const G& g) :f_(f), g_(g) { this->m_ = f_.mat() * g_.mat(); } - template <typename F, typename G> - metal::vec<helper_composed_<F,G,E,true>::dim, mln_result(F)> - helper_composed_<F,G,E,true>::operator()(const metal::vec<dim, mln_result(F)>& v) const + template <unsigned n, typename F, typename G, typename E> + metal::vec<n, mln_result(F)> + helper_composed_<n,F,G,E,true>::operator()(const metal::vec<n, mln_result(F)>& v) const { return this->m_(v); } - template <typename F, typename G> + template <unsigned n, typename F, typename G, typename E> void - helper_composed_<F,G,E,true>::set_first(const F& f) + helper_composed_<n,F,G,E,true>::set_first(const F& f) { this->f_ = f; this->m_ = this->f_.mat() * this->g_.mat(); } - template <typename F, typename G> + template <unsigned n, typename F, typename G, typename E> void - helper_composed_<F,G,E,true>::set_second(const G& g) + helper_composed_<n,F,G,E,true>::set_second(const G& g) { this->g_ = g; this->m_ = this->f_.mat() * this->g_.mat(); @@ -194,38 +198,38 @@ // Implementation of the non bijective version. - template <typename F, typename G> - helper_composed_<F,G,E,false>::helper_composed_() + template <unsigned n, typename F, typename G, typename E> + helper_composed_<n,F,G,E,false>::helper_composed_() { this->m_ = h_mat<dim,mln_result(F)>::Id; } - template <typename F, typename G> - helper_composed_<F,G,E,false>::helper_composed_(const F& f, const G& g) + template <unsigned n, typename F, typename G, typename E> + helper_composed_<n,F,G,E,false>::helper_composed_(const F& f, const G& g) :f_(f), g_(g) { this->m_ = f_.mat() * g_.mat(); } - template <typename F, typename G> - metal::vec<helper_composed_<F,G,E,false>::dim, mln_result(F)> - helper_composed_<F,G,E,false>::operator()(const metal::vec<dim, mln_result(F)>& v) const + template <unsigned n, typename F, typename G, typename E> + metal::vec<n, mln_result(F)> + helper_composed_<n,F,G,E,false>::operator()(const metal::vec<n, mln_result(F)>& v) const { return this->m_(v); } - template <typename F, typename G> + template <unsigned n, typename F, typename G, typename E> void - helper_composed_<F,G,E,false>::set_first(const F& f) + helper_composed_<n,F,G,E,false>::set_first(const F& f) { this->f_ = f; this->m_ = this->f_.mat() * this->g_.mat(); } - template <typename F, typename G> + template <unsigned n, typename F, typename G, typename E> void - helper_composed_<F,G,E,false>::set_second(const G& g) + helper_composed_<n,F,G,E,false>::set_second(const G& g) { this->g_ = g; this->m_ = this->f_.mat() * this->g_.mat();

17 years, 2 months

milena r1321: Add tests macros

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add tests macros. * tests/value_macros.hh: Macros to factorise tests. --- value_macros.hh | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) Index: trunk/milena/tests/value_macros.hh =================================================================== --- trunk/milena/tests/value_macros.hh (revision 0) +++ trunk/milena/tests/value_macros.hh (revision 1321) @@ -0,0 +1,104 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/value_macros.hh + * + * \brief Utilities to tests value types. + */ + +#define sym_compare_assert(V1, OP, V2) \ + \ + mln_assertion(V1 OP V2); \ + mln_assertion(-V1 OP -V2); \ + mln_assertion(V2 OP V1); \ + mln_assertion(-V2 OP -V1); + +#define asym_compare_assert(V1, OP, V2) \ + \ + mln_assertion(V1 OP V2); \ + mln_assertion(!(-V1 OP -V2)); \ + mln_assertion(-V2 OP -V1); \ + mln_assertion(!(V2 OP V1)); + +// For unsigned types, V1 > V2 if op is minus +#define test_interop(T1, T2, OP, V1, V2) \ + \ +{ \ + T1 i = V1; \ + T2 j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + sym_compare_assert(j, ==, float(V2)); \ + \ + i = V1; \ + j = V2; \ + \ + j = i OP j; \ + sym_compare_assert(j, ==, float(V1 OP V2)); \ + sym_compare_assert(i, ==, float(V1)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(V1 OP V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + \ + j OP##= j; \ + sym_compare_assert(j, ==, float(V2 OP V2)); \ + \ + i = V1; \ + j = V2; \ + j OP##= i; \ + sym_compare_assert(j, ==, float(V2 OP V1)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(((V1 OP V1)))); \ +} + +#define test_operator(T, OP, V1, V2) \ + \ +{ \ + T i = V1; \ + T j = V2; \ + \ + i = i OP j; \ + sym_compare_assert(i, ==, float(V1 OP V2)); \ + sym_compare_assert(j, ==, float(V2)); \ + \ + i = V1; \ + i OP##= i; \ + sym_compare_assert(i, ==, float(V1 OP V1)); \ + \ + i = V1; \ + j = V2; \ + i OP##= j; \ +}

17 years, 2 months

milena r1320: Fix graylevel. Tests on graylevel

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix graylevel. Tests on graylevel. * mln/value/graylevel.hh: Re add operator=(int) * tests/value_int_u8.cc: More tests. * tests/value_graylevel.cc: Likewise. FIXME : to augment. --- mln/value/graylevel.hh | 10 +++ tests/value_graylevel.cc | 144 +++++++++++++++++++++++++++++++++++++++++++---- tests/value_int_u8.cc | 94 ++++++++++-------------------- 3 files changed, 175 insertions(+), 73 deletions(-) Index: trunk/milena/tests/value_int_u8.cc =================================================================== --- trunk/milena/tests/value_int_u8.cc (revision 1319) +++ trunk/milena/tests/value_int_u8.cc (revision 1320) @@ -31,37 +31,7 @@ */ #include <mln/value/int_u8.hh> - -#define test_operator(T, OP, V1, V2) \ - \ -{ \ - T i = V1; \ - T j = V2; \ - \ - i = i OP j; \ - mln_assertion(i == (V1 OP V2)); \ - mln_assertion(j == V2); \ - \ - i OP##= i; \ - mln_assertion(i == (((V1 OP V2) OP (V1 OP V2)))); \ -} - -#define test_interop(T1, T2, OP, V1, V2) \ - \ -{ \ - T1 i = V1; \ - T2 j = V2; \ - \ - i = i OP j; \ - mln_assertion(i == (V1 OP V2)); \ - mln_assertion(j == V2); \ - \ - i OP##= i; \ - mln_assertion(i == (((V1 OP V2) OP (V1 OP V2)))); \ -} - - -// test_operator +#include <tests/value_macros.hh> int main() { @@ -73,21 +43,21 @@ // Assignment. { i = 51; - mln_assertion(i == 51); + sym_compare_assert(i, ==, 51); i = 51u; - mln_assertion(i == 51); + sym_compare_assert(i, ==, 51); signed char c = 51; i = c; - mln_assertion(i == 51); + sym_compare_assert(i, ==, 51); j = i; - mln_assertion(j == 51); + sym_compare_assert(j, ==, 51); i = 3; - mln_assertion(3.0f == i); - mln_assertion(i != 2.99f); + sym_compare_assert(3.0f, ==, i); + sym_compare_assert(i, !=, 2.99f); // Error at run-time as expected :-) // i = 256; @@ -101,16 +71,16 @@ int_u8 i = 42; int_u8 j = 51; - mln_assertion(i < j); - mln_assertion(j > i); - mln_assertion(i < 12345); - mln_assertion(12345 > i); - - mln_assertion(i != j); - mln_assertion(i == 42); - mln_assertion(42 == i); - mln_assertion(i != 69); - mln_assertion(69 != i); + asym_compare_assert(i, <, j); + asym_compare_assert(j, >, i); + asym_compare_assert(i, <, 12345.f); + asym_compare_assert(12345.f, >, i); + + sym_compare_assert(i, !=, j); + sym_compare_assert(i, ==, 42.f); + sym_compare_assert(42.f, ==, i); + sym_compare_assert(i, !=, 69.f); + sym_compare_assert(69.f, !=, i); } @@ -124,13 +94,13 @@ int_u8 i = 234; i++; - mln_assertion(i == 235); + sym_compare_assert(i, ==, 235.f); ++i; - mln_assertion(i == 236); + sym_compare_assert(i, ==, 236.f); i = +i; - mln_assertion(i == 236); + sym_compare_assert(i, ==, 236.f); } @@ -139,26 +109,24 @@ test_operator(int_u8, -, 100, 5); test_interop(int_u8, int, -, 100, 5); test_interop(int_u8, char, -, 100, 5); - test_interop(int_u8, unsigned char, -, 100, 5); + test_interop(int_u8, unsigned char, -, 5, 5); int_u8 c = 255; c -= c; - mln_assertion(c == 0); + sym_compare_assert(c, ==, 0.f); int_u8 i = 236; i--; - mln_assertion(i == 235); + sym_compare_assert(i, ==, 235.f); --i; - mln_assertion(i == 234); + sym_compare_assert(i, ==, 234.f); - std::cout << (-i) << " FIXME Matthieu: add .f to literals " << i << std::endl; - mln_assertion(-i == -234); // FIXME: old version - mln_assertion(-i == -234.f); // FIXME: new better version + sym_compare_assert(-i, ==, -234.f); - mln_assertion(i * -2 != 0.f); + sym_compare_assert(i * -2, !=, 0.f); std::cout << (i) << " * -2 = " << (i * -2) << ' ' << (-2 * i) << ' ' @@ -176,14 +144,14 @@ int_u8 c = 255; c *= 0; - mln_assertion(c == 0); + sym_compare_assert(c, ==, 0.f); i *= 2; int k; k *= i; unsigned char d = 0; i *= d; - mln_assertion(i == 0); + sym_compare_assert(i, ==, 0.f); // Error at run-time as expected :-) // i = 128; @@ -201,13 +169,13 @@ int_u8 c = 200; c /= 1; - mln_assertion(c == 200); + sym_compare_assert(c, ==, 200.f); c /= 2; - mln_assertion(c == 100); + sym_compare_assert(c, ==, 100.f); int_u8 d = 2; c /= 2; - mln_assertion(c == 50); + sym_compare_assert(c, ==, 50.f); } Index: trunk/milena/tests/value_graylevel.cc =================================================================== --- trunk/milena/tests/value_graylevel.cc (revision 1319) +++ trunk/milena/tests/value_graylevel.cc (revision 1320) @@ -27,7 +27,9 @@ /*! \file tests/value_graylevel.cc * - * \brief Tests on mln::value::graylevel. + * \brief Tests on mln::value::graylevel. Tests operations between + * graylevel of different encodings. + * */ @@ -45,22 +47,144 @@ using mln::literal::white; using mln::literal::black; + // Literals + { gl8 a = white; - gl16 b = black; + gl16 b = white; + mln_assertion(a == b); - mln_assertion(a.value() != b.value()); + mln_assertion(a.value() == 255); + mln_assertion(b.value() == 65535); - gl8 c = (a + b) / 2; + gl8 c = (white + white) / 2; mln_assertion(c == white); mln_assertion(c.value() == 255); - c = a; - mln_assertion(c == white); + a = black; + b = black; - c = (a * 2) / 2; - mln_assertion(c == white); + mln_assertion(a == b); + mln_assertion(a.value() == 0); + mln_assertion(b.value() == 0); + + c = (black + black) / 2; + mln_assertion(c == black); + mln_assertion(c.value() == 0); + } + + // Assigment + { + gl8 a; + gl8 b; + + a = white; + mln_assertion(a == white); + mln_assertion(a.value() == 255); + + a = 23; + mln_assertion(a != white); + mln_assertion(a != black); + mln_assertion(a.value() == 23); + + b = 2; + mln_assertion(b != white); + mln_assertion(b != black); + mln_assertion(b.value() == 2); + + a = b; + mln_assertion(a.value() == 2); + + signed char c = 51; + a = c; + mln_assertion(a.value() == 51); + + // bounds + a = 255; + mln_assertion(a.value() == 255); + a = 0; + mln_assertion(a.value() == 0); + } + + // Addition + { + gl8 a; + gl16 b; + + // gl8 <- gl8 + gl8 + a = 42; + b = 16969; + a += a; + mln_assertion(a.value() == 84); + + a = 42; + b = 16969; + a = a + a; + mln_assertion(a.value() == 84); + + // gl8 <- gl8 + gl16 + a = 42; + b = 16969; + a = a + b; + mln_assertion(a.value() == (42 + b.value() / 257) ); + a = 42; + b = 16969; + a += b; + mln_assertion(a.value() == (42 + b.value() / 257) ); + + + // gl16 <- gl8 + gl16 + a = 42; + b = 16969; + b += a; + mln_assertion(b.value() == (42 * 257 + 16969) ); + + a = 42; + b = 16969; + b = a + b; + mln_assertion(b.value() == (42 * 257 + 16969) ); + + // misc + a = 255; + b = 0; + a = a + b; + mln_assertion(a.value() == 255); + + a = 0; + b = 65535; + a = a + b; + mln_assertion(a.value() == 255); + } + + + + // Not exhaustive + + // gl8 a = white; + // gl16 b = white; + // mln_assertion(a == b); + // // mln_assertion(-a == -b); + + // mln_assertion(a.value() != b.value()); + + // { + // gl8 c = (a + b) / 2; + // mln_assertion(c == white); + // mln_assertion(c.value() == 255); + + // c = a; + // mln_assertion(c == white); + + // c = (a * 2) / 2; + // mln_assertion(c == white); + + // c = c / 6; + // } - c = c / 6; + // { + // gl8 c = (white + white) / 2; + // mln_assertion(c == white); + // mln_assertion(c.value() == 255); + // } - gray g = black; + // gray g = black; } Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1319) +++ trunk/milena/mln/value/graylevel.hh (revision 1320) @@ -162,6 +162,16 @@ template <unsigned n> graylevel<n>& + graylevel<n>::operator=(int val) + { + mln_precondition(val >= 0); + mln_precondition(unsigned(val) <= mln_max(mln_enc(int_u<n>))); + this->v_ = val; + return *this; + } + + template <unsigned n> + graylevel<n>& graylevel<n>::operator=(const literal::black_t&) { this->v_ = 0; Index: trunk/milena/mln/value/gray.hh ===================================================================

17 years, 2 months

milena r1319: Try to reduce number of files in doc/html

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Try to reduce number of files in doc/html. * doc/Doxyfile.in: Create_subdirs = YES. --- Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: trunk/milena/doc/Doxyfile.in =================================================================== --- trunk/milena/doc/Doxyfile.in (revision 1318) +++ trunk/milena/doc/Doxyfile.in (revision 1319) @@ -48,7 +48,7 @@ # source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. -CREATE_SUBDIRS = NO +CREATE_SUBDIRS = YES # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this

17 years, 2 months

milena r1318: Add queue with priority in sandbox

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add queue with priority in sandbox. * queue_p_priority.cc: New test for queue with priority. * queue_p_priority.hh: New queue with priority. * queue_p_fast.hh, * translate_image.cc, * translate_image.hh, * log.txt: Update. --- log.txt | 9 + queue_p_fast.hh | 1 queue_p_priority.cc | 64 ++++++++++ queue_p_priority.hh | 314 ++++++++++++++++++++++++++++++++++++++++++++++++++++ translate_image.cc | 19 +-- translate_image.hh | 24 +++ 6 files changed, 419 insertions(+), 12 deletions(-) Index: trunk/milena/sandbox/duhamel/queue_p_priority.cc =================================================================== --- trunk/milena/sandbox/duhamel/queue_p_priority.cc (revision 0) +++ trunk/milena/sandbox/duhamel/queue_p_priority.cc (revision 1318) @@ -0,0 +1,64 @@ +#include "queue_p_priority.hh" +#include <mln/core/image2d.hh> + +int main () +{ + using namespace mln; + + mln::queue_p_priority<point2d, unsigned> q; + point2d p1 (1,1); + point2d p2 (1,5); + point2d p3 (2,7); + + mln_assertion (q.empty ()); + + mln_assertion (q.npoints () == 0); + + q.push_force (p3); + q.push_force (p1, 3); + q.push_force (p2, 5); + + + mln_assertion (!q.empty ()); + + mln_assertion (q.has (p1)); + mln_assertion (q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 3); + mln_assertion (q.front () == p2); + q.pop (); + + mln_assertion (q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 2); + mln_assertion (q.front () == p1); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (q.has (p3)); + + mln_assertion (q.npoints () == 1); + mln_assertion (q.front () == p3); + q.pop (); + + mln_assertion (!q.has (p1)); + mln_assertion (!q.has (p2)); + mln_assertion (!q.has (p3)); + mln_assertion (q.npoints () == 0); + + mln_assertion (q.empty ()); + + q.push_force (p3); + q.push_force (p2, 5); + q.push_force (p1, 3); + + mln_assertion (q[0] == p3); + mln_assertion (q[1] == p1); + mln_assertion (q[2] == p2); + q.clear (); + mln_assertion (q.empty ()); +} Index: trunk/milena/sandbox/duhamel/translate_image.hh =================================================================== --- trunk/milena/sandbox/duhamel/translate_image.hh (revision 1317) +++ trunk/milena/sandbox/duhamel/translate_image.hh (revision 1318) @@ -61,6 +61,27 @@ } // end of namespace mln::internal + + namespace trait + { + + template <typename I> + struct image_< translate_image > : default_image_morpher_< I, mln_value(I), + translate_image > + { + + typedef trait::image::category::domain_morpher category; + + typedef mln_trait_image_io_from_(I) io; + + typedef mln_trait_image_data_from_(I) data; + + }; + + } // end of namespace mln::trait + + + /*! \brief FIXME * */ @@ -73,7 +94,6 @@ /// Return type of read-write access. typedef typename internal::morpher_lvalue_::ret lvalue; - /// Skeleton. typedef translate_image< tag::image_ > skeleton; @@ -84,7 +104,7 @@ translate_image(I& ima, const mln_dpoint(I) dp); translate_image(); - /// FIXME: Doc! + /// Return domain of translated_image. const box2d& domain() const; /// Test if a pixel value is accessible at \p p. Index: trunk/milena/sandbox/duhamel/queue_p_fast.hh =================================================================== --- trunk/milena/sandbox/duhamel/queue_p_fast.hh (revision 1317) +++ trunk/milena/sandbox/duhamel/queue_p_fast.hh (revision 1318) @@ -124,7 +124,6 @@ mutable accu::bbox bb_; mutable bool bb_needs_update_; void bb_update_() const; - }; Index: trunk/milena/sandbox/duhamel/queue_p_priority.hh =================================================================== --- trunk/milena/sandbox/duhamel/queue_p_priority.hh (revision 0) +++ trunk/milena/sandbox/duhamel/queue_p_priority.hh (revision 1318) @@ -0,0 +1,314 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_QUEUE_P_PRIORITY_HH +# define MLN_CORE_QUEUE_P_PRIORITY_HH + +/*! \file mln/core/queue_p_priority.hh + * + * \brief Definition of a point set class based on std::deque. + */ + +# include <vector> +# include <deque> +# include <map> +# include <algorithm> +# include <iterator> + +# include <mln/core/internal/point_set_base.hh> +# include <mln/core/vec_p_piter.hh> +# include <mln/accu/bbox.hh> +# include <mln/core/queue_p.hh> + +namespace mln +{ + + // Fwd decls. + template <typename P> struct vec_p_fwd_piter_; + template <typename P> struct vec_p_bkd_piter_; + + + /*! \brief Point queue class (based on std::deque). + * + * This is a mathematical set of points (unique insertion). + * + * \todo Make it work with P being a Point_Site. + * \todo Add a parameter flag to choose another policy for "push" + * (i.e., no-op if multiple or allow multiple insertions). + * + * \warning We have some troubles with point set comparison based on + * a call to npoints() when this container is multiple. + */ + template <typename P, typename T> + class queue_p_priority// : public internal::point_set_base_< P, queue_p_priority > + { + public: + + /// Forward Point_Iterator associated type. + typedef vec_p_fwd_piter_ fwd_piter; + + /// Backward Point_Iterator associated type. + typedef vec_p_bkd_piter_ bkd_piter; + + /// Constructor. + queue_p_priority(); + + /// Test is \p p belongs to this point set. + bool has(const P& p); + + /// Test if queue is empty or not. + bool empty(); + + /// Give the number of points. + unsigned npoints(); + + /// Give the exact bounding box. + const box_& bbox(); + + /// Push force a point \p p in the queue. + queue_p_priority<P, T>& push_force(const P& p, T prio = 0); + + /// Push a point \p p in the queue. + queue_p_priority<P, T>& push(const P& p, T prio = 0); + + /// Pop (remove) the front point \p p from the queue; \p p is the + /// least recently inserted point. + void pop(); + + /// Give the front point \p p of the queue; \p p is the least + /// recently inserted point. + const P& front(); + + /// Clear the queue. + void clear(); + + /// Return the corresponding std::vector of points. + const std::vector& vect() const; + + /// Return the \p i-th point. + const P& operator[](unsigned i); + + protected: + + std::map<const T, queue_p > q_; + + mutable std::vector vect_; + mutable bool vect_needs_update_; + void vect_update_(); + + mutable accu::bbox bb_; + mutable bool bb_needs_update_; + void bb_update_(); + + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, typename T> + queue_p_priority<P, T>::queue_p_priority() + { + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::vect_update_() + { + vect_.clear(); + vect_.reserve(npoints()); + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + std::copy(q_[(*it).first].begin(), q_[(*it).first].end(), + std::back_inserter(vect_)); + vect_needs_update_ = false; + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::bb_update_() + { + bb_.init(); + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + for (unsigned i = 0; i < q_[(*it).first].npoints (); ++i) + bb_.take(q_[(*it).first][i]); + } + + + template <typename P, typename T> + bool + queue_p_priority<P, T>::has(const P& p) + { + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (q_[(*it).first].has (p)) + return true; + return false; + } + + template <typename P, typename T> + bool + queue_p_priority<P, T>::empty() + { + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!q_[(*it).first].empty ()) + return false; + return true; + } + + template <typename P, typename T> + unsigned + queue_p_priority<P, T>::npoints() + { + unsigned res = 0; + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + if (!q_[(*it).first].empty ()) + res += q_[(*it).first].npoints(); + return res; + } + + template <typename P, typename T> + const box_& + queue_p_priority<P, T>::bbox() + { + mln_precondition(npoints() != 0); + if (bb_needs_update_) + bb_update_(); + return bb_.to_result(); + } + + template <typename P, typename T> + queue_p_priority<P, T>& + queue_p_priority<P, T>::push_force(const P& p, T prio) + { + q_[prio].push_force (p); + + return *this; + } + + template <typename P, typename T> + queue_p_priority<P, T>& + queue_p_priority<P, T>::push(const P& p, T prio) + { + if (! has(p)) + return this->push_force(p, prio); + else + return *this; + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::pop() + { + typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!q_[(*it).first].empty ()) + return q_[(*it).first].pop (); + + if (! vect_needs_update_) + { + vect_needs_update_ = true; + bb_needs_update_ = true; + } + } + + template <typename P, typename T> + const P& + queue_p_priority<P, T>::front() + { + mln_precondition(! q_.empty()); + + typename std::map<T, queue_p >::const_reverse_iterator it = q_.rbegin (); + + for (; it != q_.rend (); ++it) + if (!q_[(*it).first].empty ()) + break; + return q_[(*it).first].front (); + } + + template <typename P, typename T> + void + queue_p_priority<P, T>::clear() + { + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + + for (; it != q_.end (); ++it) + q_[(*it).first].clear (); + q_.clear(); + vect_needs_update_ = false; + bb_needs_update_ = false; + } + + template <typename P, typename T> + const std::vector& + queue_p_priority<P, T>::vect() const + { + if (vect_needs_update_) + vect_update_(); + return vect_; + } + + template <typename P, typename T> + const P& + queue_p_priority<P, T>::operator[](unsigned i) + { + mln_precondition(i < npoints()); + + typename std::map<T, queue_p >::const_iterator it = q_.begin (); + unsigned cpt = 0; + + for (; it != q_.end (); ++it) + { + if (!q_[(*it).first].empty ()) + for (cpt = 0; cpt < q_[(*it).first].npoints (); ++cpt) + { + if (i == 0) + return q_[(*it).first][cpt]; + --i; + } + } + return q_[(*it).first][cpt]; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_QUEUE_P_PRIORITY_HH Index: trunk/milena/sandbox/duhamel/translate_image.cc =================================================================== --- trunk/milena/sandbox/duhamel/translate_image.cc (revision 1317) +++ trunk/milena/sandbox/duhamel/translate_image.cc (revision 1318) @@ -6,7 +6,7 @@ #include <mln/border/fill.hh> #include <mln/debug/println_with_border.hh> #include <mln/debug/println.hh> -#include "translate_image.hh" +#include <mln/core/translate_image.hh> int main () { @@ -31,12 +31,13 @@ std::cout << "translated image :" << std::endl; debug::println (tmp); -// std::cout << std::endl; -// I out (4,4); -// level::paste(ima, out); -// level::paste(tmp, out); -// std::cout << "pasted image :" -// << std::endl; -// debug::println (out); -// std::cout << std::endl; + + std::cout << std::endl; + I out (4,4); + level::paste(ima, out); + level::paste(tmp, out); + std::cout << "pasted image :" + << std::endl; + debug::println (out); + std::cout << std::endl; } Index: trunk/milena/sandbox/duhamel/log.txt =================================================================== --- trunk/milena/sandbox/duhamel/log.txt (revision 1317) +++ trunk/milena/sandbox/duhamel/log.txt (revision 1318) @@ -13,3 +13,12 @@ - mesh_p / mesh_image - draw mesh - graph_labeling + +- show/display. + +- Add translate image class. +- Add convert/to_tiles. + +- border/resize. + +- queue with priority.

17 years, 2 months

milena r1317: Fix traits for translate_image

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix traits for translate_image. * translate_image.hh: Fix traits. --- translate_image.hh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1316) +++ trunk/milena/mln/core/translate_image.hh (revision 1317) @@ -73,19 +73,13 @@ struct image_< translate_image > : default_image_morpher_< I, mln_value(I), translate_image > { - typedef trait::image::category::domain_morpher category; -// typedef mln_trait_image_access(I)() access; -// typedef mln_trait_image_space(I)() space; -// typedef mln_trait_image_size(I)() size; -// typedef mln_trait_image_support(I)() support; - -// typedef mln_trait_image_border(I)() border; -// typedef mln_trait_image_data(I)() data; -// typedef mln_trait_image_io(I)() io; -// typedef mln_trait_image_speed(I)() speed; - + typedef mln_trait_image_access(I) access; + typedef mln_trait_image_space(I) space; + typedef mln_trait_image_size(I) size; + typedef mln_trait_image_support(I) support; + typedef mln_trait_image_border(I) border; typedef mln_trait_image_io_from_(I) io; typedef mln_trait_image_data_from_(I) data;

17 years, 2 months

milena r1316: Fix bug in translate_image

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix bug in translate_image. * translate_image.hh: Fix. --- translate_image.hh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1315) +++ trunk/milena/mln/core/translate_image.hh (revision 1316) @@ -76,18 +76,18 @@ typedef trait::image::category::domain_morpher category; -// typedef mln_trait_image_access_from(I) access; -// typedef mln_trait_image_space_from(I) space; -// typedef mln_trait_image_size_from(I) size; -// typedef mln_trait_image_support_from(I) support; - -// typedef mln_trait_image_border_from(I) border; - typedef mln_trait_image_data_from(I) data; - typedef mln_trait_image_io_from(I) io; -// typedef mln_trait_image_speed_from(I) speed; +// typedef mln_trait_image_access(I)() access; +// typedef mln_trait_image_space(I)() space; +// typedef mln_trait_image_size(I)() size; +// typedef mln_trait_image_support(I)() support; + +// typedef mln_trait_image_border(I)() border; +// typedef mln_trait_image_data(I)() data; +// typedef mln_trait_image_io(I)() io; +// typedef mln_trait_image_speed(I)() speed; -// typedef mln_trait_image_io_from_(I) io; -// typedef mln_trait_image_data_from_(I) data; + typedef mln_trait_image_io_from_(I) io; + typedef mln_trait_image_data_from_(I) data; }; @@ -106,6 +106,7 @@ { typedef mln::internal::image_morpher_< I, mln_pset(I), translate_image > super_; + typedef line_piter_<mln_psite(I)> line_piter; /// Return type of read-write access. typedef typename internal::morpher_lvalue_::ret lvalue;

17 years, 2 months

1313: Fix ambiguity in border property.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix ambiguity in border property. * mln/trait/image/props.hh (some): New in 'border'. * mln/border/get.hh: Fix ambiguity. * tests/core_clone.cc: Update. * tests/box2d.cc: Augment. * tests/border_get.cc: Augment. * TODO: Clean. * mln/trait/images.hh (image_): Handle const case. * mln/core/box.hh: New ctors with lens. * mln/metal/is_a.hh (is_a): New spe for const. * mln/convert/to_tiles.hh: Rename vec as v_ima. TODO | 42 +++++++++++++++++------------------------- mln/border/get.hh | 6 +++--- mln/convert/to_tiles.hh | 22 +++++++++++----------- mln/core/box.hh | 36 ++++++++++++++++++++++++++++++++++++ mln/metal/is_a.hh | 4 ++++ mln/trait/image/props.hh | 7 ++++--- mln/trait/images.hh | 9 ++++++++- tests/border_get.cc | 26 ++++++++++++-------------- tests/box2d.cc | 3 +++ tests/core_clone.cc | 2 +- 10 files changed, 99 insertions(+), 58 deletions(-) Index: tests/core_clone.cc --- tests/core_clone.cc (revision 1312) +++ tests/core_clone.cc (working copy) @@ -48,7 +48,7 @@ { box2d b = make::box2d(2,2); - std::cout << border::get( clone(ima | b) ) << std::endl; + std::cout << border::find( clone(ima | b) ) << std::endl; debug::println(ima | b); debug::println(clone(ima | b)); Index: tests/box2d.cc --- tests/box2d.cc (revision 1312) +++ tests/box2d.cc (working copy) @@ -40,4 +40,7 @@ box2d b = make::box2d(2, 3); mln_assertion(b.nrows() = 2); + + box2d b_(2, 3); + mln_assertion(b = b_); } Index: tests/border_get.cc --- tests/border_get.cc (revision 1312) +++ tests/border_get.cc (working copy) @@ -39,9 +39,9 @@ #include <mln/literal/origin.hh> -struct my_box2d : mln::Function_p2b< my_box2d > +struct f_box2d_t : mln::Function_p2b< f_box2d_t > { - my_box2d(const mln::box2d& b) + f_box2d_t(const mln::box2d& b) : b_(b) { } @@ -61,24 +61,22 @@ typedef image2d<int> I; box2d b(literal::origin, point2d(1,1)); + f_box2d_t f_b(b); + I ima(3,3, 51); -// mln_assertion(border::get(ima) = 51); -// mln_assertion( ima.has(point2d(2,2)) = true ); + mln_assertion(border::get(ima) = 51); + mln_assertion( ima.has(point2d(2,2)) = true ); -// sub_image<I, box2d> sub(ima, b); -// mln_assertion( sub.has (point2d(2,2)) = false && -// sub.owns_(point2d(2,2)) = false ); -// mln_assertion(border::get(sub) = 0); + sub_image<I, box2d> sub(ima, b); + mln_assertion( sub.has (point2d(2,2)) = false && + sub.owns_(point2d(2,2)) = false ); + mln_assertion(border::get(sub) = 0); - my_box2d f_b(b); - image_if<I, my_box2d> imaif(ima, f_b); + image_if<I, f_box2d_t> imaif(ima, f_b); mln_assertion( imaif.has (point2d(2,2)) = false && imaif.owns_(point2d(2,2)) = true ); mln_assertion(border::get(imaif) = 51); - -// std::cout << std::endl -// << "image_if< image2d >: "; -// mln::trait::image::print< image_if<I, fun::p2b::chess_t> >(std::cout); + mln_assertion(border::get( (ima | b) | f_b ) = 0); } Index: TODO --- TODO (revision 1312) +++ TODO (working copy) @@ -1,47 +1,39 @@ -*- outline -*- +* memo -* mathieu +reprise de /work2/theo_temp/SVG_TEGUCIGALPA/prestations/swt/src -** accu -*** héritage -toutes les classes d'accu dérivent de base_ ; Cf. accu/median.hh -virer l'op de convertion dans median_alt.hh -ajouter le test de présence de l'op de convertion dans Accumulator -m-a-j de la doc -est-ce les tests tournent ? -*** value -> argument -m-a-j -tests ? +* URGENT +categories for Function_* +fun * Built_In +fun * Scalar -* guillaume -** chamfer +* this week -Cf. vieilles versions -algo avec front +** Guillaume +... -* simon +** Matthieu -** lines +... -ajouter win::line<Mesh, dir> -hline2d et vline2d deviennent des aliases -retoucher les routines avec {h,v}line en argument +** Simon +h_mat +... +** Theo -* theo +value::other (for use in labeling) +... -hiérarchie de concepts sous Value -maj trait solver -virer is_fast -> changer le meta-plug -virer core/trait Index: mln/trait/image/props.hh --- mln/trait/image/props.hh (revision 1312) +++ mln/trait/image/props.hh (working copy) @@ -67,7 +67,7 @@ // typedef undef support; // irregular, aligned < regular // // global - // typedef undef border; // none, stored, computed + // typedef undef border; // none, { stored, computed } < some // typedef undef data; // raw < linear < stored, computed // typedef undef io; // read_only < read, write_only < write, read_write < both read'n write // typedef undef speed; // slow, fast, or fastest @@ -166,8 +166,9 @@ { struct any {}; struct none : any { std::string name() const { return "border::none"; } }; - struct stored : any { std::string name() const { return "border::stored"; } }; - struct computed : any { std::string name() const { return "border::computed"; } }; + struct some : any { std::string name() const { return "border::some"; } }; + struct stored : some { std::string name() const { return "border::stored"; } }; + struct computed : some { std::string name() const { return "border::computed"; } }; }; struct io Index: mln/trait/images.hh --- mln/trait/images.hh (revision 1312) +++ mln/trait/images.hh (working copy) @@ -124,7 +124,7 @@ typedef undef support; // irregular, aligned < regular // global - typedef undef border; // none, stored, computed + typedef undef border; // none, { stored, computed } < some typedef undef data; // raw < linear < stored, computed typedef undef io; // read_only < read, write_only < write, read_write < both read'n write typedef undef speed; // slow, fast, or fastest @@ -137,6 +137,13 @@ }; + template <typename I> + struct image_<const I> : image_ + { + // FIXME: TODO: io cannot contain "write"... + }; + + template <typename T, typename I> struct default_image_ : undefined_image_ { Index: mln/core/box.hh --- mln/core/box.hh (revision 1312) +++ mln/core/box.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/concept/box.hh> # include <mln/core/internal/box_impl.hh> # include <mln/core/point.hh> +# include <mln/literal/origin.hh> namespace mln @@ -54,6 +55,9 @@ struct box_ : public Box< box_ >, public internal::box_impl_< P::dim, mln_coord(P), box_ > { + /// Dimension. + enum { dim = P::dim }; + /// Mesh associated type. typedef mln_mesh(P) mesh; @@ -90,6 +94,13 @@ /// Constructor of a box going from \p pmin to \p pmax. box_(const point& pmin, const point& pmax); + /// \{ Constructors with different numbers of arguments + /// (sizes) w.r.t. the dimension. + explicit box_(mln_coord(P) ninds); + box_(mln_coord(P) nrows, mln_coord(P) ncols); + box_(mln_coord(P) nslis, mln_coord(P) nrows, mln_coord(P) ncols); + /// \} + /*! \brief Test if \p p belongs to the box. * * \param[in] p A point site. @@ -154,6 +165,31 @@ : pmin_(pmin), pmax_(pmax) { + + } + + template <typename P> + box_::box_(mln_coord(P) ninds) + { + metal::bool_<(dim = 1)>::check(); + pmin_ = literal::origin; + pmax_ = P(ninds - 1); + } + + template <typename P> + box_::box_(mln_coord(P) nrows, mln_coord(P) ncols) + { + metal::bool_<(dim = 2)>::check(); + pmin_ = literal::origin; + pmax_ = P(nrows - 1, ncols - 1); + } + + template <typename P> + box_::box_(mln_coord(P) nslis, mln_coord(P) nrows, mln_coord(P) ncols) + { + metal::bool_<(dim = 3)>::check(); + pmin_ = literal::origin; + pmax_ = P(nslis - 1, nrows - 1, ncols - 1); } template <typename P> Index: mln/metal/is_a.hh --- mln/metal/is_a.hh (revision 1312) +++ mln/metal/is_a.hh (working copy) @@ -81,6 +81,10 @@ sizeof( internal::yes_ ) )> {}; + template <typename T, template <class> class U> + struct is_a< const T, U > : is_a< T, U >::eval + {}; + } // end of namespace mln::metal Index: mln/border/get.hh --- mln/border/get.hh (revision 1312) +++ mln/border/get.hh (working copy) @@ -57,14 +57,14 @@ { template <typename I> - unsigned get_(trait::image::border::any, trait::image::category::primary, + unsigned get_(trait::image::border::some, trait::image::category::primary, const I& ima) { return ima.border(); } template <typename I> - unsigned get_(trait::image::border::any, trait::image::category::morpher, + unsigned get_(trait::image::border::some, trait::image::category::morpher, const I& ima) { return border::get( *ima.delegatee_() ); @@ -73,7 +73,7 @@ template <typename I> unsigned get_(trait::image::border::none, trait::image::category::any, - const I& ima) + const I&) { return 0; } Index: mln/convert/to_tiles.hh --- mln/convert/to_tiles.hh (revision 1312) +++ mln/convert/to_tiles.hh (working copy) @@ -47,22 +47,22 @@ /// FIXME : Run only for image2d /// Convert a vector of image2d into a tiled image with ratio. template <typename I> - I to_tiles (std::vector& vec, float ratio); + I to_tiles(std::vector& v_ima, float ratio); # ifndef MLN_INCLUDE_ONLY template <typename I> I - to_tiles (std::vector& vec, float ratio) + to_tiles(std::vector& v_ima, float ratio) { - /// Test if vec is not empty. - mln_precondition(!vec.empty ()); + // Test if v_ima is not empty. + mln_precondition(! v_ima.empty()); - unsigned size = vec.size (); - unsigned nrows = geom::nrows(vec[0]); - unsigned ncols = geom::ncols(vec[0]); + unsigned size = v_ima.size(); + unsigned nrows = geom::nrows(v_ima[0]); + unsigned ncols = geom::ncols(v_ima[0]); - /// Compute output size. + // Compute output size. int size_c = (int) ceil(sqrt(size * ratio)); int size_r = (int) ceil(sqrt(size / ratio)); @@ -71,14 +71,14 @@ for (unsigned i = 0; i < size; ++i) { /// Check if current image has good dimension. - mln_precondition(geom::nrows(vec[i]) = nrows); - mln_precondition(geom::ncols(vec[i]) = ncols); + mln_precondition(geom::nrows(v_ima[i]) = nrows); + mln_precondition(geom::ncols(v_ima[i]) = ncols); /// Compute the delta point of translation. dpoint2d dp = make::dpoint2d(i / size_c * nrows, i % size_c * ncols); /// Convert current image in translate image with its delta point. - translate_image tr_ima (vec[i], dp); + translate_image tr_ima(v_ima[i], dp); /// Paste translated image into output. level::paste (tr_ima, output);

17 years, 2 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2007