November 2008 - Olena-patches

2848: Add a loading routine for floating-point value 2-complex images.
by Roland Levillain 12 Nov '08

12 Nov '08

* mln/io/off/load.hh (mln::io::off::internal::float_off_loader): New class. (mln::io::off::load(float_2complex_image3df&, const std::string&)): New. --- milena/ChangeLog | 9 +++++ milena/mln/io/off/load.hh | 78 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 02fdd91..bb16376 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Add a loading routine for floating-point value 2-complex images. + + * mln/io/off/load.hh + (mln::io::off::internal::float_off_loader): New class. + (mln::io::off::load(float_2complex_image3df&, const std::string&)): + New. + +2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a factoring functor to load OFF image files. * mln/io/off/load.hh diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index 4e9e86d..5bfebf3 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -63,6 +63,16 @@ namespace mln existence of faces. */ void load(bin_2complex_image3df& ima, const std::string& filename); + /** \brief Load a floating-point OFF image into a complex image. + + \param[out] ima A reference to the image to construct. + \param[in] filename The name of the file to load. + + Read floating-point data is attached to 2-faces only; + 1-faces and 0-faces are set to 0.0f. */ + void load(float_2complex_image3df& ima, const std::string& filename); + + namespace internal { @@ -107,6 +117,23 @@ namespace mln void reserve(unsigned nvertices, unsigned nedges, unsigned nfaces); }; + + struct float_off_loader + : public off_loader< float_2complex_image3df, float_off_loader > + { + /// \brief Read face data. + void read_face_data(std::istream& istr); + + /// \brief Pre-allocate data. + void reserve(unsigned nvertices, unsigned nedges, unsigned nfaces); + + /// \brief Assign values to image. + void assign(values& vs, const domain& s); + + /// \brief 2-face floating-point values. + std::vector<float> face_value; + }; + } // end of namespace mln::io::off::internal @@ -125,6 +152,14 @@ namespace mln trace::exiting("mln::io::off::load"); } + void + load(float_2complex_image3df& ima, const std::string& filename) + { + trace::entering("mln::io::off::load"); + internal::float_off_loader()(ima, filename); + trace::exiting("mln::io::off::load"); + } + /*-------------------------. | Actual implementations. | @@ -425,6 +460,31 @@ namespace mln { // Do nothing (no data associated to faces). } + + void + float_off_loader::read_face_data(std::istream& istr) + { + /* We just use R and ignore G, B and A (transparency) when + considering the value (``color'') associated to a face as + a (scalar) floating-point value (though it really is an + RGB triplet). + + To ensure consistency, we /might/ (later) check that R, G + and B are equal---or better, ``almost equal'', as they + are floats. + + Moreover, R must (and G, B and A should) be + floating-point values between 0 and 1, according to the + OFF file format definition. */ + // FIXME: `A' should be optional. + float r, g, b, a; + istr >> r >> g >> b >> a; + mln_assertion(0.0f <= r); mln_assertion(r <= 1.0f); + mln_assertion(0.0f <= g); mln_assertion(g <= 1.0f); + mln_assertion(0.0f <= b); mln_assertion(b <= 1.0f); + mln_assertion(0.0f <= a); mln_assertion(a <= 1.0f); + face_value.push_back(r); + } /* \} */ @@ -436,6 +496,14 @@ namespace mln // Do nothing (no data associated to faces). } + void + float_off_loader::reserve(unsigned /* nvertices */, + unsigned /* nedges */, + unsigned nfaces) + { + face_value.reserve(nfaces); + } + void bin_off_loader::assign(values& vs, const domain& s) @@ -445,6 +513,16 @@ namespace mln vs[i].insert(vs[i].begin(), s.cplx().nfaces(i), true); } + void + float_off_loader::assign(values& vs, const domain& s) + { + // Default values for n-face with n in [0, D[. + for (unsigned i = 0; i < D; ++i) + vs[i].insert(vs[i].begin(), s.cplx().nfaces(i), 0.0f); + // Values for D-faces. + vs[D] = face_value; + } + // --------- // // Helpers. // -- 1.6.0.1

1 0

2847: Introduce a factoring functor to load OFF image files.
by Roland Levillain 12 Nov '08

12 Nov '08

* mln/io/off/load.hh (mln::io::off::internal::off_loader) (mln::io::off::internal::bin_off_loader): New classes. Use it to factor... (mln::io::off::load(bin_2complex_image3df&, const std::string&)): ...this function. (mln::io::off::internal::eat_comment): Remove. --- milena/ChangeLog | 13 + milena/mln/io/off/load.hh | 579 +++++++++++++++++++++++++++++---------------- 2 files changed, 387 insertions(+), 205 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3ffe29b..02fdd91 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a factoring functor to load OFF image files. + + * mln/io/off/load.hh + (mln::io::off::internal::off_loader) + (mln::io::off::internal::bin_off_loader): + New classes. + Use it to factor... + (mln::io::off::load(bin_2complex_image3df&, const std::string&)): + ...this function. + (mln::io::off::internal::eat_comment): Remove. + +2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Add new typedefs for commonly-used complex-based images. * mln/core/alias/complex_geometry.hh: New. diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index 05160d0..4e9e86d 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -32,6 +32,7 @@ /// \brief Input loading function for OFF files. /// /// \see http://shape.cs.princeton.edu/benchmark/documentation/off_format.html +/// \see https://people.scs.fsu.edu/~burkardt/html/off_format.html # include <cstdlib> @@ -40,6 +41,7 @@ # include <string> +# include <mln/core/concept/object.hh> # include <mln/core/alias/complex_image.hh> @@ -63,231 +65,395 @@ namespace mln namespace internal { - /// A stream manipulator eating comments starting with a `#' - /// and ending at an end of line - std::istream& eat_comment (std::istream& istr); - } + + template <typename I, typename E> + struct off_loader : public Object<E> + { + typedef off_loader<I, E> self; + + /// Dimension of the built complex. + static const unsigned D = 2; + /// Type of the set of values. + typedef metal::vec<D + 1, std::vector< mln_value(I) > > values; + /// Type of the domain. + typedef mln_pset(I) domain; + + /// \brief Constructor, with static checks. + off_loader(); + + /// Load an image from \a filename into \a ima. + void operator()(I& ima, const std::string& filename); + + /// A stream manipulator eating comments starting with a `#' + /// and ending at an end of line. + static std::istream& eat_comment(std::istream& istr); + }; + + + struct bin_off_loader + : public off_loader< bin_2complex_image3df, bin_off_loader > + { + /// \brief Read face data. + /// + /// Dummy, does nothings (but required by the super class). + void read_face_data(std::istream& istr); + + /// \brief Assign values to image. + void assign(values& vs, const domain& s); + + /// \brief Pre-allocate data. + /// + /// Dummy, does nothings (but required by the super class). + void reserve(unsigned nvertices, unsigned nedges, unsigned nfaces); + }; + + } // end of namespace mln::io::off::internal + # ifndef MLN_INCLUDE_ONLY - void load(bin_2complex_image3df& ima, const std::string& filename) + /*----------. + | Facades. | + `----------*/ + + void + load(bin_2complex_image3df& ima, const std::string& filename) { trace::entering("mln::io::off::load"); + internal::bin_off_loader()(ima, filename); + trace::exiting("mln::io::off::load"); + } + - const std::string me = "mln::io::off::load"; + /*-------------------------. + | Actual implementations. | + `-------------------------*/ - std::ifstream istr(filename.c_str()); - if (!istr) + // -------- // + // Canvas. // + // -------- // + + namespace internal + { + + template <typename I, typename E> + inline + off_loader<I, E>::off_loader() { - std::cerr << me << ": `" << filename << "' not found." << std::endl; - /* FIXME: Too violent. We should allow the use of - exceptions, at least to have Milena's code behave - correctly in interpreted environments (std::exit() or - std::abort() causes the termination of a Python - interpreter, for instance!). */ - std::exit(1); + // Concept checking. + void (E::*m1)(std::istream&) = &E::read_face_data; + m1 = 0; + void (E::*m2)(unsigned, unsigned, unsigned) = &E::reserve; + m2 = 0; + void (E::*m3)(values&, const domain&) = &E::assign; + m3 = 0; } - /*---------. - | Header. | - `---------*/ - - /* ``The .off files in the Princeton Shape Benchmark conform - to the following standard''. */ - - /* ``OFF files are all ASCII files beginning with the keyword - OFF. '' */ - std::string type; - istr >> internal::eat_comment >> type; - if (type != "OFF") - { - std::cerr << me << ": `" << filename << "': ill-formed header." - << std::endl; - std::exit(1); - } - - /* ``The next line states the number of vertices, the number - of faces, and the number of edges. The number of edges can - be safely ignored.'' */ - unsigned nvertices, nfaces, nedges; - istr >> internal::eat_comment >> nvertices - >> internal::eat_comment >> nfaces - >> internal::eat_comment >> nedges; - - /*-------. - | Data. | - `-------*/ - - /* FIXME: Maybe we could sugar all this (using make_whatever - helpers?). */ - // --------- // - // Complex. // - // --------- // + template <typename I, typename E> + inline + void + off_loader<I, E>::operator()(I& ima, const std::string& filename) + { + const std::string me = "mln::io::off::load"; + + std::ifstream istr(filename.c_str()); + if (!istr) + { + std::cerr << me << ": `" << filename << "' not found." + << std::endl; + /* FIXME: Too violent. We should allow the use of + exceptions, at least to have Milena's code behave + correctly in interpreted environments (std::exit() or + std::abort() causes the termination of a Python + interpreter, for instance!). */ + std::exit(1); + } + + /*---------. + | Header. | + `---------*/ + + /* ``The .off files in the Princeton Shape Benchmark conform + to the following standard''. */ + + /* ``OFF files are all ASCII files beginning with the keyword + OFF. '' */ + std::string type; + istr >> &self::eat_comment >> type; + if (type != "OFF") + { + std::cerr << me << ": `" << filename << "': ill-formed header." + << std::endl; + std::exit(1); + } + + /* ``The next line states the number of vertices, the number + of faces, and the number of edges. The number of edges can + be safely ignored.'' */ + unsigned nvertices, nfaces, nedges; + istr >> &self::eat_comment >> nvertices + >> &self::eat_comment >> nfaces + >> &self::eat_comment >> nedges; - const unsigned D = 2; - topo::complex<D> c; + /// Possilby pre-allocate data. + exact(this)->reserve(nvertices, nedges, nfaces); - // ------------------------------------------ // - // Vertices & geometry (vertices locations). // - // ------------------------------------------ // + /*-------. + | Data. | + `-------*/ - /* ``The vertices are listed with x, y, z coordinates, written - one per line. */ + /* FIXME: Maybe we could sugar all this (using make_whatever + helpers?). */ - /* FIXME: We should have a faster way to create a bunch of - 0-faces (vertices). */ - for (unsigned v = 0; v < nvertices; ++v) + // --------- // + // Complex. // + // --------- // + + const unsigned D = 2; + topo::complex<D> c; + + // ------------------------------------------ // + // Vertices & geometry (vertices locations). // + // ------------------------------------------ // + + /* ``The vertices are listed with x, y, z coordinates, written + one per line.'' */ + + /* FIXME: We should have a faster way to create a bunch of + 0-faces (vertices). */ + for (unsigned v = 0; v < nvertices; ++v) c.add_face(); - typedef point3df P; - typedef mln_coord_(P) C; - typedef geom::complex_geometry<D, P> G; - G geom; - for (unsigned v = 0; v < nvertices; ++v) - { - C x, y, z; - istr >> internal::eat_comment >> x - >> internal::eat_comment >> y - >> internal::eat_comment >> z; - geom.add_location(point3df(x, y, z)); - } - - // --------------- // - // Faces & edges. // - // --------------- // - - /* After the list of vertices, the faces are listed, with one - face per line. For each face, the number of vertices is - specified, followed by indices into the list of - vertices.'' */ - - // An adjacenty matrix recording the edges seen so far. - typedef std::vector< std::vector<bool> > complex_edges_t; - complex_edges_t complex_edges (nvertices, - std::vector<bool>(nvertices, false)); - - for (unsigned f = 0; f < nfaces; ++f) - { - unsigned nface_vertices; - istr >> internal::eat_comment >> nface_vertices; - if (nface_vertices <= 2) - { - std::cerr << me << ": `" << filename - << "': ill-formed face (" << nface_vertices - << " vertices)" << std::endl; - std::exit(1); - } - - // The edges of the face. - topo::n_faces_set<1, D> face_edges_set; - face_edges_set.reserve(nface_vertices); - - // The first vertex id of the face. - unsigned first_vertex_id; - istr >> internal::eat_comment >> first_vertex_id; - // The current vertex id initialized with the first id. - unsigned vertex_id = first_vertex_id; - if (first_vertex_id >= nvertices) - { - std::cerr << me << ": `" << filename - << "': invalid vertex id " << first_vertex_id - << std::endl; - std::exit(1); - } - // Iterate on vertices and form edges. - for (unsigned v = 0; v < nface_vertices; ++v) - { - /* The next vertex id. The pair (vertex_id, next_vertex_id) - is an edge of the mesh/complex. */ - unsigned next_vertex_id; - /* When V is the id of the last vertex of the face F, - set next_vertex_id to first_vertex_id; otherwise, - read it from the input. */ - if (v == nface_vertices - 1) - next_vertex_id = first_vertex_id; - else - { - istr >> internal::eat_comment >> next_vertex_id; - if (next_vertex_id >= nvertices) - { - std::cerr << me << ": `" << filename - << "': invalid vertex id " << next_vertex_id - << std::endl; - std::exit(1); - } - } - // The ends of the current edge. - topo::n_face<0, D> vertex(c, vertex_id); - topo::n_face<0, D> next_vertex(c, next_vertex_id); - // The current edge. - topo::algebraic_n_face<1, D> edge; - // If the edge has been constructed yet, create it; - // otherwise, retrieve its id from the complex. - if (!complex_edges[vertex_id][next_vertex_id]) - { - complex_edges[vertex_id][next_vertex_id] = true; - complex_edges[next_vertex_id][vertex_id] = true; - edge = - make_algebraic_n_face(c.add_face(vertex - next_vertex), - true); - } - else - { - edge = topo::edge(vertex, next_vertex); - mln_assertion(edge.is_valid()); - } - // Record this edge. - face_edges_set += edge; - // Next vertex. - vertex_id = next_vertex_id; - } - - // Add face. - c.add_face(face_edges_set); - } - - /*--------. - | Image. | - `--------*/ - - // Value type. - typedef bool V; - - // Site set. - p_complex<D, G> pc(c, geom); - - // Values. - metal::vec<D + 1, std::vector<V> > values; - for (unsigned i = 0; i <= D; ++i) - values[i].insert(values[i].begin(), pc.cplx().nfaces(i), true); - - // Image. - ima.init_(pc, values); - - /*--------------. - | End of file. | - `--------------*/ - - istr >> internal::eat_comment; - if (!istr.eof()) - { - std::cerr << me << ": `" << filename - << "': end of file not reached" << std::endl; - std::exit(1); - } - istr.close(); + typedef point3df P; + typedef mln_coord_(P) C; + typedef geom::complex_geometry<D, P> G; + G geom; + for (unsigned v = 0; v < nvertices; ++v) + { + C x, y, z; + istr >> &self::eat_comment >> x + >> &self::eat_comment >> y + >> &self::eat_comment >> z; + geom.add_location(point3df(x, y, z)); + } - trace::exiting("mln::io::off::load"); - } + // --------------- // + // Faces & edges. // + // --------------- // + /* ``After the list of vertices, the faces are listed, with + one face per line. For each face, the number of vertices + is specified, followed by indices into the list of + vertices.'' */ - namespace internal - { - /// A stream manipulator eating comments starting with a `#' - /// and ending at an end of line - std::istream& eat_comment (std::istream& istr) + // An adjacenty matrix recording the edges seen so far. + typedef std::vector< std::vector<bool> > complex_edges_t; + complex_edges_t complex_edges (nvertices, + std::vector<bool>(nvertices, false)); + + for (unsigned f = 0; f < nfaces; ++f) + { + unsigned nface_vertices; + istr >> &self::eat_comment >> nface_vertices; + if (nface_vertices <= 2) + { + std::cerr << me << ": `" << filename + << "': ill-formed face (having " + << nface_vertices << ' ' + << (nface_vertices < 2 ? "vertex" : "vertices") + << ')' << std::endl; + std::exit(1); + } + + // The edges of the face. + topo::n_faces_set<1, D> face_edges_set; + face_edges_set.reserve(nface_vertices); + + // The first vertex id of the face. + unsigned first_vertex_id; + istr >> &self::eat_comment >> first_vertex_id; + // The current vertex id initialized with the first id. + unsigned vertex_id = first_vertex_id; + if (first_vertex_id >= nvertices) + { + std::cerr << me << ": `" << filename + << "': invalid vertex id " << first_vertex_id + << std::endl; + std::exit(1); + } + // Iterate on vertices and form edges. + for (unsigned v = 0; v < nface_vertices; ++v) + { + /* The next vertex id. The pair (vertex_id, + next_vertex_id) is an edge of the + mesh/complex. */ + unsigned next_vertex_id; + /* When V is the id of the last vertex of the face F, + set next_vertex_id to first_vertex_id; otherwise, + read it from the input. */ + if (v == nface_vertices - 1) + next_vertex_id = first_vertex_id; + else + { + istr >> &self::eat_comment >> next_vertex_id; + if (next_vertex_id >= nvertices) + { + std::cerr << me << ": `" << filename + << "': invalid vertex id " + << next_vertex_id << std::endl; + std::exit(1); + } + } + // The ends of the current edge. + topo::n_face<0, D> vertex(c, vertex_id); + topo::n_face<0, D> next_vertex(c, next_vertex_id); + // The current edge. + topo::algebraic_n_face<1, D> edge; + // If the edge has been constructed yet, create it; + // otherwise, retrieve its id from the complex. + if (!complex_edges[vertex_id][next_vertex_id]) + { + complex_edges[vertex_id][next_vertex_id] = true; + complex_edges[next_vertex_id][vertex_id] = true; + edge = + make_algebraic_n_face(c.add_face(vertex - + next_vertex), + true); + } + else + { + edge = topo::edge(vertex, next_vertex); + mln_assertion(edge.is_valid()); + } + // Record this edge. + face_edges_set += edge; + // Next vertex. + vertex_id = next_vertex_id; + } + + // Possibly read a value (depends on the actual format). + exact(this)->read_face_data(istr); + + // Add face. + c.add_face(face_edges_set); + } + + /*--------. + | Image. | + `--------*/ + + // Site set. + domain s(c, geom); + + // Values + values vs; + exact(this)->assign(vs, s); + + // Image. + ima.init_(s, vs); + + /*--------------. + | End of file. | + `--------------*/ + + istr >> &self::eat_comment; + if (!istr.eof()) + { + std::cerr << me << ": `" << filename + << "': end of file not reached" << std::endl; + std::exit(1); + } + istr.close(); + } + + + // ---------------- // + // Specific parts. // + // ---------------- // + + /* FIXME: We do not honor the part + + ``Line breaks are significant here: the color description + begins after VertN and ends with the end of the line (or + the next # comment). + + in the following comment. */ + + /** \brief Reading values. + + From https://people.scs.fsu.edu/~burkardt/html/off_format.html: + + ``Following these [coordinates] are the face descriptions, + typically written with one line per face. Each has the + form + + N Vert1 Vert2 ... VertN [color] + + Here N is the number of vertices on this face, and Vert1 + through VertN are indices into the list of vertices (in + the range 0..NVertices-1). + + The optional color may take several forms. Line breaks + are significant here: the color description begins after + VertN and ends with the end of the line (or the next # + comment). A color may be: + + nothing + the default color + one integer + index into "the" colormap; see below + three or four integers + RGB and possibly alpha values in the range 0..255 + three or four floating-point numbers + RGB and possibly alpha values in the range 0..1 + + For the one-integer case, the colormap is currently read + from the file `cmap.fmap' in Geomview's `data' + directory. Some better mechanism for supplying a colormap + is likely someday. + + The meaning of "default color" varies. If no face of the + object has a color, all inherit the environment's default + material color. If some but not all faces have colors, the + default is gray (R,G,B,A=.666).'' + + \{ */ + void + bin_off_loader::read_face_data(std::istream& /* istr */) + { + // Do nothing (no data associated to faces). + } + /* \} */ + + + void + bin_off_loader::reserve(unsigned /* nvertices */, + unsigned /* nedges */, + unsigned /* nfaces */) + { + // Do nothing (no data associated to faces). + } + + + void + bin_off_loader::assign(values& vs, const domain& s) + { + // Default values. + for (unsigned i = 0; i <= D; ++i) + vs[i].insert(vs[i].begin(), s.cplx().nfaces(i), true); + } + + + // --------- // + // Helpers. // + // --------- // + + template <typename I, typename E> + inline + std::istream& + off_loader<I, E>::eat_comment(std::istream& istr) { // Skip whitespace and newlines. std::ws(istr); @@ -304,10 +470,13 @@ namespace mln } return istr; } - } + + } // end of namespace mln::io::off::internal + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::io::off } // end of namespace mln::io -- 1.6.0.1

1 0

2846: Add new typedefs for commonly-used complex-based images.
by Roland Levillain 12 Nov '08

12 Nov '08

* mln/core/alias/complex_geometry.hh: New. Use it... * mln/core/alias/bin_2complex_image3df.hh: ...here. Rename as... * mln/core/alias/complex_image.hh: ...this. Adjust (mln::int_u8_2complex_image3df) (mln::float_2complex_image3df) (mln::rgb8_2complex_image3df): New typedefs. * mln/io/off/load.hh, * mln/io/off/save.hh Adjust clients. --- milena/ChangeLog | 18 +++++++++ ...in_2complex_image3df.hh => complex_geometry.hh} | 19 ++++------ .../{bin_2complex_image3df.hh => complex_image.hh} | 39 ++++++++++++++++---- milena/mln/io/off/load.hh | 2 +- milena/mln/io/off/save.hh | 2 +- 5 files changed, 59 insertions(+), 21 deletions(-) copy milena/mln/core/alias/{bin_2complex_image3df.hh => complex_geometry.hh} (72%) rename milena/mln/core/alias/{bin_2complex_image3df.hh => complex_image.hh} (58%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3e28a7e..3ffe29b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Add new typedefs for commonly-used complex-based images. + + * mln/core/alias/complex_geometry.hh: New. + Use it... + * mln/core/alias/bin_2complex_image3df.hh: ...here. + Rename as... + * mln/core/alias/complex_image.hh: ...this. + Adjust + (mln::int_u8_2complex_image3df) + (mln::float_2complex_image3df) + (mln::rgb8_2complex_image3df): + New typedefs. + * mln/io/off/load.hh, + * mln/io/off/save.hh + Adjust clients. + +2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + Properly handle command-line arguments in apps/statues/. * apps/statues/mesh-segm.cc, apps/statues/mesh-skel.cc: diff --git a/milena/mln/core/alias/bin_2complex_image3df.hh b/milena/mln/core/alias/complex_geometry.hh similarity index 72% copy from milena/mln/core/alias/bin_2complex_image3df.hh copy to milena/mln/core/alias/complex_geometry.hh index c429752..3bde2d4 100644 --- a/milena/mln/core/alias/bin_2complex_image3df.hh +++ b/milena/mln/core/alias/complex_geometry.hh @@ -25,13 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH -# define MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +#ifndef MLN_CORE_ALIAS_COMPLEX_GEOMETRY_HH +# define MLN_CORE_ALIAS_COMPLEX_GEOMETRY_HH -/// \file mln/core/alias/bin_2complex_image3df.hh -/// \brief Definition of the mln::bin_2complex_image3df alias. +/// \file mln/core/alias/complex_geometry.hh +/// \brief Definition of mln::geom::complex_geometry aliases. -# include <mln/core/image/complex_image.hh> # include <mln/geom/complex_geometry.hh> # include <mln/core/alias/point3df.hh> @@ -39,13 +38,11 @@ namespace mln { - /// \brief Type alias for a binary image based on a 2-complex, where - /// 0-faces are located at floating-point 3-dimensional points. - typedef - mln::complex_image<2, mln::geom::complex_geometry<2,point3df>, bool> - bin_2complex_image3df; + /// \brief Type alias for the geometry of a 2-complex located in a + /// 3-dimensional space (with floating-point coordinates). + typedef mln::geom::complex_geometry<2,point3df> space_2complex_geometry; } // end of namespace mln -#endif // ! MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +#endif // ! MLN_CORE_ALIAS_COMPLEX_GEOMETRY_HH diff --git a/milena/mln/core/alias/bin_2complex_image3df.hh b/milena/mln/core/alias/complex_image.hh similarity index 58% rename from milena/mln/core/alias/bin_2complex_image3df.hh rename to milena/mln/core/alias/complex_image.hh index c429752..9dc5956 100644 --- a/milena/mln/core/alias/bin_2complex_image3df.hh +++ b/milena/mln/core/alias/complex_image.hh @@ -25,15 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH -# define MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +#ifndef MLN_CORE_ALIAS_COMPLEX_IMAGE_HH +# define MLN_CORE_ALIAS_COMPLEX_IMAGE_HH -/// \file mln/core/alias/bin_2complex_image3df.hh -/// \brief Definition of the mln::bin_2complex_image3df alias. +/// \file mln/core/alias/complex_image.hh +/// \brief Definition of mln::complex_image aliases. # include <mln/core/image/complex_image.hh> -# include <mln/geom/complex_geometry.hh> -# include <mln/core/alias/point3df.hh> +# include <mln/core/alias/complex_geometry.hh> + +# include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> namespace mln @@ -42,10 +44,31 @@ namespace mln /// \brief Type alias for a binary image based on a 2-complex, where /// 0-faces are located at floating-point 3-dimensional points. typedef - mln::complex_image<2, mln::geom::complex_geometry<2,point3df>, bool> + mln::complex_image<2, mln::space_2complex_geometry, bool> bin_2complex_image3df; + /// \brief Type alias for a grey-level image based on a 2-complex, + /// where 0-faces are located at floating-point 3-dimensional + /// points. + typedef + mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> + int_u8_2complex_image3df; + + /// \brief Type alias for a floating-point image based on a + /// 2-complex, where 0-faces are located at floating-point + /// 3-dimensional points. + typedef + mln::complex_image<2, mln::space_2complex_geometry, float> + float_2complex_image3df; + + /// \brief Type alias for a (3x8-bit) RGB image based on a + /// 2-complex, where 0-faces are located at floating-point + /// 3-dimensional points. + typedef + mln::complex_image<2, mln::space_2complex_geometry, mln::value::rgb8> + rgb8_2complex_image3df; + } // end of namespace mln -#endif // ! MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +#endif // ! MLN_CORE_ALIAS_COMPLEX_IMAGE_HH diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index 092d439..05160d0 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -40,7 +40,7 @@ # include <string> -# include <mln/core/alias/bin_2complex_image3df.hh> +# include <mln/core/alias/complex_image.hh> namespace mln diff --git a/milena/mln/io/off/save.hh b/milena/mln/io/off/save.hh index ff47744..4273821 100644 --- a/milena/mln/io/off/save.hh +++ b/milena/mln/io/off/save.hh @@ -41,7 +41,7 @@ # include <string> -# include <mln/core/alias/bin_2complex_image3df.hh> +# include <mln/core/alias/complex_image.hh> # include <mln/core/image/complex_neighborhoods.hh> # include <mln/core/image/complex_neighborhood_piter.hh> -- 1.6.0.1

1 0

2845: Properly handle command-line arguments in apps/statues/.
by Roland Levillain 12 Nov '08

12 Nov '08

* apps/statues/mesh-segm.cc, apps/statues/mesh-skel.cc: Use the right element from argv. --- milena/ChangeLog | 7 +++++++ milena/apps/statues/mesh-segm.cc | 5 ++--- milena/apps/statues/mesh-skel.cc | 5 ++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 23c3109..3e28a7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2008-11-12 Roland Levillain <roland(a)lrde.epita.fr> + + Properly handle command-line arguments in apps/statues/. + + * apps/statues/mesh-segm.cc, apps/statues/mesh-skel.cc: + Use the right element from argv. + 2008-11-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Allow some state to be transmitted fom meta cuu to accu. diff --git a/milena/apps/statues/mesh-segm.cc b/milena/apps/statues/mesh-segm.cc index 70a5104..5ab247f 100644 --- a/milena/apps/statues/mesh-segm.cc +++ b/milena/apps/statues/mesh-segm.cc @@ -39,8 +39,6 @@ #include <TriMesh.h> -#include <mln/value/rgb8.hh> - #include <mln/core/alias/point3d.hh> #include <mln/core/alias/point3d.hh> @@ -62,7 +60,8 @@ int main(int argc, char* argv[]) { if (argc != 4) { - std::cerr << "usage: " << argv[1] << " input.off lambda output.off"; + std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + << std::endl; exit(1); } diff --git a/milena/apps/statues/mesh-skel.cc b/milena/apps/statues/mesh-skel.cc index cf99305..e45d07c 100644 --- a/milena/apps/statues/mesh-skel.cc +++ b/milena/apps/statues/mesh-skel.cc @@ -39,8 +39,6 @@ #include <TriMesh.h> -#include <mln/value/rgb8.hh> - #include <mln/core/alias/point3d.hh> #include <mln/core/alias/point3d.hh> @@ -62,7 +60,8 @@ int main(int argc, char* argv[]) { if (argc != 4) { - std::cerr << "usage: " << argv[1] << " input.off lambda output.off"; + std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + << std::endl; exit(1); } -- 1.6.0.1

1 0

scool r128: Fix tests
by Maxime van Noppen 12 Nov '08

12 Nov '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r128: Fix tests URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-11-12 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix tests. * examples/scool_src/sample_1.scl, * examples/scool_src/sample_2.scl, * examples/scool_src/sample_3.scl, * examples/scool_src/sample_6.scl, * examples/scool_src/sample_animal_hierarchy.scl, * examples/scool_src/sample_container.scl: Here. --- sample_1.scl | 6 +++--- sample_2.scl | 4 ++-- sample_3.scl | 6 +++--- sample_6.scl | 2 +- sample_animal_hierarchy.scl | 22 +++++++++++----------- sample_container.scl | 14 +++++++------- 6 files changed, 27 insertions(+), 27 deletions(-) Index: branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl (revision 128) @@ -2,29 +2,29 @@ { public { - decl scream : () -> void; + scream : () -> void; + } } -}; -Cat : class < Animal = +Cat : class where Cat -> Animal = { public { - scream : () -> void = { |[ std::cout << "Miaou" << std::endl; ]| } + scream : () -> void = { |[ std::cout << "Miaou" << std::endl; ]|; } + } } -}; -final Dog : class < Animal = +final Dog : class where Dog -> Animal = { public { - scream : () -> void = { |[ std::cout << "Wouf" << std::endl; ]| } + scream : () -> void = { |[ std::cout << "Wouf" << std::endl; ]|; } + } } -}; scream : (animal : Animal) -> void = { - |[ animal.scream(); ]| + |[ animal.scream(); ]|; } main : () -> int = @@ -32,8 +32,8 @@ var cat : Cat; var dog : Dog; - |[ scream(cat); ]| - |[ scream(dog); ]| + scream(cat); + scream(dog); -> 0; } Index: branches/scool-ng/tests/examples/scool_src/sample_1.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_1.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_1.scl (revision 128) @@ -2,8 +2,8 @@ f : () -> void = { i : int = 3; - i := 4; + i = 4; - var j : int := 3; - j := 4; + var j : int = 3; + j = 4; } Index: branches/scool-ng/tests/examples/scool_src/sample_2.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_2.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_2.scl (revision 128) @@ -1,5 +1,5 @@ f : () -> void = { - var a : array[int16, 2]; - var i : int16 := a.at(0); + var a : array[int, 2]; + var i : int = a.at(0); } Index: branches/scool-ng/tests/examples/scool_src/sample_3.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_3.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_3.scl (revision 128) @@ -3,7 +3,7 @@ var i : int; var j : int; - i := 0; - j := i; - i := j + i; + i = 0; + j = i; + i = j + i; } Index: branches/scool-ng/tests/examples/scool_src/sample_container.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_container.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_container.scl (revision 128) @@ -13,14 +13,14 @@ size_type : type; - decl begin : () -> iterator; - decl begin : const () -> const_iterator; + begin : () -> iterator; + begin : const () -> const_iterator; - decl end : () -> iterator; - decl end : const () -> const_iterator; + end : () -> iterator; + end : const () -> const_iterator; - decl size : const () -> size_type; - decl empty : const () -> bool; + size : const () -> size_type; + empty : const () -> bool; + } } -}; Index: branches/scool-ng/tests/examples/scool_src/sample_6.scl =================================================================== --- branches/scool-ng/tests/examples/scool_src/sample_6.scl (revision 127) +++ branches/scool-ng/tests/examples/scool_src/sample_6.scl (revision 128) @@ -1,4 +1,4 @@ f : () -> void = { - 4 := 4; + 4 = 4; }

1 0

cleanup-2008 2844: Allow some state to be transmitted fom meta cuu to accu.
by Thierry Geraud 12 Nov '08

12 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Allow some state to be transmitted fom meta cuu to accu. * mln/core/concept/meta_accumulator.hh (unmeta): New. * mln/core/concept/object.hh (include): Add metal abort. * mln/metal/abort.hh: Upgrade doc style. * mln/accu/rank.hh: Likewise. (rank::k): New method. (rank::n): New method. (meta::rank): New attributes, resp. k and n. (unmeta): New overload for meta::rank. * mln/accu/transform.hh: Use unmeta. * tests/accu/rank.cc: Augment. * mln/morpho/erosion.spe.hh: Shorten checks in lines dispatch. mln/accu/rank.hh | 44 ++++++++++++++++++++++++++------ mln/accu/transform.hh | 7 ++--- mln/core/concept/meta_accumulator.hh | 41 ++++++++++++++++++++++++++---- mln/core/concept/object.hh | 8 ++--- mln/metal/abort.hh | 7 ++--- mln/morpho/erosion.spe.hh | 47 ++++++++++++++--------------------- tests/accu/rank.cc | 43 ++++++++++++++++++++------------ 7 files changed, 131 insertions(+), 66 deletions(-) Index: tests/accu/rank.cc --- tests/accu/rank.cc (revision 2843) +++ tests/accu/rank.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,18 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/rank.cc - * - * \brief Tests on mln::accu::rank. - */ +/// \file tests/accu/rank.cc +/// +/// Tests on mln::accu::rank. #include <mln/accu/rank.hh> #include <mln/value/int_u8.hh> -using namespace mln; + template <typename A> -void fill(Accumulator<A>& accu_) +void fill(mln::Accumulator<A>& accu_) { A& accu = exact(accu_); accu.take(2); @@ -49,45 +48,59 @@ accu.take(5); } + int main() { + using namespace mln; + using value::int_u8; + + { + accu::meta::rank r; + r.k = 4; + r.n = 9; + accu::rank<int_u8> a = accu::unmeta(r, int_u8()); + mln_assertion(a.k() == 4 && a.n() == 9); +// Meta_Accumulator<accu::meta::rank>& R = r; +// accu::unmeta(R, int_u8()); + } + { - accu::rank<value::int_u8> accu(0, 8); + accu::rank<int_u8> accu(0, 8); fill(accu); mln_assertion(accu.to_result() == 1u); } { - accu::rank<value::int_u8> accu(1, 8); + accu::rank<int_u8> accu(1, 8); fill(accu); mln_assertion(accu.to_result() == 2u); } { - accu::rank<value::int_u8> accu(2, 8); + accu::rank<int_u8> accu(2, 8); fill(accu); mln_assertion(accu.to_result() == 2u); } { - accu::rank<value::int_u8> accu(3, 8); + accu::rank<int_u8> accu(3, 8); fill(accu); mln_assertion(accu.to_result() == 3u); } { - accu::rank<value::int_u8> accu(4, 8); + accu::rank<int_u8> accu(4, 8); fill(accu); mln_assertion(accu.to_result() == 4u); } { - accu::rank<value::int_u8> accu(5, 8); + accu::rank<int_u8> accu(5, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } { - accu::rank<value::int_u8> accu(6, 8); + accu::rank<int_u8> accu(6, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } { - accu::rank<value::int_u8> accu(7, 8); + accu::rank<int_u8> accu(7, 8); fill(accu); mln_assertion(accu.to_result() == 5u); } Index: mln/core/concept/meta_accumulator.hh --- mln/core/concept/meta_accumulator.hh (revision 2843) +++ mln/core/concept/meta_accumulator.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_CORE_CONCEPT_META_ACCUMULATOR_HH # define MLN_CORE_CONCEPT_META_ACCUMULATOR_HH -/*! \file mln/core/concept/meta_accumulator.hh - * - * \brief Definition of the concept of mln::Meta_Accumulator. - */ +/// \file mln/core/concept/meta_accumulator.hh +/// +/// Definition of the concept of mln::Meta_Accumulator. # include <mln/core/concept/object.hh> # include <mln/core/concept/accumulator.hh> @@ -83,6 +82,23 @@ }; + namespace accu + { + + // To be specialized when some state (attributes) have to be transfered + // from the meta-accumulator to the accumulator. + // Warning: the first argument has to be an object with the exact type. + template <typename M, typename T> + mln_accu_with(M, T) + unmeta(const M&, T); + + template <typename M, typename T> + void + unmeta(const Meta_Accumulator<M>&, T); // Safety. + + } // end of namespace mln::accu + + # ifndef MLN_INCLUDE_ONLY @@ -93,6 +109,21 @@ // FIXME: Check "with" on E. } + namespace accu + { + + template <typename M, typename T> + inline + mln_accu_with(M, T) + unmeta(const M&, T) + { + mlc_is_a(M, Meta_Accumulator)::check(); + mln_accu_with(M, T) a; + return a; + } + + } // end of namespace mln::accu + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/concept/object.hh --- mln/core/concept/object.hh (revision 2843) +++ mln/core/concept/object.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_CORE_CONCEPT_OBJECT_HH # define MLN_CORE_CONCEPT_OBJECT_HH -/*! \file mln/core/concept/object.hh - * - * \brief Definition of the top Milena class mln::Object. - */ +/// \file mln/core/concept/object.hh +/// +/// Definition of the top Milena class mln::Object. # include <cassert> # include <iostream> @@ -44,6 +43,7 @@ # include <mln/trace/all.hh> // metal +# include <mln/metal/abort.hh> # include <mln/metal/is_a.hh> # include <mln/metal/is_not_a.hh> # include <mln/metal/is.hh> Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 2843) +++ mln/metal/abort.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_METAL_ABORT_HH # define MLN_METAL_ABORT_HH -/*! \file mln/metal/abort.hh - * - * \brief FIXME: Document. - */ +/// \file mln/metal/abort.hh +/// +/// FIXME: Document. # include <mln/metal/bool.hh> Index: mln/accu/transform.hh --- mln/accu/transform.hh (revision 2843) +++ mln/accu/transform.hh (working copy) @@ -148,7 +148,7 @@ template <typename I, typename A, typename W> mln_ch_value(I, mln_accu_with(A, mln_value(I))::result) transform(const Image<I>& input, - const Meta_Accumulator<A>&, + const Meta_Accumulator<A>& a, const Window<W>& win) { trace::entering("accu::transform"); @@ -157,9 +157,10 @@ // mln_precondition(exact(win).is_valid()); typedef mln_accu_with(A, mln_value(I)) A_; - A_ a; + A_ a_ = accu::unmeta(exact(a), mln_value(I)()); + mln_ch_value(I, mln_result(A_)) output; - output = internal::transform_dispatch(input, a, win); + output = internal::transform_dispatch(input, a_, win); trace::exiting("accu::transform"); return output; Index: mln/accu/rank.hh --- mln/accu/rank.hh (revision 2843) +++ mln/accu/rank.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,13 +28,12 @@ #ifndef MLN_ACCU_RANK_HH # define MLN_ACCU_RANK_HH -/*! \file mln/accu/rank.hh - * - * \brief Define an rank accumulator. - * - * \todo It should be renamed as rank_h since it relies on histogram - * (thus low quantization). - */ +/// \file mln/accu/rank.hh +/// +/// Define an rank accumulator. +/// +/// \todo It should be renamed as rank_h since it relies on histogram +/// (thus low quantization). # include <vector> # include <mln/accu/internal/base.hh> @@ -80,6 +79,12 @@ /// Always true here. bool is_valid() const; + /// Give the rank. + unsigned k() const; + + /// Give the total number of elements. + unsigned n() const; + protected: unsigned k_; // 0 <= k_ < n @@ -116,11 +121,20 @@ { typedef accu::rank<T> ret; }; + unsigned k, n; }; } // end of namespace mln::accu::meta + template <typename T> + rank<T> unmeta(const meta::rank& m, T) + { + rank<T> a(m.k, m.n); + return a; + } + + # ifndef MLN_INCLUDE_ONLY @@ -137,7 +151,21 @@ init(); } + template <typename T> + inline + unsigned + rank<T>::k() const + { + return k_; + } + template <typename T> + inline + unsigned + rank<T>::n() const + { + return n_; + } template <typename T> inline Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2843) +++ mln/morpho/erosion.spe.hh (working copy) @@ -1444,11 +1444,10 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_box, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1456,7 +1455,6 @@ /// \} - /// Handling win::vline2d. /// \{ @@ -1486,11 +1484,10 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_box, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1527,14 +1524,12 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_not(mln_trait_image_kind(I), - mln::trait::image::kind::logic) test_not_logic; - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_not_logic, test_box) temp; - typedef mlc_and(temp, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic)::value + && mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } } @@ -1571,14 +1566,12 @@ return erosion_dispatch_for_generic(input, win); else { - typedef mlc_is_not(mln_trait_image_kind(I), - mln::trait::image::kind::logic) test_not_logic; - typedef mlc_is_a(mln_pset(I), Box) test_box; - typedef mlc_equal(mln_trait_image_quant(I), - mln::trait::image::quant::low) test_lowq; - typedef mlc_and(test_not_logic, test_box) temp; - typedef mlc_and(temp, test_lowq) tests; - return erosion_dispatch_wrt_win(typename tests::eval (), + enum { test = mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic)::value + && mlc_is_a(mln_pset(I), Box)::value + && mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low)::value }; + return erosion_dispatch_wrt_win(metal::bool_<test>(), input, win); } }

1 0

cleanup-2008 2843: Make topological watershed work.
by Alexandre Abraham 12 Nov '08

12 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Make topological watershed work. * abraham/tests/core/image/thru_v2w2v.cc: make::image2d -> make::image. * abraham/mln/morpho/topo_wst.hh: fix reversion of tree . * abraham/mln/value/shell.hh: add traits. mln/morpho/topo_wst.hh | 13 +++++++++---- mln/value/shell.hh | 13 ++++++++++++- tests/core/image/thru_v2w2v.cc | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) Index: abraham/tests/core/image/thru_v2w2v.cc --- abraham/tests/core/image/thru_v2w2v.cc (revision 2842) +++ abraham/tests/core/image/thru_v2w2v.cc (working copy) @@ -47,7 +47,7 @@ }; - image2d<double> ima(make::image2d(vs)); + image2d<double> ima(make::image(vs)); thru<mln::fun::v2w2v::cos<double>, image2d<double> > out(ima); double i = 0; Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 2842) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -91,6 +91,7 @@ mln_value(I) min() { return mln_min(mln_value(I)); } mln_value(I) max() { return mln_max(mln_value(I)); } + void revert () { level = max() - level + min(); } }; // struct node @@ -171,15 +172,15 @@ template <class I, class N> topo_wst<I, N>::topo_wst(const Image<I>& i, const Neighborhood<N>& n) - : pima(exact(i)), - nbh(exact(n)), + : nbh(exact(n)), Par_node(exact(i).domain(), exact(i).border()), Par_tree(exact(i).domain(), exact(i).border()), Rnk_tree(exact(i).domain(), exact(i).border()), Rnk_node(exact(i).domain(), exact(i).border()), subtreeRoot(exact(i).domain(), exact(i).border()), nodes(exact(i).domain(), exact(i).border()), - isproc(exact(i).domain(), exact(i).border()) + isproc(exact(i).domain(), exact(i).border()), + pima(exact(i)) { } @@ -227,7 +228,11 @@ BuildComponentTree(); compressTree(); arith::revert_inplace(pima); - arith::revert_inplace(nodes); + // arith::revert_inplace(nodes); + mln_piter(image2d<node>) p (nodes.domain()); + for_all(p) + nodes(p).revert(); + build_euler_tour(); build_minim(); topo_watershed(); Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 2842) +++ abraham/mln/value/shell.hh (working copy) @@ -41,9 +41,20 @@ struct shell; } - // FIXME : traits + namespace trait + { + + template <typename F, typename I> + struct value_< mln::value::shell<F, I> > + : + value_< mln_result(F) > + { + }; + + } // end of namespace trait + namespace value { namespace impl

1 0

cleanup-2008 2840: Add FFT to nature.
by Alexandre Abraham 12 Nov '08

12 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Add FFT to nature. * nature/fft.cc: New. * nature/nature.cc: Add a FFT test. * nature/opening.cc: . * nature/co_occurence.hh: . * nature/Makefile: Add special rule to use FFTW. * abraham/tests/transform/fft.cc: New. * abraham/tests/transform/fft_.cc: New. * abraham/mln/transform/fft.hh: conversion to milena. mln/morpho/topo_wst.hh | 13 +++++++++---- mln/value/shell.hh | 13 ++++++++++++- tests/core/image/thru_v2w2v.cc | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) Index: abraham/tests/core/image/thru_v2w2v.cc --- abraham/tests/core/image/thru_v2w2v.cc (revision 2842) +++ abraham/tests/core/image/thru_v2w2v.cc (working copy) @@ -47,7 +47,7 @@ }; - image2d<double> ima(make::image2d(vs)); + image2d<double> ima(make::image(vs)); thru<mln::fun::v2w2v::cos<double>, image2d<double> > out(ima); double i = 0; Index: abraham/mln/morpho/topo_wst.hh --- abraham/mln/morpho/topo_wst.hh (revision 2842) +++ abraham/mln/morpho/topo_wst.hh (working copy) @@ -91,6 +91,7 @@ mln_value(I) min() { return mln_min(mln_value(I)); } mln_value(I) max() { return mln_max(mln_value(I)); } + void revert () { level = max() - level + min(); } }; // struct node @@ -171,15 +172,15 @@ template <class I, class N> topo_wst<I, N>::topo_wst(const Image<I>& i, const Neighborhood<N>& n) - : pima(exact(i)), - nbh(exact(n)), + : nbh(exact(n)), Par_node(exact(i).domain(), exact(i).border()), Par_tree(exact(i).domain(), exact(i).border()), Rnk_tree(exact(i).domain(), exact(i).border()), Rnk_node(exact(i).domain(), exact(i).border()), subtreeRoot(exact(i).domain(), exact(i).border()), nodes(exact(i).domain(), exact(i).border()), - isproc(exact(i).domain(), exact(i).border()) + isproc(exact(i).domain(), exact(i).border()), + pima(exact(i)) { } @@ -227,7 +228,11 @@ BuildComponentTree(); compressTree(); arith::revert_inplace(pima); - arith::revert_inplace(nodes); + // arith::revert_inplace(nodes); + mln_piter(image2d<node>) p (nodes.domain()); + for_all(p) + nodes(p).revert(); + build_euler_tour(); build_minim(); topo_watershed(); Index: abraham/mln/value/shell.hh --- abraham/mln/value/shell.hh (revision 2842) +++ abraham/mln/value/shell.hh (working copy) @@ -41,9 +41,20 @@ struct shell; } - // FIXME : traits + namespace trait + { + + template <typename F, typename I> + struct value_< mln::value::shell<F, I> > + : + value_< mln_result(F) > + { + }; + + } // end of namespace trait + namespace value { namespace impl

