October 2008 - Olena-patches

cleanup-2008 2538: Continue documentation.
by Nicolas Ballas 09 Oct '08

09 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Continue documentation. * doc/tutorial/design/include/properties.tex: Add properties. * doc/tutorial/design/include/imagetours.tex: Fix typos. * doc/tutorial/design/design.tex: Update. design.tex | 14 ++++++++ include/imagetours.tex | 6 +-- include/properties.tex | 83 ++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 85 insertions(+), 18 deletions(-) Index: doc/tutorial/design/include/properties.tex --- doc/tutorial/design/include/properties.tex (revision 2537) +++ doc/tutorial/design/include/properties.tex (working copy) @@ -1,6 +1,7 @@ \section{Properties} + \subsection{Notation} A property has several values. @@ -107,13 +108,12 @@ 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 isotropic grid has this property set to $isotropic\_grid$ An image based on a anisotropic grid has this property set to -$anisotropic\_gride$ +$anisotropic\_grid$ 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. @@ -139,8 +139,6 @@ +--- two_d | +--- three_d - - \end{verbatim} This property specifies the dimension of the image. @@ -159,7 +157,7 @@ \index{Property: value\_access} \begin{verbatim} -value\_access: any +value_access: any | +--- direct | @@ -170,19 +168,19 @@ 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 +memory. If an image type has a direct access 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} +\subsubsection{value\_storage} +\index{Property: value\_storage} \begin{verbatim} -vw_storage: any +value_storage: any | - +--- /ram/ + +--- /memory/ | | | +--- singleton | | @@ -192,6 +190,37 @@ +--- irrelevant \end{verbatim} +This property indicates how the values are stored in memory, when it is the +case. If the values aren't stored in the $memory$, this property is set to +$irrelevant$. If this property is set to $singleton$, only one value is store +in memory for the whole image (this the case of the \verb+flat_image+ type). +If this value is set to $one\_block$, all the image values are stored in a +linear buffer in memory. And, an image is $piecewise$, when it's value are +stored in several buffers in memory. + + +\subsubsection{value\_alignment} +\index{Property: value\_alignment} + +\begin{verbatim} +value_alignment: any + | + +--- with_grid + | + +--- not_aligned + | + +--- irrelevant +\end{verbatim} + +This property indicates if the image values are ordered the same way in memory +than when we run over them through a \verb+fwd_piter+. +When this is the case, the image values are aligned with the image underlying +grid, this property is set to $with\_grid$. +If the values are not ordered the same way in memory than the \verb+fwd_piter+ +order, this property is set to $not\_aligned$. +If the image values are not stored in memory, this property is set to +$irrelevant$. + %%%%%%%%%%%%%%%%%%%%%%%% % access % @@ -255,23 +284,38 @@ %% FIXME functions that modify globaly all the values... \begin{verbatim} - vw_io: any | - +--- /vm_some/ + +--- /some/ | | | +--- vw_read | | | +--- vw_read_write - +--- vw_none + | | + | +--- vw_global_read_write + +--- none \end{verbatim} +This property defines the value wise access of an image. +If \verb+vw_io+ is set to $vw\_none$, the associated image type does not + provide any value wise access. +If an image type provides a readable (or writable) +value access, this property is set to $vw\_read$ (or $vw\_read\_write$). +If the image provide a value wise access that allows the user to change +globally all the image values through a function $value$ to $value$, +this property is set to $vw\_global\_read\_write$. + +%% FIXME define the interface associated + +The method provided for this value access depend on the \verb+vm_set+ property. + + \subsubsection{vw\_set} \index{Property: vw\_set} \begin{verbatim} - vw_io: any + vw_set: any | +--- /some/ | | @@ -282,6 +326,15 @@ \end{verbatim} +This property precises what kind of value access is provided by an image type. +If an image type does not provide any value access (\verb+vw_io+ set to $none$) +, \verb+vw_set+ is set to $none$. +Otherwise, \verb+vw_set+ is set to $uni$ if the image provides an +access to the mathematical set of values taken by the image (through the method +\verb+value_taken+). +If \verb+vw_set+ is set to $multi$, the image provides an access to the values +taken in memory (cells) (through the method \verb+cells+). Note that a value +can be present twice in the cells set. Index: doc/tutorial/design/include/imagetours.tex --- doc/tutorial/design/include/imagetours.tex (revision 2537) +++ doc/tutorial/design/include/imagetours.tex (working copy) @@ -43,8 +43,8 @@ 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)+. +To access to a value of an image named $ima$ localized at the point p, we +just use the mathematics 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 @@ -62,7 +62,7 @@ %% 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 +In this document, we will used the following naming convention for the image types parameters: \begin{itemize} \item{\verb+T+:} represents an image value type. Index: doc/tutorial/design/design.tex --- doc/tutorial/design/design.tex (revision 2537) +++ doc/tutorial/design/design.tex (working copy) @@ -35,6 +35,20 @@ stringstyle=\color{green}\ttfamily } +\lstnewenvironment{cartouche} + {\lstset{tabsize=2, + frame=single, + breaklines=true, + basicstyle=\ttfamily, + framexleftmargin=13mm, + identifierstyle=\color{black}, + keywordstyle=\color{black}, + stringstyle=\color{black}, + commentstyle=\color{black}, + backgroundcolor=\color{grey}, + xleftmargin=12mm} + } +{} %%%LISTINGS SETTINGS

1 0

cleanup-2008 2537: Fix registration. Clean up fun.
by Ugo Jardonnet 09 Oct '08

09 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix registration. Clean up fun. * mln/fun/x2x/interpol/bilinear.hh, * mln/fun/x2x/interpol/linear.hh, * mln/fun/x2x/interpol/nneighbor.hh: Move ... * mln/fun/x2v/bilinear.hh, * mln/fun/x2v/linear.hh, * mln/fun/x2v/nneighbor.hh: ... here. * mln/fun/x2x/geom/composed.hh, * mln/fun/x2x/geom/translation.hh, * mln/fun/x2x/geom/rotation.hh: Move ... * mln/fun/x2x/composed.hh, * mln/fun/x2x/translation.hh, * mln/fun/x2x/rotation.hh: ... here. * mln/fun/x2p: New. * mln/fun/x2p/closest_point.hh: Add a functor that return the closest point of a vector x in a given p_array. * mln/registration/multiscale.hh: Fix use of p_array. * mln/registration/registration.hh: Make use of fun::x2p::closest_point. * mln/registration/icp.hh: Add buffers. fun/x2p/closest_point.hh | 96 +++++++++++++++++++++++++++++++++++++++++++ fun/x2v/bilinear.hh | 14 +----- fun/x2v/linear.hh | 12 +---- fun/x2v/nneighbor.hh | 13 +---- fun/x2x/composed.hh | 28 ++++-------- fun/x2x/rotation.hh | 6 -- fun/x2x/translation.hh | 6 -- registration/icp.hh | 43 ++++++++++++++++++- registration/multiscale.hh | 19 +++++--- registration/registration.hh | 8 ++- 10 files changed, 176 insertions(+), 69 deletions(-) Index: mln/fun/x2v/bilinear.hh --- mln/fun/x2v/bilinear.hh (revision 0) +++ mln/fun/x2v/bilinear.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_X2X_INTERPOL_BILINEAR_HH -# define MLN_FUN_X2X_INTERPOL_BILINEAR_HH +#ifndef MLN_FUN_X2X_BILINEAR_HH +# define MLN_FUN_X2X_BILINEAR_HH # include <mln/core/image/image2d.hh> # include <mln/core/concept/function.hh> @@ -34,7 +34,7 @@ # include <mln/convert/to.hh> # include <mln/algebra/vec.hh> -/*! \file mln/fun/x2x/interpol/bilinear.hh +/*! \file mln/fun/x2x/bilinear.hh * * \brief Define a bilinear interpolation of values from an underlying image */ @@ -48,10 +48,6 @@ namespace x2x { - namespace interpol - { - - /*! \brief Represent a bilinear interolation of values from an underlying image * */ @@ -129,8 +125,6 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::fun::x2x::interpol - } // end of namespace mln::fun::x2x } // end of namespace mln::fun @@ -138,4 +132,4 @@ } // end of namespace mln -#endif // ! MLN_FUN_X2X_INTERPOL_BILINEAR_HH +#endif // ! MLN_FUN_X2X_BILINEAR_HH Index: mln/fun/x2v/linear.hh --- mln/fun/x2v/linear.hh (revision 0) +++ mln/fun/x2v/linear.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_X2X_INTERPOL_LINEAR_HH -# define MLN_FUN_X2X_INTERPOL_LINEAR_HH +#ifndef MLN_FUN_X2X_LINEAR_HH +# define MLN_FUN_X2X_LINEAR_HH -/*! \file mln/fun/x2x/interpol/linear.hh +/*! \file mln/fun/x2x/linear.hh * * \brief Define a linear interpolation of values from an underlying image */ @@ -48,10 +48,6 @@ namespace x2x { - namespace interpol - { - - /*! \brief Represent a linear interolation of values from an underlying image * */ @@ -114,8 +110,6 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::fun::x2x::interpol - } // end of namespace mln::fun::x2x } // end of namespace mln::fun Index: mln/fun/x2v/nneighbor.hh --- mln/fun/x2v/nneighbor.hh (revision 0) +++ mln/fun/x2v/nneighbor.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_X2X_INTERPOL_NNEIGHBOR_HH -# define MLN_FUN_X2X_INTERPOL_NNEIGHBOR_HH +#ifndef MLN_FUN_X2X_NNEIGHBOR_HH +# define MLN_FUN_X2X_NNEIGHBOR_HH # include <mln/core/concept/function.hh> # include <mln/fun/internal/selector.hh> # include <mln/algebra/vec.hh> # include <mln/convert/to.hh> -/*! \file mln/fun/x2x/interpol/nneighbor.hh +/*! \file mln/fun/x2x/nneighbor.hh * * \brief Define a nneighbor interpolation of values from an underlying image */ @@ -47,9 +47,6 @@ namespace x2x { - namespace interpol - { - template < typename I > struct nneighbor : public fun::internal::selector_<const algebra::vec<3,float>, @@ -87,8 +84,6 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::fun::x2x::interpol - } // end of namespace mln::fun::x2x } // end of namespace mln::fun @@ -96,4 +91,4 @@ } // end of namespace mln -#endif // ! MLN_FUN_X2X_INTERPOL_NNEIGHBOR_HH +#endif // ! MLN_FUN_X2X_NNEIGHBOR_HH Index: mln/fun/x2x/composed.hh --- mln/fun/x2x/composed.hh (revision 2536) +++ mln/fun/x2x/composed.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_X2X_GEOM_COMPOSED_HH -# define MLN_FUN_X2X_GEOM_COMPOSED_HH +#ifndef MLN_FUN_X2X_COMPOSED_HH +# define MLN_FUN_X2X_COMPOSED_HH -/*! \file mln/fun/x2x/geom/composed.hh +/*! \file mln/fun/x2x/composed.hh * * \brief Definition of a composed transformation. */ @@ -50,9 +50,6 @@ namespace x2x { - namespace geom - { - // Fwd decl. template <typename F, typename G> struct composed; @@ -124,7 +121,7 @@ G g_; }; - } // end of namespace mln::fun::x2x::geom::internal + } // end of namespace mln::fun::x2x::internal /*! \brief Represent a composition of two transformations. @@ -151,8 +148,6 @@ } }; - } // end of namespace mln::fun::x2x::geom - } // end of namespace mln::fun::x2x } // end of namespace mln::fun @@ -166,7 +161,7 @@ * \return The composed transformation fog. */ template <typename F, typename G> - fun::x2x::geom::composed<F,G> compose(F f, G g); + fun::x2x::composed<F,G> compose(F f, G g); # ifndef MLN_INCLUDE_ONLY @@ -176,9 +171,6 @@ namespace x2x { - namespace geom - { - namespace internal { @@ -259,9 +251,7 @@ this->m_ = this->f_.mat() * this->g_.mat(); } - } // end of namespace mln::fun::x2x::geom::internal - - } // end of namespace mln::fun::x2x::geom + } // end of namespace mln::fun::x2x::internal } // end of namespace mln::fun::x2x @@ -269,10 +259,10 @@ template <typename F, typename G> inline - fun::x2x::geom::composed<F,G> compose(F f, G g) + fun::x2x::composed<F,G> compose(F f, G g) { trace::entering("fun::x2x::compose"); - fun::x2x::geom::composed<F,G> comp(f, g); + fun::x2x::composed<F,G> comp(f, g); trace::exiting("fun::x2x::compose"); return comp; } @@ -282,4 +272,4 @@ } // end of namespace mln -#endif // ! MLN_FUN_X2X_GEOM_COMPOSED_HH +#endif // ! MLN_FUN_X2X_COMPOSED_HH Index: mln/fun/x2x/translation.hh --- mln/fun/x2x/translation.hh (revision 2536) +++ mln/fun/x2x/translation.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_FUN_X2X_TRANSLATION_HH # define MLN_FUN_X2X_TRANSLATION_HH -/*! \file mln/fun/x2x/geom/translation.hh +/*! \file mln/fun/x2x/translation.hh * * \brief Define a translation function. */ @@ -48,9 +48,6 @@ namespace x2x { - namespace geom - { - /*! \brief Represent a translation function. * */ @@ -140,7 +137,6 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::fun::x2x::geom } // end of namespace mln::fun::x2x Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 2536) +++ mln/fun/x2x/rotation.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_FUN_X2X_ROTATION_HH # define MLN_FUN_X2X_ROTATION_HH -/*! \file mln/fun/x2x/geom/rotation.hh +/*! \file mln/fun/x2x/rotation.hh * * \brief Define a rotation function. */ @@ -48,9 +48,6 @@ namespace x2x { - namespace geom - { - namespace internal { template < unsigned n, typename C > @@ -231,7 +228,6 @@ # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::fun::x2x::geom } // end of namespace mln::fun::x2x Index: mln/fun/x2p/closest_point.hh --- mln/fun/x2p/closest_point.hh (revision 0) +++ mln/fun/x2p/closest_point.hh (revision 0) @@ -0,0 +1,96 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_FUN_X2P_CLOSEST_POINT_HH +# define MLN_FUN_X2P_CLOSEST_POINT_HH + +# include <mln/algebra/vec.hh> +# include <mln/norm/l2.hh> + +namespace mln +{ + + namespace fun + { + + namespace x2p + { + + ///FIXME: doxygen + concept checking + template <typename P> + struct closest_point + { + typedef algebra::vec<P::dim, float> input; + typedef P result; + + closest_point(const p_array& X, const box& box) + : X(X), box(box) + , log_functor_call(0) + + { } + + result + //inline + operator () (const input& Ck) const + { + ++log_functor_call; + + algebra::vec<P::dim,float> Cki = Ck; + algebra::vec<P::dim,float> best_x = X[0]; + float best_d = norm::l2(Cki - best_x); + for (size_t j = 1; j < X.nsites(); ++j) + { + algebra::vec<P::dim,float> Xj = X[j]; + float d = norm::l2(Cki - Xj); + if (d < best_d) + { + best_d = d; + best_x = Xj; + } + } + return convert::to(best_x); + } + + const box& domain() const + { + return box; + } + + const p_array& X; + const box box; + + // log call to the functor + mutable unsigned log_functor_call; + }; + + } // end of namespace mln::fun::x2p + + } // end of namespace mln::fun + +} // end of namespace mln + +#endif // ! MLN_FUN_X2P_CLOSEST_POINT_HH Index: mln/registration/multiscale.hh --- mln/registration/multiscale.hh (revision 2536) +++ mln/registration/multiscale.hh (working copy) @@ -29,6 +29,7 @@ # define MLN_REGISTRATION_MULTISCALE_HH # include <mln/registration/icp.hh> +# include <mln/fun/x2p/closest_point.hh> namespace mln { @@ -52,22 +53,25 @@ template <typename I, typename J> inline - composed< rotation<P::dim, float>, translation<P::dim, float> > + composed< rotation<I::site::dim, float>, translation<I::site::dim, float> > multiscale_(const Image& cloud, const Image<J>& surface, const float q, const unsigned nb_it) { + p_array<mln_psite(I)> c = convert::to< p_array<mln_psite(I)> >(cloud); + p_array<mln_psite(J)> x = convert::to< p_array<mln_psite(I)> >(surface); + // Shuffle cloud - shuffle(cloud); + shuffle(c); //working box const box<point2d> working_box = enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); //make a lazy_image map via function closest_point - closest_point<mln_psite_(image2db)> fun(x, working_box); //FIXME: to port - lazy_image<image2d<bool>, closest_point<mln_psite_(image2db)>, box2d > + fun::x2p::closest_point<mln_psite(I)> fun(x, working_box); + lazy_image<I, fun::x2p::closest_point<mln_psite(I)>, box2d > map(fun, fun.domain()); //init rigid transform qk @@ -87,7 +91,7 @@ template <typename I, typename J> inline - composed< rotation<P::dim, float>, translation<P::dim, float> > + composed< rotation<I::site::dim, float>, translation<I::site::dim, float> > multiscale(const Image& cloud, const Image<J>& surface, const float q, @@ -95,9 +99,10 @@ { trace::entering("registration::registration"); - mln_precondition(P::dim == 3 || P::dim == 2); + mln_precondition(I::site::dim == 3 || I::site::dim == 2); - impl::multiscale_(cloud, surface, q, nb_it); + composed< rotation<I::site::dim, float>, translation<I::site::dim, float> > + qk = impl::multiscale_(cloud, surface, q, nb_it); trace::exiting("registration::registration"); Index: mln/registration/registration.hh --- mln/registration/registration.hh (revision 2536) +++ mln/registration/registration.hh (working copy) @@ -34,6 +34,7 @@ */ # include <mln/registration/icp.hh> +# include <mln/fun/x2p/closest_point.hh> # include <mln/core/image/lazy_image.hh> namespace mln @@ -76,12 +77,13 @@ enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); //make a lazy_image map via function closest_point - closest_point<mln_psite(I)> fun(x, working_box); //FIXME: to port - lazy_image<mln_ch_value(I,bool), closest_point<mln_psite(I)>, box2d > + fun::x2p::closest_point<mln_psite(I)> fun(x, working_box); + lazy_image<I, fun::x2p::closest_point<mln_psite(I)>, box2d> map(fun, fun.domain()); + //run registration - registration::icp(c, map, qk, l, 1e-3); + registration::icp(c, map, qk, c.nsites(), 1e-3); } Index: mln/registration/icp.hh --- mln/registration/icp.hh (revision 2536) +++ mln/registration/icp.hh (working copy) @@ -38,6 +38,45 @@ namespace mln { + namespace util + { + + // FIXME: Remove use of this class + template <unsigned int n, typename T> + struct buffer + { + buffer() + : setted(0) + { + } + + void store(T e) + { + for (unsigned i = 0; i < n-1; i++) + buf[i+1] = buf[i]; + buf[0] = e; + + setted++; + } + + T& operator[](unsigned int i) + { + assert(i < n && i < setted); + return buf[i]; + } + + const T * get_array() + { + return buf; + } + + private: + T buf[n]; + unsigned int setted; + }; + + } // end of namespace mln::util + namespace registration { @@ -88,8 +127,8 @@ { trace::entering("registration::impl::icp_"); - buffer<4,T> buf_qk; - buffer<3,float> buf_dk; + util::buffer<4,T> buf_qk; + util::buffer<3,float> buf_dk; float d_k = 10000; p_array Ck(c);

