- Olena-patches

cleanup-2008 r2503: Update tutorial..
by Guillaume Lazzara 03 Oct '08

03 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> Update tutorial.. * milena/doc/tutorial/tutorial.tex: - Add a new section about sites - Add new subsections about image domain and values. - Talk about operator '/' used to create sub images. --- tutorial.tex | 460 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 304 insertions(+), 156 deletions(-) Index: branches/cleanup-2008/milena/doc/tutorial/tutorial.tex =================================================================== --- branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2502) +++ branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2503) @@ -4,6 +4,7 @@ \usepackage{makeidx} \usepackage{xcolor} \usepackage{color} +\usepackage{html} \newcommand{\img}[4]{ \begin{figure}[ht!] @@ -19,37 +20,66 @@ \author{LRDE} \date{} +\definecolor{ccomment}{rgb}{0.5,0,0} +\definecolor{cstring}{rgb}{0,0.32,0.5} +\definecolor{cidentifier}{rgb}{0,0.5,0} +\definecolor{cbg}{rgb}{0.95,0.95,0.95} + %%%LISTINGS SETTINGS \lstset{frameround=fttt} \lstloadlanguages{C++} \lstset{language=C++} -\lstset{backgroundcolor=\color{black}, -basicstyle=\bfseries\color{white}, -identifierstyle=\color{green}, -stringstyle=\color{yellow}, -commentstyle=\color{red}, + +%\lstset{backgroundcolor=\color{black}, +%basicstyle=\bfseries\color{white}, +%identifierstyle=\color{green}, +%stringstyle=\color{yellow}, +%commentstyle=\color{red}, +%showstringspaces=false,linewidth=14cm} + +\lstset{backgroundcolor=\color{cbg}, +basicstyle=\bfseries\color{black}, +identifierstyle=\color{black}, +stringstyle=\color{cstring}, +commentstyle=\color{ccomment}, showstringspaces=false,linewidth=14cm} +\newenvironment{doxycode} +{% This is the begin code +\begin{latexonly}% +\begin{lstlisting}[frame=single]% +\end{latexonly}% +\begin{htmlonly}% +\backslash code% +\end{htmlonly}% +} +{% +\begin{htmlonly}% +\backslash endcode% +\end{htmlonly}% +\begin{latexonly}% +\end{lstlisting}% +\end{latexonly}% +} + + + \begin{document} \tableofcontents -ajouter dans => milena/doc/tutorial | -------------------------------------------------- - -\chapter{Foreword} +\chapter*{Foreword} -The following tutorial talks about 2D images. We chose that kind of images -because it is easier to understand and this is the -most used. \\ +The following tutorial explains the basic concepts behind Olena and how to use +the most common objects and routines. +This tutorial includes many code examples and figures. In order to make this +tutorial easier to understand, we will mainly talk about 2D images. This is +not so restrictive since 1D, 3D, $n$D images behave the same way. -FIXME -[dessin de grille 2d, colonnes/lignes numerotees + repere x/y] -Intersection <=> point 2d <=> milieu d'un pixel \\ Since examples are based on 2D images pixels are actually "points" however we -will call them "sites" which is the most generic name.\\ +will call them "sites" which is the most generic name.\newline Here is also a list of common variable name conventions: \begin{figure}[ht!] @@ -63,21 +93,53 @@ \end{tabular} \end{figure} -Methods provided by the objects in the library are in constant time. If you need -a specific method but you cannot find it, you may find an algorithm which can -compute the information you need. - Olena is organized in a namespace hierarchy. Everything is declared by Olena within the 'oln::' namespace, and possibly a sub-namespace such as 'oln::arith::' (arithmetic operations on images), 'oln::morpho::' (morphological -operations), etc. For the sake of simplicity, we will neglect the 'oln::' +operations), etc. Usually, the namespace hierarchy is mapped to the mln +directory tree. For the sake of simplicity, we will neglect the 'oln::' prefix in all the code examples. +Methods provided by objects in the library are in constant time. If you need +a specific method but you cannot find it, you may find an algorithm which can +compute the information you need. + +\clearpage +\newpage +\chapter{Site} + +Usually, when talking about images, we think about common images composed of a +set of pixels. +Since Olena is generic, we want to support many kind of images, even images +which are not composed of a set of pixels, such as images of images. + +In order to express this genericity, we have the ``site'' concept. +This concept allows us to divide a pixel into two information: +\begin{itemize} + \item The coordinates (the site itself). + \item The value. +\end{itemize} + +Let's say we have 2D grid like this: + +//FIXME +[dessin de grille 2d, colonnes/lignes numerotees + repere x/y] +Intersection == point 2d == milieu d'un pixel \\ + +On a regular grid like this, in 2D, we usually use a 2D point as a site which +means we have the following equivalence: + +\begin{center} + Intersection $\equiv$ point2d (2D site) $\equiv$ center of a pixel +\end{center} + +The site does not store any value but refer to an area where we will be able +to read its value. -\chapter{Concepts} -//FIXME lister \underline{TOUS} les concepts (core/concepts) -\section{Site set} +\clearpage +\newpage +\chapter{Site set} Site sets are used: \begin{enumerate} @@ -85,66 +147,67 @@ \item As Site container. \end{enumerate} +They do not actually store any image value. They only store site information. + Here is a list of all the site set concepts which can be found in core/site\_set: \begin{tabular}{|l|p{8cm}|} \hline -Site set & Description \\ \hline +Site set & Description \\ +\hline -p\_key & \\ \hline -p\_priority & \\ \hline -p\_box & \\ \hline -p\_bgraph & \\ \hline -p\_double & \\ \hline -p\_if & \\ \hline -p\_line\_graph & \\ \hline -p\_queue\_fast & \\ \hline -p\_set & \\ \hline -p\_faces & \\ \hline -p\_queue & \\ \hline -p\_set\_of & \\ \hline -line2d & \\ \hline -p\_complex & \\ \hline -p\_graph & \\ \hline -p\_image & \\ \hline -p\_mutable\_array\_of & \\ \hline -p\_run & \\ \hline -p\_vaccess & \\ \hline +p\_array & site array. \\ +\hline +p\_box & compact domain definde on a regular grid (in 2D, a rectangle). \\ +\hline +p\_if & site set verifying a predicate. \\ +\hline +p\_queue & site queue. \\ +\hline +p\_run & site range. \\ +\hline +p\_runs & site range set. \\ +\hline +p\_set & mathematical site set. \\ +\hline +p\_vaccess & site set ordered by value. \\ +\hline +p\_edges & set of graph edges associated to sites. \\ +\hline +p\_vertices & set of graph vertices associated to sites.\\ +\hline \end{tabular} -\subsection{Basic interface} +\section{Basic interface} Common basic interface:\\ \begin{tabular}{|l|l|l|l|p{4cm}|} \hline -Return Type & Name & Arguments & Const & Commor type automatically from the -given container type -passed as parameter. These macros can be used with any container like images or -site sets.ents \\ \hline +Return Type & Name & Arguments & Const & Comments \\ \hline bool & is\_valid & - & X & Returns true if it has been initialized. The -default constructor does not do it. \\ \hline +default constructor does not initialize it. \\ \hline bool & has & const P\& p & X & \\ \hline \end{tabular} \\ -\subsection{Optional interface} +\section{Optional interface} Site sets may have other methods depending on their type: \\ \begin{tabular}{|l|l|l|l|p{4cm}|} \hline Return Type & Name & Arguments & Const & Comments \\ \hline -size\_t & nsites & - & - & \\ \hline +size\_t & nsites & - & - & Return the number of sites. \\ \hline const Box\& & bbox & - & X & Bounding box. Available only on grid site sets. \\ \hline \end{tabular} \\ 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}). +is it's own bounding box. \begin{lstlisting}[frame=single] box2d b(2,3); @@ -164,6 +227,7 @@ P\_array and box both have a nsites method since the internal structure allow a constant time retrieval. +%\begin{doxycode} \begin{lstlisting}[frame=single] p_array<point2d> arr; @@ -175,13 +239,12 @@ // it can be retrieved in constant time. std::cout << "nsites = " << arr.nsites() << std::endl; \end{lstlisting} - - +%\end{doxycode} \clearpage \newpage -\section{Image} +\chapter{Image} An image is composed both of: \begin{itemize} @@ -196,31 +259,21 @@ \item A site set, also called the "domain". \end{itemize} -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. - -An image has a virtual border which is defined thanks to its domain. The - 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 extended domain can be defined thanks to a function, an -image or a site set. - -//FIXME: remove this line -ici, site <=> Point2d - - \section{About value, rvalue and lvalue} +Since the values are of a specific type, it exists a set of all the possible +site values. This set is called "destination" set. It may be iterable and +printable if it is finite and not too huge. + Image types provide a method to access values, namely "operator() const". Yet, its signature is NOT "value operator()(const site\& p) const" but "rvalue operator()(const psite\& p) const" For instance, with I being image2d$<$int\_u8$>$, we have : +\begin{center} I::value == int\_u8 but I::rvalue == const int\_u8\& +\end{center} so copying the value when the call "f(p)" returns is avoided. In that case, it is a low-level implementation issue that makes rvalue @@ -233,8 +286,48 @@ With I being image2d$<$int\_u8$>$, we have : +\begin{center} I::value == int\_u8 but I::lvalue == int\_u8\& +\end{center} + +\section{Domain} +The site set contains the sites which compose the image. Sites are based on a +grid so the image depends on that grid as well. +It means that an image 2D can only be defined by sites based on a 2D grid. +Likewise, an image2d will always have its bouding box defined by a box2d. + +Being defined on a grid means that the image can be defined anywhere. +For instance, defining a 2D image with a box2d starting from point (-20, -20) + to (-3, 5) is completely valid. + +The following example shows that the definition domain and the site set are +exactly equivalent. + +\begin{lstlisting}[frame=single] + box2d b(-2,3, 3,-5); // Define a box2d from (-2,3) to (3,-5). + image2d<int> ima(b); // Define the domain of the image. + + cout << b << std::endl; // Display b + + cout << ima.domain() << std::endl; // Display b too +\end{lstlisting} + + +\section{Border and extension} +// FIXME: COMPLETELY WRONG!!! +// FIXME: Tell that the user can disable the border/extension: foo(ima | ima.domain()) +An image has a virtual border which is defined thanks to its domain. The + 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 extended domain can be defined thanks to a function, an +image or a site set. +//FIXME ADD FIGURE + +\section{Morphed images} +//FIXME: Write it! +// Pas concrete, light, how to concrete \section{Sample code} In order to create a 2D image, you have two possibilites: @@ -248,32 +341,24 @@ The empty image has no data and its definition domain is still unset. We do not know yet the number of sites it contains. However, it is really useful to have such an "empty image" because it is a placeholder for the result of some -processing, or another image. - -Trying to access the site value from an empty image leads to an error at -run-time. - +processing, or another image. Trying to access the site value from an empty +image leads to an error at run-time. -\begin{lstlisting}[frame=single] - box2d b(2,3); - image2d<int> ima(b); // Define the domain of the image. - - cout << b << std::endl; // Display b - - cout << ima.domain() << std::endl; // Display b too -\end{lstlisting} +The following example illustrates how to map data to a site throughout the +image. \begin{lstlisting}[frame=single] box2d b(2,3); image2d<int> ima(b); point2d p(1, 2); - ima.at(1,2) = 9; // The value is returned by reference - // and can be changed. + // Associate '9' as value for the site/point2d (1,2). + // The value is returned by reference and can be changed. + ima.at(1,2) = 9; cout << ima(p) << std::endl; // prints 9 ima(p) = 2; // The value is returned by reference - // and can be changed. + // and can be changed as well. cout << ima(p) << std::endl; // prints 2 \end{lstlisting} @@ -287,7 +372,7 @@ std::cout << (imga.has(p) ? "true" : "false") << std::endl; \end{lstlisting} -Since the notion of point is independent from the image it applies on, we can +Since the notion of site is independent from the image it applies on, we can form expressions where p is used on several images: \begin{lstlisting}[frame=single] // At index (9, 9), both values change. @@ -298,7 +383,7 @@ \end{lstlisting} -Images do not actually store the data in the class. This is a pointer +Images do not actually store the data in the class. Images store a pointer to an allocated space which can be shared with other objects. Once an image is assigned to another one, the two images share the same data so they have the same ID and point to the same memory space. @@ -338,7 +423,7 @@ In the Olena library, all image types behave like image2d: \begin{itemize} -\item An "empty" image actually is a mathematical variable. +\item An "empty" image is actually a mathematical variable. $\rightarrow$ just think in a mathemetical way when dealing with images; @@ -357,7 +442,7 @@ -\subsection{Interface} +\section{Interface} \begin{tabular}{|l|l|l|l|p{4cm}|} \hline @@ -381,19 +466,16 @@ \end{tabular} - -\newpage -\section{Neighborhood} - - - +\clearpage \newpage -\section{Window} +\chapter{Window and Neighborhood} -\chapter{Sites and psites} +\clearpage +\newpage +\chapter{Sites, psites and dpoints} \section{Need for site} @@ -432,7 +514,7 @@ Let's have a small example. Define a function returning a value for a given point: - +\clearpage \begin{lstlisting}[frame=single] unsigned my_values(const point2d& p) { @@ -471,13 +553,10 @@ +-+-+ \end{lstlisting} -However, in memory, since it is based on a p\_array, values are stored in a +However, in memory, since it is based on a p\_array, sites are stored in a vector. -The site x is the point (3, 7). The image values are stored in a -vector where the index is the offset of the cell from the beginning of the -vector. The site x thus corresponds to the cell 1. - +The site x is the point (3, 7) which corresponds to the cell 1 in the p\_array. \begin{lstlisting}[frame=single] arr[] = 0 1 2 3 4 @@ -486,9 +565,10 @@ +-+-+-+-+-+ \end{lstlisting} -Obviously, from the site coordinates, we cannot access the associated data in -constant-time. That's why we need a different mechanism in order to access -this data: the psites. +Obviously, we cannot check in constant time whether the site x, point2d here, +is part of that image or not: knowing the point coordinates is not enough. +That's why we need a different mechanism in order to access this information: +the psites. Here we have: @@ -520,14 +600,18 @@ How it works: a psite inherits from internal::site\_impl$<$site$>$ which is specialized for every site type; for instance, internal::site\_impl$<$point2d$>$ owns the method "coord row() const" which is defined as -"return exact(this)->to\_site().row()" +"return exact(this)-$>$to\_site().row()" +\section{Need for dpoint} +//FIXME +\clearpage +\newpage \chapter{Iterators} Each container object in Olena like site sets or images have iterators. The iteration mechanism for images is directly derived from the mechanism -for site set. +for site sets. There are usually three kinds: \begin{itemize} @@ -552,7 +636,7 @@ As you may have noticed, according to the data type, the word "iter" is prefixed by the usual name variable used for that data type. Sites variables are usually -called 'p' so the proper iterator is "piter".\\ +called 'p' so the proper iterator is "piter". (See the foreword)\\ An iterator has the following interface: \\ @@ -589,19 +673,32 @@ passed as parameter. These macros can be used with any container like images or site sets. -\begin{lstlisting}[frame=single] - image2d<int> ima(box2d(2, 3)); +Here follow an example with the implemantions of the most basic routines which use the for\_all +loop: fill and paste. - mln_piter(box2d) p(ima.domain()); +\begin{lstlisting}[frame=single] +template <typename I> +void fill(I& ima, mln_value(I) v) +{ + mln_piter(I) p(ima.domain()); for_all(p) - std::cout << p << std::endl; - - mln_viter(image2d<int>) v(ima.destination()); - for_all(v) - std::cout << v << std::endl; + ima(p) = v; +} \end{lstlisting} +\begin{lstlisting}[frame=single] +template <typename I, typename J> +void paste(const I& data, J& dest) +{ + mln_piter(I) p(data.domain()); + for_all(p) + dest(p) = data(p); +} +\end{lstlisting} + +\clearpage +\newpage \chapter{Basic operations} //FIXME : illustrer @@ -620,8 +717,7 @@ \hline \end{tabular} \\ - -\section{Examples} +\section{Fill} First, create an image: \begin{lstlisting}[frame=single] image2d<char> imga(0, 0, 20, 20); @@ -645,6 +741,7 @@ strictly map their C++ name; so oln::level::fill is defined in the file "oln/level/fill.hh". +\subsection*{Note} Most algorithms in Olena are constructed following the classical scheme: "output algo(input)", where the input image is only read. However some few algorithms take an input image in order to modify it. To enforce this particular feature, @@ -652,9 +749,10 @@ modified "inplace". The algorithm call shall be "level::fill(inplace(ima), val)". When forgetting the "inplace(..)" statement it does not compile. + +\section{Paste} We then define below a second image to play with. As you can see this image has -data for the sites (5, 5) to (14, 14) (so it has 100 sites). The definition -domain of a 2D image can start from any sites, even a negative one. +data for the sites (5, 5) to (14, 14) (so it has 100 sites). \begin{lstlisting}[frame=single] image1d<char> imgb(5, 5, 14, 14); @@ -677,6 +775,7 @@ //FIXME : ajouter des zolies zimages again. +\subsection*{Note} With this simple example we can see that images defined on different domains (or set of sites) can interoperate. The set of sites of an image is defined and can be accessed and printed. The following code: @@ -701,37 +800,13 @@ (whose values are to be pasted) is a subset of the destination image. -\begin{figure}[ht!] - \begin{lstlisting}[frame=single] -template <typename I> -void fill(I& ima, mln_value(I) v) -{ - mln_piter(I) p(ima.domain()); - for_all(p) - ima(p) = v; -} - \end{lstlisting} - \caption{Implementation of the fill routine.\label{fig:fill_impl}} -\end{figure} - - -\begin{figure}[ht!] - \begin{lstlisting}[frame=single] -template <typename I, typename J> -void paste(const I& data, J& dest) -{ - mln_piter(I) p(data.domain()); - for_all(p) - dest(p) = data(p); -} - \end{lstlisting} - \caption{Implementation of the paste routine.\label{fig:paste_impl}} -\end{figure} +\section{Blobs} +//FIXME: write it! \newpage \section{Working with parts of an image} -Sometime it may be interesting to work only on some part of the image or to +Sometime it may be interesting to work only on some parts of the image or to extract only a sub set of that image. Olena enables that thoughout out the operator '$|$'. @@ -751,14 +826,14 @@ A Sub Domain can be a site set, an image or any value returned by this operator. For a given site, Function\_p2v returns a Value and Function\_p2b returns a -boolean. These functions. are actually a sort of predicate. You can easily get -of function of function\_p2v kind thanks to pw::value(Image). It returns the +boolean. These functions. are actually a sort of predicate. A common +function\_p2v is pw::value(Image). It returns the point to value function used in the given image. C functions can also be used as predicate by passing the function pointer. You can easily get a function\_p2b by comparing the value returned by a function\_p2v to another Value. -The following sample code illustrates this feature. +The following sample codes illustrate this feature. In order to use C functions as predicate, they must have one of the following prototype if you work on 2D images: @@ -773,7 +848,7 @@ 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. +With image2d$<$int$>$, V would be int. In this section, all along the examples, the image "ima" will refer to the following declaration: @@ -826,7 +901,7 @@ // Get the sub site set containing only the sites // part of component 2. - mln_VAR(lab_2, lab_2b.domain(1)); + mln_VAR(lab_2, lab_2b.domain(true)); // Fill the sites of component 2 with red. fill(lab_2, color::red); @@ -861,9 +936,82 @@ ... } \end{lstlisting} +% +% +\medskip +% +% +\subsection*{Important note} +When writing: + +\begin{lstlisting}[frame=single] + ima | sub_D +\end{lstlisting} + +sub\_D must be included in ima.domain(). + +Let's have an image, \textit{imab}, like this: +\begin{lstlisting}[frame=single] +0 1 0 +1 1 1 +\end{lstlisting} + +Extract a sub image from \textit{imab} with sites having their value set to 1. +\begin{lstlisting}[frame=single] +mln_VAR(imab1, imab | (pw::value(imab) == 1u)); +\end{lstlisting} + +Then, \textit{imab1} looks like: +\begin{lstlisting}[frame=single] + 1 +1 1 1 +\end{lstlisting} + +Now, if we want to extract a sub image it may fail, depending on the site set +used: +\begin{lstlisting}[frame=single] +box2d b1(1,0, 1, 2); +mln_VAR(imac, imab1 | b1); + +// Print: +// 1 1 1 +debug::prinln(imac); + +box2d b2(0,0, 1, 1); +// Will fail at runtime. +// ima.domain().has((0,0)) is false. +mln_VAR(imad, imab1 | b2); +debug::prinln(imad); +\end{lstlisting} + +If you do not want this constraint, you may want to use an alternative +operator: +\begin{lstlisting}[frame=single] + ima / sub_D +\end{lstlisting} + +In that case there is no restriction on the domain at all and the following example will work. +\begin{lstlisting}[frame=single] +box2d b2(0,0, 1, 1); + +mln_VAR(imad, imab1 / b2); + +// Print +// 1 +// 1 1 +debug::prinln(imad); +\end{lstlisting} +With this operator, an intersection is applied on the image domain and the +site set. + +\newpage +\clearpage \chapter{Graphes and images} + +//FIXME: REWRITE + \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

1 0

2484: Add p_edges.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- ChangeLog | 81 ++++++++ milena/mln/core/site_set/p_edges.hh | 262 ++++++++++++++++++++++++++ milena/mln/util/internal/graph_edge_psite.hh | 126 ++++++++++++ milena/tests/core/site_set/Makefile.am | 2 + milena/tests/core/site_set/p_edges.cc | 93 +++++++++ 5 files changed, 564 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/site_set/p_edges.hh create mode 100644 milena/mln/util/internal/graph_edge_psite.hh create mode 100644 milena/tests/core/site_set/p_edges.cc diff --git a/ChangeLog b/ChangeLog index 0353d7e..e4e58c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,84 @@ +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_edges. + + * milena/mln/core/site_set/p_edges.hh: + The site set p_edges. + + * milena/mln/util/internal/graph_edge_psite.hh: + The associated psite. + + * milena/tests/core/site_set/Makefile.am, + * milena/tests/core/site_set/p_edges.cc: + Add a basic test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Refactor graph_vertex_psite. + + * milena/mln/util/internal/graph_vertex_psite.hh: + Refactor this class... + * milena/mln/util/internal/graph_psite_base.hh: + ... here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix util::graph<G>::is_subgraph_of(). + + * milena/mln/util/graph.hh: here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing methods to vertex and edge. + + * milena/mln/util/internal/graph_edge.hh: + Add change_graph(). + * milena/mln/util/internal/graph_vertex.hh: + Add invalidate(). + + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_vertices. + + * milena/mln/core/site_set/p_vertices.hh: + The site set p_vertices. + + * milena/mln/util/internal/graph_vertex_psite.hh: + The psite associated to p_vertices. + + * milena/tests/core/site_set/p_vertices.cc, + * milena/tests/core/site_set/Makefile.am: + Add a small test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a missing method to graph_vertex_iter. + + * milena/mln/util/internal/graph_vertex_iter.hh: + Add a missing update_graph() method. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid compilation of graph_vertex. + + * milena/mln/util/internal/graph_vertex.hh: + Remove useless const and a wrong precondition. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix missing methods in graph_base. + + * milena/mln/util/internal/graph_base.hh: + Add new has() overload for convenience. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update p_graph_piter. + + * milena/mln/core/site_set/p_graph_piter.hh: + update in order to make it work with the new graph structure. + 2008-09-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update reconstruction algorithms in theo's sandbox. diff --git a/milena/mln/core/site_set/p_edges.hh b/milena/mln/core/site_set/p_edges.hh new file mode 100644 index 0000000..3c94998 --- /dev/null +++ b/milena/mln/core/site_set/p_edges.hh @@ -0,0 +1,262 @@ + // 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_SITE_SET_P_EDGES_HH +# define MLN_CORE_SITE_SET_P_EDGES_HH + + /// \file mln/core/site_set/p_edges.hh + /// \brief Definition of a site set based on graph edges. + +# include <mln/core/internal/site_set_base.hh> +# include <mln/core/site_set/p_graph_piter.hh> +# include <mln/util/internal/graph_edge_psite.hh> +# include <mln/util/graph.hh> + + +namespace mln +{ + // Forward declaration. + template <typename G, typename F> struct p_edges; + + namespace trait + { + template <typename G, typename F> + struct site_set_< p_edges<G, F> > + { + // FIXME: I don't know what to use yet! + typedef trait::site_set::nsites::known nsites; + typedef trait::site_set::bbox::unknown bbox; + typedef trait::site_set::contents::fixed contents; + typedef trait::site_set::arity::unique arity; + }; + } // end of namespace mln::trait + + + template <typename G, typename F> + class p_edges + : public internal::site_set_base_< typename F::result, p_edges<G, F> > + { + typedef util::edge<G> edge_t; + + typedef p_edges<G, F> self_; + typedef internal::site_set_base_< typename F::result, self_ > super_; + + typedef G graph_t; + + public: + /// \brief Construct a graph edge psite set from a graph and a function. + /// + /// \param gr The graph upon which the graph edge psite set is built. + /// \param f the function mapping edges and sites. + p_edges(const graph_t& gr, const F& f); + + /// Associated types. + /// \{ + /// Element associated type. + typedef mln_site(super_) element; + /// Point_Site associated type. + typedef internal::edge_psite<G, F> psite; + + /// Forward Site_Iterator associated type. + typedef p_graph_piter< self_, mln_edge_fwd_iter(G) > fwd_piter; + + /// Backward Site_Iterator associated type. + typedef p_graph_piter< self_, mln_edge_bkd_iter(G) > bkd_piter; + + /// Site_Iterator associated type. + typedef fwd_piter piter; + /// \} + + /// \brief Return The number of points (sites) of the set, i.e., + /// the number of \em edges. + size_t nsites() const; + + /// Return The number of edges in the graph. + std::size_t nedges() const; + + /// Is this site set valid? + bool is_valid() const; + /// Invalidate this site set. + void invalidate(); + + /// Does this site set has site \a p? + bool has(const psite& p) const; + + /// Does this site set has edge \a e? + template <typename G2> + bool has(const util::edge<G2>& e) const; + + // FIXME: Dummy. + std::size_t memory_size() const; + + /// Accessors. + /// \{ + /// Return the graph associated to this site set + const graph_t& g() const; + /// Return the mapping function. + F function() const; + /// \} + + private: + mlc_const(graph_t)* g_; + F f_; + }; + + + /// \brief Comparison between two mln::p_edges's. + /// + /// Two mln::p_edges's are considered equal if they share the + /// same graph. + template <typename G, typename F> + bool + operator==(const p_edges<G, F>& lhs, const p_edges<G, F>& rhs); + + + /// \brief Inclusion of a mln::p_edges in another one. + /// + /// \todo Refine this later, when we are able to express subgraph + /// relations. + template <typename G, typename F> + bool + operator<=(const p_edges<G, F>& lhs, const p_edges<G, F>& rhs); + +} // end of mln + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + template <typename G, typename F> + inline + p_edges<G, F>::p_edges(const graph_t& g, const F& f) + : g_ (&g), f_(f) + { + } + + template <typename G, typename F> + inline + size_t + p_edges<G, F>::nsites() const + { + return nedges(); + } + + template <typename G, typename F> + inline + std::size_t + p_edges<G, F>::nedges() const + { + return this->g_->e_nmax(); + } + + template <typename G, typename F> + inline + bool + p_edges<G, F>::is_valid() const + { + return g_ != 0; + } + + template <typename G, typename F> + inline + void + p_edges<G, F>::invalidate() + { + g_ = 0; + } + + template <typename G, typename F> + inline + bool + p_edges<G, F>::has(const psite& p) const + { + mln_precondition(is_valid()); + return has(p.e()); + } + + template <typename G, typename F> + template <typename G2> + inline + bool + p_edges<G, F>::has(const util::edge<G2>& e) const + { + mln_precondition(is_valid()); + return e.g()->is_subgraph_of(*g_) && g_->has(e) && e.is_valid(); + } + + template <typename G, typename F> + inline + std::size_t + p_edges<G, F>::memory_size() const + { + // FIXME: Dummy; implement (see other site sets). + abort(); + return 0; + } + + template <typename G, typename F> + inline + const typename p_edges<G, F>::graph_t& + p_edges<G, F>::g() const + { + mln_precondition(is_valid()); + return *g_; + } + + template <typename G, typename F> + inline + F + p_edges<G, F>::function() const + { + return f_; + } + + template <typename G, typename F> + bool + operator==(const p_edges<G, F>& lhs, const p_edges<G, F>& rhs) + { + /* FIXME: We should not rely on pointer equality here, as graph + will soon become shells using (shared) tracked pointers to + actual data. So, delegate the equality test to the graphs + themselves. */ + return (*lhs.g_) == (*rhs.g_); + } + + template <typename G, typename F> + bool + operator<=(const p_edges<G, F>& lhs, const p_edges<G, F>& rhs) + { + return lhs == rhs; + } + +} // end of mln + +# endif // ! MLN_INCLUDE_ONLY + +#endif // MLN_CORE_SITE_SET_P_EDGES_HH diff --git a/milena/mln/util/internal/graph_edge_psite.hh b/milena/mln/util/internal/graph_edge_psite.hh new file mode 100644 index 0000000..5e00d18 --- /dev/null +++ b/milena/mln/util/internal/graph_edge_psite.hh @@ -0,0 +1,126 @@ +// 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_UTIL_INTERNAL_GRAPH_EDGE_PSITE_HH +# define MLN_UTIL_INTERNAL_GRAPH_EDGE_PSITE_HH + +# include <mln/core/concept/pseudo_site.hh> +# include <mln/util/internal/graph_psite_base.hh> + +namespace mln +{ + + template <typename G, typename F> class p_edges; + +} // end of namespace mln + +/// \file mln/util/internal/edge_psite.hh +/// \brief Implementation of p_edges psite. + +namespace mln +{ + + namespace internal + { + + template <typename G, typename F> + class edge_psite : + public graph_psite_base<util::edge<G>, typename F::result, + p_edges<G, F>, + edge_psite<G, F> > + { + typedef edge_psite<G, F> self_; + typedef p_edges<G, F> target_t; + typedef graph_psite_base<util::edge<G>, typename F::result, target_t, self_> super_; + typedef util::edge<G> edge_t; + + public: + /// Associated Types + /// \{ + /// Site type, the return type of the mapping function \p F here. + typedef typename F::result site; + /// \} + + /// Constructors + /// \{ + edge_psite(); + edge_psite(const target_t& t); + /// \} + + /// Accessors + /// \{ + /// Return the underlying edge. + const edge_t& e() const; + /// \} + + protected: + /// The underlying edge (inherited). + using super_::v_; + }; + + } // end of namespace internal + +} // end of namespace mln + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace internal + { + + template <typename G, typename F> + inline + edge_psite<G, F>::edge_psite() + { + } + + template <typename G, typename F> + inline + edge_psite<G, F>::edge_psite(const target_t& t) + { + this->change_target(t); + } + + template <typename G, typename F> + inline + const typename edge_psite<G, F>::edge_t& + edge_psite<G, F>::e() const + { + return v_; + } + + } // end of namespace internal + +} // end of namespace mln + +# endif // !MLN_INCLUDE_ONLY + +#endif // !MLN_UTIL_INTERNAL_GRAPH_EDGE_PSITE_HH + diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index d1b2cf6..1b23c79 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ p_array \ ## p_bgraph \ + p_edges \ p_image \ p_priority_queue \ p_queue \ @@ -22,5 +23,6 @@ p_queue_fast_SOURCES = p_queue_fast.cc p_set_SOURCES = p_set.cc pset_if_SOURCES = pset_if.cc p_vertices_SOURCES = p_vertices.cc +p_edges_SOURCES = p_edges.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/site_set/p_edges.cc b/milena/tests/core/site_set/p_edges.cc new file mode 100644 index 0000000..9ab01a1 --- /dev/null +++ b/milena/tests/core/site_set/p_edges.cc @@ -0,0 +1,93 @@ +// Copyright (C) 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/core/site_set/p_edges.cc + * + * \brief Tests on mln::p_edges. + */ + +#include <mln/util/graph.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/site_set/p_edges.hh> + +// Function mapping an edge to a specific site. +template <typename G> +struct my_fun +{ + typedef mln::point2d result; + + const result& operator()(const mln::util::edge<G>& v) const + { + static mln::point2d res(0, 0); + res.row() = v.id(); + return res; + } +}; + +int main() +{ + using namespace mln; + + // Create a graph. + util::graph g; + g.add_vertex (); // 0 + g.add_vertex (); // 1 + g.add_vertex (); // 2 + g.add_vertex (); // 3 + g.add_vertex (); // 4 + g.add_vertex (); // 5 + g.add_edge (0, 1); + g.add_edge (0, 2); + g.add_edge (3, 4); + g.add_edge (4, 5); + g.add_edge (5, 4); + g.add_edge (1, 0); + g.add_edge (5, 3); + g.add_edge (2, 1); + + typedef p_edges<util::graph, my_fun<util::graph> > p_edges; + p_edges pv(g, my_fun<util::graph>()); + + // Forward iterator + { + mln_fwd_piter_(p_edges) p(pv); + unsigned i = 0; + for_all(p) + mln_assertion(p.p_hook_().e().id() == i++); + mln_assertion(i == g.e_nmax()); + } + // Backward iterator + { + mln_bkd_piter_(p_edges) p(pv); + unsigned i = g.e_nmax() - 1; + for_all(p) + mln_assertion(p.p_hook_().e().id() == i--); + mln_assertion(i == UINT_MAX); + } + + return 0; +} -- 1.5.6.5

