Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 2529: Add documentation about the image properties.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Add documentation about the image properties. * doc/tutorial/design: New. * doc/tutorial/design/include: New. * doc/tutorial/design/include/properties.tex, * doc/tutorial/design/include/imagetours.tex, * doc/tutorial/design/design.tex: New documentation files. * doc/tutorial/design/Makefile: New. * doc/tutorial/images_tour.txt: Update. * sandbox/ballas/doc/image_tours.txt: Fix typo mistakes. doc/tutorial/design/Makefile | 29 ++ doc/tutorial/design/design.tex | 52 +++ doc/tutorial/design/include/imagetours.tex | 299 +++++++++++++++++++++ doc/tutorial/design/include/properties.tex | 402 +++++++++++++++++++++++++++++ sandbox/ballas/doc/image_tours.txt | 2 5 files changed, 783 insertions(+), 1 deletion(-) Index: doc/tutorial/design/include/properties.tex --- doc/tutorial/design/include/properties.tex (revision 0) +++ doc/tutorial/design/include/properties.tex (revision 0) @@ -0,0 +1,402 @@ +\section{Properties} + + +\subsection{Notation} + +A property has several values. +Furthermore the values of a property can be seen as a hierarchy. +Hence, we need to define a notation to represent these hierarchies. +\begin{itemize} + +\item \verb+category: primary+ means that \verb+primary+ is a value of the +property category. + +\item +\begin{verbatim} +category: any + | + +--- primary + | + +--- morpher +\end{verbatim} +\end{itemize} It means that \verb+primary+ and \verb+morpher+ inherit from +\verb+any+ + +\subsection{Properties defining the image} + +%%%%%%%%%%%%%%%%%% +% Category % +%%%%%%%%%%%%%%%%%% +\subsubsection{category} +\index{Property: category} + + +\begin{verbatim} + category: any + | + +--- primary + | + +--- morpher + | + +--- domain_morpher + | + +--- value_morpher + | + +--- identity_morpher +\end{verbatim} + + +This property specifies the category of an image type. +Primary images are instantiated in the first place; they don't need any +prior image type definition. +Morpher images transform an image type into another one. +Morphers are a non-intrusive way to add or modify some behaviors in an +existing class. + + +%% FIXME image morpher + +%%%%%%%%%%%%%%%%%% +% Size % +%%%%%%%%%%%%%%%%%% +\subsubsection{size} +\index{Property: size} + +\begin{verbatim} + size: any + | + +--- regular + | + +--- huge +\end{verbatim} + + +The size property gives an indication about the memory needed by an image. +A $huge$ image is an image which cannot be fully stored in the RAM. +Accessing a $huge$ image is slower than accessing a $regular$ image. +Indeed, to access to a $huge$ image, we first need to load in the RAM a part of +the image from another storage device. + +\subsection{Properties related to the image localization} + +%%%%%%%%%%%%%%%%%% +% Localization % +%%%%%%%%%%%%%%%%%% +\subsubsection{localization} +\index{Property: localization} + +\begin{verbatim} + localization: /any/ + | + + -- none + | + + -- space + | + + -- /grid/ + | + + -- isotropic_grid + | | + | + -- basic_grid + | + + -- anisotropic_grid + +\end{verbatim} + +This property defines the underlying support of the images. +The support of an image describes the image geometry and the relationship +between its sites. +An image on a non-localized space has this property set to $none$. +An image on a localized space has this property set to $space$. +An image based on a isotropic grid has this property set to $isotropic\_gride$ +An image based on a anisotropic grid has this property set to +$anisotropic\_gride$ +An image based on a aligned and orthogonal grid has its property set to +$basic\_grid$ + +%% FIXME: Is it true? +If an image has its \verb+localization+ set to $space$, the user must define +the neighborhood relationships between the sites. +Otherwise, the image underlying grid defines the neighborhood relationships. + + +%% FIXME Image de different type de grid + +%%%%%%%%%%%%%%%%%% +% Space % +%%%%%%%%%%%%%%%%%% +\subsubsection{space} +\index{Property: space} + +\begin{verbatim} + dimension: any + | + +--- none + | + +--- some + | + +--- one_d + | + +--- two_d + | + +--- three_d + + +\end{verbatim} + +This property specifies the dimension of the image. +An image in Milena can either be in one dimension, two dimensions or three dimensions. +An image can also have no dimension specified. + + + +\subsection{Property related to the image values} + + +%%% +%%% Data storage +%%% +\subsubsection{value\_access} +\index{Property: value\_access} + +\begin{verbatim} +value\_access: any + | + +--- direct + | + +--- indirect + | + +--- computed +\end{verbatim} + + +Image values can either be computed on the fly by a function or stored in +memory. If an image type has a direct acces on the values in memory, it is +possible to take a reference of them. In this case, this property is set to +$direct$. In the other case, this property is set $indirect$. When an image +computes its values on the fly, this property is refined to $computed$. + + +\subsubsection{vw\_storage} +\index{Property: vw\_storage} + +\begin{verbatim} +vw_storage: any + | + +--- /ram/ + | | + | +--- singleton + | | + | +--- one_block + | | + | +--- piecewise + +--- irrelevant +\end{verbatim} + + +%%%%%%%%%%%%%%%%%%%%%%%% +% access % +%%%%%%%%%%%%%%%%%%%%%%%% + +\subsubsection{pw\_io} +\index{Property: pw\_io} + +\begin{verbatim} + + pw_io: any + | + +--- read + | + +--- read_write +\end{verbatim} + + +All the image types in Milena provide an access to its values through +\verb+ima(p)+ where \verb+ima+ is an image and \verb+p+ a site. + +This property describes the read/write accessibility of this access. +If the image is read only, \verb+pw_io+ is set to $read$. +If the image is readable and writable, \verb+pw_io+ is set to $read\_write$.\\ + + +%%%%%%%%%%%%%%%%%%%%%%%% +% Speed % +%%%%%%%%%%%%%%%%%%%%%%%% + +%% FIXME detais fast image..., add normal image +\subsubsection{speed} +\index{Property: speed} + +\begin{verbatim} + + speed: any + | + +--- slow + | + +--- fast + | + +--- fastest +\end{verbatim} + + This property gives some information about the time needed to access a +value from a site through \verb+ima(p)+ where \verb+ima+ is an image and +\verb+p+ a site. + +If the \verb+speed+ property is equal to $slow$, $ima(p)$ complexity is greater +than $O(1)$. +If this property is equal to $fast$, $ima(p)$ complexity is in +$O(1)$ +If this property is equal to $fastest$, $ima(p)$ complexity is +in $O(1)$. Furthermore, in this case, $ima$ has an extended domain, and $ima$ +values have a pointer semantics (it is possible to directly iterate on the +image pixels). + +\subsubsection{vw\_io} +\index{Property: vw\_io} + +%% FIXME functions that modify globaly all the values... +\begin{verbatim} + + vw_io: any + | + +--- /vm_some/ + | | + | +--- vw_read + | | + | +--- vw_read_write + +--- vw_none +\end{verbatim} + +\subsubsection{vw\_set} +\index{Property: vw\_set} + +\begin{verbatim} + + vw_io: any + | + +--- /some/ + | | + | +--- uni + | | + | +--- multi + +--- none +\end{verbatim} + + + + + +\subsection{Properties related to the extended domain} + +%%%%%%%%%%%%%%%%%%%%%%%% +% ext_domain % +%%%%%%%%%%%%%%%%%%%%%%%% +\subsubsection{ext\_domain} +\index{Property: ext\_domain} + +\begin{verbatim} + ext_domain: any + | + +--- none + | + +--- some + | + +--- fixed + | + +--- infinite + | + +--- extendable +\end{verbatim} + +This property indicates if the image has an extended domain. +An extended domain grows the image domain by adding dummy values +on the image border. +\begin{table}[!h] + \begin{center} + \begin{tabular}{c|c|c|c|c|c} + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}}\\ + \hline + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}}\\ + \hline + {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{red}{12}}} & + {\textbf{\textcolor{red}{2}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}}\\ + \hline + {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{red}{2}}} & + {\textbf{\textcolor{red}{15}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}}\\ + \hline + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}}\\ + \hline + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}} & + {\textbf{\textcolor{green}{1}}} & {\textbf{\textcolor{green}{1}}}\\ + \end{tabular} + The values equal to {\textbf{\textcolor{green}{1}}} represent the extended domain. + \end{center} + \label{tab:pprop01}\caption{Image with an extended domain of size 2.} +\end{table} +An extended domain increases the performances of the image processing +algorithms. +Indeed, image processing algorithms often use the neighbors of the image +sites. +With an extended border it isn't necessary to test if the neighbors of an image +site are included in the image domain. +The size of the extended domain can differ (\verb+fixed+, \verb+infinite+ or +\verb+extendable+). + + + +%% FIXME illustration + + +%%%%%%%%%%%%%%%%%%%%%%%% +% ext_value % +%%%%%%%%%%%%%%%%%%%%%%%% +\subsubsection{ext\_value} +\index{Property: ext\_value} + +\begin{verbatim} + ext_value: any + | + +--- undefined + | + +--- single + | + +--- multiple +\end{verbatim} + +If all the extended domain sites share the same value (in memory), this property +is set to ``single''. +If each site of the image extended domain has its proper value, this property +is set to ``multiple''. +Otherwise, this property is set to ``undefined''. + + +%%%%%%%%%%%%%%%%%%%%%%%% +% ext_io % +%%%%%%%%%%%%%%%%%%%%%%%% +\subsubsection{ext\_io} +\index{Property: ext\_io} + +\begin{verbatim} + + ext_io: any + | + +--- /some/ + | | + | +--- read + | | + | +--- read_write + +--- none +\end{verbatim} + +This property describes the read/write accessibility of the image extended +border values. Index: doc/tutorial/design/include/imagetours.tex --- doc/tutorial/design/include/imagetours.tex (revision 0) +++ doc/tutorial/design/include/imagetours.tex (revision 0) @@ -0,0 +1,299 @@ +%% Outline: +%% This file gives a quick overview of the following image types: + +%% image2d<T> +%% mmap_image2d<T> +%% file_image2d<T> +%% tiled_image +%% fun_image<S,F> +%% flat_image<S,T> +%% pkey_image<P,T> +%% pvkeys_image<P,T> + +%% graph-based images... + +%% rle_image<P,T> +%% sparse_image<P, T> +%% value_enc_image<P, T> + +%% f_image<F,I> +%% f_images<F,n,I> +%% lut_image<I,T> + +%% sub_image +%% image_if +%% hexa<I> +%% translated_image + + +\section{Images tour} + +\subsection{Introduction} + + +In the Milena library, an image can be seen as an application +$site$ to $value$. +A $site$ is a localized object in space. +Points in $1D$, $2D$ or $3D$, are the sites objects commonly used in the +library. +However, the $site$ concept allows Milena to deal with complicated image type +(for instance see the \verb+graph_image+ type). + +So, an image is composed by a set of localized objects, $sites$, that +compose the definition domain of the image. +A value is associated to each site of the image. This is the destination domain +of the image. +To access to a value of an image nammed $ima$ localized at the point p, we +just use the mathematic notation: \verb+ima(p)+. + +Obviously, every image types of Milena provide an access $site$ to $value$, +through \verb+ima(p)+. Yet, depending on the image type, the values can be +stored in different way in memory. +For instance, in the \verb+image2d+, all the values are stored directly in a +memory buffer. +On the contrary, some images compress the space taken by the destination set +like the \verb+rle_image+. +These images use runs. +A run is a succession of points that share the same value. It is encoded by +a point (the beginning of the run), and an integer (the length of the run). +Runs allows \verb+rle_image+ to gain space in memory.\\ + +%% Explain what is a run + +%% Explain the different template parameters T/S/F... +All the image types are parametrized by different static parameters. +In this document, we will used the following namming convention for the +image types parameters: +\begin{itemize} +\item{\verb+T+:} represents an image value type. +\item{\verb+S+:} represents a type of a $sites$ set. +\item{\verb+F+:} is a type of a function $site$ to $value$. +\item{\verb+P+:} represents a $site$ type. +\item{\verb+I+:} represents an image type. +\end{itemize} + +\subsection{Primary images} + +%% Primary image definition + +Primary images are a major category of Milena image type. +Primary images are not based on another image type. +They are sufficient to define themselves. +Thus, a primary image types directly holds in memory its data (values). + + +\begin{itemize} + +\item{\verb+image2d<T>+}: rectangular images based on a 2d grid with all its +values stored in a buffer in memory. An extended domain is added to the image +domain. + +Related image type: \verb+image1d<T>+, \verb+image3d<T>+. + + +\item{\verb+mmap_image2d<T>+:} this image2d-like type has its values data +``memory mapped''. + +Related image types: \verb+mmap_image1d<T>+, \verb+mmap_image3d<T>+. + +\item{\verb+file_image2d<T>+:} this image2d-like type has its values data +stored in a file. + +Related image types: \verb+file_image1d<T>+, \verb+file_image3d<T>+. + +\item{\verb+tiled_image<T>+:} FIXME. + +\item{\verb+fun_image<S, F>+:} image type defined by a domain \verb+S+ and a +function f of type \verb+F+: $site \rightarrow value$. +f associates some values to each site composing the image. + +\item{\verb+flat_image<S, T>+:} defined by a domain and a value $v$. +All the sites composing a flat image share the same value $v$. + +\item{\verb+pkey_image<P, T>+:} defined by couples $(p,v)$ where the $site$ p +is a key to retrieve the values v. A map, a sorted associative container, is +used to store the couples $(p,v)$. + +\item{\verb+pvkeys_image<P, T>+:} defined by couples $(p,v)$ where the site p is a key, and at the same time, coherently maintaining couples +($v$, list of $p$) where the value v is the key. + + +%% FIXME Graph Image +\item{\verb+graph_image+:} FIXME + +%% FIXME what is a run... +\item{\verb+rle_image<P, T>+:} defined by couples $(r, v)$, where $r$ is a run +and $v$ a value. A value is associated to each run. + +\item{\verb+sparse_image<P, T>+:} defined by couples ($r$, list of $v$) where a +run $r$ is associated to a list of values. A value is associated to each +point composing a run. + +\item{\verb+value_enc_image<P, T>+:} defined by couples ($v$, list of $r$). +A list of run is associated to every values composing the image. This is a +value-driven image. + +\end{itemize} + +\subsection{Morphers} + +%% Morpher definition +A morpher transforms a type into another one. +It can be seen as an extension of the decorator design pattern. +Morphers are a non-intrusive way to add or modify some behaviors in an +existing class. +Here, the image morphers rest upon another image (the input image(s) which +will be transformed). +Since, it extends an image, an image morpher is also an image type. + +The Milena library provide different kinds of morphers. +Domain morphers only modify the domain (the set of points/sites composing the image) of the input image. +Value morphers only change the input image values (cast the values into another +type\ldots{}) +Identity morphers don't modify either the definition domain or the image +values. + + + +\subsubsection{Domain morphers} + +\begin{itemize} + +\item{\verb+sub_image<I, S>+:} restrict an image to a given sites set. + +\item{\verb+image_if<I, F>+:} restrict the input image domain to all the image +sites that satisfy a condition expressed by a function. + +\item{\verb+hexa<I>+:} make a hexagonal mesh of the input image (the input +image must be an image in two dimension). + +\item{\verb+translated image<I, T>+:} apply a translation of $dp$, a given +delta-point to all the sites composing the input image. +\end{itemize} + +\subsubsection{Value morphers} + +\begin{itemize} + +\item{\verb+f_image<F, I>+:} transform the image values through a "function". + +\item{\verb+f_images<F, n, I>+:} takes $n$ values from $n$ input images, +and transform them through a function (that return only one value). + +\item{\verb+lut_image<I, T>+:} use a translation table, to do a binding between the input image values and the morpher output values. + +\end{itemize} + + +\subsubsection{Identity morphers} + +\begin{itemize} +\item FIXME... +\end{itemize} + + +\subsection{Data access:} + +\begin{tabular}{ccl} + +image type & ima(p) & Details\\ +\hline + +\verb+image2d<T>+ & +\lstinline+values[p.row][p.col]+ & +\verb+values+ is a buffer containing all the image\\ +& +& +values.\\ + +\\ + +\verb+fun_image<S, F>+ & +\lstinline+f(p)+ & +\verb+f+ is the function associated to the image.\\ + +\verb+flat_image<T>+ & +\lstinline+v+ & +\verb+v+ is the flat value.\\ + +\\ + +\verb+pkey_image<P, T>+ & +\lstinline+map[p]+ & +\verb+map+ is a table that associates a value to\\ +& +& +each key \verb+p+.\\ + +\verb+pkeys_image<P, T>+ & +\lstinline+map[p]+ & +same as \verb+pkey_image<P, T>+.\\ + +\\ + +\verb+rle_image<P, T>+ & +\lstinline+values[r.in_index()]+ & +\verb+values+ is an array that associates a value\\ +& +& +to each run.\\ +& +& +\verb+in_index+ returns the index of the run in\\ +& +& +the image.\\ + +\verb+sparse_image<P, T>+ & +\lstinline+values[r.in_index()][r.out_index()]+ & +\verb+values+ is an 2D array that associates a\\ +& +& +value to each point in a run.\\ +& +& +\verb+in_index+ returns the index of the run in\\ +& +& +the image.\\ +& +& +\verb+out_index+ returns the index of the current\\ +& +& +point in the run.\\ + +\verb+value_enc_image<P, T>+ & +\lstinline+values[r.in_index()]+ & +\verb+values+ is an array that associates a values\\ +& +& +to each run.\\ + +\\ + +\verb+f_image<F, I>+ & +\lstinline+f(ref(p))+ & +\verb+f+ is the function associated to the morpher.\\ +& +& +\verb+ref+ is the underlying image.\\ + +\verb+f_images<F, n, I>+ & +\lstinline+f(ref_1(p), ref_2(p), ... ref_n(p))+ & +\verb+f+ is the function associated to the morpher.\\ +& +& +\verb+ref_n+ are the underlying images.\\ + + +\verb+lut_image<I, T>+ & +\lstinline+lut[ref(p)]+ & +\verb+lut+ is the morpher translation table.\\ +& +& +\verb+ref_n+ are the underlying images.\\ + +\end{tabular} + + Index: doc/tutorial/design/design.tex --- doc/tutorial/design/design.tex (revision 0) +++ doc/tutorial/design/design.tex (revision 0) @@ -0,0 +1,52 @@ +\documentclass{article} + +%% Packages +\usepackage{latexsym} +\usepackage{exscale} +\usepackage{amssymb} +\usepackage{amsbsy} +\usepackage{epstopdf} +\usepackage{graphicx} +\usepackage{makeidx} +%%\usepackage{placeins} +\usepackage{amsmath} +\usepackage{color} +\usepackage{listings} +%%\usepackage[all]{hypcap} + +\title{Milena - Images and properties} +\author{LRDE} +\date{} + +\makeindex +%%\usepackage[nottoc, notlof, notlot]{tocbibind} + +\lstset{ + frame=single, + basicstyle=\ttfamily, + framexleftmargin=1mm, + xleftmargin=1mm, + framexrightmargin=1mm, + xrightmargin=1mm, + language=C++, + basicstyle=\small, + keywordstyle=\color{blue}\bfseries, + commentstyle=\color{red}\textit, + stringstyle=\color{green}\ttfamily +} + +%%%LISTINGS SETTINGS + + + + +\begin{document} + +\maketitle + +\tableofcontents + +\include{include/imagetours} +\include{include/properties} + +\end{document} Index: doc/tutorial/design/Makefile --- doc/tutorial/design/Makefile (revision 0) +++ doc/tutorial/design/Makefile (revision 0) @@ -0,0 +1,29 @@ +FILE = design.tex +FILEGEN = $(FILE:.tex=.pdf) +SOURCE = +PDFLATEX = pdflatex + +FIND=find . +RM=rm +RMOPT=-rf + +all: pdf + +light: $(FILE) $(SOURCE) + $(PDFLATEX) $(FILE) + +pdf: $(FILE) $(SOURCE) + $(PDFLATEX) $(FILE) + $(PDFLATEX) $(FILE) + $(PDFLATEX) $(FILE) + +clean: + $(FIND) $ -name '*.toc' -o -name '*.aux' -o -name '*.bat' $ \ + -exec $(RM) $(RMOPT) {} \; + $(FIND) $ -name '*.glo' -o -name '*.log' -o -name '*.out' $ \ + -exec $(RM) $(RMOPT) {} \; + $(FIND) $ -name '#*' -o -name '*.aux' -o -name '*~' \ + -o -name '*.idx' $ -exec $(RM) $(RMOPT) {} \; + +distclean: clean + $(RM) $(RMOPT) $(FILEGEN) Index: doc/tutorial/images_tour.txt Index: sandbox/ballas/doc/image_tours.txt --- sandbox/ballas/doc/image_tours.txt (revision 2528) +++ sandbox/ballas/doc/image_tours.txt (working copy) @@ -47,7 +47,7 @@ Some operators are only defined in special cases. Properties provide a way to check that the operator's input types respect the operator requirements. -frf + *** Specialization of an Algorithm Example:

16 years, 3 months

cleanup-2008 2528: New sample code for line-based processing.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> New sample code for line-based processing. * geraud/browsing: New. * geraud/browsing/fwd.cc: New. * geraud/browsing/fwd.hh: New. fwd.cc | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ fwd.hh | 88 +++++++++++++++++++++++++++++ 2 files changed, 284 insertions(+) Index: geraud/browsing/fwd.cc --- geraud/browsing/fwd.cc (revision 0) +++ geraud/browsing/fwd.cc (revision 0) @@ -0,0 +1,196 @@ +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/window2d.hh> +# include <mln/accu/min.hh> + +# include <mln/debug/println.hh> +# include <mln/debug/iota.hh> + +# include "fwd.hh" + + +struct base +{ + void init() {} + void final() {} + + void next() {} + + void begin() {} + void end() {} +}; + + + +template <typename I_> +struct iota : base +{ + typedef I_ I; + + I input; + mln_psite(I) p; + + unsigned c; + + void init() + { + c = 0; + } + + void next() + { + input(p) = ++c; + } +}; + + + +template <typename I_, typename A, typename W> +struct accu_win : base +{ + typedef I_ I; + + I input; + W win; + mln_psite(I) p; + mln_qiter(W) q; + + mln_accu_with(A, mln_value(I)) a; + + accu_win(const I& input, + const W& win) + : input(input), + win(win), + p(), + q(win, p) + { + } + + void next() + { + a.init(); + for_all(q) if (input.has(q)) + a.take(input(q)); + std::cout << a << ' '; + } + + void final() + { + std::cout << std::endl; + } +}; + + +// generic(accu, ima) + + +namespace mln +{ + + template <typename I> + void line_inc(const I& ima, unsigned half) + { + box2d b = ima.domain(); + unsigned nrows = b.nrows(), ncols = b.ncols(); + + for (unsigned row = 0; row < nrows; ++row) + { + unsigned col = 0; + + std::cout << std::endl + << "START : " + << std::endl + << std::endl; + + for (unsigned c = 0; c <= half; ++c) + std::cout << " take " << ima.at(row, c) << " "; + std::cout << std::endl; + + std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // ok (row, col) at line start + + + std::cout << std::endl + << "BEGIN : " + << std::endl + << std::endl; + + unsigned col_plus = half; + + while (col < half) + { + ++col; + ++col_plus; + std::cout << " take " << ima.at(row, col_plus) << " "; + std::cout << " --> OK at " << ima.at(row, col) << std::endl; + } + + std::cout << std::endl + << "MIDDLE : " + << std::endl + << std::endl; + + int col_minus = -1; + + while (col < ncols - half - 1) + { + ++col; + ++col_plus; + ++col_minus; + std::cout << " take " << ima.at(row, col_plus) << " "; + std::cout << " untake " << ima.at(row, col_minus) << " "; + std::cout << " --> OK at " << ima.at(row, col) << std::endl; + // ok (row, col) at line middle + } + std::cout << std::endl; + + + std::cout << std::endl + << "END : " + << std::endl + << std::endl; + + while (col < ncols - 1) + { + ++col; + ++col_minus; + std::cout << " untake " << ima.at(row, col_minus) << " "; + std::cout << " --> OK at " << ima.at(row, col) << std::endl; + } + std::cout << std::endl; + + abort(); + } + } + +} // mln + + +int main() +{ + using namespace mln; + + typedef image2d<unsigned> I; + I ima(3, 12, 0); + debug::iota(ima); + debug::println(ima); + + + line_inc(ima, 2); + +// typedef window2d W; +// W win; +// win.insert(dpoint2d(0,-1)); +// win.insert(dpoint2d(0, 0)); +// win.insert(dpoint2d(0, 1)); + +// accu_win<I, accu::min, W> f(ima, win); +// canvas::browsing::fwd(f); + +// canvas::browsing::row_fwd(f); + +// iota<I> f; +// f.input = ima; +// canvas::browsing::col_fwd(f); +// debug::println(ima); + +} Index: geraud/browsing/fwd.hh --- geraud/browsing/fwd.hh (revision 0) +++ geraud/browsing/fwd.hh (revision 0) @@ -0,0 +1,88 @@ + + +namespace mln +{ + + namespace canvas + { + + namespace browsing + { + + template <typename F> + void fwd(F& f) + { + trace::entering("canvas::browsing::fwd"); + mln_precondition(f.input.has_data()); + typedef typename F::I I; + mln_fwd_piter(I) p(f.input.domain()); + f.init(); + for_all(p) + { + f.p = p; + f.next(); + } + f.final(); + trace::exiting("canvas::browsing::fwd"); + } + + + template <typename F> + void row_fwd(F& f) + { + trace::entering("canvas::browsing::row_fwd"); + mln_precondition(f.input.has_data()); + box2d b = f.input.domain(); + unsigned nrows = b.nrows(), ncols = b.ncols(); + def::coord& row = f.p.row(); + def::coord& col = f.p.col(); + + f.init(); + for (row = 0; row < nrows; ++row) + { + col = 0; + f.begin(); + while (col < ncols) + { + f.next(); + ++col; + } + f.end(); + } + f.final(); + trace::exiting("canvas::browsing::row_fwd"); + } + + + template <typename F> + void col_fwd(F& f) + { + trace::entering("canvas::browsing::col_fwd"); + mln_precondition(f.input.has_data()); + box2d b = f.input.domain(); + unsigned nrows = b.nrows(), ncols = b.ncols(); + def::coord& row = f.p.row(); + def::coord& col = f.p.col(); + + f.init(); + for (col = 0; col < ncols; ++col) + { + row = 0; + f.begin(); + while (row < nrows) + { + f.next(); + ++row; + } + f.end(); // FIXME: p invalid... + } + f.final(); + trace::exiting("canvas::browsing::col_fwd"); + } + + + } // end of namespace mln::canvas::browsing + + } // end of namespace mln::canvas + +} // end of namespace mln

