https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> De-activate dependencies to files kept out of release 1.0. * mln/trait/ch_value.hh, * mln/trait/essential.hh, * mln/trait/all.hh, * mln/core/image/vmorph/thru_image.hh, * mln/core/image/vmorph/all.hh, * mln/core/image/vmorph/thrubin_image.hh, * mln/all.hh, * mln/data/all.hh, * mln/linear/all.hh, * mln/value/all.hh, * mln/value/essential.hh, * mln/convert/all.hh, * mln/essential/routine.hh, * mln/fun/all.hh, * mln/fun/v2v/essential.hh, * mln/fun/v2v/all.hh, * mln/fun/essential.hh, * tests/trait/ch_value.cc, * tests/core/image/vmorph/Makefile.am, * tests/linear/Makefile.am, * tests/value/Makefile.am, * tests/convert/Makefile.am, * tests/fun/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/Makefile.am: De-activate dependencies to files kept out of release 1.0. Misc. * mln/core/image/vmorph/fun_image.hh: Re-vamp. * tests/core/image/vmorph/fun_image.cc: New. * mln/accu/shape/bbox.hh: Fix namespace balancing. mln/accu/shape/bbox.hh | 8 ++- mln/all.hh | 9 +++- mln/convert/all.hh | 3 - mln/core/image/vmorph/all.hh | 5 +- mln/core/image/vmorph/fun_image.hh | 67 ++++++++++++++++++++++----------- mln/core/image/vmorph/thru_image.hh | 11 ++--- mln/core/image/vmorph/thrubin_image.hh | 12 +++-- mln/data/all.hh | 3 - mln/essential/routine.hh | 13 ++++-- mln/fun/all.hh | 15 ++++++- mln/fun/essential.hh | 7 ++- mln/fun/v2v/all.hh | 12 +++-- mln/fun/v2v/essential.hh | 8 ++- mln/linear/all.hh | 16 +++---- mln/trait/all.hh | 22 ++++------ mln/trait/ch_value.hh | 37 +++++++++--------- mln/trait/essential.hh | 19 +++------ mln/value/all.hh | 16 ++++--- mln/value/essential.hh | 9 ++-- tests/Makefile.am | 7 +-- tests/convert/Makefile.am | 4 - tests/core/image/vmorph/Makefile.am | 4 + tests/core/image/vmorph/fun_image.cc | 47 +++++++++++++++++++++++ tests/fun/Makefile.am | 3 - tests/fun/v2v/Makefile.am | 11 ++--- tests/linear/Makefile.am | 11 +++-- tests/trait/ch_value.cc | 17 ++++---- tests/value/Makefile.am | 8 ++- 28 files changed, 265 insertions(+), 139 deletions(-) Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 4130) +++ mln/trait/ch_value.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -115,23 +116,25 @@ typedef M< mln_ch_value(I, V), E > ret; }; - // For mln::value::stack_image<n,I>. - template < template <unsigned, class> class M, unsigned n, typename I, - typename V > - struct ch_value_< M< n, tag::image_<I> >, V > - { - /* FIXME: The code used to read - - typedef algebra::vec<n, V> value; - typedef mln_ch_value(I, value) ret; - here. But this is wrong IMHO (Roland). Changing the value - type of a stack image (in fact, a vectorial image) shall - alter the *value type* of the image, not the type of the - *components* of the vector. Hence the current definition. - */ - typedef mln_ch_value(I, V) ret; - }; + // De-activated for 1.0 + // +// // For mln::value::stack_image<n,I>. +// template < template <unsigned, class> class M, unsigned n, typename I, +// typename V > +// struct ch_value_< M< n, tag::image_<I> >, V > +// { +// // FIXME: The code used to read + +// // typedef algebra::vec<n, V> value; +// // typedef mln_ch_value(I, value) ret; + +// // here. But this is wrong IMHO (Roland). Changing the value +// // type of a stack image (in fact, a vectorial image) shall +// // alter the *value type* of the image, not the type of the +// // *components* of the vector. Hence the current definition. +// typedef mln_ch_value(I, V) ret; +// }; // For mln::complex_image<D, G, T>. template < template <unsigned, class, class> class M, Index: mln/trait/essential.hh --- mln/trait/essential.hh (revision 4130) +++ mln/trait/essential.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,20 +27,14 @@ #ifndef MLN_TRAIT_ESSENTIAL_HH # define MLN_TRAIT_ESSENTIAL_HH -/*! - * \file - * - * \brief Definition of essential traits. - * - */ +/// +/// \file +/// +/// \brief Definition of essential traits. -// meta-program to solve a trait cessential -# include <mln/trait/solve.hh> -// promote +# include <mln/trait/solve.hh> # include <mln/trait/promote.hh> - -// ops # include <mln/trait/op/essential.hh> Index: mln/trait/all.hh --- mln/trait/all.hh (revision 4130) +++ mln/trait/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,12 +27,10 @@ #ifndef MLN_TRAIT_ALL_HH # define MLN_TRAIT_ALL_HH -/*! - * \file - * - * \brief Definition of all traits. - * - */ +/// +/// \file +/// +/// \brief Definition of all traits. namespace mln @@ -55,14 +54,13 @@ } // end of namespace mln -// meta-program to solve a trait call # include <mln/trait/solve.hh> - -// promote # include <mln/trait/promote.hh> - -// ops # include <mln/trait/op/all.hh> +// # include <mln/trait/next/all.hh> De-activated in 1.0 +// # include <mln/trait/functions.hh> De-activated in 1.0 + + #endif // ! MLN_TRAIT_ALL_HH Index: mln/core/image/vmorph/thru_image.hh --- mln/core/image/vmorph/thru_image.hh (revision 4130) +++ mln/core/image/vmorph/thru_image.hh (working copy) @@ -26,17 +26,18 @@ #ifndef MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH # define MLN_CORE_IMAGE_VMORPH_THRU_IMAGE_HH -# include <mln/core/internal/image_value_morpher.hh> -# include <mln/core/concept/meta_function.hh> -# include <mln/metal/bexpr.hh> -# include <mln/trait/functions.hh> - /// \file /// /// \brief Definition of a morpher that morph image values through a function. /// /// \todo Debug constness of thru_image +# include <mln/core/internal/image_value_morpher.hh> +# include <mln/core/concept/meta_function.hh> +# include <mln/metal/bexpr.hh> +# include <mln/trait/functions.hh> + + namespace mln { Index: mln/core/image/vmorph/all.hh --- mln/core/image/vmorph/all.hh (revision 4130) +++ mln/core/image/vmorph/all.hh (working copy) @@ -33,9 +33,10 @@ # include <mln/core/image/vmorph/cast_image.hh> # include <mln/core/image/vmorph/fun_image.hh> -# include <mln/core/image/vmorph/thrubin_image.hh> -# include <mln/core/image/vmorph/thru_image.hh> # include <mln/core/image/vmorph/violent_cast_image.hh> +// # include <mln/core/image/vmorph/thrubin_image.hh> De-activated in 1.0 +// # include <mln/core/image/vmorph/thru_image.hh> De-activated in 1.0 + #endif // ! MLN_CORE_IMAGE_VMORPH_ALL_HH Index: mln/core/image/vmorph/fun_image.hh --- mln/core/image/vmorph/fun_image.hh (revision 4130) +++ mln/core/image/vmorph/fun_image.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -28,16 +29,17 @@ /// \file /// -/// Definition of an image morpher that make the user see the -/// image through a function +/// Definition of an image morpher that returns image data through a +/// function. # include <mln/core/internal/image_value_morpher.hh> # include <mln/trait/images.hh> # include <mln/value/set.hh> -# include <mln/value/shell.hh> +// # include <mln/value/shell.hh> De-activated for 1.0 # include <mln/metal/if.hh> # include <mln/metal/equal.hh> + namespace mln { @@ -50,8 +52,9 @@ template <typename F, typename I> struct data< fun_image<F,I> > { - data(I& ima); - I& ima_; + data(const F& f, const I& ima); + F f_; + const I ima_; }; } // end of namespace mln::internal @@ -66,7 +69,7 @@ { // typedef trait::image::category::value_morpher category; typedef trait::image::category::primary category; // does not work either - typedef trait::image::value_io::read_write value_io; + typedef trait::image::value_io::read_only value_io; typedef trait::image::value_access::computed value_access; typedef trait::image::value_storage::disrupted value_storage; typedef @@ -88,7 +91,6 @@ - /// Image read through a function. /// /// \ingroup modimagevaluemorpher @@ -104,7 +106,8 @@ typedef mln_result(F) rvalue; /// Return type of read-write access. - typedef mln::value::shell<F,I> lvalue; + typedef mln_result(F) lvalue; + // typedef mln::value::shell<F,I> lvalue; De-activated for 1.0 /// Skeleton. typedef fun_image< tag::value_<mln_result(F)>, tag::image_<I> > skeleton; @@ -113,23 +116,42 @@ fun_image(); /// Constructor. - fun_image(Image<I>& ima); + fun_image(const Function_v2v<F>& f, const Image<I>& ima); /// Initialize an empty image. - void init_(Image<I>& ima); + void init_(const Function_v2v<F>& f, const Image<I>& ima); /// Read-only access of pixel value at point site \p p. mln_result(F) operator()(const mln_psite(I)& p) const; - /// Mutable access is for reading and writing. - lvalue operator()(const mln_psite(I)& p); + /// Mutable access is for reading only. + mln_result(F) operator()(const mln_psite(I)& p); + // lvalue operator()(const mln_psite(I)& p); De-activated for 1.0 F f; }; + + + template <typename F, typename I> + fun_image<F, I> + operator << (const Function_v2v<F>& f, const Image<I>& ima); + + + # ifndef MLN_INCLUDE_ONLY + template <typename F, typename I> + fun_image<F, I> + inline + operator << (const Function_v2v<F>& f, const Image<I>& ima) + { + fun_image<F, I> tmp(exact(f), exact(ima)); + return tmp; + } + + // internal::data< fun_image<T,I> > namespace internal @@ -137,8 +159,9 @@ template <typename F, typename I> inline - data< fun_image<F,I> >::data(I& ima) - : ima_(ima) + data< fun_image<F,I> >::data(const F& f, const I& ima) + : f_(f), + ima_(ima) { } @@ -156,19 +179,19 @@ template <typename F, typename I> inline - fun_image<F,I>::fun_image(Image<I>& ima) + fun_image<F,I>::fun_image(const Function_v2v<F>& f, const Image<I>& ima) { - init_(ima); + init_(f, ima); } template <typename F, typename I> inline void - fun_image<F,I>::init_(Image<I>& ima) + fun_image<F,I>::init_(const Function_v2v<F>& f, const Image<I>& ima) { mln_precondition(exact(ima).is_valid()); - this->data_ = new internal::data<fun_image<F,I> >(exact(ima)); + this->data_ = new internal::data<fun_image<F,I> >(exact(f), exact(ima)); } @@ -183,10 +206,12 @@ template <typename F, typename I> inline - value::shell<F, I> + mln_result(F) fun_image<F,I>::operator()(const mln_psite(I)& p) { - return mln::value::shell<F, I>( this->data_->ima_, p ); + mln_precondition(this->data_->ima_.has(p)); + return f( this->data_->ima_(p) ); +// return mln::value::shell<F, I>( this->data_->ima_, p ); De-activated for 1.0 } Index: mln/core/image/vmorph/thrubin_image.hh --- mln/core/image/vmorph/thrubin_image.hh (revision 4130) +++ mln/core/image/vmorph/thrubin_image.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,15 +27,16 @@ #ifndef MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH # define MLN_CORE_IMAGE_VMORPH_THRUBIN_IMAGE_HH +/// \file +/// +/// \brief Definition of a morpher that morph values from two images +/// through a binary function. + # include <mln/core/internal/image_value_morpher.hh> # include <mln/core/concept/meta_function.hh> # include <mln/metal/bexpr.hh> # include <mln/trait/functions.hh> -/// \file -/// -/// \brief Definition of a morpher that morph values from two images -/// through a binary function. namespace mln { Index: mln/all.hh --- mln/all.hh (revision 4130) +++ mln/all.hh (working copy) @@ -29,6 +29,8 @@ /// \file /// /// File that includes all the headers. +/// +/// \todo Do not include essentials. #include <mln/accu/all.hh> @@ -43,7 +45,6 @@ #include <mln/draw/all.hh> #include <mln/estim/all.hh> #include <mln/extension/all.hh> -#include <mln/extract/all.hh> #include <mln/fun/all.hh> #include <mln/geom/all.hh> #include <mln/graph/all.hh> @@ -74,4 +75,10 @@ #include <mln/essential/2d.hh> #include <mln/essential/3d.hh> + +// #include <mln/extract/all.hh> De-activated in 1.0 +// #include <mln/registration/all.hh> De-activated in 1.0 +// #include <mln/subsampling/all.hh> De-activated in 1.0 + + #endif // ! MLN_ALL_HH Index: mln/data/all.hh --- mln/data/all.hh (revision 4130) +++ mln/data/all.hh (working copy) @@ -68,7 +68,8 @@ # include <mln/data/to_enc.hh> # include <mln/data/transform.hh> # include <mln/data/update.hh> -//<< # include <mln/data/was.median.hh> >> + +// # include <mln/data/was.median.hh> De-activated in 1.0 Index: mln/linear/all.hh --- mln/linear/all.hh (revision 4130) +++ mln/linear/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -58,15 +59,14 @@ # include <mln/linear/convolve.hh> # include <mln/linear/convolve_2x1d.hh> # include <mln/linear/convolve_directional.hh> - -# include <mln/linear/gaussian.hh> -# include <mln/linear/gaussian_directional_2d.hh> -# include <mln/linear/gaussian_1d.hh> - # include <mln/linear/lap.hh> # include <mln/linear/log.hh> -//# include <mln/linear/sobel.hh> -//# include <mln/linear/local/convolve.hh> + +// # include <mln/linear/sobel.hh> De-activated in 1.0 +// # include <mln/linear/local/convolve.hh> De-activated in 1.0 +// # include <mln/linear/gaussian.hh> De-activated in 1.0 +// # include <mln/linear/gaussian_directional_2d.hh> De-activated in 1.0 +// # include <mln/linear/gaussian_1d.hh> De-activated in 1.0 #endif // ! MLN_LINEAR_ALL_HH Index: mln/accu/shape/bbox.hh --- mln/accu/shape/bbox.hh (revision 4130) +++ mln/accu/shape/bbox.hh (working copy) @@ -81,7 +81,7 @@ }; - } // end of mln::accu::shape + } // end of namespace mln::accu::shape namespace meta @@ -104,6 +104,8 @@ } // end of namespace mln::accu::meta + + # ifndef MLN_INCLUDE_ONLY namespace shape @@ -224,10 +226,10 @@ return is_valid_; } -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::shape +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::accu } // end of namespace mln Index: mln/value/all.hh --- mln/value/all.hh (revision 4130) +++ mln/value/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,8 @@ /// \file /// /// File that includes all "value types"-related materials. +/// +/// \todo Incomplete list of files. namespace mln @@ -44,18 +47,19 @@ } -# include <mln/value/aliases.hh> -# include <mln/value/label.hh> # include <mln/trait/value_.hh> -# include <mln/value/proxy.hh> +# include <mln/value/aliases.hh> # include <mln/value/interval.hh> +# include <mln/value/label.hh> +# include <mln/value/proxy.hh> // FIXME: that includes concept/image.hh! -// # include <mln/value/cast.hh> -// # include <mln/value/stack.hh> +// # include <mln/value/cast.hh> De-activated in 1.0 +// # include <mln/value/shell.hh> De-activated in 1.0 +// # include <mln/value/stack.hh> De-activated in 1.0 Index: mln/value/essential.hh --- mln/value/essential.hh (revision 4130) +++ mln/value/essential.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,14 +31,15 @@ /// /// File that includes essential "value types"-related materials. + # include <mln/value/concept/essential.hh> # include <mln/value/builtin/essential.hh> # include <mln/value/float01_8.hh> # include <mln/value/float01_16.hh> -//# include <mln/value/gl8.hh> -//# include <mln/value/gl16.hh> +// # include <mln/value/gl8.hh> De-activated in 1.0 +// # include <mln/value/gl16.hh> De-activated in 1.0 # include <mln/value/int_s8.hh> # include <mln/value/int_s16.hh> @@ -53,4 +55,5 @@ # include <mln/value/rgb8.hh> # include <mln/value/rgb16.hh> + #endif // ! MLN_VALUE_ESSENTIAL_HH Index: mln/convert/all.hh --- mln/convert/all.hh (revision 4130) +++ mln/convert/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // Index: mln/essential/routine.hh --- mln/essential/routine.hh (revision 4130) +++ mln/essential/routine.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,6 +27,7 @@ #ifndef MLN_ESSENTIAL_ROUTINE_HH # define MLN_ESSENTIAL_ROUTINE_HH + # include <mln/topo/essential.hh> # include <mln/accu/essential.hh> # include <mln/algebra/essential.hh> @@ -40,7 +42,6 @@ # include <mln/draw/essential.hh> # include <mln/estim/essential.hh> # include <mln/extension/essential.hh> -# include <mln/extract/essential.hh> # include <mln/fun/essential.hh> # include <mln/geom/essential.hh> # include <mln/graph/essential.hh> @@ -58,9 +59,7 @@ # include <mln/norm/essential.hh> # include <mln/opt/essential.hh> # include <mln/pw/essential.hh> -# include <mln/registration/essential.hh> # include <mln/set/essential.hh> -# include <mln/subsampling/essential.hh> # include <mln/tag/essential.hh> # include <mln/test/essential.hh> # include <mln/trace/essential.hh> @@ -70,4 +69,10 @@ # include <mln/value/essential.hh> # include <mln/win/essential.hh> + +// # include <mln/extract/essential.hh> De-activated in 1.0 +// # include <mln/registration/essential.hh> De-activated in 1.0 +// # include <mln/subsampling/essential.hh> De-activated in 1.0 + + #endif // ! MLN_ESSENTIAL_ROUTINE_HH Index: mln/fun/all.hh --- mln/fun/all.hh (revision 4130) +++ mln/fun/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,6 +30,8 @@ /// \file /// /// File that includes all functions. +/// +/// \todo Incomplete list of files. namespace mln @@ -46,10 +49,15 @@ } +// Files. + # include <mln/fun/c.hh> # include <mln/fun/ops.hh> + + +// Sub-directories. + # include <mln/fun/i2v/all.hh> -# include <mln/fun/meta/all.hh> # include <mln/fun/p2b/all.hh> # include <mln/fun/p2v/all.hh> # include <mln/fun/stat/all.hh> @@ -61,5 +69,8 @@ # include <mln/fun/x2v/all.hh> # include <mln/fun/x2x/all.hh> +// # include <mln/fun/meta/all.hh> De-activated in 1.0 +// # include <mln/fun/spe/all.hh> De-activated in 1.0 + #endif // ! MLN_FUN_ALL_HH Index: mln/fun/v2v/essential.hh --- mln/fun/v2v/essential.hh (revision 4130) +++ mln/fun/v2v/essential.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,10 +31,13 @@ /// /// \brief File that includes essential functions from value to value. + # include <mln/fun/v2v/abs.hh> # include <mln/fun/v2v/cast.hh> # include <mln/fun/v2v/convert.hh> -# include <mln/fun/v2v/rgb_to_hsi.hh> # include <mln/fun/v2v/saturate.hh> +// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0 + + #endif // ! MLN_FUN_V2V_ESSENTIAL_HH Index: mln/fun/v2v/all.hh --- mln/fun/v2v/all.hh (revision 4130) +++ mln/fun/v2v/all.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -51,16 +52,17 @@ # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> -# include <mln/fun/v2v/hsi_to_rgb.hh> -# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/fun/v2v/id.hh> # include <mln/fun/v2v/linear.hh> # include <mln/fun/v2v/norm.hh> # include <mln/fun/v2v/projection.hh> -# include <mln/fun/v2v/rgb_to_hsi.hh> -# include <mln/fun/v2v/rgb_to_hsl.hh> # include <mln/fun/v2v/saturate.hh> # include <mln/fun/v2v/wrap.hh> +// # include <mln/fun/v2v/hsi_to_rgb.hh> De-activated in 1.0 +// # include <mln/fun/v2v/hsl_to_rgb.hh> De-activated in 1.0 +// # include <mln/fun/v2v/rgb_to_hsi.hh> De-activated in 1.0 +// # include <mln/fun/v2v/rgb_to_hsl.hh> De-activated in 1.0 + #endif // ! MLN_FUN_V2V_ALL_HH Index: mln/fun/essential.hh --- mln/fun/essential.hh (revision 4130) +++ mln/fun/essential.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,10 +31,11 @@ /// /// File that includes essential fun-related routines. + # include <mln/fun/c.hh> # include <mln/fun/ops.hh> # include <mln/fun/i2v/essential.hh> -# include <mln/fun/meta/essential.hh> +// # include <mln/fun/meta/essential.hh> # include <mln/fun/p2b/essential.hh> # include <mln/fun/p2v/essential.hh> # include <mln/fun/v2b/essential.hh> @@ -43,4 +45,5 @@ # include <mln/fun/x2v/essential.hh> # include <mln/fun/x2x/essential.hh> + #endif // ! MLN_FUN_ESSENTIAL_HH Index: tests/trait/ch_value.cc --- tests/trait/ch_value.cc (revision 4130) +++ tests/trait/ch_value.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,7 +27,7 @@ #include <mln/trait/ch_value.hh> #include <mln/core/image/image2d.hh> -#include <mln/value/stack.hh> +// #include <mln/value/stack.hh> De-activated for 1.0 int main() @@ -37,11 +38,13 @@ typedef trait::ch_value<I, bool>::ret J; J ima1; - // Stack image. - typedef value::stack_image<3, I> K; - typedef trait::ch_value<K, float>::ret L; - L ima2; - mlc_equal(L, image2d<float>)::check(); + // De-activated for 1.0 + // +// // Stack image. +// typedef value::stack_image<3, I> K; +// typedef trait::ch_value<K, float>::ret L; +// L ima2; +// mlc_equal(L, image2d<float>)::check(); // FIXME: Exercise more image types. // ... Index: tests/core/image/vmorph/Makefile.am --- tests/core/image/vmorph/Makefile.am (revision 4130) +++ tests/core/image/vmorph/Makefile.am (working copy) @@ -20,8 +20,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - cast_image + cast_image \ + fun_image cast_image_SOURCES = cast_image.cc +fun_image_SOURCES = fun_image.cc TESTS = $(check_PROGRAMS) Index: tests/core/image/vmorph/fun_image.cc --- tests/core/image/vmorph/fun_image.cc (revision 0) +++ tests/core/image/vmorph/fun_image.cc (revision 0) @@ -0,0 +1,47 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/vmorph/fun_image.hh> +#include <mln/data/compare.hh> +#include <mln/debug/iota.hh> +#include <mln/fun/v2v/inc.hh> + + + +int main() +{ + using namespace mln; + + + image2d<int> ima(2, 2); + debug::iota(ima); + + int vals[] = { 2, 3, + 4, 5 }; + + fun::v2v::inc<int> f; + mln_assertion((f << ima) == make::image2d(vals)); +} Index: tests/linear/Makefile.am --- tests/linear/Makefile.am (revision 4130) +++ tests/linear/Makefile.am (working copy) @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -20,24 +21,26 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ - gaussian \ local +# gaussian De-activated for 1.0 + check_PROGRAMS = \ convolve \ convolve_directional \ convolve_2x1d \ - gaussian_ \ lap \ log \ sobel_2d convolve_SOURCES = convolve.cc -gaussian__SOURCES = gaussian.cc lap_SOURCES = lap.cc convolve_directional_SOURCES = convolve_directional.cc convolve_2x1d_SOURCES = convolve_2x1d.cc log_SOURCES = log.cc sobel_2d_SOURCES = sobel_2d.cc +# gaussian__SOURCES = gaussian.cc De-activated for 1.0 + + TESTS = $(check_PROGRAMS) Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 4130) +++ tests/value/Makefile.am (working copy) @@ -39,8 +39,9 @@ rgb8 \ scalar \ set \ - sign \ - stack + sign + +# stack De-activated for 1.0 # float01 # float01_bis # float01_f @@ -69,7 +70,8 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc -stack_SOURCES = stack.cc + +# stack_SOURCES = stack.cc De-activated for 1.0 # FIXME: Enable when make check_full works. # graylevel_f_full_SOURCES = graylevel_f_full.cc Index: tests/convert/Makefile.am --- tests/convert/Makefile.am (revision 4130) +++ tests/convert/Makefile.am (working copy) @@ -23,14 +23,13 @@ ##FIXME: re-enable all tests check_PROGRAMS = \ - to_hsl \ to_image \ to_p_array \ to_p_set \ to_rgb \ to_window -to_hsl_SOURCES = to_hsl.cc +# to_hsl_SOURCES = to_hsl.cc De-activated for 1.0 to_image_SOURCES = to_image.cc to_p_array_SOURCES = to_p_array.cc to_p_set_SOURCES = to_p_set.cc @@ -38,4 +37,3 @@ to_window_SOURCES = to_window.cc TESTS = $(check_PROGRAMS) - Index: tests/fun/Makefile.am --- tests/fun/Makefile.am (revision 4130) +++ tests/fun/Makefile.am (working copy) @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # Index: tests/fun/v2v/Makefile.am --- tests/fun/v2v/Makefile.am (revision 4130) +++ tests/fun/v2v/Makefile.am (working copy) @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -20,16 +21,16 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - hsl_to_rgb \ norm \ projection \ - rgb_to_hsl \ wrap norm_SOURCES = norm.cc projection_SOURCES = projection.cc -rgb_to_hsl_SOURCES = rgb_to_hsl.cc -hsl_to_rgb_SOURCES = hsl_to_rgb.cc wrap_SOURCES = wrap.cc +# rgb_to_hsl_SOURCES = rgb_to_hsl.cc De-activated for 1.0 +# hsl_to_rgb_SOURCES = hsl_to_rgb.cc De-activated for 1.0 +# component_SOURCES = component.cc De-activated for 1.0 + TESTS = $(check_PROGRAMS) Index: tests/Makefile.am --- tests/Makefile.am (revision 4130) +++ tests/Makefile.am (working copy) @@ -34,7 +34,6 @@ draw \ estim \ extension \ - extract \ fun \ geom \ graph \ @@ -51,9 +50,7 @@ norm \ opt \ pw \ - registration \ set \ - subsampling \ tag \ test \ topo \ @@ -67,6 +64,10 @@ win \ world +# extract De-activated for 1.0 +# registration De-activated for 1.0 +# subsampling De-activated for 1.0 + check_PROGRAMS = \ all_headers \