July 2008 - Olena-patches

[Olena] #149: Revamp util::graph
by Olena 18 May '09

18 May '09

#149: Revamp util::graph -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- * Get rid of superfluous dynamic allocations (w.r.t. vertices & edges handling). * Move properties attached to vertices and edges out of the graph (this should allow the merging of `util::graph` and `util::internal::graph_base`. * Allow the removal of vertices and edges. Don't forget to warn users about the invalidation of vertex and edge ids (handlers). * Stop using the term « id » (« identifier ») for vertices and edges, and prefer the term « handler » ? (The BGL call them « descriptors ».) All these changes might bring us closer to the BGL' `adjacency_list`. See how we could factor things, while not requiring a dependency on the BGL. -- Ticket URL: <https://trac.lrde.org/olena/ticket/149> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

3 7

[Olena] #153: Write a test using Ubigraph
by Olena 18 May '09

18 May '09

#153: Write a test using Ubigraph -----------------------------------+---------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: trivial | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: rendering third-party | -----------------------------------+---------------------------------------- Ubigraph is a promising graph manipulation and visualization project: * http://ubietylab.net/ubigraph/ We could write a small test exercising its display capabilities, e.g., the construction of a skeleton on a binary, graph-based image (even a 2-D image on a regular grid). Check the license(s); the client part is Free Software, but the server doesn't seem so. -- Ticket URL: <https://trac.lrde.org/olena/ticket/153> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

[Olena] #143: Reorganize milena/mln/core/
by Olena 18 May '09

18 May '09

#143: Reorganize milena/mln/core/ ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- (This ticket is just a proposal. We might close it even if no change occur in `milena/mln/core`.) There are many things in source:trunk/milena/mln/core/, that could be reorganized and/or split in several directories/subdirectories: * basic/classic images and entites (`mln::image2d`, etc.) * graph-based images and entities (`mln::graph_image`, etc.) * non classic images and associated tools (`mln::rle_image`, etc.) * morphers (`mln::cast_image`, etc.) * internal/core mechanisms (`initialize.hh` etc.) * general tools (`contract.hh`, `inplace.hh`, etc.) * concepts (though they are located in their own directory, `mln/core/concept/`) * implementation/factoring classes (thought most of them are in `mln/core/internal/`) * other entities, that should be moved elsewhere (`mln::h_vec`, etc.) * and so on. To my (Roland) mind, we should: 1. Identify the different kind of files present in `core/`. 2. Assign one (maybe two) kinds to each file of this directory. 3. Determine a new file layout, and perform the moves. -- Ticket URL: <https://trac.lrde.org/olena/ticket/143> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 3

[Olena] #140: Add points having floating-point coordinates
by Olena 18 May '09

18 May '09

#140: Add points having floating-point coordinates ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Name regular instances `point1df`, `point2df` and `point3df`. (N.B.: Aroune will need them so as to build the 3-d surface graph from a set of triangles.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/140> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

[Olena] #130: Don not pass neighborhoods as argument to algorithms
by Olena 14 May '09

14 May '09

#130: Don not pass neighborhoods as argument to algorithms ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Neighborhoods shall be bound to images: they are a property of them. Hence an algorithm (at least a facade) shall not accept an image along with an ''external'' neighborhood. Most of the time, these algorithms are based on windows improperly called neighborhoods. Here is the list of files to revamp, as of revision 1663: * source:trunk/labeling/level.spe.hh * source:trunk/labeling/regional_maxima.hh * source:trunk/labeling/regional_minima.hh * source:trunk/make/voronoi.hh * source:trunk/milena/mln/geom/labeling/blobs.hh * source:trunk/milena/mln/geom/seeds2tiling_roundness.hh * source:trunk/milena/mln/labeling/background.hh * source:trunk/milena/mln/labeling/flat_zones.hh * source:trunk/milena/mln/labeling/foreground.hh * source:trunk/milena/mln/labeling/level.hh * source:trunk/morpho/Rd.hh * source:trunk/morpho/dilation.hh * source:trunk/morpho/opening_area.hh * source:trunk/morpho/opening_attribute.hh -- Ticket URL: <https://trac.lrde.org/olena/ticket/130> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 11

