Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix ambiguity in border property. * mln/trait/image/props.hh (some): New in 'border'. * mln/border/get.hh: Fix ambiguity. * tests/core_clone.cc: Update. * tests/box2d.cc: Augment. * tests/border_get.cc: Augment. * TODO: Clean. * mln/trait/images.hh (image_): Handle const case. * mln/core/box.hh: New ctors with lens. * mln/metal/is_a.hh (is_a): New spe for const. * mln/convert/to_tiles.hh: Rename vec as v_ima. TODO | 42 +++++++++++++++++------------------------- mln/border/get.hh | 6 +++--- mln/convert/to_tiles.hh | 22 +++++++++++----------- mln/core/box.hh | 36 ++++++++++++++++++++++++++++++++++++ mln/metal/is_a.hh | 4 ++++ mln/trait/image/props.hh | 7 ++++--- mln/trait/images.hh | 9 ++++++++- tests/border_get.cc | 26 ++++++++++++-------------- tests/box2d.cc | 3 +++ tests/core_clone.cc | 2 +- 10 files changed, 99 insertions(+), 58 deletions(-) Index: tests/core_clone.cc --- tests/core_clone.cc (revision 1312) +++ tests/core_clone.cc (working copy) @@ -48,7 +48,7 @@ { box2d b = make::box2d(2,2); - std::cout << border::get( clone(ima | b) ) << std::endl; + std::cout << border::find( clone(ima | b) ) << std::endl; debug::println(ima | b); debug::println(clone(ima | b)); Index: tests/box2d.cc --- tests/box2d.cc (revision 1312) +++ tests/box2d.cc (working copy) @@ -40,4 +40,7 @@ box2d b = make::box2d(2, 3); mln_assertion(b.nrows() = 2); + + box2d b_(2, 3); + mln_assertion(b = b_); } Index: tests/border_get.cc --- tests/border_get.cc (revision 1312) +++ tests/border_get.cc (working copy) @@ -39,9 +39,9 @@ #include <mln/literal/origin.hh> -struct my_box2d : mln::Function_p2b< my_box2d > +struct f_box2d_t : mln::Function_p2b< f_box2d_t > { - my_box2d(const mln::box2d& b) + f_box2d_t(const mln::box2d& b) : b_(b) { } @@ -61,24 +61,22 @@ typedef image2d<int> I; box2d b(literal::origin, point2d(1,1)); + f_box2d_t f_b(b); + I ima(3,3, 51); -// mln_assertion(border::get(ima) = 51); -// mln_assertion( ima.has(point2d(2,2)) = true ); + mln_assertion(border::get(ima) = 51); + mln_assertion( ima.has(point2d(2,2)) = true ); -// sub_image<I, box2d> sub(ima, b); -// mln_assertion( sub.has (point2d(2,2)) = false && -// sub.owns_(point2d(2,2)) = false ); -// mln_assertion(border::get(sub) = 0); + sub_image<I, box2d> sub(ima, b); + mln_assertion( sub.has (point2d(2,2)) = false && + sub.owns_(point2d(2,2)) = false ); + mln_assertion(border::get(sub) = 0); - my_box2d f_b(b); - image_if<I, my_box2d> imaif(ima, f_b); + image_if<I, f_box2d_t> imaif(ima, f_b); mln_assertion( imaif.has (point2d(2,2)) = false && imaif.owns_(point2d(2,2)) = true ); mln_assertion(border::get(imaif) = 51); - -// std::cout << std::endl -// << "image_if< image2d >: "; -// mln::trait::image::print< image_if<I, fun::p2b::chess_t> >(std::cout); + mln_assertion(border::get( (ima | b) | f_b ) = 0); } Index: TODO --- TODO (revision 1312) +++ TODO (working copy) @@ -1,47 +1,39 @@ -*- outline -*- +* memo -* mathieu +reprise de /work2/theo_temp/SVG_TEGUCIGALPA/prestations/swt/src -** accu -*** héritage -toutes les classes d'accu dérivent de base_ ; Cf. accu/median.hh -virer l'op de convertion dans median_alt.hh -ajouter le test de présence de l'op de convertion dans Accumulator -m-a-j de la doc -est-ce les tests tournent ? -*** value -> argument -m-a-j -tests ? +* URGENT +categories for Function_* +fun * Built_In +fun * Scalar -* guillaume -** chamfer +* this week -Cf. vieilles versions -algo avec front +** Guillaume +... -* simon +** Matthieu -** lines +... -ajouter win::line<Mesh, dir> -hline2d et vline2d deviennent des aliases -retoucher les routines avec {h,v}line en argument +** Simon +h_mat +... +** Theo -* theo +value::other (for use in labeling) +... -hiérarchie de concepts sous Value -maj trait solver -virer is_fast -> changer le meta-plug -virer core/trait Index: mln/trait/image/props.hh --- mln/trait/image/props.hh (revision 1312) +++ mln/trait/image/props.hh (working copy) @@ -67,7 +67,7 @@ // typedef undef support; // irregular, aligned < regular // // global - // typedef undef border; // none, stored, computed + // typedef undef border; // none, { stored, computed } < some // typedef undef data; // raw < linear < stored, computed // typedef undef io; // read_only < read, write_only < write, read_write < both read'n write // typedef undef speed; // slow, fast, or fastest @@ -166,8 +166,9 @@ { struct any {}; struct none : any { std::string name() const { return "border::none"; } }; - struct stored : any { std::string name() const { return "border::stored"; } }; - struct computed : any { std::string name() const { return "border::computed"; } }; + struct some : any { std::string name() const { return "border::some"; } }; + struct stored : some { std::string name() const { return "border::stored"; } }; + struct computed : some { std::string name() const { return "border::computed"; } }; }; struct io Index: mln/trait/images.hh --- mln/trait/images.hh (revision 1312) +++ mln/trait/images.hh (working copy) @@ -124,7 +124,7 @@ typedef undef support; // irregular, aligned < regular // global - typedef undef border; // none, stored, computed + typedef undef border; // none, { stored, computed } < some typedef undef data; // raw < linear < stored, computed typedef undef io; // read_only < read, write_only < write, read_write < both read'n write typedef undef speed; // slow, fast, or fastest @@ -137,6 +137,13 @@ }; + template <typename I> + struct image_<const I> : image_ + { + // FIXME: TODO: io cannot contain "write"... + }; + + template <typename T, typename I> struct default_image_ : undefined_image_ { Index: mln/core/box.hh --- mln/core/box.hh (revision 1312) +++ mln/core/box.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/concept/box.hh> # include <mln/core/internal/box_impl.hh> # include <mln/core/point.hh> +# include <mln/literal/origin.hh> namespace mln @@ -54,6 +55,9 @@ struct box_ : public Box< box_ >, public internal::box_impl_< P::dim, mln_coord(P), box_ > { + /// Dimension. + enum { dim = P::dim }; + /// Mesh associated type. typedef mln_mesh(P) mesh; @@ -90,6 +94,13 @@ /// Constructor of a box going from \p pmin to \p pmax. box_(const point& pmin, const point& pmax); + /// \{ Constructors with different numbers of arguments + /// (sizes) w.r.t. the dimension. + explicit box_(mln_coord(P) ninds); + box_(mln_coord(P) nrows, mln_coord(P) ncols); + box_(mln_coord(P) nslis, mln_coord(P) nrows, mln_coord(P) ncols); + /// \} + /*! \brief Test if \p p belongs to the box. * * \param[in] p A point site. @@ -154,6 +165,31 @@ : pmin_(pmin), pmax_(pmax) { + + } + + template <typename P> + box_::box_(mln_coord(P) ninds) + { + metal::bool_<(dim = 1)>::check(); + pmin_ = literal::origin; + pmax_ = P(ninds - 1); + } + + template <typename P> + box_::box_(mln_coord(P) nrows, mln_coord(P) ncols) + { + metal::bool_<(dim = 2)>::check(); + pmin_ = literal::origin; + pmax_ = P(nrows - 1, ncols - 1); + } + + template <typename P> + box_::box_(mln_coord(P) nslis, mln_coord(P) nrows, mln_coord(P) ncols) + { + metal::bool_<(dim = 3)>::check(); + pmin_ = literal::origin; + pmax_ = P(nslis - 1, nrows - 1, ncols - 1); } template <typename P> Index: mln/metal/is_a.hh --- mln/metal/is_a.hh (revision 1312) +++ mln/metal/is_a.hh (working copy) @@ -81,6 +81,10 @@ sizeof( internal::yes_ ) )> {}; + template <typename T, template <class> class U> + struct is_a< const T, U > : is_a< T, U >::eval + {}; + } // end of namespace mln::metal Index: mln/border/get.hh --- mln/border/get.hh (revision 1312) +++ mln/border/get.hh (working copy) @@ -57,14 +57,14 @@ { template <typename I> - unsigned get_(trait::image::border::any, trait::image::category::primary, + unsigned get_(trait::image::border::some, trait::image::category::primary, const I& ima) { return ima.border(); } template <typename I> - unsigned get_(trait::image::border::any, trait::image::category::morpher, + unsigned get_(trait::image::border::some, trait::image::category::morpher, const I& ima) { return border::get( *ima.delegatee_() ); @@ -73,7 +73,7 @@ template <typename I> unsigned get_(trait::image::border::none, trait::image::category::any, - const I& ima) + const I&) { return 0; } Index: mln/convert/to_tiles.hh --- mln/convert/to_tiles.hh (revision 1312) +++ mln/convert/to_tiles.hh (working copy) @@ -47,22 +47,22 @@ /// FIXME : Run only for image2d /// Convert a vector of image2d into a tiled image with ratio. template <typename I> - I to_tiles (std::vector& vec, float ratio); + I to_tiles(std::vector& v_ima, float ratio); # ifndef MLN_INCLUDE_ONLY template <typename I> I - to_tiles (std::vector& vec, float ratio) + to_tiles(std::vector& v_ima, float ratio) { - /// Test if vec is not empty. - mln_precondition(!vec.empty ()); + // Test if v_ima is not empty. + mln_precondition(! v_ima.empty()); - unsigned size = vec.size (); - unsigned nrows = geom::nrows(vec[0]); - unsigned ncols = geom::ncols(vec[0]); + unsigned size = v_ima.size(); + unsigned nrows = geom::nrows(v_ima[0]); + unsigned ncols = geom::ncols(v_ima[0]); - /// Compute output size. + // Compute output size. int size_c = (int) ceil(sqrt(size * ratio)); int size_r = (int) ceil(sqrt(size / ratio)); @@ -71,14 +71,14 @@ for (unsigned i = 0; i < size; ++i) { /// Check if current image has good dimension. - mln_precondition(geom::nrows(vec[i]) = nrows); - mln_precondition(geom::ncols(vec[i]) = ncols); + mln_precondition(geom::nrows(v_ima[i]) = nrows); + mln_precondition(geom::ncols(v_ima[i]) = ncols); /// Compute the delta point of translation. dpoint2d dp = make::dpoint2d(i / size_c * nrows, i % size_c * ncols); /// Convert current image in translate image with its delta point. - translate_image tr_ima (vec[i], dp); + translate_image tr_ima(v_ima[i], dp); /// Paste translated image into output. level::paste (tr_ima, output);