1 0

scool r127: Handle typedefs
by Maxime van Noppen 12 Nov '08

12 Nov '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r127: Handle typedefs URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-11-12 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle typedefs. * pp-cxx/CxxFun.str: Fix pretty print of identifiers. * scl-syn/Declaration.sdf: Add the grammar entry for typedefs. * scoolt/Declaration.str: Traduce the scool typedef into a C++ * typedef. --- pp-cxx/CxxFun.str | 2 +- scl-syn/Declaration.sdf | 10 +++++++--- scoolt/Declaration.str | 12 ++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxFun.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxFun.str (revision 126) +++ branches/scool-ng/src/pp-cxx/CxxFun.str (revision 127) @@ -50,7 +50,7 @@ CxxTopLevelToAbox: CxxTypedef(t, idf) -> - H hs=0 [ H hs=1 [ "typedef" ~<CxxTypeToAbox> t ~S(idf)] ";" ] + H hs=0 [ H hs=1 [ "typedef" ~<CxxTypeToAbox> t ~<CxxIdToAbox> idf] ";" ] CxxArgDefToAbox: (t, idf) -> Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 126) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 127) @@ -91,6 +91,7 @@ where <ClassWhereClauseToCxx(|cqualif, idf, body)> wclause => cxx_code + //////////////////////////////////////////////////////////////////////////////// // Static functions // //////////////////////////////////////////////////////////////////////////////// @@ -99,3 +100,14 @@ StaticClassFunction(idf, params, cqualif, StaticClassBlock(body)) -> cxx_code where <StaticClassFunctionToCxx(|cqualif, idf, params, body)> [] => cxx_code + + + //////////////////////////////////////////////////////////////////////////////// + // Static functions // + //////////////////////////////////////////////////////////////////////////////// + + DeclarationToCxx: + TypeDefinition(tqualif, idf, StaticInitialiser(type)) -> CxxTypedef(cxx_type, cxx_idf) + where + <IdentifierToCxx> idf => cxx_idf + ; <TypeToCxx> type => cxx_type Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 126) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 127) @@ -4,7 +4,7 @@ Lexical Type Statement Expression Class exports - sorts Declaration Block FunctionBlock SimpleDeclaration StaticFunction + sorts Declaration Block FunctionBlock SimpleDeclaration StaticFunction ExpressionInitialiser StaticExpressionInitialiser context-free syntax StaticFunction -> Declaration @@ -17,10 +17,14 @@ "{" StaticStatement* "}" -> StaticBlock {cons("StaticBlock")} "{" StaticClassStatement* "}" -> StaticClassBlock {cons("StaticClassBlock")} - "=" Expression -> Initialiser {cons("Initialiser")} + "=" Expression -> ExpressionInitialiser {cons("Initialiser")} + "=" StaticExpression -> StaticExpressionInitialiser {cons("StaticInitialiser")} - SimpleQualifier? Identifier ":" SimpleType Initialiser? ";" -> SimpleDeclaration {cons("SimpleDeclaration")} + SimpleQualifier? Identifier ":" SimpleType ExpressionInitialiser? ";" -> SimpleDeclaration {cons("SimpleDeclaration")} + + SimpleQualifier? Identifier ":" "type" ";" -> SimpleDeclaration {cons("TypeDeclaration")} + SimpleQualifier? Identifier ":" "type" StaticExpressionInitialiser ";" -> SimpleDeclaration {cons("TypeDefinition")} FunctionQualifier? Identifier ":" FunctionType ";" -> Declaration {cons("FunctionDeclaration")}

