Olena-patches October 2007

olena-patches@lrde.epita.fr

8 participants
229 discussions

1422: Configure milena/tests/norm/Makefile.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/tests/norm/Makefile. configure.ac | 3 +++ 1 file changed, 3 insertions(+) Index: configure.ac --- configure.ac (revision 1421) +++ configure.ac (working copy) @@ -107,6 +107,9 @@ # FIXME: Should be performed through oln.m4 macros. AC_CONFIG_FILES([ milena/tests/Makefile + milena/tests/norm/Makefile +]) +AC_CONFIG_FILES([ olena/tests/algorithms/Makefile olena/tests/check/Makefile olena/tests/check/defs

16 years, 5 months

1421: Move norm-related tests to their own directory.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Move norm-related tests to their own directory. * tests/norm/: New directory. * tests/l1.cc, tests/l2.cc, tests/linfty.cc: Move... * tests/norm/l1.cc, tests/norm/l2.cc, tests/norm/linfty.cc: ...here. * tests/tests.mk: ...here (new file). * tests/Makefile.am: Move general purpose, test-related variables... * tests/norm/Makefile.am: New. Makefile.am | 14 ++------------ norm/Makefile.am | 14 ++++++++++++++ tests.mk | 12 ++++++++++++ 3 files changed, 28 insertions(+), 12 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 1420) +++ tests/Makefile.am (working copy) @@ -1,18 +1,8 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -## FIXME: Revamp (see Olena 0.11's test suite). - -AM_CPPFLAGS = -I$(top_srcdir)/milena - -# FIXME: Add -# -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) -# -# when oln.m4 is available in the distribution, instead of using the -# set-by-hand TESTS_CXXFLAGS. -TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -AM_CXXFLAGS = $(TESTS_CXXFLAGS) +include $(top_srcdir)/milena/tests/tests.mk +SUBDIRS = norm check_PROGRAMS = \ accu_all \ Index: tests/tests.mk --- tests/tests.mk (revision 0) +++ tests/tests.mk (revision 0) @@ -0,0 +1,12 @@ +## FIXME: Revamp (see Olena 0.11's test suite). + +AM_CPPFLAGS = -I$(top_srcdir)/milena + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +AM_CXXFLAGS = $(TESTS_CXXFLAGS) Index: tests/norm/Makefile.am --- tests/norm/Makefile.am (revision 0) +++ tests/norm/Makefile.am (revision 0) @@ -0,0 +1,14 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + l1 \ + l2 \ + linfty + +l1_SOURCES = l1.cc +l2_SOURCES = l2.cc +linfty_SOURCES = linfty.cc + +TESTS = $(check_PROGRAMS)

16 years, 5 months