17 years, 3 months

milena r1315: Add tests for border resize with image_if and sub_image

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add tests for border resize with image_if and sub_image. * border_resize_image_if.cc, * border_resize_sub_image.cc: New test for border resize. * show.cc: Update. --- border_resize_image_if.cc | 80 +++++++++++++++++++++++++++++++++++++++++++++ border_resize_sub_image.cc | 78 +++++++++++++++++++++++++++++++++++++++++++ show.cc | 2 - 3 files changed, 159 insertions(+), 1 deletion(-) Index: trunk/milena/tests/border_resize_sub_image.cc =================================================================== --- trunk/milena/tests/border_resize_sub_image.cc (revision 0) +++ trunk/milena/tests/border_resize_sub_image.cc (revision 1315) @@ -0,0 +1,78 @@ +// 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/border_resize_sub_image.cc + * + * \brief Tests on mln::border::resize. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/border/get.hh> +#include <mln/literal/origin.hh> +#include <mln/border/resize.hh> + +struct my_box2d : mln::Function_p2b< my_box2d > +{ + my_box2d(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + + + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + unsigned border = 42; + unsigned new_border = 51; + + box2d b(literal::origin, point2d(1,1)); + I ima(3,3, border); + + mln_assertion(border::get(ima) == border); + sub_image<I, box2d> sub(ima, b); + mln_assertion( sub.has (point2d(2,2)) == false && + sub.owns_(point2d(2,2)) == false ); + + + + + /// Cannot resize a subimage => compilation error. + border::resize (sub, new_border); +} Index: trunk/milena/tests/border_resize_image_if.cc =================================================================== --- trunk/milena/tests/border_resize_image_if.cc (revision 0) +++ trunk/milena/tests/border_resize_image_if.cc (revision 1315) @@ -0,0 +1,80 @@ +// 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/border_resize_image_if.cc + * + * \brief Tests on mln::border::resize. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/border/get.hh> +#include <mln/literal/origin.hh> +#include <mln/border/resize.hh> + +struct my_box2d : mln::Function_p2b< my_box2d > +{ + my_box2d(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + + + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + unsigned border = 42; + unsigned new_border = 51; + + box2d b(literal::origin, point2d(1,1)); + I ima(3,3, border); + + mln_assertion(border::get(ima) == border); + mln_assertion( ima.has(point2d(2,2)) == true ); + + my_box2d f_b(b); + image_if<I, my_box2d> imaif(ima, f_b); + mln_assertion( imaif.has (point2d(2,2)) == false && + imaif.owns_(point2d(2,2)) == true ); + + + mln_assertion(border::get(imaif) == border); + border::resize (imaif, new_border); + mln_assertion(border::get(imaif) == new_border); +} Index: trunk/milena/tests/show.cc =================================================================== --- trunk/milena/tests/show.cc (revision 1314) +++ trunk/milena/tests/show.cc (revision 1315) @@ -62,6 +62,6 @@ image2d<unsigned> tmp = geom::chamfer(input, w_win, max); // Call color_pretty for sub_image. - for (unsigned i = 2; i < 9; i += 2) + for (unsigned i = 2; i < 22; i += 2) display::show (inplace (tmp | i)); }

17 years, 3 months

milena r1314: Update resize

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update resize. * border/resize.hh: Update for image_if and sub_image. * core/image1d.hh, * core/image3d.hh: (swap_) Update. * core/translate_image.hh, * display/show.hh: Update. --- border/resize.hh | 26 ++++++++++++++++++-------- core/image1d.hh | 24 +++--------------------- core/image3d.hh | 26 +++----------------------- core/translate_image.hh | 13 +++++++++++-- display/show.hh | 4 +++- 5 files changed, 38 insertions(+), 55 deletions(-) Index: trunk/milena/mln/core/translate_image.hh =================================================================== --- trunk/milena/mln/core/translate_image.hh (revision 1313) +++ trunk/milena/mln/core/translate_image.hh (revision 1314) @@ -76,9 +76,18 @@ typedef trait::image::category::domain_morpher category; - typedef mln_trait_image_io_from_(I) io; +// typedef mln_trait_image_access_from(I) access; +// typedef mln_trait_image_space_from(I) space; +// typedef mln_trait_image_size_from(I) size; +// typedef mln_trait_image_support_from(I) support; + +// typedef mln_trait_image_border_from(I) border; + typedef mln_trait_image_data_from(I) data; + typedef mln_trait_image_io_from(I) io; +// typedef mln_trait_image_speed_from(I) speed; - typedef mln_trait_image_data_from_(I) data; +// typedef mln_trait_image_io_from_(I) io; +// typedef mln_trait_image_data_from_(I) data; }; Index: trunk/milena/mln/core/image1d.hh =================================================================== --- trunk/milena/mln/core/image1d.hh (revision 1313) +++ trunk/milena/mln/core/image1d.hh (revision 1314) @@ -295,27 +295,9 @@ data_< image1d<T> >::swap_(data_< image1d<T> >& other_) { - T* sw_buffer_ = this->buffer_; - this->buffer_ = other_.buffer_; - other_.buffer_ = sw_buffer_; - - T* sw_array_ = this->array_; - this->array_ = other_.array_; - other_.array_ = sw_array_; - - unsigned sw_bdr_ = this->bdr_; - this->bdr_ = other_.bdr_; - other_.bdr_ = sw_bdr_; - - /// box1d vb_ virtual box, i.e., box including the virtual border - box1d sw_vb_ = this->vb_; - this->vb_ = other_.vb_; - other_.vb_ = sw_vb_; - - /// box1d b_ theoretical box - box1d sw_b_ = this->b_; - this->b_ = other_.b_; - other_.b_ = sw_b_; + data_< image1d<T> > self_ = *this; + *this = other_; + other_ = self_; } Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1313) +++ trunk/milena/mln/core/image3d.hh (revision 1314) @@ -334,29 +334,9 @@ void data_< image3d<T> >::swap_(data_< image3d<T> >& other_) { - - T* sw_buffer_ = this->buffer_; - this->buffer_ = other_.buffer_; - other_.buffer_ = sw_buffer_; - - T*** sw_array_ = this->array_; - this->array_ = other_.array_; - other_.array_ = sw_array_; - - unsigned sw_bdr_ = this->bdr_; - this->bdr_ = other_.bdr_; - other_.bdr_ = sw_bdr_; - - /// box3d vb_ virtual box, i.e., box including the virtual border - box3d sw_vb_ = this->vb_; - this->vb_ = other_.vb_; - other_.vb_ = sw_vb_; - - /// box3d b_ theoretical box - box3d sw_b_ = this->b_; - this->b_ = other_.b_; - other_.b_ = sw_b_; - + data_< image3d<T> > self_ = *this; + *this = other_; + other_ = self_; } template <typename T> Index: trunk/milena/mln/border/resize.hh =================================================================== --- trunk/milena/mln/border/resize.hh (revision 1313) +++ trunk/milena/mln/border/resize.hh (revision 1314) @@ -36,10 +36,10 @@ # include <cstring> # include <mln/core/concept/image.hh> -# include <mln/core/image2d.hh> # include <mln/core/clone.hh> # include <mln/level/fill.hh> - +# include <mln/metal/is_not.hh> +# include <mln/border/get.hh> namespace mln { @@ -69,15 +69,25 @@ namespace impl { template <typename I> - void resize_(const Image& ima_, unsigned new_border) + void resize_(const I& ima_, trait::image::category::morpher, + unsigned new_border) { - I& ima = const_cast<I&> (exact(ima_)); + return resize ( *ima_.delegatee_(), new_border); + } + + + template <typename I> + void resize_(const I& ima_, trait::image::category::primary, + unsigned new_border) + { + I& ima = const_cast<I&> (ima_); I src = clone(ima); ima.resize_(new_border); level::fill(ima, src); } + } // end of namespace mln::border::resize /// Facade. @@ -85,13 +95,13 @@ template <typename I> void resize(const Image& ima_, unsigned thickness) { - mlc_is(mln_trait_image_speed(I), trait::image::speed::fastest)::check(); + mlc_is(mln_trait_image_border(I), trait::image::border::some)::check(); const I& ima = exact(ima_); mln_precondition(ima.has_data()); - if (ima.border() >= thickness) + if (border::get(ima) >= thickness) return; - impl::resize_(ima, thickness); - mln_postcondition(ima.border() >= thickness); + impl::resize_(ima, mln_trait_image_category(I)(), thickness); + mln_postcondition(border::get(ima) >= thickness); return; } Index: trunk/milena/mln/display/show.hh =================================================================== --- trunk/milena/mln/display/show.hh (revision 1313) +++ trunk/milena/mln/display/show.hh (revision 1314) @@ -77,7 +77,9 @@ std::string path_tmp = tmp; io::ppm::save(out, path_tmp); - std::string s = cmd + " " + path_tmp; + + + std::string s = cmd + " " + path_tmp + " &"; system (s.c_str ()); }

