September 2008 - Olena-patches

r2217: Use set_cplx() in ctors of complexes on iterators.
by Roland Levillain 11 Sep '08

11 Sep '08

* mln/core/complex_iter.hh (mln): (mln::complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>)) (mln::complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>)): Do it. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 10 ++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e167fe7..3dcecf7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Use set_cplx() in ctors of complexes on iterators. + + * mln/core/complex_iter.hh (mln): + (mln::complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>)) + (mln::complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>)): + Do it. + +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Allow iterators on complexes to change their target. * mln/core/complex_iter.hh diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index 07181c0..b96d309 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -212,9 +212,8 @@ namespace mln inline complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>& c) { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); + set_cplx(c); + mln_postcondition(!is_valid()); } template <unsigned D> @@ -345,9 +344,8 @@ namespace mln inline complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>& c) { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); + set_cplx(c); + mln_postcondition(!is_valid()); } template <unsigned D> -- 1.5.6.5

1 0

r2216: Allow iterators on complexes to change their target.
by Roland Levillain 11 Sep '08

11 Sep '08

* mln/core/complex_iter.hh (mln::complex_fwd_iter_<D>::set_cplx) (mln::complex_bkd_iter_<D>::set_cplx): New. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 957f2e9..e167fe7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + + Allow iterators on complexes to change their target. + + * mln/core/complex_iter.hh + (mln::complex_fwd_iter_<D>::set_cplx) + (mln::complex_bkd_iter_<D>::set_cplx): + New. + 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> * tests/core/complex_image.cc: Fix comment about complex windows. diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index f2701e3..07181c0 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -71,6 +71,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. bool is_valid() const; /// Invalidate the iterator. @@ -144,6 +148,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. bool is_valid() const; /// Invalidate the iterator. @@ -229,6 +237,16 @@ namespace mln template <unsigned D> inline + void + complex_fwd_iter_<D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline bool complex_fwd_iter_<D>::is_valid() const { @@ -352,6 +370,16 @@ namespace mln template <unsigned D> inline + void + complex_bkd_iter_<D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline bool complex_bkd_iter_<D>::is_valid() const { -- 1.5.6.5

1 0

cleanup-2008 r2215: Add a section about graph images in tutorial
by Guillaume Lazzara 11 Sep '08