16 years, 3 months

cleanup-2008 2527: Some fixes.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Some fixes. * mln/morpho/erosion.spe.hh: Fix missing namespace. * mln/morpho/includes.hh: Fix missing include. * mln/canvas/browsing/fwd.hh: Remove useless trace. canvas/browsing/fwd.hh | 6 ------ morpho/erosion.spe.hh | 2 +- morpho/includes.hh | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2526) +++ mln/morpho/erosion.spe.hh (working copy) @@ -487,7 +487,7 @@ const I& input, const W& win) { if (win.is_centered()) - return erosion_on_set_centered(input, win); + return impl::erosion_on_set_centered(input, win); else return impl::generic::erosion_on_set(input, win); } Index: mln/morpho/includes.hh --- mln/morpho/includes.hh (revision 2526) +++ mln/morpho/includes.hh (working copy) @@ -40,6 +40,8 @@ # include <mln/core/concept/window.hh> # include <mln/core/concept/neighborhood.hh> +# include <mln/core/routine/clone.hh> + # include <mln/value/ops.hh> # include <mln/accu/min.hh> Index: mln/canvas/browsing/fwd.hh --- mln/canvas/browsing/fwd.hh (revision 2526) +++ mln/canvas/browsing/fwd.hh (working copy) @@ -93,19 +93,13 @@ mln_precondition(f.input.has_data()); typedef typename F::I I; mln_fwd_piter(I) p(f.input.domain()); - trace::entering("canvas::browsing::fwd::init"); f.init(); - trace::exiting("canvas::browsing::fwd::init"); for_all(p) { f.p = p; - trace::entering("canvas::browsing::fwd::next"); f.next(); - trace::exiting("canvas::browsing::fwd::next"); } - trace::entering("canvas::browsing::fwd::final"); f.final(); - trace::exiting("canvas::browsing::fwd::final"); trace::exiting("canvas::browsing::fwd"); }