17 years, 3 months

milena r1312: Tests on composed transformations (does not work)

by Simon Nivault

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Simon Nivault <simon.nivault(a)lrde.epita.fr> Tests on composed transformations (does not work). * mln/fun/internal/x2x_impl.hh: Update. * mln/fun/x2x/composed.hh: Update. * tests/fun_x2x_composed.cc: New. --- mln/fun/internal/x2x_impl.hh | 1 mln/fun/x2x/composed.hh | 178 ++++++++++++++++++++++++++++++++----------- tests/fun_x2x_composed.cc | 57 +++++++++++++ 3 files changed, 191 insertions(+), 45 deletions(-) Index: trunk/milena/tests/fun_x2x_composed.cc =================================================================== --- trunk/milena/tests/fun_x2x_composed.cc (revision 0) +++ trunk/milena/tests/fun_x2x_composed.cc (revision 1312) @@ -0,0 +1,57 @@ +// 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/image2d.cc + * + * \brief Tests on mln::image2d. + */ + + +#include <iostream> +#include <mln/fun/x2x/translation.hh> +#include <mln/fun/x2x/rotation.hh> +#include <mln/fun/x2x/composed.hh> +#include <mln/fun/i2v/all.hh> + + + +int main() +{ + using namespace mln; + + float + a = 2.3, + b = 0, + c = 2.9; + + metal::vec<3,float> vec1 = make::vec(a, b, c); + fun::x2x::translation<3,float> tr(all(1.6)); + fun::x2x::rotation<3,float> rot(0.3, 1); + std::cout << vec1 << std::endl; + std::cout << compose(tr, rot)(vec1) << std::endl; + std::cout << compose(rot, tr)(vec1) << std::endl; +} Index: trunk/milena/mln/fun/x2x/composed.hh =================================================================== --- trunk/milena/mln/fun/x2x/composed.hh (revision 1311) +++ trunk/milena/mln/fun/x2x/composed.hh (revision 1312) @@ -55,42 +55,50 @@ namespace internal { - template <typename F, typename G, typename E> - struct helper_; - - template <typename F, typename G, typename E> - struct helper_<Function_x2x<F>, Function_x2x<G>, E> - : Function_x2x<E> + template <typename F, typename G, typename E, bool is_bij = true> + struct helper_composed_ + : public fun::internal::x2x_impl_<mln_result(F), E >, + public Bijection_x2x<E> { - }; + typedef fun::internal::x2x_impl_<typename F::result, E > super_; - template <typename F, typename G, typename E> - struct helper_<Bijection_x2x<F>, Bijection_x2x<G>, E > - : Bijection_x2x<E> - { - typedef composed<G::invert,F::invert> invert; + using super_::dim; + + helper_composed_(); + helper_composed_(const F& f, const G& g); + + using super_::operator(); + metal::vec<dim,mln_result(F)> + operator()(const metal::vec<dim,mln_result(F)>& v) const; + + void set_first(const F& f); + void set_second(const G& g); + + protected: + + F f_; + G g_; + + typedef composed<mln_invert(G),mln_invert(F)> invert; invert inv() const; }; - } - // FIXME: Doc! - - template <typename F, typename G> - struct composed - : internal::x2x_impl_<F::result, composed<F,G> >, - public internal::helper_< F, G, composed<F,G> >, - private typename metal::bool<(F::dim == G::dim)>::check_t, - private typename metal::is<F::argument, G::result>::check_t + template <typename F, typename G, typename E> + struct helper_composed_<F, G, E, false> + : public fun::internal::x2x_impl_<mln_result(F), E >, + public Function_x2x<E> { + typedef fun::internal::x2x_impl_<typename F::result, E > super_; - typedef internal::x2x_impl_<F::result, composed<F,G> > super_ + using super_::dim; - composed(); - composed(const F& f, const G& g); + helper_composed_(); + helper_composed_(const F& f, const G& g); - using super_:operator(); - metal::vec<super_::dim,C> operator()(const metal::vec<super_::dim,C>& v) const; + using super_::operator(); + metal::vec<dim,mln_result(F)> + operator()(const metal::vec<dim,mln_result(F)>& v) const; void set_first(const F& f); void set_second(const G& g); @@ -101,61 +109,143 @@ G g_; }; + } // end of namespace mln::fun::x2x::internal + + // FIXME: Doc! + + template <typename F, typename G> + struct composed + : public internal::helper_composed_<F, G, composed<F,G>, + mlc_is(F, Bijection_x2x<F>)::value && + mlc_is(G, Bijection_x2x<G>)::value>, + private metal::bool_<(F::dim == G::dim)>::check_t, + private metal::is<mln_argument(F), mln_result(G)>::check_t + { + typedef internal::helper_composed_<F, G, composed<F,G>, + mlc_is(F, Bijection_x2x<F>)::value && + mlc_is(G, Bijection_x2x<G>)::value> super_; + + composed() {} + + composed(const F& f, const G& g) + : helper_composed_<F, G, composed<F,G>, + mlc_is(F, Bijection_x2x<F>)::value && + mlc_is(G, Bijection_x2x<G>)::value>(f, g) + { + } + }; + + } // end of namespace mln::fun::x2x + + } // end of namespace mln::fun + + template <typename F, typename G> + fun::x2x::composed<F,G> compose(F f, G g); # ifndef MLN_INCLUDE_ONLY + namespace fun + { + + namespace x2x + { + + namespace internal + { + + // Implementation of the bijective version. + template <typename F, typename G> - composed<F,G>::composed() + helper_composed_<F,G,E,true>::helper_composed_() { - m_ = h_mat<n,C>::Id; + this->m_ = h_mat<dim,mln_result(F)>::Id; } template <typename F, typename G> - composed<F,G>::composed(const F& f, const G& g) + helper_composed_<F,G,E,true>::helper_composed_(const F& f, const G& g) :f_(f), g_(g) { - m_ = f_.mat() * g_.mat(); + this->m_ = f_.mat() * g_.mat(); + } + + template <typename F, typename G> + metal::vec<helper_composed_<F,G,E,true>::dim, mln_result(F)> + helper_composed_<F,G,E,true>::operator()(const metal::vec<dim, mln_result(F)>& v) const + { + return this->m_(v); + } + + template <typename F, typename G> + void + helper_composed_<F,G,E,true>::set_first(const F& f) + { + this->f_ = f; + this->m_ = this->f_.mat() * this->g_.mat(); } template <typename F, typename G> - metal::vec<super_::dim,C> - composed<F,G>::operator()(const metal::vec<super_::dim,C>& v) const + void + helper_composed_<F,G,E,true>::set_second(const G& g) { - return m_(v); + this->g_ = g; + this->m_ = this->f_.mat() * this->g_.mat(); } + // Implementation of the non bijective version. + template <typename F, typename G> - composed<F,G>::invert - composed<F,G>::inv() const + helper_composed_<F,G,E,false>::helper_composed_() { - typename composed::invert res(tr2_.inv(), tr1_.inv()); + this->m_ = h_mat<dim,mln_result(F)>::Id; + } + + template <typename F, typename G> + helper_composed_<F,G,E,false>::helper_composed_(const F& f, const G& g) + :f_(f), + g_(g) + { + this->m_ = f_.mat() * g_.mat(); + } - return res; + template <typename F, typename G> + metal::vec<helper_composed_<F,G,E,false>::dim, mln_result(F)> + helper_composed_<F,G,E,false>::operator()(const metal::vec<dim, mln_result(F)>& v) const + { + return this->m_(v); } template <typename F, typename G> void - composed<F,G>::set_first(const F& f) + helper_composed_<F,G,E,false>::set_first(const F& f) { - f_ = f; - m_ = f_.mat() * g_.mat(); + this->f_ = f; + this->m_ = this->f_.mat() * this->g_.mat(); } template <typename F, typename G> void - composed<F,G>::set_second(const G& g) + helper_composed_<F,G,E,false>::set_second(const G& g) { - g_ = g; - m_ = f_.mat() * g_.mat(); + this->g_ = g; + this->m_ = this->f_.mat() * this->g_.mat(); } -# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::fun::x2x::internal } // end of namespace mln::fun::x2x } // end of namespace mln::fun + template <typename F, typename G> + fun::x2x::composed<F,G> compose(F f, G g) + { + fun::x2x::composed<F,G> comp(f, g); + return comp; + } + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln Index: trunk/milena/mln/fun/internal/x2x_impl.hh =================================================================== --- trunk/milena/mln/fun/internal/x2x_impl.hh (revision 1311) +++ trunk/milena/mln/fun/internal/x2x_impl.hh (revision 1312) @@ -37,7 +37,6 @@ # include <mln/core/h_mat.hh> # include <mln/core/h_vec.hh> - namespace mln {