1419: Refactor the L-infinity-norm, and test it.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Refactor the L-infinity-norm, and test it. * mln/norm/infty.hh: Rename as... * mln/norm/linfty.hh: ...this. Use type `mln_value_sum(C)' instead of `float' to handle L-infinity-norm values. (mln::norm::impl::linfty_, mln::norm::impl::linfty_distance_): New. Use to factor the implementations of... (mln::norm::linfty, mln::norm::linfty_distance): ...these functions. (linfty_distance(const metal::vec<n,C>&, const metal::vec<n,C>&)): New function. * tests/linfty.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add linfty. (linfty_SOURCES): New. mln/norm/linfty.hh | 104 ++++++++++++++++++++++++++++++++++++----------------- tests/Makefile.am | 2 + tests/linfty.cc | 34 ++++++++--------- 3 files changed, 91 insertions(+), 49 deletions(-) Index: mln/norm/linfty.hh --- mln/norm/linfty.hh (revision 1417) +++ mln/norm/linfty.hh (working copy) @@ -25,15 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_NORM_INFTY_HH -# define MLN_NORM_INFTY_HH +#ifndef MLN_NORM_LINFTY_HH +# define MLN_NORM_LINFTY_HH -/*! \file mln/norm/infty.hh +/*! \file mln/norm/linfty.hh * - * \brief Define some infinity-norm related routines. + * \brief Define some L-infinity-norm related routines. + * \see http://mathworld.wolfram.com/L-Infinity-Norm.html for more + * information. */ -# include <cmath> +# include <mln/math/abs.hh> # include <mln/metal/vec.hh> @@ -43,56 +45,94 @@ namespace norm { - /// Infinity-norm of a vector \p v (being a C static array). + /// L-infinity-norm of a vector \a vec. + /// \{ template <unsigned n, typename C> - C infty(const C (&v)[n]); + C linfty(const C (&vec)[n]); - /// Infinity-norm of a vector \p v (being a metal::vec). template <unsigned n, typename C> - C infty(const metal::vec<n,C>& v); + C linfty(const metal::vec<n,C>& vec); + /// \} - /// Infinity-norm distance between vectors \p v1 and \p v2. + /// L-infinity-norm distance between vectors \a vec1 and \a vec2. + /// \{ template <unsigned n, typename C> - C infty_distance(const C (&v1)[n], const C (&v2)[n]); + C linfty_distance(const C (&vec1)[n], const C (&vec2)[n]); + + template <unsigned n, typename C> + C linfty_distance(const metal::vec<n,C>& vec1, + const metal::vec<n,C>& vec2); + /// \} # ifndef MLN_INCLUDE_ONLY - template <unsigned n, typename C> - C infty(const C (&v)[n]) + namespace impl { - C c = 0; - for (unsigned i = 0; i < n; ++i) - if (std::abs(v[i]) > c) - c = std::abs(v[i]); - return c; - } - template <unsigned n, typename C> - C infty(const metal::vec<n,C>& v) + template <unsigned n, typename C, typename V> + C linfty_(const V& vec) { - // FIXME: Add a ctor to metal::vec... - C c = 0; + C m = 0; for (unsigned i = 0; i < n; ++i) - if (std::abs(v[i]) > c) - c = std::abs(v[i]); - return c; + { + // Compute the maximal component absolute value of the + // vector. + C mc = mln::math::abs(vec[i]); + if (mc > m) + m = mc; + } + return m; } - template <unsigned n, typename C> - C infty_distance(const C (&v1)[n], const C (&v2)[n]) + template <unsigned n, typename C, typename V> + C linfty_distance_(const V& vec1, const V& vec2) { C d = 0; for (unsigned i = 0; i < n; ++i) { - C dd = v2[i] > v1[i] ? v2[i] - v1[i] : v1[i] - v2[i]; - if (dd > d) - d = dd; + // Compute the maximal absolute value of the distance + // between components of the same index. + C dc = mln::math::abs(vec1[i] - vec2[i]); + if (dc > d) + d = dc; } return d; } + } // end of namespace mln::norm::impl + + + /*----------. + | Facades. | + `----------*/ + + template <unsigned n, typename C> + C linfty(const C (&vec)[n]) + { + return impl::linfty_<n, C>(vec); + } + + template <unsigned n, typename C> + C linfty(const metal::vec<n,C>& vec) + { + return impl::linfty_<n, C>(vec); + } + + template <unsigned n, typename C> + C linfty_distance(const C (&vec1)[n], const C (&vec2)[n]) + { + return impl::linfty_distance_<n, C>(vec1, vec2); + } + + template <unsigned n, typename C> + C linfty_distance(const metal::vec<n,C>& vec1, + const metal::vec<n,C>& vec2) + { + return impl::linfty_distance_<n, C>(vec1, vec2); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::norm @@ -100,4 +140,4 @@ } // end of namespace mln -#endif // ! MLN_NORM_INFTY_HH +#endif // ! MLN_NORM_LINFTY_HH Index: tests/linfty.cc --- tests/linfty.cc (revision 1417) +++ tests/linfty.cc (working copy) @@ -25,50 +25,50 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/l2.hh -/// \brief Test the L2-norm. +/// \file tests/linfty.hh +/// \brief Test the L-infinity-norm. #include <cmath> #include <cassert> #include <mln/metal/vec.hh> #include <mln/math/abs.hh> -#include <mln/norm/l2.hh> +#include <mln/norm/linfty.hh> // FIXME: We should have a almost_equal function somewhere in Milena. static const float epsilon = 0.0001; using mln::metal::vec; -using mln::norm::l2; +using mln::norm::linfty; template <typename V> -void check_l2 (const V& vec1, const V& vec2) +void check_linfty (const V& vec1, const V& vec2) { - assert (mln::math::abs(mln::norm::l2(vec1) - mln::norm::l2(vec2)) + assert (mln::math::abs(mln::norm::linfty(vec1) - mln::norm::linfty(vec2)) < epsilon); } template <typename V, typename S> -void check_l2_distance (const V& vec1, const V& vec2, const S& ref_val) +void check_linfty_distance (const V& vec1, const V& vec2, const S& ref_val) { - assert (mln::math::abs(mln::norm::l2_distance(vec1, vec2) - ref_val) + assert (mln::math::abs(mln::norm::linfty_distance(vec1, vec2) - ref_val) < epsilon); } int main () { - vec<3, int> t; t.set (2, -2, 3); + vec<3, int> t; t.set (2, -2, 4); vec<3, int> u; u.set (4, 1, 0); - float d = std::sqrt((4 - 2) * (4 - 2) + - (1 + 2) * (1 + 2) + - (0 - 3) * (0 - 3)); + float d = std::max(std::abs(4 - 2), + std::max(std::abs(1 + 2), + std::abs(0 - 4))); - check_l2(t, u); - check_l2_distance (t, u, d); + check_linfty(t, u); + check_linfty_distance (t, u, d); - int v[] = {2, -2, 3}; + int v[] = {2, -2, 4}; int w[] = {4, 1, 0}; - check_l2(v, w); - check_l2_distance (v, w, d); + check_linfty(v, w); + check_linfty_distance (v, w, d); } Index: tests/Makefile.am --- tests/Makefile.am (revision 1419) +++ tests/Makefile.am (working copy) @@ -86,6 +86,7 @@ \ l1 \ l2 \ + linfty \ labeling_algo \ labeling_estimate \ labeling_foreground \ @@ -274,6 +275,7 @@ l1_SOURCES = l1.cc l2_SOURCES = l2.cc +linfty_SOURCES = linfty.cc labeling_algo_SOURCES = labeling_algo.cc labeling_estimate_SOURCES = labeling_estimate.cc labeling_foreground_SOURCES = labeling_foreground.cc