16 years, 3 months

cleanup-2008 2525: Prototype for bijective and 2 ways functions.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Prototype for bijective and 2 ways functions. Not tested yet so it goes to sandbox * abraham/mln/fun: New. * abraham/mln/fun/v2w2v: New. * abraham/mln/fun/v2w2v/cos.hh: New Example of bijective function using cosinus. * abraham/mln/fun/v2w_w2v: New. * abraham/mln/fun/v2w_w2v/norm.hh: New Example of 2 way function using norm. * abraham/mln/core: New. * abraham/mln/core/concept: New. * abraham/mln/core/concept/function.hh: New Definition of bijective and 2 way function concepts (Function_v2w2v and Function_v2w_w2v). * abraham/mln/math: New. * abraham/mln/math/cos.hh: New templated mln::math::cos function. * abraham/mln/math/acos.hh: New templated mln::math::acos function. core/concept/function.hh | 513 +++++++++++++++++++++++++++++++++++++++++++++++ fun/v2w2v/cos.hh | 95 ++++++++ math/acos.hh | 65 +++++ math/cos.hh | 65 +++++ 4 files changed, 738 insertions(+) Index: abraham/mln/fun/v2w2v/cos.hh --- abraham/mln/fun/v2w2v/cos.hh (revision 0) +++ abraham/mln/fun/v2w2v/cos.hh (revision 0) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 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. + +#ifndef MLN_FUN_V2W2V_COS_HH +# define MLN_FUN_V2W2V_COS_HH + +/*! \file mln/fun/v2w2v/cos.hh + * + * \brief Cos functor. + * + * \see mln/math/. + */ + +# include <mln/core/concept/function.hh> +# include <mln/trait/value_.hh> + +# include <mln/math/cos.hh> +# include <mln/math/acos.hh> + + +namespace mln +{ + + namespace fun + { + + namespace v2w2v + { + + /*! \brief Cosinus bijective functor. + * + * \c V is the type of input values and the result type. + * + * \see mln::math::cos. + */ + template <typename V> + struct cos : public Function_v2w2v< cos<V> > + { + typedef V result; + V operator()(const V& v) const; + V f_1 (const V& v) const; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + inline + V + cos<V>::operator()(const V& v) const + { + return mln::math::cos (v); + } + + template <typename V> + inline + V + cos<V>::f_1(const V& v) const + { + return mln::math::acos (v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::v2w2v + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_V2W2V_COS_HH Index: abraham/mln/fun/v2w_w2v/norm.hh Index: abraham/mln/core/concept/function.hh --- abraham/mln/core/concept/function.hh (revision 0) +++ abraham/mln/core/concept/function.hh (revision 0) @@ -0,0 +1,513 @@ +// Copyright (C) 2007 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. + +#ifndef MLN_CORE_CONCEPT_FUNCTION_HH +# define MLN_CORE_CONCEPT_FUNCTION_HH + +/*! \file mln/core/concept/function.hh + * + * \brief Definition of several concepts of functions. + */ + +# include <mln/core/concept/object.hh> + + +namespace mln +{ + + // Fwd decls. + template <typename E> struct Function; + template <typename E> struct Function_v2v; + template <typename E> struct Function_v2w2v; + template <typename E> struct Function_v2w_w2v; + template <typename E> struct Function_i2v; + template <typename E> struct Function_p2v; + template <typename E> struct Function_v2b; + template <typename E> struct Function_p2b; + template <typename E> struct Function_p2p; + template <typename E> struct Function_x2x; + + template <typename E> struct Function_vv2v; + + + /// Function category flag type. + template <> + struct Function<void> + { + typedef Object<void> super; + }; + + + /*! \brief Base class for implementation of function-objects. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function : public Object<E> + { + typedef Function<void> category; + + /* + An operator() has to be provided. Its signature depends + on the particular function-object one considers. + */ + protected: + Function(); + Function(const Function&); + }; + + + /*-----------------. + | Value -> Value. | + `-----------------*/ + + template <> + struct Function_v2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value to value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_v2v : public Function<E> + { + typedef Function_v2v<void> category; + protected: + Function_v2v(); + Function_v2v(const Function_v2v&); + }; + + + /*----------------------------. + | Value <-> Value (Bijective) | + `----------------------------*/ + + // FIXME : should it also be a v2v function? + + template <> + struct Function_v2w2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value V to value W and vice versa. + * + * The parameter \a E is the exact type. + */ + + template <typename E> + struct Function_v2w2v : public Function<E> + { + typedef Function_v2w2v<void> category; + + /* + result operator() (value); + value f_1 (result); + */ + + protected: + Function_v2w2v(); + Function_v2w2v(const Function_v2w2v&); + }; + + + /*---------------------------. + | Value <-> Value (Two ways) | + `---------------------------*/ + + // FIXME : should it also be a v2v function? + + template <> + struct Function_v2w_w2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * value V to value W and from W to V thanks to the previous + * value V. + * + * The parameter \a E is the exact type. + * + * eg: f : x -> norm(x) + * f_1: (x, n) -> x' := x / norm(x) * n + */ + + template <typename E> + struct Function_v2w_w2v : public Function<E> + { + typedef Function_v2w2v<void> category; + + /* + result operator() (value); + value f_1 (result, value); + */ + + protected: + Function_v2w_w2v(); + Function_v2w_w2v(const Function_v2w2v&); + }; + + + /*-----------------. + | Index -> Value. | + `-----------------*/ + + template <> + struct Function_i2v<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * index to value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_i2v : public Function_v2v<E> + { + typedef Function_i2v<void> category; + protected: + Function_i2v(); + Function_i2v(const Function_i2v&); + }; + + + /*-----------------. + | Point -> Value. | + `-----------------*/ + + template <> + struct Function_p2v<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from point to + * value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2v : public virtual Function_v2v<E> + { + typedef Function_p2v<void> category; + protected: + Function_p2v(); + Function_p2v(const Function_p2v&); + }; + + + /*----------------. + | Value -> bool. | + `----------------*/ + + template <> + struct Function_v2b<void> { typedef Function_v2v<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from value to + * bool. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_v2b : public virtual Function_v2v<E> + { + typedef Function_v2b<void> category; + typedef bool result; + protected: + Function_v2b(); + Function_v2b(const Function_v2b&); + }; + + + /*----------------. + | Point -> bool. | + `----------------*/ + + template <> + struct Function_p2b<void> { typedef Function_p2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from point to + * bool. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2b : public Function_p2v<E>, + public Function_v2b<E> + { + typedef Function_p2b<void> category; + typedef bool result; + protected: + Function_p2b(); + Function_p2b(const Function_p2b&); + }; + + + /*-----------------. + | Point -> Point. | + `-----------------*/ + + template <> + struct Function_p2p<void> { typedef Function_p2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from point to + * point. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_p2p : public Function_p2v<E> + { + typedef Function_p2p<void> category; + protected: + Function_p2p(); + Function_p2p(const Function_p2p&); + }; + + + /*-------------------. + | Vector -> Vector. | + `-------------------*/ + + template <> + struct Function_x2x<void> { typedef Function_v2v<void> super; }; // FIXME + + /*! + * \brief Base class for implementation of function-objects from vector to + * vector. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_x2x : public Function_v2v<E> + { + typedef Function_x2x<void> category; + protected: + Function_x2x(); + Function_x2x(const Function_x2x&); + }; + + + /*--------------------. + | Vector <-> Vector. | + `--------------------*/ + + /*! + * \brief Base class for implementation of bijective function-objects from + * vector to vector. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Bijection_x2x : public Function_x2x< E > + { + /* + typedef invert; + invert inv() const; + */ + protected: + Bijection_x2x(); + }; + + + /*------------------------. + | Value, Value -> Value. | + `------------------------*/ + + template <> + struct Function_vv2v<void> { typedef Function<void> super; }; + + /*! + * \brief Base class for implementation of function-objects from + * a couple of values to a value. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Function_vv2v : public Function<E> + { + typedef Function_vv2v<void> category; + protected: + Function_vv2v(); + Function_vv2v(const Function_vv2v&); + }; + + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename E> + inline + Function<E>::Function() + { + typedef mln_result(E) result; + } + + template <typename E> + inline + Function<E>::Function(const Function<E>& rhs) + : Object<E>(rhs) + { + } + + template <typename E> + inline + Function_v2v<E>::Function_v2v() + { + } + + template <typename E> + inline + Function_v2v<E>::Function_v2v(const Function_v2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_v2w2v<E>::Function_v2w2v(const Function_v2w2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_v2w_w2v<E>::Function_v2w_w2v(const Function_v2w_w2v<E>& rhs) + : Function<E>(rhs) + { + } + + template <typename E> + inline + Function_i2v<E>::Function_i2v() + { + } + + template <typename E> + inline + Function_i2v<E>::Function_i2v(const Function_i2v<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_p2v<E>::Function_p2v() + { + } + + template <typename E> + inline + Function_p2v<E>::Function_p2v(const Function_p2v<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_v2b<E>::Function_v2b() + { + } + + template <typename E> + inline + Function_v2b<E>::Function_v2b(const Function_v2b<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Function_p2b<E>::Function_p2b() + { + } + + template <typename E> + inline + Function_p2b<E>::Function_p2b(const Function_p2b<E>& rhs) + : Function_v2v<E>(rhs), + Function_p2v<E>(rhs), + Function_v2b<E>(rhs) + { + } + + template <typename E> + inline + Function_p2p<E>::Function_p2p() + { + } + + template <typename E> + inline + Function_p2p<E>::Function_p2p(const Function_p2p<E>& rhs) + : Function_p2v<E>(rhs) + { + } + + template <typename E> + inline + Function_x2x<E>::Function_x2x() + { + } + + template <typename E> + inline + Function_x2x<E>::Function_x2x(const Function_x2x<E>& rhs) + : Function_v2v<E>(rhs) + { + } + + template <typename E> + inline + Bijection_x2x<E>::Bijection_x2x() + { + typedef typename E::invert invert; + invert (E::*m)() const = & E::inv; + m = 0; + } + + template <typename E> + inline + Function_vv2v<E>::Function_vv2v() + { + } + + template <typename E> + inline + Function_vv2v<E>::Function_vv2v(const Function_vv2v<E>& rhs) + : Function<E>(rhs) + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_CONCEPT_FUNCTION_HH Index: abraham/mln/math/cos.hh --- abraham/mln/math/cos.hh (revision 0) +++ abraham/mln/math/cos.hh (revision 0) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 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. + +#ifndef MLN_MATH_COS_HH +# define MLN_MATH_COS_HH + +/*! \file mln/math/cos.hh + * + * \brief Define the cosinus (cos) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T cos(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + T cos(const T& v) + { + return std::cos(v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_COS_HH Index: abraham/mln/math/acos.hh --- abraham/mln/math/acos.hh (revision 0) +++ abraham/mln/math/acos.hh (revision 0) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 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. + +#ifndef MLN_MATH_ACOS_HH +# define MLN_MATH_ACOS_HH + +/*! \file mln/math/acos.hh + * + * \brief Define the arc cosinus (acos) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T acos(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + T acos(const T& v) + { + return std::acos(v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_ACOS_HH