[Olena] #142: Add iterators on graphs
by Olena 18 Oct '08

18 Oct '08

#142: Add iterators on graphs ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- We need these, at least: * iterator on vertices (forward, backward) * iterator on edges (forward, backward) * iterator on the adjacent edges of a vertex (forward, backward) * iterator on the adjacent edges of an edge (forward, backward) -- Ticket URL: <https://trac.lrde.org/olena/ticket/142> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 3

[Olena] #154: Revive Swilena in Olena 1.0
by Olena 11 Aug '08

11 Aug '08

#154: Revive Swilena in Olena 1.0 ---------------------------------------------------+------------------------ Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Swilena | Version: 1.0 Keywords: dynamic interpreter shell interactive | ---------------------------------------------------+------------------------ Start with a very small test (e.g., a single image type + some morphological filters + a (topological) watershed transform). BTW, we might want to promote [https://svn.lrde.epita.fr/svn/clspr/trunk/ clspr] (C++-Libtool-SWIG-Python-Ruby) as a reusable component (but this is just an idea; it might not be usable as-is practically). (N.B. : Some future users of Olena have requested this (fast) reintroduction of Swilena; we should work on the distribution of the project in parallel as well, to have something usable for them.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/154> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 3

2118: Factor complex and face implementation.
by Roland Levillain 31 Jul '08