17 years, 3 months

1311: Add a new border computation mode and change image_if meaning.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a new border computation mode and change image_if meaning. * mln/metal/is.hh: Fix typo. * mln/metal/is_not.hh: New. * tests/metal_is.cc: Augment. * mln/core/internal/image_if_base.hh: Change semantics; now access to outside domain is OK. (owns_): New. (border): Explicit delegation to I in trait::. * tests/trait_images.cc: Augment. * tests/border_get.cc: New. * mln/border/get.hh: . * mln/border/find.hh: New. * mln/core/init.hh (init_): Use border::find instead of border::get. * mln/core/concept/doc/image.hh: Fix type. * mln/core/image2d.hh (swap_): Shorten code. mln/border/find.hh | 28 ++++++------ mln/border/get.hh | 29 ++++++------ mln/core/concept/doc/image.hh | 2 mln/core/image2d.hh | 26 +---------- mln/core/init.hh | 7 ++- mln/core/internal/image_if_base.hh | 14 ++++++ mln/metal/is.hh | 2 mln/metal/is_not.hh | 63 +++++++++++++++++++++++++++ tests/border_get.cc | 84 +++++++++++++++++++++++++++++++++++++ tests/metal_is.cc | 5 ++ tests/trait_images.cc | 8 +++ 11 files changed, 211 insertions(+), 57 deletions(-) Index: tests/metal_is.cc --- tests/metal_is.cc (revision 1310) +++ tests/metal_is.cc (working copy) @@ -31,6 +31,7 @@ */ #include <mln/metal/is.hh> +#include <mln/metal/is_not.hh> @@ -79,4 +80,8 @@ metal::is<int, float>::check_not(); metal::is<from_1, dest>::check_not(); metal::is<from_2, dest>::check_not(); + + metal::is_not<int, float>::check(); + metal::is_not<from_1, dest>::check(); + metal::is_not<from_2, dest>::check(); } Index: tests/trait_images.cc --- tests/trait_images.cc (revision 1310) +++ tests/trait_images.cc (working copy) @@ -46,11 +46,17 @@ std::cout << "image2d: "; mln::trait::image::print(std::cout); + typedef sub_image<I, box2d> Isub; std::cout << std::endl << "sub_image< image2d >: "; - mln::trait::image::print< sub_image<I, box2d> >(std::cout); + mln::trait::image::print< Isub >(std::cout); std::cout << std::endl << "image_if< image2d >: "; mln::trait::image::print< image_if<I, fun::p2b::chess_t> >(std::cout); + + + std::cout << std::endl + << "image_if< sub_image< image2d > >: "; + mln::trait::image::print< image_if<Isub, fun::p2b::chess_t> >(std::cout); } Index: tests/border_get.cc --- tests/border_get.cc (revision 0) +++ tests/border_get.cc (revision 0) @@ -0,0 +1,84 @@ +// 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/border_get.cc + * + * \brief Tests on mln::border::get. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/border/get.hh> +#include <mln/literal/origin.hh> + + +struct my_box2d : mln::Function_p2b< my_box2d > +{ + my_box2d(const mln::box2d& b) + : b_(b) + { + } + mln::box2d b_; + bool operator()(const mln::point2d& p) const + { + return b_.has(p); + } +}; + + + +int main() +{ + using namespace mln; + + typedef image2d<int> I; + + box2d b(literal::origin, point2d(1,1)); + I ima(3,3, 51); + +// mln_assertion(border::get(ima) = 51); +// mln_assertion( ima.has(point2d(2,2)) = true ); + +// sub_image<I, box2d> sub(ima, b); +// mln_assertion( sub.has (point2d(2,2)) = false && +// sub.owns_(point2d(2,2)) = false ); +// mln_assertion(border::get(sub) = 0); + + my_box2d f_b(b); + image_if<I, my_box2d> imaif(ima, f_b); + mln_assertion( imaif.has (point2d(2,2)) = false && + imaif.owns_(point2d(2,2)) = true ); + mln_assertion(border::get(imaif) = 51); + + +// std::cout << std::endl +// << "image_if< image2d >: "; +// mln::trait::image::print< image_if<I, fun::p2b::chess_t> >(std::cout); +} Index: mln/core/internal/image_if_base.hh --- mln/core/internal/image_if_base.hh (revision 1310) +++ mln/core/internal/image_if_base.hh (working copy) @@ -84,6 +84,8 @@ typedef mlc_if( I_data_are_linear_, trait::image::data::stored, // if linear then just stored I_data_ ) data; // otherwise like I + + typedef mln_trait_image_border(I) border; }; } // end of namespace mln::trait @@ -105,6 +107,10 @@ void init_(I& ima, const F& f); + /// Test if the image owns the point site \p p. + /// The result is the same than over the underlying image. + bool owns_(const mln_psite(I)& p) const; // Overload the def "owns_ -> has". + protected: /// Constructor from an image \p ima and a predicate \p f. @@ -158,6 +164,14 @@ } template <typename I, typename F, typename E> + bool + image_if_base_<I,F,E>::owns_(const mln_psite(I)& p) const + { + mln_precondition(this->has_data()); + return this->data_->ima_.owns_(p); + } + + template <typename I, typename F, typename E> void image_if_base_<I,F,E>::init_(I& ima, const F& f) { Index: mln/core/init.hh --- mln/core/init.hh (revision 1310) +++ mln/core/init.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/tag/init.hh> # include <mln/geom/bbox.hh> -# include <mln/border/get.hh> +# include <mln/border/find.hh> @@ -81,7 +81,10 @@ template <typename I> void init_(tag::border_t, unsigned& bdr, const Image& ima) { - bdr = border::get(ima); + // 'Find' means that we want a value; this is not always the + // border thickness of 'ima', but it can be the thickness of + // a morphed / underlying image over which ima is constructed. + bdr = border::find(ima); } template <typename I> Index: mln/core/concept/doc/image.hh --- mln/core/concept/doc/image.hh (revision 1310) +++ mln/core/concept/doc/image.hh (working copy) @@ -75,7 +75,7 @@ */ bool has_data() const; - /*! \brief Test if the image owns the poinst site \p p. + /*! \brief Test if the image owns the point site \p p. * * \return True if accessing the image value at \p p is * possible, that is, does not abort the execution. Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 1310) +++ mln/core/image2d.hh (working copy) @@ -318,29 +318,9 @@ void data_< image2d<T> >::swap_(data_< image2d<T> >& other_) { - - T* sw_buffer_ = this->buffer_; - this->buffer_ = other_.buffer_; - other_.buffer_ = sw_buffer_; - - T** sw_array_ = this->array_; - this->array_ = other_.array_; - other_.array_ = sw_array_; - - unsigned sw_bdr_ = this->bdr_; - this->bdr_ = other_.bdr_; - other_.bdr_ = sw_bdr_; - - /// box2d vb_ virtual box, i.e., box including the virtual border - box2d sw_vb_ = this->vb_; - this->vb_ = other_.vb_; - other_.vb_ = sw_vb_; - - /// box2d b_ theoretical box - box2d sw_b_ = this->b_; - this->b_ = other_.b_; - other_.b_ = sw_b_; - + data_< image2d<T> > self_ = *this; + *this = other_; + other_ = self_; } template <typename T> Index: mln/metal/is_not.hh --- mln/metal/is_not.hh (revision 0) +++ mln/metal/is_not.hh (revision 0) @@ -0,0 +1,63 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_METAL_IS_NOT_HH +# define MLN_CORE_METAL_IS_NOT_HH + +/*! \file mln/metal/is_not.hh + * + * \brief Definition of a type that means "is not". + */ + +# include <mln/metal/is.hh> + + +# define mlc_is_not(T, U) mln::metal::is_not< T, U > + + + +namespace mln +{ + + namespace metal + { + + /*! \brief "is_not" check. + * + * FIXME: Doc! + */ + template <typename T, typename U> + struct is_not : not_< is<T, U> >::eval + { + }; + + } // end of namespace mln::metal + +} // end of namespace mln + + +#endif // ! MLN_CORE_METAL_IS_NOT_HH Index: mln/metal/is.hh --- mln/metal/is.hh (revision 1310) +++ mln/metal/is.hh (working copy) @@ -30,7 +30,7 @@ /*! \file mln/metal/is.hh * - * \brief Definition of a type that means "converts to". + * \brief Definition of a type that means "is". */ # include <mln/metal/is_a.hh> Index: mln/border/get.hh --- mln/border/get.hh (revision 1310) +++ mln/border/get.hh (working copy) @@ -33,7 +33,7 @@ * \brief FIXME. */ -# include <mln/core/internal/image_morpher.hh> +# include <mln/border/find.hh> namespace mln @@ -56,28 +56,26 @@ namespace impl { - template <typename I, typename S, typename E> - unsigned get__(const mln::internal::image_morpher_<I,S,E>& ima) - { - return border::get(*ima.delegatee_()); - } - - template <typename S, typename E> - unsigned get__(const mln::internal::image_base_<S,E>&) + template <typename I> + unsigned get_(trait::image::border::any, trait::image::category::primary, + const I& ima) { - return 0; + return ima.border(); } template <typename I> - unsigned get_(trait::image::speed::any, const I& ima) + unsigned get_(trait::image::border::any, trait::image::category::morpher, + const I& ima) { - return border::impl::get__(ima); + return border::get( *ima.delegatee_() ); } + template <typename I> - unsigned get_(trait::image::speed::fastest, const I& ima) + unsigned get_(trait::image::border::none, trait::image::category::any, + const I& ima) { - return ima.border(); + return 0; } } // end of namespace mln::border::impl @@ -89,7 +87,8 @@ unsigned get(const Image& ima) { mln_precondition(exact(ima).has_data()); - return border::impl::get_(mln_trait_image_speed(I)(), exact(ima)); + return border::impl::get_(mln_trait_image_border(I)(), mln_trait_image_category(I)(), + exact(ima)); } # endif // ! MLN_INCLUDE_ONLY Index: mln/border/find.hh --- mln/border/find.hh (revision 1310) +++ mln/border/find.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_BORDER_GET_HH -# define MLN_BORDER_GET_HH +#ifndef MLN_BORDER_FIND_HH +# define MLN_BORDER_FIND_HH -/*! \file mln/border/get.hh +/*! \file mln/border/find.hh * * \brief FIXME. */ @@ -42,13 +42,13 @@ namespace border { - /*! Get the virtual (outer) border thickness of image \p ima. + /*! Find the virtual (outer) border thickness of image \p ima. * * \param[in] ima The image. * \result The border thickness (0 if there is no border). */ template <typename I> - unsigned get(const Image& ima); + unsigned find(const Image& ima); # ifndef MLN_INCLUDE_ONLY @@ -57,25 +57,25 @@ { template <typename I, typename S, typename E> - unsigned get__(const mln::internal::image_morpher_<I,S,E>& ima) + unsigned find__(const mln::internal::image_morpher_<I,S,E>& ima) { - return border::get(*ima.delegatee_()); + return border::find(*ima.delegatee_()); } template <typename S, typename E> - unsigned get__(const mln::internal::image_base_<S,E>&) + unsigned find__(const mln::internal::image_base_<S,E>&) { return 0; } template <typename I> - unsigned get_(trait::image::speed::any, const I& ima) + unsigned find_(trait::image::speed::any, const I& ima) { - return border::impl::get__(ima); + return border::impl::find__(ima); } template <typename I> - unsigned get_(trait::image::speed::fastest, const I& ima) + unsigned find_(trait::image::speed::fastest, const I& ima) { return ima.border(); } @@ -86,10 +86,10 @@ // Facade. template <typename I> - unsigned get(const Image& ima) + unsigned find(const Image& ima) { mln_precondition(exact(ima).has_data()); - return border::impl::get_(mln_trait_image_speed(I)(), exact(ima)); + return border::impl::find_(mln_trait_image_speed(I)(), exact(ima)); } # endif // ! MLN_INCLUDE_ONLY @@ -99,4 +99,4 @@ } // end of namespace mln -#endif // ! MLN_BORDER_GET_HH +#endif // ! MLN_BORDER_FIND_HH