16 years, 3 months

scool r109: Fix bug in r107 (not translating scool AST in some cases)

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix bug in r107 (not translating scool AST in some cases) * Class.str: Translate the StaticFunctionCall into C++. Class.str | 8 +++++--- Expression.str | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) Index: branches/scool-ng/src/scoolt/Expression.str =================================================================== --- branches/scool-ng/src/scoolt/Expression.str (revision 108) +++ branches/scool-ng/src/scoolt/Expression.str (revision 109) @@ -8,6 +8,7 @@ Identifier(idf) -> CxxId(idf) + BaseExpressionToCxx: idf -> cxx_idf where Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 108) +++ branches/scool-ng/src/scoolt/Class.str (revision 109) @@ -1,6 +1,6 @@ module Class -imports libstratego-lib Cxx Scool Declaration +imports libstratego-lib Cxx Scool Declaration Expression rules @@ -50,14 +50,16 @@ <?Some("abstract") <+ ?None()> cqualif AddExactParameter(| cqualif, cxx_idf): - SimpleType(type) -> StaticFunctionCall(Identifier(type), Parameters([params])) + SimpleType(type) -> cxx_class where <ExactParameter(| cqualif, cxx_idf)> [] => params + ; <StaticExpressionToCxx> StaticFunctionCall(Identifier(type), Parameters([params])) => cxx_class AddExactParameter(| cqualif, cxx_idf): - StaticFunctionCall(idf, Parameters(params)) -> StaticFunctionCall(idf, Parameters(new_params)) + StaticFunctionCall(idf, Parameters(params)) -> cxx_class where <conc> ([<ExactParameter(| cqualif, cxx_idf)> []], params) => new_params + ; <StaticExpressionToCxx> StaticFunctionCall(idf, Parameters(new_params)) => cxx_class ExactParameter(| cqualif, cxx_idf): _ -> Identifier(idf) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