1 0

cleanup-2008 2536: Fix accu::min_h and max_h.
by Thierry Geraud 09 Oct '08

09 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix accu::min_h and max_h. * mln/accu/min_h.hh, * mln/accu/max_h.hh (debug_print_): New. (take): Fix. max_h.hh | 37 ++++++++++++++++++++++++++----------- min_h.hh | 18 ++++++++++++++++-- 2 files changed, 42 insertions(+), 13 deletions(-) Index: mln/accu/min_h.hh --- mln/accu/min_h.hh (revision 2535) +++ mln/accu/min_h.hh (working copy) @@ -68,6 +68,8 @@ const accu::histo<V>& histo() const; + void debug_print_() const; + protected: mutable accu::histo<V> h_; @@ -101,12 +103,12 @@ void min_h<V>::take(const argument& t) { - h_.take(t); - if (h_.sum() == 1) + if (h_.sum() == 0) { this->take_as_init(t); return; } + h_.take(t); if (t < t_) { ++sum_; @@ -233,6 +235,18 @@ template <typename V> inline + void + min_h<V>::debug_print_() const + { + std::cout << "h={" << h_ << "} "; + std::cout << "sum=" << sum_ << ' ' + << "valid=" << valid_ << ' ' + << "i=" << i_ << ' ' + << "t=" << t_ << std::endl; + } + + template <typename V> + inline std::ostream& operator<<(std::ostream& ostr, const min_h<V>& m) { return ostr << m.to_result(); Index: mln/accu/max_h.hh --- mln/accu/max_h.hh (revision 2535) +++ mln/accu/max_h.hh (working copy) @@ -67,6 +67,8 @@ const accu::histo<V>& histo() const; + void debug_print_() const; + protected: mutable accu::histo<V> h_; @@ -100,12 +102,12 @@ void max_h<V>::take(const argument& t) { - h_.take(t); - if (h_.sum() == 1) + if (h_.sum() == 0) { this->take_as_init(t); return; } + h_.take(t); if (t > t_) { ++sum_; @@ -165,25 +167,26 @@ template <typename V> inline void - max_h<V>::go_minus_() const + max_h<V>::go_plus_() const { do - --i_; - while (h_[i_] == 0); + { + ++i_; + if (h_[i_] != 0) + sum_ -= h_[i_]; + } + while (sum_ != 0); t_ = s_[i_]; } template <typename V> inline void - max_h<V>::go_plus_() const + max_h<V>::go_minus_() const { do - { - ++i_; - if (h_[i_] != 0) - sum_ -= h_[i_]; - } while (sum_ != 0); + --i_; + while (h_[i_] == 0); t_ = s_[i_]; } @@ -231,6 +234,18 @@ template <typename V> inline + void + max_h<V>::debug_print_() const + { + std::cout << "h={" << h_ << "} "; + std::cout << "sum=" << sum_ << ' ' + << "valid=" << valid_ << ' ' + << "i=" << i_ << ' ' + << "t=" << t_ << std::endl; + } + + template <typename V> + inline std::ostream& operator<<(std::ostream& ostr, const max_h<V>& m) { return ostr << m.to_result();

1 0

cleanup-2008 2535: Augment line iteration sandbox code.
by Thierry Geraud 09 Oct '08

09 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment line iteration sandbox code. * geraud/browsing/fwd.cc: Add some code closer to what we expect. fwd.cc | 358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 338 insertions(+), 20 deletions(-) Index: geraud/browsing/fwd.cc --- geraud/browsing/fwd.cc (revision 2534) +++ geraud/browsing/fwd.cc (working copy) @@ -1,6 +1,8 @@ # include <mln/core/image/image2d.hh> # include <mln/core/alias/window2d.hh> -# include <mln/accu/min.hh> +# include <mln/value/int_u8.hh> +# include <mln/accu/min_h.hh> +# include <mln/accu/max_h.hh> # include <mln/debug/println.hh> # include <mln/debug/iota.hh> @@ -86,96 +88,412 @@ namespace mln { - template <typename I> - void line_inc(const I& ima, unsigned half) - { - box2d b = ima.domain(); - unsigned nrows = b.nrows(), ncols = b.ncols(); + // 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(); + // } + // } - for (unsigned row = 0; row < nrows; ++row) - { - unsigned col = 0; + + + /* + + template <typename I> + void line_inc(const I& ima, + const mln_site(I)& pstart, unsigned len, + unsigned half) + { + unsigned row = pstart.row(); + const unsigned col_start = pstart.col(); + const unsigned col_last = col_start + len - 1; std::cout << std::endl << "START : " << std::endl << std::endl; - for (unsigned c = 0; c <= half; ++c) - std::cout << " take " << ima.at(row, c) << " "; + unsigned col = col_start; + + for (unsigned c = 0; c <= half && c < len; ++c) + std::cout << " take " << ima.at(row, col + c) << " "; std::cout << std::endl; std::cout << " --> OK at " << ima.at(row, col) << std::endl; // ok (row, col) at line start + if (col == col_last) + return; std::cout << std::endl << "BEGIN : " << std::endl << std::endl; - unsigned col_plus = half; + unsigned col_plus = col_start + half; - while (col < half) + while (col < col_start + half && col < col_last) { ++col; ++col_plus; + if (col_plus <= col_last) std::cout << " take " << ima.at(row, col_plus) << " "; std::cout << " --> OK at " << ima.at(row, col) << std::endl; } + if (col == col_last) + return; + std::cout << std::endl << "MIDDLE : " << std::endl << std::endl; - int col_minus = -1; + int col_minus = col_start - 1; - while (col < ncols - half - 1) + + while (col < col_last - half) { ++col; ++col_plus; ++col_minus; + mln_invariant(col_plus >= col_start && col_plus <= col_last); std::cout << " take " << ima.at(row, col_plus) << " "; + mln_invariant(col_minus >= col_start && col_minus <= col_last); 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; + if (col == col_last) + return; std::cout << std::endl << "END : " << std::endl << std::endl; - while (col < ncols - 1) + while (col < col_last) { ++col; ++col_minus; + mln_invariant(col_minus >= col_start && col_minus <= col_last); std::cout << " untake " << ima.at(row, col_minus) << " "; std::cout << " --> OK at " << ima.at(row, col) << std::endl; } std::cout << std::endl; - abort(); } + + */ + + + + /* + + template <typename I> + void line_inc(unsigned dir, + const I& ima, + const mln_site(I)& p_start, unsigned len, + unsigned half) + { + typedef mln_site(I) P; + const unsigned start = p_start[dir]; + const unsigned last = start + len - 1; + + std::cout << std::endl + << "START : " + << std::endl + << std::endl; + + P p = p_start; + + P q = p; + for (unsigned c = 0; c <= half && c < len; ++c) + { + std::cout << " take " << ima(q) << " "; + ++q[dir]; + } + std::cout << std::endl; + + std::cout << " --> OK at " << ima(p) << std::endl; + + def::coord& cur = p[dir]; + if (cur == last) + return; + + std::cout << std::endl + << "BEGIN : " + << std::endl + << std::endl; + + P p_plus = p_start; + def::coord& plus = p_plus[dir]; + plus += half; + + while (cur < start + half && cur < last) + { + ++cur; + ++plus; + if (plus <= last) + std::cout << " take " << ima(p_plus) << " "; + std::cout << " --> OK at " << ima(p) << std::endl; + } + + if (cur == last) + return; + + std::cout << std::endl + << "MIDDLE : " + << std::endl + << std::endl; + + P p_minus = p_start; + def::coord& minus = p_minus[dir]; + --minus; + + while (cur < last - half) + { + ++cur; + ++plus; + ++minus; + mln_invariant(plus >= start && plus <= last); + std::cout << " take " << ima(p_plus) << " "; + mln_invariant(minus >= start && minus <= last); + std::cout << " untake " << ima(p_minus) << " "; + std::cout << " --> OK at " << ima(p) << std::endl; + // ok (row, cur) at line middle + } + std::cout << std::endl; + + if (cur == last) + return; + + std::cout << std::endl + << "END : " + << std::endl + << std::endl; + + while (cur < last) + { + ++cur; + ++minus; + mln_invariant(minus >= start && minus <= last); + std::cout << " untake " << ima(p_minus) << " "; + std::cout << " --> OK at " << ima(p) << std::endl; + } + std::cout << std::endl; + + } + +*/ + + + template <typename I, typename A, typename O> + void line_inc(unsigned dir, + const I& input, + const mln_site(I)& p_start, unsigned len, + A a, unsigned half, + O& output) + { + typedef mln_site(I) P; + const unsigned start = p_start[dir]; + const unsigned last = start + len - 1; + + std::cout << std::endl + << "START : " + << std::endl + << std::endl; + + P p = p_start; + a.init(); + + P q = p; + for (unsigned c = 0; c <= half && c < len; ++c) + { + a.take(input(q)); + std::cout << " take " << debug::format(input(q)) << " "; + ++q[dir]; + } + std::cout << std::endl; + + std::cout << " --> OK at " << debug::format(input(p)) << std::endl; + output(p) = a; + + def::coord& cur = p[dir]; + if (cur == last) + return; + + std::cout << std::endl + << "BEGIN : " + << std::endl + << std::endl; + + P p_plus = p_start; + def::coord& plus = p_plus[dir]; + plus += half; + + while (cur < start + half && cur < last) + { + ++cur; + ++plus; + if (plus <= last) + { + a.take(input(p_plus)); + std::cout << " take " << debug::format(input(p_plus)) << " "; + } + std::cout << " --> OK at " << debug::format(input(p)) << std::endl; + output(p) = a; + } + + if (cur == last) + return; + + std::cout << std::endl + << "MIDDLE : " + << std::endl + << std::endl; + + P p_minus = p_start; + def::coord& minus = p_minus[dir]; + --minus; + + while (cur < last - half) + { + ++cur; + ++plus; + ++minus; + mln_invariant(plus >= start && plus <= last); + a.take(input(p_plus)); + std::cout << " take " << debug::format(input(p_plus)) << " "; + mln_invariant(minus >= start && minus <= last); + a.untake(input(p_minus)); + std::cout << " untake " << debug::format(input(p_minus)) << " "; + std::cout << " --> OK at " << debug::format(input(p)) << std::endl; + output(p) = a; + // ok (row, cur) at line middle + } + std::cout << std::endl; + + if (cur == last) + return; + + std::cout << std::endl + << "END : " + << std::endl + << std::endl; + + while (cur < last) + { + ++cur; + ++minus; + mln_invariant(minus >= start && minus <= last); + a.untake(input(p_minus)); + std::cout << " untake " << debug::format(input(p_minus)) << " "; + std::cout << " --> OK at " << debug::format(input(p)) << std::endl; + output(p) = a; + } + std::cout << std::endl; + } + + } // mln + + int main() { using namespace mln; + using value::int_u8; - typedef image2d<unsigned> I; - I ima(3, 12, 0); + typedef image2d<int_u8> I; + I ima(12, 12); debug::iota(ima); debug::println(ima); - line_inc(ima, 2); + I out(12, 12); + point2d p_start(0, 0); + line_inc(0, // dir + ima, p_start, ima.ncols(), + accu::min_h<int_u8>(), 4, // half + out); + + debug::println(out); + // typedef window2d W; // W win;

1 0

milena r2534: Add hyper_directional browsing
by Matthieu Garrigues 09 Oct '08

09 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-09 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add hyper_directional browsing. This is the old directional browsing. hyper_directional browse an hyper plan of a n dimensional box (It browse all the dimensions except the given one. The given dimension is browsed by the "next()" method of the argument functor defined by the user). * mln/canvas/browsing/hyper_directional.hh: New. * tests/canvas/browsing/Makefile.am: . * tests/canvas/browsing/directional.cc: Remove. * tests/canvas/browsing/hyper_directional.cc: New. --- mln/canvas/browsing/hyper_directional.hh | 134 +++++++++++++++++++++++++++++ tests/canvas/browsing/Makefile.am | 4 tests/canvas/browsing/hyper_directional.cc | 121 ++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/tests/canvas/browsing/directional.cc (deleted) =================================================================== Index: branches/cleanup-2008/milena/tests/canvas/browsing/hyper_directional.cc =================================================================== --- branches/cleanup-2008/milena/tests/canvas/browsing/hyper_directional.cc (revision 0) +++ branches/cleanup-2008/milena/tests/canvas/browsing/hyper_directional.cc (revision 2534) @@ -0,0 +1,121 @@ +// 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. + +/*! \file tests/canvas/browsing/hyper_directional.cc + * + * \brief Tests on mln::canvas::browsing::hyper_directional. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/canvas/browsing/hyper_directional.hh> +#include <mln/fun/p2v/iota.hh> +#include <mln/debug/println.hh> +#include <mln/level/fill.hh> + +// FIXME: Move code below into mln/canvas/browsing/iota.hh. + + +template <typename I_, typename F> +struct assign_browsing_functor +{ + typedef I_ I; + enum { dim = I::site::dim }; + + + I input; + F f; + int dir; + + assign_browsing_functor(I& input, F f = F(), int dir_ = 0) + : input(input), + f(f), + dir(dir_) + {} + + mln_psite(I) p; + + void init() {} + void final() {} + void next() + { + input(p) = f(p); + //FIXME: Try to make more relevant test. + mln_assertion(p[dir] == 0); + } + void fwd() { next(); } + void bkd() { next(); } + void down() { next(); } +}; + +namespace mln +{ + + template <typename I, typename F, typename B> + void my_test(Image& ima_, + const Function_p2v<F>& f_, + const Browsing& browse_, + int dir = 0) + { + I& ima = exact(ima_); + const F& f = exact(f_); + const B& browse = exact(browse_); + + assign_browsing_functor<I, F> fun(ima, f, dir); + browse(fun); + } + +} + + +int main() +{ + using namespace mln; + image2d<unsigned> ima2(3, 3); + image3d<unsigned> ima3(3, 3, 3); + + level::fill(ima2, 0); + my_test(ima2, fun::p2v::iota, canvas::browsing::hyper_directional, 0); + debug::println(ima2); + + level::fill(ima2, 0); + my_test(ima2, fun::p2v::iota, canvas::browsing::hyper_directional, 1); + debug::println(ima2); + + + level::fill(ima3, 0); + my_test(ima3, fun::p2v::iota, canvas::browsing::hyper_directional, 0); + debug::println(ima3); + + level::fill(ima3, 0); + my_test(ima3, fun::p2v::iota, canvas::browsing::hyper_directional, 1); + debug::println(ima3); + + level::fill(ima3, 0); + my_test(ima3, fun::p2v::iota, canvas::browsing::hyper_directional, 2); + debug::println(ima3); +} Index: branches/cleanup-2008/milena/tests/canvas/browsing/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/canvas/browsing/Makefile.am (revision 2533) +++ branches/cleanup-2008/milena/tests/canvas/browsing/Makefile.am (revision 2534) @@ -6,13 +6,13 @@ fwd \ snake_fwd \ snake_vert \ - directional \ + hyper_directional \ dir_struct_elt_incr_update fwd_SOURCES = fwd.cc snake_fwd_SOURCES = snake_fwd.cc snake_vert_SOURCES = snake_vert.cc -directional_SOURCES = directional.cc +hyper_directional_SOURCES = hyper_directional.cc dir_struct_elt_incr_update_SOURCES = dir_struct_elt_incr_update.cc TESTS = $(check_PROGRAMS) Index: branches/cleanup-2008/milena/mln/canvas/browsing/hyper_directional.hh =================================================================== --- branches/cleanup-2008/milena/mln/canvas/browsing/hyper_directional.hh (revision 0) +++ branches/cleanup-2008/milena/mln/canvas/browsing/hyper_directional.hh (revision 2534) @@ -0,0 +1,134 @@ +// 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_CANVAS_BROWSING_HYPER_DIRECTIONAL_HH +# define MLN_CANVAS_BROWSING_HYPER_DIRECTIONAL_HH + +/*! \file mln/canvas/browsing/hyper_directional.hh + * + * \brief Hyper_Directional browsing of an image. + */ + +# include <mln/core/concept/browsing.hh> +# include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace canvas + { + + namespace browsing + { + + /*! + * \brief Browsing in a certain direction. + * + * This canvas browse all the point of an image 'input' of type + * 'I' and of dimension 'dim' in the direction 'dir'. + * + * The functor should provide (In addition to 'input', 'I', + * 'dim' and 'dir') three methods : + * + * - init() : Will be called at the beginning. + * - next() : Will be called at each point 'p' (also provided by + * the fonctor). + * - final(): Will be called at the end. + * + * F shall features : \n + * { \n + * --- as types: \n + * I; \n + * --- as attributes: \n + * dim; \n + * dir; // and test dir < dim \n + * input; \n + * p; \n + * --- as methods: \n + * void init(); \n + * void next(); \n + * void final(); \n + * } \n + * + */ + struct hyper_directional_t : public Browsing< hyper_directional_t > + { + template <typename F> + void operator()(F& f) const; + } + + hyper_directional; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + inline + void + hyper_directional_t::operator()(F& f) const + { + trace::entering("canvas::browsing::hyper_directional"); + mln_precondition(f.dir < f.dim); + typedef typename F::I I; + + mln_psite(I) + pmin = f.input.domain().pmin(), + pmax = f.input.domain().pmax(); + + f.p = pmin; + + f.init(); + + do + { + f.next(); + + for (int c = F::dim - 1; c >= 0; --c) + { + if (c == int(f.dir)) + continue; + if (f.p[c] != pmax[c]) + { + ++f.p[c]; + break; + } + f.p[c] = pmin[c]; + } + } while (f.p != pmin); + + f.final(); + trace::exiting("canvas::browsing::hyper_directional"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::canvas::browsing + + } // end of namespace mln::canvas + +} // end of namespace mln + +#endif // ! MLN_CANVAS_BROWSING_HYPER_DIRECTIONAL_HH

1 0

milena r2533: Add flexibility on arbitrary erosion 2d
by Matthieu Garrigues 08 Oct '08

08 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-08 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add flexibility on arbitrary erosion 2d. * mln/morpho/erosion.spe.hh: arbitrary erosion 2d choose between vertical or horizontal snake browsing with respect to the shape of the window. * tests/morpho/erosion.cc: Fix octagone 2d size. --- mln/morpho/erosion.spe.hh | 177 +++++++++++++++++++++++++++++++++------------- tests/morpho/erosion.cc | 3 2 files changed, 130 insertions(+), 50 deletions(-) Index: branches/cleanup-2008/milena/tests/morpho/erosion.cc =================================================================== --- branches/cleanup-2008/milena/tests/morpho/erosion.cc (revision 2532) +++ branches/cleanup-2008/milena/tests/morpho/erosion.cc (revision 2533) @@ -75,7 +75,7 @@ win::rectangle2d rec(21, 21); win::hline2d hline(31); win::vline2d vline(31); - win::octagon2d oct(15); + win::octagon2d oct(19); image2d<int_u8> out; image2d<int_u8> ref; // trace::quiet = false; @@ -211,7 +211,6 @@ bool test = out == ref; mln_assertion(test); std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; - io::pgm::save(out, "out_oct.pgm"); } } Index: branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2532) +++ branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2533) @@ -33,6 +33,8 @@ # endif // ! MLN_MORPHO_EROSION_HH # include <mln/core/alias/window2d.hh> +# include <mln/core/alias/dpoint2d.hh> + # include <mln/win/octagon2d.hh> # include <mln/win/rectangle2d.hh> @@ -276,16 +278,21 @@ win_right_fwd, win_left_bkd, win_right_bkd, - win_bot, - win_top; + win_bot_up, + win_top_up, + win_bot_down, + win_top_down; mln_qixter(const I, window2d) q_l_fwd, q_r_fwd, q_l_bkd, q_r_bkd, - q_top, - q_bot; + q_top_up, + q_bot_up, + q_top_down, + q_bot_down; + std::vector<move_fun> moves; std::vector<dpsite> dps; @@ -294,27 +301,53 @@ : input(input), win(win), min(), - win_left_fwd(win::shift(win, left) - win), - win_right_fwd(win - win::shift(win, left)), - win_left_bkd(win::shift(win_left_fwd, right)), - win_right_bkd(win::shift(win_right_fwd, right)), - win_bot(win - win::shift(win, up)), - win_top(win::shift(win, up) - win), + + win_left_fwd(win::shift(win, mln::left) - win), + win_right_fwd(win - win::shift(win, mln::left)), + win_left_bkd(win::shift(win_left_fwd, mln::right)), + win_right_bkd(win::shift(win_right_fwd, mln::right)), + + win_bot_up(win::shift(win, mln::down) - win), + win_top_up(win - win::shift(win, mln::down)), + win_bot_down(win::shift(win_bot_up, mln::up)), + win_top_down(win::shift(win_top_up, mln::up)), + q_l_fwd(input, win_left_fwd, p), q_r_fwd(input, win_right_fwd, p), q_l_bkd(input, win_left_bkd, p), q_r_bkd(input, win_right_bkd, p), - q_top(input, win_top, p), - q_bot(input, win_bot, p), + + q_top_up(input, win_top_up, p), + q_bot_up(input, win_bot_up, p), + q_top_down(input, win_top_down, p), + q_bot_down(input, win_bot_down, p), + moves(3), dps(3) { - dps[0] = dpsite(1, 0); - dps[1] = dpsite(0, 1); - dps[2] = dpsite(0, -1); + if (win_bot_up.size() + win_top_up.size() + + win_bot_down.size() + win_top_down.size() < + win_left_fwd.size() + win_right_fwd.size() + + win_left_bkd.size() + win_right_bkd.size()) + { + // Vertical snake + dps[0] = mln::right; + dps[1] = mln::down; + dps[2] = mln::up; + moves[0] = &self::right; + moves[1] = &self::down; + moves[2] = &self::up; + } + else + { + // Horizontal snake + dps[0] = mln::down; + dps[1] = mln::right; + dps[2] = mln::left; moves[0] = &self::down; - moves[1] = &self::fwd; - moves[2] = &self::bkd; + moves[1] = &self::right; + moves[2] = &self::left; + } } void init() @@ -323,14 +356,14 @@ extension::fill(input, mln_max(mln_value(I))); initialize(output, input); min.init(); - p = input.domain().pmin() + up; + p = input.domain().pmin() - dps[0]; mln_qixter(const I, W) q(input, win, p); for_all(q) min.take(q.val()); p = input.domain().pmin(); } - void fwd() + void right() { for_all(q_l_fwd) min.untake(q_l_fwd.val()); @@ -339,7 +372,7 @@ output(p) = min; } - void bkd() + void left() { for_all(q_r_bkd) min.untake(q_r_bkd.val()); @@ -350,10 +383,19 @@ void down() { - for_all(q_top) - min.untake(q_top.val()); - for_all(q_bot) - min.take(q_bot.val()); + for_all(q_top_down) + min.untake(q_top_down.val()); + for_all(q_bot_down) + min.take(q_bot_down.val()); + output(p) = min; + } + + void up() + { + for_all(q_bot_up) + min.untake(q_bot_up.val()); + for_all(q_top_up) + min.take(q_top_up.val()); output(p) = min; } @@ -395,16 +437,20 @@ win_right_fwd, win_left_bkd, win_right_bkd, - win_bot, - win_top; + win_bot_up, + win_top_up, + win_bot_down, + win_top_down; mln_qiter(window2d) q_l_fwd, q_r_fwd, q_l_bkd, q_r_bkd, - q_top, - q_bot; + q_top_up, + q_bot_up, + q_top_down, + q_bot_down; std::vector<move_fun> moves; std::vector<dpsite> dps; @@ -413,27 +459,53 @@ : input(input), win(win), min(), - win_left_fwd(win::shift(win, left) - win), - win_right_fwd(win - win::shift(win, left)), - win_left_bkd(win::shift(win_left_fwd, right)), - win_right_bkd(win::shift(win_right_fwd, right)), - win_bot(win - win::shift(win, up)), - win_top(win::shift(win, up) - win), + + win_left_fwd(win::shift(win, mln::left) - win), + win_right_fwd(win - win::shift(win, mln::left)), + win_left_bkd(win::shift(win_left_fwd, mln::right)), + win_right_bkd(win::shift(win_right_fwd, mln::right)), + + win_bot_up(win::shift(win, mln::down) - win), + win_top_up(win - win::shift(win, mln::down)), + win_bot_down(win::shift(win_bot_up, mln::up)), + win_top_down(win::shift(win_top_up, mln::up)), + q_l_fwd(win_left_fwd, p), q_r_fwd(win_right_fwd, p), q_l_bkd(win_left_bkd, p), q_r_bkd(win_right_bkd, p), - q_top(win_top, p), - q_bot(win_bot, p), + + q_top_up(win_top_up, p), + q_bot_up(win_bot_up, p), + q_top_down(win_top_down, p), + q_bot_down(win_bot_down, p), + moves(3), dps(3) { - dps[0] = dpsite(1, 0); - dps[1] = dpsite(0, 1); - dps[2] = dpsite(0, -1); + if (win_bot_up.size() + win_top_up.size() + + win_bot_down.size() + win_top_down.size() < + win_left_fwd.size() + win_right_fwd.size() + + win_left_bkd.size() + win_right_bkd.size()) + { + // Vertical snake + dps[0] = mln::right; + dps[1] = mln::down; + dps[2] = mln::up; + moves[0] = &self::right; + moves[1] = &self::down; + moves[2] = &self::up; + } + else + { + // Horizontal snake + dps[0] = mln::down; + dps[1] = mln::right; + dps[2] = mln::left; moves[0] = &self::down; - moves[1] = &self::fwd; - moves[2] = &self::bkd; + moves[1] = &self::right; + moves[2] = &self::left; + } } void init() @@ -442,14 +514,14 @@ extension::fill(input, mln_max(mln_value(I))); initialize(output, input); min.init(); - p = input.domain().pmin() + up; + p = input.domain().pmin() - dps[0]; mln_qiter(W) q(win, p); for_all(q) min.take(input(q)); p = input.domain().pmin(); } - void fwd() + void right() { for_all(q_l_fwd) min.untake(input(q_l_fwd)); @@ -458,7 +530,7 @@ output(p) = min; } - void bkd() + void left() { for_all(q_r_bkd) min.untake(input(q_r_bkd)); @@ -469,10 +541,19 @@ void down() { - for_all(q_top) - min.untake(input(q_top)); - for_all(q_bot) - min.take(input(q_bot)); + for_all(q_top_down) + min.untake(input(q_top_down)); + for_all(q_bot_down) + min.take(input(q_bot_down)); + output(p) = min; + } + + void up() + { + for_all(q_bot_up) + min.untake(input(q_bot_up)); + for_all(q_top_up) + min.take(input(q_top_up)); output(p) = min; }

1 0

scool r118: Accept where clauses in class predeclarations
by Maxime van Noppen 08 Oct '08

08 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-08 Maxime van Noppen <yabo(a)lrde.epita.fr> Accept where clauses in class predeclarations * scl-syn/Declaration.sdf: Here. Declaration.sdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 117) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 118) @@ -30,5 +30,5 @@ Identifier ":" ParametersDeclaration "->" "type" "=" StaticBlock -> StaticFunction {cons("StaticTypeFunction")} ClassQualifier? Identifier ":" ParametersDeclaration "->" "class" "=" StaticClassBlock -> StaticFunction {cons("StaticClassFunction")} - ClassQualifier? Identifier ":" "class" ";" -> Declaration {cons("ClassDeclaration")} + ClassQualifier? Identifier ":" "class" ClassWhereClause? ";" -> Declaration {cons("ClassDeclaration")} ClassQualifier? Identifier ":" "class" ClassWhereClause? "=" ClassBlock -> Declaration {cons("ClassDefinition")} -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r117: Fix moulette
by Maxime van Noppen 08 Oct '08

08 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-08 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix moulette * check.sh: Print the summary of the performed tests even when they * are given on the command line. check.sh | 1 + 1 file changed, 1 insertion(+) Index: branches/scool-ng/tests/check.sh =================================================================== --- branches/scool-ng/tests/check.sh (revision 116) +++ branches/scool-ng/tests/check.sh (revision 117) @@ -308,6 +308,7 @@ shift done + print_summary exit 0 fi -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r116: Do not add the inheritance relationships in class predeclarations
by Maxime van Noppen 08 Oct '08

08 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-08 Maxime van Noppen <yabo(a)lrde.epita.fr> Do not add the inheritance relationships in class predeclarations * Declaration.str: Here. Declaration.str | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 115) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 116) @@ -64,15 +64,14 @@ //////////////////////////////////////////////////////////////////////////////// DeclarationToCxx: - ClassDeclaration(cqualif, idf, None()) -> CxxClassDecl(cxx_params, cxx_idf, []) + ClassDeclaration(cqualif, idf, _) -> CxxClassDecl(cxx_params, cxx_idf, []) where <AddExactType(|cqualif)> [] => cxx_params ; <IdentifierToCxx> idf => cxx_idf - DeclarationToCxx: - ClassDeclaration(cqualif, idf, Some(ClassWhereClause([wclause]))) -> cxx_code - where - <ClassWhereClauseToCxx(|cqualif, idf)> wclause => cxx_code +// FIXME: we could generate a comment explaining the where clause to document the predeclaration +// DeclarationToCxx: +// ClassDeclaration(cqualif, idf, Some(ClassWhereClause([wclause]))) -> CxxClassDecl(cxx_params, cxx_idf, []) DeclarationToCxx: -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r115: Fix compilation problems in tests
by Maxime van Noppen 08 Oct '08

08 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-08 Maxime van Noppen <yabo(a)lrde.epita.fr> Fix compilation problems in tests * class/c++_ast/declaration_002.aterm: Fix. * class/c++_src/declaration_002.cc: Fix. * class/c++_ast/inheritance_004.aterm: Remove. * class/c++_build/declaration_002.g++: New. * class/c++_src/inheritance_004.cc: Remove. * class/scool_ast/inheritance_004.aterm, * class/scool_src/inheritance_004.scl: Fix. * config: Increase the number of tests to automatically perform the * compilation test. class/c++_ast/declaration_002.aterm | 2 +- class/c++_src/declaration_002.cc | 2 +- class/scool_ast/inheritance_004.aterm | 2 +- class/scool_src/inheritance_004.scl | 4 ++++ config | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) Index: branches/scool-ng/tests/class/c++_ast/inheritance_004.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/class/c++_ast/declaration_002.aterm =================================================================== --- branches/scool-ng/tests/class/c++_ast/declaration_002.aterm (revision 114) +++ branches/scool-ng/tests/class/c++_ast/declaration_002.aterm (revision 115) @@ -1 +1 @@ -CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[("public",CxxType(CxxId("Bar"),[CxxId("Exact")]))])]) +CxxProgram([CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Bar"),[]),CxxClassDecl([(CxxType("typename"),"Exact")],CxxId("Foo"),[])]) Index: branches/scool-ng/tests/class/c++_src/inheritance_004.cc (deleted) =================================================================== Index: branches/scool-ng/tests/class/c++_src/declaration_002.cc =================================================================== --- branches/scool-ng/tests/class/c++_src/declaration_002.cc (revision 114) +++ branches/scool-ng/tests/class/c++_src/declaration_002.cc (revision 115) @@ -1,4 +1,4 @@ template < typename Exact > class Bar; template < typename Exact > -class Foo : public Bar< Exact >; +class Foo; Index: branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm (revision 114) +++ branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm (revision 115) @@ -1 +1 @@ -Program([ClassDefinition(None,Identifier("Cat"),Some(ClassWhereClause([Inherits("Cat",StaticFunctionCall(Identifier("Foo"),Parameters([Integer("42")])))])),ClassBlock([]))]) +Program([StaticClassFunction(None,Identifier("Foo"),ParametersDeclaration([TypedId(Identifier("I"),SimpleType("int"))]),StaticClassBlock([])),ClassDefinition(None,Identifier("Cat"),Some(ClassWhereClause([Inherits("Cat",StaticFunctionCall(Identifier("Foo"),Parameters([Integer("42")])))])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_src/inheritance_004.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/inheritance_004.scl (revision 114) +++ branches/scool-ng/tests/class/scool_src/inheritance_004.scl (revision 115) @@ -1,3 +1,7 @@ +Foo : [I : int ] -> class = +{ +} + Cat : class where Cat -> Foo[42] = { } Index: branches/scool-ng/tests/class/c++_build/declaration_002.g++ =================================================================== Index: branches/scool-ng/tests/config =================================================================== --- branches/scool-ng/tests/config (revision 114) +++ branches/scool-ng/tests/config (revision 115) @@ -1,4 +1,4 @@ -number_of_tests=3 +number_of_tests=4 test_1 () { -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0