17 years, 3 months

1308: Update grays.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update grays. * tests/value_graylevel.cc: Activate tests. * mln/value/graylevel.hh: Fix missing include. * mln/value/gray.hh: Handle Literals. * mln/value/builtin: New. graylevel.hh | 1 + 1 files changed, 1 insertion(+) Index: mln/value/graylevel.hh --- mln/value/graylevel.hh (revision 1310) +++ mln/value/graylevel.hh (working copy) @@ -46,6 +46,7 @@ /// Fwd decl. namespace literal { struct black_t; struct white_t; } + namespace value {

17 years, 3 months

milena r1310: Add border::resize and fix bug in println_with_border for 3d

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add border::resize and fix bug in println_with_border for 3d. * border/resize.hh: Resize border. * core/image1d.hh, * core/image2d.hh, * core/image3d.hh: Add reallocate for resize border. * debug/println_with_border.hh: Fix bug. --- border/resize.hh | 26 +++++++++++++++++-- core/image1d.hh | 53 ++++++++++++++++++++++++++++++++++++++++ core/image2d.hh | 56 +++++++++++++++++++++++++++++++++++++++++-- core/image3d.hh | 54 ++++++++++++++++++++++++++++++++++++++++- debug/println_with_border.hh | 3 +- 5 files changed, 185 insertions(+), 7 deletions(-) Index: trunk/milena/mln/debug/println_with_border.hh =================================================================== --- trunk/milena/mln/debug/println_with_border.hh (revision 1309) +++ trunk/milena/mln/debug/println_with_border.hh (revision 1310) @@ -88,10 +88,11 @@ std::size_t len_s = b.len(P::dim - 3); std::size_t len_r = b.len(P::dim - 2); std::size_t len_c = b.len(P::dim - 1); + std::size_t border = input.border (); std::size_t real_len_s = len_s + 2 * border; - std::size_t real_len_r = len_r + 2 * border; std::size_t real_len_c = len_c + 2 * border; + std::size_t real_len_r = len_r + 2 * border; for (std::size_t k = 0; k < real_len_s; ++k) { Index: trunk/milena/mln/core/image1d.hh =================================================================== --- trunk/milena/mln/core/image1d.hh (revision 1309) +++ trunk/milena/mln/core/image1d.hh (revision 1310) @@ -76,6 +76,8 @@ void update_vb_(); void allocate_(); void deallocate_(); + void swap_ (data_< image1d<T> >& other_); + void reallocate_(unsigned new_border); }; } // end of namespace mln::internal @@ -205,6 +207,12 @@ /// Give a hook to the value buffer. T* buffer(); + + + + /// Resize image border with new_border. + void resize_(unsigned new_border); + }; template <typename T, typename J> @@ -281,6 +289,44 @@ } } + + template <typename T> + void + data_< image1d<T> >::swap_(data_< image1d<T> >& other_) + { + + T* sw_buffer_ = this->buffer_; + this->buffer_ = other_.buffer_; + other_.buffer_ = sw_buffer_; + + T* sw_array_ = this->array_; + this->array_ = other_.array_; + other_.array_ = sw_array_; + + unsigned sw_bdr_ = this->bdr_; + this->bdr_ = other_.bdr_; + other_.bdr_ = sw_bdr_; + + /// box1d vb_ virtual box, i.e., box including the virtual border + box1d sw_vb_ = this->vb_; + this->vb_ = other_.vb_; + other_.vb_ = sw_vb_; + + /// box1d b_ theoretical box + box1d sw_b_ = this->b_; + this->b_ = other_.b_; + other_.b_ = sw_b_; + + } + + template <typename T> + void + data_< image1d<T> >::reallocate_(unsigned new_border) + { + data_< image1d<T> >& tmp = *(new data_< image1d<T> >(this->b_, new_border)); + this->swap_(tmp); + } + } // end of namespace mln::internal @@ -434,6 +480,13 @@ return p; } + template <typename T> + void + image1d<T>::resize_(unsigned new_border) + { + this->data_->reallocate_(new_border); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1309) +++ trunk/milena/mln/core/image2d.hh (revision 1310) @@ -59,7 +59,6 @@ namespace internal { - template <typename T> struct data_< image2d<T> > { @@ -76,6 +75,8 @@ void update_vb_(); void allocate_(); void deallocate_(); + void swap_ (data_< image2d<T> >& other_); + void reallocate_(unsigned new_border); }; } // end of namespace mln::internal @@ -205,6 +206,13 @@ /// Give a hook to the value buffer. T* buffer(); + + + + + /// Resize image border with new_border. + void resize_(unsigned new_border); + }; @@ -244,7 +252,6 @@ namespace internal { - template <typename T> data_< image2d<T> >::data_(const box2d& b, unsigned bdr) : buffer_(0), @@ -307,6 +314,44 @@ } } + template <typename T> + void + data_< image2d<T> >::swap_(data_< image2d<T> >& other_) + { + + T* sw_buffer_ = this->buffer_; + this->buffer_ = other_.buffer_; + other_.buffer_ = sw_buffer_; + + T** sw_array_ = this->array_; + this->array_ = other_.array_; + other_.array_ = sw_array_; + + unsigned sw_bdr_ = this->bdr_; + this->bdr_ = other_.bdr_; + other_.bdr_ = sw_bdr_; + + /// box2d vb_ virtual box, i.e., box including the virtual border + box2d sw_vb_ = this->vb_; + this->vb_ = other_.vb_; + other_.vb_ = sw_vb_; + + /// box2d b_ theoretical box + box2d sw_b_ = this->b_; + this->b_ = other_.b_; + other_.b_ = sw_b_; + + } + + template <typename T> + void + data_< image2d<T> >::reallocate_(unsigned new_border) + { + data_< image2d<T> >& tmp = *(new data_< image2d<T> >(this->b_, new_border)); + this->swap_(tmp); + } + + } // end of namespace mln::internal @@ -460,6 +505,13 @@ return p; } + template <typename T> + void + image2d<T>::resize_(unsigned new_border) + { + this->data_->reallocate_(new_border); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1309) +++ trunk/milena/mln/core/image3d.hh (revision 1310) @@ -76,7 +76,8 @@ void update_vb_(); void allocate_(); void deallocate_(); - + void swap_ (data_< image3d<T> >& other_); + void reallocate_(unsigned new_border); }; } // end of namespace mln::internal @@ -213,6 +214,12 @@ /// To use the track pointer inherited. using super_::data_; + + + + /// Resize image border with new_border. + void resize_(unsigned new_border); + }; template <typename T, typename J> @@ -323,6 +330,44 @@ } } + template <typename T> + void + data_< image3d<T> >::swap_(data_< image3d<T> >& other_) + { + + T* sw_buffer_ = this->buffer_; + this->buffer_ = other_.buffer_; + other_.buffer_ = sw_buffer_; + + T*** sw_array_ = this->array_; + this->array_ = other_.array_; + other_.array_ = sw_array_; + + unsigned sw_bdr_ = this->bdr_; + this->bdr_ = other_.bdr_; + other_.bdr_ = sw_bdr_; + + /// box3d vb_ virtual box, i.e., box including the virtual border + box3d sw_vb_ = this->vb_; + this->vb_ = other_.vb_; + other_.vb_ = sw_vb_; + + /// box3d b_ theoretical box + box3d sw_b_ = this->b_; + this->b_ = other_.b_; + other_.b_ = sw_b_; + + } + + template <typename T> + void + data_< image3d<T> >::reallocate_(unsigned new_border) + { + data_< image3d<T> >& tmp = *(new data_< image3d<T> >(this->b_, new_border)); + this->swap_(tmp); + } + + } // end of namespace mln::internal // image3d<T> @@ -476,6 +521,13 @@ return p; } + template <typename T> + void + image3d<T>::resize_(unsigned new_border) + { + this->data_->reallocate_(new_border); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: trunk/milena/mln/border/resize.hh =================================================================== --- trunk/milena/mln/border/resize.hh (revision 1309) +++ trunk/milena/mln/border/resize.hh (revision 1310) @@ -30,11 +30,15 @@ /*! \file mln/border/resize.hh * - * \brief FIXME. + * \brief Resize border. */ +# include <cstring> + # include <mln/core/concept/image.hh> -# include <mln/core/internal/fixme.hh> +# include <mln/core/image2d.hh> +# include <mln/core/clone.hh> +# include <mln/level/fill.hh> namespace mln @@ -62,6 +66,22 @@ # ifndef MLN_INCLUDE_ONLY + namespace impl + { + template <typename I> + void resize_(const Image& ima_, unsigned new_border) + { + I& ima = const_cast<I&> (exact(ima_)); + I src = clone(ima); + + ima.resize_(new_border); + level::fill(ima, src); + } + + } // end of namespace mln::border::resize + + /// Facade. + template <typename I> void resize(const Image& ima_, unsigned thickness) { @@ -70,7 +90,7 @@ mln_precondition(ima.has_data()); if (ima.border() >= thickness) return; - mln::internal::fixme(); + impl::resize_(ima, thickness); mln_postcondition(ima.border() >= thickness); return; }