2 1

2502: Fix paths in milena/sandbox/ChangeLog.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/sandbox/ChangeLog | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 0e0a314..cec1786 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -470,13 +470,13 @@ Add a 2D simplicial complex (toy code) + a double-window type. - * sandbox/geraud/cs2d: New directory. - * sandbox/geraud/cs2d/cs2d.cc: New. - * sandbox/geraud/cs2d/dbl_neighb.cc: New. - * sandbox/geraud/cs2d/cs2d.hh: New. - * sandbox/geraud/cs2d/cs2d_utils.hh: New. - * sandbox/geraud/cs2d/dbl_neighb.hh: New. - * sandbox/geraud/cs2d/cs2d_morpho.hh: New. + * geraud/cs2d: New directory. + * geraud/cs2d/cs2d.cc: New. + * geraud/cs2d/dbl_neighb.cc: New. + * geraud/cs2d/cs2d.hh: New. + * geraud/cs2d/cs2d_utils.hh: New. + * geraud/cs2d/dbl_neighb.hh: New. + * geraud/cs2d/cs2d_morpho.hh: New. 2008-06-04 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0

2501: Fix paths in milena/ChangeLog.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 210 +++++++++++++++++++++++++++--------------------------- 1 files changed, 105 insertions(+), 105 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8a149f5..8a3620e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -807,8 +807,8 @@ (mln::topo::face_fwd_iter<D>) (mln::topo::face_bkd_iter<D>): ...these. - * milena/mln/topo/complex.hh: Adjust. - * milena/tests/topo/complex.cc: Update documentation. + * mln/topo/complex.hh: Adjust. + * tests/topo/complex.cc: Update documentation. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> @@ -817,52 +817,52 @@ * mln/topo/internal/complex_iter_base.hh (mln::topo::internal::complex_iter_base_<F, E>): Rename as... (mln::topo::internal::complex_iter_base<F, E>): ...this. - * milena/mln/topo/attic/complex_faces_iter.hh, - * milena/mln/topo/attic/faces_iter.hh, - * milena/mln/topo/complex_iter.hh: + * mln/topo/attic/complex_faces_iter.hh, + * mln/topo/attic/faces_iter.hh, + * mln/topo/complex_iter.hh: Adjust clients. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> Disable old iterators on n-faces (with n statically known). - * milena/mln/core/site_set/p_complex_faces_piter.hh, - * milena/mln/core/site_set/p_faces_piter.hh, - * milena/mln/topo/complex_faces_iter.hh, - * milena/mln/topo/faces_iter.hh: + * mln/core/site_set/p_complex_faces_piter.hh, + * mln/core/site_set/p_faces_piter.hh, + * mln/topo/complex_faces_iter.hh, + * mln/topo/faces_iter.hh: Move... - * milena/mln/core/site_set/attic/p_complex_faces_piter.hh, - * milena/mln/core/site_set/attic/p_faces_piter.hh, - * milena/mln/topo/attic/complex_faces_iter.hh, - * milena/mln/topo/attic/faces_iter.hh: + * mln/core/site_set/attic/p_complex_faces_piter.hh, + * mln/core/site_set/attic/p_faces_piter.hh, + * mln/topo/attic/complex_faces_iter.hh, + * mln/topo/attic/faces_iter.hh: ...here. Disable these iterators... - * milena/mln/core/site_set/p_complex.hh, - * milena/mln/core/site_set/p_faces.hh, - * milena/mln/topo/complex.hh, - * milena/tests/core/image/complex_image.cc, - * milena/tests/topo/complex.cc: + * mln/core/site_set/p_complex.hh, + * mln/core/site_set/p_faces.hh, + * mln/topo/complex.hh, + * tests/core/image/complex_image.cc, + * tests/topo/complex.cc: ...in those files. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> Split mln/topo/face.hh. - * milena/mln/topo/face.hh + * mln/topo/face.hh (mln::topo::face_data<N, D>) (mln::topo::n_face<N, D>) (mln::topo::n_faces_set<N, D>): Move... - * milena/mln/topo/face_data.hh, - * milena/mln/topo/n_face.hh, - * milena/mln/topo/n_faces_set.hh: + * mln/topo/face_data.hh, + * mln/topo/n_face.hh, + * mln/topo/n_faces_set.hh: ...here (new files). - * milena/mln/topo/complex.hh, - * milena/mln/topo/complex_faces_iter.hh, - * milena/mln/topo/complex_iter.hh, - * milena/mln/topo/faces_iter.hh: + * mln/topo/complex.hh, + * mln/topo/complex_faces_iter.hh, + * mln/topo/complex_iter.hh, + * mln/topo/faces_iter.hh: Adjust. - * milena/tests/topo/complex.cc: Update documentation. + * tests/topo/complex.cc: Update documentation. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> @@ -2184,14 +2184,14 @@ 2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> Fix some tests. - * milena/tests/convert/to_p_set.cc, - * milena/tests/convert/to_window.cc: Use the proper comparison operator. + * tests/convert/to_p_set.cc, + * tests/convert/to_window.cc: Use the proper comparison operator. - * milena/tests/core/alias/point1d.cc: use point1d::ind(). + * tests/core/alias/point1d.cc: use point1d::ind(). - * milena/tests/core/alias/w_window1d_int.cc: use convert::to(). + * tests/core/alias/w_window1d_int.cc: use convert::to(). - * milena/tests/core/image/value_enc_image.cc: + * tests/core/image/value_enc_image.cc: use the proper p_runs2d type. 2008-09-17 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -2318,33 +2318,33 @@ 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> make seed2tiling_roundness test compile. - * milena/mln/convert/to_image.hh: + * mln/convert/to_image.hh: use operator(point1d p) instead of operator(int index). - * milena/mln/display/color_pretty.hh: add missing header. + * mln/display/color_pretty.hh: add missing header. - * milena/mln/geom/chamfer.hh: Use pw::cst(bool) with operator |. + * mln/geom/chamfer.hh: Use pw::cst(bool) with operator |. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Make w_window compile. - * milena/mln/core/site_set/p_priority.hh: + * mln/core/site_set/p_priority.hh: Add missing comparison operator. - * milena/mln/core/w_window.hh, - * milena/mln/core/concept/weighted_window.hh: + * mln/core/w_window.hh, + * mln/core/concept/weighted_window.hh: Update typedefs. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Rename owns_() to has(). - * milena/mln/core/image/lazy_image.hh, - * milena/mln/morpho/dilation.hh: here. + * mln/core/image/lazy_image.hh, + * mln/morpho/dilation.hh: here. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Do not exclude the concept directory from doc generation. - * milena/doc/Doxyfile.in: do it. + * doc/Doxyfile.in: do it. 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> @@ -3041,13 +3041,13 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_(). - * milena/mln/core/image/interpolated.hh, - * milena/mln/core/image/plain.hh, - * milena/mln/core/image/safe.hh, - * milena/mln/core/image/sparse_image.hh: + * mln/core/image/interpolated.hh, + * mln/core/image/plain.hh, + * mln/core/image/safe.hh, + * mln/core/image/sparse_image.hh: Add missing init_() here . - * milena/mln/core/image/status.txt: Update cast_image status. + * mln/core/image/status.txt: Update cast_image status. 2008-09-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3237,7 +3237,7 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Temporary fix doc compilation. - * milena/doc/Doxyfile.in: + * doc/Doxyfile.in: Temporary excludes core/concept from the doc generation. The doc can now be generated. Due to core/concept the doc generation never ended. @@ -3245,17 +3245,17 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove deprecated tests. - * milena/tests/core/image/Makefile.am: + * tests/core/image/Makefile.am: Remove deprecated tests and comments few others. 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix fill_with_image. - * milena/mln/level/fill_with_image.hh: Use exact(). - * milena/mln/level/fill_with_image.spe.hh: + * mln/level/fill_with_image.hh: Use exact(). + * mln/level/fill_with_image.spe.hh: Fix fill_with_image prototype. - * milena/mln/level/memcpy_.hh: Use full namespace name. + * mln/level/memcpy_.hh: Use full namespace name. 2008-09-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3490,32 +3490,32 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_(). - * milena/mln/core/image/cast_image.hh, - * milena/mln/core/image/decorated_image.hh: add missing init_(). + * mln/core/image/cast_image.hh, + * mln/core/image/decorated_image.hh: add missing init_(). 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Fix few tests. - * milena/mln/core/site_set/p_complex.hh, - * milena/mln/core/site_set/p_complex_piter.hh, - * milena/mln/core/site_set/p_faces.hh, - * milena/mln/core/site_set/p_bgraph_piter.hh, - * milena/mln/core/site_set/p_graph_piter.hh: + * mln/core/site_set/p_complex.hh, + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_faces.hh, + * mln/core/site_set/p_bgraph_piter.hh, + * mln/core/site_set/p_graph_piter.hh: remove useless '_' in class names. - * milena/tests/canvas/browsing/directional.cc, - * milena/tests/canvas/browsing/fwd.cc, - * milena/tests/canvas/browsing/snake_fwd.cc: rename point to site. + * tests/canvas/browsing/directional.cc, + * tests/canvas/browsing/fwd.cc, + * tests/canvas/browsing/snake_fwd.cc: rename point to site. - * milena/mln/core/alias/dpoint2d_h.hh, - * milena/mln/core/alias/point2d_h.hh, - * milena/tests/algebra/h_vec.cc, - * milena/tests/core/alias/point2d.cc, - * milena/tests/core/alias/point1d.cc: Use def::coord instead of int. + * mln/core/alias/dpoint2d_h.hh, + * mln/core/alias/point2d_h.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point2d.cc, + * tests/core/alias/point1d.cc: Use def::coord instead of int. - * milena/tests/set/diff.cc, - * milena/tests/core/site_set/p_image2d.cc: Update. + * tests/set/diff.cc, + * tests/core/site_set/p_image2d.cc: Update. 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3788,7 +3788,7 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Add at() and remove operator[] from image1d. - * milena/mln/core/image/image1d.hh: add at() and remove operator[]. + * mln/core/image/image1d.hh: add at() and remove operator[]. 2008-09-12 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -3825,19 +3825,19 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Propagate few renamings. - * milena/mln/canvas/browsing/snake_fwd.hh, - * milena/mln/debug/println.spe.hh: Use def::coord instead of int. + * mln/canvas/browsing/snake_fwd.hh, + * mln/debug/println.spe.hh: Use def::coord instead of int. - * milena/mln/convert/to_image.hh: Rename mln_point to mln_site. + * mln/convert/to_image.hh: Rename mln_point to mln_site. - * milena/mln/geom/shift.hh: + * mln/geom/shift.hh: Use convert::to instead of convert::to_dpoint(). - * milena/mln/level/median.hh: Update the use of io property. + * mln/level/median.hh: Update the use of io property. - * milena/mln/pw/image.hh: Fix typo. + * mln/pw/image.hh: Fix typo. - * milena/mln/win/line.hh: remove useless '_' in type name. + * mln/win/line.hh: remove useless '_' in type name. 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3880,40 +3880,40 @@ 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Fix most of Doxygen's warnings. - * milena/mln/core/image/flat_image.hh, - * milena/mln/core/internal/site_relative_iterator_base.hh, - * milena/mln/core/site_set/line2d.hh, - * milena/mln/core/site_set/p_if_piter.hh, - * milena/mln/core/site_set/p_priority.hh, - * milena/mln/trait/image/props.hh, - * milena/mln/util/internal/boost_graph_structure.hh, - * milena/mln/util/internal/graph_base.hh, - * milena/tests/algebra/h_vec.cc, - * milena/tests/binarization/threshold.cc, - * milena/tests/core/image/flat_image.cc, - * milena/tests/core/image/tr_image.cc, - * milena/tests/core/other/dpoints_pixter.cc, - * milena/tests/core/site_set/p_priority_queue.cc, - * milena/tests/core/site_set/p_priority_queue_fast.cc, - * milena/tests/core/site_set/p_priority_queue_fast_with_array.cc, - * milena/tests/core/site_set/pset_array.cc, - * milena/tests/core/site_set/pset_if.cc, - * milena/tests/level/sort_psites_full.cc, - * milena/tests/morpho/line_graph_image_wst.cc, - * milena/tests/morpho/meyer_wst.cc, - * milena/tests/morpho/meyer_wst_long.cc, - * milena/tests/test/positive.cc, - * milena/tests/value/builtin/builtin.cc: + * mln/core/image/flat_image.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/core/site_set/line2d.hh, + * mln/core/site_set/p_if_piter.hh, + * mln/core/site_set/p_priority.hh, + * mln/trait/image/props.hh, + * mln/util/internal/boost_graph_structure.hh, + * mln/util/internal/graph_base.hh, + * tests/algebra/h_vec.cc, + * tests/binarization/threshold.cc, + * tests/core/image/flat_image.cc, + * tests/core/image/tr_image.cc, + * tests/core/other/dpoints_pixter.cc, + * tests/core/site_set/p_priority_queue.cc, + * tests/core/site_set/p_priority_queue_fast.cc, + * tests/core/site_set/p_priority_queue_fast_with_array.cc, + * tests/core/site_set/pset_array.cc, + * tests/core/site_set/pset_if.cc, + * tests/level/sort_psites_full.cc, + * tests/morpho/line_graph_image_wst.cc, + * tests/morpho/meyer_wst.cc, + * tests/morpho/meyer_wst_long.cc, + * tests/test/positive.cc, + * tests/value/builtin/builtin.cc: Fix \file tag with the proper file name. - * milena/doc/Doxyfile.in: Add new macro expansions. - * milena/doc/Makefile.am: set EXCLUDE_SYMBOLS properly when + * doc/Doxyfile.in: Add new macro expansions. + * doc/Makefile.am: set EXCLUDE_SYMBOLS properly when making the user doc. 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_() to pw::image. - * milena/mln/pw/image.hh: Add missing init_(). + * mln/pw/image.hh: Add missing init_(). 2008-09-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -8969,8 +8969,8 @@ Add a test on regular neighborhoods. - * milena/tests/core/neighb.cc: New. - * milena/tests/core/Makefile.am (check_PROGRAMS): Add neighb. + * tests/core/neighb.cc: New. + * tests/core/Makefile.am (check_PROGRAMS): Add neighb. (neighb_SOURCES): New. 2008-04-09 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0