31 Jul '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Factor complex and face implementation. * mln/core/face.hh (mln::internal::lower_dim_faces_mixin<N, D>) (mln::internal::higher_dim_faces_mixin<N, D>): New classes. Use them... (mln::face<N, D>): ...here, as mixins. (mln::face<N, D>::connect_lower_dim_face) (mln::face<N, D>::connect_higher_dim_face) (mln::face<D, D>::connect_lower_dim_face) (mln::face<0, D>::connect_higher_dim_face): Remove, and turn into... (mln::internal::lower_dim_faces_mixin<N, D>::connect_lower_dim_face) (mln::internal::higher_dim_faces_mixin<N, D>::connect_higher_dim_face): ...these (new methods). * mln/core/complex.hh (mln::internal::lower_dim_faces_set_mixin<N, D>) (mln::internal::higher_dim_faces_set_mixin<N, D>): New classes. Use them... (mln::internal::faces_set_mixin<N, D>): ...here, as mixins, and (mln::internal::faces_set_mixin<N, D>::print): Factor using these mixins. complex.hh | 126 ++++++++++++++++++++++++++++++++++++++----------------------- face.hh | 112 +++++++++++++++++++++++++++--------------------------- 2 files changed, 136 insertions(+), 102 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2117) +++ mln/core/complex.hh (working copy) @@ -110,7 +110,6 @@ }; - // FIXME: Move and renamed as mln::debug::println? /// Pretty print a complex. template <unsigned D> std::ostream& @@ -126,51 +125,67 @@ namespace internal { - // FIXME: Factor common things here. + // Forward declarations. + template <unsigned N, unsigned D> struct lower_dim_faces_set_mixin; + template <unsigned N, unsigned D> struct higher_dim_faces_set_mixin; + + + /*---------------------------------. + | mln::internal::faces_set_mixin. | + `---------------------------------*/ /// \brief Recursive mixins of set of faces. /// \{ - template <unsigned N, unsigned D> - struct faces_set_mixin : faces_set_mixin<N - 1, D> + template <unsigned N, unsigned D> struct faces_set_mixin; + + /// 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> { - std::vector< face<N, D> > faces_; + std::vector< face<D, D> > faces_; /// Pretty-printing. /// \{ - /// Print the faces of dimension \p N. + /// Print the faces of dimension \p D. void print(std::ostream& ostr) const; - /// Recursively print the faces of dimensions 0 to \p N - /// (in ascending dimension). void print_rec_asc(std::ostream& ostr) const; /// \} }; - template <unsigned D> - struct faces_set_mixin<0u, D> + /// 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> { - std::vector< face<0u, D> > faces_; + std::vector< face<N, D> > faces_; /// Pretty-printing. /// \{ - /// Print the faces of dimension 0. + /// Print the faces of dimension \p N. void print(std::ostream& ostr) const; + /// Recursively print the faces of dimensions 0 to \p N + /// (in ascending dimension). void print_rec_asc(std::ostream& ostr) const; /// \} }; + /// Faces of lowest dimension (0). template <unsigned D> - struct faces_set_mixin<D, D> : faces_set_mixin<D - 1, D> + struct faces_set_mixin<0u, D> : higher_dim_faces_set_mixin<0u, D> { - std::vector< face<D, D> > faces_; + std::vector< face<0u, D> > faces_; /// Pretty-printing. /// \{ - /// Print the faces of dimension \p D. + /// Print the faces of dimension 0. void print(std::ostream& ostr) const; void print_rec_asc(std::ostream& ostr) const; /// \} }; + /// Faces of a 0-complex. template <> struct faces_set_mixin<0u, 0u> { @@ -185,6 +200,27 @@ }; /// \} + + /*--------------------------------------------. + | mln::internal::lower_dim_faces_set_mixin. | + | mln::internal::higher_dim_faces_set_mixin. | + `--------------------------------------------*/ + + /// Mixins of mixin mln::faces_set_mixin. + /// \{ + template <unsigned N, unsigned D> + struct lower_dim_faces_set_mixin + { + void print(std::ostream& ostr, const face<N, D>& f) const; + }; + + template <unsigned N, unsigned D> + struct higher_dim_faces_set_mixin + { + void print(std::ostream& ostr, const face<N, D>& f) const; + }; + /// \} + } // end of namespace mln::internal @@ -291,8 +327,6 @@ namespace internal { - // FIXME: Factor common things here. - template <unsigned N, unsigned D> void faces_set_mixin<N, D>::print_rec_asc(std::ostream& ostr) const @@ -322,6 +356,7 @@ print(ostr); } + template <unsigned N, unsigned D> void faces_set_mixin<N, D>::print(std::ostream& ostr) const @@ -333,19 +368,10 @@ for (unsigned f = 0; f < faces_.size(); ++f) { ostr << " " << f << ": dim " << N - 1 << ": { "; - for (typename std::vector< face_handle<N - 1, D> >::const_iterator l = - faces_[f].lower_dim_faces_.begin(); - l != faces_[f].lower_dim_faces_.end(); - ++l) - ostr << l->face_id_ << " "; + lower_dim_faces_set_mixin<N, D>::print(ostr, faces_[f]); ostr << "}, dim " << N + 1 << ": { "; - for (typename std::vector< face_handle<N + 1, D> >::const_iterator h = - faces_[f].higher_dim_faces_.begin(); - h != faces_[f].higher_dim_faces_.end(); - ++h) - ostr << h->face_id_ << " "; - ostr << "}"; - ostr << std::endl; + higher_dim_faces_set_mixin<N, D>::print(ostr, faces_[f]); + ostr << "}" << std::endl; } } @@ -353,7 +379,6 @@ void faces_set_mixin<0u, D>::print(std::ostream& ostr) const { - // FIXME: Much could be factored with the previous routine. const unsigned N = 0u; ostr << "Faces of dimension " << N << " and their ajacent faces of dimension " @@ -361,13 +386,8 @@ for (unsigned f = 0; f < faces_.size(); ++f) { ostr << " " << f << ": dim " << N + 1 << ": { "; - for (typename std::vector< face_handle<N + 1, D> >::const_iterator h = - faces_[f].higher_dim_faces_.begin(); - h != faces_[f].higher_dim_faces_.end(); - ++h) - ostr << h->face_id_ << " "; - ostr << "}"; - ostr << std::endl; + higher_dim_faces_set_mixin<N, D>::print(ostr, faces_[f]); + ostr << "}" << std::endl; } } @@ -375,7 +395,6 @@ void faces_set_mixin<D, D>::print(std::ostream& ostr) const { - // FIXME: Much could be factored with the previous routines. const unsigned N = D; ostr << "Faces of dimension " << N << " and their ajacent faces of dimension " @@ -383,26 +402,41 @@ for (unsigned f = 0; f < faces_.size(); ++f) { ostr << " " << f << ": dim " << N - 1 << ": { "; - for (typename std::vector< face_handle<N - 1, D> >::const_iterator l = - faces_[f].lower_dim_faces_.begin(); - l != faces_[f].lower_dim_faces_.end(); - ++l) - ostr << l->face_id_ << " "; - ostr << "}"; - ostr << std::endl; + lower_dim_faces_set_mixin<N, D>::print(ostr, faces_[f]); + ostr << "}" << std::endl; } } void faces_set_mixin<0u, 0u>::print(std::ostream& ostr) const { - // FIXME: Much could be factored with the previous routines. const unsigned N = 0u; ostr << "Faces of dimension " << N << std::endl; for (unsigned f = 0; f < faces_.size(); ++f) ostr << " " << f << std::endl; } + + template <unsigned N, unsigned D> + void + lower_dim_faces_set_mixin<N, D>::print(std::ostream& ostr, + const face<N, D>& f) const + { + 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_ << " "; + } + + template <unsigned N, unsigned D> + void + higher_dim_faces_set_mixin<N, D>::print(std::ostream& ostr, + const face<N, D>& f) const + { + 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_ << " "; + } + } // end of namespace mln::internal # endif // ! MLN_INCLUDE_ONLY Index: mln/core/face.hh --- mln/core/face.hh (revision 2117) +++ mln/core/face.hh (working copy) @@ -30,8 +30,6 @@ /// \file mln/core/face.hh /// \brief Face of a complex. -/// -/// FIXME: More. #include <vector> @@ -41,13 +39,20 @@ namespace mln { - // Forward declarations. + // Forward declarations (external). template <unsigned D> class complex; + namespace internal + { + template <unsigned N, unsigned D> struct lower_dim_faces_set_mixin; + template <unsigned N, unsigned D> struct higher_dim_faces_set_mixin; + } + + // Forward declarations (internal). template <unsigned N, unsigned D> class face_handle; namespace internal { - template <unsigned N, unsigned D> - struct faces_set_mixin; + template <unsigned N, unsigned D> class lower_dim_faces_mixin; + template <unsigned N, unsigned D> class higher_dim_faces_mixin; } @@ -55,60 +60,65 @@ | Face. | `-------*/ - /* FIXME: we might want to factor connect_{higher,lower}_dim_cell - and {higher,lower_dim_faces_} as member of super classes. */ + /// \p N-face of a \p D-complex. + template <unsigned N, unsigned D> class face; - template <unsigned N, unsigned D> - class face - { - public: - void connect_higher_dim_face(const face_handle<N + 1, D>& f); - void connect_lower_dim_face (const face_handle<N - 1, D>& f); - private: - friend class mln::internal::faces_set_mixin<N, D>; + // Specialization for the faces of highest dimension (D). + template <unsigned D> + class face<D, D> : public internal::lower_dim_faces_mixin<D, D> + { + }; - // FIXME: Provide accessors instead of using `friend' if there are - // clients other than mln::internal::faces_set_mixin<N, D>. - std::vector< face_handle<N + 1, D> > higher_dim_faces_; - std::vector< face_handle<N - 1, D> > lower_dim_faces_; + // Specialization for the faces of intermediate dimension (greater + // than 0, lower than \p D). + template <unsigned N, unsigned D> + class face : public internal::lower_dim_faces_mixin<N, D>, + public internal::higher_dim_faces_mixin<N, D> + { }; // Specialization for the faces of lowest dimension (0). template <unsigned D> - class face<0u, D> + class face<0u, D> : public internal::higher_dim_faces_mixin<0u, D> { - public: - void connect_higher_dim_face(const face_handle<1u, D>& f); - - private: - friend class mln::internal::faces_set_mixin<0, D>; + }; - // FIXME: Provide accessors instead of using `friend; if there are - // clients other than mln::internal::faces_set_mixin<0, D>. - std::vector< face_handle<1u, D> > higher_dim_faces_; + // Specialization for the case of a 0-complex. + template <> + class face<0u, 0u> + { }; - // Specialization for the faces of highest dimension (D). - template <unsigned D> - class face<D, D> + + namespace internal { - public: - void connect_lower_dim_face(const face_handle<1u, D>& f); + /// Factored implementation of faces. + /// \{ + template <unsigned N, unsigned D> + class lower_dim_faces_mixin + { + public: + void connect_lower_dim_face (const face_handle<N - 1, D>& f); private: - friend class mln::internal::faces_set_mixin<D, D>; - - // FIXME: Provide accessors instead of using `friend; if there are - // clients other than mln::internal::faces_set_mixin<0, D>. - std::vector< face_handle<1u, D> > lower_dim_faces_; + friend class mln::internal::lower_dim_faces_set_mixin<N, D>; + std::vector< face_handle<N - 1, D> > lower_dim_faces_; }; - // Specialization for the case of a 0-complex. - template <> - class face<0u, 0u> + template <unsigned N, unsigned D> + class higher_dim_faces_mixin { + public: + void connect_higher_dim_face(const face_handle<N + 1, D>& f); + private: + friend class mln::internal::higher_dim_faces_set_mixin<N, D>; + std::vector< face_handle<N + 1, D> > higher_dim_faces_; }; + /// \} + + } // end of namespace mln::internal + /*--------------. @@ -233,33 +243,23 @@ | Faces. | `--------*/ - template <unsigned N, unsigned D> - void - face<N, D>::connect_higher_dim_face(const face_handle<N + 1, D>& f) + namespace internal { - higher_dim_faces_.push_back(f); - } - template <unsigned N, unsigned D> void - face<N, D>::connect_lower_dim_face(const face_handle<N - 1, D>& f) + 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 D> + template <unsigned N, unsigned D> void - face<0u, D>::connect_higher_dim_face(const face_handle<1u, D>& f) + higher_dim_faces_mixin<N, D>::connect_higher_dim_face(const face_handle<N + 1, D>& f) { higher_dim_faces_.push_back(f); } - template <unsigned D> - void - face<D, D>::connect_lower_dim_face(const face_handle<1u, D>& f) - { - lower_dim_faces_.push_back(f); - } + } // end of namespace mln::internal /*---------------.