16 years, 5 months

milena r1419: Add functon which display a binary image from a FLLT branch

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-31 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add functon which display a binary image from a FLLT branch. * mln/util/tree_to_image.hh: (display_branch(const Image<J>& ima_, node* node)) : Take a node and compute its binary image from set_p of FLLT and display this image. --- tree_to_image.hh | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) Index: trunk/milena/mln/util/tree_to_image.hh =================================================================== --- trunk/milena/mln/util/tree_to_image.hh (revision 1418) +++ trunk/milena/mln/util/tree_to_image.hh (revision 1419) @@ -47,23 +47,19 @@ template <typename T, typename I> void - tree_to_image_rec(node<T>* node, Image& output_); - - template <typename T, typename I> - void tree_to_image (tree<T>& tree, Image& output_); template <typename P, typename J> void display_set(const Image<J>& ima_, set_p& s); - template <typename T, typename J> + template <typename I, typename J> void - display_tree_rec(const Image<J>& ima_, node<T>* node, int level); + display_tree(const Image<J>& ima_, tree& tree); template <typename I, typename J> void - display_tree(const Image<J>& ima_, tree& tree); + display_branch(const Image<J>& ima_, node* node); # ifndef MLN_INCLUDE_ONLY @@ -142,6 +138,36 @@ display_tree_rec(ima, tree.root(), level); } + template <typename T, typename J, typename K> + void + display_branch_rec(const Image<J>& ima_, node<T>* node, Image<K>& output_) + { + K& output = exact(output_); + const J& ima = exact(ima_); + + mln_piter(set_p<point2d>) p(node->elt().points); + for_all (p) + output(p) = true; + typename mln::util::node<T>::children_t::iterator it = node->children().begin(); + for (; + it != node->children().end(); ++it) + display_branch_rec(ima, (*it), output); + } + + template <typename I, typename J> + void + display_branch(const Image<J>& ima_, node* node) + { + const J& ima = exact(ima_); + image2d<bool> output (ima.domain ()); + + level::fill(output, false); + mln_assertion(node); + display_branch_rec(ima, node, output); + debug::println(output); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::util

16 years, 5 months

1418: Start a tutorial.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start a tutorial. * doc/tutorial: New directory. * doc/tutorial/slides.tex: New. * mln/value/internal/value_like.hh: Fix typos. doc/tutorial/slides.tex | 550 +++++++++++++++++++++++++++++++++++++++ mln/value/internal/value_like.hh | 6 2 files changed, 553 insertions(+), 3 deletions(-) Index: doc/tutorial/slides.tex --- doc/tutorial/slides.tex (revision 0) +++ doc/tutorial/slides.tex (revision 0) @@ -0,0 +1,550 @@ +% $Header: /cvsroot/latex-beamer/latex-beamer/examples/beamerexample1.tex,v 1.46 2004/10/07 20:53:07 tantau Exp $ + +\documentclass{beamer} +%\usepackage{beamerthemesplit} + +%\documentclass{article} +%\usepackage[envcountsect]{beamerarticle} + +% Do NOT take this file as a template for your own talks. Use a file +% in the directory solutions instead. They are much better suited. + +% Try the class options [notes], [notes=only], [trans], [handout], +% [red], [compress], [draft] and see what happens! + +% Copyright 2003 by Till Tantau <tantau(a)users.sourceforge.net>. +% +% This program can be redistributed and/or modified under the terms +% of the LaTeX Project Public License Distributed from CTAN +% archives in directory macros/latex/base/lppl.txt. + +% For a green structure color use: +%\colorlet{structure}{green!50!black} + + \mode<article> % only for the article version + { + \usepackage{fullpage} + \usepackage{myhyperref} + } + + + \mode<presentation> + { + \setbeamertemplate{background canvas}[vertical shading][bottom=red!10,top=blue!10] + \usetheme{Warsaw} + \usefonttheme[onlysmall]{structurebold} + + +% Put the page number too. +\defbeamertemplate*{footline}{infolines theme without institution} +{ + \leavevmode% + \hbox{% + \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1.125ex,center]{author in head/foot}% + \usebeamerfont{author in head/foot}\insertshortauthor + \end{beamercolorbox}% + \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1.125ex,center]{title in head/foot}% + \usebeamerfont{title in head/foot}\insertshorttitle + \end{beamercolorbox}% + \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1.125ex,right]{date +in head/foot}% + \usebeamerfont{date in head/foot}\insertshortdate{}\hspace*{2em} + \insertframenumber{} / \inserttotalframenumber\hspace*{2ex} + \end{beamercolorbox}}% + \vskip0pt% +} + + +} +% end of mode presentation + + + +%\setbeamercolor{math text}{fg=green!50!black} +%\setbeamercolor{normal text in math text}{parent=math text} + +\usepackage{pgf,pgfarrows,pgfnodes,pgfautomata,pgfheaps,pgfshade} +\usepackage{amsmath,amssymb} +\usepackage[latin1]{inputenc} +\usepackage{colortbl} +\usepackage[english]{babel} + +%\usepackage{lmodern} +%\usepackage[T1]{fontenc} + +\usepackage{times} +\usepackage{multicol} +\usepackage{xspace} +\usepackage{ulem} + +\usepackage{graphicx} +\graphicspath{{./figs/}} + +\usepackage{listings} +\lstloadlanguages{[ISO]C++} +\lstset{language=[ISO]C++, + texcl=true, + columns=fullflexible, + basicstyle={\small\sffamily}, % normal footnote small scriptsize tiny + commentstyle=\itshape, + showstringspacesúlse, + numberstyle=\tiny, +% morekeywords={where, auto, concept, concept_map, axiom, late_check, final, abstract}, + morecomment=[s]{/*}{*/} +} + + +\setbeamercovered{dynamic} + +% +% The following defintions are peculiar to this particular +% presetation. They have nothing to do with the beamer class +% + +\newcommand{\Lang}[1]{\operatorname{\text{\textsc{#1}}}} + +\newcommand{\Class}[1]{\operatorname{\mathchoice + {\text{\normalfont\small #1}} + {\text{\normalfont\small #1}} + {\text{\normalfont#1}} + {\text{\normalfont#1}}}} + +\newcommand{\DOF}{\Class{DOF}} +\newcommand{\NOF}{\Class{NOF}} +\newcommand{\DOFpoly}{\Class{DOF}_{\operatorname{poly}}} +\newcommand{\NOFpoly}{\Class{NOF}_{\operatorname{poly}}} + + +\newcommand{\Nat}{\mathbb{N}} +\newcommand{\Set}[1]{\{#1\}} + + + +\title[Milena: A Tutorial] +{Milena: A Tutorial} + +\author[Milena Team]{Milena Team} + +\institute[LRDE]{EPITA Research and Development Laboratory (LRDE)} + +\date[EPITA-LRDE 2007]{November 2007} + +\subject{} + +%\pgfdeclaremask{lrde}{lrde-logo-mask} +%\pgfdeclareimage[mask=lrde,width=0.6cm]{lrde-logo}{lrde} +%\pgfdeclareimage[width=0.6cm]{lrde-logo}{lrde} + +%\logo{\vbox{\hbox to 1cm{\hfil\pgfuseimage{lrde-logo}}}} +\logo{} + + + +%########################################################### +% NEW! +%########################################################### + +\newcommand{\fal}{$\bullet$\xspace} +\definecolor{darkgreen}{rgb}{0.1,0.7,0.1} + +%########################################################### +% end of NEW! +%########################################################### + + + +\begin{document} + +\frame{\titlepage} + +\section<presentation>*{Outline} + +\begin{frame} + \frametitle{Outline} +{\scriptsize + \tableofcontents[part=1,pausesections] +} +\end{frame} + +\AtBeginSubsection[] +{ + \begin{frame}<beamer> + \frametitle{Outline} +{\scriptsize + \tableofcontents[current,currentsubsection] +} + \end{frame} +} + +\part<presentation>{Main Talk} + + + + +% macros + +\newcommand{\oln}{\textsc{Olena}\xspace} +\newcommand{\mln}{\textsc{Milena}\xspace} + +% end of macros + + + +%############################################################ +\section{Part 1: Introduction} + + + +%============================== +\subsection{What is \mln?} + + +%........................................................................ +\begin{frame} + \frametitle{What is \oln?} + + \oln is the name for + \begin{itemize} + \item the project of building some modern image processing tools + \item the platform, including + \begin{itemize} + \item a library + \item command line executables + \item some documentation + \item etc. + \end{itemize} + \end{itemize} + + \bigskip + + \begin{block}{\mln} + \mln is the C++ image processing\footnote{In the following, IP is + ``Image Processing'' for short.} library of \oln. + \end{block} + +\end{frame} + + + +%........................................................................ +\begin{frame} + \frametitle{Yet Another Image Processing Library (YAIPL) ?} + + \begin{block}{Yes!} + \begin{itemize} + \item Many libraries exist that can fulfill one's needs. + \item If you're happy with your favorite tool, we cannot force you + to change for \mln... + \item Though, you might have a look at \mln and being seduced! + \end{itemize} + + \end{block} + + \bigskip + + \begin{block}{No!} + \begin{itemize} + \item \mln is rather different that available libraries. + \item A lot of convenient data structures that \emph{really} helps + you in developing IP solutions. + \end{itemize} + \end{block} + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{A Short History of the \oln Project} + + {\small + + \begin{itemize} + \item 2000: Start of the project. + \item From Nov. 2001 to April 2004: Evolution from version 0.1 to 0.10.\\ + The level of genericity we expected from the lib was partially obtained... + \item February 2007: Update to conform modern C++ compilers = version 0.11.\\ + \end{itemize} + + \medskip + + \textit{During 3 years we developed a prototype to experiment with + genericity and to try to meet our objectives.} + + \medskip + + \begin{itemize} + \item From June 2007 up to new: Re-writing of the library with a + programming paradigm that rocks. + \end{itemize} + +}%small + +\end{frame} + + + +%============================== +\subsection{Features of the \mln Library} + +%........................................................................ +\begin{frame} + \frametitle{Feature List} + + \begin{itemize} + \item Generic... + \item Efficient so that one can process large images. + \item Quite as easy to use than a C or Java library. + \item Many tools to help writing readable algorithms in a concise way. + \item C++. + \end{itemize} + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{Genericity} + + FIXME + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{Efficiency} + + FIXME + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{Easy to Use} + + FIXME + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{Many Tools} + + FIXME + +\end{frame} + + +%........................................................................ +\begin{frame} + \frametitle{C++} + + FIXME + +\end{frame} + + + + +%============================== +\subsection{Getting Started with \mln} + + +%........................................................................ +\begin{frame} + \frametitle{What Is Needed} + + \begin{itemize} + \item A C++ compiler (\texttt{g++-4} is great and fast). + \item A browser (e.g., \texttt{Firefox}) + \item A pdf reader (e.g., \texttt{kpdf}) + \item Either \texttt{unzip} or (\texttt{gzip} and \texttt{tar}) + \item A directory to uncompress the \mln archive. + \end{itemize} + +\end{frame} + + +%........................................................................ +\begin{frame}[fragile] + \frametitle{Installation} + + \begin{enumerate} + \item Get a snapshot of \mln from the web\\ + {\scriptsize \url{http://olena.lrde.epita.fr/}} + \item Uncompress the archive. + \item Have a look. % FIXME + \end{enumerate} + + For instance: + +{\tiny +\begin{verbatim} +tegucigalpa% cd +tegucigalpa% mkdir milena +tegucigalpa% cd milena +tegucigalpa% mv /tmp/milena-1.0-alpha.tar.gz . +tegucigalpa% tar zxvf * +tegucigalpa% ls doc +tegucigalpa% ls mln +\end{verbatim} +} + +\end{frame} + + + +%........................................................................ +\begin{frame} + \frametitle{The Main Directories} + + \begin{center} + \begin{tabular}{ll} + \texttt{doc} & some documentation materials \\ + \texttt{img} & few tiny images to play with \\ + \texttt{demo} & several examples of what can be done with \mln \\ + \texttt{mln} & the library \\ + \end{tabular} + \end{center} + +\end{frame} + + + +%........................................................................ +\begin{frame} + \frametitle{\mln Documentation} + +FIXME + +\end{frame} + + + +%........................................................................ +\begin{frame} + \frametitle{\mln Brief Overview of the Library Contents} + + In \texttt{mln}: +\smallskip + +{\scriptsize +\hspace*{-5mm} + \begin{tabular}{|ll|ll|} + \hline +\texttt{accu} & accumulator objects & +\texttt{arith} & arithmetical operators \\ +\texttt{border} & routines about virtual border & +\texttt{canvas} & canvases \\ +\texttt{convert} & conversions routines & +\texttt{core} & the library core \\ +\texttt{debug} & debugging tools & +\texttt{display} & display tools \\ +\texttt{draw} & drawing routines & +\texttt{estim} & estimation operators \\ +\texttt{fun} & functions & +\texttt{geom} & geometrical routines \\ +\texttt{histo} & histogram-related tools & +\texttt{io} & input/output routines \\ +\texttt{labeling} & labeling algorithms & +\texttt{level} & point-wise operators on levels \\ +\texttt{linear} & linear operators & +\texttt{literal} & definitions of literals \\ +\texttt{logical} & logical operators & +\texttt{make} & routines to make objects \\ +\texttt{math} & mathematical functions & +\texttt{metal} & static hard-core (metallic) tools \\ +\texttt{morpho} & mathematical morphology & +\texttt{norm} & norms and related distances \\ +\texttt{pw} & tools to point-wise expressions & +\texttt{set} & mathematical set routines \\ +\texttt{tag} & some tags & +\texttt{test} & testing routines \\ +\texttt{trace} & tracing helpers & +\texttt{trait} & definitions of traits \\ +\texttt{util} & miscellaneous utilities & +\texttt{value} & types of values \\ +\texttt{win} & windows & & \\ + \hline + \end{tabular} +} % scriptsize + +\end{frame} + + + +%........................................................................ +\begin{frame}[fragile] + \frametitle{Illustration} + + +\begin{minipage}{0.5\linewidth} +{\it Algorithm:}\\ +\smallskip +{\tiny +$\forall p \in \mathcal{D}(f), \;\; \mathit{oper}(f(p), \, c)$ +} + +\bigskip\medskip + +{\it Olena in 2007:} +\smallskip +\begin{lstlisting}[basicstyle={\tiny\sffamily}] +template <typename O, typename I, typename T> +void op(Image& f, T c) +{ + O oper; + oln_piter(I) p(f.domain()); + for_all(p) + oper(f(p), c); +} + +\end{lstlisting} + +\end{minipage} + % + \hspace*{2mm} + % +\begin{minipage}{.45\linewidth} + +{\it Olena in 2000:} +\smallskip +\begin{lstlisting}[basicstyle={\tiny\sffamily}] +template< typename O, + template< class U > class get_A = get_value, + typename P = Pred_true > +struct op +{ + template< typename I > static + void on( I& f, + const get_A< I::value_type >::output_type& c, + P pred = P() ) + { + O oper; + get_A< I::value_type > access; + I::iterator_type iter( f ); + for ( iter.first(); ! iter.isDone(); iter.next() ) + if ( pred( access( iter() ) ) ) + oper( access( iter() ), c ); + } +}; +\end{lstlisting} + +\end{minipage} + +\end{frame} + + + +%############################################################ +\end{document} + +%%% Local Variables: +%%% mode: latex +%%% eval: (ispell-change-dictionary "american") +%%% TeX-master: t + +% LocalWords: IP interoperability morphers Milena Index: mln/value/internal/value_like.hh --- mln/value/internal/value_like.hh (revision 1417) +++ mln/value/internal/value_like.hh (working copy) @@ -71,13 +71,13 @@ /// Interoperation associated type. typedef N interop; - /// Explicit convertion towards equivalent type. + /// Explicit conversion towards equivalent type. V to_equiv() const; - /// Explicit convertion towards encoding type. + /// Explicit conversion towards encoding type. const C& to_enc() const; - /// Explicit convertion towards interoperation type. + /// Explicit conversion towards interoperation type. N to_interop() const;

16 years, 5 months

1416: Refactor the L2-norm, and test it.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena A bit of explanation about why there are deletions (lines starting with a `-') in the diff of tests/l2.cc: I used `svn copy' to create this file from tests/l1.cc. So, the differences you see are w.r.t. the latter. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Refactor the L2-norm, and test it. * mln/norm/l2.hh: Use type `mln_value_sum(C)' instead of `float' to handle L2-norm values. (mln::norm::impl::l2_, mln::norm::impl::l2_distance_): New. Use to factor the implementations of... (mln::norm::l2, mln::norm::l2_distance): ...these functions. * tests/l2.cc: New test. * tests/Makefile.am (check_PROGRAMS): Add l2. (l2_SOURCES): New. mln/norm/l2.hh | 91 +++++++++++++++++++++++++++++++++--------------------- tests/Makefile.am | 2 + tests/l2.cc | 37 +++++++++++---------- 3 files changed, 78 insertions(+), 52 deletions(-) Index: mln/norm/l2.hh --- mln/norm/l2.hh (revision 1416) +++ mln/norm/l2.hh (working copy) @@ -30,78 +30,99 @@ /*! \file mln/norm/l2.hh * - * \brief Define some l2-norm related routines. + * \brief Define some L2-norm related routines. + * \see http://mathworld.wolfram.com/L2-Norm.html for more information. */ -# include <cmath> - +# include <mln/math/sqr.hh> +# include <mln/math/sqrt.hh> # include <mln/metal/vec.hh> + namespace mln { namespace norm { - /// Infinity-norm of a vector \p vec. + /// L2-norm of a vector \a vec. + /// \{ template <unsigned n, typename C> - float l2(const C (&vec)[n]); + mln_value_sum(C) l2(const C (&vec)[n]); - /// Infinity-norm distance between vectors \p v1 and \p v2. template <unsigned n, typename C> - float l2_distance(const C (&v1)[n], const C (&v2)[n]); + mln_value_sum(C) l2(const metal::vec<n,C>& vec); + /// \} + /// L2-norm distance between vectors \a vec1 and \p vec2. + /// \{ template <unsigned n, typename C> - float l2(const metal::vec<n,C>& vec); + mln_value_sum(C) l2_distance(const C (&vec1)[n], const C (&vec2)[n]); template <unsigned n, typename C> - float l2_distance(const metal::vec<n,C>& vec1, const metal::vec<n,C>& vec2); - - // FIXME: Replace float by mln_value_sum(C)... + mln_value_sum(C) l2_distance(const metal::vec<n,C>& vec1, + const metal::vec<n,C>& vec2); + /// \} # ifndef MLN_INCLUDE_ONLY - template <unsigned n, typename C> - float l2(const C (&vec)[n]) + namespace impl + { + + template <unsigned n, typename C, typename V> + mln_value_sum(C) + l2_(const V& vec) { - C c = 0; + mln_value_sum(C) m = 0; for (unsigned i = 0; i < n; ++i) - c += vec[i] * vec[i]; - return sqrt(c); + m += mln::math::sqr(vec[i]); + return mln::math::sqrt(m); } - template <unsigned n, typename C> - float l2_distance(const C (&v1)[n], const C (&v2)[n]) + template <unsigned n, typename C, typename V> + mln_value_sum(C) + l2_distance_(const V& vec1, const V& vec2) { - C d = 0; + mln_value_sum(C) d = 0; for (unsigned i = 0; i < n; ++i) - { - C dd = v1[i] - v2[i]; - d += dd * dd; - } - return sqrt(d); + d += mln::math::sqr(vec1[i] - vec2[i]); + return mln::math::sqrt(d); } + } // end of namespace mln::norm::impl + + + /*----------. + | Facades. | + `----------*/ + template <unsigned n, typename C> - float l2(const metal::vec<n,C>& vec) + mln_value_sum(C) + l2(const C (&vec)[n]) { - C c = 0; - for (unsigned i = 0; i < n; ++i) - c += vec[i] * vec[i]; - return sqrt(c); + return impl::l2_<n, C>(vec); } template <unsigned n, typename C> - float l2(const metal::vec<n,C>& vec1, const metal::vec<n,C>& vec2) + mln_value_sum(C) + l2(const metal::vec<n,C>& vec) { - C d = 0; - for (unsigned i = 0; i < n; ++i) + return impl::l2_<n, C>(vec); + } + + template <unsigned n, typename C> + mln_value_sum(C) + l2_distance(const C (&vec1)[n], const C (&vec2)[n]) { - C dd = vec1[i] - vec2[i]; - d += dd * dd; + return impl::l2_distance_<n, C>(vec1, vec2); } - return sqrt(d); + + template <unsigned n, typename C> + mln_value_sum(C) + l2_distance(const metal::vec<n,C>& vec1, const metal::vec<n,C>& vec2) + { + return impl::l2_distance_<n, C>(vec1, vec2); } # endif // ! MLN_INCLUDE_ONLY Index: tests/l2.cc --- tests/l2.cc (revision 1411) +++ tests/l2.cc (working copy) @@ -25,47 +25,50 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/l1.hh -/// \brief Test the L1-norm. +/// \file tests/l2.hh +/// \brief Test the L2-norm. +#include <cmath> #include <cassert> #include <mln/metal/vec.hh> #include <mln/math/abs.hh> -#include <mln/norm/l1.hh> +#include <mln/norm/l2.hh> // FIXME: We should have a almost_equal function somewhere in Milena. static const float epsilon = 0.0001; using mln::metal::vec; -using mln::norm::l1; +using mln::norm::l2; template <typename V> -void check_l1 (const V& vec1, const V& vec2) +void check_l2 (const V& vec1, const V& vec2) { - assert (mln::math::abs(mln::norm::l1(vec1) - mln::norm::l1(vec2)) + assert (mln::math::abs(mln::norm::l2(vec1) - mln::norm::l2(vec2)) < epsilon); } template <typename V, typename S> -void check_l1_distance (const V& vec1, const V& vec2, const S& ref_val) +void check_l2_distance (const V& vec1, const V& vec2, const S& ref_val) { - assert (mln::math::abs(mln::norm::l1_distance(vec1, vec2) - ref_val) + assert (mln::math::abs(mln::norm::l2_distance(vec1, vec2) - ref_val) < epsilon); } int main () { - vec<3, int> t; t.set (1, -2, 3); - vec<3, int> u; u.set (5, 1, 0); - int d = (5 - 1) + (1 + 2) + 3; + vec<3, int> t; t.set (2, -2, 3); + vec<3, int> u; u.set (4, 1, 0); + float d = std::sqrt((4 - 2) * (4 - 2) + + (1 + 2) * (1 + 2) + + (0 - 3) * (0 - 3)); - check_l1(t, u); - check_l1_distance (t, u, d); + check_l2(t, u); + check_l2_distance (t, u, d); - int v[] = {1, -2, 3}; - int w[] = {5, 1, 0}; + int v[] = {2, -2, 3}; + int w[] = {4, 1, 0}; - check_l1(v, w); - check_l1_distance (v, w, d); + check_l2(v, w); + check_l2_distance (v, w, d); } Index: tests/Makefile.am --- tests/Makefile.am (revision 1416) +++ tests/Makefile.am (working copy) @@ -85,6 +85,7 @@ io_ppm \ \ l1 \ + l2 \ labeling_algo \ labeling_estimate \ labeling_foreground \ @@ -272,6 +273,7 @@ io_ppm_SOURCES = io_ppm.cc l1_SOURCES = l1.cc +l2_SOURCES = l2.cc labeling_algo_SOURCES = labeling_algo.cc labeling_estimate_SOURCES = labeling_estimate.cc labeling_foreground_SOURCES = labeling_foreground.cc

16 years, 5 months

1415: Improve the L1-norm implementation.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Improve the L1-norm implementation. * mln/norm/l1.hh (mln::norm::l1_distance): Fix documentation. (mln::norm::l1_, mln::norm::l1_distance_): Avoid temporaries. l1.hh | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) Index: mln/norm/l1.hh --- mln/norm/l1.hh (revision 1415) +++ mln/norm/l1.hh (working copy) @@ -30,12 +30,13 @@ /*! \file mln/norm/l1.hh * - * \brief Define some l1-norm related routines. + * \brief Define some L1-norm related routines. * \see http://mathworld.wolfram.com/L1-Norm.html for more information. */ -# include <mln/metal/vec.hh> # include <mln/math/abs.hh> +# include <mln/metal/vec.hh> + namespace mln { @@ -52,7 +53,7 @@ mln_value_sum(C) l1(const metal::vec<n,C>& vec); /// \} - /// L1-norm distance between vectors \a v1 and \a v2. + /// L1-norm distance between vectors \a vec1 and \a vec2. /// \{ template <unsigned n, typename C> mln_value_sum(C) l1_distance(const C (&vec1)[n], const C (&vec2)[n]); @@ -68,33 +69,31 @@ namespace impl { template <unsigned n, typename C, typename V> - mln_value_sum(C) l1_(const V& vec) + mln_value_sum(C) + l1_(const V& vec) { - mln_value_sum(C) c = 0; + mln_value_sum(C) m = 0; for (unsigned i = 0; i < n; ++i) - { - mln_value_sum(C) v = vec[i]; - c += mln::math::abs (v); - } - return c; + m += mln::math::abs (vec[i]); + return m; } template <unsigned n, typename C, typename V> - mln_value_sum(C) l1_distance_(const V& vec1, const V& vec2) + mln_value_sum(C) + l1_distance_(const V& vec1, const V& vec2) { mln_value_sum(C) d = 0; for (unsigned i = 0; i < n; ++i) - { - mln_value_sum(C) v = vec1[i] - vec2[i]; - d += mln::math::abs (v); - } + d += mln::math::abs (vec1[i] - vec2[i]); return d; } } // end of namespace mln::norm::impl - // Facades. + /*----------. + | Facades. | + `----------*/ template <unsigned n, typename C> mln_value_sum(C)

16 years, 5 months

1414: Remove a useless specialization of mln::math::abs.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Remove a useless specialization of mln::math::abs. * mln/math/abs.hh (abs(const value::int_s<n>&)): Remove this specialization, as value::int_s shall handle the required conversion automatically. abs.hh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) Index: mln/math/abs.hh --- mln/math/abs.hh (revision 1414) +++ mln/math/abs.hh (working copy) @@ -30,12 +30,12 @@ /*! \file mln/math/abs.hh * - * \brief Define abs routine. + * \brief Define the absolute value (abs) routine. */ # include <cmath> -# include <mln/value/all.hh> +# include <mln/value/all.hh> namespace mln @@ -62,12 +62,6 @@ return v; } - template <unsigned n> - value::int_s<n> abs(const value::int_s<n>& v) - { - return std::abs(v.to_enc()); - } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::math

16 years, 5 months

1413: Add the (non-negative) square root function.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/math/sqrt.hh: New. sqrt.hh | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) Index: mln/math/sqrt.hh --- mln/math/sqrt.hh (revision 0) +++ mln/math/sqrt.hh (revision 0) @@ -0,0 +1,64 @@ +// 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_SQRT_HH +# define MLN_MATH_SQRT_HH + +/*! \file mln/math/sqrt.hh + * + * \brief Define the (non-negative) square root (sqrt) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T sqrt(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + T sqrt(const T& v) + { + return std::sqrt(v); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_SQRT_HH

16 years, 5 months

1412: Add the square function.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/math/sqr.hh: New file. sqr.hh | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) Index: mln/math/sqr.hh --- mln/math/sqr.hh (revision 0) +++ mln/math/sqr.hh (revision 0) @@ -0,0 +1,64 @@ +// 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_SQR_HH +# define MLN_MATH_SQR_HH + +/*! \file mln/math/sqr.hh + * + * \brief Define the square (sqr) routine. + */ + +# include <cmath> + + +namespace mln +{ + + namespace math + { + + template <typename T> + T sqr(const T& v); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + T sqr(const T& v) + { + return v * v; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_SQR_HH

16 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2007