11 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 ChangeLog: 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Add a section about graph images in tutorial. * milena/doc/tutorial/tutorial.tex: Add a section about graph images and fix few mistakes all along the tutorial. --- tutorial.tex | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 239 insertions(+), 42 deletions(-) Index: branches/cleanup-2008/milena/doc/tutorial/tutorial.tex =================================================================== --- branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2214) +++ branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2215) @@ -144,17 +144,26 @@ The previous methods are available depending on the site set. A box will have the bbox() method since it can be retrived in constant time: a box -is it's own bounding box (see \ref{fig:box_bbox}). A p\_array does not have this +is it's own bounding box (see \ref{fig:box_bbox}). + +\begin{lstlisting}[frame=single] + box2d b(2,3); + + // The bbox can be retrived in constant time. + std::cout << b.bbox() << std::endl; + + // nsites can be retrieved in constant time. + std::cout << "nsites = " << b.nsites() << std::endl; +\end{lstlisting} + +A p\_array does not have this method since sites do not have to be adjacent. Maintaining such information, in order to keep getting the bbox in constant time, would be time and memory consuming. Instead of providing a method directly in p\_array, an algorithm is -available if this information needed (see \ref{fig:parray_bbox}). +available if this information is needed. P\_array and box both have a nsites method since the internal structure allow a constant time retrieval. -\subsubsection*{Sample code} - -\begin{figure}[ht!] \begin{lstlisting}[frame=single] p_array<point2d> arr; @@ -166,21 +175,9 @@ // it can be retrieved in constant time. std::cout << "nsites = " << arr.nsites() << std::endl; \end{lstlisting} - \caption{How to retrieve information from a p\_array.\label{fig:parray_bbox}} -\end{figure} -\begin{figure}[ht!] - \begin{lstlisting}[frame=single] - box2d b(2,3); - // The bbox can be retrived in constant time. - std::cout << b.bbox() << std::endl; - // nsites can be retrieved in constant time. - std::cout << "nsites = " << b.nsites() << std::endl; - \end{lstlisting} - \caption{How to retrieve information from a box.\label{fig:box_bbox}} -\end{figure} \clearpage \newpage @@ -199,8 +196,8 @@ \item A site set, also called the "domain". \end{itemize} -Every image type is defined on a specific site type. An image2d will always -have a domain defined by a box2d. +An image2d will always have its bouding box defined by a box2d whatever the +site set used to define its domain. The Value set, which includes all the possible values a site can have, is also called "destination" set. @@ -208,7 +205,7 @@ border is virtual since the image can have an extended domain as well. That one is optional, it defines sites outside the virtual border which is useful in algorithms when working with sites being part of the domain but close -to the borders. The virtual border can be defined thanks to a function, an +to the borders. The extended domain can be defined thanks to a function, an image or a site set. //FIXME: remove this line @@ -373,7 +370,6 @@ \chapter{Iterators} -Every objects Each container object in Olena like site sets or images have iterators. There are usually three kinds: \begin{itemize} @@ -413,14 +409,11 @@ Example of different forward iterations: \begin{itemize} \item box2d: from top to bottom then from left to right. - \item p\_array<point2d>: from left to right. + \item p\_array$<$point2d$>$: from left to right. \end{itemize} -A for\_all() macro is available to iterate over all the sites -(Fig. \ref{fig:for_all}). \\ +A for\_all() macro is available to iterate over all the sites: \\ - -\begin{figure}[ht!] \begin{lstlisting}[frame=single] box2d b(3, 2); mln_piter(box2d) p(b); @@ -428,16 +421,12 @@ for_all(p) std::cout << p; //prints every site coordinates. \end{lstlisting} - \caption{Use of the for\_all() macro.\label{fig:for_all}} -\end{figure} Note that when you declare an iterator, prefer using the "mln\_*iter" macros. They resolve the iterator type automatically from the given container type passed as parameter. These macros can be used with any container like images or site sets. -(\ref{fig:iter_allcontainers}). -\begin{figure}[ht!] \begin{lstlisting}[frame=single] image2d<int> ima(box2d(2, 3)); @@ -449,23 +438,28 @@ for_all(v) std::cout << v << std::endl; \end{lstlisting} - \caption{mln\_*iter macros can be used with any -containers.\label{fig:iter_allcontainers}} -\end{figure} \chapter{Basic operations} //FIXME : illustrer -\begin{itemize} - \item level::clone(), creates a deep copy of an object. Any shared data is -duplicated. - \item level::fill(), fill an object with a value (fig. \ref{fig:fill_impl}). - \item level::paste(), paste object data to another object (fig. -\ref{fig:paste_impl}) - \item labeling::blobs(), find and label the different components of an image. -\end{itemize} +\section{Basic routines} +\begin{tabular}{|l|p{8cm}|} +\hline +Routine name & Description \\ \hline +level::clone() & creates a deep copy of an object. Any shared data is +duplicated. \\ \hline + +level::fill() & fill an object with a value. \\ \hline + +level::paste() & paste object data to another object. \\ \hline +labeling::blobs() & find and label the different components of an image. \\ +\hline +\end{tabular} \\ + + +\section{Examples} First, create an image: \begin{lstlisting}[frame=single] image2d<char> imga(0, 0, 20, 20); @@ -572,7 +566,7 @@ \caption{Implementation of the paste routine.\label{fig:paste_impl}} \end{figure} - +\newpage \section{Working with parts of an image} Sometime it may be interesting to work only on some part of the image or to @@ -604,6 +598,21 @@ by a function\_p2v to another Value. The following sample code illustrates this feature. +In order to use C functions as predicate, they must have one of the following +prototype if you work on 2D images: +\begin{lstlisting}[frame=single] +//function_p2b +bool my_function_p2b(mln::point2d p); + +//function_p2v +//V is the value type used in the image. +V my_function_p2v(mln::point2d p); +\end{lstlisting} +Of course, you just need to change the point type if you use another image +type. For instance, you would use point3d with 3D images. +The returned value type V for function\_p2v depends on the image value type. +With image2d<int>, V would be int. + In this section, all along the examples, the image "ima" will refer to the following declaration: \begin{lstlisting}[frame=single] @@ -675,9 +684,197 @@ fill(inplace(lab.domain(2)), color::red); \end{lstlisting} +Here is an example using a C function: +\begin{lstlisting}[frame=single] +bool row_oddity(mln::point2d p) +{ + return p.row() % 2; +} + +void my_function() +{ + ... + //Prints only sites which are on odd lines. + debug::println(ima | row_oddity}; + ... +} +\end{lstlisting} \chapter{Graphes and images} +\section{Description} +Olena enables the possibility of using graphes with images. +Graphes can help you to handle directly parts of an image and represent their +relationship. +Specific data can be associated to each vertex and/or edges. + +//FIXME: Add more explanations? + +\section{Example} + +First, create a graph which looks like the following: +\begin{lstlisting}[frame=single] + 0 1 2 3 4 + .----------- + 0 | 0 2 + 1 | \ / | + 2 | 1 | + 3 | \ | + 4 | 3-4 +\end{lstlisting} + +To do so, we need to create a site set containing the sites we are going to use +as vertices: + +\begin{lstlisting} +std::vector<point2d> sites; + +// Site associated to... +sites.push_back(point2d(0,0)); // ... vertex 0. +sites.push_back(point2d(2,2)); // ... vertex 1. +sites.push_back(point2d(0,4)); // ... vertex 2. +sites.push_back(point2d(4,3)); // ... vertex 3. +sites.push_back(point2d(4,4)); // ... vertex 4. +\end{lstlisting} + +Then populate the graph with vertices: +\begin{lstlisting} +util::graph<point2d> g; + +for (unsigned i = 0; i < points.size(); ++i) + g.add_vertex (points[i]); +\end{lstlisting} + +Finally, populate the graph with edges: +\begin{lstlisting} +g.add_edge(0, 1); // Associated to edge 0. +g.add_edge(1, 2); // Associated to edge 1. +g.add_edge(1, 3); // Associated to edge 2. +g.add_edge(3, 4); // Associated to edge 3. +g.add_edge(4, 2); // Associated to edge 4. +\end{lstlisting} + +Now, a graph structure is created but contains only site relationship +information. We may like to map data to it. Vertices and edges are mapped to +indexes. Indexes start from 0 and respect the insertion order. +Therefore, the idea is to provide a function which returns the associated data +according to the index given as parameter. Combining this function and the +graph, which is actually a sort of site set, we get an image. Since this is an +image, you can use it with algorithms and for\_all loops. + +\begin{lstlisting}[frame=single] + +Value my_data_fun(vertex_index_t index) +{ + if (index == 0) + return value1; + else if (index > 1 && < 4) + return value2; + return value3; +} + +Value my_data_fun(edge_index_t index) +{ + if (index == 0) + return value1; + else if (index > 1 && < 4) + return value2; + return value3; +} + +void my_fun() +{ + ... + // Constructs an image which associates + // data and edges. A site is actually an edge. + mln_VAR(graph_edge_ima, my_data_fun | g.edges()); + + //Prints each edge. + mln_piter p(graph_edge_ima); + for_all(p) + std::cout << p << std::endl; + + // Constructs an image which associates + // data and vertices. A site is actually a vertex. + mln_VAR(graph_vertices_ima, my_data_fun2 | g.vertices()); + + //Prints each vertex + mln_piter p(graph_vertices_ima); + for_all(p) + std::Cout << p << std::endl; + ... +} +\end{lstlisting} + +Note that like any image in Olena, graph images share their data. Therefore, +while constructing a graph image from a graph and a function, the graph is not +copied and this is NOT a costly operation. + +Like other images, graph images also have an overloaded operator() to access the +data associated to a vertex or an edge. +\begin{lstlisting} + //Prints each edge's associated value. + mln_piter p(graph_edge_ima); + for_all(p) + std::cout << graph_edge_ima(p) << std::endl; + + //Prints each vertex's associated value. + mln_piter p(graph_vertex_ima); + for_all(p) + std::cout << graph_vertex_ima(p) << std::endl; +\end{lstlisting} + +Of course, creating a graph image is not necessary and you can work directly +with the graph and container/function mapping indexes and data. + +\begin{lstlisting} +// Iterator on vertices. +mln_Viter V(g); + +// Prints each vertex and its associated value. +for_all(V) +{ + std::cout << V << " : " << my_data_fun(V) << std::endl; +} +\end{lstlisting} + +Graphes have iterators like any other site sets and also provide +specific iterators in order to iterate over graphes in a more intuitive way. + +\begin{lstlisting} +// Iterator on vertices. +mln_Viter V(g); + +// Iterator on V's edges. +mln_Eiter n(g, V); + +// Prints the graph +// List all edges for each vertex. +for_all(V) +{ + std::cout << V << " : "; + for_all(n) + std::cout << n << " "; + std::cout << std::endl; +} + +// Iterator on edges. +mln_Eiter E(g); + +// Iterator on vertices adjacent to E. +mln_Viter n(g, E); + +// Prints the graph +// List all adjacent vertices for each edge. +for_all(E) +{ + std::cout << E << " : "; + for_all(n) + std::cout << n << " "; + std::cout << std::endl; +} +\end{lstlisting} +//FIXME talk about p_vertices and p_edges. \end{document} \ No newline at end of file

1 0

r2214: * tests/core/complex_image.cc: Fix comment about complex windows.
by Roland Levillain 10 Sep '08

10 Sep '08

--- milena/ChangeLog | 4 ++++ milena/tests/core/complex_image.cc | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8138447..957f2e9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/complex_image.cc: Fix comment about complex windows. + +2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/complex_psite.hh (operator<<): Fix indentation. 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/tests/core/complex_image.cc b/milena/tests/core/complex_image.cc index b704793..7c69de6 100644 --- a/milena/tests/core/complex_image.cc +++ b/milena/tests/core/complex_image.cc @@ -232,11 +232,11 @@ int main() where M is in [0, N-1]. In that definition, P is said adjacent to an M-face Q if - if there is a sequence (M1, M2, ..., Mn) of faces so that - - M1 is an (M+1)-face adjacent to M ; - - M2 is an (M+2)-face adjacent to M1 ; + there is a sequence (M1, M2, ..., Mk) of faces so that + - M1 is an (N-1)-face adjacent to P ; + - M2 is an (N-2)-face adjacent to M1 ; - and so on; - - Mn is an (N-1)-face adjacent to N. + - Mk is an (M+1)-face adjacent to Q. - what else? -- 1.6.0.1

1 0

r2213: * mln/core/complex_psite.hh (operator<<): Fix indentation.
by Roland Levillain 10 Sep '08

10 Sep '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/complex_psite.hh | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b8a8a04..8138447 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/complex_psite.hh (operator<<): Fix indentation. + +2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/p_complex.hh: Add forward declarations for p_complex_fwd_piter_ and p_complex_bkd_piter_. diff --git a/milena/mln/core/complex_psite.hh b/milena/mln/core/complex_psite.hh index 9184627..d7ace6b 100644 --- a/milena/mln/core/complex_psite.hh +++ b/milena/mln/core/complex_psite.hh @@ -264,13 +264,16 @@ namespace mln return lhs.face() < rhs.face(); } + /*------------------. + | Pretty-printing. | + `------------------*/ 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() << ')'; + return ostr << "(dim = " << p.n() << ", id = " << p.face_id() << ')'; } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

r2212: * mln/core/p_complex.hh: Add forward declarations for p_complex_fwd_piter_ and p_complex_bkd_piter_.
by Roland Levillain 10 Sep '08

10 Sep '08

--- milena/ChangeLog | 5 +++++ milena/mln/core/p_complex.hh | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb9ab2e..b8a8a04 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/p_complex.hh: Add forward declarations for + p_complex_fwd_piter_ and p_complex_bkd_piter_. + +2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/p_complex_piter.hh: Fix Doxygen header. 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/p_complex.hh b/milena/mln/core/p_complex.hh index 57acdab..028c4f8 100644 --- a/milena/mln/core/p_complex.hh +++ b/milena/mln/core/p_complex.hh @@ -44,7 +44,12 @@ namespace mln { - // FIXME: Rename as p_faces. + // Forward declarations. + template <unsigned D, typename P> class p_complex_fwd_piter_; + template <unsigned D, typename P> class p_complex_bkd_piter_; + + + // FIXME: Rename as p_faces? /* FIXME: For compatibility reasons with mln::Point_Set, a point type \P is attached to this complex-based pset (but it is not -- 1.5.6.5

1 0

r2211: * mln/core/p_complex_piter.hh: Fix Doxygen header.
by Roland Levillain 10 Sep '08

10 Sep '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/p_complex_piter.hh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1778c8e..fb9ab2e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/p_complex_piter.hh: Fix Doxygen header. + +2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + Add forward and backward iterators on complexes. * mln/core/complex_iter.hh: New diff --git a/milena/mln/core/p_complex_piter.hh b/milena/mln/core/p_complex_piter.hh index 467f352..98efc11 100644 --- a/milena/mln/core/p_complex_piter.hh +++ b/milena/mln/core/p_complex_piter.hh @@ -28,16 +28,16 @@ #ifndef MLN_CORE_P_COMPLEX_PITER_HH # define MLN_CORE_P_COMPLEX_PITER_HH +/// \file mln/core/p_complex_piter.hh +/// \brief Definition of point iterator on complex-based pset. + # include <limits> # include <mln/core/internal/point_iterator_base.hh> # include <mln/core/p_complex.hh> # include <mln/core/complex_psite.hh> -/// \file mln/core/p_complex_piter.hh -/// \brief Definition of point iterator on complex-based pset. - -// Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P> +// Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P>. namespace mln { -- 1.5.6.5

1 0

r2210: Add forward and backward iterators on complexes.
by Roland Levillain 10 Sep '08

10 Sep '08

* mln/core/complex_iter.hh: New * mln/core/complex.hh: Add forward declarations for class complex_fwd_iter_ and class complex_bkd_iter_. (mln::complex<D>::fwd_citer, mln::complex<D>::bkd_citer): New typedefs. * mln/core/macros.hh (mln_citer, mln_citer_) (mln_bkd_citer, mln_bkd_citer_, mln_fwd_citer, mln_fwd_citer_): New shortcut macros. * tests/core/complex.cc: Exercise iterators on complexes. --- milena/ChangeLog | 14 ++ milena/mln/core/complex.hh | 11 +- milena/mln/core/complex_iter.hh | 449 +++++++++++++++++++++++++++++++++++++++ milena/mln/core/macros.hh | 18 ++ milena/tests/core/complex.cc | 24 ++ 5 files changed, 515 insertions(+), 1 deletions(-) create mode 100644 milena/mln/core/complex_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 65eba6d..1778c8e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,17 @@ +2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Add forward and backward iterators on complexes. + + * mln/core/complex_iter.hh: New + * mln/core/complex.hh: Add forward declarations for class + complex_fwd_iter_ and class complex_bkd_iter_. + (mln::complex<D>::fwd_citer, mln::complex<D>::bkd_citer): + New typedefs. + * mln/core/macros.hh (mln_citer, mln_citer_) + (mln_bkd_citer, mln_bkd_citer_, mln_fwd_citer, mln_fwd_citer_): + New shortcut macros. + * tests/core/complex.cc: Exercise iterators on complexes. + 2008-09-05 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Minor fix : Translation Rotation. diff --git a/milena/mln/core/complex.hh b/milena/mln/core/complex.hh index 6715acd..c0c1b80 100644 --- a/milena/mln/core/complex.hh +++ b/milena/mln/core/complex.hh @@ -45,16 +45,20 @@ # include <mln/core/face.hh> +# include <mln/core/complex_iter.hh> + namespace mln { - // Forward declaration. + // Forward declarations. namespace internal { template <unsigned N, unsigned D> struct faces_set_mixin; } + template <unsigned D> class complex_fwd_iter_; + template <unsigned D> class complex_bkd_iter_; /*----------. @@ -66,6 +70,11 @@ namespace mln class complex : private internal::faces_set_mixin<D, D> { public: + /// Forward mln::Iterator associated type. + typedef complex_fwd_iter_<D> fwd_citer; + /// Backward mln::Iterator associated type. + typedef complex_bkd_iter_<D> bkd_citer; + /// Complex construction. /// \{ /// \brief Add a 0-face to the complex. diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh new file mode 100644 index 0000000..f2701e3 --- /dev/null +++ b/milena/mln/core/complex_iter.hh @@ -0,0 +1,449 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_COMPLEX_ITER_HH +# define MLN_CORE_COMPLEX_ITER_HH + +/// \file mln/core/complex_iter.hh +/// \brief Definition of forward and backward iterators on complexes. + + +# include <limits> + +# include <mln/core/concept/iterator.hh> +# include <mln/core/complex.hh> + + +// Factor complex_fwd_iter_<D> and complex_bkd_iter_<D>? + +namespace mln +{ + + // Fwd decls. + template <unsigned D> class complex; + + + /*-----------------------. + | complex_fwd_iter_<D>. | + `-----------------------*/ + + /// \brief Forward iterator on all the faces of mln::complex<D>. + template <unsigned D> + class complex_fwd_iter_ : public Iterator< complex_fwd_iter_<D> > + { + typedef complex_fwd_iter_<D> self_; + + public: + typedef any_face_handle<D> face; + + /// Construction and assignment. + /// \{ + /* FIXME: Keep this non-const? See a (big) comment about this in + milena/tests/complex_image.cc. */ + complex_fwd_iter_(complex<D>& c); + complex_fwd_iter_(const self_& rhs); + self_& operator= (const self_& rhs); + /// \} + + /// Manipulation. + /// \{ + /// Test if the iterator is valid. + bool is_valid() const; + /// Invalidate the iterator. + void invalidate(); + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + /// \} + + /// Conversion and accessors. + /// \{ + /// Reference to the corresponding any-face handle. + const face& to_face () const; + /// Convert the iterator into an any-face handle. + operator face() const; + /// \} + + private: + /// The face handle this iterator is pointing to. + face face_; + + /// \brief An invalid value for both the dimension and the id of + /// the face. + /// + /// Use a function instead of a static constant, since `static' + /// variables needs to be compiled once, which requires a compiled + /// library to avoid duplicate symbols, which is something that + /// was not really planned in Milena. A function tagged `inlined' + /// can appear multiple times in a program, and solves this + /// problem. We rely on the compiler to inline this call. + /// + /// Of course, we could have used UINT_MAX, but it is not very + /// C++. + unsigned invalid_unsigned_() const; + }; + + + /* 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> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_fwd_iter_<D>& p); + + + /*-----------------------. + | complex_bkd_iter_<D>. | + `-----------------------*/ + + /// \brief Backward iterator on all the faces of mln::complex<D>. + template <unsigned D> + class complex_bkd_iter_ : public Iterator< complex_bkd_iter_<D> > + { + typedef complex_bkd_iter_<D> self_; + + public: + typedef any_face_handle<D> face; + + /// Construction and assignment. + /// \{ + /* FIXME: Keep this non-const? See a (big) comment about this in + milena/tests/complex_image.cc. */ + complex_bkd_iter_(complex<D>& c); + complex_bkd_iter_(const self_& rhs); + self_& operator= (const self_& rhs); + /// \} + + /// Manipulation. + /// \{ + /// Test if the iterator is valid. + bool is_valid() const; + /// Invalidate the iterator. + void invalidate(); + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + /// \} + + /// Conversion and accessors. + /// \{ + /// Reference to the corresponding any-face handle. + const face& to_face () const; + /// Convert the iterator into an any-face handle. + operator face() const; + /// \} + + private: + /// The face handle this iterator is pointing to. + face face_; + + /// \brief An invalid value for both the dimension and the id of + /// the face. + /// + /// Use a function instead of a static constant, since `static' + /// variables needs to be compiled once, which requires a compiled + /// library to avoid duplicate symbols, which is something that + /// was not really planned in Milena. A function tagged `inlined' + /// can appear multiple times in a program, and solves this + /// problem. We rely on the compiler to inline this call. + /// + /// Of course, we could have used UINT_MAX, but it is not very + /// C++. + unsigned invalid_unsigned_() const; + }; + + + /* 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> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_bkd_iter_<D>& p); + + + +# ifndef MLN_INCLUDE_ONLY + + /*-----------------------. + | complex_fwd_iter_<D>. | + `-----------------------*/ + + template <unsigned D> + inline + complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline + complex_fwd_iter_<D>::complex_fwd_iter_(const complex_fwd_iter_<D>& rhs) + : face_(rhs.face_) + { + } + + template <unsigned D> + inline + complex_fwd_iter_<D>& + complex_fwd_iter_<D>::operator=(const complex_fwd_iter_<D>& rhs) + { + if (&rhs == this) + return *this; + face_ = rhs.face_; + return *this; + } + + template <unsigned D> + inline + bool + complex_fwd_iter_<D>::is_valid() const + { + return face_.is_valid(); + } + + template <unsigned D> + inline + void + complex_fwd_iter_<D>::invalidate() + { + face_.set_n(invalid_unsigned_()); + face_.set_face_id(invalid_unsigned_()); + } + + template <unsigned D> + inline + void + complex_fwd_iter_<D>::start() + { + face_.set_n(0u); + face_.set_face_id(0u); + } + + template <unsigned D> + inline + void + complex_fwd_iter_<D>::next_() + { + if (is_valid()) + { + unsigned n = face_.n(); + unsigned face_id = face_.face_id(); + + if (face_id + 1 < face_.cplx().nfaces(n)) + /* FIXME: Provide accessor any_face_handle::n() returning + a mutable reference? This way, we could just write + + ++face_.face_id(); + + instead of the following. */ + face_.set_face_id(face_id + 1); + else + // Start to iterate on the faces of the next dimension if + // possible. + if (n <= D) + { + // FIXME: Same remark as above. + face_.set_n(n + 1); + face_.set_face_id(0u); + } + else + invalidate(); + } + } + + template <unsigned D> + inline + const any_face_handle<D>& + complex_fwd_iter_<D>::to_face() const + { + return face_; + } + + template <unsigned D> + inline + complex_fwd_iter_<D>::operator any_face_handle<D>() const + { + mln_precondition(is_valid()); + return face_; + } + + template <unsigned D> + unsigned + complex_fwd_iter_<D>::invalid_unsigned_() const + { + return std::numeric_limits<unsigned>::max(); + } + + + template <unsigned D> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_fwd_iter_<D>& p) + { + return ostr << "(dim = " << p.to_face().n() + << ", id = " << p.to_face().face_id() << ')'; + } + + + /*-----------------------. + | complex_bkd_iter_<D>. | + `-----------------------*/ + + template <unsigned D> + inline + complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline + complex_bkd_iter_<D>::complex_bkd_iter_(const complex_bkd_iter_<D>& rhs) + : face_(rhs.face_) + { + } + + template <unsigned D> + inline + complex_bkd_iter_<D>& + complex_bkd_iter_<D>::operator=(const complex_bkd_iter_<D>& rhs) + { + if (&rhs == this) + return *this; + face_ = rhs.face_; + return *this; + } + + template <unsigned D> + inline + bool + complex_bkd_iter_<D>::is_valid() const + { + return face_.is_valid(); + } + + template <unsigned D> + inline + void + complex_bkd_iter_<D>::invalidate() + { + face_.set_n(invalid_unsigned_()); + face_.set_face_id(invalid_unsigned_()); + } + + template <unsigned D> + inline + void + complex_bkd_iter_<D>::start() + { + face_.set_n(D); + face_.set_face_id(face_.cplx().template nfaces<D>() - 1); + } + + template <unsigned D> + inline + void + complex_bkd_iter_<D>::next_() + { + if (is_valid()) + { + unsigned n = face_.n(); + unsigned face_id = face_.face_id(); + + if (face_id > 0) + /* FIXME: Provide accessor any_face_handle::n() returning + a mutable reference? This way, we could just write + + ++face_.face_id(); + + instead of the following. */ + face_.set_face_id(face_id - 1); + else + // Start to iterate on the faces of the previous dimension + // if it exists. + if (n > 0) + { + // FIXME: Same remark as above. + face_.set_n(n - 1); + face_.set_face_id(face_.cplx().nfaces(n - 1) - 1); + } + else + invalidate(); + } + } + + template <unsigned D> + inline + const any_face_handle<D>& + complex_bkd_iter_<D>::to_face() const + { + return face_; + } + + template <unsigned D> + inline + complex_bkd_iter_<D>::operator any_face_handle<D>() const + { + mln_precondition(is_valid()); + return face_; + } + + template <unsigned D> + unsigned + complex_bkd_iter_<D>::invalid_unsigned_() const + { + return std::numeric_limits<unsigned>::max(); + } + + + template <unsigned D> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_bkd_iter_<D>& p) + { + return ostr << "(dim = " << p.to_face().n() + << ", id = " << p.to_face().face_id() << ')'; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_CORE_COMPLEX_ITER_HH diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 705509f..a7376ca 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -45,6 +45,12 @@ // b +/// Shortcuts to access the bkd_citer type associated to T. +/// \{ +# define mln_bkd_citer(T) typename T::bkd_citer +# define mln_bkd_citer_(T) T::bkd_citer +/// \} + /// Shortcuts to access the bkd_niter type associated to T. /// \{ # define mln_bkd_niter(T) typename T::bkd_niter @@ -78,6 +84,12 @@ // c +/// Shortcuts to access the citer type associated to T. +/// \{ +# define mln_citer(T) typename T::fwd_citer +# define mln_citer_(T) T::fwd_citer +/// \} + /// Shortcuts to access the coord type associated to T. /// \{ # define mln_coord(T) typename T::coord @@ -111,6 +123,12 @@ // f +/// Shortcuts to access the fwd_citer type associated to T. +/// \{ +# define mln_fwd_citer(T) typename T::fwd_citer +# define mln_fwd_citer_(T) T::fwd_citer +/// \} + /// Shortcuts to access the fwd_niter type associated to T. /// \{ # define mln_fwd_niter(T) typename T::fwd_niter diff --git a/milena/tests/core/complex.cc b/milena/tests/core/complex.cc index ad3f991..1bacd6e 100644 --- a/milena/tests/core/complex.cc +++ b/milena/tests/core/complex.cc @@ -109,4 +109,28 @@ int main() const face<1, D>& face2 = af.to_face<1>(); mln_assertion(&face1 == &face2); + + + /*------------. + | Iteration. | + `------------*/ + + // Iterators on a complex (not complex_image), or more precisely on + // the faces of a complex. + + mln_fwd_citer_(complex<D>) ff(c); + for_all(ff) + std::cout << ff << std::endl; + + std::cout << std::endl; + + mln_bkd_citer_(complex<D>) bf(c); + for_all(bf) + std::cout << bf << std::endl; + + /* FIXME: Exercice more iterators (see + milena/tests/core/complex_image.cc) and ticket #162 + (https://trac.lrde.org/olena/ticket/162) */ + // ... + } -- 1.5.6.5

1 1

cleanup-2008 2209: Parametrize histo::data by value types, Repair image1d.
by Nicolas Ballas 10 Sep '08

10 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Parametrize histo::data by value types, Repair image1d. * tests/core/other/pixter1d.cc, * tests/core/image/image1d.cc: Replace npoints method by nsites. * mln/histo/compute.spe.hh, * mln/histo/compute.hh, * tests/histo/compute.cc, * tests/histo/to_image1d.cc: Change the histo::data parameter * mln/histo/data.hh: Update data parameter. * mln/core/site_set/p_line_graph_piter.hh: Fix compile errors. * mln/core/image/image1d.hh: Repair image1d. * mln/core/image/image3d.hh: Fix compile errors. * mln/core/internal/check/image_fastest.hh: . * mln/core/alias/dpoint1d.hh, * mln/core/alias/dpoint3d.hh: Fix the dpoints coordinates type. * mln/core/alias/point1d.hh, * mln/core/alias/point3d.hh: Add specialization for subject_impl. * mln/core/alias/point2d.hh: delete trailing whitespaces. * mln/pw/image.hh, * mln/value/stack.hh: Remove the values method. * mln/convert/to_image.hh, * mln/morpho/erosion.hh: Adapt to the histo::data changes. mln/convert/to_image.hh | 6 - mln/core/alias/dpoint1d.hh | 3 mln/core/alias/dpoint3d.hh | 4 mln/core/alias/point1d.hh | 95 ++++++++++++++++++ mln/core/alias/point3d.hh | 157 ++++++++++++++++++++++++++++++- mln/core/image/image1d.hh | 75 +++++++------- mln/core/image/image3d.hh | 26 +++-- mln/core/internal/check/image_fastest.hh | 2 mln/core/site_set/p_line_graph_piter.hh | 8 - mln/histo/compute.hh | 12 +- mln/histo/compute.spe.hh | 10 - mln/histo/data.hh | 62 ++++++------ mln/pw/image.hh | 15 -- mln/value/stack.hh | 14 -- tests/core/image/image1d.cc | 6 - tests/core/other/pixter1d.cc | 4 tests/histo/compute.cc | 6 - tests/histo/to_image1d.cc | 4 18 files changed, 369 insertions(+), 140 deletions(-) Index: tests/histo/compute.cc --- tests/histo/compute.cc (revision 2208) +++ tests/histo/compute.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -68,7 +68,7 @@ debug::iota(ima); ima.at(0,0) = 2; - histo::data< value::set<int_u8> > h = histo::compute(ima); + histo::data<int_u8> h = histo::compute(ima); std::ostringstream oss; oss << h; mln_assertion(oss.str() == "2:2 3:1 4:1 5:1 6:1 7:1 8:1 9:1 "); @@ -84,7 +84,7 @@ image2d<int_s5> ima(3, 3); debug::iota(ima); - histo::data< value::set<int_s5> > h = histo::compute(ima); + histo::data<int_s5> h = histo::compute(ima); mln_assertion(h.vset().nvalues() == 31); for (unsigned i = 0; i <= 15; ++i) // values from -15 to 0 Index: tests/histo/to_image1d.cc --- tests/histo/to_image1d.cc (revision 2208) +++ tests/histo/to_image1d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -68,7 +68,7 @@ debug::iota(ima); ima(make::point2d(0,1)) = 255; debug::println(ima); - histo::data< value::set<int_u8> > h = histo::compute(ima); + histo::data<int_u8> h = histo::compute(ima); std::cout << h << std::endl; image1d<std::size_t> ima2 = convert::to_image(h); Index: tests/core/other/pixter1d.cc --- tests/core/other/pixter1d.cc (revision 2208) +++ tests/core/other/pixter1d.cc (working copy) @@ -64,7 +64,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } { @@ -80,7 +80,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } } } Index: tests/core/image/image1d.cc --- tests/core/image/image1d.cc (revision 2208) +++ tests/core/image/image1d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,6 +43,6 @@ image1d<int> f(ninds, border); - mln_assertion(f.npoints() == ninds); - mln_assertion(f.ncells() == (ninds + 2 * border)); + mln_assertion(f.nsites() == ninds); + mln_assertion(f.nelements() == (ninds + 2 * border)); } Index: mln/histo/compute.spe.hh --- mln/histo/compute.spe.hh (revision 2208) +++ mln/histo/compute.spe.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -52,12 +52,12 @@ namespace generic { template <typename I> - data<mln_vset(I)> compute_(const I& input); + data<mln_value(I)> compute_(const I& input); } template <typename I> inline - data<mln_vset(I)> + data<mln_value(I)> compute_(trait::image::speed::any, const I& input) { return generic::compute_(input); @@ -65,10 +65,10 @@ template <typename I> inline - data<mln_vset(I)> + data<mln_value(I)> compute_(trait::image::speed::fastest, const I& input) { - data<mln_vset(I)> h(input.values()); + data<mln_value(I)> h; mln_pixter(const I) p(input); for_all(p) ++h(p.val()); Index: mln/histo/data.hh --- mln/histo/data.hh (revision 2208) +++ mln/histo/data.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -36,7 +36,7 @@ # include <vector> # include <algorithm> -# include <mln/core/concept/value_set.hh> +# include <mln/value/set.hh> namespace mln @@ -46,101 +46,101 @@ { - /*! Generic histogram class over a value set with type \c S. + /*! Generic histogram class over a value set with type \c T. */ - template <typename S> + template <typename T> struct data { - typedef mln_value(S) value; + typedef T value; - data(const Value_Set<S>& s); + data(); void clear(); - std::size_t operator()(const value& v) const; - std::size_t& operator()(const value& v); + std::size_t operator()(const T& v) const; + std::size_t& operator()(const T& v); const std::vector<std::size_t>& vect() const; - const S& vset() const; + const mln::value::set<T>& vset() const; std::size_t operator[](unsigned i) const; protected: - const S& s_; + const mln::value::set<T>& s_; std::vector<std::size_t> h_; }; - template <typename S> - std::ostream& operator<<(std::ostream& ostr, const data<S>& h); + template <typename T> + std::ostream& operator<<(std::ostream& ostr, const data<T>& h); # ifndef MLN_INCLUDE_ONLY - template <typename S> + template <typename T> inline - data<S>::data(const Value_Set<S>& s) - : s_(exact(s)), + data<T>::data() + : s_(mln::value::set<T>::the()), h_(s_.nvalues(), 0) { clear(); } - template <typename S> + template <typename T> inline void - data<S>::clear() + data<T>::clear() { std::fill(h_.begin(), h_.end(), 0); } - template <typename S> + template <typename T> inline std::size_t - data<S>::operator()(const value& v) const + data<T>::operator()(const T& v) const { return h_[s_.index_of(v)]; } - template <typename S> + template <typename T> inline std::size_t& - data<S>::operator()(const value& v) + data<T>::operator()(const T& v) { return h_[s_.index_of(v)]; } - template <typename S> + template <typename T> inline - const S& - data<S>::vset() const + const mln::value::set<T>& + data<T>::vset() const { return s_; } - template <typename S> + template <typename T> inline std::size_t - data<S>::operator[](unsigned i) const + data<T>::operator[](unsigned i) const { mln_precondition(i < s_.nvalues()); return h_[i]; } - template <typename S> + template <typename T> inline const std::vector<std::size_t>& - data<S>::vect() const + data<T>::vect() const { return h_; } - template <typename S> + template <typename T> inline - std::ostream& operator<<(std::ostream& ostr, const data<S>& h) + std::ostream& operator<<(std::ostream& ostr, const data<T>& h) { - mln_viter(S) v(h.vset()); + mln_viter(mln::value::set<T>) v(h.vset()); for_all(v) if (h(v) != 0) ostr << v << ':' << h(v) << ' '; Index: mln/histo/compute.hh --- mln/histo/compute.hh (revision 2208) +++ mln/histo/compute.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -49,7 +49,7 @@ /// Compute the histogram of image \p input. template <typename I> - data<mln_vset(I)> compute(const Image& input); + data<mln_value(I)> compute(const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -62,9 +62,9 @@ template <typename I> inline - data<mln_vset(I)> compute_(const I& input) + data<mln_value(I)> compute_(const I& input) { - data<mln_vset(I)> h(input.values()); + data<mln_value(I)> h; mln_piter(I) p(input.domain()); for_all(p) ++h(input(p)); @@ -78,13 +78,13 @@ template <typename I> inline - data<mln_vset(I)> compute(const Image& input) + data<mln_value(I)> compute(const Image& input) { trace::entering("histo::compute"); mlc_equal(mln_trait_image_quant(I), mln::trait::image::quant::low)::check(); mln_precondition(exact(input).has_data()); - data<mln_vset(I)> h = impl::compute_(mln_trait_image_speed(I)(), + data<mln_value(I)> h = impl::compute_(mln_trait_image_speed(I)(), exact(input)); trace::exiting("histo::compute"); Index: mln/core/site_set/p_line_graph_piter.hh --- mln/core/site_set/p_line_graph_piter.hh (revision 2208) +++ mln/core/site_set/p_line_graph_piter.hh (working copy) @@ -49,10 +49,10 @@ /// \brief Forward iterator on point sites of a mln::p_line_graph. template <typename P> class p_line_graph_fwd_piter_ - : public internal::site_iterator_base_< P, p_line_graph_fwd_piter_ > + : public internal::site_iterator_base< P, p_line_graph_fwd_piter_ > { typedef p_line_graph_fwd_piter_ self_; - typedef internal::site_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base< P, self_ > super_; public: // Make definitions from super class available. @@ -129,10 +129,10 @@ /// \brief Backward iterator on point sites of a mln::p_line_graph. template <typename P> class p_line_graph_bkd_piter_ - : public internal::site_iterator_base_< P, p_line_graph_bkd_piter_ > + : public internal::site_iterator_base< P, p_line_graph_bkd_piter_ > { typedef p_line_graph_bkd_piter_ self_; - typedef internal::site_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2208) +++ mln/core/image/image1d.hh (working copy) @@ -169,9 +169,6 @@ /// Give the border thickness. unsigned border() const; - /// Give the number of cells (points including border ones). - std::size_t ncells() const; - /// Read-only access to the image value located at point \p p. const T& operator()(const point1d& p) const; @@ -179,16 +176,10 @@ T& operator()(const point1d& p); /// Read-only access to the image value located at offset \p o. - const T& operator[](unsigned o) const; + const T& operator[](unsigned i) const; /// Read-write access to the image value located at offset \p o. - T& operator[](unsigned o); - - /// Read-only access to the image value located at (\p ind). - const T& at(int ind) const; - - /// Read-write access to the image value located at (\p ind). - T& at(int ind); + T& operator[](unsigned i); /// Fast Image method @@ -197,10 +188,10 @@ using super_::index_of_point; /// Give the offset corresponding to the delta-point \p dp. - int offset(const dpoint1d& dp) const; + int delta_index(const dpoint1d& dp) const; /// Give the point corresponding to the offset \p o. - point1d point_at_offset(unsigned o) const; + point1d point_at_index(unsigned i) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -208,6 +199,16 @@ /// Give a hook to the value buffer. T* buffer(); + /// Read-only access to the image value located at (\p ind). + const T& element(unsigned ind) const; + + /// Read-write access to the image value located at (\p ind). + T& element(unsigned ind); + + /// Give the number of cells (points including border ones). + std::size_t nelements() const; + + /// Resize image border with new_border. void resize_(unsigned new_border); @@ -358,7 +359,7 @@ image1d<T>::domain() const { mln_precondition(this->has_data()); - return this->data->b_; + return this->data_->b_; } template <typename T> @@ -367,7 +368,7 @@ image1d<T>::bbox() const { mln_precondition(this->has_data()); - return this->data->b_; + return this->data_->b_; } template <typename T> @@ -376,16 +377,16 @@ image1d<T>::border() const { mln_precondition(this->has_data()); - return this->data->bdr_; + return this->data_->bdr_; } template <typename T> inline std::size_t - image1d<T>::ncells() const + image1d<T>::nelements() const { mln_precondition(this->has_data()); - return this->data->vb_.npoints(); + return this->data_->vb_.nsites(); } template <typename T> @@ -394,7 +395,7 @@ image1d<T>::has(const point1d& p) const { mln_precondition(this->has_data()); - return this->data->vb_.has(p); + return this->data_->vb_.has(p); } template <typename T> @@ -403,7 +404,7 @@ image1d<T>::operator()(const point1d& p) const { mln_precondition(this->has(p)); - return this->data->array_[p.ind()]; + return this->data_->array_[p.ind()]; } template <typename T> @@ -412,7 +413,7 @@ image1d<T>::operator()(const point1d& p) { mln_precondition(this->has(p)); - return this->data->array_[p.ind()]; + return this->data_->array_[p.ind()]; } template <typename T> @@ -420,8 +421,8 @@ const T& image1d<T>::operator[](unsigned o) const { - mln_precondition(o < ncells()); - return *(this->data->buffer_ + o); + mln_precondition(o < nelements()); + return *(this->data_->buffer_ + o); } template <typename T> @@ -429,26 +430,26 @@ T& image1d<T>::operator[](unsigned o) { - mln_precondition(o < ncells()); - return *(this->data->buffer_ + o); + mln_precondition(o < nelements()); + return *(this->data_->buffer_ + o); } template <typename T> inline const T& - image1d<T>::at(int ind) const + image1d<T>::element(unsigned ind) const { mln_precondition(this->has(make::point1d(ind))); - return this->data->array_[ind]; + return this->data_->array_[ind]; } template <typename T> inline T& - image1d<T>::at(int ind) + image1d<T>::element(unsigned ind) { mln_precondition(this->has(make::point1d(ind))); - return this->data->array_[ind]; + return this->data_->array_[ind]; } template <typename T> @@ -457,7 +458,7 @@ image1d<T>::buffer() const { mln_precondition(this->has_data()); - return this->data->buffer_; + return this->data_->buffer_; } template <typename T> @@ -466,13 +467,13 @@ image1d<T>::buffer() { mln_precondition(this->has_data()); - return this->data->buffer_; + return this->data_->buffer_; } template <typename T> inline int - image1d<T>::offset(const dpoint1d& dp) const + image1d<T>::delta_index(const dpoint1d& dp) const { mln_precondition(this->has_data()); int o = dp[0]; @@ -482,11 +483,11 @@ template <typename T> inline point1d - image1d<T>::point_at_offset(unsigned o) const + image1d<T>::point_at_index(unsigned i) const { - mln_precondition(o < ncells()); - point1d p = make::point1d(o + this->data->vb_.min_ind()); - mln_postcondition(& this->operator()(p) == this->data->buffer_ + o); + mln_precondition(i < nelements()); + point1d p = make::point1d(i + this->data_->vb_.min_ind()); + mln_postcondition(& this->operator()(p) == this->data_->buffer_ + i); return p; } @@ -495,7 +496,7 @@ void image1d<T>::resize_(unsigned new_border) { - this->data->reallocate_(new_border); + this->data_->reallocate_(new_border); } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2208) +++ mln/core/image/image3d.hh (working copy) @@ -89,17 +89,25 @@ template <typename T> struct image_< image3d<T> > : default_image_< T, image3d<T> > { + // misc typedef trait::image::category::primary category; - - typedef trait::image::access::random access; - typedef trait::image::space::three_d space; + typedef trait::image::speed::fastest speed; typedef trait::image::size::regular size; - typedef trait::image::support::aligned support; - typedef trait::image::border::stored border; - typedef trait::image::data::raw data; - typedef trait::image::io::read_write io; - typedef trait::image::speed::fastest speed; + // value + typedef trait::image::value_access::direct value_access; + typedef trait::image::value_storage::one_block value_storage; + typedef trait::image::value_browsing::site_wise_only value_browsing; + typedef trait::image::value_io::read_write value_io; + + // site / domain + typedef trait::image::localization::basic_grid localization; + typedef trait::image::dimension::three_d dimension; + + // extended domain + typedef trait::image::ext_domain::extendable ext_domain; + typedef trait::image::ext_value::multiple ext_value; + typedef trait::image::ext_io::read_write ext_io; }; } // end of namespace mln::trait @@ -127,7 +135,7 @@ /// Super type - typedef internal::image_primary< box3d, image3d<T> > super_; + typedef internal::image_primary< T, box3d, image3d<T> > super_; /// Value associated type. typedef T value; Index: mln/core/internal/check/image_fastest.hh --- mln/core/internal/check/image_fastest.hh (revision 2208) +++ mln/core/internal/check/image_fastest.hh (working copy) @@ -38,7 +38,6 @@ # include <mln/core/internal/force_exact.hh> - namespace mln { @@ -90,6 +89,7 @@ typedef mln_psite(E) psite; typedef mln_delta(psite) dpsite; + typedef mln_fwd_pixter(E) fwd_pixter; typedef mln_bkd_pixter(E) bkd_pixter; Index: mln/core/alias/dpoint1d.hh --- mln/core/alias/dpoint1d.hh (revision 2208) +++ mln/core/alias/dpoint1d.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/dpoint.hh> # include <mln/core/grids.hh> +# include <mln/core/def/coord.hh> namespace mln @@ -44,7 +45,7 @@ /*! \brief Type alias for a delta-point defined on the 1D square * grid with integer coordinates. */ - typedef dpoint<mln::grid::tick, int> dpoint1d; + typedef dpoint<mln::grid::tick, def::coord> dpoint1d; } // end of namespace mln Index: mln/core/alias/dpoint3d.hh --- mln/core/alias/dpoint3d.hh (revision 2208) +++ mln/core/alias/dpoint3d.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/core/dpoint.hh> # include <mln/core/grids.hh> - +# include <mln/core/def/coord.hh> namespace mln { @@ -44,7 +44,7 @@ /*! \brief Type alias for a delta-point defined on the 3D square * grid with integer coordinates. */ - typedef dpoint<mln::grid::cube, int> dpoint3d; + typedef dpoint<mln::grid::cube, def::coord> dpoint3d; } // end of namespace mln Index: mln/core/alias/point1d.hh --- mln/core/alias/point1d.hh (revision 2208) +++ mln/core/alias/point1d.hh (working copy) @@ -35,7 +35,9 @@ */ # include <mln/core/point.hh> - +// For site_const_impl and site_mutable_impl. +# include <mln/core/concept/site_proxy.hh> +# include <mln/core/internal/force_exact.hh> namespace mln { @@ -45,6 +47,97 @@ */ typedef point<grid::tick, def::coord> point1d; + namespace internal + { + + // Specialization. + + template <typename C, typename E> + struct subject_impl< const point<grid::tick, C>, E > + { + typedef C coord; + enum { dim = 1 }; + + typedef const C& row_t; + const C& row() const; + + const C& operator[](unsigned i) const; + const C& last_coord() const; + private: + const E& exact_() const; + }; + + + // Specialization for point<M,C>. + + template <typename C, typename E> + struct subject_impl< point<grid::tick, C>, E > : + subject_impl< const point<grid::tick, C>, E > + { + private: + typedef subject_impl< const point<grid::tick, C>, E > super_; + E& exact_(); + public: + using super_::row; + C& row(); + using super_::operator[]; + C& operator[](unsigned i); + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // subject_impl + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::tick, C>, E >::row() const + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::tick, C>, E >::operator[](unsigned i) const + { + mln_precondition(i < 1); + return exact_().get_subject()[i]; + } + + template <typename C, typename E> + inline + const E& + subject_impl< const point<grid::tick, C>, E >::exact_() const + { + return internal::force_exact<const E>(*this); + } + + // subject_impl + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::tick, C>, E >::row() + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::tick, C>, E >::operator[](unsigned i) + { + mln_precondition(i < 2); + return exact_().get_subject()[i]; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + } // end of namespace mln Index: mln/core/alias/point2d.hh Index: mln/core/alias/point3d.hh --- mln/core/alias/point3d.hh (revision 2208) +++ mln/core/alias/point3d.hh (working copy) @@ -35,7 +35,9 @@ */ # include <mln/core/point.hh> - +// For site_const_impl and site_mutable_impl: +# include <mln/core/concept/site_proxy.hh> +# include <mln/core/internal/force_exact.hh> namespace mln { @@ -45,6 +47,159 @@ */ typedef point<grid::cube, def::coord> point3d; + namespace internal + { + + // Specialization. + + template <typename C, typename E> + struct subject_impl< const point<grid::cube, C>, E > + { + typedef C coord; + enum { dim = 3 }; + + typedef const C& row_t; + const C& row() const; + + typedef const C& col_t; + const C& col() const; + + typedef const C& sli_t; + const C& sli() const; + + const C& operator[](unsigned i) const; + const C& last_coord() const; + private: + const E& exact_() const; + }; + + + // Specialization for point<M,C>. + + template <typename C, typename E> + struct subject_impl< point<grid::cube, C>, E > : + subject_impl< const point<grid::cube, C>, E > + { + private: + typedef subject_impl< const point<grid::cube, C>, E > super_; + E& exact_(); + public: + + using super_::row; + C& row(); + + using super_::col; + C& col(); + + using super_::sli; + C& sli(); + + using super_::operator[]; + C& operator[](unsigned i); + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // subject_impl + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::row() const + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::col() const + { + return exact_().get_subject().col(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::sli() const + { + return exact_().get_subject().sli(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::operator[](unsigned i) const + { + mln_precondition(i < 3); + return exact_().get_subject()[i]; + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::last_coord() const + { + return this->col(); + } + + template <typename C, typename E> + inline + const E& + subject_impl< const point<grid::cube, C>, E >::exact_() const + { + return internal::force_exact<const E>(*this); + } + + // subject_impl + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::row() + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::col() + { + return exact_().get_subject().col(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::sli() + { + return exact_().get_subject().sli(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::operator[](unsigned i) + { + mln_precondition(i < 3); + return exact_().get_subject()[i]; + } + + template <typename C, typename E> + inline + E& + subject_impl< point<grid::cube, C>, E >::exact_() + { + return internal::force_exact<E>(*this); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + } // end of namespace mln Index: mln/value/stack.hh --- mln/value/stack.hh (revision 2208) +++ mln/value/stack.hh (working copy) @@ -166,9 +166,6 @@ /// Return type of read-write access. typedef typename internal::helper_stack_image_lvalue_<n,I>::ret lvalue; - /// Value set associated type. - typedef mln::value::set<value> vset; - /// Skeleton. typedef stack_image< n, tag::image_ > skeleton; @@ -191,9 +188,6 @@ /// Read-write access of pixel value at point site \p p. lvalue operator()(const psite&); void write_(const psite& p, const value& v); - - /// Give the set of values of the image. - const vset& values() const; }; @@ -296,14 +290,6 @@ return internal::helper_stack_image_lvalue_<n,I>::make(*this, p); } - template <unsigned n, typename I> - inline - const mln::value::set< algebra::vec<n, mln_value(I)> >& - stack_image<n,I>::values() const - { - return vset::the(); - } - // stack(..) template <typename I> Index: mln/convert/to_image.hh --- mln/convert/to_image.hh (revision 2208) +++ mln/convert/to_image.hh (working copy) @@ -187,11 +187,11 @@ return ima; } - template <typename S> + template <typename T> inline - image1d<std::size_t> to_image(const histo::data<S>& h) + image1d<std::size_t> to_image(const histo::data<T>& h) { - mln_value(S) + mln_value(histo::data<T>) v_min = h.vset()[0], v_max = h.vset()[h.vset().nvalues() - 1]; image1d<std::size_t> ima(make::box1d(v_min, v_max)); Index: mln/pw/image.hh --- mln/pw/image.hh (revision 2208) +++ mln/pw/image.hh (working copy) @@ -130,10 +130,6 @@ /// Return type of read-write access. typedef void lvalue; // FIXME - /// Value set associated type. - typedef mln::value::set<mln_result(F)> vset; - - /// Constructor without argument. image(); @@ -150,9 +146,6 @@ /// Read-write access is present but disabled. void operator()(const mln_psite(S)&); - - /// Give the set of values of the image. - const vset& values() const; }; } // end of namespace mln::pw @@ -230,14 +223,6 @@ mln_invariant(0); // FIXME: Turn into a compile-time error... } - template <typename F, typename S> - inline - const mln::value::set<mln_result(F)>& - image<F,S>::values() const - { - return vset::the(); - } - } // end of namespace mln::pw # endif // ! MLN_INCLUDE_ONLY Index: mln/morpho/erosion.hh

1 0

cleanup-2008 2208: Update rotation.
by Ugo Jardonnet 10 Sep '08

10 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Update rotation. * mln/fun/x2x/rotation.hh (give_h_mat): Add function. rotation.hh | 99 ++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 70 insertions(+), 29 deletions(-) Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 2207) +++ mln/fun/x2x/rotation.hh (working copy) @@ -48,6 +48,76 @@ namespace x2x { + namespace internal + { + template < unsigned n, typename C > + algebra::h_mat<n+1, C> + get_h_mat(const float alpha_, const algebra::vec<3,C>& axis_ + { + assert(!"get_h_mat : n not implemented"); + } + + template <typename C > + algebra::h_mat<4, C> + get_h_mat(const float alpha_, const algebra::vec<3,C>& axis_) + { + algebra::h_mat<4, C> m_; + + const float cos_a = cos(alpha_); + const float sin_a = sin(alpha_); + const float u = axis_[0]; + const float v = axis_[1]; + const float w = axis_[2]; + const float u2 = u * u; + const float v2 = v * v; + const float w2 = w * w; + const float uvw2 = u2 + v2 + w2; + + m_(0,0) = (u2 + (v2 + w2) * cos_a) / uvw2; + m_(0,1) = (u*v * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; + m_(0,2) = (u*w * (1 - cos_a) + v * math::sqrt(uvw2) * sin_a) / uvw2; + m_(0,3) = 0; + + m_(1,0) = (u*v * (1 - cos_a) + w * math::sqrt(uvw2) * sin_a) / uvw2; + m_(1,1) = (v2 + (u2 + w2) * cos_a) / uvw2; + m_(1,2) = (v*w * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; + m_(1,3) = 0; + + m_(2,0) = (u*w * (1 - cos_a) - v * math::sqrt(uvw2) * sin_a) / uvw2; + m_(2,1) = (v*w * (1 - cos_a) + u * math::sqrt(uvw2) * sin_a) / uvw2; + m_(2,1) = (u2 + (u2 + v2) * cos_a) / uvw2; + m_(2,3) = 0; + + m_(2,0) = 0; + m_(2,1) = 0; + m_(2,1) = 0; + m_(2,3) = 1; + + return m_; + } + + template <typename C > + algebra::h_mat<3, C> + get_h_mat(const float alpha_, const algebra::vec<2,C>& axis_ + { + algebra::h_mat<3, C> m_; + const float cos_a = cos(alpha_); + const float sin_a = sin(alpha_); + const algebra::vec<4,float> vec + = make::vec(cos_a, -sin_a, sin_a, cos_a); + unsigned k = 0; + for (unsigned i = 0; i < 3; ++i) + for (unsigned j = 0; j < 3; ++j) + { + if (j != this->dir_ && i != this->dir_) + this->m_(i, j) = vec[k++]; + else + this->m_(i, j) = (i == j); + } + } + } + + /*! \brief Represent a rotation function. * */ @@ -159,35 +229,6 @@ rotation<n,C>::update() { assert(n == 3); // debug - const float cos_a = cos(alpha_); - const float sin_a = sin(alpha_); - const float u = axis_[0]; - const float v = axis_[1]; - const float w = axis_[2]; - const float u2 = u * u; - const float v2 = v * v; - const float w2 = w * w; - const float uvw2 = u2 + v2 + w2; - - this->m_(0,0) = (u2 + (v2 + w2) * cos_a) / uvw2; - this->m_(0,1) = (u*v * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(0,2) = (u*w * (1 - cos_a) + v * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(0,3) = 0; - - this->m_(1,0) = (u*v * (1 - cos_a) + w * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(1,1) = (v2 + (u2 + w2) * cos_a) / uvw2; - this->m_(1,2) = (v*w * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(1,3) = 0; - - this->m_(2,0) = (u*w * (1 - cos_a) - v * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(2,1) = (v*w * (1 - cos_a) + u * math::sqrt(uvw2) * sin_a) / uvw2; - this->m_(2,1) = (u2 + (u2 + v2) * cos_a) / uvw2; - this->m_(2,3) = 0; - - this->m_(2,0) = 0; - this->m_(2,1) = 0; - this->m_(2,1) = 0; - this->m_(2,3) = 1; }

1 0