2500: Move back an entry from milena/sandbox/ChangeLog at the right place.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/sandbox/ChangeLog | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index c81fd7d..0e0a314 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -211,12 +211,6 @@ * jardonnet/test/icp.cc: . * jardonnet/registration/tools.hh: . -2008-06-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add kruskal algorithm in a sample morphological chain. - - * geraud/cs2d/kruskal.cc: New. - 2008-09-01 Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Sandbox: Start working on metal::array. @@ -332,6 +326,12 @@ * jardonnet/registration/quat7.hh: Fix: signed -> unsigned. * jardonnet/registration/icp_ref.hh: Add saving before start. +2008-06-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add kruskal algorithm in a sample morphological chain. + + * geraud/cs2d/kruskal.cc: New. + 2008-06-18 Matthieu Garrigues <garrigues(a)lrde.epita.fr> -- 1.6.0.1

1 0

2499: Move sandbox-only-related entries from milena/ChangeLog into milena/sandbox/ChangeLog (cont.).
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 19 ------------------- milena/sandbox/ChangeLog | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ded75fb..8a149f5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -7586,13 +7586,6 @@ * mln/trait/site_set/props.hh: Add some doc. * mln/trait/site_sets.hh: Likewise. -2008-06-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add some tutorial-like files about cubical complex. - - * sandbox/geraud/cs2d/tuto.cc: New. - * sandbox/geraud/cs2d/tuto_bis.cc: New. - 2008-06-09 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Deactivate site set inclusion tests. @@ -7612,18 +7605,6 @@ (operator <): Likewise. * doc/tutorial/examples/p_array.cc: Add a test of inclusion. -2008-06-06 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add a 2D simplicial complex (toy code) + a double-window type. - - * sandbox/geraud/cs2d: New directory. - * sandbox/geraud/cs2d/cs2d.cc: New. - * sandbox/geraud/cs2d/dbl_neighb.cc: New. - * sandbox/geraud/cs2d/cs2d.hh: New. - * sandbox/geraud/cs2d/cs2d_utils.hh: New. - * sandbox/geraud/cs2d/dbl_neighb.hh: New. - * sandbox/geraud/cs2d/cs2d_morpho.hh: New. - 2008-05-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Clean Site_Iterator design and propagate to p_array and box. diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 645ba74..c81fd7d 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -431,6 +431,13 @@ * jardonnet/test/img/c10.pbm, * jardonnet/test/img/c11.pbm: New test images. +2008-06-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add some tutorial-like files about cubical complex. + + * geraud/cs2d/tuto.cc: New. + * geraud/cs2d/tuto_bis.cc: New. + 2008-06-09 Aroune Aroumougame <aroune.aroumougame(a)gmail.com> Thinning test files. @@ -459,6 +466,18 @@ * jardonnet/registration/icp_ref.hh (impl::icp) : Update : Stop if e_k < d_k. +2008-06-06 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add a 2D simplicial complex (toy code) + a double-window type. + + * sandbox/geraud/cs2d: New directory. + * sandbox/geraud/cs2d/cs2d.cc: New. + * sandbox/geraud/cs2d/dbl_neighb.cc: New. + * sandbox/geraud/cs2d/cs2d.hh: New. + * sandbox/geraud/cs2d/cs2d_utils.hh: New. + * sandbox/geraud/cs2d/dbl_neighb.hh: New. + * sandbox/geraud/cs2d/cs2d_morpho.hh: New. + 2008-06-04 Roland Levillain <roland(a)lrde.epita.fr> Finish the computation of the fusion graph test. -- 1.6.0.1