scool r108: Fix reference files

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix reference files * class/c++_ast/inheritance_001.aterm, * class/c++_ast/inheritance_002.aterm, * class/c++_ast/inheritance_004.aterm: here. inheritance_001.aterm | 2 +- inheritance_002.aterm | 2 +- inheritance_004.aterm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",StaticFunctionCall(Identifier("Bar"),Parameters([Identifier("Exact")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",CxxType(CxxId("Bar"),[CxxId("Exact")])),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",StaticFunctionCall(Identifier("Animal"),Parameters([Identifier("Exact")]))),[]),CxxClassDecl([],CxxId("Monkey"),("public",StaticFunctionCall(Identifier("Mammal"),Parameters([Identifier("Monkey")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",CxxType(CxxId("Animal"),[CxxId("Exact")])),[]),CxxClassDecl([],CxxId("Monkey"),("public",CxxType(CxxId("Mammal"),[CxxId("Monkey")])),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 107) +++ branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 108) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",StaticFunctionCall(Identifier("Foo"),Parameters([Identifier("Exact"),Integer("42")]))),[])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",CxxType(CxxId("Foo"),[CxxId("Exact"),CxxInt("42")])),[])]) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

scool r107: Handle inheritance from templated classes

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle inheritance from templated classes * Class.str: Here. Class.str | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 106) +++ branches/scool-ng/src/scoolt/Class.str (revision 107) @@ -54,12 +54,16 @@ where <ExactParameter(| cqualif, cxx_idf)> [] => params + AddExactParameter(| cqualif, cxx_idf): + StaticFunctionCall(idf, Parameters(params)) -> StaticFunctionCall(idf, Parameters(new_params)) + where + <conc> ([<ExactParameter(| cqualif, cxx_idf)> []], params) => new_params + ExactParameter(| cqualif, cxx_idf): _ -> Identifier(idf) where <? Some("final")> cqualif ; <? CxxId(idf)> cxx_idf - // FIXME : I only have the cxx_idf and rather want the scl_idf to build my SFC ExactParameter(| cqualif, cxx_idf): _ -> Identifier("Exact") -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