1 0

scool r126: Add reference files for tests on typedefs and fix tests
by Maxime van Noppen 12 Nov '08

12 Nov '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: transformers-patches(a)lrde.epita.fr, olena-patches(a)lrde.epita.fr Subject: scool r126: Add reference files for tests on typedefs and fix tests URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-11-12 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on typedefs and fix tests. * class/c++_ast/typedef_001.aterm: New. * class/c++_build/typedef_001.g++: New. * class/c++_src/typedef_001.cc: New. * variable/c++_build/declaration_001.g++: New. * variable/c++_build/declaration_005.g++: New. * variable/c++_build/declaration_007.g++: New. * variable/c++_build/declaration_008.g++: New. * class/scool_ast/typedef_001.aterm: New. * class/scool_src/typedef_001.scl:, * variable/c++_ast/declaration_001.aterm:, * variable/c++_ast/declaration_005.aterm:, * variable/c++_ast/declaration_007.aterm:, * variable/c++_ast/declaration_008.aterm:, * variable/c++_src/declaration_001.cc:, * variable/c++_src/declaration_005.cc:, * variable/c++_src/declaration_007.cc:, * variable/c++_src/declaration_008.cc:, * variable/scool_ast/declaration_001.aterm:, * variable/scool_ast/declaration_005.aterm:, * variable/scool_ast/declaration_007.aterm:, * variable/scool_ast/declaration_008.aterm:, * variable/scool_src/declaration_001.scl:, * variable/scool_src/declaration_005.scl:, * variable/scool_src/declaration_007.scl:, * variable/scool_src/declaration_008.scl: Here. --- class/c++_ast/typedef_001.aterm | 1 + class/c++_src/typedef_001.cc | 6 ++++++ class/scool_ast/typedef_001.aterm | 1 + class/scool_src/typedef_001.scl | 3 +++ variable/c++_ast/declaration_001.aterm | 2 +- variable/c++_ast/declaration_005.aterm | 2 +- variable/c++_ast/declaration_007.aterm | 2 +- variable/c++_ast/declaration_008.aterm | 2 +- variable/c++_src/declaration_001.cc | 2 +- variable/c++_src/declaration_005.cc | 4 ++++ variable/c++_src/declaration_007.cc | 3 ++- variable/c++_src/declaration_008.cc | 1 + variable/scool_ast/declaration_001.aterm | 2 +- variable/scool_ast/declaration_005.aterm | 2 +- variable/scool_ast/declaration_007.aterm | 2 +- variable/scool_ast/declaration_008.aterm | 2 +- variable/scool_src/declaration_001.scl | 2 +- variable/scool_src/declaration_005.scl | 6 ++++++ variable/scool_src/declaration_007.scl | 3 ++- variable/scool_src/declaration_008.scl | 1 + 20 files changed, 37 insertions(+), 12 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/typedef_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/typedef_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/typedef_001.aterm (revision 126) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("foo"),[],[CxxPublic([CxxTypedef(CxxType("int"),CxxId("new_type"))])])]) Index: branches/scool-ng/tests/class/c++_src/typedef_001.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/typedef_001.cc (revision 0) +++ branches/scool-ng/tests/class/c++_src/typedef_001.cc (revision 126) @@ -0,0 +1,6 @@ +template < typename Exact > +class foo +{ + public: + typedef int new_type; +}; Index: branches/scool-ng/tests/class/scool_ast/typedef_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/typedef_001.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/typedef_001.aterm (revision 126) @@ -0,0 +1 @@ +Program([ClassDefinition(Identifier("foo"),None,None,ClassBlock([AccessBlock(Public,[TypeDefinition(None,Identifier("new_type"),StaticInitialiser(SimpleType("int")))])]))]) Index: branches/scool-ng/tests/class/scool_src/typedef_001.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/typedef_001.scl (revision 125) +++ branches/scool-ng/tests/class/scool_src/typedef_001.scl (revision 126) @@ -1,4 +1,7 @@ foo : class = { + public + { new_type: type = int; } +} Index: branches/scool-ng/tests/class/c++_build/typedef_001.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_005.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxType(CxxId("list"),[CxxType("int")]),CxxId("l"))]) +CxxProgram([CxxProgram("#include <list>\n\nusing std::list;\n"),CxxDecl(CxxType(CxxId("list"),[CxxType("int")]),CxxId("l"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_007.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42")),CxxDecl(CxxConstType(CxxType("int")),CxxId("j"),CxxInt("51"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_008.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxType("int"),CxxId("i"),CxxId("j"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("j"),CxxInt("42")),CxxDecl(CxxType("int"),CxxId("i"),CxxId("j"))]) Index: branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm (revision 125) +++ branches/scool-ng/tests/variable/c++_ast/declaration_001.aterm (revision 126) @@ -1 +1 @@ -CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"))]) +CxxProgram([CxxDecl(CxxConstType(CxxType("int")),CxxId("i"),CxxInt("42"))]) Index: branches/scool-ng/tests/variable/c++_src/declaration_007.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_007.cc (revision 126) @@ -1 +1,2 @@ -const int i; +const int i = 42; +const int j = 51; Index: branches/scool-ng/tests/variable/c++_src/declaration_008.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_008.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_008.cc (revision 126) @@ -1 +1,2 @@ +const int j = 42; int i = j; Index: branches/scool-ng/tests/variable/c++_src/declaration_001.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_001.cc (revision 126) @@ -1 +1 @@ -const int i; +const int i = 42; Index: branches/scool-ng/tests/variable/c++_src/declaration_005.cc =================================================================== --- branches/scool-ng/tests/variable/c++_src/declaration_005.cc (revision 125) +++ branches/scool-ng/tests/variable/c++_src/declaration_005.cc (revision 126) @@ -1 +1,5 @@ +#include <list> + +using std::list; + list< int > l; Index: branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_005.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),Parameters([SimpleType("int")])),None)]) +Program([Cxx("#include <list>\n\nusing std::list;\n"),SimpleDeclaration(Some("var"),Identifier("l"),StaticFunctionCall(Identifier("list"),Parameters([SimpleType("int")])),None)]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_007.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),None)]) +Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("42")))),SimpleDeclaration(None,Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("51"))))]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_008.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(Some("var"),Identifier("i"),SimpleType("int"),Some(Initialiser(Identifier("j"))))]) +Program([SimpleDeclaration(None,Identifier("j"),SimpleType("int"),Some(Initialiser(Integer("42")))),SimpleDeclaration(Some("var"),Identifier("i"),SimpleType("int"),Some(Initialiser(Identifier("j"))))]) Index: branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm =================================================================== --- branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm (revision 125) +++ branches/scool-ng/tests/variable/scool_ast/declaration_001.aterm (revision 126) @@ -1 +1 @@ -Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),None)]) +Program([SimpleDeclaration(None,Identifier("i"),SimpleType("int"),Some(Initialiser(Integer("42"))))]) Index: branches/scool-ng/tests/variable/scool_src/declaration_001.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_001.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_001.scl (revision 126) @@ -1 +1 @@ -i : int; +i : int = 42; Index: branches/scool-ng/tests/variable/scool_src/declaration_005.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_005.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_005.scl (revision 126) @@ -1 +1,7 @@ +|[ +#include <list> + +using std::list; +]| + var l : list[int]; Index: branches/scool-ng/tests/variable/scool_src/declaration_007.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_007.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_007.scl (revision 126) @@ -1 +1,2 @@ -i : int ; +i : int = 42; +j : int = 51; Index: branches/scool-ng/tests/variable/scool_src/declaration_008.scl =================================================================== --- branches/scool-ng/tests/variable/scool_src/declaration_008.scl (revision 125) +++ branches/scool-ng/tests/variable/scool_src/declaration_008.scl (revision 126) @@ -1 +1,2 @@ +j : int = 42; var i : int = j; Index: branches/scool-ng/tests/variable/c++_build/declaration_001.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_005.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_007.g++ =================================================================== Index: branches/scool-ng/tests/variable/c++_build/declaration_008.g++ ===================================================================

1 0