1 0

2498: Move Milena-related entries from ChangeLog to milena/ChangeLog, and adjust paths.
by Roland Levillain 03 Oct '08

03 Oct '08

--- ChangeLog | 405 ------------------------------------------------------ milena/ChangeLog | 405 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 405 insertions(+), 405 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4e58c0..77e305b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,422 +1,17 @@ -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add p_edges. - - * milena/mln/core/site_set/p_edges.hh: - The site set p_edges. - - * milena/mln/util/internal/graph_edge_psite.hh: - The associated psite. - - * milena/tests/core/site_set/Makefile.am, - * milena/tests/core/site_set/p_edges.cc: - Add a basic test. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Refactor graph_vertex_psite. - - * milena/mln/util/internal/graph_vertex_psite.hh: - Refactor this class... - * milena/mln/util/internal/graph_psite_base.hh: - ... here. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix util::graph<G>::is_subgraph_of(). - - * milena/mln/util/graph.hh: here. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add missing methods to vertex and edge. - - * milena/mln/util/internal/graph_edge.hh: - Add change_graph(). - * milena/mln/util/internal/graph_vertex.hh: - Add invalidate(). - - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add p_vertices. - - * milena/mln/core/site_set/p_vertices.hh: - The site set p_vertices. - - * milena/mln/util/internal/graph_vertex_psite.hh: - The psite associated to p_vertices. - - * milena/tests/core/site_set/p_vertices.cc, - * milena/tests/core/site_set/Makefile.am: - Add a small test. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add a missing method to graph_vertex_iter. - - * milena/mln/util/internal/graph_vertex_iter.hh: - Add a missing update_graph() method. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix invalid compilation of graph_vertex. - - * milena/mln/util/internal/graph_vertex.hh: - Remove useless const and a wrong precondition. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix missing methods in graph_base. - - * milena/mln/util/internal/graph_base.hh: - Add new has() overload for convenience. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Update p_graph_piter. - - * milena/mln/core/site_set/p_graph_piter.hh: - update in order to make it work with the new graph structure. - -2008-09-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Update reconstruction algorithms in theo's sandbox. - - * milena/mln/level/paste.hh: Fix warning. - * milena/sandbox/geraud/Rd/hybrid.hh, - * milena/sandbox/geraud/Rd/queue_based.hh, - * milena/sandbox/geraud/Rd/parallel.cc, - * milena/sandbox/geraud/Rd/union_find.hh, - * milena/sandbox/geraud/Rd/parallel.hh, - * milena/sandbox/geraud/Rd/sequential.cc, - * milena/sandbox/geraud/Rd/utils.hh, - * milena/sandbox/geraud/Rd/hybrid.cc, - * milena/sandbox/geraud/Rd/queue_based.cc, - * milena/sandbox/geraud/Rd/min.cc, - * milena/sandbox/geraud/Rd/sequential.hh, - * milena/sandbox/geraud/Rd/union_find.cc: Update. - 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/tests/topo/Makefile. -2008-09-22 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Update test on extension fill. - - * milena/tests/extension/fill.cc (println_with_border): Remove. - Use 'extended' instead. - * milena/mln/core/image/extended.hh: Fix missing arg name. - -2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix many errors in core/image tests. - * milena/mln/convert/to_p_set.hh: Update doc. - - * milena/mln/make/w_window.hh, - * milena/mln/convert/to_p_set.hh, - * milena/mln/convert/to_w_window.hh, - * milena/mln/convert/to_window.hh: rename mln_dpoint to mln_dpsite. - - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/obased_rle_image.hh: - Rename size_mem() to memory_size(). - Rename p_of_run() to index(). - - * milena/mln/core/image/plain.hh: add missing init_(). - - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/value_enc_image.hh: - Use p_set_of and p_run instead of p_runs_. - - - * milena/mln/estim/sum.hh: - Fully specify the types in template parameters. - - * milena/mln/geom/bbox.hh: Add support for weighted_windows. - -2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> - - Remove \internal tag. - * milena/mln/accu/all.hh, - * milena/mln/accu/internal/base.hh, - * milena/mln/arith/all.hh, - * milena/mln/border/all.hh, - * milena/mln/canvas/all.hh, - * milena/mln/core/concept/doc/image_fastest.hh, - * milena/mln/core/concept/object.hh, - * milena/mln/core/image/bgraph_image.hh, - * milena/mln/core/image/cast_image.hh, - * milena/mln/core/image/complex_image.hh, - * milena/mln/core/image/decorated_image.hh, - * milena/mln/core/image/extension_fun.hh, - * milena/mln/core/image/extension_ima.hh, - * milena/mln/core/image/extension_val.hh, - * milena/mln/core/image/fi_adaptor.hh, - * milena/mln/core/image/flat_image.hh, - * milena/mln/core/image/graph_image.hh, - * milena/mln/core/image/hexa.hh, - * milena/mln/core/image/image1d.hh, - * milena/mln/core/image/image2d.hh, - * milena/mln/core/image/image3d.hh, - * milena/mln/core/image/image_if.hh, - * milena/mln/core/image/instant.hh, - * milena/mln/core/image/interpolated.hh, - * milena/mln/core/image/line_graph_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/obased_rle_image.hh, - * milena/mln/core/image/plain.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/safe.hh, - * milena/mln/core/image/sparse_image.hh, - * milena/mln/core/image/sub_image.hh, - * milena/mln/core/image/sub_image_if.hh, - * milena/mln/core/image/t_image.hh, - * milena/mln/core/image/tr_image.hh, - * milena/mln/core/image/translate_image.hh, - * milena/mln/core/image/value_enc_image.hh, - * milena/mln/core/internal/box_impl.hh, - * milena/mln/core/internal/check/image_all.hh, - * milena/mln/core/internal/check/image_fastest.hh, - * milena/mln/core/internal/coord_impl.hh, - * milena/mln/core/internal/data.hh, - * milena/mln/core/internal/dpoints_base.hh, - * milena/mln/core/internal/fixme.hh, - * milena/mln/core/internal/force_exact.hh, - * milena/mln/core/internal/image_base.hh, - * milena/mln/core/internal/image_domain_morpher.hh, - * milena/mln/core/internal/image_identity.hh, - * milena/mln/core/internal/image_if_base.hh, - * milena/mln/core/internal/image_morpher.hh, - * milena/mln/core/internal/image_primary.hh, - * milena/mln/core/internal/image_value_morpher.hh, - * milena/mln/core/internal/morpher_lvalue.hh, - * milena/mln/core/internal/neighborhood_base.hh, - * milena/mln/core/internal/piter_adaptor.hh, - * milena/mln/core/internal/pixel_impl.hh, - * milena/mln/core/internal/pixel_iterator_base.hh, - * milena/mln/core/internal/pseudo_site_base.hh, - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/internal/set_of.hh, - * milena/mln/core/internal/site_iterator_base.hh, - * milena/mln/core/internal/site_set_base.hh, - * milena/mln/core/internal/site_set_impl.hh, - * milena/mln/core/internal/site_set_iterator_base.hh, - * milena/mln/core/internal/window_base.hh, - * milena/mln/debug/all.hh, - * milena/mln/display/all.hh, - * milena/mln/fun/all.hh, - * milena/mln/fun/x2x/all.hh, - * milena/mln/fun/x2x/composed.hh, - * milena/mln/geom/all.hh, - * milena/mln/geom/seeds2tiling_roundness.hh, - * milena/mln/histo/all.hh, - * milena/mln/io/all.hh, - * milena/mln/io/pbm/all.hh, - * milena/mln/io/pfm/all.hh, - * milena/mln/io/pnm/all.hh, - * milena/mln/labeling/all.hh, - * milena/mln/level/all.hh, - * milena/mln/level/approx/all.hh, - * milena/mln/level/naive/all.hh, - * milena/mln/linear/all.hh, - * milena/mln/logical/all.hh, - * milena/mln/metal/all.hh, - * milena/mln/metal/math/all.hh, - * milena/mln/morpho/all.hh, - * milena/mln/neighb/image.hh, - * milena/mln/norm/all.hh, - * milena/mln/pw/image.hh, - * milena/mln/test/all.hh, - * milena/mln/trait/all.hh, - * milena/mln/util/all.hh, - * milena/mln/util/array.hh, - * milena/mln/util/greater_point.hh, - * milena/mln/util/greater_psite.hh, - * milena/mln/util/lazy_set.hh, - * milena/mln/util/set.hh, - * milena/mln/value/all.hh, - * milena/mln/value/float01_.hh, - * milena/mln/value/graylevel.hh, - * milena/mln/value/internal/convert.hh, - * milena/mln/value/internal/encoding.hh, - * milena/mln/value/internal/gray_.hh, - * milena/mln/value/internal/gray_f.hh, - * milena/mln/value/internal/iterable_set.hh, - * milena/mln/value/internal/value_like.hh, - * milena/mln/value/label.hh, - * milena/mln/value/set.hh, - * milena/mln/value/stack.hh: here. - 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * configure.ac: Add tests/extension to configure.ac. -2008-09-16 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix various test related files (again). - * milena/tests/convert/to_image.cc, - * milena/tests/convert/to_window.cc, - * milena/tests/histo/compute.cc, - * milena/tests/histo/to_image1d.cc, - * milena/tests/morpho/hit_or_miss.cc, - * milena/tests/morpho/thinning.cc, - * milena/tests/set/inter.cc, - * milena/tests/set/is_subset_of.cc, - * milena/tests/set/sym_diff.cc, - * milena/tests/set/uni.cc: Make the test compile. - - * milena/mln/fun/x2x/rotation.hh, - * milena/mln/set/diff.hh, - * milena/mln/labeling/regional_minima.hh, - * milena/mln/border/resize.hh, - * milena/mln/level/fill.hh, - * milena/mln/level/fill_with_image.hh, - * milena/mln/level/fill_with_value.hh: - Avoid compilation warning when compiled with -DNDEBUG. - - * milena/mln/convert/to_p_array.hh: Add a missing exact(). - - * milena/mln/set/inter.hh, - * milena/mln/convert/to_image.hh, - * milena/mln/convert/to_p_set.hh, - * milena/mln/convert/to_std_set.hh, - * milena/mln/convert/to_window.hh: Rename mln_point. - - * milena/mln/core/alias/box1d.hh: Add full namespace name. - - * milena/mln/draw/label.hh: Use sub_image instead of image_if_value. - - * milena/mln/level/transform.spe.hh, - * milena/mln/level/median.hh: use values_eligible() instead of values(). - - * milena/mln/morpho/Rd.hh: Use greater_point instead of operator<. - - * milena/mln/morpho/erosion.spe.hh: Add a missing include. - - * milena/tests/morpho/Makefile.am: Disable graph related tests. - -2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> - - Improve user doc generation. - * milena/doc/Doxyfile.in: Exclude the proper file. - * milena/doc/Makefile.am: Exclude the proper symbols for the user doc. - -2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix various test related files. - * milena/tests/core/routine/exact.cc: Write test. - - * milena/tests/canvas/chamfer.cc: Fix includes. - - * milena/tests/convert/to_p_set.cc: Fix a method call. - - * milena/mln/trait/op/all.hh: remove guards. - - * milena/mln/core/internal/exact.hh: Add a forward declaration. - - * milena/mln/core/routine/exact.hh: Move an include. - - * milena/mln/level/median.hh, - * milena/mln/level/naive/median.hh, - * milena/mln/level/was.median.hh: Use median_h. - - * milena/mln/level/memset_.hh: Use full namespace name to call - force_exact (g++ does not look at the right namespace if the full name - is not given). - - * milena/mln/convert/to_image.hh: use geom::bbox(). - - * milena/mln/geom/chamfer.hh, - * milena/mln/geom/pmin_pmax.hh: Rename mln_point to mln_site. - - - * milena/mln/geom/seeds2tiling.hh, - * milena/mln/geom/seeds2tiling_roundness.hh: Use exact(). - - * milena/mln/value/hsi.hh: Add missing copyright header. - -2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix Changelog and comments. - * ChangeLog: Add missing entries. - * milena/tests/core/site_set/p_image.cc: Fix comments. - -2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> - - Remove deprecated tests. - * milena/tests/core/site_set/p_priority_queue_fast.cc, - * milena/tests/core/site_set/p_priority_queue_fast_with_array.cc, - * milena/tests/core/site_set/p_runs.cc, - * milena/tests/core/site_set/pset_array.cc: - Remove these tests according to core/site_set/status.txt. - - * milena/mln/level/fill_with_value.hh: fix a compilation warning - (unused variable). - - * milena/mln/set/get.hh: new algorithm to get the ith element in a - site set. - - * milena/tests/core/image/Makefile.am, - * milena/tests/core/site_set/Makefile.am: disable few tests. - - * milena/tests/core/site_set/p_image2d.cc: rename as... - * milena/tests/core/site_set/p_image.cc: ...this file. - - * milena/tests/core/site_set/p_priority_queue.cc, - * milena/tests/core/site_set/p_set.cc, - * milena/tests/core/site_set/pset_if.cc: - update assertions and make the test compile. - - -2008-09-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add a window-to-neighborhood adapter. - - * milena/mln/core/internal/window_base.hh - (is_neighbable_): New. - * milena/mln/core/neighb.hh: Revamp. - -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. - -2008-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> - - Improve tutorial. - * milena/doc/tutorial/tutorial.tex: improve explanations. - 2008-09-05 Nicolas Ballas <ballas(a)lrde.epita.fr> Update configure.ac. * configure.ac: add the new Makefiles present in tests/core/.... -2008-09-05 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Augment tutorial example for Z. - - * milena/doc/tutorial/examples/for_Z.cc: Augment. - * milena/mln/debug/println.spe.hh (has): Replace ima.has by - ima.domain.has so that we do not print the domain extension. - * milena/mln/core/site_set/p_if.hh (pset, pset_): Rename as... - (s, s_): ...these; more consistent with the other code. - * milena/mln/core/image/image_if.hh (todo): Fix typo. - * milena/mln/core/internal/image_domain_morpher.hh - (operator()): Fix missing preconditions. - * milena/mln/value/rgb.hh (operator<<): Remove spaces. - * milena/mln/geom/bbox.hh (bbox): Add overload for images. - 2008-08-11 Roland Levillain <roland(a)lrde.epita.fr> * build-aux/with-swilena.m4: Require SWIG 1.3.31. diff --git a/milena/ChangeLog b/milena/ChangeLog index 0c47245..ded75fb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -114,6 +114,87 @@ Don't include header `limits'. Include header `iosfwd'. +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_edges. + + * mln/core/site_set/p_edges.hh: + The site set p_edges. + + * mln/util/internal/graph_edge_psite.hh: + The associated psite. + + * tests/core/site_set/Makefile.am, + * tests/core/site_set/p_edges.cc: + Add a basic test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Refactor graph_vertex_psite. + + * mln/util/internal/graph_vertex_psite.hh: + Refactor this class... + * mln/util/internal/graph_psite_base.hh: + ... here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix util::graph<G>::is_subgraph_of(). + + * mln/util/graph.hh: here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing methods to vertex and edge. + + * mln/util/internal/graph_edge.hh: + Add change_graph(). + * mln/util/internal/graph_vertex.hh: + Add invalidate(). + + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_vertices. + + * mln/core/site_set/p_vertices.hh: + The site set p_vertices. + + * mln/util/internal/graph_vertex_psite.hh: + The psite associated to p_vertices. + + * tests/core/site_set/p_vertices.cc, + * tests/core/site_set/Makefile.am: + Add a small test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a missing method to graph_vertex_iter. + + * mln/util/internal/graph_vertex_iter.hh: + Add a missing update_graph() method. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid compilation of graph_vertex. + + * mln/util/internal/graph_vertex.hh: + Remove useless const and a wrong precondition. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix missing methods in graph_base. + + * mln/util/internal/graph_base.hh: + Add new has() overload for convenience. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update p_graph_piter. + + * mln/core/site_set/p_graph_piter.hh: + update in order to make it work with the new graph structure. + 2008-10-02 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start to integrate registration in Milena. @@ -512,6 +593,24 @@ (mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D>): Adjust. +2008-09-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Update reconstruction algorithms in theo's sandbox. + + * mln/level/paste.hh: Fix warning. + * sandbox/geraud/Rd/hybrid.hh, + * sandbox/geraud/Rd/queue_based.hh, + * sandbox/geraud/Rd/parallel.cc, + * sandbox/geraud/Rd/union_find.hh, + * sandbox/geraud/Rd/parallel.hh, + * sandbox/geraud/Rd/sequential.cc, + * sandbox/geraud/Rd/utils.hh, + * sandbox/geraud/Rd/hybrid.cc, + * sandbox/geraud/Rd/queue_based.cc, + * sandbox/geraud/Rd/min.cc, + * sandbox/geraud/Rd/sequential.hh, + * sandbox/geraud/Rd/union_find.cc: Update. + 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> Delegate pretty-printing of iterators on faces to mln::topo::face. @@ -1970,6 +2069,14 @@ * mln/canvas/browsing/snake_fwd.hh: Desactivate check of dimension. +2008-09-22 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Update test on extension fill. + + * tests/extension/fill.cc (println_with_border): Remove. + Use 'extended' instead. + * mln/core/image/extended.hh: Fix missing arg name. + 2008-09-18 Roland Levillain <roland(a)lrde.epita.fr> Rename util::ordpair_<T> as util::ord_pair<T>. @@ -2043,6 +2150,39 @@ 2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix many errors in core/image tests. + * mln/convert/to_p_set.hh: Update doc. + + * mln/make/w_window.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_w_window.hh, + * mln/convert/to_window.hh: rename mln_dpoint to mln_dpsite. + + * mln/core/internal/run_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/obased_rle_image.hh: + Rename size_mem() to memory_size(). + Rename p_of_run() to index(). + + * mln/core/image/plain.hh: add missing init_(). + + * mln/core/internal/run_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/value_enc_image.hh: + Use p_set_of and p_run instead of p_runs_. + + + * mln/estim/sum.hh: + Fully specify the types in template parameters. + + * mln/geom/bbox.hh: Add support for weighted_windows. + +2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix some tests. * milena/tests/convert/to_p_set.cc, * milena/tests/convert/to_window.cc: Use the proper comparison operator. @@ -2063,6 +2203,120 @@ 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove \internal tag. + * mln/accu/all.hh, + * mln/accu/internal/base.hh, + * mln/arith/all.hh, + * mln/border/all.hh, + * mln/canvas/all.hh, + * mln/core/concept/doc/image_fastest.hh, + * mln/core/concept/object.hh, + * mln/core/image/bgraph_image.hh, + * mln/core/image/cast_image.hh, + * mln/core/image/complex_image.hh, + * mln/core/image/decorated_image.hh, + * mln/core/image/extension_fun.hh, + * mln/core/image/extension_ima.hh, + * mln/core/image/extension_val.hh, + * mln/core/image/fi_adaptor.hh, + * mln/core/image/flat_image.hh, + * mln/core/image/graph_image.hh, + * mln/core/image/hexa.hh, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/image/image_if.hh, + * mln/core/image/instant.hh, + * mln/core/image/interpolated.hh, + * mln/core/image/line_graph_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/obased_rle_image.hh, + * mln/core/image/plain.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/safe.hh, + * mln/core/image/sparse_image.hh, + * mln/core/image/sub_image.hh, + * mln/core/image/sub_image_if.hh, + * mln/core/image/t_image.hh, + * mln/core/image/tr_image.hh, + * mln/core/image/translate_image.hh, + * mln/core/image/value_enc_image.hh, + * mln/core/internal/box_impl.hh, + * mln/core/internal/check/image_all.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/coord_impl.hh, + * mln/core/internal/data.hh, + * mln/core/internal/dpoints_base.hh, + * mln/core/internal/fixme.hh, + * mln/core/internal/force_exact.hh, + * mln/core/internal/image_base.hh, + * mln/core/internal/image_domain_morpher.hh, + * mln/core/internal/image_identity.hh, + * mln/core/internal/image_if_base.hh, + * mln/core/internal/image_morpher.hh, + * mln/core/internal/image_primary.hh, + * mln/core/internal/image_value_morpher.hh, + * mln/core/internal/morpher_lvalue.hh, + * mln/core/internal/neighborhood_base.hh, + * mln/core/internal/piter_adaptor.hh, + * mln/core/internal/pixel_impl.hh, + * mln/core/internal/pixel_iterator_base.hh, + * mln/core/internal/pseudo_site_base.hh, + * mln/core/internal/run_image.hh, + * mln/core/internal/set_of.hh, + * mln/core/internal/site_iterator_base.hh, + * mln/core/internal/site_set_base.hh, + * mln/core/internal/site_set_impl.hh, + * mln/core/internal/site_set_iterator_base.hh, + * mln/core/internal/window_base.hh, + * mln/debug/all.hh, + * mln/display/all.hh, + * mln/fun/all.hh, + * mln/fun/x2x/all.hh, + * mln/fun/x2x/composed.hh, + * mln/geom/all.hh, + * mln/geom/seeds2tiling_roundness.hh, + * mln/histo/all.hh, + * mln/io/all.hh, + * mln/io/pbm/all.hh, + * mln/io/pfm/all.hh, + * mln/io/pnm/all.hh, + * mln/labeling/all.hh, + * mln/level/all.hh, + * mln/level/approx/all.hh, + * mln/level/naive/all.hh, + * mln/linear/all.hh, + * mln/logical/all.hh, + * mln/metal/all.hh, + * mln/metal/math/all.hh, + * mln/morpho/all.hh, + * mln/neighb/image.hh, + * mln/norm/all.hh, + * mln/pw/image.hh, + * mln/test/all.hh, + * mln/trait/all.hh, + * mln/util/all.hh, + * mln/util/array.hh, + * mln/util/greater_point.hh, + * mln/util/greater_psite.hh, + * mln/util/lazy_set.hh, + * mln/util/set.hh, + * mln/value/all.hh, + * mln/value/float01_.hh, + * mln/value/graylevel.hh, + * mln/value/internal/convert.hh, + * mln/value/internal/encoding.hh, + * mln/value/internal/gray_.hh, + * mln/value/internal/gray_f.hh, + * mln/value/internal/iterable_set.hh, + * mln/value/internal/value_like.hh, + * mln/value/label.hh, + * mln/value/set.hh, + * mln/value/stack.hh: here. + +2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> + make seed2tiling_roundness test compile. * milena/mln/convert/to_image.hh: use operator(point1d p) instead of operator(int index). @@ -2519,6 +2773,50 @@ * mln/win/multiple.hh (i_): Fix warning. * doc/examples/tuto_bis.cc: Update. +2008-09-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix various test related files (again). + * tests/convert/to_image.cc, + * tests/convert/to_window.cc, + * tests/histo/compute.cc, + * tests/histo/to_image1d.cc, + * tests/morpho/hit_or_miss.cc, + * tests/morpho/thinning.cc, + * tests/set/inter.cc, + * tests/set/is_subset_of.cc, + * tests/set/sym_diff.cc, + * tests/set/uni.cc: Make the test compile. + + * mln/fun/x2x/rotation.hh, + * mln/set/diff.hh, + * mln/labeling/regional_minima.hh, + * mln/border/resize.hh, + * mln/level/fill.hh, + * mln/level/fill_with_image.hh, + * mln/level/fill_with_value.hh: + Avoid compilation warning when compiled with -DNDEBUG. + + * mln/convert/to_p_array.hh: Add a missing exact(). + + * mln/set/inter.hh, + * mln/convert/to_image.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_std_set.hh, + * mln/convert/to_window.hh: Rename mln_point. + + * mln/core/alias/box1d.hh: Add full namespace name. + + * mln/draw/label.hh: Use sub_image instead of image_if_value. + + * mln/level/transform.spe.hh, + * mln/level/median.hh: use values_eligible() instead of values(). + + * mln/morpho/Rd.hh: Use greater_point instead of operator<. + + * mln/morpho/erosion.spe.hh: Add a missing include. + + * tests/morpho/Makefile.am: Disable graph related tests. + 2008-09-16 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment the documentation example on a 2D complex. @@ -2691,6 +2989,12 @@ * mln/core/macros.hh (mln_vset, mln_vset_): s/t_eligible_value_set/t_eligible_values_set/ +2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve user doc generation. + * doc/Doxyfile.in: Exclude the proper file. + * doc/Makefile.am: Exclude the proper symbols for the user doc. + 2008-09-15 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Move and update line_piter as box_runstart_piter. @@ -2702,6 +3006,40 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix various test related files. + * tests/core/routine/exact.cc: Write test. + + * tests/canvas/chamfer.cc: Fix includes. + + * tests/convert/to_p_set.cc: Fix a method call. + + * mln/trait/op/all.hh: remove guards. + + * mln/core/internal/exact.hh: Add a forward declaration. + + * mln/core/routine/exact.hh: Move an include. + + * mln/level/median.hh, + * mln/level/naive/median.hh, + * mln/level/was.median.hh: Use median_h. + + * mln/level/memset_.hh: Use full namespace name to call + force_exact (g++ does not look at the right namespace if the full name + is not given). + + * mln/convert/to_image.hh: use geom::bbox(). + + * mln/geom/chamfer.hh, + * mln/geom/pmin_pmax.hh: Rename mln_point to mln_site. + + + * mln/geom/seeds2tiling.hh, + * mln/geom/seeds2tiling_roundness.hh: Use exact(). + + * mln/value/hsi.hh: Add missing copyright header. + +2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing init_(). * milena/mln/core/image/interpolated.hh, * milena/mln/core/image/plain.hh, @@ -3065,6 +3403,39 @@ * mln/core/internal/site_relative_iterator_base.hh: . * mln/win/multiple.hh: New. +2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Changelog and comments. + * ChangeLog: Add missing entries. + * tests/core/site_set/p_image.cc: Fix comments. + +2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove deprecated tests. + * tests/core/site_set/p_priority_queue_fast.cc, + * tests/core/site_set/p_priority_queue_fast_with_array.cc, + * tests/core/site_set/p_runs.cc, + * tests/core/site_set/pset_array.cc: + Remove these tests according to core/site_set/status.txt. + + * mln/level/fill_with_value.hh: fix a compilation warning + (unused variable). + + * mln/set/get.hh: new algorithm to get the ith element in a + site set. + + * tests/core/image/Makefile.am, + * tests/core/site_set/Makefile.am: disable few tests. + + * tests/core/site_set/p_image2d.cc: rename as... + * tests/core/site_set/p_image.cc: ...this file. + + * tests/core/site_set/p_priority_queue.cc, + * tests/core/site_set/p_set.cc, + * tests/core/site_set/pset_if.cc: + update assertions and make the test compile. + + 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add an 'estim nsites' routine for Z. @@ -3555,6 +3926,14 @@ * mln/win/rectangle2d.hh: Update an old include +2008-09-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add a window-to-neighborhood adapter. + + * mln/core/internal/window_base.hh + (is_neighbable_): New. + * mln/core/neighb.hh: Revamp. + 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> Factor iterators on p_complexes with iterator on complexes. @@ -3609,6 +3988,12 @@ (mln::complex_bkd_iter_<D>::set_cplx): New. +2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a section about graph images in tutorial. + * doc/tutorial/tutorial.tex: Add a section about graph images and fix + few mistakes all along the tutorial. + 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> * tests/core/complex_image.cc: Fix comment about complex windows. @@ -3678,6 +4063,11 @@ * mln/core/alias/dpoint3d.hh: remove underscore to dpoint_. * mln/core/alias/point3d.hh: remove underscore to point_. +2008-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve tutorial. + * doc/tutorial/tutorial.tex: improve explanations. + 2008-09-09 Nicolas Ballas <ballas(a)lrde.epita.fr> Add the sign value type (subset of the int value type). @@ -3896,6 +4286,21 @@ * mln/fun/x2x/rotation.hh: Fix wrong namespaces. * sandbox/jardonnet/virtual/access.hh: Fix concept check. +2008-09-05 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Augment tutorial example for Z. + + * doc/tutorial/examples/for_Z.cc: Augment. + * mln/debug/println.spe.hh (has): Replace ima.has by + ima.domain.has so that we do not print the domain extension. + * mln/core/site_set/p_if.hh (pset, pset_): Rename as... + (s, s_): ...these; more consistent with the other code. + * mln/core/image/image_if.hh (todo): Fix typo. + * mln/core/internal/image_domain_morpher.hh + (operator()): Fix missing preconditions. + * mln/value/rgb.hh (operator<<): Remove spaces. + * mln/geom/bbox.hh (bbox): Add overload for images. + 2008-09-03 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add metal::array (1d,2d,3d). -- 1.6.0.1