scool r106: Add reference files for tests on inheritance

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-06 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on inheritance * class/c++_ast/inheritance_001.aterm: New. * class/c++_ast/inheritance_002.aterm: New. * class/c++_ast/inheritance_004.aterm: New. inheritance_001.aterm | 1 + inheritance_002.aterm | 1 + inheritance_004.aterm | 1 + 3 files changed, 3 insertions(+) Index: branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_001.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),("public",StaticFunctionCall(Identifier("Bar"),Parameters([Identifier("Exact")]))),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_002.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Animal"),[],[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Mammal"),("public",StaticFunctionCall(Identifier("Animal"),Parameters([Identifier("Exact")]))),[]),CxxClassDecl([],CxxId("Monkey"),("public",StaticFunctionCall(Identifier("Mammal"),Parameters([Identifier("Monkey")]))),[])]) Index: branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 0) +++ branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (revision 106) @@ -0,0 +1 @@ +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Cat"),("public",StaticFunctionCall(Identifier("Foo"),Parameters([Identifier("Exact"),Integer("42")]))),[])]) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

2525: Simplify face iterators using the new accessors of face handles.

by Roland Levillain

* mln/topo/face_iter.hh (mln::topo::face_fwd_iter<D>::next_) (mln::topo::face_bkd_iter<D>::next_) * mln/topo/n_face_iter.hh (mln::topo::n_face_fwd_iter<D>::next_) (mln::topo::n_face_bkd_iter<D>::next_) * mln/topo/static_n_face_iter.hh (mln::topo::static_n_face_fwd_iter<N, D>::next_) (mln::topo::static_n_face_bkd_iter<N, D>::next_): Here. --- milena/ChangeLog | 15 +++++++++++ milena/mln/topo/face_iter.hh | 42 +++++++------------------------- milena/mln/topo/n_face_iter.hh | 28 +++------------------ milena/mln/topo/static_n_face_iter.hh | 30 +++-------------------- 4 files changed, 32 insertions(+), 83 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d647d7e..18b410e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + Simplify face iterators using the new accessors of face handles. + + * mln/topo/face_iter.hh + (mln::topo::face_fwd_iter<D>::next_) + (mln::topo::face_bkd_iter<D>::next_) + * mln/topo/n_face_iter.hh + (mln::topo::n_face_fwd_iter<D>::next_) + (mln::topo::n_face_bkd_iter<D>::next_) + * mln/topo/static_n_face_iter.hh + (mln::topo::static_n_face_fwd_iter<N, D>::next_) + (mln::topo::static_n_face_bkd_iter<N, D>::next_): + Here. + +2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + Add extra accessors for topo::face<D> and topo::n_face<N, D>. * mln/topo/face.hh diff --git a/milena/mln/topo/face_iter.hh b/milena/mln/topo/face_iter.hh index b34bfbd..2c0df92 100644 --- a/milena/mln/topo/face_iter.hh +++ b/milena/mln/topo/face_iter.hh @@ -169,26 +169,14 @@ namespace mln { if (is_valid()) { - unsigned n = f_.n(); - unsigned face_id = f_.face_id(); - - if (face_id + 1 < f_.cplx().nfaces(n)) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().nfaces(f_.n())) + f_.inc_face_id(); else // Start to iterate on the faces of the next dimension if // possible. - if (n <= D) + if (f_.n() <= D) { - // FIXME: Same remark as above. - f_.set_n(n + 1); + f_.inc_n(); f_.set_face_id(0u); } else @@ -233,27 +221,15 @@ namespace mln { if (is_valid()) { - unsigned n = f_.n(); - unsigned face_id = f_.face_id(); - - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else // Start to iterate on the faces of the previous dimension // if it exists. - if (n > 0) + if (f_.n() > 0) { - // FIXME: Same remark as above. - f_.set_n(n - 1); - f_.set_face_id(f_.cplx().nfaces(n - 1) - 1); + f_.dec_n(); + f_.set_face_id(f_.cplx().nfaces(f_.n()) - 1); } else invalidate(); diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh index eaf9ef9..4b658bb 100644 --- a/milena/mln/topo/n_face_iter.hh +++ b/milena/mln/topo/n_face_iter.hh @@ -191,19 +191,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - // The number of faces of dimension N in cplx_. - unsigned nn_faces = f_.cplx().nfaces(n()); - if (face_id + 1 < nn_faces) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().nfaces(n())) + f_.inc_face_id(); else invalidate(); } @@ -265,17 +254,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() returning - a mutable reference? This way, we could just write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else invalidate(); } diff --git a/milena/mln/topo/static_n_face_iter.hh b/milena/mln/topo/static_n_face_iter.hh index 3868e01..db184ba 100644 --- a/milena/mln/topo/static_n_face_iter.hh +++ b/milena/mln/topo/static_n_face_iter.hh @@ -174,20 +174,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - // The number of faces of dimension N in cplx_. - unsigned nn_faces = f_.cplx().template nfaces<N>(); - if (face_id + 1 < nn_faces) - /* FIXME: Provide accessor face::face_id() - returning a mutable reference? This way, we could just - write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id + 1); + if (f_.face_id() + 1 < f_.cplx().template nfaces<N>()) + f_.inc_face_id(); else invalidate(); } @@ -235,18 +223,8 @@ namespace mln { if (is_valid()) { - unsigned face_id = f_.face_id(); - if (face_id > 0) - /* FIXME: Provide accessor face::face_id() - returning a mutable reference? This way, we could just - write - - ++f_.face_id(); - - instead of the following. - - Or add {inc,add}_face_id() services. */ - f_.set_face_id(face_id - 1); + if (f_.face_id() > 0) + f_.dec_face_id(); else invalidate(); } -- 1.5.6.5

16 years, 3 months

2524: Add extra accessors for topo::face<D> and topo::n_face<N, D>.

by Roland Levillain

* mln/topo/face.hh (mln::topo::face<D>::inc_n) (mln::topo::face<D>::dec_n) (mln::topo::face<D>::inc_face_id) (mln::topo::face<D>::dec_face_id) * mln/topo/n_face.hh (mln::topo::n_face<N, D>::inc_face_id) (mln::topo::n_face<N, D>::dec_face_id): New methods. --- milena/ChangeLog | 14 ++++++++++++++ milena/mln/topo/face.hh | 42 ++++++++++++++++++++++++++++++++++++++++++ milena/mln/topo/n_face.hh | 20 ++++++++++++++++++++ 3 files changed, 76 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 03789ee..d647d7e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,17 @@ +2008-10-06 Roland Levillain <roland(a)lrde.epita.fr> + + Add extra accessors for topo::face<D> and topo::n_face<N, D>. + + * mln/topo/face.hh + (mln::topo::face<D>::inc_n) + (mln::topo::face<D>::dec_n) + (mln::topo::face<D>::inc_face_id) + (mln::topo::face<D>::dec_face_id) + * mln/topo/n_face.hh + (mln::topo::n_face<N, D>::inc_face_id) + (mln::topo::n_face<N, D>::dec_face_id): + New methods. + 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> Introduce a header for iterators on complexes. diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index ac02877..bd2c3cd 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -88,10 +88,20 @@ namespace mln /// Set the complex the face belongs to. void set_cplx(complex<D>& cplx); + /// Set the dimension of the face. void set_n(unsigned n); + /// Increment the dimension of the face. + void inc_n(); + /// Decrement the dimension of the face. + void dec_n(); + /// Set the id of the face. void set_face_id(unsigned face_id); + /// Increment the id of the face. + void inc_face_id(); + /// Decrement the id of the face. + void dec_face_id(); /// Return the mln::topo::face_data pointed by this handle. template <unsigned N> @@ -248,12 +258,44 @@ namespace mln template <unsigned D> inline void + face<D>::inc_n() + { + ++n_; + } + + template <unsigned D> + inline + void + face<D>::dec_n() + { + --n_; + } + + template <unsigned D> + inline + void face<D>::set_face_id(unsigned face_id) { face_id_ = face_id; } template <unsigned D> + inline + void + face<D>::inc_face_id() + { + ++face_id_; + } + + template <unsigned D> + inline + void + face<D>::dec_face_id() + { + --face_id_; + } + + template <unsigned D> template <unsigned N> inline face_data<N, D>& diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index 6cf3b37..f0a7277 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -86,6 +86,10 @@ namespace mln unsigned n() const; /// Set the id of the face. void set_face_id(unsigned face_id); + /// Increment the id of the face. + void inc_face_id(); + /// Decrement the id of the face. + void dec_face_id(); /// Return the mln::topo::face_data pointed by this handle. face_data<N, D>& data() const; @@ -223,6 +227,22 @@ namespace mln template <unsigned N, unsigned D> inline + void + n_face<N, D>::inc_face_id() + { + ++face_id_; + } + + template <unsigned N, unsigned D> + inline + void + n_face<N, D>::dec_face_id() + { + --face_id_; + } + + template <unsigned N, unsigned D> + inline face_data<N, D>& n_face<N, D>::data() const { -- 1.5.6.5

16 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches