Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

2143: Add a printing operator for mln::complex_psite.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a printing operator for mln::complex_psite. * mln/core/complex_psite.hh (operator<<(std::ostream&, const complex_psite<D, P>&)): New operator. * tests/core/complex_image.cc: ...here. mln/core/complex_psite.hh | 19 +++++++++++++++++++ tests/core/complex_image.cc | 1 + 2 files changed, 20 insertions(+) Index: mln/core/complex_psite.hh --- mln/core/complex_psite.hh (revision 2143) +++ mln/core/complex_psite.hh (working copy) @@ -127,6 +127,16 @@ /// \} + /* FIXME: This hand-made delegation is painful. We should rely on + the general mechanism provided by Point_Site. But then again, we + need to refine/adjust the interface of Point_Site w.r.t. the + mandatory conversions to points. */ + template <unsigned D, typename P> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_psite<D, P>& p); + + # ifndef MLN_INCLUDE_ONLY @@ -254,6 +264,15 @@ return lhs.face() < rhs.face(); } + + template <unsigned D, typename P> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_psite<D, P>& p) + { + return ostr << "(dim = " << p.n() << ", id = " << p.face_id() << ')'; + } + # endif // ! MLN_INCLUDE_ONLY Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2143) +++ tests/core/complex_image.cc (working copy) @@ -147,6 +147,7 @@ any_face_handle<D> af(e0_); // An associated psite. complex_psite<D, point2d> cs(af); + std::cout << cs << std::endl; /*--------------------.

16 years, 5 months