1 0

2497: Exercise neighborhood and piters on lower+higher-dim. adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* tests/core/image/complex_image.cc: Here. --- milena/ChangeLog | 6 ++++ milena/tests/core/image/complex_image.cc | 40 ++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 54dde45..0c47245 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise neighborhood and piters on lower+higher-dim. adjacent faces. + + * tests/core/image/complex_image.cc: Here. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood of both lower- and higher-dimension adjacent faces. * mln/core/image/complex_lower_higher_neighborhood.hh: New. diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 76f55db..d30ccc4 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -39,8 +39,13 @@ // FIXME: Include these elsewhere? (In complex_image.hh?) #include <mln/core/image/complex_lower_neighborhood.hh> #include <mln/core/image/complex_higher_neighborhood.hh> +#include <mln/core/image/complex_lower_higher_neighborhood.hh> #include <mln/core/image/complex_neighborhood_piter.hh> +/* FIXME: Split this test (and maybe factor common parts, like the + construction of the complex), since it exercises too many features + in a single file. */ + int main() { @@ -201,7 +206,8 @@ int main() // Iterators on windows and neighborhoods. // // ---------------------------------------- // - // FIXME: Factor: these two test cases only differ by their neighborhood. + // FIXME: Factor: these three test cases only differ by their + // neighborhoods. // Iterate on the lower-dimension faces of each face. { @@ -245,17 +251,35 @@ int main() std::cout << std::endl; } - /* FIXME: Implement windows (and neighborhoods) and corresponding - iterators for complex-based images. + // Iterate on the lower- and higher-dimension faces of each face. + { + typedef complex_lower_higher_neighborhood<D, P> nbh_t; + nbh_t nbh; + mln_fwd_niter_(nbh_t) fn(nbh, fp); + mln_bkd_niter_(nbh_t) bn(nbh, fp); + for_all(fp) + { + std::cout << "Lower- and higer-dimension faces adjacent to " << fp + << std::endl; + for_all_2(fn, bn) + { + mln_assertion((fn.center() == + static_cast<const complex_psite<D, P>&>(fp))); + mln_assertion((bn.center() == + static_cast<const complex_psite<D, P>&>(fp))); + std::cout << " " << fn << '\t' << bn << std::endl; + } + } + std::cout << std::endl; + } + + + /* FIXME: Implement other neighborhoods (and windows) and + corresponding iterators for complex-based images. For a given (fixed) dimension N and a psite P on a N-face, implement windows returning - - the set of (N-1)-faces adjacent to P (using p_faces and - faces_psite?); - - the set of (N+1)-faces adjacent to P (using p_faces and - faces_psite?); - - the set of N-faces sharing a (N-1)-face with P; - the set of N-faces sharing a (N-1)-face or (N-2)-face (by transitivity) with P (is it useful?); -- 1.6.0.1