17 years, 3 months

milena r1309: Add tests for border::resize

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add tests for border::resize. * border_resize_image1d_1.cc, * border_resize_image1d_2.cc, * border_resize_image1d_3.cc, * border_resize_image2d_1.cc, * border_resize_image2d_2.cc, * border_resize_image2d_3.cc, * border_resize_image3d_1.cc, * border_resize_image3d_2.cc, * border_resize_image3d_3.cc: New tests. --- border_resize_image1d_1.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ border_resize_image1d_2.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ border_resize_image1d_3.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ border_resize_image2d_1.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ border_resize_image2d_2.cc | 74 +++++++++++++++++++++++++++++++++++++++++++++ border_resize_image2d_3.cc | 74 +++++++++++++++++++++++++++++++++++++++++++++ border_resize_image3d_1.cc | 74 +++++++++++++++++++++++++++++++++++++++++++++ border_resize_image3d_2.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ border_resize_image3d_3.cc | 73 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 660 insertions(+) Index: trunk/milena/tests/border_resize_image2d_2.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_2.cc (revision 0) +++ trunk/milena/tests/border_resize_image2d_2.cc (revision 1309) @@ -0,0 +1,74 @@ +// 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/border_resize_image?d_?.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 2; + unsigned new_border = 5; + + std::cout << std::endl + << "Test 2d resize" + << std::endl + << std::endl; + image2d<value::int_u8> ima(4, 5, border); + debug::iota(ima); + border::fill(ima, 8); + + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + +} Index: trunk/milena/tests/border_resize_image3d_3.cc =================================================================== --- trunk/milena/tests/border_resize_image3d_3.cc (revision 0) +++ trunk/milena/tests/border_resize_image3d_3.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image?d_?.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image3d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> +#include <mln/level/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 3; + unsigned new_border = 1; + + std::cout << std::endl + << "Test 3d resize" + << std::endl + << std::endl; + image3d<value::int_u8> ima(1, 3, 2, border); + level::fill (ima, 2); + border::fill(ima, 8); + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; +} Index: trunk/milena/tests/border_resize_image1d_2.cc =================================================================== --- trunk/milena/tests/border_resize_image1d_2.cc (revision 0) +++ trunk/milena/tests/border_resize_image1d_2.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image1d_2.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image1d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 3; + unsigned new_border = 6; + + std::cout << std::endl + << "Test 1d resize" + << std::endl + << std::endl; + image1d<int> ima(6, border); + debug::iota(ima); + border::fill(ima, 8); + + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; +} Index: trunk/milena/tests/border_resize_image3d_1.cc =================================================================== --- trunk/milena/tests/border_resize_image3d_1.cc (revision 0) +++ trunk/milena/tests/border_resize_image3d_1.cc (revision 1309) @@ -0,0 +1,74 @@ +// 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/border_resize_image3d_1.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image3d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> +#include <mln/level/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 1; + unsigned new_border = 3; + + std::cout << std::endl + << "Test 3d resize" + << std::endl + << std::endl; + image3d<value::int_u8> ima(3, 1, 2, border); + level::fill (ima, 2); + border::fill(ima, 8); + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + +} Index: trunk/milena/tests/border_resize_image2d_3.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_3.cc (revision 0) +++ trunk/milena/tests/border_resize_image2d_3.cc (revision 1309) @@ -0,0 +1,74 @@ +// 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/border_resize_image?d_?.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 3; + unsigned new_border = 2; + + std::cout << std::endl + << "Test 2d resize" + << std::endl + << std::endl; + image2d<value::int_u8> ima(4, 5, border); + debug::iota(ima); + border::fill(ima, 8); + + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + +} Index: trunk/milena/tests/border_resize_image2d_1.cc =================================================================== --- trunk/milena/tests/border_resize_image2d_1.cc (revision 0) +++ trunk/milena/tests/border_resize_image2d_1.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image?d_?.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 1; + unsigned new_border = 3; + + std::cout << std::endl + << "Test 2d resize" + << std::endl + << std::endl; + image2d<value::int_u8> ima(3, 2, border); + debug::iota(ima); + border::fill(ima, 8); + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + +} Index: trunk/milena/tests/border_resize_image1d_3.cc =================================================================== --- trunk/milena/tests/border_resize_image1d_3.cc (revision 0) +++ trunk/milena/tests/border_resize_image1d_3.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image1d_3.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image1d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 3; + unsigned new_border = 1; + + std::cout << std::endl + << "Test 1d resize" + << std::endl + << std::endl; + image1d<value::int_u8> ima(5, border); + debug::iota(ima); + border::fill(ima, 8); + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + +} Index: trunk/milena/tests/border_resize_image3d_2.cc =================================================================== --- trunk/milena/tests/border_resize_image3d_2.cc (revision 0) +++ trunk/milena/tests/border_resize_image3d_2.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image3d_2.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image3d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> +#include <mln/level/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 2; + unsigned new_border = 4; + + std::cout << std::endl + << "Test 3d resize" + << std::endl + << std::endl; + image3d<int> ima(2, 3, 2, border); + level::fill (ima, 2); + border::fill(ima, 8); + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; +} Index: trunk/milena/tests/border_resize_image1d_1.cc =================================================================== --- trunk/milena/tests/border_resize_image1d_1.cc (revision 0) +++ trunk/milena/tests/border_resize_image1d_1.cc (revision 1309) @@ -0,0 +1,73 @@ +// 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/border_resize_image1d_1.cc + * + * \brief Tests on mln::border::resize. + */ + + +#include <mln/core/image1d.hh> +#include <mln/debug/iota.hh> +#include <mln/value/int_u8.hh> +#include <mln/border/resize.hh> +#include <mln/debug/println_with_border.hh> +#include <mln/border/fill.hh> + +using namespace mln; + +int +main (void) +{ + unsigned border = 1; + unsigned new_border = 3; + + std::cout << std::endl + << "Test 1d resize" + << std::endl + << std::endl; + image1d<value::int_u8> ima(3, border); + debug::iota(ima); + border::fill(ima, 8); + + + std::cout << "before resize (" + << border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; + + + border::resize (ima, new_border); + std::cout << "after resize (" + << new_border + << ")" + << std::endl; + debug::println_with_border(ima); + std::cout << std::endl; +}

17 years, 3 months