1 0

2117: Improve handling of faces of lowest and highest dimensions.
by Roland Levillain 31 Jul '08

31 Jul '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Improve handling of faces (of complexes) of lowest and highest dimensions. * mln/core/face.hh (mln::face<D, D>, mln::face<0u, 0u>): New. * mln/core/complex.hh (mln::internal::faces_set_mixin<D, D>) (mln::internal::faces_set_mixin<0u, 0u>): New. (mln::internal::faces_set_mixin<0u, D>::print): Aesthetic change. complex.hh | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ face.hh | 29 +++++++++++++++++++++- 2 files changed, 101 insertions(+), 8 deletions(-) Index: mln/core/complex.hh --- mln/core/complex.hh (revision 2116) +++ mln/core/complex.hh (working copy) @@ -121,8 +121,6 @@ | Faces of a complex. | `---------------------*/ - // FIXME: Move these declarations after � Complex �. - /// The sets of n-faces of a complex are recursively aggregated as /// mixins. namespace internal @@ -159,6 +157,32 @@ void print_rec_asc(std::ostream& ostr) const; /// \} }; + + template <unsigned D> + struct faces_set_mixin<D, D> : faces_set_mixin<D - 1, D> + { + std::vector< face<D, D> > faces_; + + /// Pretty-printing. + /// \{ + /// Print the faces of dimension \p D. + void print(std::ostream& ostr) const; + void print_rec_asc(std::ostream& ostr) const; + /// \} + }; + + template <> + struct faces_set_mixin<0u, 0u> + { + std::vector< face<0u, 0u> > faces_; + + /// Pretty-printing. + /// \{ + /// Print the faces of dimension \p D. + void print(std::ostream& ostr) const; + void print_rec_asc(std::ostream& ostr) const; + /// \} + }; /// \} } // end of namespace mln::internal @@ -279,7 +303,21 @@ template <unsigned D> void - faces_set_mixin<0, D>::print_rec_asc(std::ostream& ostr) const + faces_set_mixin<0u, D>::print_rec_asc(std::ostream& ostr) const + { + print(ostr); + } + + template <unsigned D> + void + faces_set_mixin<D, D>::print_rec_asc(std::ostream& ostr) const + { + faces_set_mixin<D - 1, D>::print_rec_asc(ostr); + print(ostr); + } + + void + faces_set_mixin<0u, 0u>::print_rec_asc(std::ostream& ostr) const { print(ostr); } @@ -316,13 +354,13 @@ faces_set_mixin<0u, D>::print(std::ostream& ostr) const { // FIXME: Much could be factored with the previous routine. - const unsigned N = 0; + const unsigned N = 0u; ostr << "Faces of dimension " << N << " and their ajacent faces of dimension " << N + 1 << std::endl; for (unsigned f = 0; f < faces_.size(); ++f) { - ostr << " " << f << " dim " << N + 1 << ": { "; + ostr << " " << f << ": dim " << N + 1 << ": { "; for (typename std::vector< face_handle<N + 1, D> >::const_iterator h = faces_[f].higher_dim_faces_.begin(); h != faces_[f].higher_dim_faces_.end(); @@ -333,9 +371,37 @@ } } + template <unsigned D> + void + faces_set_mixin<D, D>::print(std::ostream& ostr) const + { + // FIXME: Much could be factored with the previous routines. + const unsigned N = D; + ostr << "Faces of dimension " << N + << " and their ajacent faces of dimension " + << N - 1 << std::endl; + for (unsigned f = 0; f < faces_.size(); ++f) + { + ostr << " " << f << ": dim " << N - 1 << ": { "; + for (typename std::vector< face_handle<N - 1, D> >::const_iterator l = + faces_[f].lower_dim_faces_.begin(); + l != faces_[f].lower_dim_faces_.end(); + ++l) + ostr << l->face_id_ << " "; + ostr << "}"; + ostr << std::endl; + } + } - // FIXME: Handle faces_set_mixin<D, D>::print. - + void + faces_set_mixin<0u, 0u>::print(std::ostream& ostr) const + { + // FIXME: Much could be factored with the previous routines. + const unsigned N = 0u; + ostr << "Faces of dimension " << N << std::endl; + for (unsigned f = 0; f < faces_.size(); ++f) + ostr << " " << f << std::endl; + } } // end of namespace mln::internal Index: mln/core/face.hh --- mln/core/face.hh (revision 2116) +++ mln/core/face.hh (working copy) @@ -74,6 +74,7 @@ std::vector< face_handle<N - 1, D> > lower_dim_faces_; }; + // Specialization for the faces of lowest dimension (0). template <unsigned D> class face<0u, D> { @@ -88,7 +89,26 @@ std::vector< face_handle<1u, D> > higher_dim_faces_; }; - // FIXME: Handle face<0u, 0u>. + // Specialization for the faces of highest dimension (D). + template <unsigned D> + class face<D, D> + { + public: + void connect_lower_dim_face(const face_handle<1u, D>& f); + + private: + friend class mln::internal::faces_set_mixin<D, D>; + + // FIXME: Provide accessors instead of using `friend; if there are + // clients other than mln::internal::faces_set_mixin<0, D>. + std::vector< face_handle<1u, D> > lower_dim_faces_; + }; + + // Specialization for the case of a 0-complex. + template <> + class face<0u, 0u> + { + }; /*--------------. @@ -234,6 +254,13 @@ higher_dim_faces_.push_back(f); } + template <unsigned D> + void + face<D, D>::connect_lower_dim_face(const face_handle<1u, D>& f) + { + lower_dim_faces_.push_back(f); + } + /*---------------. | Set of faces. |

1 0

2115: Fix std::memcpy usage.
by Roland Levillain 31 Jul '08

31 Jul '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix std::memcpy usage. * mln/level/memcpy_.hh: Include `cstring'. memcpy_.hh | 1 + 1 file changed, 1 insertion(+) Index: mln/level/memcpy_.hh --- mln/level/memcpy_.hh (revision 2115) +++ mln/level/memcpy_.hh (working copy) @@ -35,6 +35,7 @@ * \todo Overload with images and points; Cf. memset_. */ +# include <cstring> # include <mln/core/concept/image.hh> # include <mln/core/pixel.hh> # include <mln/metal/is_not_const.hh>

1 0