1 0

2496: Add neighborhood of both lower- and higher-dimension adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/core/image/complex_lower_higher_neighborhood.hh: New. --- milena/ChangeLog | 6 + .../image/complex_lower_higher_neighborhood.hh | 121 ++++++++++++++++++++ 2 files changed, 127 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/image/complex_lower_higher_neighborhood.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 57729ee..54dde45 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood of both lower- and higher-dimension adjacent faces. + + * mln/core/image/complex_lower_higher_neighborhood.hh: New. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise iterators lower+higher-dimension adjacent faces. * tests/topo/complex.cc: Here. diff --git a/milena/mln/core/image/complex_lower_higher_neighborhood.hh b/milena/mln/core/image/complex_lower_higher_neighborhood.hh new file mode 100644 index 0000000..3780709 --- /dev/null +++ b/milena/mln/core/image/complex_lower_higher_neighborhood.hh @@ -0,0 +1,121 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH +# define MLN_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH + +/// \file mln/core/complex_lower_higher_neighborhood.hh +/// \brief A neighborhood centered on a n-face of complex returning its +/// adjacent (n-1)-faces and (n+1)-faces. + +# include <mln/core/concept/neighborhood.hh> + +# include <mln/core/site_set/complex_psite.hh> + +# include <mln/topo/adj_lower_higher_face_iter.hh> + +/* FIXME: Factor with complex_lower_neighborhood and + complex_higher_neighborhood (e.g., using an + internal::complex_neighborhood_base common base class). */ + + +namespace mln +{ + // Forward declarations. + template <typename I, typename P, typename N> + class complex_neighborhood_fwd_piter; + template <typename I, typename P, typename N> + class complex_neighborhood_bkd_piter; + + + /// \brief Neighborhood centered on a n-face of complex returning its + /// adjacent (n-1)-faces. + template <unsigned D, typename P> + class complex_lower_higher_neighborhood + : public Neighborhood< complex_lower_higher_neighborhood<D, P> > + { + typedef complex_lower_higher_neighborhood<D, P> self_; + + public: + /// The associated complex iterators. + /// \{ + typedef topo::adj_lower_higher_face_fwd_iter<D> complex_fwd_iter; + typedef topo::adj_lower_higher_face_bkd_iter<D> complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the neighborhood. + typedef complex_psite<D, P> psite; + /// The type of site corresponding to the neighborhood. + typedef mln_site(psite) site; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the ordering of vertices. + typedef + complex_neighborhood_fwd_piter<complex_fwd_iter, P, self_> fwd_niter; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the reverse ordering of vertices. + typedef + complex_neighborhood_bkd_piter<complex_bkd_iter, P, self_> bkd_niter; + + /// The default niter type. + typedef fwd_niter niter; + /// \} + + /// Conversions. + /// \{ + /// The window type corresponding to this neighborhood. + // FIXME: Dummy. + typedef self_ window; + /// Create a window corresponding to this neighborhood. + const window& win() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: Dummy. + template <unsigned D, typename P> + inline + // FIXME: Change (dummy) type. + const typename complex_lower_higher_neighborhood<D, P>::window& + complex_lower_higher_neighborhood<D, P>::win() const + { + // FIXME: Dummy. + return *this; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH -- 1.6.0.1