milena r1307: Add black and white literals

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add black and white literals. * mln/core/concept/object.hh: Remove literals/zero.hh include * mln/literal/black.hh: New. * mln/literal/white.hh: New. * mln/value/gray.hh: Remove old black and white variables. * mln/value/graylevel.hh: Add cpy Ctor and assigment with literals. * tests/value_graylevel.cc: Update. --- mln/core/concept/object.hh | 2 - mln/literal/black.hh | 58 +++++++++++++++++++++++++++++++++++++++++++++ mln/literal/white.hh | 58 +++++++++++++++++++++++++++++++++++++++++++++ mln/value/gray.hh | 9 ------ mln/value/graylevel.hh | 42 ++++++++++++++++++++++++++++---- tests/value_graylevel.cc | 25 ++++++++++++++++--- 6 files changed, 175 insertions(+), 19 deletions(-) Index: trunk/milena/tests/value_graylevel.cc =================================================================== --- trunk/milena/tests/value_graylevel.cc (revision 1306) +++ trunk/milena/tests/value_graylevel.cc (revision 1307) @@ -30,6 +30,11 @@ * \brief Tests on mln::value::graylevel. */ + +#include <mln/literal/black.hh> + +#include <mln/literal/white.hh> + #include <mln/value/graylevel.hh> @@ -37,18 +42,30 @@ { using namespace mln::value; - gl8 a = white; - gl16 b = white; + using mln::literal::white; + using mln::literal::black; + + gl8 a (white); + gl16 b = black; + + mln_assertion(a == b); gl8 c = (a + b) / 2; + + // FIXME cant't compare with literals. mln_assertion(c == white); + // FIXME can't compare with int + mln_assertion(c == 255); + c = a; - mln_assertion(c == white); + // FIXME cant't compare with literals. + //mln_assertion(c == white); c = (a * 2) / 2; - mln_assertion(c == white); + // FIXME cant't compare with literals. + //mln_assertion(c == white); c = c / 6; } Index: trunk/milena/mln/core/concept/object.hh =================================================================== --- trunk/milena/mln/core/concept/object.hh (revision 1306) +++ trunk/milena/mln/core/concept/object.hh (revision 1307) @@ -99,7 +99,7 @@ # include <mln/core/exact.hh> -# include <mln/literal/zero.hh> +//# include <mln/literal/zero.hh> # include <mln/core/ops.hh> // FIXME: Read FIXME in mln/metal/binary_arith_trait.hh! Index: trunk/milena/mln/literal/black.hh =================================================================== --- trunk/milena/mln/literal/black.hh (revision 0) +++ trunk/milena/mln/literal/black.hh (revision 1307) @@ -0,0 +1,58 @@ +// 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_LITERAL_BLACK_HH +# define MLN_LITERAL_BLACK_HH + +/*! \file mln/literal/black.hh + * \brief Definition of the literal of mln::black. + * + */ + +# include <mln/core/concept/literal.hh> + +namespace mln +{ + + namespace literal + { + + /// Type of literal black. + struct black_t : public Literal<black_t> + { + }; + + + /// Literal black. + static black_t black = black_t(); + + } // end of namespace mln::literal + +} // end of namespace mln + + +#endif // ! MLN_LITERAL_BLACK_HH Index: trunk/milena/mln/literal/white.hh =================================================================== --- trunk/milena/mln/literal/white.hh (revision 0) +++ trunk/milena/mln/literal/white.hh (revision 1307) @@ -0,0 +1,58 @@ +// 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_LITERAL_WHITE_HH +# define MLN_LITERAL_WHITE_HH + +/*! \file mln/literal/white.hh + * \brief Definition of the literal of mln::white. + * + */ + +# include <mln/core/concept/literal.hh> + +namespace mln +{ + + namespace literal + { + + /// Type of literal white. + struct white_t : public Literal<white_t> + { + }; + + + /// Literal white. + static white_t white = white_t(); + + } // end of namespace mln::literal + +} // end of namespace mln + + +#endif // ! MLN_LITERAL_WHITE_HH Index: trunk/milena/mln/value/graylevel.hh =================================================================== --- trunk/milena/mln/value/graylevel.hh (revision 1306) +++ trunk/milena/mln/value/graylevel.hh (revision 1307) @@ -42,13 +42,15 @@ namespace mln { + /// Fwd decl. + namespace literal { struct black_t; struct white_t; } + namespace value { /// Fwd decl. class gray; - /// General gray-level class on n bits. template <unsigned n> struct graylevel @@ -66,10 +68,21 @@ /// Ctor. explicit graylevel(int val); + /// \{ Ctors with literals. + graylevel(const literal::black_t&); + graylevel(const literal::white_t&); + /// \} + /// Access to std type. mln_enc(int_u<n>) value() const; + /// Assigment with int. graylevel<n>& operator=(int val); + + /// \{ Assigment with literals. + graylevel<n>& operator=(const literal::white_t&); + graylevel<n>& operator=(const literal::black_t&); + /// \} }; @@ -126,6 +139,19 @@ this->v_ = val; } + + template <unsigned n> + graylevel<n>::graylevel(const literal::black_t&) + { + this->v_ = 0; + } + + template <unsigned n> + graylevel<n>::graylevel(const literal::white_t&) + { + this->v_ = mln_max(mln_enc(int_u<n>)); + } + template <unsigned n> mln_enc(int_u<n>) graylevel<n>::value() const @@ -135,11 +161,17 @@ template <unsigned n> graylevel<n>& - graylevel<n>::operator=(int val) + graylevel<n>::operator=(const literal::black_t&) { - mln_precondition(val >= 0); - mln_precondition(unsigned(val) <= mln_max(mln_enc(int_u<n>))); - this->v_ = val; + this->v_ = 0; + return *this; + } + + template <unsigned n> + graylevel<n>& + graylevel<n>::operator=(const literal::white_t&) + { + this->v_ = mln_max(mln_enc(int_u<n>)); return *this; } Index: trunk/milena/mln/value/gray.hh =================================================================== --- trunk/milena/mln/value/gray.hh (revision 1306) +++ trunk/milena/mln/value/gray.hh (revision 1307) @@ -83,12 +83,6 @@ unsigned long val_; }; - /// White. - extern const gray white; - - /// Black. - extern const gray black; - std::ostream& operator<<(std::ostream& ostr, const gray& g); bool operator==(const gray& lhs, const gray& rhs); @@ -107,9 +101,6 @@ # ifndef MLN_INCLUDE_ONLY - const gray white = gray(1, 1); - const gray black = gray(1, 0); - template <unsigned N, unsigned M> gray operator+(const graylevel<N>& lhs, const graylevel<M>& rhs) {

17 years, 3 months