2143: Add a complex-base image type.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a complex-base image type. * mln/core/complex_image.hh: New. * mln/trait/ch_value.hh (mln::trait::impl::ch_value_<M<D, tag::psite_, tag::value_<T> >, V>): New specialization for mln::complex_image<D, P, T>. * mln/core/p_complex.hh (mln::p_complex<D, P>::cplx): New mutable accessor. * mln/core/complex_psite.hh (mln::complex_psite<D, P>::n) (mln::complex_psite<D, P>::face_id): New accessors. * mln/core/face.hh (any_face_handle<D>::any_face_handle(const face_handle<N, D>&)): New ctor. (any_face_handle<D>::any_face_handle(const any_face_handle<D>&)): Don't forget to initialize n_. (any_face_handle<D>::any_face_handle(complex<D>&, unsigned, unsigned)): Ensure N is compatible with D. * tests/core/complex_image.cc: Exercise mln::complex_image. mln/core/complex_image.hh | 301 ++++++++++++++++++++++++++++++++++++++++++++ mln/core/complex_psite.hh | 24 +++ mln/core/face.hh | 17 ++ mln/core/p_complex.hh | 42 ++++-- mln/trait/ch_value.hh | 8 + tests/core/complex_image.cc | 91 +++++++++++-- 6 files changed, 457 insertions(+), 26 deletions(-) Index: tests/core/complex_image.cc --- tests/core/complex_image.cc (revision 2142) +++ tests/core/complex_image.cc (working copy) @@ -30,12 +30,11 @@ #include <iostream> +#include <mln/value/int_u8.hh> #include <mln/core/point2d.hh> -// #include <mln/core/complex_image.hh> #include <mln/core/p_faces.hh> -#include <mln/core/p_complex.hh> - +#include <mln/core/complex_image.hh> int main() @@ -91,9 +90,61 @@ `---------------------*/ // A pset. - p_complex<D, point2d> pc0(c); - // An any-face handle (on E0) - any_face_handle<D> af(c, 1, 0); + p_complex<D, point2d> pc(c); + /* An any-face handle (on E0). + + Note that AF is built on `e0_', not `e0' (e0_ is built on + `pc.cplx()', not `c'), since the p_complex `pc' makes a copy of + the complex `c', and crossed-ownership tests doesn't work. I.e., + + pc.has(e0); + + is false. + + + FIXME: This might be a problem, since `pc.cplx()' and `c' + represent the same complex, in two different memory location (but + the former is controlled by PC, while the latter can be modified, + or even destroyed). This is a common problem for ``big'' values + that we don't want to manipulate by value (copy), or when we + don't want to use expensive, deep comparisons of pset to ensure + consistency. Here (and in graph-based images), we choose to + create a copy of the pset once, and manipulate it with a + tracked_ptr, to ensure both + + 1. perfect control of the lifetime of the pset (here, you can + delete `c', and `pc' will still be valid); + + 2. no pset duplication when creating new images based on it. + + + I (Roland) don't see elegant solutions here. A possiblity would + be to disconnect a face_handle from its complex (currently, a + face_handle is a bit like a Trivial Iterator from the C++ + Standard Library), but this means relaxed dynamic checks, and + more obscure errors. + + At least, we could have better error messages, i.e., something + like + + mln/core/complex_image.hh 267: + mln::complex_image<D, P, V>::operator(): Uncompatible p_complex. + + instead of + + mln/core/complex_image.hh:267: + typename mln::complex_image<D, P, V>::lvalue + mln::complex_image<D, P, V>::operator()(const mln::complex_psite<D, P>&) + [with unsigned int D = 2u, + P = mln::point_<mln::grid::square, int>, + V = mln::value::int_u<8u>]: + Assertion `this->data_->pc_.has(p)' failed. + + (which looks even uglier in the original, non-indented version). + + Ask Akim for his improved versions of abort() and assert(). */ + face_handle<1, D> e0_(pc.cplx(), 0); + any_face_handle<D> af(e0_); // An associated psite. complex_psite<D, point2d> cs(af); @@ -115,20 +166,36 @@ faces_psite<2, D, point2d> fs2(t0); - // FIXME: Enable when complex_image is available. -#if 0 /*----------------------. | Complex-based image. | `----------------------*/ + using mln::value::int_u8; + // An image type built on a 2-complex with mln::int_u8 values on // each face. - typedef ima_t complex_image< p_complex<D, point2d>, int_u8>; + typedef complex_image<D, point2d, int_u8> ima_t; - // FIXME: Create and init IMA. - // ... - ima_t ima(pc2); + // Values. + metal::vec<D + 1, std::vector< int_u8 > > values; + // Assign 0 to 0-faces, 1 to 1-faces and 2 to 2-faces. + for (unsigned d = 0; d < D; ++d) + for (unsigned n = 0; n < pc.cplx().nfaces(d); ++n) + values[d].push_back(d); + // Create and init an image based on PC. + ima_t ima(pc, values); + + // Check the value associated to edge E0_ (through complex psite CS). + mln_assertion(ima(cs) == 1u); + + + /*--------------------------------. + | Complex-based image iterators. | + `--------------------------------*/ + + // FIXME: Enable when iterators are available. +#if 0 mln_piter_(ima_t) p(ima.domain()); #endif } Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 2142) +++ mln/trait/ch_value.hh (working copy) @@ -110,6 +110,14 @@ typedef mln_ch_value(I, V) ret; }; + // For mln::complex_image<D, P, T>. + template < template <unsigned, class, class> class M, + unsigned D, typename P, typename T, typename V > + struct ch_value_< M< D, tag::psite_, tag::value_<T> >, V > + { + typedef M< D, P, V > ret; + }; + // For mln::neighb::image<I, N>. template < template <class, class> class M, typename I, typename N, typename V > Index: mln/core/complex_image.hh --- mln/core/complex_image.hh (revision 0) +++ mln/core/complex_image.hh (revision 0) @@ -0,0 +1,301 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_COMPLEX_IMAGE_HH +# define MLN_CORE_COMPLEX_IMAGE_HH + +/// \file mln/core/complex_image.hh +/// \brief Definition of a line complex-based image. + +# include <vector> + +# include <mln/trait/images.hh> + +# include <mln/core/internal/image_primary.hh> +# include <mln/metal/vec.hh> +# include <mln/core/p_complex.hh> +# include <mln/core/complex_psite.hh> +# include <mln/value/set.hh> + + +/* FIXME: In the current implementation, the type of values on faces + of different dimensions is necessarily the same (V). We should + allow different data types for vertices and edges. */ + + +namespace mln +{ + + // Fwd decl. + template <unsigned D, typename P, typename V> struct complex_image; + + namespace internal + { + + /// \internal Data structure for \c mln::complex_image<P,V>. + template <unsigned D, typename P, typename V> + struct data_< complex_image<D, P, V> > + { + data_(const p_complex<D, P>& pc, + const metal::vec< D + 1, std::vector<V> >& values); + + metal::vec< D + 1, std::vector<V> > values_; + const p_complex<D, P> pc_; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <unsigned D, typename P, typename V> + struct image_< complex_image<D, P, V> > + : default_image_< V, complex_image<D, P, V> > + { + typedef trait::image::category::primary category; + + // FIXME: Is that right? + typedef trait::image::access::random access; + typedef typename trait::image::space_from_point::ret space; + typedef trait::image::size::regular size; + typedef trait::image::support::irregular support; + + typedef trait::image::border::none border; + typedef trait::image::data::stored data; + typedef trait::image::io::read_write io; + // FIXME: Is that right? + typedef trait::image::speed::fast speed; + }; + + } // end of namespace mln::trait + + + /// \brief Image based on a complex. + /// + /// Values are stored on the vertices of the graph. + template <unsigned D, typename P, typename V> + struct complex_image : + public internal::image_primary_< p_complex<D, P>, complex_image<D, P, V> > + { + /// Super type. + typedef mln::internal::image_base_< p_complex<D, P>, + complex_image<D, P, V> > super_; + + /// Value associated type. + typedef V value; + + /// \brief Return type of read-write access. + /// + /// We use the associated type \c reference instead of a plain + /// reference on th value type (\v V), because it's the only way + /// to safely form a reference on the element in the case of a + /// std::vector<bool>. + typedef typename std::vector<V>::reference lvalue; + + /// Return type of read-only access. + typedef typename std::vector<V>::const_reference rvalue; + + /// Value set associated type. + typedef mln::value::set<value> vset; + + /// Skeleton. + typedef complex_image< D, tag::psite_, tag::value_<V> > skeleton; + + /// Constructors. + /// \{ + complex_image(); + complex_image(const p_complex<D, P>& pc); + complex_image(const p_complex<D, P>& pc, + const metal::vec< D + 1, std::vector<V> >& values); + /// \} + + /// Initialize an empty image. + void init_(const p_complex<D, P>& pc, + const metal::vec< D + 1, std::vector<V> >& values); + + /// Read-only access of pixel value at point site \p p. + rvalue operator()(const complex_psite<D, P>& p) const; + + /// Read-write access of pixel value at point site \p p. + lvalue operator()(const complex_psite<D, P>& p); + + /// Accessors. + /// \{ + /// Return the domain of psites od the image. + const p_complex<D, P>& domain() const; + /// Return the domain of values of the image. + const vset& values() const; + + /// Return the array of values associated to the faces. + const metal::vec<D + 1, std::vector<V> >& face_values() const; + /// \} + }; + + // Fwd decl. + template <unsigned D, typename P, typename V, typename W> + void init_(tag::image_t, + complex_image<D, P, V>& target, + const complex_image<D, P, W>& model); + + +# ifndef MLN_INCLUDE_ONLY + + /*-----------------. + | Initialization. | + `-----------------*/ + + template <unsigned D, typename P, typename V, typename W> + inline + void init_(tag::image_t, + complex_image<D, P, V>& target, + const complex_image<D, P, W>& model) + { + metal::vec<D + 1, std::vector<V> > values; + for (unsigned i = 0; i < D; ++i) + values[i].resize(model.values[i].size()); + target.init_(model.domain(), values); + } + + /*-------. + | Data. | + `-------*/ + + namespace internal + { + template <unsigned D, typename P, typename V> + inline + data_< complex_image<D, P, V> >::data_(const p_complex<D, P>& pc, + const metal::vec< D + 1, + std::vector<V> >& values) + : values_(values), + pc_(pc) + { + // Ensure the complex is consistent with the values. + /* FIXME: We need additional macros in mln/core/contract.hh for + big blocks of preconditions like this one. */ +# ifndef NDEBUG + for (unsigned i = 0; i < D; ++i) + mln_precondition(pc.cplx().nfaces(i) == values[i].size()); +# endif // !NDEBUG + } + + } // end of namespace mln::internal + + /*---------------. + | Construction. | + `---------------*/ + + template <unsigned D, typename P, typename V> + inline + complex_image<D, P, V>::complex_image() + { + } + + template <unsigned D, typename P, typename V> + inline + complex_image<D, P, V>::complex_image(const p_complex<D, P>& pc) + { + metal::vec<D + 1, std::vector<V> > values; + for (unsigned i = 0; i < D; ++i) + values[i].resize(pc.cplx().nfaces(i)); + init_(pc, values); + } + + template <unsigned D, typename P, typename V> + inline + complex_image<D, P, V>::complex_image(const p_complex<D, P>& pc, + const metal::vec< D + 1, + std::vector<V> >& values) + { + init_(pc, values); + } + + template <unsigned D, typename P, typename V> + inline + void + complex_image<D, P, V>::init_(const p_complex<D, P>& pc, + const metal::vec< D + 1, std::vector<V> >& values) + { + mln_precondition(! this->has_data()); + this->data_ = + new internal::data_< complex_image<D, P, V> >(pc, values); + } + + /*---------------. + | Manipulation. | + `---------------*/ + + template <unsigned D, typename P, typename V> + inline + typename complex_image<D, P, V>::rvalue + complex_image<D, P, V>::operator()(const complex_psite<D, P>& p) const + { + mln_precondition(this->data_->pc_.has(p)); + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> + inline + typename complex_image<D, P, V>::lvalue + complex_image<D, P, V>::operator()(const complex_psite<D, P>& p) + { + mln_precondition(this->data_->pc_.has(p)); + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> + inline + const mln::value::set<V> & + complex_image<D, P, V>::values() const + { + return vset::the(); + } + + template <unsigned D, typename P, typename V> + inline + const metal::vec< D + 1, std::vector<V> >& + complex_image<D, P, V>::face_values() const + { + return this->data_->val_; + } + + template <unsigned D, typename P, typename V> + inline + const p_complex<D, P>& + complex_image<D, P, V>::domain() const + { + mln_precondition(this->has_data()); + return this->data_->pc_; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_COMPLEX_IMAGE_HH Index: mln/core/complex_psite.hh --- mln/core/complex_psite.hh (revision 2142) +++ mln/core/complex_psite.hh (working copy) @@ -76,11 +76,19 @@ coord operator[](unsigned face) const; /// \} + /// Accessors + /// \{ /// Return the face handle of this point site. any_face_handle<D> face() const; /// Return the complex on which this site is built. const complex<D>& cplx() const; + /// Return the dimension of the face of this psite. + unsigned n() const; + /// Return the id of the face of this psite. + unsigned face_id() const; + /// \} + /// Is this psite valid? bool is_valid() const; @@ -208,6 +216,22 @@ return face_.cplx(); } + template <unsigned D, typename P> + inline + unsigned + complex_psite<D, P>::n() const + { + return face_.n(); + } + + template <unsigned D, typename P> + inline + unsigned + complex_psite<D, P>::face_id() const + { + return face_.face_id(); + } + /*--------------. | Comparisons. | `--------------*/ Index: mln/core/face.hh --- mln/core/face.hh (revision 2142) +++ mln/core/face.hh (working copy) @@ -257,6 +257,10 @@ /// Build a face handle from \a complex and \a face_id. any_face_handle(complex<D>& complex, unsigned n, unsigned face_id); + /// Build a face handle from a face_handle. + template <unsigned N> + any_face_handle(const face_handle<N, D>& f); + /// Copy and assignment. /// \{ any_face_handle(const any_face_handle<D>& rhs); @@ -499,11 +503,22 @@ : cplx_(&c), n_(n), face_id_(face_id) { // Ensure N is compatible with D. + mln_precondition(n <= D); + } + + template <unsigned D> + template <unsigned N> + any_face_handle<D>::any_face_handle(const face_handle<N, D>& f) + : cplx_(&f.cplx()), n_(N), face_id_(f.face_id()) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } template <unsigned D> any_face_handle<D>::any_face_handle(const any_face_handle<D>& rhs) - : cplx_(rhs.cplx_), face_id_(rhs.face_id_) + : cplx_(rhs.cplx_), n_(rhs.n_), face_id_(rhs.face_id_) { } Index: mln/core/p_complex.hh --- mln/core/p_complex.hh (revision 2142) +++ mln/core/p_complex.hh (working copy) @@ -85,13 +85,22 @@ /// Return The number of faces in the complex. std::size_t nfaces() const; - /// Give the exact bounding box. - const box_& bbox() const; + // FIXME: Add nfaces(unsigned) routines? bool has(const psite& p) const; - /// Return the complex associated to the p_complex domain. + /// Accessors. + /// \{ + /// Return the complex associated to the p_complex domain (const + /// version) const complex<D>& cplx() const; + /// Return the complex associated to the p_complex domain (mutable + /// version). + complex<D>& cplx(); + + /// Give the exact bounding box. + const box_& bbox() const; + /// \} private: /// The complex on which this pset is built. @@ -156,15 +165,6 @@ template <unsigned D, typename P> inline - const box_& - p_complex<D, P>::bbox() const - { - // FIXME: Dummy value. - return bb_; - } - - template <unsigned D, typename P> - inline bool p_complex<D, P>::has(const psite& p) const { @@ -175,7 +175,6 @@ p.face().is_valid(); } - template <unsigned D, typename P> const complex<D>& p_complex<D, P>::cplx() const @@ -184,6 +183,23 @@ return *cplx_.ptr_; } + template <unsigned D, typename P> + complex<D>& + p_complex<D, P>::cplx() + { + mln_precondition(cplx_); + return *cplx_.ptr_; + } + + template <unsigned D, typename P> + inline + const box_& + p_complex<D, P>::bbox() const + { + // FIXME: Dummy value. + return bb_; + } + template <unsigned D, typename P> bool