1 0

2495: Exercise iterators lower+higher-dimension adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* tests/topo/complex.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/topo/complex.cc | 41 +++++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4ebc231..57729ee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise iterators lower+higher-dimension adjacent faces. + + * tests/topo/complex.cc: Here. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on both lower- and higher-dimension adjacent faces. * mln/topo/adj_lower_higher_face_iter.hh: New. diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index f079734..9e559de 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -36,6 +36,9 @@ using namespace mln; +/* FIXME: Split this test (and maybe factor common parts, like the + construction of the complex), since it exercises too many features + in a single file. */ // Forward declarations. template <unsigned N, unsigned D> @@ -207,26 +210,18 @@ int main() milena/tests/core/complex_image.cc) and ticket #162 (https://trac.lrde.org/olena/ticket/162) */ - /* Iterate on the the set of (n-1)- and (n+1)-faces adjacent to the - faces of C. + /* Iterate on the the set of (n-1)- and/or (n+1)-faces adjacent to + the faces of C. Note: this can be solved with iterators where the dimension can - be either static or dynamic. + be either static or dynamic. For the moment, our iterators are + dynamic w.r.t. the dimensions of the faces (both the reference + face and the iterated ones). - Let's start with a dynamic one, as it would allow us to - write something like this: - - mln_fwd_citer_(topo::complex<D>) f(c); - mln_fwd_lower_nciter(topo::complex<D>) n(c); - for_all(c) - for_all(n) - // ... - - (Note: we might want to get rid of the name `citer', and use - `fiter' everywhere.). - - A static version might be useful (and more efficient) too. */ + Static versions might be useful, and more efficient too, when + flexibility is not needed. */ + // Iterate on the the set of (n-1)-faces adjacent to the faces of C. topo::adj_lower_face_fwd_iter<D> fwd_alf(fwd_f); topo::adj_lower_face_bkd_iter<D> bkd_alf(fwd_f); for_all(fwd_f) @@ -238,6 +233,7 @@ int main() } std::cout << std::endl; + // Iterate on the the set of (n+1)-faces adjacent to the faces of C. topo::adj_higher_face_fwd_iter<D> fwd_ahf(fwd_f); topo::adj_higher_face_bkd_iter<D> bkd_ahf(fwd_f); for_all(fwd_f) @@ -249,6 +245,19 @@ int main() } std::cout << std::endl; + // Iterate on the the set of (n+1)-faces *and* (n+1)-faces adjacent + // to the faces of C. + topo::adj_lower_higher_face_fwd_iter<D> fwd_alhf(fwd_f); + topo::adj_lower_higher_face_bkd_iter<D> bkd_alhf(fwd_f); + for_all(fwd_f) + { + std::cout << "Lower- and higher-dimension faces adjacent to " << fwd_f + << ": " << std::endl; + for_all_2(fwd_alhf, bkd_alhf) + std::cout << " " << fwd_alhf << '\t' << bkd_alhf << std::endl; + } + std::cout << std::endl; + /* But first, we need to clarify (existing) names. The one listed in https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages are OK. -- 1.6.0.1

1 0