1306: Use more literals.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Use more literals. * tests/value_int_u8.cc: Augment. * mln/literal/origin.hh: New. * tests/point2d.cc (zero): Replace by... (origin): ...this. * mln/core/point.hh, * mln/core/dpoint.hh (operator=): Handle literals. Update. * mln/core/ops.hh: Add FIXMEs. * mln/literal/all.hh: Update. * mln/literal/zero.hh: Fix typo in doc. * mln/value/int_s.hh: Handle literals. * mln/value/int_u.hh (zero, one): Remove variables. * mln/value/concept/scalar.hh, * mln/make/w_window_line.hh, * mln/morpho/hit_or_miss.hh: Update with literals. mln/core/dpoint.hh | 32 ++++++++++++++++------- mln/core/ops.hh | 2 + mln/core/point.hh | 45 ++++++++++++++++++++++++++++++--- mln/literal/all.hh | 2 + mln/literal/origin.hh | 60 ++++++++++++++++++++++++++++++++++++++++++++ mln/literal/zero.hh | 1 mln/make/w_window_line.hh | 3 +- mln/morpho/hit_or_miss.hh | 9 +++--- mln/value/concept/scalar.hh | 5 ++- mln/value/int_s.hh | 39 +++++++++++++++++++++++++++- mln/value/int_u.hh | 12 -------- tests/point2d.cc | 4 +- tests/value_int_u8.cc | 6 +++- 13 files changed, 184 insertions(+), 36 deletions(-) Index: tests/value_int_u8.cc --- tests/value_int_u8.cc (revision 1305) +++ tests/value_int_u8.cc (working copy) @@ -159,7 +159,11 @@ mln_assertion(-i = -234.f); // FIXME: new better version mln_assertion(i * -2 != 0.f); - std::cout << (i) << " " << (i * -2) << " " << (-2 * int(i)) << std::endl; + std::cout << (i) << " * -2 = " + << (i * -2) << ' ' + << (-2 * i) << ' ' + << (-2 * int(i)) + << std::endl; } // Multiplication Index: tests/point2d.cc --- tests/point2d.cc (revision 1305) +++ tests/point2d.cc (working copy) @@ -65,9 +65,9 @@ } { point2d O(0,0); - point2d O_ = literal::zero; + point2d O_ = literal::origin; mln_assertion(O_ = O); - mln_assertion(O = literal::zero); + mln_assertion(O = literal::origin); } q.set_all(0); Index: mln/core/point.hh --- mln/core/point.hh (revision 1305) +++ mln/core/point.hh (working copy) @@ -51,6 +51,7 @@ namespace literal { struct zero_t; struct one_t; + struct origin_t; } /// \} @@ -115,9 +116,14 @@ point_(C sli, C row, C col); /// \} - /// \{ Constructors with literals. + /// \{ Constructors/assignments with literals. + point_(const literal::origin_t&); + point_<M,C>& operator=(const literal::origin_t&); + // Works only in 1D: point_(const literal::zero_t&); - point_(const literal::one_t&); // Works only in 1D. + point_<M,C>& operator=(const literal::zero_t&); + point_(const literal::one_t&); + point_<M,C>& operator=(const literal::one_t&); /// \} /// Constructor; coordinates are set by function \p f. @@ -209,9 +215,33 @@ } template <typename M, typename C> - point_<M,C>::point_(const literal::zero_t&) + point_<M,C>::point_(const literal::origin_t&) + { + coord_.set_all(0); + } + + template <typename M, typename C> + point_<M,C>& + point_<M,C>::operator=(const literal::origin_t&) { coord_.set_all(0); + return *this; + } + + template <typename M, typename C> + point_<M,C>::point_(const literal::zero_t&) + { + metal::bool_<(dim = 1)>::check(); + coord_[0] = 1; + } + + template <typename M, typename C> + point_<M,C>& + point_<M,C>::operator=(const literal::zero_t&) + { + metal::bool_<(dim = 1)>::check(); + coord_[0] = 1; + return *this; } template <typename M, typename C> @@ -222,6 +252,15 @@ } template <typename M, typename C> + point_<M,C>& + point_<M,C>::operator=(const literal::one_t&) + { + metal::bool_<(dim = 1)>::check(); + coord_[0] = 1; + return *this; + } + + template <typename M, typename C> void point_<M,C>::set_all(C c) { coord_.set_all(c); Index: mln/core/ops.hh --- mln/core/ops.hh (revision 1305) +++ mln/core/ops.hh (working copy) @@ -174,6 +174,8 @@ mln_trait_op_times(O, int) operator*(int lhs, const Object<O>& rhs) { + // FIXME HERE: Activate: std::cout << "call(int * Object)" << std::endl; + // FIXME HERE: Change below to '* value::scalar(lhs)': return exact(rhs) * lhs; } Index: mln/core/dpoint.hh --- mln/core/dpoint.hh (revision 1305) +++ mln/core/dpoint.hh (working copy) @@ -98,9 +98,12 @@ dpoint_(C sli, C row, C col); /// \} - /// \{ Constructors with literals. + /// \{ Constructors/assignments with literals. dpoint_(const literal::zero_t&); - dpoint_(const literal::one_t&); // Works only in 1D. + dpoint_<M,C>& operator=(const literal::zero_t&); + // Works only in 1D: + dpoint_(const literal::one_t&); + dpoint_<M,C>& operator=(const literal::one_t&); /// \} /// Constructor; coordinates are set by function \p f. @@ -110,9 +113,6 @@ /// Set all coordinates to the value \p c. void set_all(C c); - /// Zero delta-point. - static const dpoint_<M,C> zero; - /// Conversion towards a metal::vec. template <typename Q> operator metal::vec<M::dim, Q>() const; @@ -177,6 +177,14 @@ } template <typename M, typename C> + dpoint_<M,C>& + dpoint_<M,C>::operator=(const literal::zero_t&) + { + coord_.set_all(0); + return *this; + } + + template <typename M, typename C> dpoint_<M,C>::dpoint_(const literal::one_t&) { metal::bool_<(dim = 1)>::check(); @@ -184,6 +192,15 @@ } template <typename M, typename C> + dpoint_<M,C>& + dpoint_<M,C>::operator=(const literal::one_t&) + { + metal::bool_<(dim = 1)>::check(); + coord_[0] = 1; + return *this; + } + + template <typename M, typename C> template <typename F> dpoint_<M,C>::dpoint_(const Function_i2v<F>& f_) { @@ -201,10 +218,6 @@ } template <typename M, typename C> - const dpoint_<M,C> - dpoint_<M,C>::zero = all(0); - - template <typename M, typename C> template <typename Q> dpoint_<M,C>::operator metal::vec<M::dim, Q> () const { @@ -218,7 +231,6 @@ return coord_; } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/literal/origin.hh --- mln/literal/origin.hh (revision 0) +++ mln/literal/origin.hh (revision 0) @@ -0,0 +1,60 @@ +// 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_LITERAL_ORIGIN_HH +# define MLN_LITERAL_ORIGIN_HH + +/*! \file mln/literal/origin.hh + * + * \brief Definition of the literal of mln::origin. + */ + +# include <mln/core/concept/literal.hh> + + +namespace mln +{ + + namespace literal + { + + /// Type of literal origin. + struct origin_t : public Literal<origin_t> + { + }; + + + /// Literal origin. + static origin_t origin = origin_t(); + + + } // end of namespace mln::literal + +} // end of namespace mln + + +#endif // ! MLN_LITERAL_ORIGIN_HH Index: mln/literal/all.hh --- mln/literal/all.hh (revision 1305) +++ mln/literal/all.hh (working copy) @@ -45,6 +45,8 @@ # include <mln/literal/zero.hh> # include <mln/literal/one.hh> +# include <mln/literal/origin.hh> + // FIXME: Add: // # include <mln/literal/white.hh> // # include <mln/literal/black.hh> Index: mln/literal/zero.hh --- mln/literal/zero.hh (revision 1305) +++ mln/literal/zero.hh (working copy) @@ -29,6 +29,7 @@ # define MLN_LITERAL_ZERO_HH /*! \file mln/literal/zero.hh + * * \brief Definition of the literal of mln::zero. * * \todo Macro-ification of similar code (when no trivial conversion ops are involved). Index: mln/value/int_s.hh --- mln/value/int_s.hh (revision 1305) +++ mln/value/int_s.hh (working copy) @@ -46,8 +46,10 @@ { - // Fwd decl. + /// \{ Fwd decls. namespace value { template <unsigned n> struct int_s; } + namespace literal { struct zero_t; struct one_t; } + /// \} @@ -110,6 +112,13 @@ /// Constructor from an integer. int_s(int i); + /// \{ Constructors/assignments with literals. + int_s(const literal::zero_t&); + int_s& operator=(const literal::zero_t&); + int_s(const literal::one_t&); + int_s& operator=(const literal::one_t&); + /// \} + /// Conversion to an integer. operator int() const; @@ -195,6 +204,34 @@ } template <unsigned n> + int_s<n>::int_s(const literal::zero_t&) + { + this->v_ = 0; + } + + template <unsigned n> + int_s<n>& + int_s<n>::operator=(const literal::zero_t&) + { + this->v_ = 0; + return *this; + } + + template <unsigned n> + int_s<n>::int_s(const literal::one_t&) + { + this->v_ = 1; + } + + template <unsigned n> + int_s<n>& + int_s<n>::operator=(const literal::one_t&) + { + this->v_ = 1; + return *this; + } + + template <unsigned n> int_s<n> int_s<n>::operator-() const { Index: mln/value/int_u.hh --- mln/value/int_u.hh (revision 1305) +++ mln/value/int_u.hh (working copy) @@ -148,12 +148,6 @@ /// Assignment from an integer. int_u<n>& operator=(int i); - - /// Zero value. - static const int_u<n> zero; - - /// Unit value. - static const int_u<n> one; }; @@ -256,12 +250,6 @@ } template <unsigned n> - const int_u<n> int_u<n>::zero = 0; - - template <unsigned n> - const int_u<n> int_u<n>::one = 1; - - template <unsigned n> std::ostream& operator<<(std::ostream& ostr, const int_u<n>& i) { // FIXME: This code could be factored for almost every Value<*>... Index: mln/value/concept/scalar.hh --- mln/value/concept/scalar.hh (revision 1305) +++ mln/value/concept/scalar.hh (working copy) @@ -34,6 +34,7 @@ */ # include <mln/core/concept/value.hh> +# include <mln/literal/one.hh> namespace mln @@ -106,14 +107,14 @@ template <typename S> S& operator++(value::Scalar<S>& rhs) { - exact(rhs) += 1; // FIXME: literal::one? + exact(rhs) += S(literal::one); return exact(rhs); } template <typename S> S& operator--(value::Scalar<S>& rhs) { - exact(rhs) -= 1; // FIXME: literal::one? + exact(rhs) -= S(literal::one); return exact(rhs); } Index: mln/make/w_window_line.hh --- mln/make/w_window_line.hh (revision 1305) +++ mln/make/w_window_line.hh (working copy) @@ -34,6 +34,7 @@ */ # include <mln/core/w_window.hh> +# include <mln/literal/zero.hh> namespace mln @@ -62,7 +63,7 @@ { mln_precondition(L % 2 = 1); mln::w_window<D,W> w_win; - D dp = D::zero; + D dp = literal::zero; for (unsigned i = 0; i < L; ++i) { dp[D::dim - 1] = i - L / 2; Index: mln/morpho/hit_or_miss.hh --- mln/morpho/hit_or_miss.hh (revision 1305) +++ mln/morpho/hit_or_miss.hh (working copy) @@ -38,6 +38,7 @@ # include <mln/morpho/includes.hh> # include <mln/pw/all.hh> # include <mln/fun/p2v/ternary.hh> +# include <mln/literal/zero.hh> namespace mln @@ -153,7 +154,7 @@ fun::p2v::ternary(pw::value(input) = pw::value(ero_fg) && pw::value(dil_bg) < pw::value(input), pw::value(input) - pw::value(dil_bg), - pw::cst(V::zero))); + pw::cst( V(literal::zero) ))); // FIXME: Replace 'pw::cst(V::zero)' by 'pw::cst(V(literal::zero))' // FIXME: and then by 'literal::zero'! @@ -167,10 +168,10 @@ fun::p2v::ternary(pw::value(input) = pw::value(dil_fg) && pw::value(ero_bg) > pw::value(input), pw::value(ero_bg) - pw::value(input), - pw::cst(V::zero))); + pw::cst( V(literal::zero) ))); } else - level::fill(output, V::zero); + level::fill(output, V(literal::zero)); } else // Unconstrained: UHMT. { @@ -180,7 +181,7 @@ level::fill(output, fun::p2v::ternary(pw::value(dil) < pw::value(ero), pw::value(ero) - pw::value(dil), - pw::cst(V::zero))); + pw::cst( V(literal::zero) ))); } }

17 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches