August 2008 - Olena-patches

2125: Add more services to complexes.
by Roland Levillain 07 Aug '08

07 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add more services to complexes. * mln/core/complex.hh (mln::complex<D>::nfaces()) (mln::complex<D>::nfaces(unsigned)): New methods. (mln::complex<D>::fold_left_) (mln::complex<D>::apply_if_dim_matches_) (mln::internal::faces_set_mixin<N, D>::fold_left_): (mln::internal::faces_set_mixin<N, D>::apply_if_dim_matches_): New methods. (mln::internal::add_size) (mln::internal::get_size): New meta-functors. complex.hh | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 316 insertions(+), 7 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2125) +++ mln/core/complex.hh (working copy) @@ -38,6 +38,7 @@ # include <cstddef> +# include <limits> # include <iosfwd> # include <mln/metal/bool.hh> @@ -67,7 +68,6 @@ public: /// Complex construction. /// \{ - /// \brief Add a 0-face to the complex. face_handle<0u, D> add_face(); @@ -79,9 +79,31 @@ face_handle<N + 1, D> add_face(const faces_set<N, D>& adjacent_faces); /// \} + /// \brief Static manipulators. + /// + /// These methods use statically-known input. + /// \{ + /// \brief Return the total number of faces, whatever their + /// dimension. + std::size_t nfaces() const; + /// \brief Return the number of \p N-faces. template <unsigned N> std::size_t nfaces() const; + /// \} + + /// \brief Dynamic manipulators. + /// + /// These methods use input know as run time. + /// \{ + /// \brief Return the number of \a n-faces. + /// + /// Warning, this function has a complexity linear in term of N, + /// since each faces_set is checked (the present implementation + /// does not provide a direct access to faces_set through a + /// dynamic value of the dimension). + std::size_t nfaces(unsigned n) const; + /// \} /// Pretty-printing. /// \{ @@ -104,6 +126,32 @@ const face<N, D>& face_(unsigned face_id) const; /// \} + /// Functional meta-manipulators. + /// \{ + /* FIXME: Use something more constraining than the STL's + UnaryFunction/BinaryFunction. Use Function or Function_v2v? + Or a new subclass of Function? */ + + /* FIXME: Replace F and ACCU by a Milena accumulator? */ + + /** \brief Apply a kind of static fold left operator to the + implicit list of faces_set using a functor \a f and a value \a + accu. + + Argument \a is called an "accumulator", but with a slightly + different meaning than mln:accu members. + + We might want to use TypeLists or something similar, is they + provide an explicit static fold left operator. */ + template <typename BinaryFunction, typename T> + T fold_left_(const BinaryFunction& f, const T& accu) const; + + /// \brief Apply a functor \a f to this list of \a n-faces. + template <typename UnaryFunction> + typename UnaryFunction::result_type + apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const; + /// \} + /// \brief connect two faces. /// /// \param f1 A face of dimension \p N @@ -146,8 +194,8 @@ /// Faces of highest dimension (\p D). template <unsigned D> - struct faces_set_mixin<D, D> : faces_set_mixin<D - 1, D>, - lower_dim_faces_set_mixin<D, D> + struct faces_set_mixin<D, D> : public faces_set_mixin<D - 1, D>, + public lower_dim_faces_set_mixin<D, D> { std::vector< face<D, D> > faces_; @@ -157,13 +205,26 @@ void print(std::ostream& ostr) const; void print_rec_asc(std::ostream& ostr) const; /// \} + + /// Functional meta-manipulators. + /// \{ + /// \brief Fold left. + /// \see mln::complex<D>::fold_left_. + template <typename BinaryFunction, typename T> + T fold_left_(const BinaryFunction& f, const T& accu) const; + /// \brief Apply a functor \a f to the list of faces if \a n == \p D. + /// \see mln::complex<D>::apply_if_dim_matches_. + template <typename UnaryFunction> + typename UnaryFunction::result_type + apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const; + /// \} }; /// Faces of intermediate dimension (greater than 0, lower than \p D). template <unsigned N, unsigned D> - struct faces_set_mixin : faces_set_mixin<N - 1, D>, - lower_dim_faces_set_mixin<N, D>, - higher_dim_faces_set_mixin<N, D> + struct faces_set_mixin : public faces_set_mixin<N - 1, D>, + public lower_dim_faces_set_mixin<N, D>, + public higher_dim_faces_set_mixin<N, D> { std::vector< face<N, D> > faces_; @@ -175,11 +236,24 @@ /// (in ascending dimension). void print_rec_asc(std::ostream& ostr) const; /// \} + + /// Functional meta-manipulators. + /// \{ + /// \brief Fold left. + /// \see mln::complex<D>::fold_left_. + template <typename BinaryFunction, typename T> + T fold_left_(const BinaryFunction& f, const T& accu) const; + /// \brief Apply a functor \a f to the list of faces if \a n == \p N. + /// \see mln::complex<D>::apply_if_dim_matches_. + template <typename UnaryFunction> + typename UnaryFunction::result_type + apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const; + /// \} }; /// Faces of lowest dimension (0). template <unsigned D> - struct faces_set_mixin<0u, D> : higher_dim_faces_set_mixin<0u, D> + struct faces_set_mixin<0u, D> : public higher_dim_faces_set_mixin<0u, D> { std::vector< face<0u, D> > faces_; @@ -189,6 +263,19 @@ void print(std::ostream& ostr) const; void print_rec_asc(std::ostream& ostr) const; /// \} + + /// Functional meta-manipulators. + /// \{ + /// \brief Fold left. + /// \see mln::complex<D>::fold_left_. + template <typename BinaryFunction, typename T> + T fold_left_(const BinaryFunction& f, const T& accu) const; + /// \brief Apply a functor \a f to the list of faces if \a n == 0. + /// \see mln::complex<D>::apply_if_dim_matches_. + template <typename UnaryFunction> + typename UnaryFunction::result_type + apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const; + /// \} }; /// Faces of a 0-complex. @@ -203,6 +290,19 @@ void print(std::ostream& ostr) const; void print_rec_asc(std::ostream& ostr) const; /// \} + + /// Functional meta-manipulators. + /// \{ + /// \brief Fold left. + /// \see mln::complex<D>::fold_left_. + template <typename BinaryFunction, typename T> + T fold_left_(const BinaryFunction& f, const T& accu) const; + /// \brief Apply a functor \a f to the list of faces if \a n == 0. + /// \see mln::complex<D>::apply_if_dim_matches_. + template <typename UnaryFunction> + typename UnaryFunction::result_type + apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const; + /// \} }; /// \} @@ -233,6 +333,10 @@ # ifndef MLN_INCLUDE_ONLY + /*-----------------------. + | Complex construction. | + `-----------------------*/ + template <unsigned D> face_handle<0u, D> complex<D>::add_face() @@ -278,6 +382,64 @@ return fh; } + + /*-------. + | Misc. | + `-------*/ + + namespace internal + { + + /// A binary meta-functor defined by: + /// + /// \code + /// add_size : x, c -> x + c.size() + /// \endcode + /// + /// \see mln::complex<D>::nfaces (static version). + /// \see mln::complex<D>::fold_left_. + struct add_size + { + template <typename T, typename Container> + T operator()(const T& x, const Container& c) const + { + return x + c.size(); + } + }; + + /// An unary meta-functor defined by: + /// + /// \code + /// add_size : c -> c.size() + /// \endcode + /// + /// \see mln::complex<D>::nfaces (dynamic version). + /// \see mln::complex<D>::apply_if_dim_matches_. + struct get_size + { + typedef std::size_t result_type; + + template <typename Container> + typename Container::size_type operator()(const Container& c) const + { + return c.size(); + } + }; + + } // end of namespace mln::internal + + + /*----------------------. + | Static manipulators. | + `----------------------*/ + + template <unsigned D> + std::size_t + complex<D>::nfaces() const + { + return fold_left_(internal::add_size(), 0); + } + template <unsigned D> template <unsigned N> std::size_t @@ -286,6 +448,25 @@ return internal::faces_set_mixin<N, D>::faces_.size(); } + + /*-----------------------. + | Dynamic manipulators. | + `-----------------------*/ + + template <unsigned D> + std::size_t + complex<D>::nfaces(unsigned n) const + { + // Ensure N is compatible with D. + mln_precondition(n <= D); + return apply_if_dim_matches_(n, internal::get_size()); + } + + + /*-------------------. + | Internal methods. | + `-------------------*/ + template <unsigned D> template <unsigned N> face<N, D>& @@ -462,6 +643,134 @@ } // end of namespace mln::internal + + /*-------------------------------. + | Functional meta-manipulators. | + `-------------------------------*/ + + /* ------------------------------- */ + /* ``Static Fold Left'' Operator. */ + /* ------------------------------- */ + + template <unsigned D> + template <typename BinaryFunction, typename T> + T + complex<D>::fold_left_(const BinaryFunction& f, const T& accu) const + { + return internal::faces_set_mixin<D, D>::fold_left_(f, accu); + } + + namespace internal + { + + // FIXME: Try to factor. + + template <unsigned D> + template <typename BinaryFunction, typename T> + T + faces_set_mixin<D, D>::fold_left_(const BinaryFunction& f, + const T& accu) const + { + return faces_set_mixin<D - 1, D>::fold_left_(f, f(accu, faces_)); + } + + template <unsigned N, unsigned D> + template <typename BinaryFunction, typename T> + T + faces_set_mixin<N, D>::fold_left_(const BinaryFunction& f, + const T& accu) const + { + return faces_set_mixin<N - 1, D>::fold_left_(f, f(accu, faces_)); + } + + template <unsigned D> + template <typename BinaryFunction, typename T> + T + faces_set_mixin<0u, D>::fold_left_(const BinaryFunction& f, + const T& accu) const + { + return f(accu, faces_); + } + + template <typename BinaryFunction, typename T> + T + faces_set_mixin<0u, 0u>::fold_left_(const BinaryFunction& f, + const T& accu) const + { + return f(accu, faces_); + } + + } // end of namespace mln::internal + + + /* ------------------------------------------------ */ + /* ``Static Apply-If-Dimension-Matches'' Operator. */ + /* ------------------------------------------------ */ + + template <unsigned D> + template <typename UnaryFunction> + typename UnaryFunction::result_type + complex<D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const + { + // Ensure N is compatible with D. + mln_precondition(n <= D); + return internal::faces_set_mixin<D, D>::apply_if_dim_matches_(n, f); + } + + namespace internal + { + + // FIXME: Try to factor. + + template <unsigned D> + template <typename UnaryFunction> + typename UnaryFunction::result_type + faces_set_mixin<D, D>::apply_if_dim_matches_(unsigned n, + const UnaryFunction& f) const + { + // Ensure N and D are compatible. + mln_precondition(n <= D); + return n == D ? + f(faces_) : + faces_set_mixin<D - 1, D>::apply_if_dim_matches_(n, f); + } + + template <unsigned N, unsigned D> + template <typename UnaryFunction> + typename UnaryFunction::result_type + faces_set_mixin<N, D>::apply_if_dim_matches_(unsigned n, + const UnaryFunction& f) const + { + // Ensure N and D are compatible. + mln_precondition(n <= D); + return n == N ? + f(faces_) : + faces_set_mixin<N - 1, D>::apply_if_dim_matches_(n, f); + } + + template <unsigned D> + template <typename UnaryFunction> + typename UnaryFunction::result_type + faces_set_mixin<0u, D>::apply_if_dim_matches_(unsigned n, + const UnaryFunction& f) const + { + // If we reached this method, then N should be 0. + mln_precondition(n == 0); + return f(faces_); + } + + template <typename UnaryFunction> + typename UnaryFunction::result_type + faces_set_mixin<0u, 0u>::apply_if_dim_matches_(unsigned n, + const UnaryFunction& f) const + { + // If we reached this method, then N should be 0. + mln_precondition(n == 0); + return f(faces_); + } + + } // end of namespace mln::internal + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

1 0

2124: Follow g++ 4.3 advice w.r.t. ignored type qualifiers on return types.
by Roland Levillain 07 Aug '08

07 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Follow g++ 4.3 advice w.r.t. ignored type qualifiers on function return types. * mln/util/tracked_ptr.hh (mln::util::tracked_ptr<T>::operator->() const) (mln::util::tracked_ptr<T>::operator->()): Remove useless `const' qualifier on return type. * mln/value/builtin/floatings.hh (mln::trait::value_<float>::min) (mln::trait::value_<float>::max) (mln::trait::value_<float>::epsilon) (mln::trait::value_<double>::min) (mln::trait::value_<double>::max) (mln::trait::value_<double>::epsilon): Likewise. util/tracked_ptr.hh | 8 ++++---- value/builtin/floatings.hh | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) Index: mln/util/tracked_ptr.hh --- mln/util/tracked_ptr.hh (revision 2124) +++ mln/util/tracked_ptr.hh (working copy) @@ -67,13 +67,13 @@ ** ** \invariant Pointer proxy exists. */ - const T*const operator->() const; + const T* operator->() const; /*! \brief Mimics the behavior of op-> for a pointer in the mutable case. ** ** \invariant Pointer proxy exists. */ - T*const operator->(); + T* operator->(); /// Ctor. tracked_ptr(); @@ -127,7 +127,7 @@ ** \invariant Pointer proxy exists. */ inline - const T*const tracked_ptr<T>::operator->() const + const T* tracked_ptr<T>::operator->() const { mln_invariant(run_()); mln_precondition(ptr_ != 0); @@ -140,7 +140,7 @@ ** \invariant Pointer proxy exists. */ inline - T*const tracked_ptr<T>::operator->() + T* tracked_ptr<T>::operator->() { mln_invariant(run_()); mln_precondition(ptr_ != 0); Index: mln/value/builtin/floatings.hh --- mln/value/builtin/floatings.hh (revision 2124) +++ mln/value/builtin/floatings.hh (working copy) @@ -74,17 +74,17 @@ typedef value::kind::data kind; typedef value::quant::high quant; - static const float min() + static float min() { static const float min_ = std::numeric_limits<float>::min(); return min_; } - static const float max() + static float max() { static const float max_ = std::numeric_limits<float>::max(); return max_; } - static const float epsilon() + static float epsilon() { static const float epsilon_ = std::numeric_limits<float>::epsilon(); return epsilon_; @@ -105,17 +105,17 @@ typedef value::kind::data kind; typedef value::quant::high quant; - static const double min() + static double min() { static const double min_ = std::numeric_limits<double>::min(); return min_; } - static const double max() + static double max() { static const double max_ = std::numeric_limits<double>::max(); return max_; } - static const double epsilon() + static double epsilon() { static const double epsilon_ = std::numeric_limits<double>::epsilon(); return epsilon_;

1 0

Re: [Olena-patches] [Olena] #3: Migrate Olena 0.11 (and previous revisions) from PRCS to Subversion
by Olena 07 Aug '08

07 Aug '08

#3: Migrate Olena 0.11 (and previous revisions) from PRCS to Subversion --------------------------+------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: assigned Priority: blocker | Milestone: Olena 0.11.1 Component: other | Version: 0.11 Resolution: | Keywords: prcs subversion svn --------------------------+------------------------------------------------- Old description: > '''No further development should be done on the 0.11 branch until this > task is either fixed or removed.''' > > This task is an open discussion. I haven't much tried to convert the > PRCS Olena repository to a Subversion one, and I think '''is''' really > feasible, though not trivial. If you're interested in this migration, > please ask me (Roland) first before making actual changes to the PRCS or > the SVN repository. New description: '''No further development should be done on the 0.11 branch until this task is either fixed or removed.''' This task is an open discussion. I haven't much tried to convert the PRCS Olena repository to a Subversion one, and I think it '''is''' really feasible, though not trivial. If you're interested in this migration, please ask me (Roland) first before making actual changes to the PRCS or the SVN repository. Comment (by levill_r): Missing word in description. -- Ticket URL: <https://trac.lrde.org/olena/ticket/3#comment:5> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

2124: Fix duplicate entry in ChangeLog
by Roland Levillain 06 Aug '08

06 Aug '08

Ach! URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog =================================================================== --- ChangeLog (revision 2123) +++ ChangeLog (revision 2124) @@ -10,14 +10,6 @@ 2008-08-06 Roland Levillain <roland(a)lrde.epita.fr> - * mln/core/graph_psite.hh, mln/core/line_graph_psite.hh, - * mln/core/p_graph_piter.hh, mln/core/p_line_graph_piter.hh: - Fix spacing in template definitions. - * mln/core/p_graph.hh, mln/core/p_line_graph.hh: Likewise. - Fix documentation. - -2008-08-06 Roland Levillain <roland(a)lrde.epita.fr> - Add complex-based psite and pset. * mln/core/complex_psite.hh, mln/core/p_complex.hh: New.

1 0

2123: Misc. fixes in graph and line graph entities.
by Roland Levillain 06 Aug '08

06 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Misc. fixes in graph and line graph entities. * mln/core/graph_psite.hh, mln/core/line_graph_psite.hh, * mln/core/p_graph_piter.hh, mln/core/p_line_graph_piter.hh: Fix spacing in template definitions. * mln/core/p_graph.hh, mln/core/p_line_graph.hh: Likewise. Fix documentation. graph_psite.hh | 5 ++++- p_graph.hh | 22 ++++++++++++++-------- p_line_graph.hh | 10 ++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) Index: mln/core/line_graph_psite.hh Index: mln/core/p_graph_piter.hh Index: mln/core/p_line_graph.hh --- mln/core/p_line_graph.hh (revision 2122) +++ mln/core/p_line_graph.hh (working copy) @@ -74,12 +74,14 @@ /// Backward Point_Iterator associated type. typedef p_line_graph_bkd_piter_ bkd_piter; - /// Return The number of points (sites) of the set, i.e., the - /// number of \em edges, since this is a point set based on a line - /// graph. + /// \brief Return The number of points (sites) of the set, i.e., + /// the number of \em edges, since this is a point set based on a + /// line graph. + /// + /// Required by the mln::Point_Set concept. std::size_t npoints() const; - /// Return The number of vertices (vertices) in the graph. + /// Return The number of vertices in the graph. std::size_t nvertices() const; /// Return The number of edges in the graph. std::size_t nedges() const; Index: mln/core/p_line_graph_piter.hh Index: mln/core/graph_psite.hh --- mln/core/graph_psite.hh (revision 2122) +++ mln/core/graph_psite.hh (working copy) @@ -31,13 +31,15 @@ /// \file mln/core/graph_psite.hh /// \brief Definition of a graph-based point site. +# include <mln/core/concept/point_site.hh> + # include <mln/core/p_graph.hh> namespace mln { - // Fwd decl. + // Forward declaration. template<typename P> class p_graph; @@ -113,6 +115,7 @@ /// \} + # ifndef MLN_INCLUDE_ONLY template<typename P> Index: mln/core/p_graph.hh --- mln/core/p_graph.hh (revision 2122) +++ mln/core/p_graph.hh (working copy) @@ -28,16 +28,18 @@ #ifndef MLN_CORE_P_GRAPH_HH # define MLN_CORE_P_GRAPH_HH -# include <mln/core/concept/point_site.hh> +/// \file mln/core/p_graph.hh +/// \brief Definition of a point set based on graph. + # include <mln/core/internal/point_set_base.hh> + # include <mln/accu/bbox.hh> # include <mln/util/tracked_ptr.hh> # include <mln/util/graph.hh> + # include <mln/core/graph_psite.hh> # include <mln/core/p_graph_piter.hh> -/// \file mln/core/p_graph.hh -/// \brief Definition of a point set based on graph. namespace mln { @@ -68,11 +70,13 @@ /// Backward Point_Iterator associated type. typedef p_graph_bkd_piter_ bkd_piter; - /// Return The number of points (sites) of the set, i.e., the - /// number of \em vertices. + /// \brief Return The number of points (sites) of the set, i.e., + /// the number of \em vertices. + /// + /// Required by the mln::Point_Set concept. std::size_t npoints() const; - /// Return The number of vertices (vertices) in the graph. + /// Return The number of vertices in the graph. std::size_t nvertices() const; /// Return The number of edges in the graph. std::size_t nedges() const; @@ -110,7 +114,8 @@ const util::vertex_id& rhs) const; /// \} - /// Return the graph associated to the p_graph domain: + /// Return the graph associated to the p_graph domain. + // FIXME: Rename as something else (graph() ?). const graph& to_graph() const; graph& to_graph(); @@ -138,7 +143,7 @@ /// \brief Inclusion of a mln::p_graph in another one. /// /// This inclusion relation is very strict for the moment, since our - /// infrastrure for graphs i simple: a mln::p_graph is included + /// infrastrure for graphs is simple: a mln::p_graph is included /// in another one if their are equal. /// /// \todo Refine this later, when we are able to express subgraph @@ -148,6 +153,7 @@ operator<=(const p_graph& lhs, const p_graph& rhs); + # ifndef MLN_INCLUDE_ONLY template<typename P>

1 0

2121: Add complex-based psite and pset.
by Roland Levillain 06 Aug '08

06 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add complex-based psite and pset. * mln/core/complex_psite.hh, mln/core/p_complex.hh: New. * mln/core/face.hh: s/mln_assertion/mln_precondition/. (mln::face_handle<N, D>::face_handle): Statically ensure N is compatible with D in ctors. * tests/core/p_complex.cc: New test. * tests/core/Makefile.am (check_PROGRAMS): Add p_complex. (p_complex_SOURCES): New. mln/core/complex_psite.hh | 249 ++++++++++++++++++++++++++++++++++++++++++++++ mln/core/face.hh | 17 ++- mln/core/p_complex.hh | 199 ++++++++++++++++++++++++++++++++++++ tests/core/Makefile.am | 2 tests/core/p_complex.cc | 95 +++++++++++++++++ 5 files changed, 556 insertions(+), 6 deletions(-) Index: mln/core/face.hh --- mln/core/face.hh (revision 2121) +++ mln/core/face.hh (working copy) @@ -150,7 +150,6 @@ /// Accessors. /// \{ /// Return the complex the face belongs to. - // FIXME: Rename to complex()? complex<D>& cplx() const; /// Return the id of the face. unsigned face_id() const; @@ -269,18 +268,24 @@ face_handle<N, D>::face_handle() : cplx_(0), face_id_(UINT_MAX) { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); } template <unsigned N, unsigned D> face_handle<N, D>::face_handle(complex<D>& c, unsigned face_id) : cplx_(&c), face_id_(face_id) { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); } template <unsigned N, unsigned D> face_handle<N, D>::face_handle(const face_handle<N, D>& rhs) : cplx_(rhs.cplx_), face_id_(rhs.face_id_) { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); } template <unsigned N, unsigned D> @@ -306,7 +311,7 @@ complex<D>& face_handle<N, D>::cplx() const { - mln_assertion(cplx_); + mln_precondition(cplx_); return *cplx_; } @@ -321,7 +326,7 @@ face<N, D>& face_handle<N, D>::to_face() const { - mln_assertion(is_valid()); + mln_precondition(is_valid()); return cplx_->template face_<N>(face_id_); } @@ -337,7 +342,7 @@ bool operator==(const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) { - mln_assertion(&lhs.face.cplx() == &rhs.face.cplx()); + mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); return lhs.face().id() == rhs.face().id(); } @@ -345,7 +350,7 @@ bool operator< (const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) { - mln_assertion(&lhs.face.cplx() == &rhs.face.cplx()); + mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); return lhs.face().id() < rhs.face().id(); } @@ -360,7 +365,7 @@ { // Check consistency. if (!faces_.empty()) - mln_assertion(&faces_.front().cplx() == &f.cplx()); + mln_precondition(&faces_.front().cplx() == &f.cplx()); faces_.push_back(f); } Index: mln/core/complex_psite.hh --- mln/core/complex_psite.hh (revision 0) +++ mln/core/complex_psite.hh (revision 0) @@ -0,0 +1,249 @@ +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_COMPLEX_PSITE_HH +# define MLN_CORE_COMPLEX_PSITE_HH + +/// \file mln/core/complex_psite.hh +/// \brief Definition of a complex-based point site. + +# include <mln/core/concept/point_site.hh> + +# include <mln/core/complex.hh> + + +namespace mln +{ + /* FIXME: Write also a complex_psite where N is dynamic, and can be + changed? */ + + /* FIXME: Currently, P and N are free variables; we might want to + relate them, e.g., have P::dim == N. Or even get rid of P. */ + + /// \brief Point site associated to a mln::complex_image. + /// + /// \arg \p P The type of point associated to this psite. + /// \arg \p N The dimension of the face associated to this psite. + /// \arg \p D The dimention of the complex this psite belongs to. + template <typename P, unsigned N, unsigned D> + class complex_psite : public Point_Site< complex_psite<P, N, D> > + { + typedef complex_psite<P, N, D> self_; + typedef Point_Site<self_> super_; + + public: + typedef mln_mesh(P) mesh; + enum { dim = P::dim }; + typedef P point; + typedef mln_dpoint(P) dpoint; + typedef mln_coord(P) coord; + + /// Construction and assignment. + /// \{ + complex_psite(); + complex_psite(const face_handle<N, D>& face); + complex_psite(const self_& rhs); + self_& operator= (const self_& rhs); + /// \} + + /// Access to psite. + const self_& to_psite() const; + + /* FIXME: Should be removed as soon as ``point sets'' become + ``site sets''. */ + /// Access to point. + /// \{ + const point& to_point() const; + coord operator[](unsigned face) const; + /// \} + + /// Return the face handle of this point site. + face_handle<N, D> face() const; + /// Return the complex on which this site is built. + const complex<D>& cplx() const; + + /// Is this psite valid? + bool is_valid() const; + + private: + /// The handle of the face this psite is pointing towards. + face_handle<N, D> face_; + // FIXME: Actually, this is a dummy value! + point p_; + }; + + + /// Comparison of two instances of mln::complex_psite. + /// \{ + /* FIXME: Shouldn't those comparisons be part of a much general + mechanism? */ + + /// \brief Is \a lhs equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + template <typename P, unsigned N, unsigned D> + bool + operator==(const complex_psite<P, N, D>& lhs, + const complex_psite<P, N, D>& rhs); + + /// \brief Is \a lhs ``less'' than \a rhs? + /// + /// This comparison is required by algorithms sorting psites. + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + template <typename P, unsigned N, unsigned D> + bool + operator< (const complex_psite<P, N, D>& lhs, + const complex_psite<P, N, D>& rhs); + /// \} + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, unsigned N, unsigned D> + inline + complex_psite<P, N, D>::complex_psite() + : super_(), + // Dummy initializations. + face_(), p_() + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } + + template <typename P, unsigned N, unsigned D> + inline + complex_psite<P, N, D>::complex_psite(const face_handle<N, D>& face) + : super_(), + face_(face), p_() + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } + + template <typename P, unsigned N, unsigned D> + inline + complex_psite<P, N, D>::complex_psite(const complex_psite<P, N, D>& rhs) + : super_(rhs), + face_(rhs.face_), p_() + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } + + template <typename P, unsigned N, unsigned D> + inline + complex_psite<P, N, D>& + complex_psite<P, N, D>::operator= (const complex_psite<P, N, D>& rhs) + { + if (&rhs == this) + return *this; + face_ = rhs.face_; + return *this; + } + + template <typename P, unsigned N, unsigned D> + inline + bool + complex_psite<P, N, D>::is_valid() const + { + return face.is_valid(); + } + + template <typename P, unsigned N, unsigned D> + inline + const complex_psite<P, N, D>& + complex_psite<P, N, D>::to_psite() const + { + return *this; + } + + template <typename P, unsigned N, unsigned D> + inline + const P& + complex_psite<P, N, D>::to_point() const + { + // FIXME: Dummy value. + return p_; + } + + template <typename P, unsigned N, unsigned D> + inline + mln_coord(P) + complex_psite<P, N, D>::operator[](unsigned i) const + { + mln_precondition(is_valid()); + return to_point()[i]; + } + + template <typename P, unsigned N, unsigned D> + inline + face_handle<N, D> + complex_psite<P, N, D>::face() const + { + return face_; + } + + template <typename P, unsigned N, unsigned D> + inline + const complex<D>& + complex_psite<P, N, D>::cplx() const + { + return face_.cplx(); + } + + /*--------------. + | Comparisons. | + `--------------*/ + + template <typename P, unsigned N, unsigned D> + bool + operator==(const complex_psite<P, N, D>& lhs, + const complex_psite<P, N, D>& rhs) + { + mln_precondition(&lhs.cplx() == &rhs.cplx()); + return lhs.face() == rhs.face(); + } + + template <typename P, unsigned N, unsigned D> + bool + operator< (const complex_psite<P, N, D>& lhs, + const complex_psite<P, N, D>& rhs) + { + mln_precondition(&lhs.cplx() == &rhs.cplx()); + return lhs.face() < rhs.face(); + } + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of mln + +#endif // MLN_CORE_COMPLEX_PSITE_HH Index: mln/core/p_complex.hh --- mln/core/p_complex.hh (revision 0) +++ mln/core/p_complex.hh (revision 0) @@ -0,0 +1,199 @@ +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_P_COMPLEX_HH +# define MLN_CORE_P_COMPLEX_HH + +/// \file mln/core/p_complex.hh +/// \brief Definition of a point set based on a complex. + +# include <mln/core/internal/point_set_base.hh> + +# include <mln/accu/bbox.hh> +# include <mln/util/tracked_ptr.hh> +# include <mln/core/complex.hh> + +# include <mln/core/complex_psite.hh> + + +namespace mln +{ + + /// A complex psite set based on a complex of dimension \p D (a \p + /// D-complex). + template<typename P, unsigned N, unsigned D> + struct p_complex + : public internal::point_set_base_< complex_psite<P, N, D>, + p_complex<P, N, D> > + { + /// \brief Construct a complex psite set from a complex. + /// + /// \param gr The complex upon which the complex psite set is built. + /// + /// \a gr is \em copied internally, so that the complex psite set is + /// still valid after the initial complex has been removed. + p_complex (const complex<D>& cplx); + + /// Point_Site associated type. + typedef complex_psite<P, N, D> psite; + + // FIXME: Fake. + typedef void fwd_piter; + typedef void bkd_piter; + + /// \brief Return The number of points (sites) of the set, i.e., the + /// number of \em faces. + /// + /// Required by the mln::Point_Set concept. + std::size_t npoints() const; + + /// Return The number of faces in the complex. + std::size_t nfaces() const; + + /// Give the exact bounding box. + const box_& bbox() const; + + bool has(const psite& p) const; + + /// Return the complex associated to the p_complex domain. + const complex<D>& cplx() const; + + private: + /// The complex on which this pset is built. + util::tracked_ptr< complex<D> > cplx_; + // FIXME: Remove as soon as bbox become optional. + box_ bb_; + }; + + + /// \brief Comparison between two mln::p_complex's. + /// + /// Two mln::p_complex's are considered equal if they share the + /// same complex. + template <typename P, unsigned N, unsigned D> + bool + operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + + /// \brief 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 + /// in another one if their are equal. + /// + /// \todo Refine this later, when we are able to express subcomplex + /// relations. + template <typename P, unsigned N, unsigned D> + bool + operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P, unsigned N, unsigned D> + inline + p_complex<P, N, D>::p_complex(const complex<D>& cplx) + // Create a deep, managed copy of CPLX. + : cplx_(new complex<D>(cplx)) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + + // FIXME: Dummy initialization. + accu::bbox a; + for (unsigned i = 0; i < npoints(); ++i) + a.take(P()); + bb_ = a.to_result(); + } + + template <typename P, unsigned N, unsigned D> + inline + std::size_t + p_complex<P, N, D>::npoints() const + { + return nfaces(); + } + + template <typename P, unsigned N, unsigned D> + inline + std::size_t + p_complex<P, N, D>::nfaces() const + { + return this->cplx_->template nfaces<N>(); + } + + template <typename P, unsigned N, unsigned D> + inline + const box_& + p_complex<P, N, D>::bbox() const + { + // FIXME: Dummy value. + return bb_; + } + + template <typename P, unsigned N, unsigned D> + inline + bool + p_complex<P, N, D>::has(const psite& p) const + { + return + // Check whether P's complex is compatible with this pset's complex. + &p.cplx() == &cplx() && + // Check whether the complex has the face associated to P. + p.face().is_valid(); + } + + + template <typename P, unsigned N, unsigned D> + const complex<D>& + p_complex<P, N, D>::cplx() const + { + mln_precondition(cplx_); + return *cplx_.ptr_; + } + + + template <typename P, unsigned N, unsigned D> + bool + operator==(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + { + return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; + } + + template <typename P, unsigned N, unsigned D> + bool + operator<=(const p_complex<P, N, D>& lhs, const p_complex<P, N, D>& rhs) + { + return lhs == rhs; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // MLN_CORE_P_COMPLEX_HH Index: tests/core/p_complex.cc --- tests/core/p_complex.cc (revision 0) +++ tests/core/p_complex.cc (revision 0) @@ -0,0 +1,95 @@ +// 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. + +/// \file tests/core/p_complex.cc +/// \brief Test of mln::p_complex. + +#include <iostream> + +#include <mln/core/p_complex.hh> +#include <mln/core/point2d.hh> + + +// FIXME: Extend this test and rename it as complex_image.cc. + +int main() +{ + using namespace mln; + + /*----------. + | Complex. | + `----------*/ + + /* A 2-d (simplicial) complex and its adjacency graph. + + v0 e3 v3 + o-----------o v0----e3----v3 + / \ ,-----. / / \ | / + / . \ \ t2/ / / \ t2 / + e0 / / \ e1\ / / e4 e0. ,e1� `e4 + / /t1 \ \ ' / / t1 \ / + / `-----' \ / / | \ / + o-----------o v1----e2----v2 + v1 e2 v2 + + v = vertex + e = edge + t = triangle + */ + + + complex<2> c; + + // 0-faces (points). + face_handle<0, 2> v0 = c.add_face(); + face_handle<0, 2> v1 = c.add_face(); + face_handle<0, 2> v2 = c.add_face(); + face_handle<0, 2> v3 = c.add_face(); + + // 1-faces (segments). + face_handle<1, 2> e0 = c.add_face(v0 + v1); + face_handle<1, 2> e1 = c.add_face(v0 + v2); + face_handle<1, 2> e2 = c.add_face(v1 + v2); + face_handle<1, 2> e3 = c.add_face(v0 + v3); + face_handle<1, 2> e4 = c.add_face(v2 + v3); + + // 2-faces (triangles). + face_handle<2, 2> t0 = c.add_face(e0 + e1 + e2); + face_handle<2, 2> t1 = c.add_face(e1 + e3 + e4); + + + /*----------------------. + | Complex-based psets. | + `----------------------*/ + + // Pset of 0-faces. + p_complex<point2d, 0, 2> pc0(c); + // Pset of 1-faces. + p_complex<point2d, 1, 2> pc1(c); + // Pset of 2-faces. + p_complex<point2d, 2, 2> pc2(c); +} Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 2121) +++ tests/core/Makefile.am (working copy) @@ -51,6 +51,7 @@ \ obased_rle_image \ \ + p_complex \ p_priority_queue \ p_priority_queue_fast \ p_priority_queue_fast_with_array \ @@ -138,6 +139,7 @@ obased_rle_image_SOURCES = obased_rle_image.cc +p_complex_SOURCES = p_complex.cc p_priority_queue_SOURCES = p_priority_queue.cc p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc

1 0

2120: Check more preconditions in mln::complex<D>.
by Roland Levillain 06 Aug '08

06 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Check more preconditions in mln::complex<D>. * mln/core/complex.hh (mln::complex<D>::add_face(const faces_set<N, D>&)): Ensure arguments are consistent with the complex. complex.hh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2120) +++ mln/core/complex.hh (working copy) @@ -250,7 +250,19 @@ face_handle<N + 1, D> complex<D>::add_face(const faces_set<N, D>& adjacent_faces) { - // FIXME: Ensure ADJACENT_FACES are already part of the complex. + typedef typename std::vector< face_handle<N, D> >::const_iterator iter_t; + + // Ensure ADJACENT_FACES are already part of the complex. + /* FIXME: We need additional macros in mln/core/contract.hh for + big blocks of preconditions like this one. */ +# ifndef NDEBUG + for (iter_t a = adjacent_faces.faces().begin(); + a != adjacent_faces.faces().end(); ++a) + { + mln_precondition(&a->cplx() == this); + mln_precondition(a->is_valid()); + } +# endif // !NDEBUG face<N + 1, D> f; /* FIXME: This is not thread-proof (these two lines should @@ -260,12 +272,9 @@ face_handle<N + 1, D> fh(*this, id); // Connect F and its ADJACENT_FACES. - /* FIXME: Use <fonctional> or Milena's functors. */ - for (typename std::vector< face_handle<N, D> >::const_iterator a = - adjacent_faces.faces().begin(); + for (iter_t a = adjacent_faces.faces().begin(); a != adjacent_faces.faces().end(); ++a) connect_(*a, fh); - return fh; }

1 0

2119: Add more services to complexes and faces.
by Roland Levillain 06 Aug '08

06 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add more services to complexes and faces. * mln/core/complex.hh (mln::complex<D>::nfaces<N>): New. Use it... (mln::complex<D>::add_face): ...here. * mln/core/face.hh (mln::face_handle<N, D>::c, mln::face_handle<N, D>::c_): Rename as... (mln::face_handle<N, D>::cplx, mln::face_handle<N, D>::cplx_): ...these. Adjust users. (operator==(const face_handle<N, D>&, const face_handle<N, D>&)) (operator< (const face_handle<N, D>&, const face_handle<N, D>&)): New. complex.hh | 18 ++++++++++++++- face.hh | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 72 insertions(+), 15 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2119) +++ mln/core/complex.hh (working copy) @@ -36,6 +36,8 @@ /// /// FIXME: More. +# include <cstddef> + # include <iosfwd> # include <mln/metal/bool.hh> @@ -77,6 +79,10 @@ face_handle<N + 1, D> add_face(const faces_set<N, D>& adjacent_faces); /// \} + /// \brief Return the number of \p N-faces. + template <unsigned N> + std::size_t nfaces() const; + /// Pretty-printing. /// \{ /// Print the complex. @@ -234,7 +240,7 @@ /* FIXME: This is not thread-proof (these two lines should form an atomic section). */ internal::faces_set_mixin<0u, D>::faces_.push_back(face<0u, D>()); - unsigned id = internal::faces_set_mixin<0u, D>::faces_.size() - 1; + unsigned id = nfaces<0u>() - 1; return face_handle<0u, D>(*this, id); } @@ -250,7 +256,7 @@ /* FIXME: This is not thread-proof (these two lines should form an atomic section). */ internal::faces_set_mixin<N + 1, D>::faces_.push_back(f); - unsigned id = internal::faces_set_mixin<N + 1, D>::faces_.size() - 1; + unsigned id = nfaces<N + 1>() - 1; face_handle<N + 1, D> fh(*this, id); // Connect F and its ADJACENT_FACES. @@ -265,6 +271,14 @@ template <unsigned D> template <unsigned N> + std::size_t + complex<D>::nfaces() const + { + return internal::faces_set_mixin<N, D>::faces_.size(); + } + + template <unsigned D> + template <unsigned N> face<N, D>& complex<D>::face_(unsigned face_id) { Index: mln/core/face.hh --- mln/core/face.hh (revision 2119) +++ mln/core/face.hh (working copy) @@ -58,6 +58,8 @@ } + // FIXME: Rename `face' as `face_data' and `face_handle' as face. + /*-------. | Face. | `-------*/ @@ -66,7 +68,7 @@ template <unsigned N, unsigned D> class face; - // Specialization for the faces of highest dimension (D). + // Specialization for the faces of highest dimension (\p D). template <unsigned D> class face<D, D> : public internal::lower_dim_faces_mixin<D, D> { @@ -148,7 +150,8 @@ /// Accessors. /// \{ /// Return the complex the face belongs to. - complex<D>& c() const; + // FIXME: Rename to complex()? + complex<D>& cplx() const; /// Return the id of the face. unsigned face_id() const; @@ -160,16 +163,40 @@ /// \brief The complex the face belongs to. /// /// A const face_handle can be used to modify a complex. - mutable complex<D>* c_; + mutable complex<D>* cplx_; /// \brief The id of the face. unsigned face_id_; }; + + /// Create a handle for \p N-face of a \p D-complex. template <unsigned N, unsigned D> face_handle<N, D> make_face_handle(const complex<D>& c, unsigned face_id); + /// Comparison of two instances of mln::face_handle. + /// \{ + /// \brief Is \a lhs equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + template <unsigned N, unsigned D> + bool + operator==(const face_handle<N, D>& lhs, const face_handle<N, D>& rhs); + + /// \brief Is \a lhs ``less'' than \a rhs? + /// + /// This comparison is required by algorithms sorting face handles. + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::complex. + template <unsigned N, unsigned D> + bool + operator< (const face_handle<N, D>& lhs, const face_handle<N, D>& rhs); + /// \} + + /*----------------------. | Set of face handles. | `----------------------*/ @@ -240,19 +267,19 @@ template <unsigned N, unsigned D> face_handle<N, D>::face_handle() - : c_(0), face_id_(UINT_MAX) + : cplx_(0), face_id_(UINT_MAX) { } template <unsigned N, unsigned D> face_handle<N, D>::face_handle(complex<D>& c, unsigned face_id) - : c_(&c), face_id_(face_id) + : cplx_(&c), face_id_(face_id) { } template <unsigned N, unsigned D> face_handle<N, D>::face_handle(const face_handle<N, D>& rhs) - : c_(rhs.c_), face_id_(rhs.face_id_) + : cplx_(rhs.cplx_), face_id_(rhs.face_id_) { } @@ -262,7 +289,7 @@ { if (&rhs != this) { - c_ = rhs.c_; + cplx_ = rhs.cplx_; face_id_ = rhs.face_id_; } return *this; @@ -272,15 +299,15 @@ bool face_handle<N, D>::is_valid() const { - return c_ != 0 && face_id_ != UINT_MAX; + return cplx_ != 0 && face_id_ < cplx_->template nfaces<N>(); } template <unsigned N, unsigned D> complex<D>& - face_handle<N, D>::c() const + face_handle<N, D>::cplx() const { - mln_assertion(c_); - return *c_; + mln_assertion(cplx_); + return *cplx_; } template <unsigned N, unsigned D> @@ -295,7 +322,7 @@ face_handle<N, D>::to_face() const { mln_assertion(is_valid()); - return c_->template face_<N>(face_id_); + return cplx_->template face_<N>(face_id_); } @@ -306,6 +333,22 @@ return face_handle<N, D>(&c, face_id); } + template <unsigned N, unsigned D> + bool + operator==(const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) + { + mln_assertion(&lhs.face.cplx() == &rhs.face.cplx()); + return lhs.face().id() == rhs.face().id(); + } + + template <unsigned N, unsigned D> + bool + operator< (const face_handle<N, D>& lhs, const face_handle<N, D>& rhs) + { + mln_assertion(&lhs.face.cplx() == &rhs.face.cplx()); + return lhs.face().id() < rhs.face().id(); + } + /*---------------. | Set of faces. | @@ -317,7 +360,7 @@ { // Check consistency. if (!faces_.empty()) - mln_assertion(&faces_.front().c() == &f.c()); + mln_assertion(&faces_.front().cplx() == &f.cplx()); faces_.push_back (f); }

1 0

2118: Allow non-initialized faces.
by Roland Levillain 06 Aug '08

06 Aug '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Allow non-initialized faces. * mln/core/face.hh (mln::face_handle<N, D>::face_handle): New ctor. (mln::face_handle<N, D>::is_valid): New method. Use it... (mln::face_handle<N, D>::get): ...here. Rename as... (mln::face_handle<N, D>::to_face): ...this. (mln::face_handle<N, D>::face_id_): Make this attribute private. (mln::face_handle<N, D>::c_): Likewise. Turn this reference into a pointer. (mln::face_handle<N, D>::face_handle) (mln::face_handle<N, D>::to_face) (mln::make_face_handle<N, D>): Adjust. (mln::faces_set<N, D>::add): Likewise. Remove spurious FIXME. (mln::face_handle<N, D>::c, mln::face_handle<N, D>::face_id): New accessors. * mln/core/complex.hh (mln::complex<D>::connect_) (mln::internal::lower_dim_faces_set_mixin<N, D>::print) (mln::internal::higher_dim_faces_set_mixin<N, D>::print): Adjust. complex.hh | 8 ++-- face.hh | 102 +++++++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 34 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2118) +++ mln/core/complex.hh (working copy) @@ -288,8 +288,8 @@ // Ensure N is compatible with D. metal::bool_< N <= D >::check(); - f1.get().connect_higher_dim_face(f2); - f2.get().connect_lower_dim_face(f1); + f1.to_face().connect_higher_dim_face(f2); + f2.to_face().connect_lower_dim_face(f1); } @@ -424,7 +424,7 @@ { for (typename std::vector< face_handle<N - 1, D> >::const_iterator l = f.lower_dim_faces_.begin(); l != f.lower_dim_faces_.end(); ++l) - ostr << l->face_id_ << " "; + ostr << l->face_id() << " "; } template <unsigned N, unsigned D> @@ -434,7 +434,7 @@ { for (typename std::vector< face_handle<N + 1, D> >::const_iterator h = f.higher_dim_faces_.begin(); h != f.higher_dim_faces_.end(); ++h) - ostr << h->face_id_ << " "; + ostr << h->face_id() << " "; } } // end of namespace mln::internal Index: mln/core/face.hh --- mln/core/face.hh (revision 2118) +++ mln/core/face.hh (working copy) @@ -31,6 +31,8 @@ /// \file mln/core/face.hh /// \brief Face of a complex. +#include <climits> + #include <vector> #include <mln/core/contract.hh> @@ -129,6 +131,9 @@ template <unsigned N, unsigned D> struct face_handle { + /// Build a non-initialized face handle. + face_handle(); + /// Build a face handle from \a complex and \a face_id. face_handle(complex<D>& complex, unsigned face_id); /// Copy and assignment. @@ -137,15 +142,26 @@ face_handle<N, D>& operator=(const face_handle<N, D>& rhs); /// \} + /// Is this handle valid? + bool is_valid() const; + /// Accessors. /// \{ + /// Return the complex the face belongs to. + complex<D>& c() const; + /// Return the id of the face. + unsigned face_id() const; + /// Return the mln::face pointed by this handle. - face<N, D>& get() const; + face<N, D>& to_face() const; /// \} - /* FIXME: Hide data. */ - // A const face_handle can be used to modify a complex. - mutable complex<D>& c_; + private: + /// \brief The complex the face belongs to. + /// + /// A const face_handle can be used to modify a complex. + mutable complex<D>* c_; + /// \brief The id of the face. unsigned face_id_; }; @@ -195,13 +211,42 @@ # ifndef MLN_INCLUDE_ONLY + /*--------. + | Faces. | + `--------*/ + + namespace internal + { + template <unsigned N, unsigned D> + void + lower_dim_faces_mixin<N, D>::connect_lower_dim_face(const face_handle<N - 1, D>& f) + { + lower_dim_faces_.push_back(f); + } + + template <unsigned N, unsigned D> + void + higher_dim_faces_mixin<N, D>::connect_higher_dim_face(const face_handle<N + 1, D>& f) + { + higher_dim_faces_.push_back(f); + } + + } // end of namespace mln::internal + + /*--------------. | Face handle. | `--------------*/ template <unsigned N, unsigned D> + face_handle<N, D>::face_handle() + : c_(0), face_id_(UINT_MAX) + { + } + + template <unsigned N, unsigned D> face_handle<N, D>::face_handle(complex<D>& c, unsigned face_id) - : c_(c), face_id_(face_id) + : c_(&c), face_id_(face_id) { } @@ -224,42 +269,42 @@ } template <unsigned N, unsigned D> - face<N, D>& - face_handle<N, D>::get() const + bool + face_handle<N, D>::is_valid() const { - return c_.template face_<N>(face_id_); + return c_ != 0 && face_id_ != UINT_MAX; } - template <unsigned N, unsigned D> - face_handle<N, D> - make_face_handle(const complex<D>& c, unsigned face_id) + complex<D>& + face_handle<N, D>::c() const { - return face_handle<N, D>(c, face_id); + mln_assertion(c_); + return *c_; } - - /*--------. - | Faces. | - `--------*/ - - namespace internal - { template <unsigned N, unsigned D> - void - lower_dim_faces_mixin<N, D>::connect_lower_dim_face(const face_handle<N - 1, D>& f) + unsigned + face_handle<N, D>::face_id() const { - lower_dim_faces_.push_back(f); + return face_id_; } template <unsigned N, unsigned D> - void - higher_dim_faces_mixin<N, D>::connect_higher_dim_face(const face_handle<N + 1, D>& f) + face<N, D>& + face_handle<N, D>::to_face() const { - higher_dim_faces_.push_back(f); + mln_assertion(is_valid()); + return c_->template face_<N>(face_id_); } - } // end of namespace mln::internal + + template <unsigned N, unsigned D> + face_handle<N, D> + make_face_handle(const complex<D>& c, unsigned face_id) + { + return face_handle<N, D>(&c, face_id); + } /*---------------. @@ -272,10 +317,7 @@ { // Check consistency. if (!faces_.empty()) - mln_assertion(&faces_.front().c_ == &f.c_); - - /* FIXME: This is not thread-proof (these two lines should - form an atomic section). */ + mln_assertion(&faces_.front().c() == &f.c()); faces_.push_back (f); }

1 0