16 years, 5 months

2141: Aesthetic changes w.r.t. domain names in graph-based images.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Aesthetic changes w.r.t. domain names in graph-based images. * mln/core/graph_image.hh: s/g/pg/. * mln/core/line_graph_image.hh: s/g/plg/. graph_image.hh | 27 ++++++++++++++------------- line_graph_image.hh | 30 +++++++++++++++--------------- 2 files changed, 29 insertions(+), 28 deletions(-) Index: mln/core/graph_image.hh --- mln/core/graph_image.hh (revision 2141) +++ mln/core/graph_image.hh (working copy) @@ -53,7 +53,7 @@ template <typename P, typename V> struct data_< graph_image<P, V> > { - data_(const p_graph& g, const std::vector<V>& val); + data_(const p_graph& pg, const std::vector<V>& val); std::vector<V> val_; const p_graph pg_; @@ -119,12 +119,12 @@ /// Constructors. /// \{ graph_image(); - graph_image(const p_graph& g); - graph_image(const p_graph& g, const std::vector<V>& val); + graph_image(const p_graph& pg); + graph_image(const p_graph& pg, const std::vector<V>& val); /// \} /// Initialize an empty image. - void init_(const p_graph& g, const std::vector<V>& val); + void init_(const p_graph& pg, const std::vector<V>& val); /// Read-only access of pixel value at point site \p p. rvalue operator()(const graph_psite& p) const; @@ -183,12 +183,12 @@ { template <typename P, typename V> inline - data_< graph_image<P, V> >::data_(const p_graph& g, + data_< graph_image<P, V> >::data_(const p_graph& pg, const std::vector<V>& val) : val_ (val), - pg_ (g) + pg_ (pg) { - mln_precondition(g.nvertices() == val.size()); + mln_precondition(pg.nvertices() == val.size()); } } // end of namespace mln::internal @@ -205,25 +205,26 @@ template <typename P, typename V> inline - graph_image<P, V>::graph_image(const p_graph& g) + graph_image<P, V>::graph_image(const p_graph& pg) { - init_(g, std::vector<V>(g.nvertices())); + init_(pg, std::vector<V>(pg.nvertices())); } template <typename P, typename V> inline - graph_image<P, V>::graph_image(const p_graph& g, const std::vector<V>& val) + graph_image<P, V>::graph_image(const p_graph& pg, + const std::vector<V>& val) { - init_(g, val); + init_(pg, val); } template <typename P, typename V> inline void - graph_image<P, V>::init_(const p_graph& g, const std::vector<V>& val) + graph_image<P, V>::init_(const p_graph& pg, const std::vector<V>& val) { mln_precondition(! this->has_data()); - this->data_ = new internal::data_< graph_image<P, V> > (g, val); + this->data_ = new internal::data_< graph_image<P, V> > (pg, val); } /*---------------. Index: mln/core/line_graph_image.hh --- mln/core/line_graph_image.hh (revision 2141) +++ mln/core/line_graph_image.hh (working copy) @@ -67,7 +67,7 @@ template <typename P, typename V> struct data_< line_graph_image<P, V> > { - data_(const p_line_graph& g, + data_(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); std::vector<V> vertex_val_; @@ -105,7 +105,7 @@ /// \brief Image based on a graph. /// - /// Values are stored on the vertices of the graph. + /// Values are stored on the edges of the graph. template <typename P, typename V> struct line_graph_image : public internal::image_primary_< p_line_graph, line_graph_image<P, V> > @@ -137,14 +137,14 @@ /// Constructors. /// \{ line_graph_image(); - line_graph_image(const p_line_graph& g); - line_graph_image(const p_line_graph& g, + line_graph_image(const p_line_graph& plg); + line_graph_image(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); /// \} /// Initialize an empty image. - void init_(const p_line_graph& g, + void init_(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); @@ -210,15 +210,15 @@ { template <typename P, typename V> inline - data_< line_graph_image<P, V> >::data_(const p_line_graph& g, + data_< line_graph_image<P, V> >::data_(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) : vertex_val_(vertex_val), edge_val_(edge_val), - plg_(g) + plg_(plg) { - mln_precondition(g.nvertices() == vertex_val.size()); - mln_precondition(g.nedges() == edge_val.size()); + mln_precondition(plg.nvertices() == vertex_val.size()); + mln_precondition(plg.nedges() == edge_val.size()); } } // end of namespace mln::internal @@ -235,30 +235,30 @@ template <typename P, typename V> inline - line_graph_image<P, V>::line_graph_image(const p_line_graph& g) + line_graph_image<P, V>::line_graph_image(const p_line_graph& plg) { - init_(g, std::vector<V>(g.nvertices()), std::vector<V>(g.nedges())); + init_(plg, std::vector<V>(plg.nvertices()), std::vector<V>(plg.nedges())); } template <typename P, typename V> inline - line_graph_image<P, V>::line_graph_image(const p_line_graph& g, + line_graph_image<P, V>::line_graph_image(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) { - init_(g, vertex_val, edge_val); + init_(plg, vertex_val, edge_val); } template <typename P, typename V> inline void - line_graph_image<P, V>::init_(const p_line_graph& g, + line_graph_image<P, V>::init_(const p_line_graph& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) { mln_precondition(! this->has_data()); this->data_ = - new internal::data_< line_graph_image<P, V> >(g, vertex_val, edge_val); + new internal::data_< line_graph_image<P, V> >(plg, vertex_val, edge_val); } /*---------------.

16 years, 5 months

2141: Follow g++ 4.3 advice w.r.t. nested `if' statements.

by Roland Levillain

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. nested `if' statements. * mln/canvas/labeling.hh (mln::canvas::labeling<F>::pass_1()) * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst<I, N, L>): Add braces around inner `if' to avoid (visual) ambiguity w.r.t. a dangling `else'. canvas/labeling.hh | 2 ++ morpho/meyer_wst.hh | 2 ++ 2 files changed, 4 insertions(+) Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2140) +++ mln/morpho/meyer_wst.hh (working copy) @@ -155,6 +155,7 @@ mln_niter(N) n(nbh, p); for_all(n) if (output.has(n) && output(n) != unmarked) + { if (adjacent_marker == unmarked) { adjacent_marker = output(n); @@ -166,6 +167,7 @@ single_adjacent_marker_p = false; break; } + } /* If the neighborhood of P contains only psites with the same label, then P is marked with this label, and its neighbors that are not yet marked are put into the Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2140) +++ mln/canvas/labeling.hh (working copy) @@ -174,10 +174,12 @@ make_set(p); for_all(n) if (f.input.has(n) && deja_vu(n)) + { if (f.equiv(n, p)) do_union(n, p); else f.do_no_union(n, p); + } deja_vu(p) = true; } }

16 years, 5 months

2139: Require SWIG 1.3.31.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * build-aux/with-swilena.m4: Require SWIG 1.3.31. with-swilena.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: build-aux/with-swilena.m4 --- build-aux/with-swilena.m4 (revision 2139) +++ build-aux/with-swilena.m4 (working copy) @@ -73,14 +73,14 @@ [You need Ruby development files to compile the Ruby interface.])]) CPPFLAGS=$save_CPPFLAGS - AC_PROG_SWIG([1.3.29]) + AC_PROG_SWIG([1.3.31]) if (eval "$SWIG -version") >/dev/null 2>&1; then :; else oln_has_swig=no fi case $with_swig:$oln_has_swig in yes:no) - AC_MSG_ERROR([SWIG 1.3.29 is required. + AC_MSG_ERROR([SWIG 1.3.31 is required. Use `--without-swig' to disable SWIG modules.]);; esac fi

16 years, 5 months

2139: Wrap more morphological filters.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Wrap more morphological filters. * morpho.ixx: Wrap mln::morpho::closing, mln::morpho::opening mln::morpho::gradient_internal, mln::morpho::gradient_external, mln::morpho::opening_area. (instantiate_closing, instantiate_opening) (instantiate_gradient_internal, instantiate_gradient_external) (instantiate_opening_area): New macros. Use them... (instantiate_morpho): ...here. Deduce the previous `L' parameter from `mln_value(I)', and remove it from the list of parameters of the macro. * image2d_int_u8.i: Adjust. * image2d_int.i: Use macros instantiate_erosion and instantiate_dilation. * python/data.py: New. * python/test.py: Rename as... * python/image2d-misc.py: ...this. * python/lena.py: Rename as... * python/morpho-fun.py: ...this. Exercise more morphological filters. Move WST-based segmentation tests... * python/morpho-segm.py: ...here (new test). * python/swilena.py: Add documentation header. * python/Makefile.am (python_PYTHON): Add data.py. (TESTS): Add morpho-segm.py. s/test.py/image2d-misc.py/ s/lena.py/morpho-fun.py/ image2d_int.i | 7 +---- image2d_int_u8.i | 3 -- morpho.ixx | 67 +++++++++++++++++++++++++++++++++++++++----------- python/Makefile.am | 4 ++ python/data.py | 37 +++++++++++++++++++++++++++ python/morpho-fun.py | 50 +++++++++++++++++-------------------- python/morpho-segm.py | 60 ++++++++++++++++++++++++++++++++++++++++++++ python/swilena.py | 3 ++ 8 files changed, 183 insertions(+), 48 deletions(-) Index: python/data.py --- python/data.py (revision 0) +++ python/data.py (revision 0) @@ -0,0 +1,37 @@ +#! /usr/bin/env python + +# 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. + +# \file python/data.py +# \brief Access to the data of the distribution (images, meshes, etc.). + +import os + +top_srcdir = os.environ["top_srcdir"] +img_dir = os.path.join(top_srcdir, "milena", "img") +lena = os.path.join (img_dir, "lena.pgm") Index: python/morpho-fun.py --- python/morpho-fun.py (revision 2138) +++ python/morpho-fun.py (working copy) @@ -27,38 +27,36 @@ # reasons why the executable file might be covered by the GNU General # Public License. -import os -from swilena import * +# \file python/morpho-fun.py +# \brief Test on mathematical morphology on functions (scalar images). -# Factor this part in a shared test Python file. -top_srcdir = os.environ["top_srcdir"] -img_dir = os.path.join(top_srcdir, "milena", "img") -lena = os.path.join (img_dir, "lena.pgm") +import data +from swilena import * # Module alias. image = image2d_int_u8 -ima = image.load(lena) +ima = image.load(data.lena) + +dilated = image.dilation(ima, win_c4p()) +image.save(dilated, "dilation.pgm") eroded = image.erosion(ima, win_c4p()) -image.save(eroded, "eroded.pgm") +image.save(eroded, "erosion.pgm") -dilated = image.dilation(ima, win_c4p()) -image.save(dilated, "dilated.pgm") +image.save(image.opening(ima, win_c4p()), "opening.pgm") +image.save(image.closing(ima, win_c4p()), "closing.pgm") -# Gradient. -gradient = image.gradient(ima, win_c4p()) -# Area closing. -closed_gradient = image.image2d_int_u8(gradient.domain()) -image.closing_area(ima, c4(), 50, closed_gradient) -# Watershed transform. -nbasins = int_u8(); -ws = image.meyer_wst (closed_gradient, c4(), nbasins) -# FIXME: Actualy print the number of basins; for the moment, this -# statement outputs something like -# -# <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' -# at 0x816e160> > -# -print nbasins -image.save(ws, "ws.pgm") +image.save(image.gradient(ima, win_c4p()), "gradient.pgm") +image.save(image.gradient_internal(ima, win_c4p()), "gradient_internal.pgm") +image.save(image.gradient_external(ima, win_c4p()), "gradient_external.pgm") + +# FIXME: The interface of closing_area/opening_area is a pain: the +# output should be returned, not taken as argument. +closed_ima = image.image2d_int_u8(ima.domain()) +image.closing_area(ima, c4(), 50, closed_ima) +image.save(closed_ima, "closing_area.pgm") + +opened_ima = image.image2d_int_u8(ima.domain()) +image.closing_area(ima, c4(), 50, opened_ima) +image.save(opened_ima, "opening_area.pgm") Property changes on: python/morpho-fun.py ___________________________________________________________________ Added: svn:mergeinfo Index: python/morpho-segm.py --- python/morpho-segm.py (revision 0) +++ python/morpho-segm.py (revision 0) @@ -0,0 +1,60 @@ +#! /usr/bin/env python + +# 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. + +# \file python/morpho-segm.py +# \brief Test on watershed transform-based segmentation. + +import data +from swilena import * + +# Module alias. +image = image2d_int_u8 + +ima = image.load(data.lena) + +# Gradient. +gradient = image.gradient(ima, win_c4p()) +image.save(gradient, "gradient.pgm") +# Area closing of the gradient. +closed_gradient = image.image2d_int_u8(gradient.domain()) +image.closing_area(ima, c4(), 50, closed_gradient) +# Watershed transform. +nbasins = int_u8(); +ws = image.meyer_wst (closed_gradient, c4(), nbasins) +# FIXME: Actualy print the number of basins; for the moment, this +# statement outputs something like +# +# <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' +# at 0x816e160> > +# +print nbasins +image.save(ws, "segm.pgm") + +# FIXME: Also re-enable the naive segmentation with no gradient +# simplification, and an output on an image2d<int_u32>. Property changes on: python/image2d-misc.py ___________________________________________________________________ Added: svn:mergeinfo Index: python/Makefile.am --- python/Makefile.am (revision 2138) +++ python/Makefile.am (working copy) @@ -30,6 +30,8 @@ python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py +# data.py: Access to the data of the distribution (images, meshes, etc.) +python_PYTHON += data.py ## ----------------- ## @@ -170,5 +172,5 @@ $(MAKE) $(AM_MAKEFLAGS) $(RUN) @mv -f $@.tmp $@ -TESTS = test.py lena.py +TESTS = image2d-misc.py morpho-fun.py morpho-segm.py EXTRA_DIST += $(TESTS) Index: python/swilena.py --- python/swilena.py (revision 2138) +++ python/swilena.py (working copy) @@ -27,6 +27,9 @@ # reasons why the executable file might be covered by the GNU General # Public License. +# \file swilena.py +# \brief The whole Swilena suite. + import ltihooks from point2d import * Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2138) +++ image2d_int_u8.i (working copy) @@ -68,8 +68,7 @@ then. */ instantiate_morpho(mln::image2d< mln::value::int_u<8> >, mln::window2d, - mln::neighb2d, - mln::value::int_u<8>) + mln::neighb2d) /*---------------------------------------. | image2d<int_u8> and image2d<int_u32>. | Index: image2d_int.i --- image2d_int.i (revision 2138) +++ image2d_int.i (working copy) @@ -54,8 +54,5 @@ %} %include "morpho.ixx" -// Explicit instantiation of this trait for the return type of -// mln::morpho::dilation and mln::morpho::erosion. -%template() mln::trait::concrete< mln::image2d< int > >; -%template(dilation) mln::morpho::dilation< mln::image2d<int>, mln::window2d >; -%template(erosion) mln::morpho::erosion< mln::image2d<int>, mln::window2d >; +instantiate_erosion(erosion, mln::image2d<int>, mln::window2d) +instantiate_dilation(dilation, mln::image2d<int>, mln::window2d) Index: morpho.ixx --- morpho.ixx (revision 2138) +++ morpho.ixx (working copy) @@ -31,12 +31,13 @@ %module morpho +%include "concrete.ixx" +%include "ch_value.ixx" + /*-----------------------------------. | Morphological dilation & erosion. | `-----------------------------------*/ -%include "concrete.ixx" - %{ #include "mln/morpho/dilation.hh" #include "mln/morpho/erosion.hh" @@ -52,22 +53,39 @@ %enddef %define instantiate_erosion(Name, I, W) + // Explicit instantiation of this trait for the return type. %template() mln::trait::concrete; %template(Name) mln::morpho::erosion< I, W >; %enddef /*----------------------------------. -| Morphological opening & closing. | +| Morphological closing & opening. | `----------------------------------*/ -// FIXME: Add them. +%{ +#include "mln/morpho/closing.hh" +#include "mln/morpho/opening.hh" +%} + +%include "mln/morpho/closing.hh" +%include "mln/morpho/opening.hh" + +%define instantiate_closing(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::closing< I, W >; +%enddef + +%define instantiate_opening(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::opening< I, W >; +%enddef /*------------. | Gradients. | `------------*/ -// FIXME: Add other gradient. - %{ #include "mln/morpho/gradient.hh" %} @@ -80,28 +98,42 @@ %template(Name) mln::morpho::gradient< I, W >; %enddef +%define instantiate_gradient_internal(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient_internal< I, W >; +%enddef + +%define instantiate_gradient_external(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient_external< I, W >; +%enddef + /*-------------------------. | Area closing & opening. | `-------------------------*/ -// FIXME: Add area opening. - %{ #include "mln/morpho/closing_area.hh" +#include "mln/morpho/opening_area.hh" %} %include "mln/morpho/closing_area.hh" +%include "mln/morpho/opening_area.hh" %define instantiate_closing_area(Name, I, N) %template(Name) mln::morpho::closing_area< I, N, I >; %enddef +%define instantiate_opening_area(Name, I, N) + %template(Name) mln::morpho::opening_area< I, N, I >; +%enddef + /*------------------------------------. | Meyer's Watershed Transform (WST). | `------------------------------------*/ -%include "ch_value.ixx" - %{ #include "mln/morpho/meyer_wst.hh" %} @@ -118,12 +150,19 @@ | Instantiate everything. | `-------------------------*/ -%define instantiate_morpho(I, W, N, L) +%define instantiate_morpho(I, W, N) instantiate_dilation(dilation, I, W) instantiate_erosion(erosion, I, W) + + instantiate_closing(closing, I, W) + instantiate_opening(opening, I, W) + instantiate_gradient(gradient, I, W) + instantiate_gradient_internal(gradient_internal, I, W) + instantiate_gradient_external(gradient_external, I, W) + instantiate_closing_area(closing_area, I, N) - // FIXME: Could we used `typename I::value' instead of `L' here, and - // remove L from the list of arguments? - instantiate_meyer_wst(meyer_wst, L, I, N) + instantiate_opening_area(opening_area, I, N) + + instantiate_meyer_wst(meyer_wst, mln_value(I), I, N) %enddef

16 years, 5 months

2138: Provide instantiation macros for module `morpho'.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Provide instantiation macros for module `morpho'. * morpho.ixx (instantiate_dilation, instantiate_erosion) (instantiate_gradient, instantiate_closing_area) (instantiate_meyer_wst): New SWIG macros. (instantiate_morpho): Likewise. Use it... * image2d_int_u8.i: ...here, to simplify the wrapping of morpho routines. image2d_int_u8.i | 39 +++++++++------------------------------ morpho.ixx | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 58 insertions(+), 34 deletions(-) Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2137) +++ image2d_int_u8.i (working copy) @@ -60,46 +60,25 @@ %include "morpho.ixx" -// Explicit instantiation of this trait for the return type of -// mln::morpho::dilation, mln::morpho::erosion and mln::morpho::gradient. -%template() mln::trait::concrete< mln::image2d< mln::value::int_u<8> > >; - -/* FIXME: Can't we use `mln::value::int8' directlt here (as we can +/* FIXME: Can't we use `mln::value::int8' directly here (as we can use `mln::window2d', which is a really just typedef for - `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ -%template(dilation) mln::morpho::dilation< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; -%template(erosion) mln::morpho::erosion< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; - -%template(gradient) mln::morpho::gradient< mln::image2d< mln::value::int_u<8> >, - mln::window2d >; + `mln::window< mln::dpoint_<mln::grid::square, int> >')? -%template(closing_area) -mln::morpho::closing_area< mln::image2d< mln::value::int_u<8> >, + 2008-08-11: Probably, but we should %include "mln/value/int_u8.hh" + then. */ +instantiate_morpho(mln::image2d< mln::value::int_u<8> >, + mln::window2d, mln::neighb2d, - mln::image2d< mln::value::int_u<8> > >; - -%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<8> >; -%template(meyer_wst) mln::morpho::meyer_wst< - mln::value::int_u<8>, - mln::image2d< mln::value::int_u<8> >, - mln::neighb2d - >; + mln::value::int_u<8>) /*---------------------------------------. | image2d<int_u8> and image2d<int_u32>. | `---------------------------------------*/ -// Explicit instantiation of this trait for the return type of meyer_wst32. -%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<32> >; -%template(meyer_wst32) mln::morpho::meyer_wst< +instantiate_meyer_wst(meyer_wst32, mln::value::int_u<32>, mln::image2d< mln::value::int_u<8> >, - mln::neighb2d - >; + mln::neighb2d) // FIXME: Rearrange and move this elsewhere. instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) Index: morpho.ixx --- morpho.ixx (revision 2137) +++ morpho.ixx (working copy) @@ -31,9 +31,9 @@ %module morpho -/*---------------------. -| Dilation & erosion. | -`---------------------*/ +/*-----------------------------------. +| Morphological dilation & erosion. | +`-----------------------------------*/ %include "concrete.ixx" @@ -45,7 +45,22 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" -// FIXME: Add morphological opening & closing. +%define instantiate_dilation(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::dilation< I, W >; +%enddef + +%define instantiate_erosion(Name, I, W) + %template() mln::trait::concrete; + %template(Name) mln::morpho::erosion< I, W >; +%enddef + +/*----------------------------------. +| Morphological opening & closing. | +`----------------------------------*/ + +// FIXME: Add them. /*------------. | Gradients. | @@ -59,6 +74,12 @@ %include "mln/morpho/gradient.hh" +%define instantiate_gradient(Name, I, W) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::concrete; + %template(Name) mln::morpho::gradient< I, W >; +%enddef + /*-------------------------. | Area closing & opening. | `-------------------------*/ @@ -71,6 +92,10 @@ %include "mln/morpho/closing_area.hh" +%define instantiate_closing_area(Name, I, N) + %template(Name) mln::morpho::closing_area< I, N, I >; +%enddef + /*------------------------------------. | Meyer's Watershed Transform (WST). | `------------------------------------*/ @@ -82,3 +107,23 @@ %} %include "mln/morpho/meyer_wst.hh" + +%define instantiate_meyer_wst(Name, L, I, N) + // Explicit instantiation of this trait for the return type. + %template() mln::trait::ch_value< I, L >; + %template(Name) mln::morpho::meyer_wst< L, I, N >; +%enddef + +/*-------------------------. +| Instantiate everything. | +`-------------------------*/ + +%define instantiate_morpho(I, W, N, L) + instantiate_dilation(dilation, I, W) + instantiate_erosion(erosion, I, W) + instantiate_gradient(gradient, I, W) + instantiate_closing_area(closing_area, I, N) + // FIXME: Could we used `typename I::value' instead of `L' here, and + // remove L from the list of arguments? + instantiate_meyer_wst(meyer_wst, L, I, N) +%enddef

16 years, 5 months

[Olena] #154: Revive Swilena in Olena 1.0

by Olena

#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.

16 years, 5 months

2137: Wrap morphological gradient and area closing.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Wrap morphological gradient and area closing. * morpho.ixx: Wrap mln::morpho::gradient and mln::morpho::closing_area. * image2d_int_u8.i (meyer_wst): Rename as... (meyer_wst32): ...this. (gradient, closing_area, meyer_wst): New wrappings. * python/lena.py: Exercise gradient and area closing (along with Meyer's watershed transform). image2d_int_u8.i | 31 +++++++++++++++++++++++-------- morpho.ixx | 31 ++++++++++++++++++++++++++++--- python/lena.py | 18 ++++++++++-------- 3 files changed, 61 insertions(+), 19 deletions(-) Index: python/lena.py --- python/lena.py (revision 2136) +++ python/lena.py (working copy) @@ -46,17 +46,19 @@ dilated = image.dilation (ima, win_c4p()) image.save(dilated, "dilated.pgm") -# Watershed Transform. -# FIXME: Run a gradient and an area closing first. -nbasins = int_u32(); -ws = image.meyer_wst (ima, c4(), nbasins) -print (type (ws)) -# FIXME: Ugly name; move int_u32 methods outside image2d_int_u8. -image.println32(ws) -# FIXME: Actualy print the number of basins; for the moment, thus +# Gradient. +gradient = image.gradient(ima, win_c4p()) +# Area closing. +closed_gradient = image.image2d_int_u8(gradient.domain()) +image.closing_area(ima, c4(), 50, closed_gradient) +# Watershed transform. +nbasins = int_u8(); +ws = image.meyer_wst (closed_gradient, c4(), nbasins) +# FIXME: Actualy print the number of basins; for the moment, this # statement outputs something like # # <int_u32.int_u32; proxy of <Swig Object of type 'mln::value::int_u< 32 > *' # at 0x816e160> > # print nbasins +image.save(ws, "ws.pgm") Index: image2d_int_u8.i --- image2d_int_u8.i (revision 2136) +++ image2d_int_u8.i (working copy) @@ -61,8 +61,9 @@ %include "morpho.ixx" // Explicit instantiation of this trait for the return type of -// mln::morpho::dilation and mln::morpho::erosion. +// mln::morpho::dilation, mln::morpho::erosion and mln::morpho::gradient. %template() mln::trait::concrete< mln::image2d< mln::value::int_u<8> > >; + /* FIXME: Can't we use `mln::value::int8' directlt here (as we can use `mln::window2d', which is a really just typedef for `mln::window< mln::dpoint_<mln::grid::square, int> >')? */ @@ -71,20 +72,34 @@ %template(erosion) mln::morpho::erosion< mln::image2d< mln::value::int_u<8> >, mln::window2d >; -// Explicit instantiation of this trait for the return type of -// mln::morpho::meyer_wst. +%template(gradient) mln::morpho::gradient< mln::image2d< mln::value::int_u<8> >, + mln::window2d >; + +%template(closing_area) +mln::morpho::closing_area< mln::image2d< mln::value::int_u<8> >, + mln::neighb2d, + mln::image2d< mln::value::int_u<8> > >; + %template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, - mln::value::int_u<32> >; + mln::value::int_u<8> >; %template(meyer_wst) mln::morpho::meyer_wst< - mln::value::int_u<32>, + mln::value::int_u<8>, mln::image2d< mln::value::int_u<8> >, mln::neighb2d >; +/*---------------------------------------. +| image2d<int_u8> and image2d<int_u32>. | +`---------------------------------------*/ -/*-------------------. -| image2d<int_u32>. | -`-------------------*/ +// Explicit instantiation of this trait for the return type of meyer_wst32. +%template() mln::trait::ch_value< mln::image2d< mln::value::int_u<8> >, + mln::value::int_u<32> >; +%template(meyer_wst32) mln::morpho::meyer_wst< + mln::value::int_u<32>, + mln::image2d< mln::value::int_u<8> >, + mln::neighb2d + >; // FIXME: Rearrange and move this elsewhere. instantiate_image2d(image2d_int_u32, mln::value::int_u<32>) Index: morpho.ixx --- morpho.ixx (revision 2136) +++ morpho.ixx (working copy) @@ -31,9 +31,9 @@ %module morpho -/*-----------------------. -| Dilation and erosion. | -`-----------------------*/ +/*---------------------. +| Dilation & erosion. | +`---------------------*/ %include "concrete.ixx" @@ -45,6 +45,31 @@ %include "mln/morpho/dilation.hh" %include "mln/morpho/erosion.hh" +// FIXME: Add morphological opening & closing. + +/*------------. +| Gradients. | +`------------*/ + +// FIXME: Add other gradient. + +%{ +#include "mln/morpho/gradient.hh" +%} + +%include "mln/morpho/gradient.hh" + +/*-------------------------. +| Area closing & opening. | +`-------------------------*/ + +// FIXME: Add area opening. + +%{ +#include "mln/morpho/closing_area.hh" +%} + +%include "mln/morpho/closing_area.hh" /*------------------------------------. | Meyer's Watershed Transform (WST). |

16 years, 5 months

2136: Simplify the wrappings of mln::neighb2d and mln::window2d.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/swilena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Simplify the wrappings of mln::neighb2d and mln::window2d. * neighb2d.i, window2d.i: Wrap the classes directly, instead of using simplified, inlined declarations. * box2d.i: Aesthetic changes. box2d.i | 12 +++----- neighb2d.i | 91 +++++++------------------------------------------------------ window2d.i | 77 +++++++-------------------------------------------- 3 files changed, 27 insertions(+), 153 deletions(-) Index: window2d.i --- window2d.i (revision 2135) +++ window2d.i (working copy) @@ -37,75 +37,20 @@ #include "mln/core/window2d.hh" %} -// FIXME: Move mln::window to its own file. +%include "mln/core/macros.hh" %include "mln/core/concept/window.hh" - -// FIXME: Wrap mln::window by hand, for Milena macros disturb swig. -// Annotate the original source code instead? -namespace mln -{ - template <typename D> - class window : public Window< window<D> >, - public internal::dpoints_base_<D, window<D> > - { - typedef internal::dpoints_base_<D, window<D> > super_; - public: - - /*! \brief Point_Iterator type to browse the points of a generic window - * w.r.t. the ordering of delta-points. - */ - typedef dpoints_fwd_piter<D> fwd_qiter; - - /*! \brief Point_Iterator type to browse the points of a generic window - * w.r.t. the reverse ordering of delta-points. - */ - typedef dpoints_bkd_piter<D> bkd_qiter; - - - /*! \brief Constructor without argument. - * - * The constructed window is empty. - */ - window(); - - - /*! \brief Test if the window is symmetric. - */ - bool is_symmetric() const; - - /// Insert a delta-point \p dp. - window<D>& insert(const D& dp); - -// FIXME: Swig tries to wrap everything by default; prevent it from wrapping -// invalid methods (1D and 3D ctors for a point2d). - /// \{ Insertion of a delta-point with different numbers of - /// arguments (coordinates) w.r.t. the dimension. -// window<D>& insert(const mln_coord(D)& dind); // For 1D. - -// FIXME: The macro mln_coord disturbs swig. -// window<D>& insert(const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 2D. - window<D>& insert(const typename D::coord& drow, - const typename D::coord& dcol); // For 2D. - -// window<D>& insert(const mln_coord(D)& dsli, -// const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 3D. -// /// \} - - /// Apply a central symmetry to the target window. - window<D>& sym(); - - protected: - -// FIXME: The macro used here disturbs swig. -// box_<mln_point(D)> b_; - box_<typename D::point> b_; - }; - -} // end of namespace mln +%include "mln/core/window.hh" %include "mln/core/window2d.hh" +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D insertions for a window2d). +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&); +%ignore mln::window< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&); + %template(window2d) mln::window< mln::dpoint_<mln::grid::square, int > >; Index: box2d.i --- box2d.i (revision 2135) +++ box2d.i (working copy) @@ -45,13 +45,11 @@ // invalid methods (1D and 3D ctors for a box2d). /* FIXME: Can't we simplify these directives, i.e. use `point2d' and `int' directly? */ -%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( - typename mln::point_<mln::grid::square, int>::coord -); -%ignore mln::box_< mln::point_<mln::grid::square, int> >::box_( +%ignore mln::box_< mln::point_<mln::grid::square, int> >:: +box_(typename mln::point_<mln::grid::square, int>::coord); +%ignore mln::box_< mln::point_<mln::grid::square, int> >:: +box_(typename mln::point_<mln::grid::square, int>::coord, typename mln::point_<mln::grid::square, int>::coord, - typename mln::point_<mln::grid::square, int>::coord, - typename mln::point_<mln::grid::square, int>::coord -); + typename mln::point_<mln::grid::square, int>::coord); %template(box2d) mln::box_< mln::point_<mln::grid::square, int> >; Index: neighb2d.i --- neighb2d.i (revision 2135) +++ neighb2d.i (working copy) @@ -37,89 +37,20 @@ #include "mln/core/neighb2d.hh" %} -// FIXME: Move mln::neighb_ to its own file. +%include "mln/core/macros.hh" %include "mln/core/concept/neighborhood.hh" - -// FIXME: Wrap mln::neighb by hand, for Milena macros disturb swig. -// Annotate the original source code instead? -namespace mln -{ - - // fwd decls - template <typename D> class dpoints_fwd_piter; - template <typename D> class dpoints_bkd_piter; - - - /*! \brief Generic neighborhood class. - * - * This neighborhood of window is just like a set of delta-points. - * The parameter is \c D, type of delta-point. - */ - template <typename D> - struct neighb_ : public Neighborhood< neighb_<D> >, - public internal::dpoints_base_<D, neighb_<D> > - { - /// Dpoint associated type. - typedef D dpoint; - -// FIXME: The macro mln_point disturbs swig. -// /// Point associated type. -// typedef mln_point(D) point; - typedef typename D::point point; - - /*! \brief Point_Iterator type to browse the points of a generic - * neighborhood w.r.t. the ordering of delta-points. - */ - typedef dpoints_fwd_piter<D> fwd_niter; - - /*! \brief Point_Iterator type to browse the points of a generic - * neighborhood w.r.t. the reverse ordering of delta-points. - */ - typedef dpoints_bkd_piter<D> bkd_niter; - - /*! \brief Same as fwd_niter. - */ - typedef fwd_niter niter; - - /*! \brief Constructor without argument. - * - * The constructed neighborhood is empty. You have to use insert() - * to proceed to the neighborhood definition. - */ - neighb_(); - - /*! \brief Insert a delta-point \p dp in the neighborhood - * definition. - * - * \param[in] dp The delta-point to insert. - * - * This method also insert the symmetrical delta-point, - \p dp, - * in the neighborhood definition; thus the client has not to - * ensure the symmetry property; that is automatic. - */ - neighb_<D>& insert(const D& dp); - -// FIXME: Swig tries to wrap everything by default; prevent it from wrapping -// invalid methods (1D and 3D ctors for a point2d). - /// \{ Insertion of a delta-point with different numbers of - /// arguments (coordinates) w.r.t. the dimension. -// neighb_<D>& insert(const mln_coord(D)& dind); // For 1D. - -// FIXME: The macro mln_coord disturbs swig. -// neighb_<D>& insert(const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 2D. - neighb_<D>& insert(const typename D::coord& drow, - const typename D::coord& dcol); // For 2D. - -// neighb_<D>& insert(const mln_coord(D)& dsli, -// const mln_coord(D)& drow, -// const mln_coord(D)& dcol); // For 3D. - /// \} - }; - -} // end of namespace mln +%include "mln/core/neighb.hh" %include "mln/core/neighb2d.hh" +// Swig tries to wrap everything by default; prevent it from wrapping +// invalid methods (1D and 3D insertions for a neighb2d). +%ignore mln::neighb_< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&); +%ignore mln::neighb_< mln::dpoint_<mln::grid::square, int > >:: +insert(const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&, + const typename mln::dpoint_<mln::grid::square, int>::coord&); + %template(neighb2d) mln::neighb_< mln::dpoint_<mln::grid::square, int > >;

16 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches