Olena-patches September 2008

olena-patches@lrde.epita.fr

12 participants
359 discussions

cleanup-2008 2278: Make neighborhoods based on windows work.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make neighborhoods based on windows work. * sandbox/geraud/cs2d/tuto_bis.cc: Rename as... * doc/examples/tuto_bis.cc: ...this. De-activate code. Start with new material. * mln/core/window.hh (is_symmetric): Fix the use of sym. * mln/core/neighb.hh (neighb_fwd_niter, neighb_bkd_niter): New. (fwd_niter, bkd_niter, niter): Update. (change_window): New. (from_to_): New overload. * mln/core/concept/window.hh (operator==): Split decl and def. * mln/core/concept/neighborhood.hh (to_window): Relax sig. * mln/make/dual_neighb2d.hh: New. * mln/convert/to_p_set.hh (D): Remove useless typedef. * mln/win/multiple.hh (is_centered, is_symmetrical): New. doc/examples/tuto_bis.cc | 96 ++++++++++++++- mln/convert/to_p_set.hh | 3 mln/core/concept/neighborhood.hh | 5 mln/core/concept/window.hh | 13 +- mln/core/neighb.hh | 237 ++++++++++++++++++++++++++++++++++++++- mln/core/window.hh | 3 mln/make/dual_neighb2d.hh | 80 +++++++++++++ mln/win/multiple.hh | 28 ++++ 8 files changed, 442 insertions(+), 23 deletions(-) Index: doc/examples/tuto_bis.cc --- doc/examples/tuto_bis.cc (revision 2268) +++ doc/examples/tuto_bis.cc (working copy) @@ -1,9 +1,20 @@ # include <vector> +# include <mln/core/var.hh> + +# include <mln/core/alias/point2d.hh> +# include <mln/core/alias/window2d.hh> +# include <mln/make/win_multiple.hh> +# include <mln/convert/to.hh> +# include <mln/make/dual_neighb2d.hh> +# include <mln/literal/origin.hh> +# include <mln/core/site_set/p_set.hh> + + +/* # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> # include <mln/core/image/image_if.hh> -# include <mln/core/image_if_value.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/alias/window2d.hh> @@ -21,13 +32,14 @@ # include <mln/level/transform.hh> # include <mln/accu/mean.hh> -# include "dbl_neighb.hh" +*/ +/* + namespace mln { - namespace level { @@ -117,19 +129,50 @@ } is_point; +*/ + - struct is_row_odd_t +namespace mln { - bool operator()(const mln::point2d& p) const + + template <typename W, typename S> + void convert_to_site_set(const Window<W>& win, + const mln_psite(W)& p, + Site_Set<S>& s_) { - return p.row() % 2; + std::cout << "win -> pset" << std::endl; + + S& s = exact(s_); + s.clear(); + + mln_qiter(W) q(exact(win), p); + for_all(q) + exact(s).insert(q); } - } is_row_odd; -#define mln_VAR(Var, Expr) \ -typeof(Expr) Var = Expr; + template <typename N, typename S> + void convert_to_site_set(const Neighborhood<N>& nbh, + const mln_psite(N)& p, + Site_Set<S>& s_) + { + S& s = exact(s_); + s.clear(); + + mln_niter(N) n(exact(nbh), p); + for_all(n) + exact(s).insert(n); + } + +} + + + + bool is_row_odd(const mln::point2d& p) + { + return p.row() % 2; + } @@ -137,6 +180,39 @@ { using namespace mln; + // e2c + + bool e2c_h[] = { 0, 1, 0, + 0, 0, 0, + 0, 1, 0 }; + + bool e2c_v[] = { 0, 0, 0, + 1, 0, 1, + 0, 0, 0 }; + + mln_VAR( e2c, make::dual_neighb2d(is_row_odd, e2c_h, e2c_v) ); + +// p_set<point2d> s; +// convert_to_site_set(e2c, literal::origin, s); +// std::cout << s << std::endl; + + bool e2e_h[] = { 0, 0, 1, 0, 0, + 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0, + 0, 1, 0, 1, 0, + 0, 0, 1, 0, 0 }; + + bool e2e_v[] = { 0, 0, 0, 0, 0, + 0, 1, 0, 1, 0, + 1, 0, 0, 0, 1, + 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0 }; + + mln_VAR( e2e, make::dual_neighb2d(is_row_odd, e2e_h, e2e_v) ); + + + /* + window2d c4 = convert::to_window(mln::c4()); @@ -274,4 +350,6 @@ // 5 5 5 // DONE! + + */ } Index: mln/core/window.hh --- mln/core/window.hh (revision 2277) +++ mln/core/window.hh (working copy) @@ -186,7 +186,8 @@ window<D>::is_symmetric() const { window<D> cpy = *this; - return cpy.sym() == *this; + cpy.sym(); + return cpy == *this; } template <typename D> Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 2277) +++ mln/core/neighb.hh (working copy) @@ -39,24 +39,30 @@ namespace mln { + // Forward declaration. + template <typename W> class neighb_fwd_niter; + template <typename W> class neighb_bkd_niter; /*! \brief Adapter class from window to neighborhood. */ template <typename W> - class neighb : public internal::neighborhood_base< mln_dpsite(W), neighb<D> >, + class neighb : public internal::neighborhood_base< mln_dpsite(W), neighb<W> >, private mlc_is_a(W, Window)::check_t { public: + typedef W window; + const W& to_window() const { return win_; } + /// Forward site iterator associated type. - typedef mln_fwd_qiter(W) fwd_niter; + typedef neighb_fwd_niter<W> fwd_niter; /// Backward site iterator associated type. - typedef mln_bkd_qiter(W) bkd_niter; + typedef neighb_bkd_niter<W> bkd_niter; /// Site iterator associated type. - typedef mln_qiter(W) niter; + typedef fwd_niter niter; /// Constructor without argument. @@ -68,6 +74,9 @@ /// Get the corresponding window. const W& win() const; + /// Change the corresponding window. + void change_window(const W& new_win); + private: W win_; }; @@ -83,14 +92,94 @@ void from_to_(const mln::neighb<W>& from, W& to); + template <typename W> + void + from_to_(const W& from, mln::neighb<W>& to); + } // end of namespace convert::impl } // end of namespace convert + // neighb_fwd_niter<W> + + template <typename W> + class neighb_fwd_niter + : public internal::site_relative_iterator_base< neighb<W>, + neighb_fwd_niter<W> > + { + public: + + /// Constructor without argument. + neighb_fwd_niter(); + + template <typename P> + neighb_fwd_niter(const neighb<W>& nbh, const P& c); + + /// Test the iterator validity. + bool is_valid_() const; + + /// Invalidate the iterator. + void invalidate_(); + + /// Start an iteration. + void do_start_(); + + /// Go to the next point. + void do_next_(); + + /// Compute the current psite. + mln_psite(W) compute_p_() const; + + protected: + + mln_fwd_qiter(W) i_; + }; + + + + // neighb_bkd_niter<W> + + template <typename W> + class neighb_bkd_niter + : public internal::site_relative_iterator_base< neighb<W>, + neighb_bkd_niter<W> > + { + public: + + /// Constructor without argument. + neighb_bkd_niter(); + + template <typename P> + neighb_bkd_niter(const neighb<W>& nbh, const P& c); + + /// Test the iterator validity. + bool is_valid_() const; + + /// Invalidate the iterator. + void invalidate_(); + + /// Start an iteration. + void do_start_(); + + /// Go to the next point. + void do_next_(); + + /// Compute the current psite. + mln_psite(W) compute_p_() const; + + protected: + + mln_bkd_qiter(W) i_; + }; + + + # ifndef MLN_INCLUDE_ONLY + // neighb<W> + template <typename W> inline neighb<W>::neighb() @@ -101,8 +190,7 @@ inline neighb<W>::neighb(const W& win) { - mln_precondition(win.is_neighbable_()); - win_ = win; + change_window(win); } template <typename W> @@ -113,6 +201,17 @@ return win_; } + template <typename W> + inline + void + neighb<W>::change_window(const W& new_win) + { + mln_precondition(new_win.is_neighbable_()); + win_ = new_win; + } + + + // convert::impl::from_to_ namespace convert { @@ -126,11 +225,137 @@ to = from.win(); } + template <typename W> + void + from_to_(const W& from, mln::neighb<W>& to) + { + to.change_window(from); + } + } // end of namespace convert::impl } // end of namespace convert + // neighb_fwd_niter<W> + + template <typename W> + inline + neighb_fwd_niter<W>::neighb_fwd_niter() + { + } + + template <typename W> + template <typename P> + inline + neighb_fwd_niter<W>::neighb_fwd_niter(const neighb<W>& nbh, const P& c) + { + this->change_target(nbh); + this->center_at(c); + i_.center_at(c); // Always before change_target for this kind of iter. + i_.change_target(nbh.to_window()); + } + + template <typename W> + inline + bool + neighb_fwd_niter<W>::is_valid_() const + { + return i_.is_valid(); + } + + template <typename W> + inline + void + neighb_fwd_niter<W>::invalidate_() + { + i_.invalidate(); + } + + template <typename W> + inline + void + neighb_fwd_niter<W>::do_start_() + { + i_.start(); + } + + template <typename W> + inline + void + neighb_fwd_niter<W>::do_next_() + { + i_.next(); + } + + template <typename W> + inline + mln_psite(W) + neighb_fwd_niter<W>::compute_p_() const + { + return i_.compute_p_(); + } + + + // neighb_bkd_niter<W> + + template <typename W> + inline + neighb_bkd_niter<W>::neighb_bkd_niter() + { + } + + template <typename W> + template <typename P> + inline + neighb_bkd_niter<W>::neighb_bkd_niter(const neighb<W>& nbh, const P& c) + { + this->change_target(nbh); + this->center_at(c); + i_.center_at(c); // Always before change_target for this kind of iter. + i_.change_target(nbh.to_window()); + } + + template <typename W> + inline + bool + neighb_bkd_niter<W>::is_valid_() const + { + return i_.is_valid(); + } + + template <typename W> + inline + void + neighb_bkd_niter<W>::invalidate_() + { + i_.invalidate(); + } + + template <typename W> + inline + void + neighb_bkd_niter<W>::do_start_() + { + i_.start(); + } + + template <typename W> + inline + void + neighb_bkd_niter<W>::do_next_() + { + i_.next(); + } + + template <typename W> + inline + mln_psite(W) + neighb_bkd_niter<W>::compute_p_() const + { + return i_.compute_p_(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/concept/window.hh --- mln/core/concept/window.hh (revision 2277) +++ mln/core/concept/window.hh (working copy) @@ -79,10 +79,8 @@ template <typename Wl, typename Wr> - bool operator==(const Window<Wl>& lhs, const Window<Wr>& rhs) - { - return exact(lhs).std_vector() == exact(rhs).std_vector(); - } + bool operator==(const Window<Wl>& lhs, const Window<Wr>& rhs); + # ifndef MLN_INCLUDE_ONLY @@ -100,6 +98,13 @@ typedef mln_bkd_qiter(E) bkd_qiter; } + template <typename Wl, typename Wr> + inline + bool operator==(const Window<Wl>& lhs, const Window<Wr>& rhs) + { + return exact(lhs).std_vector() == exact(rhs).std_vector(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/concept/neighborhood.hh --- mln/core/concept/neighborhood.hh (revision 2277) +++ mln/core/concept/neighborhood.hh (working copy) @@ -73,6 +73,7 @@ }; + # ifndef MLN_INCLUDE_ONLY template <typename E> @@ -84,8 +85,10 @@ typedef mln_bkd_niter(E) bkd_niter; typedef mln_window(E) window; - window (E::*m)() const = & E::to_window; + bool m = (& E::to_window) == (& E::to_window); m = 0; +// const window& (E::*m)() const = & E::to_window; +// m = 0; } # endif // ! MLN_INCLUDE_ONLY Index: mln/make/dual_neighb2d.hh --- mln/make/dual_neighb2d.hh (revision 0) +++ mln/make/dual_neighb2d.hh (revision 0) @@ -0,0 +1,80 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MAKE_DUAL_NEIGHB2D_HH +# define MLN_MAKE_DUAL_NEIGHB2D_HH + +/*! \file mln/make/dual_neighb2d.hh + * + * \brief Routine to create a dual neighborhood. + */ + +# include <mln/core/alias/window2d.hh> +# include <mln/win/multiple.hh> +# include <mln/core/neighb.hh> + + +namespace mln +{ + + namespace make + { + + template <typename A, unsigned St, unsigned Sf> + neighb< win::multiple<window2d, bool(*)(A)> > + dual_neighb2d(bool (*test)(A), + bool const (&when_true) [St], + bool const (&when_false)[Sf]); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename A, unsigned St, unsigned Sf> + inline + neighb< win::multiple<window2d, bool(*)(A)> > + dual_neighb2d(bool (*test)(A), + bool const (&when_true) [St], + bool const (&when_false)[Sf]) + { + typedef win::multiple<window2d, bool(*)(A)> W; + W wm(test); + wm.set_window(false, convert::to<window2d>(when_false)); // 0 + wm.set_window(true, convert::to<window2d>(when_true) ); // 1 + neighb<W> tmp(wm); + return tmp; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::make + +} // end of namespace mln + + +#endif // ! MLN_MAKE_DUAL_NEIGHB2D_HH Index: mln/convert/to_p_set.hh --- mln/convert/to_p_set.hh (revision 2277) +++ mln/convert/to_p_set.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -112,7 +112,6 @@ inline p_set<mln_site(W)> to_p_set(const Window<W>& win) { - typedef mln_dpsite(W) D; typedef mln_site(W) P; p_set pset; mln_qiter(W) q(exact(win), P::origin); Index: mln/win/multiple.hh --- mln/win/multiple.hh (revision 2277) +++ mln/win/multiple.hh (working copy) @@ -78,6 +78,10 @@ const mln_dpsite(W)& ith_dp_around(unsigned i, const mln_psite(W)& p) const; + bool is_centered() const; + + bool is_symmetric() const; + private: util::array<W> win_; @@ -179,6 +183,30 @@ template <typename W, typename F> inline + bool + multiple<W,F>::is_centered() const + { + mln_precondition(win_.nelements() >= 1); + for (unsigned i = 0; i < win_.nelements(); ++i) + if (! win_[i].is_centered()) + return false; + return true; + } + + template <typename W, typename F> + inline + bool + multiple<W,F>::is_symmetric() const + { + mln_precondition(win_.nelements() >= 1); + for (unsigned i = 0; i < win_.nelements(); ++i) + if (! win_[i].is_symmetric()) + return false; + return true; + } + + template <typename W, typename F> + inline unsigned multiple<W,F>::size_around(const mln_psite(W)& p) const {

16 years, 3 months

2277: Have tools/area_flooding compile again (cont.).

by Roland Levillain

* mln/make/neighb2d.hh: Include mln/convert/to.hh. --- milena/ChangeLog | 6 ++++++ milena/mln/make/neighb2d.hh | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1654dea..2b828ba 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-15 Roland Levillain <roland(a)lrde.epita.fr> + Have tools/area_flooding compile again (cont.). + + * mln/make/neighb2d.hh: Include mln/convert/to.hh. + +2008-09-15 Roland Levillain <roland(a)lrde.epita.fr> + Have tools/area_flooding compile again. * mln/core/image/line_graph_image.hh diff --git a/milena/mln/make/neighb2d.hh b/milena/mln/make/neighb2d.hh index 0f4b19f..26ca9fa 100644 --- a/milena/mln/make/neighb2d.hh +++ b/milena/mln/make/neighb2d.hh @@ -34,6 +34,7 @@ */ # include <mln/core/alias/window2d.hh> +# include <mln/convert/to.hh> namespace mln -- 1.5.6.5

16 years, 3 months

cleanup-2008 r2272: Improve user doc generation

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Improve user doc generation. * milena/doc/Doxyfile.in: Exclude the proper file. * milena/doc/Makefile.am: Exclude the proper symbols for the user doc. --- Doxyfile.in | 3 ++- Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/doc/Doxyfile.in =================================================================== --- branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2271) +++ branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2272) @@ -80,7 +80,8 @@ *.hcc RECURSIVE = YES EXCLUDE = @top_srcdir@/milena/sandbox \ - @top_srcdir@/milena/mln/core/concept + @top_srcdir@/milena/mln/core/concept \ + @top_srcdir@/milena/mln/core/concept/proxy.hxx EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh EXCLUDE_SYMBOLS = Index: branches/cleanup-2008/milena/doc/Makefile.am =================================================================== --- branches/cleanup-2008/milena/doc/Makefile.am (revision 2271) +++ branches/cleanup-2008/milena/doc/Makefile.am (revision 2272) @@ -41,7 +41,7 @@ -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' \ - -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = mln::internal::*,g' + -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal*,g'

16 years, 3 months

milena r2271: Move and update line_piter as box_runstart_piter

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-15 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Move and update line_piter as box_runstart_piter. * mln/core/line_piter.hh: Rename as... * mln/core/box_runstart_piter.hh: ...this. * tests/core/other/line_piter.cc: Rename as... * tests/core/other/box_runstart_piter.cc: ...this. --- mln/core/box_runstart_piter.hh | 165 +++++++++++++++++++++++++++++++++ tests/core/other/box_runstart_piter.cc | 89 +++++++++++++++++ 2 files changed, 254 insertions(+) Index: branches/cleanup-2008/milena/tests/core/other/line_piter.cc (deleted) =================================================================== Index: branches/cleanup-2008/milena/tests/core/other/box_runstart_piter.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/other/box_runstart_piter.cc (revision 0) +++ branches/cleanup-2008/milena/tests/core/other/box_runstart_piter.cc (revision 2271) @@ -0,0 +1,89 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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/core/other/box_runstart_piter.cc + * + * \brief Tests on mln::box_runstart_piter. + */ +#include <mln/core/alias/box1d.hh> +#include <mln/core/alias/box2d.hh> +#include <mln/core/alias/box3d.hh> +#include <mln/core/box_runstart_piter.hh> + +int main() +{ + using namespace mln; + + const unsigned border = 2; + + /// Test with box1d + { + box1d b1(make::point1d(40), make::point1d(42)); + box_runstart_piter<point1d> p1(b1); + for_all(p1) + { + mln_assertion(p1[0] == 40); + std::cout << p1 <<std::endl; + } + std::cout << "run_len : " << p1.run_length()<<std::endl; + mln_assertion(p1.run_length() == 3); + } + + + /// Test with box2d + { + box2d b2(make::point2d(1,2), make::point2d(5,8)); + box_runstart_piter<point2d> p2(b2); + int i = 1; + for_all(p2) + { + mln_assertion(p2[1] == 2 && p2[0] == i++); + std::cout << p2 <<std::endl; + } + std::cout << "run_len : " << p2.run_length()<<std::endl; + mln_assertion(p2.run_length() == 7); + } + +// Test with image 3d + { + box3d b3(make::point3d(1,2,3), make::point3d(5,8,7)); + box_runstart_piter<point3d> p3(b3); + int i = 1; + int j = 2; + for_all(p3) + { + std::cout << p3 << std::endl; + if (i++ == 5) + i = 1; + if (j++ == 8) + j = 2; + } + std::cout << "run_len : " << p3.run_length() << std::endl; + mln_assertion(p3.run_length() == 5); + } + +} Index: branches/cleanup-2008/milena/mln/core/line_piter.hh (deleted) =================================================================== Index: branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh (revision 0) +++ branches/cleanup-2008/milena/mln/core/box_runstart_piter.hh (revision 2271) @@ -0,0 +1,165 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_BOX_RUNSTART_PITER_HH +# define MLN_CORE_BOX_RUNSTART_PITER_HH + +/*! \file mln/core/box_runstart_piter.hh + * + * \brief Definition of iterators on points by lines. + * + */ + +# include <mln/core/internal/site_iterator_base.hh> +# include <mln/core/site_set/box.hh> + +namespace mln +{ + + /*! \brief A generic forward iterator on points by lines. + * + * The parameter \c P is the type of points. + */ + template <typename P> + class box_runstart_piter : + public internal::site_set_iterator_base< box, + box_runstart_piter > + { + typedef box_runstart_piter self_; + typedef internal::site_set_iterator_base< box, self_ > super_; + public: + + // Make definitions from super class available. + enum { dim = super_::dim }; + + /*! \brief Constructor. + * + * \param[in] b A box. + */ + box_runstart_piter(const box& b); + + box_runstart_piter(); + + /// Test the iterator validity. + bool is_valid_() const; + + /// Invalidate the iterator. + void invalidate_(); + + /// Start an iteration. + void start_(); + + /// Go to the next point. + void next_(); + + /// Give the lenght of the run + unsigned run_length() const; + + private: + using super_::p_; + using super_::s_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + // box_runstart_piter + + template <typename P> + inline + box_runstart_piter::box_runstart_piter() + { + } + + template <typename P> + inline + box_runstart_piter::box_runstart_piter(const box& b) + { + this->change_target(b); + } + + template <typename P> + inline + bool + box_runstart_piter::is_valid_() const + { + return p_[0] != s_->pmax()[0] + 1; + } + + template <typename P> + inline + void + box_runstart_piter::invalidate_() + { + p_[0] = s_->pmax()[0] + 1; + } + + template <typename P> + inline + void + box_runstart_piter::start_() + { + p_ = s_->pmin(); + } + + template <typename P> + inline + void + box_runstart_piter::next_() + { + // Do we want this run for image in 3d? + for (int c = dim - 2; c >= 0; --c) + { + if (p_[c] != s_->pmax()[c]) + { + ++p_[c]; + break; + } + else + p_[c] = s_->pmin()[c]; + } + + if (p_ == s_->pmin()) + invalidate_(); + } + + template <typename P> + inline + unsigned + box_runstart_piter::run_length() const + { + return s_->len(dim - 1); + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_BOX_RUNSTART_PITER_HH

16 years, 3 months

cleanup-2008 r2270: Fix various test related files

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix various test related files. * milena/tests/core/routine/exact.cc: Write test. * milena/tests/canvas/chamfer.cc: Fix includes. * milena/tests/convert/to_p_set.cc: Fix a method call. * milena/mln/trait/op/all.hh: remove guards. * milena/mln/core/internal/exact.hh: Add a forward declaration. * milena/mln/core/routine/exact.hh: Move an include. * milena/mln/level/median.hh, * milena/mln/level/naive/median.hh, * milena/mln/level/was.median.hh: Use median_h. * milena/mln/level/memset_.hh: Use full namespace name to call force_exact (g++ does not look at the right namespace if the full name is not given). * milena/mln/convert/to_image.hh: use geom::bbox(). * milena/mln/geom/chamfer.hh, * milena/mln/geom/pmin_pmax.hh: Rename mln_point to mln_site. * milena/mln/geom/seeds2tiling.hh, * milena/mln/geom/seeds2tiling_roundness.hh: Use exact(). * milena/mln/value/hsi.hh: Add missing copyright header. --- mln/convert/to_image.hh | 2 +- mln/core/internal/exact.hh | 11 ++++++++++- mln/core/routine/exact.hh | 6 +----- mln/geom/chamfer.hh | 3 +-- mln/geom/pmin_pmax.hh | 26 +++++++++++++------------- mln/geom/seeds2tiling.hh | 5 +++-- mln/geom/seeds2tiling_roundness.hh | 12 +++++++----- mln/level/median.hh | 6 +++--- mln/level/memset_.hh | 2 +- mln/level/naive/median.hh | 4 ++-- mln/level/was.median.hh | 6 +++--- mln/trait/op/all.hh | 5 +---- mln/value/hsi.hh | 27 +++++++++++++++++++++++++++ tests/canvas/chamfer.cc | 2 -- tests/convert/to_p_set.cc | 5 ++++- tests/core/routine/exact.cc | 7 +------ 16 files changed, 78 insertions(+), 51 deletions(-) Index: branches/cleanup-2008/milena/tests/core/routine/exact.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/routine/exact.cc (revision 2269) +++ branches/cleanup-2008/milena/tests/core/routine/exact.cc (revision 2270) @@ -44,11 +44,6 @@ using namespace mln; test t; - std::cout << typeid(exact(t)).name() << std::endl;; - Object<test>& t_ = t; - std::cout << typeid(exact(t_)).name() << std::endl;; - - int i; - std::cout << typeid(exact(i)).name() << std::endl;; + mln_assertion(typeid(exact(t_)).name() == typeid(exact(t)).name()); } Index: branches/cleanup-2008/milena/tests/convert/to_p_set.cc =================================================================== --- branches/cleanup-2008/milena/tests/convert/to_p_set.cc (revision 2269) +++ branches/cleanup-2008/milena/tests/convert/to_p_set.cc (revision 2270) @@ -60,7 +60,10 @@ d(0,-1); p_set<point2d> ref; - ref.insert(a).insert(b).insert(c).insert(d); + ref.insert(a); + ref.insert(b); + ref.insert(c); + ref.insert(d); // Reference constructed. // Nbh : Index: branches/cleanup-2008/milena/tests/canvas/chamfer.cc =================================================================== --- branches/cleanup-2008/milena/tests/canvas/chamfer.cc (revision 2269) +++ branches/cleanup-2008/milena/tests/canvas/chamfer.cc (revision 2270) @@ -32,14 +32,12 @@ #include <mln/core/image/image2d.hh> #include <mln/core/image/sub_image.hh> -#include <mln/core/image_if_value.hh> #include <mln/core/image/inplace.hh> #include <mln/level/fill.hh> #include <mln/debug/println.hh> #include <mln/core/alias/w_window2d_int.hh> #include <mln/core/alias/w_window2d_float.hh> -#include <mln/core/image_if_interval.hh> #include <mln/make/win_chamfer.hh> #include <mln/geom/chamfer.hh> Index: branches/cleanup-2008/milena/mln/trait/op/all.hh =================================================================== --- branches/cleanup-2008/milena/mln/trait/op/all.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/trait/op/all.hh (revision 2270) @@ -25,8 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_TRAIT_OP_ALL_HH -# define MLN_TRAIT_OP_ALL_HH +// GUARD NOT REQUIRED: all included files already have guards. /*! * \file mln/trait/op/all.hh @@ -81,5 +80,3 @@ // Ordering. # include <mln/trait/op/ord.hh> - -#endif // ! MLN_TRAIT_OP_ALL_HH Index: branches/cleanup-2008/milena/mln/core/internal/exact.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/internal/exact.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/core/internal/exact.hh (revision 2270) @@ -32,7 +32,15 @@ * \brief Meta-code for the mln::exact downcast routines. */ -# include <mln/core/concept/object.hh> + +/// Forward declaration. +namespace mln +{ + + template <typename T> + struct Object; + +} // End of namespace mln namespace mln @@ -121,5 +129,6 @@ } // end of namespace mln +# include <mln/core/concept/object.hh> #endif // ! MLN_CORE_INTERNAL_EXACT_HH Index: branches/cleanup-2008/milena/mln/core/routine/exact.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/routine/exact.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/core/routine/exact.hh (revision 2270) @@ -32,14 +32,11 @@ * \brief Definition of the mln::exact downcast routines. */ -#include <mln/core/internal/exact.hh> - - /// FIXME: Doc! #define mln_exact(T) typename mln::internal::exact_<T>::ret #define mln_exact_(T) mln::internal::exact_<T>::ret - +#include <mln/core/internal/exact.hh> namespace mln { @@ -88,5 +85,4 @@ } // end of namespace mln - #endif // ! MLN_CORE_ROUTINE_EXACT_HH Index: branches/cleanup-2008/milena/mln/level/was.median.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/was.median.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/level/was.median.hh (revision 2270) @@ -40,7 +40,7 @@ # include <mln/geom/max_row.hh> # include <mln/geom/min_row.hh> # include <mln/set/diff.hh> -# include <mln/accu/median.hh> +# include <mln/level/median.hh> # include <mln/win/hline2d.hh> namespace mln @@ -81,7 +81,7 @@ q_bp(win_bkd_plus, p), q_bm(win_bkd_minus, p), q_top(win_top, p), q_bot(win_bot, p); - accu::median<mln_vset(I)> med(input.values()); + accu::median_h<mln_vset(I)> med(input.values()); // initialization @@ -154,7 +154,7 @@ int& row = p.row(); int& col = p.col(); - accu::median<mln_vset(I)> med(input.values()); + accu::median_h<mln_vset(I)> med(input.values()); for (row = min_row; row <= max_row; ++row) { Index: branches/cleanup-2008/milena/mln/level/memset_.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/memset_.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/level/memset_.hh (revision 2270) @@ -128,7 +128,7 @@ typedef mln_image(P) I; metal::is_not_const::check(); - P& pix = internal::force_exact(pix_); + P& pix = mln::internal::force_exact(pix_); mln_precondition(pix.ima().has_data()); mln_precondition(& pix.val() >= & pix.ima()[0]); mln_precondition(& pix.val() < & pix.ima()[0] + pix.ima().nelements()); Index: branches/cleanup-2008/milena/mln/level/median.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/median.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/level/median.hh (revision 2270) @@ -43,7 +43,7 @@ # include <mln/canvas/browsing/snake_fwd.hh> # include <mln/canvas/browsing/dir_struct_elt_incr_update.hh> -# include <mln/accu/median.hh> +# include <mln/accu/median_h.hh> namespace mln @@ -108,7 +108,7 @@ // aux data - accu::median<mln_vset(I)> med; + accu::median_h<mln_vset(I)> med; P p; window<D> win_fp, win_fm, win_bp, win_bm, win_dp, win_dm; mln_qiter(W) q_fp, q_fm, q_bp, q_bm, q_dp, q_dm; @@ -196,7 +196,7 @@ // aux data mln_psite(I) p; - accu::median<mln_vset(I)> med; + accu::median_h<mln_vset(I)> med; // ctor inline Index: branches/cleanup-2008/milena/mln/level/naive/median.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/naive/median.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/level/naive/median.hh (revision 2270) @@ -35,7 +35,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/alias/window2d.hh> -# include <mln/accu/median.hh> +# include <mln/level/median.hh> namespace mln @@ -79,7 +79,7 @@ { mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); - accu::median<mln_vset(I)> med(input.values()); + accu::median_h<mln_vset(I)> med(input.values()); for_all(p) { Index: branches/cleanup-2008/milena/mln/value/hsi.hh =================================================================== --- branches/cleanup-2008/milena/mln/value/hsi.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/value/hsi.hh (revision 2270) @@ -1,3 +1,30 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + #include <mln/value/ops.hh> #include <mln/value/concept/vectorial.hh> Index: branches/cleanup-2008/milena/mln/convert/to_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2270) @@ -137,7 +137,7 @@ mln_image_from(S, bool) to_image(const Site_Set<S>& pset_, unsigned border) { const S& pset = exact(pset_); - mln_image_from(S, bool) ima(pset.bbox().to_larger(border)); + mln_image_from(S, bool) ima(geom::bbox(pset).to_larger(border)); level::fill(ima, false); mln_piter(S) p(pset); for_all(p) Index: branches/cleanup-2008/milena/mln/geom/pmin_pmax.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/pmin_pmax.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/geom/pmin_pmax.hh (revision 2270) @@ -50,7 +50,7 @@ /// Compute the minimum and maximum points of point set \p s. template <typename S> - std::pair<mln_point(S), mln_point(S)> + std::pair<mln_site(S), mln_site(S)> pmin_pmax(const Site_Set<S>& s); @@ -58,13 +58,13 @@ /// of point set \p s. template <typename S> void - pmin_pmax(const Site_Set<S>& s, mln_point(S)& pmin, mln_point(S)& pmax); + pmin_pmax(const Site_Set<S>& s, mln_site(S)& pmin, mln_site(S)& pmax); /// Compute the minimum and maximum points when browsing with /// iterator \p p. template <typename I> - std::pair<mln_psite(I), mln_psite(I)> + std::pair<mln_site(I), mln_site(I)> pmin_pmax(const Site_Iterator& p); @@ -72,7 +72,7 @@ /// when browsing with iterator \p p. template <typename I> void - pmin_pmax(const Site_Iterator& p, mln_psite(I)& pmin, mln_psite(I)& pmax); + pmin_pmax(const Site_Iterator& p, mln_site(I)& pmin, mln_site(I)& pmax); @@ -84,7 +84,7 @@ template <typename I> inline void - pmin_pmax(const Site_Iterator& p_, mln_psite(I)& pmin, mln_psite(I)& pmax) + pmin_pmax(const Site_Iterator& p_, mln_site(I)& pmin, mln_site(I)& pmax) { I p = exact(p_); // a copy of p_ @@ -94,7 +94,7 @@ pmin = pmax = p; // update with remaining points - typedef mln_psite(I) P; + typedef mln_site(I) P; for_all_remaining(p) for (unsigned i = 0; i < P::dim; ++i) if (p[i] < pmin[i]) @@ -105,10 +105,10 @@ template <typename I> inline - std::pair<mln_psite(I), mln_psite(I)> + std::pair<mln_site(I), mln_site(I)> pmin_pmax(const Site_Iterator& p) { - typedef mln_psite(I) P; + typedef mln_site(I) P; std::pair<P, P> tmp; pmin_pmax(p, tmp.first, tmp.second); // Calls the previous version. return tmp; @@ -125,7 +125,7 @@ template <typename S> inline void - pmin_pmax_(const Site_Set<S>& s, mln_point(S)& pmin, mln_point(S)& pmax) + pmin_pmax_(const Site_Set<S>& s, mln_site(S)& pmin, mln_site(S)& pmax) { mln_piter(S) it(exact(s)); pmin_pmax(it, pmin, pmax); @@ -136,7 +136,7 @@ template <typename B> inline void - pmin_pmax_(const Box& b, mln_point(B)& pmin, mln_point(B)& pmax) + pmin_pmax_(const Box& b, mln_site(B)& pmin, mln_site(B)& pmax) { pmin = exact(b).pmin(); pmax = exact(b).pmax(); @@ -148,7 +148,7 @@ template <typename S> inline void - pmin_pmax(const Site_Set<S>& s, mln_point(S)& pmin, mln_point(S)& pmax) + pmin_pmax(const Site_Set<S>& s, mln_site(S)& pmin, mln_site(S)& pmax) { mln_precondition(exact(s).nsites() != 0); impl::pmin_pmax_(exact(s), pmin, pmax); @@ -156,11 +156,11 @@ template <typename S> inline - std::pair<mln_point(S), mln_point(S)> + std::pair<mln_site(S), mln_site(S)> pmin_pmax(const Site_Set<S>& s) { mln_precondition(exact(s).nsites() != 0); - typedef mln_point(S) P; + typedef mln_site(S) P; std::pair<P, P> tmp; pmin_pmax(s, tmp.first, tmp.second); // Calls the previous version. return tmp; Index: branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/geom/seeds2tiling.hh (revision 2270) @@ -69,12 +69,13 @@ inline I seeds2tiling (Image& ima_, - const Neighborhood<N>& nbh) + const Neighborhood<N>& nbh_) { trace::entering("geom::impl::seed2tiling"); I& ima = exact(ima_); I out = clone(ima_); + const N& nbh = exact(nbh_); p_queue<mln_psite(I)> q; // Init. @@ -105,7 +106,7 @@ if (out(n) != 0) out(p) = out(n); else - q.push_force(n); // n may already be in the queue, + q.push(n); // n may already be in the queue, // yet we then queue again this psite } } Index: branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/geom/seeds2tiling_roundness.hh (revision 2270) @@ -37,7 +37,8 @@ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/p_priority_fast.hh> +# include <mln/core/site_set/p_priority.hh> +# include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/routine/clone.hh> # include <mln/accu/mean.hh> # include <mln/estim/min_max.hh> @@ -79,21 +80,22 @@ inline I seeds2tiling_roundness(Image& ima_, const w_window2d_int& w_win, - unsigned max, const Neighborhood<N>& nbh) + unsigned max, const Neighborhood<N>& nbh_) { trace::entering("geom::impl::seed2tiling_roundness"); I& ima = exact(ima_); + const N& nbh = exact(nbh_); image2d<unsigned> dist = geom::chamfer(ima, w_win, max); I out = clone(ima_); - p_priority_fast<mln_psite(I), unsigned> q; + p_priority<mln_psite(I), p_queue_fast<unsigned> > q; // Init. { mln_piter(I) p(ima.domain()); for_all(p) - q.push_force(p, max - dist(p)); + q.push(p, max - dist(p)); } @@ -145,4 +147,4 @@ } // end of namespace mln -#endif // ! MLN_GEOM_SEEDS2TILING_ROUNDNESS_HH +#endif // ! MLN_GEOM_SEEDS3TILING_ROUNDNESS_HH Index: branches/cleanup-2008/milena/mln/geom/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2269) +++ branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2270) @@ -37,7 +37,6 @@ # include <mln/core/alias/w_window2d_int.hh> # include <mln/core/alias/w_window2d_float.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/image_if_value.hh> # include <mln/core/image/inplace.hh> # include <mln/canvas/chamfer.hh> @@ -66,7 +65,7 @@ { typedef I_ I; typedef W_ W; - typedef mln_point(I_) P; + typedef mln_site(I_) P; // requirements from mln::canvas::chamfer:

16 years, 3 months

cleanup-2008 r2269: Add missing init_()

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_(). * milena/mln/core/image/interpolated.hh, * milena/mln/core/image/plain.hh, * milena/mln/core/image/safe.hh, * milena/mln/core/image/sparse_image.hh: Add missing init_() here . * milena/mln/core/image/status.txt: Update cast_image status. --- interpolated.hh | 14 +++++++++++++- plain.hh | 8 ++++---- safe.hh | 26 +++++++++++++++++++++++++- sparse_image.hh | 38 ++++++++++++++++++++++++++++---------- status.txt | 2 +- 5 files changed, 71 insertions(+), 17 deletions(-) Index: branches/cleanup-2008/milena/mln/core/image/status.txt =================================================================== --- branches/cleanup-2008/milena/mln/core/image/status.txt (revision 2268) +++ branches/cleanup-2008/milena/mln/core/image/status.txt (revision 2269) @@ -39,7 +39,7 @@ ** value morpher -KO cast_image +OK cast_image KO value::stack_image ** domain morpher Index: branches/cleanup-2008/milena/mln/core/image/safe.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/safe.hh (revision 2268) +++ branches/cleanup-2008/milena/mln/core/image/safe.hh (revision 2269) @@ -93,6 +93,10 @@ safe_image(I& ima); safe_image(I& ima, const mln_value(I)& default_value); + // Initialize an empty image. + void init_(I& ima); + void init_(I& ima, const mln_value(I)& default_value); + mln_rvalue(I) operator()(const mln_psite(I)& p) const; mln_morpher_lvalue(I) operator()(const mln_psite(I)& p); @@ -142,18 +146,38 @@ inline safe_image::safe_image(I& ima, const mln_value(I)& default_value) { - this->data_ = new internal::data< safe_image >(ima, default_value); + mln_precondition(ima.has_data()); + init_(ima, default_value); } template <typename I> inline safe_image::safe_image(I& ima) { + mln_precondition(ima.has_data()); + init_(ima, mln_value(I)()); + } + + template <typename I> + inline + void + safe_image::init_(I& ima) + { + mln_precondition(ima.has_data()); this->data_ = new internal::data< safe_image >(ima, mln_value(I)()); } template <typename I> inline + void + safe_image::init_(I& ima, const mln_value(I)& default_value) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data< safe_image >(ima, default_value); + } + + template <typename I> + inline mln_rvalue(I) safe_image::operator()(const mln_psite(I)& p) const { Index: branches/cleanup-2008/milena/mln/core/image/interpolated.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/interpolated.hh (revision 2268) +++ branches/cleanup-2008/milena/mln/core/image/interpolated.hh (revision 2269) @@ -91,6 +91,9 @@ interpolated(I& ima); interpolated(); + /// Initialize an empty image. + void init_(I& ima); + /// Test if this image has been initialized. bool has_data() const; @@ -133,7 +136,7 @@ interpolated::interpolated(I& ima) { mln_precondition(ima.has_data()); - this->data_ = new internal::data< interpolated >(ima); + init_(ima); } template <typename I> @@ -144,6 +147,15 @@ template <typename I> inline + void + interpolated::init_(I& ima) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data< interpolated >(ima); + } + + template <typename I> + inline bool interpolated::has_data() const { mln_invariant(this->data_->ima_.has_data()); Index: branches/cleanup-2008/milena/mln/core/image/sparse_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/sparse_image.hh (revision 2268) +++ branches/cleanup-2008/milena/mln/core/image/sparse_image.hh (revision 2269) @@ -35,7 +35,7 @@ # include <vector> # include <mln/core/internal/image_primary.hh> -# include <mln/core/p_set_of.hh> +# include <mln/core/site_set/p_set_of.hh> # include <mln/core/site_set/p_run.hh> # include <mln/value/set.hh> @@ -55,6 +55,7 @@ struct data< sparse_image<P,T> > { data(); + data(const p_set_of< p_run >& s); /// Domain. p_set_of< p_run > domain_; @@ -106,11 +107,11 @@ */ template <typename P, typename T> class sparse_image - : public internal::image_primary< p_set_of< p_run >, + : public internal::image_primary< P, p_set_of< p_run >, sparse_image<P,T> > { typedef sparse_image<P,T> self_; - typedef internal::image_primary<p_set_of< p_run >, self_> super_; + typedef internal::image_primary<P, p_set_of< p_run >, self_> super_; public: /// Value associated type. @@ -132,6 +133,8 @@ /// Constructor from a set of runs. sparse_image(const p_set_of< p_run >& s); + /// Initialize an empty image. + void init_(const p_set_of< p_run >& s); /// Add a new range to the image. void insert(const p_run& r, const std::vector<T>& vals); @@ -160,13 +163,24 @@ { // internal::data< sparse_image<I,S> > - template <typename P, typename T> inline data< sparse_image<P,T> >::data() { } + template <typename P, typename T> + inline + data< sparse_image<P,T> >::data(const p_set_of< p_run >& s) + { + mln_precondition(s.is_valid()); + this->domain_ = s; + const unsigned nr = s.nelements(); + this->values_.resize(nr); + for (unsigned r = 0; r < nr; ++r) + this->values_[r].resize(s[r].nsites()); + } + } // end of namespace mln::internal @@ -180,14 +194,18 @@ inline sparse_image<P,T>::sparse_image(const p_set_of< p_run >& s) { - this->data_ = new internal::data< sparse_image<P,T> >(); - this->data_->domain_ = s; - const unsigned nr = s.nruns(); - this->data_->values_.resize(nr); - for (unsigned r = 0; r < nr; ++r) - this->data_->values_[r].resize(s.run(r).nsites()); + this->data_ = new internal::data< sparse_image<P,T> >(s); + } + + template <typename P, typename T> + inline + void + sparse_image<P,T>::init_(const p_set_of< p_run >& s) + { + this->data_ = new internal::data< sparse_image<P,T> >(s); } + template <typename P, typename T> inline void Index: branches/cleanup-2008/milena/mln/core/image/plain.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/plain.hh (revision 2268) +++ branches/cleanup-2008/milena/mln/core/image/plain.hh (revision 2269) @@ -100,15 +100,15 @@ /// Copy constructor from an image \p ima. plain(const I& ima); + /// Initialize an empty image. + void init_(const I& ima); + /// Assignment operator. plain& operator=(const plain& rhs); /// Assignment operator from an image \p ima. plain& operator=(const I& ima); - /// Initialization routine. - void init(const I& ima); - /// Conversion into an image with type \c I. operator I () const; }; @@ -161,7 +161,7 @@ template <typename I> inline void - plain::init(const I& ima) + plain::init_(const I& ima) { mln_precondition(ima.has_data()); this->data_ = new internal::data< plain >(ima);

16 years, 3 months

cleanup-2008 2268: Remove useless make::[d]point?d and make::window?d.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Remove useless make::[d]point?d and make::window?d. * mln/make/dpoint1d.hh: Remove. * mln/make/dpoint2d.hh: Remove. * mln/make/dpoint3d.hh: Remove. * mln/make/point1d.hh: Remove. * mln/make/point2d.hh: Remove. * mln/make/point3d.hh: Remove. * mln/make/window1d.hh: Remove. * mln/make/window2d.hh: Remove. * mln/make/window3d.hh: Remove. * tests/histo/to_image1d.cc, * tests/core/site_set/p_image.cc, * tests/core/site_set/p_bgraph.cc, * tests/core/site_set/p_set.cc, * tests/core/other/neighb.cc, * tests/core/other/graph_elt_window.cc, * tests/core/other/graph_elt_neighborhood.cc, * tests/core/other/point_set_compatibility.cc, * tests/core/other/pixter1d.cc, * tests/core/other/pixter2d.cc, * tests/core/other/pixter3d.cc, * tests/core/other/line_graph_elt_window.cc, * tests/core/other/line_graph_elt_neighborhood.cc, * tests/core/other/dpoints_pixter.cc, * tests/core/other/pixel.cc, * tests/core/other/line_piter.cc, * tests/core/image/graph_image_wst.cc, * tests/core/image/plain.cc, * tests/core/image/bgraph_image.cc, * tests/core/image/decorated_image.cc, * tests/core/image/translate_image.cc, * tests/core/image/graph_image.cc, * tests/core/image/value_enc_image.cc, * tests/core/image/line_graph_image.cc, * tests/core/image/safe_image.cc, * tests/core/routine/clone.cc, * tests/core/alias/window3d.cc, * tests/core/alias/point2d.cc, * tests/core/alias/dpoint1d.cc, * tests/core/alias/dpoint2d.cc, * tests/core/alias/dpoint3d.cc, * tests/draw/graph.cc, * tests/draw/line.cc, * tests/level/memcpy_.cc, * tests/level/paste.cc, * tests/level/memset_.cc, * tests/linear/local/convolve.cc, * tests/accu/bbox.cc, * tests/value/stack.cc, * tests/convert/to_p_array.cc, * tests/convert/to_image.cc, * tests/geom/sym.cc, * tests/geom/shift.cc, * tests/geom/pmin_pmax.cc, * tests/geom/bbox.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/line_graph_image_wst.cc, * tests/morpho/thinning.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/combined.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/lena_line_graph_image_wst2.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc, * doc/tutorial/examples/p_line2d.cc, * doc/tutorial/examples/p_array.cc, * doc/tutorial/examples/image_plain.cc, * doc/tutorial/examples/window.cc, * doc/tutorial/examples/win_multiple.cc, * doc/tutorial/examples/image_safe.cc, * doc/tutorial/examples/proxy.cc, * mln/core/site_set/line2d.hh, * mln/core/image/hexa.hh, * mln/core/image/image1d.hh, * mln/core/image/fi_adaptor.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh, * mln/core/routine/exact.hh, * mln/core/alias/neighb1d.hh, * mln/core/alias/dpoint1d.hh, * mln/core/alias/neighb3d.hh, * mln/core/alias/dpoint2d.hh, * mln/core/alias/dpoint3d.hh, * mln/core/alias/dpoint2d_h.hh, * mln/core/alias/window1d.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh, * mln/core/alias/point1d.hh, * mln/core/alias/point2d.hh, * mln/core/alias/point3d.hh, * mln/core/clock_neighb2d.hh, * mln/linear/gaussian.hh, * mln/make/neighb2d.hh, * mln/make/all.hh, * mln/make/box1d.hh, * mln/make/box2d.hh, * mln/make/box3d.hh, * mln/make/w_window1d.hh, * mln/make/w_window2d.hh, * mln/make/w_window3d.hh, * mln/make/box2d_h.hh, * mln/make/voronoi.hh, * mln/make/image1d.hh, * mln/make/image2d.hh, * mln/convert/to.hh, * mln/convert/to_tiles.hh, * mln/win/cube3d.hh, * mln/win/diag2d.hh, * mln/win/backdiag2d.hh, * mln/win/cuboid3d.hh, * mln/win/disk2d.hh, * mln/io/pfm/save.hh, * mln/io/pfm/load.hh, * mln/io/fits/load.hh, * mln/io/pnm/load.hh, * mln/io/pbm/load.hh, * sandbox/duhamel/test_border_fill_image1d_3.cc, * sandbox/duhamel/test_border_fill_image3d_3.cc, * sandbox/duhamel/main_mesh_image.cc, * sandbox/duhamel/graph_labeling.hh, * sandbox/duhamel/labeling_algo.cc, * sandbox/duhamel/test_border_duplicate_image2d_3.cc, * sandbox/duhamel/test_border_duplicate_image1d_5.cc, * sandbox/duhamel/test_border_fill_image2d_4.cc, * sandbox/duhamel/test_border_duplicate_image1d_4.cc, * sandbox/duhamel/test_border_duplicate_image3d_4.cc, * sandbox/duhamel/labeling_algo.hh, * sandbox/duhamel/test_border_fill_image2d_3.cc, * sandbox/duhamel/test_border_fill_image1d_5.cc, * sandbox/duhamel/test_border_duplicate_image1d_3.cc, * sandbox/duhamel/test_border_duplicate_image3d_3.cc, * sandbox/duhamel/draw_mesh.hh, * sandbox/duhamel/test_border_fill_image1d_4.cc, * sandbox/duhamel/test_border_fill_image3d_4.cc, * sandbox/duhamel/translate_image.cc, * sandbox/duhamel/test_border_duplicate_image2d_4.cc, * sandbox/pellegrin/set/test/p_queue_fast.cc, * sandbox/pellegrin/set/test/p_bgraph.cc, * sandbox/pellegrin/set/test/p_queue.cc, * sandbox/pellegrin/set/test/p_runs.cc, * sandbox/pellegrin/set/test/p_set.cc, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/aroumougame/skeleton/mesh-skel_region.cc, * sandbox/aroumougame/skeleton/mesh-skel.cc, * sandbox/aroumougame/skeleton/test_image3d.cc, * sandbox/aroumougame/skeleton/thinning.hh, * sandbox/nivault/plugin-gimp/src/gimp-image.hh, * sandbox/jardonnet/test/reduce.cc, * sandbox/jardonnet/test/gaussian_subsampling.cc, * sandbox/jardonnet/test/subsampling.cc, * sandbox/jardonnet/registration/save.hh, * sandbox/jardonnet/registration/icp_ref.hh, * sandbox/jardonnet/registration/icp.hh, * sandbox/geraud/cs2d/kruskal.cc, * sandbox/geraud/cs2d/tuto_bis.cc, * sandbox/garrigues/level_set.hh, * sandbox/garrigues/fllt/essai.cc, * sandbox/garrigues/fllt/fllt_simple.svg.3.cc, * sandbox/garrigues/fllt/fllt_simple.cc, * sandbox/garrigues/fllt/fllt_simple.svg.2.cc: Update. apps/statues/mesh-segm.cc | 4 - apps/statues/mesh-skel.cc | 4 - doc/tutorial/examples/image_plain.cc | 2 doc/tutorial/examples/image_safe.cc | 4 - doc/tutorial/examples/p_array.cc | 2 doc/tutorial/examples/p_line2d.cc | 4 - doc/tutorial/examples/proxy.cc | 2 doc/tutorial/examples/win_multiple.cc | 18 ++++-- doc/tutorial/examples/window.cc | 4 - mln/convert/to.hh | 2 mln/convert/to_tiles.hh | 2 mln/core/alias/dpoint1d.hh | 5 - mln/core/alias/dpoint2d.hh | 9 +-- mln/core/alias/dpoint2d_h.hh | 8 +-- mln/core/alias/dpoint3d.hh | 13 ++-- mln/core/alias/neighb1d.hh | 2 mln/core/alias/neighb3d.hh | 56 ++++++++++----------- mln/core/alias/point1d.hh | 1 mln/core/alias/point2d.hh | 1 mln/core/alias/point3d.hh | 1 mln/core/alias/window1d.hh | 42 +++++++++++++++ mln/core/alias/window2d.hh | 24 ++++----- mln/core/alias/window3d.hh | 46 ++++++++++++++++- mln/core/clock_neighb2d.hh | 36 ++++++------- mln/core/image/fi_adaptor.hh | 6 +- mln/core/image/hexa.hh | 6 +- mln/core/image/image1d.hh | 10 +-- mln/core/image/image2d.hh | 6 +- mln/core/image/image3d.hh | 6 +- mln/core/routine/exact.hh | 3 - mln/core/site_set/line2d.hh | 10 +-- mln/io/fits/load.hh | 2 mln/io/pbm/load.hh | 2 mln/io/pfm/load.hh | 2 mln/io/pfm/save.hh | 2 mln/io/pnm/load.hh | 2 mln/linear/gaussian.hh | 12 ++-- mln/make/all.hh | 11 ---- mln/make/box1d.hh | 9 +-- mln/make/box2d.hh | 9 +-- mln/make/box2d_h.hh | 8 +-- mln/make/box3d.hh | 9 +-- mln/make/image1d.hh | 2 mln/make/image2d.hh | 2 mln/make/neighb2d.hh | 6 +- mln/make/voronoi.hh | 2 mln/make/w_window1d.hh | 2 mln/make/w_window2d.hh | 2 mln/make/w_window3d.hh | 2 mln/win/backdiag2d.hh | 2 mln/win/cube3d.hh | 2 mln/win/cuboid3d.hh | 2 mln/win/diag2d.hh | 2 mln/win/disk2d.hh | 2 sandbox/aroumougame/skeleton/mesh-skel.cc | 4 - sandbox/aroumougame/skeleton/mesh-skel_region.cc | 4 - sandbox/aroumougame/skeleton/test_image3d.cc | 34 ++++++------ sandbox/aroumougame/skeleton/thinning.hh | 2 sandbox/duhamel/draw_mesh.hh | 24 ++++----- sandbox/duhamel/graph_labeling.hh | 2 sandbox/duhamel/labeling_algo.cc | 2 sandbox/duhamel/labeling_algo.hh | 4 - sandbox/duhamel/main_mesh_image.cc | 12 ++-- sandbox/duhamel/test_border_duplicate_image1d_3.cc | 2 sandbox/duhamel/test_border_duplicate_image1d_4.cc | 2 sandbox/duhamel/test_border_duplicate_image1d_5.cc | 2 sandbox/duhamel/test_border_duplicate_image2d_3.cc | 2 sandbox/duhamel/test_border_duplicate_image2d_4.cc | 2 sandbox/duhamel/test_border_duplicate_image3d_3.cc | 2 sandbox/duhamel/test_border_duplicate_image3d_4.cc | 2 sandbox/duhamel/test_border_fill_image1d_3.cc | 2 sandbox/duhamel/test_border_fill_image1d_4.cc | 2 sandbox/duhamel/test_border_fill_image1d_5.cc | 2 sandbox/duhamel/test_border_fill_image2d_3.cc | 2 sandbox/duhamel/test_border_fill_image2d_4.cc | 2 sandbox/duhamel/test_border_fill_image3d_3.cc | 2 sandbox/duhamel/test_border_fill_image3d_4.cc | 2 sandbox/duhamel/translate_image.cc | 2 sandbox/garrigues/fllt/essai.cc | 4 - sandbox/garrigues/fllt/fllt_simple.cc | 26 ++++----- sandbox/garrigues/fllt/fllt_simple.svg.2.cc | 26 ++++----- sandbox/garrigues/fllt/fllt_simple.svg.3.cc | 26 ++++----- sandbox/garrigues/level_set.hh | 2 sandbox/geraud/cs2d/kruskal.cc | 4 - sandbox/geraud/cs2d/tuto_bis.cc | 4 - sandbox/jardonnet/registration/icp.hh | 4 - sandbox/jardonnet/registration/icp_ref.hh | 4 - sandbox/jardonnet/registration/save.hh | 4 - sandbox/jardonnet/test/gaussian_subsampling.cc | 2 sandbox/jardonnet/test/reduce.cc | 2 sandbox/jardonnet/test/subsampling.cc | 2 sandbox/nivault/plugin-gimp/src/gimp-image.hh | 6 +- sandbox/pellegrin/set/core/line2d.hh | 10 +-- sandbox/pellegrin/set/test/p_bgraph.cc | 10 +-- sandbox/pellegrin/set/test/p_queue.cc | 8 +-- sandbox/pellegrin/set/test/p_queue_fast.cc | 8 +-- sandbox/pellegrin/set/test/p_runs.cc | 8 +-- sandbox/pellegrin/set/test/p_set.cc | 8 +-- tests/accu/bbox.cc | 8 +-- tests/convert/to_image.cc | 2 tests/convert/to_p_array.cc | 4 - tests/core/alias/dpoint1d.cc | 6 +- tests/core/alias/dpoint2d.cc | 6 +- tests/core/alias/dpoint3d.cc | 6 +- tests/core/alias/point2d.cc | 2 tests/core/alias/window3d.cc | 6 +- tests/core/image/bgraph_image.cc | 10 +-- tests/core/image/decorated_image.cc | 2 tests/core/image/graph_image.cc | 10 +-- tests/core/image/graph_image_wst.cc | 10 +-- tests/core/image/line_graph_image.cc | 10 +-- tests/core/image/plain.cc | 6 +- tests/core/image/safe_image.cc | 4 - tests/core/image/translate_image.cc | 2 tests/core/image/value_enc_image.cc | 24 ++++----- tests/core/other/dpoints_pixter.cc | 6 +- tests/core/other/graph_elt_neighborhood.cc | 10 +-- tests/core/other/graph_elt_window.cc | 10 +-- tests/core/other/line_graph_elt_neighborhood.cc | 10 +-- tests/core/other/line_graph_elt_window.cc | 10 +-- tests/core/other/line_piter.cc | 6 +- tests/core/other/neighb.cc | 12 ++-- tests/core/other/pixel.cc | 4 - tests/core/other/pixter1d.cc | 4 - tests/core/other/pixter2d.cc | 4 - tests/core/other/pixter3d.cc | 4 - tests/core/other/point_set_compatibility.cc | 10 +-- tests/core/routine/clone.cc | 4 - tests/core/site_set/p_bgraph.cc | 10 +-- tests/core/site_set/p_image.cc | 16 +++--- tests/core/site_set/p_set.cc | 2 tests/draw/graph.cc | 14 ++--- tests/draw/line.cc | 2 tests/geom/bbox.cc | 8 +-- tests/geom/pmin_pmax.cc | 14 ++--- tests/geom/shift.cc | 20 +++---- tests/geom/sym.cc | 20 +++---- tests/histo/to_image1d.cc | 2 tests/level/memcpy_.cc | 4 - tests/level/memset_.cc | 2 tests/level/paste.cc | 8 +-- tests/linear/local/convolve.cc | 2 tests/morpho/artificial_line_graph_image_wst.cc | 8 +-- tests/morpho/combined.cc | 2 tests/morpho/hit_or_miss.cc | 6 +- tests/morpho/lena_line_graph_image_wst1.cc | 8 +-- tests/morpho/lena_line_graph_image_wst2.cc | 8 +-- tests/morpho/line_graph_image_wst.cc | 18 +++--- tests/morpho/thinning.cc | 4 - tests/value/stack.cc | 4 - 150 files changed, 590 insertions(+), 525 deletions(-) Index: tests/histo/to_image1d.cc --- tests/histo/to_image1d.cc (revision 2267) +++ tests/histo/to_image1d.cc (working copy) @@ -66,7 +66,7 @@ { image2d<int_u8> ima(3, 3); debug::iota(ima); - ima(make::point2d(0,1)) = 255; + ima(point2d(0,1)) = 255; debug::println(ima); histo::data<int_u8> h = histo::compute(ima); std::cout << h << std::endl; Index: tests/core/site_set/p_image.cc --- tests/core/site_set/p_image.cc (revision 2267) +++ tests/core/site_set/p_image.cc (working copy) @@ -39,17 +39,17 @@ image2d<bool> ima(box2d(20,20)); p_image<image2d<bool> > ps(ima); - ps.insert(make::point2d(6, 9)); - ps.insert(make::point2d(4, 2)); - ps.insert(make::point2d(4, 2)); - ps.insert(make::point2d(5, 1)); + ps.insert(point2d(6, 9)); + ps.insert(point2d(4, 2)); + ps.insert(point2d(4, 2)); + ps.insert(point2d(5, 1)); mln_assertion(ps.nsites() == 3); - ps.remove(make::point2d(5, 1)); - ps.remove(make::point2d(5, 1)); + ps.remove(point2d(5, 1)); + ps.remove(point2d(5, 1)); - ps.remove(make::point2d(6, 9)); - ps.remove(make::point2d(4, 2)); + ps.remove(point2d(6, 9)); + ps.remove(point2d(4, 2)); mln_assertion(ps.nsites() == 0); mln_assertion(ps.is_empty()); Index: tests/core/site_set/p_bgraph.cc --- tests/core/site_set/p_bgraph.cc (revision 2267) +++ tests/core/site_set/p_bgraph.cc (working copy) @@ -62,11 +62,11 @@ for (int i = 0; i < num_edges; ++i) boost::add_edge(edge_array[i].first, edge_array[i].second, g); - g[0] = make::point2d(0, 0); - g[1] = make::point2d(0, 1); - g[2] = make::point2d(1, 0); - g[3] = make::point2d(1, 1); - g[4] = make::point2d(0, 2); + g[0] = point2d(0, 0); + g[1] = point2d(0, 1); + g[2] = point2d(1, 0); + g[3] = point2d(1, 1); + g[4] = point2d(0, 2); /*-----------. | p_bgraph. | Index: tests/core/site_set/p_set.cc --- tests/core/site_set/p_set.cc (revision 2267) +++ tests/core/site_set/p_set.cc (working copy) @@ -51,7 +51,7 @@ mln_assertion(geom::bbox(ps) == make::box2d(4,1, 6, 9)); - ps.remove(make::point2d(4, 2)); + ps.remove(point2d(4, 2)); mln_assertion(ps.nsites() == 2); mln_assertion(geom::bbox(ps) == make::box2d(5,1, 6, 9)); Index: tests/core/other/neighb.cc --- tests/core/other/neighb.cc (revision 2267) +++ tests/core/other/neighb.cc (working copy) @@ -47,12 +47,12 @@ int main() { - test(c2(), make::point1d(0), 2); + test(c2(), point1d(0), 2); - test(c4(), make::point2d(0, 0), 4); - test(c8(), make::point2d(0, 0), 8); + test(c4(), point2d(0, 0), 4); + test(c8(), point2d(0, 0), 8); - test( c6(), make::point3d(0, 0, 0), 6); - test(c18(), make::point3d(0, 0, 0), 18); - test(c26(), make::point3d(0, 0, 0), 26); + test( c6(), point3d(0, 0, 0), 6); + test(c18(), point3d(0, 0, 0), 18); + test(c26(), point3d(0, 0, 0), 26); } Index: tests/core/other/graph_elt_window.cc --- tests/core/other/graph_elt_window.cc (revision 2267) +++ tests/core/other/graph_elt_window.cc (working copy) @@ -64,11 +64,11 @@ // Points associated to vertices. std::vector<p_t> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. mln::util::graph<p_t> g; Index: tests/core/other/graph_elt_neighborhood.cc --- tests/core/other/graph_elt_neighborhood.cc (revision 2267) +++ tests/core/other/graph_elt_neighborhood.cc (working copy) @@ -64,11 +64,11 @@ // Points associated to vertices. std::vector<p_t> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. mln::util::graph<p_t> g; Index: tests/core/other/point_set_compatibility.cc --- tests/core/other/point_set_compatibility.cc (revision 2267) +++ tests/core/other/point_set_compatibility.cc (working copy) @@ -50,11 +50,11 @@ // Points associated to vertices. std::vector<point2d> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. util::graph<point2d> g; Index: tests/core/other/pixter1d.cc --- tests/core/other/pixter1d.cc (revision 2267) +++ tests/core/other/pixter1d.cc (working copy) @@ -37,7 +37,7 @@ using namespace mln; { - box1d b(make::point1d(2), make::point1d(4)); + box1d b(point1d(2), point1d(4)); image1d<int> ima(b, 2); mln_pixter_(image1d<int>) p(ima); @@ -46,7 +46,7 @@ } { - box1d b(make::point1d(2), make::point1d(6)); + box1d b(point1d(2), point1d(6)); image1d<int> ima(b, 1); debug::iota(ima); Index: tests/core/other/pixter2d.cc --- tests/core/other/pixter2d.cc (revision 2267) +++ tests/core/other/pixter2d.cc (working copy) @@ -37,7 +37,7 @@ using namespace mln; { - box2d b(make::point2d(2, 1), make::point2d(4, 3)); + box2d b(point2d(2, 1), point2d(4, 3)); image2d<int> ima(b, 2); mln_pixter_(image2d<int>) p(ima); @@ -46,7 +46,7 @@ } { - box2d b(make::point2d(2, 1), make::point2d(6, 3)); + box2d b(point2d(2, 1), point2d(6, 3)); image2d<int> ima(b, 1); debug::iota(ima); Index: tests/core/other/pixter3d.cc --- tests/core/other/pixter3d.cc (revision 2267) +++ tests/core/other/pixter3d.cc (working copy) @@ -37,7 +37,7 @@ using namespace mln; { - box3d b(make::point3d(1,2, 1), make::point3d(2,4, 3)); + box3d b(point3d(1,2, 1), point3d(2,4, 3)); image3d<int> ima(b, 2); mln_pixter_(image3d<int>) p(ima); @@ -46,7 +46,7 @@ } { - box3d b(make::point3d(1,2, 1), make::point3d(3,6, 3)); + box3d b(point3d(1,2, 1), point3d(3,6, 3)); image3d<int> ima(b, 1); debug::iota(ima); Index: tests/core/other/line_graph_elt_window.cc --- tests/core/other/line_graph_elt_window.cc (revision 2267) +++ tests/core/other/line_graph_elt_window.cc (working copy) @@ -62,11 +62,11 @@ // Points associated to vertices. std::vector<p_t> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. mln::util::graph<p_t> g; Index: tests/core/other/line_graph_elt_neighborhood.cc --- tests/core/other/line_graph_elt_neighborhood.cc (revision 2267) +++ tests/core/other/line_graph_elt_neighborhood.cc (working copy) @@ -62,11 +62,11 @@ // Points associated to vertices. std::vector<p_t> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. mln::util::graph<p_t> g; Index: tests/core/other/dpoints_pixter.cc --- tests/core/other/dpoints_pixter.cc (revision 2267) +++ tests/core/other/dpoints_pixter.cc (working copy) @@ -86,7 +86,7 @@ I ima(6); win::segment1d seg(3); - point1d p = make::point1d(3); + point1d p = point1d(3); test_fill(ima, seg, 3); test_pixel(make::pixel(ima, p), seg); @@ -98,7 +98,7 @@ I ima(5, 5); win::rectangle2d rect(3, 3); - point2d p = make::point2d(1, 1); + point2d p = point2d(1, 1); test_fill(ima, rect, 3 * 3); test_pixel(make::pixel(ima, p), rect); @@ -110,7 +110,7 @@ I ima(3, 4, 5); win::cuboid3d cuboid(3, 3, 3); - point3d p = make::point3d(2, 1, 3); + point3d p = point3d(2, 1, 3); test_fill(ima, cuboid, 3 * 3 * 3); test_pixel(make::pixel(ima, p), cuboid); Index: tests/core/other/pixel.cc --- tests/core/other/pixel.cc (revision 2267) +++ tests/core/other/pixel.cc (working copy) @@ -45,13 +45,13 @@ I ima(3, 3); { - pixel pxl(ima, make::point2d(1, 1)); + pixel pxl(ima, point2d(1, 1)); pxl.val() = 51; mln_assertion(ima.at(1, 1) == 51); } { - pixel<const I> pxl(ima, make::point2d(1, 1)); + pixel<const I> pxl(ima, point2d(1, 1)); ima.at(1, 1) = 51; mln_assertion(unsigned(pxl) == 4); mln_assertion(pxl.val() == 51); Index: tests/core/other/line_piter.cc --- tests/core/other/line_piter.cc (revision 2267) +++ tests/core/other/line_piter.cc (working copy) @@ -44,7 +44,7 @@ /// Test with image 1d { - box1d b1(make::point1d(5), make::point1d(42)); + box1d b1(point1d(5), point1d(42)); image1d<int> f1(b1, border); image1d<int>::line_piter p1(f1.domain()); for_all(p1) @@ -57,7 +57,7 @@ /// Test with image 2d { - box2d b2(make::point2d(1,2), make::point2d(5,8)); + box2d b2(point2d(1,2), point2d(5,8)); image2d<int> f2(b2, border); image2d<int>::line_piter p2(f2.domain()); @@ -71,7 +71,7 @@ /// Test with image 3d { - box3d b3(make::point3d(1,2,3), make::point3d(5,8,7)); + box3d b3(point3d(1,2,3), point3d(5,8,7)); image3d<int> f3(b3, border); image3d<int>::line_piter p3(f3.domain()); Index: tests/core/image/graph_image_wst.cc --- tests/core/image/graph_image_wst.cc (revision 2267) +++ tests/core/image/graph_image_wst.cc (working copy) @@ -52,11 +52,11 @@ // Points associated to nodes. std::vector<point2d> points; - points.push_back(make::point2d(0,0)); // Point associated to node 0. - points.push_back(make::point2d(2,2)); // Point associated to node 1. - points.push_back(make::point2d(0,4)); // Point associated to node 2. - points.push_back(make::point2d(4,3)); // Point associated to node 3. - points.push_back(make::point2d(4,4)); // Point associated to node 4. + points.push_back(point2d(0,0)); // Point associated to node 0. + points.push_back(point2d(2,2)); // Point associated to node 1. + points.push_back(point2d(0,4)); // Point associated to node 2. + points.push_back(point2d(4,3)); // Point associated to node 3. + points.push_back(point2d(4,4)); // Point associated to node 4. // Edges. util::graph<point2d> g; Index: tests/core/image/plain.cc --- tests/core/image/plain.cc (revision 2267) +++ tests/core/image/plain.cc (working copy) @@ -60,7 +60,7 @@ ima = lena; - ima(make::point2d(0,0)) = 124; + ima(point2d(0,0)) = 124; mln_assertion(ima != lena); @@ -69,12 +69,12 @@ mln_assertion(ima == ima2); - ima(make::point2d(0,0)) = 124; + ima(point2d(0,0)) = 124; mln_assertion(ima != ima2); ima = ima2; - ima(make::point2d(0,0)) = 124; + ima(point2d(0,0)) = 124; mln_assertion(ima == ima2); } Index: tests/core/image/bgraph_image.cc --- tests/core/image/bgraph_image.cc (revision 2267) +++ tests/core/image/bgraph_image.cc (working copy) @@ -67,11 +67,11 @@ for (int i = 0; i < num_edges; ++i) boost::add_edge(edge_array[i].first, edge_array[i].second, g); - g[0] = make::point2d(0, 0); - g[1] = make::point2d(0, 1); - g[2] = make::point2d(1, 0); - g[3] = make::point2d(1, 1); - g[4] = make::point2d(0, 2); + g[0] = point2d(0, 0); + g[1] = point2d(0, 1); + g[2] = point2d(1, 0); + g[3] = point2d(1, 1); + g[4] = point2d(0, 2); /*------------------. | Boost Graph Image | Index: tests/core/image/decorated_image.cc --- tests/core/image/decorated_image.cc (revision 2267) +++ tests/core/image/decorated_image.cc (working copy) @@ -54,7 +54,7 @@ typedef image2d<int> I; I ima(1, 1); - point2d p = make::point2d(0, 0); + point2d p = point2d(0, 0); decorated_image< I, counter > ima_ = decorate(ima, counter()); ima_(p) = ima_(p) = 51; Index: tests/core/image/translate_image.cc --- tests/core/image/translate_image.cc (revision 2267) +++ tests/core/image/translate_image.cc (working copy) @@ -49,7 +49,7 @@ I ima (4, 2, 1); debug::iota (ima); - translate_image tmp (ima, make::dpoint2d (0,2)); + translate_image tmp (ima, dpoint2d (0,2)); std::cout << "orginal image domain : " << ima.domain () << std::endl Index: tests/core/image/graph_image.cc --- tests/core/image/graph_image.cc (revision 2267) +++ tests/core/image/graph_image.cc (working copy) @@ -65,11 +65,11 @@ // Points associated to vertices. std::vector<point2d> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. util::graph<point2d> g; Index: tests/core/image/value_enc_image.cc --- tests/core/image/value_enc_image.cc (revision 2267) +++ tests/core/image/value_enc_image.cc (working copy) @@ -72,14 +72,14 @@ p_runs_<point2d> pruns1; p_runs_<point2d> pruns2; - pruns0.insert(p_run<point2d>(make::point2d(0, 0), 2)); + pruns0.insert(p_run<point2d>(point2d(0, 0), 2)); - pruns1.insert(p_run<point2d>(make::point2d(2, 4), 7)); - pruns1.insert(p_run<point2d>(make::point2d(18, 42), 5)); - pruns1.insert(p_run<point2d>(make::point2d(50, 76), 2)); - pruns1.insert(p_run<point2d>(make::point2d(17,40), 6)); + pruns1.insert(p_run<point2d>(point2d(2, 4), 7)); + pruns1.insert(p_run<point2d>(point2d(18, 42), 5)); + pruns1.insert(p_run<point2d>(point2d(50, 76), 2)); + pruns1.insert(p_run<point2d>(point2d(17,40), 6)); - pruns2.insert(p_run<point2d>(make::point2d(10,10), 5)); + pruns2.insert(p_run<point2d>(point2d(10,10), 5)); ima_type ima; ima.insert(pruns0, 0); @@ -106,13 +106,13 @@ typedef value_enc_image<point2d, int> ima_type; ima_type ima; - ima.insert(p_run<point2d>(make::point2d(0, 0), 2), 0); - ima.insert(p_run<point2d>(make::point2d(10,10), 5), 2); + ima.insert(p_run<point2d>(point2d(0, 0), 2), 0); + ima.insert(p_run<point2d>(point2d(10,10), 5), 2); - ima.insert(p_run<point2d>(make::point2d(2, 4), 7), 1); - ima.insert(p_run<point2d>(make::point2d(18, 42), 5), 1); - ima.insert(p_run<point2d>(make::point2d(50, 76), 2), 1); - ima.insert(p_run<point2d>(make::point2d(17,40), 6), 1); + ima.insert(p_run<point2d>(point2d(2, 4), 7), 1); + ima.insert(p_run<point2d>(point2d(18, 42), 5), 1); + ima.insert(p_run<point2d>(point2d(50, 76), 2), 1); + ima.insert(p_run<point2d>(point2d(17,40), 6), 1); mln_piter_(ima_type) piter (ima.domain()); Index: tests/core/image/line_graph_image.cc --- tests/core/image/line_graph_image.cc (revision 2267) +++ tests/core/image/line_graph_image.cc (working copy) @@ -65,11 +65,11 @@ // Points associated to vertices. std::vector<point2d> points; - points.push_back(make::point2d(0,0)); // Point associated to vertex 0. - points.push_back(make::point2d(2,2)); // Point associated to vertex 1. - points.push_back(make::point2d(0,4)); // Point associated to vertex 2. - points.push_back(make::point2d(4,3)); // Point associated to vertex 3. - points.push_back(make::point2d(4,4)); // Point associated to vertex 4. + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. // Edges. util::graph<point2d> g; Index: tests/core/image/safe_image.cc --- tests/core/image/safe_image.cc (revision 2267) +++ tests/core/image/safe_image.cc (working copy) @@ -41,8 +41,8 @@ typedef image2d<int> I; I ima(1, 1); point2d - in = make::point2d(0, 0), - out = make::point2d(-999, -999); + in = point2d(0, 0), + out = point2d(-999, -999); { safe_image ima_ = safe(ima, 7); Index: tests/core/routine/clone.cc --- tests/core/routine/clone.cc (revision 2267) +++ tests/core/routine/clone.cc (working copy) @@ -57,13 +57,13 @@ { image2d<int> ima_ = clone(ima); std::cout << ima_.border() << std::endl; - ima_(make::point2d(1,1)) = 51; + ima_(point2d(1,1)) = 51; debug::println(ima); } { image2d<int> ima_( ima ); - ima_(make::point2d(1,1)) = 51; + ima_(point2d(1,1)) = 51; debug::println(ima); } Index: tests/core/alias/window3d.cc --- tests/core/alias/window3d.cc (revision 2267) +++ tests/core/alias/window3d.cc (working copy) @@ -46,9 +46,9 @@ mln_assertion(w.is_centered() == false); mln_assertion(w.is_symmetric() == true); - w.insert(make::dpoint3d(-1, -1, -1)); - w.insert(make::dpoint3d( 1, 1, 1)); - w.insert(make::dpoint3d( 0, 0, 2)); + w.insert(dpoint3d(-1, -1, -1)); + w.insert(dpoint3d( 1, 1, 1)); + w.insert(dpoint3d( 0, 0, 2)); image3d<bool> ima = convert::to_image(w); debug::println(ima); Index: tests/core/alias/point2d.cc --- tests/core/alias/point2d.cc (revision 2267) +++ tests/core/alias/point2d.cc (working copy) @@ -52,7 +52,7 @@ mln_assertion(p.col() == 1 && p[1] == 1); // construction - q = make::point2d(5, 1); + q = point2d(5, 1); mln_assertion(p == q); { point2d q_; Index: tests/core/alias/dpoint1d.cc --- tests/core/alias/dpoint1d.cc (revision 2267) +++ tests/core/alias/dpoint1d.cc (working copy) @@ -41,9 +41,9 @@ point1d p, q; dpoint1d dp; - p = make::point1d(1); - q = make::point1d(4); - dp = make::dpoint1d(3); + p = point1d(1); + q = point1d(4); + dp = dpoint1d(3); mln_assertion(dp == q - p); mln_assertion(q == p + dp); Index: tests/core/alias/dpoint2d.cc --- tests/core/alias/dpoint2d.cc (revision 2267) +++ tests/core/alias/dpoint2d.cc (working copy) @@ -41,9 +41,9 @@ point2d p, q; dpoint2d dp; - p = make::point2d(1, 2); - q = make::point2d(4, 7); - dp = make::dpoint2d(3, 5); + p = point2d(1, 2); + q = point2d(4, 7); + dp = dpoint2d(3, 5); mln_assertion(dp == q - p); mln_assertion(q == p + dp); Index: tests/core/alias/dpoint3d.cc --- tests/core/alias/dpoint3d.cc (revision 2267) +++ tests/core/alias/dpoint3d.cc (working copy) @@ -41,9 +41,9 @@ point3d p, q; dpoint3d dp; - p = make::point3d(2, 1, 4); - q = make::point3d(4, 7, 1); - dp = make::dpoint3d(2, 6, -3); + p = point3d(2, 1, 4); + q = point3d(4, 7, 1); + dp = dpoint3d(2, 6, -3); mln_assertion(dp == q - p); mln_assertion(q == p + dp); Index: tests/draw/graph.cc --- tests/draw/graph.cc (revision 2267) +++ tests/draw/graph.cc (working copy) @@ -94,8 +94,8 @@ // Points associated to nodes. points_type points; - points.push_back (make::point2d (0,0)); // Point associated to node 0. - points.push_back (make::point2d (2,2)); // Point associated to node 1. + points.push_back (point2d (0,0)); // Point associated to node 0. + points.push_back (point2d (2,2)); // Point associated to node 1. // Edges. edges_type edges; @@ -121,11 +121,11 @@ // Points associated to nodes. points_type points; - points.push_back (make::point2d (0,0)); // Point associated to node 0. - points.push_back (make::point2d (2,2)); // Point associated to node 1. - points.push_back (make::point2d (0,4)); // Point associated to node 2. - points.push_back (make::point2d (4,3)); // Point associated to node 3. - points.push_back (make::point2d (4,4)); // Point associated to node 4. + points.push_back (point2d (0,0)); // Point associated to node 0. + points.push_back (point2d (2,2)); // Point associated to node 1. + points.push_back (point2d (0,4)); // Point associated to node 2. + points.push_back (point2d (4,3)); // Point associated to node 3. + points.push_back (point2d (4,4)); // Point associated to node 4. // Edges. edges_type edges; Index: tests/draw/line.cc --- tests/draw/line.cc (revision 2267) +++ tests/draw/line.cc (working copy) @@ -46,7 +46,7 @@ { using namespace mln; - point2d b = make::point2d(0,0), e = make::point2d(6,9); + point2d b = point2d(0,0), e = point2d(6,9); line2d l(b, e); mln_assertion(l.nsites() == 10); Index: tests/level/memcpy_.cc --- tests/level/memcpy_.cc (revision 2267) +++ tests/level/memcpy_.cc (working copy) @@ -47,8 +47,8 @@ debug::iota(ima); point2d - src = make::point2d(0, 2), - dest = make::point2d(1, 2); + src = point2d(0, 2), + dest = point2d(1, 2); level::memcpy_(inplace(make::pixel(ima, dest)), make::pixel(ima, src), Index: tests/level/paste.cc --- tests/level/paste.cc (revision 2267) +++ tests/level/paste.cc (working copy) @@ -48,11 +48,11 @@ // tests in two dimension { - box2d b(make::point2d(1,2), make::point2d(2,4)); + box2d b(point2d(1,2), point2d(2,4)); image2d<int> ima(b, 2); debug::iota(ima); - box2d b2(make::point2d(-1,-2), make::point2d(3,6)); + box2d b2(point2d(-1,-2), point2d(3,6)); image2d<int> ima2(b2, 0); debug::iota(ima2); @@ -65,11 +65,11 @@ // tests in three dimension { - box3d b(make::point3d(1,2, 1), make::point3d(2,4, 3)); + box3d b(point3d(1,2, 1), point3d(2,4, 3)); image3d<int> ima(b, 2); debug::iota(ima); - box3d b2(make::point3d(-1,-2, -1), make::point3d(3,6, 3)); + box3d b2(point3d(-1,-2, -1), point3d(3,6, 3)); image3d<int> ima2(b2, 2); debug::iota(ima2); Index: tests/level/memset_.cc --- tests/level/memset_.cc (revision 2267) +++ tests/level/memset_.cc (working copy) @@ -43,7 +43,7 @@ image2d<int> ima(3, 3); level::fill(ima, 0); int X = 9; - level::memset_(ima, make::point2d(0,0), + level::memset_(ima, point2d(0,0), X, geom::ncols(ima) + 2 * ima.border() + 1); // ^ Index: tests/linear/local/convolve.cc --- tests/linear/local/convolve.cc (revision 2267) +++ tests/linear/local/convolve.cc (working copy) @@ -54,7 +54,7 @@ image2d<int_u8> ima(size, size); debug::iota(ima); - point2d p = make::point2d(1,1); + point2d p = point2d(1,1); w_window2d_int w_win = make::w_window(win::rectangle2d(size, size), pw::cst(1)); Index: tests/accu/bbox.cc --- tests/accu/bbox.cc (revision 2267) +++ tests/accu/bbox.cc (working copy) @@ -41,10 +41,10 @@ using namespace mln; accu::bbox<point2d> accu; - accu.take_as_init(make::point2d(0,0)); - accu.take(make::point2d(0,5)); - accu.take(make::point2d(5,0)); - accu.take(make::point2d(5,5)); + accu.take_as_init(point2d(0,0)); + accu.take(point2d(0,5)); + accu.take(point2d(5,0)); + accu.take(point2d(5,5)); mln_assertion(accu.to_result() == make::box2d(0,0,5,5)); } Index: tests/value/stack.cc --- tests/value/stack.cc (revision 2267) +++ tests/value/stack.cc (working copy) @@ -43,7 +43,7 @@ box2d b = make::box2d(2, 2); image2d<int> ima5(b), ima1(b); - point2d p = make::point2d(0, 0); + point2d p = point2d(0, 0); algebra::vec<2, int> v = make::vec(5, 1); value::stack(ima5, ima1)(p) = v; @@ -54,7 +54,7 @@ value::stack_image<2, image2d<int> > s2; - p = make::point2d(1, 1); + p = point2d(1, 1); s2 = s1; s2(p) = v; mln_assertion(s1(p) == v); Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2267) +++ tests/convert/to_p_array.cc (working copy) @@ -44,7 +44,7 @@ using namespace mln; typedef p_array<point1d> vec1d; - point1d p1 = make::point1d(6); + point1d p1 = point1d(6); win::segment1d win1d(5); vec1d v1(convert::to_p_array(win1d, p1)); @@ -54,7 +54,7 @@ std::cout << "\n"; typedef p_array<point2d> vec2d; - point2d p2 = make::point2d(10,10); + point2d p2 = point2d(10,10); win::rectangle2d win2d(3, 3); vec2d v2(convert::to_p_array(win2d, p2)); Index: tests/convert/to_image.cc --- tests/convert/to_image.cc (revision 2267) +++ tests/convert/to_image.cc (working copy) @@ -58,7 +58,7 @@ 1, 0, 1 }; image2d<bool> ima_X = convert::to_image(box_3x3 | fun::p2b::chess, 0); - window2d win_X = make::window2d(X); + window2d win_X = convert::to<window2d>(X); mln_assertion(convert::to_image(win_X) == ima_X); // FIXME: nbh! Index: tests/geom/sym.cc --- tests/geom/sym.cc (revision 2267) +++ tests/geom/sym.cc (working copy) @@ -38,17 +38,17 @@ window2d win, win2; - win.insert(make::dpoint2d(0,0)); - win.insert(make::dpoint2d(1,2)); - win.insert(make::dpoint2d(3,4)); - win.insert(make::dpoint2d(5,6)); - win.insert(make::dpoint2d(7,8)); + win.insert(dpoint2d(0,0)); + win.insert(dpoint2d(1,2)); + win.insert(dpoint2d(3,4)); + win.insert(dpoint2d(5,6)); + win.insert(dpoint2d(7,8)); - win2.insert(make::dpoint2d(0,0)); - win2.insert(make::dpoint2d(-1,-2)); - win2.insert(make::dpoint2d(-3,-4)); - win2.insert(make::dpoint2d(-5,-6)); - win2.insert(make::dpoint2d(-7,-8)); + win2.insert(dpoint2d(0,0)); + win2.insert(dpoint2d(-1,-2)); + win2.insert(dpoint2d(-3,-4)); + win2.insert(dpoint2d(-5,-6)); + win2.insert(dpoint2d(-7,-8)); mln_assertion(geom::sym(win) == win2); } Index: tests/geom/shift.cc --- tests/geom/shift.cc (revision 2267) +++ tests/geom/shift.cc (working copy) @@ -38,17 +38,17 @@ window2d win, win2; - win.insert(make::dpoint2d(0,0)); - win.insert(make::dpoint2d(1,2)); - win.insert(make::dpoint2d(3,4)); - win.insert(make::dpoint2d(5,6)); - win.insert(make::dpoint2d(7,8)); + win.insert(dpoint2d(0,0)); + win.insert(dpoint2d(1,2)); + win.insert(dpoint2d(3,4)); + win.insert(dpoint2d(5,6)); + win.insert(dpoint2d(7,8)); - win2.insert(make::dpoint2d(2,2)); - win2.insert(make::dpoint2d(3,4)); - win2.insert(make::dpoint2d(5,6)); - win2.insert(make::dpoint2d(7,8)); - win2.insert(make::dpoint2d(9,10)); + win2.insert(dpoint2d(2,2)); + win2.insert(dpoint2d(3,4)); + win2.insert(dpoint2d(5,6)); + win2.insert(dpoint2d(7,8)); + win2.insert(dpoint2d(9,10)); mln_assertion(geom::shift(win, dp) == win2); } Index: tests/geom/pmin_pmax.cc --- tests/geom/pmin_pmax.cc (revision 2267) +++ tests/geom/pmin_pmax.cc (working copy) @@ -37,14 +37,14 @@ p_set<point2d> p; point2d min, max; - p.insert(make::point2d(0,0)); - p.insert(make::point2d(-1,2)); - p.insert(make::point2d(-3,4)); - p.insert(make::point2d(7,6)); - p.insert(make::point2d(5,8)); + p.insert(point2d(0,0)); + p.insert(point2d(-1,2)); + p.insert(point2d(-3,4)); + p.insert(point2d(7,6)); + p.insert(point2d(5,8)); geom::pmin_pmax(p, min, max); - mln_assertion(min == (make::point2d(-3 ,0))); - mln_assertion(max == (make::point2d( 7 ,8))); + mln_assertion(min == (point2d(-3 ,0))); + mln_assertion(max == (point2d( 7 ,8))); } Index: tests/geom/bbox.cc --- tests/geom/bbox.cc (revision 2267) +++ tests/geom/bbox.cc (working copy) @@ -36,10 +36,10 @@ using namespace mln; p_set<point2d> s; - s.insert(make::point2d(0,0)); - s.insert(make::point2d(0,5)); - s.insert(make::point2d(5,0)); - s.insert(make::point2d(5,5)); + s.insert(point2d(0,0)); + s.insert(point2d(0,5)); + s.insert(point2d(5,0)); + s.insert(point2d(5,5)); mln_assertion(geom::bbox(s) == make::box2d(0,0,5,5)); } Index: tests/morpho/artificial_line_graph_image_wst.cc --- tests/morpho/artificial_line_graph_image_wst.cc (revision 2267) +++ tests/morpho/artificial_line_graph_image_wst.cc (working copy) @@ -168,10 +168,10 @@ // Process points on odd rows and odd columns if (p_out[0] % 2 == 1 && p_out[1] % 2 == 1) output(p_out) = - (output(p_out + make::dpoint2d(-1, -1)) + - output(p_out + make::dpoint2d(-1, +1)) + - output(p_out + make::dpoint2d(+1, -1)) + - output(p_out + make::dpoint2d(+1, +1))) / 4; + (output(p_out + dpoint2d(-1, -1)) + + output(p_out + dpoint2d(-1, +1)) + + output(p_out + dpoint2d(+1, -1)) + + output(p_out + dpoint2d(+1, +1))) / 4; } // Draw the watershed. /* FIXME: We should draw the watershed on another image and Index: tests/morpho/line_graph_image_wst.cc --- tests/morpho/line_graph_image_wst.cc (revision 2267) +++ tests/morpho/line_graph_image_wst.cc (working copy) @@ -71,15 +71,15 @@ std::vector<int> vertex_values; // We don't really care about values on vertices, because the algorithm // won't see them. So all are set to 0. - g.add_vertex (make::point2d(0, 0)); vertex_values.push_back (0); // Vertex 0. - g.add_vertex (make::point2d(0, 1)); vertex_values.push_back (0); // Vertex 1. - g.add_vertex (make::point2d(0, 2)); vertex_values.push_back (0); // Vertex 2. - g.add_vertex (make::point2d(0, 3)); vertex_values.push_back (0); // Vertex 3. - - g.add_vertex (make::point2d(1, 0)); vertex_values.push_back (0); // Vertex 4. - g.add_vertex (make::point2d(1, 1)); vertex_values.push_back (0); // Vertex 5. - g.add_vertex (make::point2d(1, 2)); vertex_values.push_back (0); // Vertex 6. - g.add_vertex (make::point2d(1, 3)); vertex_values.push_back (0); // Vertex 7. + g.add_vertex (point2d(0, 0)); vertex_values.push_back (0); // Vertex 0. + g.add_vertex (point2d(0, 1)); vertex_values.push_back (0); // Vertex 1. + g.add_vertex (point2d(0, 2)); vertex_values.push_back (0); // Vertex 2. + g.add_vertex (point2d(0, 3)); vertex_values.push_back (0); // Vertex 3. + + g.add_vertex (point2d(1, 0)); vertex_values.push_back (0); // Vertex 4. + g.add_vertex (point2d(1, 1)); vertex_values.push_back (0); // Vertex 5. + g.add_vertex (point2d(1, 2)); vertex_values.push_back (0); // Vertex 6. + g.add_vertex (point2d(1, 3)); vertex_values.push_back (0); // Vertex 7. // Edges. std::vector<int> edge_values; Index: tests/morpho/thinning.cc --- tests/morpho/thinning.cc (revision 2267) +++ tests/morpho/thinning.cc (working copy) @@ -54,12 +54,12 @@ bool fg[] = { 0, 0, 0, 0, 1, 0, 0, 0, 0 }; - window2d win_fg = make::window2d(fg); + window2d win_fg = convert::to<window2d>(fg); bool bg[] = { 0, 0, 0, 1, 0, 1, 0, 0, 0 }; - window2d win_bg = make::window2d(bg); + window2d win_bg = convert::to<window2d>(bg); border::thickness = 2; Index: tests/morpho/hit_or_miss.cc --- tests/morpho/hit_or_miss.cc (revision 2267) +++ tests/morpho/hit_or_miss.cc (working copy) @@ -53,7 +53,7 @@ using value::int_u8; window2d win_hit = geom::shift(win::rectangle2d(3, 3), - make::dpoint2d(+1, +1)); + dpoint2d(+1, +1)); window2d win_miss = mln::set::diff(win::rectangle2d(5, 5), win_hit); { @@ -62,7 +62,7 @@ 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1 }; - window2d win_hit_ = make::window2d(hit); + window2d win_hit_ = convert::to<window2d>(hit); mln_precondition(win_hit_ == win_hit); bool miss[] = { 1, 1, 1, 1, 1, @@ -70,7 +70,7 @@ 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0 }; - window2d win_miss_ = make::window2d(miss); + window2d win_miss_ = convert::to<window2d>(miss); mln_precondition(win_miss_ == win_miss); } Index: tests/morpho/combined.cc --- tests/morpho/combined.cc (revision 2267) +++ tests/morpho/combined.cc (working copy) @@ -70,7 +70,7 @@ // { 0, 1, 0, // 0, 1, 0, // 1, 0, 0 }; -// window2d win = make::window2d(w); +// window2d win = convert::to<window2d>(w); // std::cout << win << std::endl; // std::cout << c8() << std::endl; Index: tests/morpho/lena_line_graph_image_wst1.cc --- tests/morpho/lena_line_graph_image_wst1.cc (revision 2267) +++ tests/morpho/lena_line_graph_image_wst1.cc (working copy) @@ -204,10 +204,10 @@ // Process points on odd rows and odd columns if (p_out[0] % 2 == 1 && p_out[1] % 2 == 1) output(p_out) = - (output(p_out + make::dpoint2d(-1, -1)) + - output(p_out + make::dpoint2d(-1, +1)) + - output(p_out + make::dpoint2d(+1, -1)) + - output(p_out + make::dpoint2d(+1, +1))) / 4; + (output(p_out + dpoint2d(-1, -1)) + + output(p_out + dpoint2d(-1, +1)) + + output(p_out + dpoint2d(+1, -1)) + + output(p_out + dpoint2d(+1, +1))) / 4; } // Draw the watershed. /* FIXME: We should draw the watershed on another image and Index: tests/morpho/lena_line_graph_image_wst2.cc --- tests/morpho/lena_line_graph_image_wst2.cc (revision 2267) +++ tests/morpho/lena_line_graph_image_wst2.cc (working copy) @@ -164,10 +164,10 @@ // Process points on odd rows and odd columns if (p_out[0] % 2 == 1 && p_out[1] % 2 == 1) output(p_out) = - (output(p_out + make::dpoint2d(-1, -1)) + - output(p_out + make::dpoint2d(-1, +1)) + - output(p_out + make::dpoint2d(+1, -1)) + - output(p_out + make::dpoint2d(+1, +1))) / 4; + (output(p_out + dpoint2d(-1, -1)) + + output(p_out + dpoint2d(-1, +1)) + + output(p_out + dpoint2d(+1, -1)) + + output(p_out + dpoint2d(+1, +1))) / 4; } // Draw the watershed. /* FIXME: We should draw the watershed on another image and Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2267) +++ apps/statues/mesh-segm.cc (working copy) @@ -42,7 +42,7 @@ #include <mln/value/rgb8.hh> #include <mln/core/alias/point3d.hh> -#include <mln/make/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/util/graph.hh> #include <mln/core/image/line_graph_image.hh> @@ -122,7 +122,7 @@ mln::util::graph<mln::point3d> g; // Populate the graph with vertices. for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::make::point3d(i, i, i)); + g.add_vertex (mln::point3d(i, i, i)); // Populate the graph with edges. mesh.need_across_edge(); Index: apps/statues/mesh-skel.cc --- apps/statues/mesh-skel.cc (revision 2267) +++ apps/statues/mesh-skel.cc (working copy) @@ -42,7 +42,7 @@ #include <mln/value/rgb8.hh> #include <mln/core/alias/point3d.hh> -#include <mln/make/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/util/graph.hh> #include <mln/core/image/graph_image.hh> @@ -127,7 +127,7 @@ mln::util::graph<mln::point3d> g; // Populate the graph with vertices. for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::make::point3d(i, i, i)); + g.add_vertex (mln::point3d(i, i, i)); // Populate the graph with edges. mesh.need_across_edge(); Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2267) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -21,8 +21,8 @@ image2d<char> ima(6, 11); level::fill(ima, '.'); - p_line2d line(make::point2d(4,10), - make::point2d(1,1)); + p_line2d line(point2d(4,10), + point2d(1,1)); std::cout << line << std::endl; level::fill(inplace(ima | line), 'x'); Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 2267) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -70,7 +70,7 @@ mln_piter_(Arr2) p(arr2); for_all(p) { - mln_assertion(make::point2d(p.row(), p.col()) == p); + mln_assertion(point2d(p.row(), p.col()) == p); std::cout << "point " << p << ": #" << index_of_in(p, arr2) << " in arr2, #" << index_of_in(p, arr1) << " in arr1" << std::endl; Index: doc/tutorial/examples/image_plain.cc --- doc/tutorial/examples/image_plain.cc (revision 2267) +++ doc/tutorial/examples/image_plain.cc (working copy) @@ -17,7 +17,7 @@ { for (unsigned col = 0; col < ima.ncols(); ++col) for (unsigned c = 0; c < nc; ++c) - std::cout << ima.at(row, col)(make::point2d(r,c)) << ' '; + std::cout << ima.at(row, col)(point2d(r,c)) << ' '; std::cout << std::endl; } } Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2267) +++ doc/tutorial/examples/window.cc (working copy) @@ -59,8 +59,8 @@ bool b2[3][3] = { { 1, 1, 0 }, { 1, 0, 0 }, { 0, 0, 0 } }; - mln_assertion(make::window2d(b) == make::window2d(b2)); - mln_assertion(make::window2d(b) == win); + mln_assertion(convert::to<window2d>(b) == convert::to<window2d>(b2)); + mln_assertion(convert::to<window2d>(b) == win); } { Index: doc/tutorial/examples/win_multiple.cc --- doc/tutorial/examples/win_multiple.cc (revision 2267) +++ doc/tutorial/examples/win_multiple.cc (working copy) @@ -7,6 +7,7 @@ # include <mln/debug/println.hh> # include <mln/core/alias/neighb2d.hh> +# include <mln/convert/to.hh> @@ -50,12 +51,15 @@ bool vert[] = { 0, 1, 0, 0, 0, 0, 0, 1, 0 }; - w.set_window(0, make::window2d(vert)); - bool horiz[] = { 0, 0, 0, - 1, 0, 1, - 0, 0, 0 }; - w.set_window(1, make::window2d(horiz)); - mln_assertion(w.size() == 2); - browse(ima, w); + convert::to<window2d>(vert); + +// w.set_window(0, convert::to<window2d>(vert)); +// bool horiz[] = { 0, 0, 0, +// 1, 0, 1, +// 0, 0, 0 }; +// w.set_window(1, convert::to<window2d>(horiz)); +// mln_assertion(w.size() == 2); + +// browse(ima, w); } Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2267) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -17,8 +17,8 @@ level::fill(ima, 0); safe_image ima_(ima); - level::paste(pw::cst(8) | p_line2d(make::point2d(-1,-1), - make::point2d( 3, 3)), + level::paste(pw::cst(8) | p_line2d(point2d(-1,-1), + point2d( 3, 3)), ima_); debug::println(ima); } Index: doc/tutorial/examples/proxy.cc --- doc/tutorial/examples/proxy.cc (revision 2267) +++ doc/tutorial/examples/proxy.cc (working copy) @@ -81,7 +81,7 @@ // mln_piter_(Arr2) p(arr2); // for_all(p) // { -// mln_assertion(make::point2d(p.row(), p.col()) == p); +// mln_assertion(point2d(p.row(), p.col()) == p); // std::cout << "point " << p << ": #" // << index_of_in(p, arr2) << " in arr2, #" // << index_of_in(p, arr1) << " in arr1" << std::endl; Index: mln/core/site_set/line2d.hh --- mln/core/site_set/line2d.hh (revision 2267) +++ mln/core/site_set/line2d.hh (working copy) @@ -186,7 +186,7 @@ int e = ddrow - dcol; for (int i = 0; i < dcol; ++i) { - arr_.append(make::point2d(row, col)); + arr_.append(point2d(row, col)); while (e >= 0) { row += srow; @@ -201,7 +201,7 @@ int e = ddcol - drow; for (int i = 0; i < drow; ++i) { - arr_.append(make::point2d(row, col)); + arr_.append(point2d(row, col)); while (e >= 0) { col += scol; @@ -212,13 +212,13 @@ } } if (! is_end_excluded) - arr_.append(make::point2d(row, col)); + arr_.append(point2d(row, col)); // Compute bb_. point2d end_ = arr_[arr_.nsites() - 1]; - bb_.pmin() = make::point2d(math::min(beg.row(), end_.row()), + bb_.pmin() = point2d(math::min(beg.row(), end_.row()), math::min(beg.col(), end_.col())); - bb_.pmax() = make::point2d(math::max(beg.row(), end_.row()), + bb_.pmax() = point2d(math::max(beg.row(), end_.row()), math::max(beg.col(), end_.col())); mln_postcondition(this->begin() == beg); Index: mln/core/image/hexa.hh --- mln/core/image/hexa.hh (revision 2267) +++ mln/core/image/hexa.hh (working copy) @@ -235,7 +235,7 @@ { mln_precondition(this->has_data()); mln_precondition(this->has(p)); - return this->data_->ima_(make::point2d(p[0] / 2, p[1] / 2)); + return this->data_->ima_(point2d(p[0] / 2, p[1] / 2)); } template <typename I> @@ -245,7 +245,7 @@ { mln_precondition(this->has_data()); mln_precondition(this->has(p)); - return this->data_->ima_(make::point2d(p[0] / 2, p[1] / 2)); + return this->data_->ima_(point2d(p[0] / 2, p[1] / 2)); } template <typename I> @@ -263,7 +263,7 @@ hexa::has(const psite& p) const { mln_precondition(this->has_data()); - return this->data_->ima_.has(make::point2d(p[0] / 2, p[1] / 2)); + return this->data_->ima_.has(point2d(p[0] / 2, p[1] / 2)); } Index: mln/core/image/image1d.hh --- mln/core/image/image1d.hh (revision 2267) +++ mln/core/image/image1d.hh (working copy) @@ -425,7 +425,7 @@ const T& image1d<T>::at(int index) const { - mln_precondition(this->has(make::point1d(index))); + mln_precondition(this->has(point1d(index))); return this->data_->array_[index]; } @@ -434,7 +434,7 @@ T& image1d<T>::at(int index) { - mln_precondition(this->has(make::point1d(index))); + mln_precondition(this->has(point1d(index))); return this->data_->array_[index]; } @@ -444,7 +444,7 @@ const T& image1d<T>::element(unsigned ind) const { - mln_precondition(this->has(make::point1d(ind))); + mln_precondition(this->has(point1d(ind))); return this->data_->array_[ind]; } @@ -453,7 +453,7 @@ T& image1d<T>::element(unsigned ind) { - mln_precondition(this->has(make::point1d(ind))); + mln_precondition(this->has(point1d(ind))); return this->data_->array_[ind]; } @@ -491,7 +491,7 @@ image1d<T>::point_at_index(unsigned i) const { mln_precondition(i < nelements()); - point1d p = make::point1d(i + this->data_->vb_.min_ind()); + point1d p = point1d(i + this->data_->vb_.min_ind()); mln_postcondition(& this->operator()(p) == this->data_->buffer_ + i); return p; } Index: mln/core/image/fi_adaptor.hh --- mln/core/image/fi_adaptor.hh (revision 2267) +++ mln/core/image/fi_adaptor.hh (working copy) @@ -353,7 +353,7 @@ const mln_value(I)& fi_adaptor::at(int row, int col) const { - mln_precondition(this->has(make::point2d(row, col))); + mln_precondition(this->has(point2d(row, col))); // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - row][col]; @@ -363,7 +363,7 @@ mln_value(I)& fi_adaptor::at(int row, int col) { - mln_precondition(this->has(make::point2d(row, col))); + mln_precondition(this->has(point2d(row, col))); // Because Freeimage stores lena upside down. return this->data_->array_[this->domain().len(0) - 1 - row][col]; @@ -399,7 +399,7 @@ fi_adaptor::point_at_index(unsigned o) const { mln_precondition(o < nelements()); - point2d p = make::point2d(this->data_->b_.max_row() - o / this->data_->b_.len(1) - this->data_->b_.min_row(), + point2d p = point2d(this->data_->b_.max_row() - o / this->data_->b_.len(1) - this->data_->b_.min_row(), o % this->data_->b_.len(1) + this->data_->b_.min_col()); mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); Index: mln/core/image/image2d.hh --- mln/core/image/image2d.hh (revision 2267) +++ mln/core/image/image2d.hh (working copy) @@ -462,7 +462,7 @@ const T& image2d<T>::at(int row, int col) const { - mln_precondition(this->has(make::point2d(row, col))); + mln_precondition(this->has(point2d(row, col))); return this->data_->array_[row][col]; } @@ -471,7 +471,7 @@ T& image2d<T>::at(int row, int col) { - mln_precondition(this->has(make::point2d(row, col))); + mln_precondition(this->has(point2d(row, col))); return this->data_->array_[row][col]; } @@ -566,7 +566,7 @@ image2d<T>::point_at_index(unsigned i) const { mln_precondition(i < nelements()); - point2d p = make::point2d(i / this->data_->vb_.len(1) + this->data_->vb_.min_row(), + point2d p = point2d(i / this->data_->vb_.len(1) + this->data_->vb_.min_row(), i % this->data_->vb_.len(1) + this->data_->vb_.min_col()); mln_postcondition(& this->operator()(p) == this->data_->buffer_ + i); return p; Index: mln/core/image/image3d.hh --- mln/core/image/image3d.hh (revision 2267) +++ mln/core/image/image3d.hh (working copy) @@ -479,7 +479,7 @@ const T& image3d<T>::at(int sli, int row, int col) const { - mln_precondition(this->has(make::point3d(sli, row, col))); + mln_precondition(this->has(point3d(sli, row, col))); return data_->array_[sli][row][col]; } @@ -488,7 +488,7 @@ T& image3d<T>::at(int sli, int row, int col) { - mln_precondition(this->has(make::point3d(sli, row, col))); + mln_precondition(this->has(point3d(sli, row, col))); return data_->array_[sli][row][col]; } @@ -526,7 +526,7 @@ image3d<T>::point_at_index(unsigned o) const { mln_precondition(o < nelements()); - point3d p = make::point3d(o / (data_->vb_.len(1) * data_->vb_.len(2)) + data_->vb_.min_sli(), + point3d p = point3d(o / (data_->vb_.len(1) * data_->vb_.len(2)) + data_->vb_.min_sli(), (o % (data_->vb_.len(1) * data_->vb_.len(2))) / data_->vb_.len(2) + data_->vb_.min_row(), o % data_->vb_.len(2) + data_->vb_.min_col()); mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); Index: mln/core/routine/exact.hh --- mln/core/routine/exact.hh (revision 2267) +++ mln/core/routine/exact.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -37,6 +37,7 @@ /// FIXME: Doc! #define mln_exact(T) typename mln::internal::exact_<T>::ret +#define mln_exact_(T) mln::internal::exact_<T>::ret Index: mln/core/alias/neighb1d.hh --- mln/core/alias/neighb1d.hh (revision 2267) +++ mln/core/alias/neighb1d.hh (working copy) @@ -66,7 +66,7 @@ static neighb1d it; if (flower) { - it.insert(make::dpoint1d(+1)); + it.insert(dpoint1d(+1)); flower = false; } return it; Index: mln/core/alias/dpoint1d.hh --- mln/core/alias/dpoint1d.hh (revision 2267) +++ mln/core/alias/dpoint1d.hh (working copy) @@ -51,7 +51,6 @@ } // end of namespace mln -# include <mln/make/dpoint1d.hh> # include <mln/core/alias/point1d.hh> @@ -63,8 +62,8 @@ * \{ */ - const dpoint1d before = make::dpoint1d( -1 ); - const dpoint1d after = make::dpoint1d( +1 ); + const dpoint1d before = dpoint1d( -1 ); + const dpoint1d after = dpoint1d( +1 ); const dpoint1d ind_dec = before; const dpoint1d ind_inc = after; Index: mln/core/alias/neighb3d.hh --- mln/core/alias/neighb3d.hh (revision 2267) +++ mln/core/alias/neighb3d.hh (working copy) @@ -111,9 +111,9 @@ static neighb3d it; if (flower) { - it.insert(make::dpoint3d(+1, 0, 0)); - it.insert(make::dpoint3d(0, +1, 0)); - it.insert(make::dpoint3d(0, 0, +1)); + it.insert(dpoint3d(+1, 0, 0)); + it.insert(dpoint3d(0, +1, 0)); + it.insert(dpoint3d(0, 0, +1)); flower = false; } return it; @@ -126,16 +126,16 @@ static neighb3d it; if (flower) { - it.insert(make::dpoint3d(+1, 0, 0)); - it.insert(make::dpoint3d(0, +1, 0)); - it.insert(make::dpoint3d(0, 0, +1)); - - it.insert(make::dpoint3d(+1, 0, +1)); - it.insert(make::dpoint3d(+1, 0, -1)); - it.insert(make::dpoint3d(0, +1, +1)); - it.insert(make::dpoint3d(0, +1, -1)); - it.insert(make::dpoint3d(+1, +1, 0)); - it.insert(make::dpoint3d(+1, -1, 0)); + it.insert(dpoint3d(+1, 0, 0)); + it.insert(dpoint3d(0, +1, 0)); + it.insert(dpoint3d(0, 0, +1)); + + it.insert(dpoint3d(+1, 0, +1)); + it.insert(dpoint3d(+1, 0, -1)); + it.insert(dpoint3d(0, +1, +1)); + it.insert(dpoint3d(0, +1, -1)); + it.insert(dpoint3d(+1, +1, 0)); + it.insert(dpoint3d(+1, -1, 0)); flower = false; } @@ -149,21 +149,21 @@ static neighb3d it; if (flower) { - it.insert(make::dpoint3d(+1, 0, 0)); - it.insert(make::dpoint3d(0, +1, 0)); - it.insert(make::dpoint3d(0, 0, +1)); - - it.insert(make::dpoint3d(+1, 0, +1)); - it.insert(make::dpoint3d(+1, 0, -1)); - it.insert(make::dpoint3d(0, +1, +1)); - it.insert(make::dpoint3d(0, +1, -1)); - it.insert(make::dpoint3d(+1, +1, 0)); - it.insert(make::dpoint3d(+1, -1, 0)); - - it.insert(make::dpoint3d(+1, +1, +1)); - it.insert(make::dpoint3d(+1, +1, -1)); - it.insert(make::dpoint3d(+1, -1, +1)); - it.insert(make::dpoint3d(+1, -1, -1)); + it.insert(dpoint3d(+1, 0, 0)); + it.insert(dpoint3d(0, +1, 0)); + it.insert(dpoint3d(0, 0, +1)); + + it.insert(dpoint3d(+1, 0, +1)); + it.insert(dpoint3d(+1, 0, -1)); + it.insert(dpoint3d(0, +1, +1)); + it.insert(dpoint3d(0, +1, -1)); + it.insert(dpoint3d(+1, +1, 0)); + it.insert(dpoint3d(+1, -1, 0)); + + it.insert(dpoint3d(+1, +1, +1)); + it.insert(dpoint3d(+1, +1, -1)); + it.insert(dpoint3d(+1, -1, +1)); + it.insert(dpoint3d(+1, -1, -1)); flower = false; } return it; Index: mln/core/alias/dpoint2d.hh --- mln/core/alias/dpoint2d.hh (revision 2267) +++ mln/core/alias/dpoint2d.hh (working copy) @@ -50,7 +50,6 @@ } // end of namespace mln -# include <mln/make/dpoint2d.hh> # include <mln/core/alias/point2d.hh> @@ -61,10 +60,10 @@ * \brief Definition of a shortcut for delta point in 2d. * \{ */ - const dpoint2d up = make::dpoint2d( -1, 0 ); - const dpoint2d down = make::dpoint2d( +1, 0 ); - const dpoint2d left = make::dpoint2d( 0, -1 ); - const dpoint2d right = make::dpoint2d( 0, +1 ); + const dpoint2d up = dpoint2d( -1, 0 ); + const dpoint2d down = dpoint2d( +1, 0 ); + const dpoint2d left = dpoint2d( 0, -1 ); + const dpoint2d right = dpoint2d( 0, +1 ); /*! * \} Index: mln/core/alias/dpoint3d.hh --- mln/core/alias/dpoint3d.hh (revision 2267) +++ mln/core/alias/dpoint3d.hh (working copy) @@ -50,7 +50,6 @@ } // end of namespace mln -# include <mln/make/dpoint3d.hh> # include <mln/core/alias/point3d.hh> @@ -61,12 +60,12 @@ * \brief Definition of a shortcut for delta point in 3d. * \{ */ - const dpoint3d sagittal_dec = make::dpoint3d( 0, 0, -1); - const dpoint3d sagittal_inc = make::dpoint3d( 0, 0, +1); - const dpoint3d axial_dec = make::dpoint3d( 0, -1, 0); - const dpoint3d axial_inc = make::dpoint3d( 0, +1, 0); - const dpoint3d coronal_dec = make::dpoint3d(-1, 0, 0); - const dpoint3d coronal_inc = make::dpoint3d(+1, 0, 0); + const dpoint3d sagittal_dec = dpoint3d( 0, 0, -1); + const dpoint3d sagittal_inc = dpoint3d( 0, 0, +1); + const dpoint3d axial_dec = dpoint3d( 0, -1, 0); + const dpoint3d axial_inc = dpoint3d( 0, +1, 0); + const dpoint3d coronal_dec = dpoint3d(-1, 0, 0); + const dpoint3d coronal_inc = dpoint3d(+1, 0, 0); /*! * \} Index: mln/core/alias/dpoint2d_h.hh --- mln/core/alias/dpoint2d_h.hh (revision 2267) +++ mln/core/alias/dpoint2d_h.hh (working copy) @@ -58,10 +58,10 @@ { // FIXME: Doc! - const dpoint2d_h up_h = make::dpoint2d_h( -1, 0 ); - const dpoint2d_h down_h = make::dpoint2d_h( +1, 0 ); - const dpoint2d_h left_h = make::dpoint2d_h( 0, -1 ); - const dpoint2d_h right_h = make::dpoint2d_h( 0, +1 ); + const dpoint2d_h up_h = dpoint2d_h( -1, 0 ); + const dpoint2d_h down_h = dpoint2d_h( +1, 0 ); + const dpoint2d_h left_h = dpoint2d_h( 0, -1 ); + const dpoint2d_h right_h = dpoint2d_h( 0, +1 ); } // end of namespace mln Index: mln/core/alias/window1d.hh --- mln/core/alias/window1d.hh (revision 2267) +++ mln/core/alias/window1d.hh (working copy) @@ -44,10 +44,48 @@ typedef window<mln::dpoint1d> window1d; -} // end of namespace mln + namespace convert + { + namespace impl + { + + template <unsigned M> + void from_to_(bool const (&values)[M], window1d& win); + + } // end of namespace mln::convert::impl + + } // end of namespace mln::convert + + + +# ifndef MLN_INCLUDE_ONLY + namespace convert + { + namespace impl + { -# include <mln/make/window1d.hh> + template <unsigned M> + void + from_to_(bool const (&values)[M], window1d& win) + { + mlc_bool(M % 2 == 1)::check(); + mln_precondition(win.is_empty()); // FIXME: or just .clear() it? + + const int h = int(M) / 2; + unsigned i = 0; + for (int ind = - h; ind <= h; ++ind) + if (values[i++]) + win.insert(dpoint1d(ind)); + } + + } // end of namespace mln::convert::impl + + } // end of namespace mln::convert + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln #endif // ! MLN_CORE_ALIAS_WINDOW1D_HH Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2267) +++ mln/core/alias/window2d.hh (working copy) @@ -61,10 +61,10 @@ { template <unsigned S> - void from_to_(bool (&values)[S], window2d& win); + void from_to_(bool const (&values)[S], window2d& win); template <unsigned R, unsigned C> - void from_to_(bool (&values)[R][C], window2d& win); + void from_to_(bool const (&values)[R][C], window2d& win); } // end of namespace mln::convert::impl @@ -81,11 +81,11 @@ static window2d it; if (!initialized_p) { - it.insert(make::dpoint2d( 0, -1)); - it.insert(make::dpoint2d(-1, 0)); - it.insert(make::dpoint2d( 0, 0)); - it.insert(make::dpoint2d(+1, 0)); - it.insert(make::dpoint2d( 0, +1)); + it.insert(dpoint2d( 0, -1)); + it.insert(dpoint2d(-1, 0)); + it.insert(dpoint2d( 0, 0)); + it.insert(dpoint2d(+1, 0)); + it.insert(dpoint2d( 0, +1)); initialized_p = true; } return it; @@ -99,7 +99,7 @@ template <unsigned S> void - from_to_(bool (&values)[S], window2d& win) + from_to_(bool const (&values)[S], window2d& win) { mln_precondition(win.is_empty()); // FIXME: or just .clear() it? enum { h = mlc_sqrt_int(S) / 2 }; @@ -113,11 +113,12 @@ template <unsigned R, unsigned C> void - from_to_(bool (&values)[R][C], window2d& win) + from_to_(bool const (&values)[R][C], window2d& win) { - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? mlc_bool(R % 2 == 1)::check(); mlc_bool(C % 2 == 1)::check(); + mln_precondition(win.is_empty()); // FIXME: or just .clear() it? + const int drow = int(R) / 2, dcol = int(C) / 2; for (int row = - drow; row <= drow; ++row) for (int col = - dcol; col <= dcol; ++col) @@ -134,7 +135,4 @@ } // end of namespace mln -# include <mln/make/window2d.hh> - - #endif // ! MLN_CORE_ALIAS_WINDOW2D_HH Index: mln/core/alias/window3d.hh --- mln/core/alias/window3d.hh (revision 2267) +++ mln/core/alias/window3d.hh (working copy) @@ -32,6 +32,7 @@ /// \brief Definition of the mln::window3d alias and of a construction /// routine. +# include <cmath> # include <mln/core/window.hh> # include <mln/core/alias/dpoint3d.hh> @@ -44,10 +45,51 @@ typedef window<mln::dpoint3d> window3d; -} // end of namespace mln + namespace convert + { + namespace impl + { + + template <unsigned M> + void from_to_(bool const (&values)[M], window3d& win); + + } // end of namespace mln::convert::impl + + } // end of namespace mln::convert + + + +# ifndef MLN_INCLUDE_ONLY + namespace convert + { + namespace impl + { + + template <unsigned M> + void + from_to_(bool const (&values)[M], window3d& win) + { + mln_precondition(win.is_empty()); // FIXME: or just .clear() it? + const int h = unsigned(std::pow(float(M), float(1. / 3.))) / 2; + mln_precondition((2 * h + 1) * (2 * h + 1) * (2 * h + 1) == M); + + unsigned i = 0; + for (int sli = - h; sli <= h; ++sli) + for (int row = - h; row <= h; ++row) + for (int col = - h; col <= h; ++col) + if (values[i++]) + win.insert(dpoint3d(sli, row, col)); + } + + } // end of namespace mln::convert::impl -# include <mln/make/window3d.hh> + } // end of namespace mln::convert + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln #endif // ! MLN_CORE_ALIAS_WINDOW3D_HH Index: mln/core/alias/point1d.hh --- mln/core/alias/point1d.hh (revision 2267) +++ mln/core/alias/point1d.hh (working copy) @@ -142,7 +142,6 @@ } // end of namespace mln -# include <mln/make/point1d.hh> # include <mln/core/alias/dpoint1d.hh> Index: mln/core/alias/point2d.hh --- mln/core/alias/point2d.hh (revision 2267) +++ mln/core/alias/point2d.hh (working copy) @@ -180,7 +180,6 @@ } // end of namespace mln -# include <mln/make/point2d.hh> # include <mln/core/alias/dpoint2d.hh> Index: mln/core/alias/point3d.hh --- mln/core/alias/point3d.hh (revision 2267) +++ mln/core/alias/point3d.hh (working copy) @@ -204,7 +204,6 @@ } // end of namespace mln -# include <mln/make/point3d.hh> # include <mln/core/alias/dpoint3d.hh> Index: mln/core/clock_neighb2d.hh --- mln/core/clock_neighb2d.hh (revision 2267) +++ mln/core/clock_neighb2d.hh (working copy) @@ -104,10 +104,10 @@ { unsigned begin = 0; std::vector<dpoint2d> v; - v.push_back(make::dpoint2d(0, 1)); - v.push_back(make::dpoint2d(-1, 0)); - v.push_back(make::dpoint2d(0, -1)); - v.push_back(make::dpoint2d(1, 0)); + v.push_back(dpoint2d(0, 1)); + v.push_back(dpoint2d(-1, 0)); + v.push_back(dpoint2d(0, -1)); + v.push_back(dpoint2d(1, 0)); std::vector<dpoint2d>::const_iterator ite = v.begin (); for (; (ite != v.end ()) && (dp != *ite); ++ite, ++begin) @@ -133,14 +133,14 @@ // { unsigned begin = 0; std::vector<dpoint2d> v; - v.push_back(make::dpoint2d(0, 1)); - v.push_back(make::dpoint2d(-1, 1)); - v.push_back(make::dpoint2d(-1, 0)); - v.push_back(make::dpoint2d(-1, -1)); - v.push_back(make::dpoint2d(0, -1)); - v.push_back(make::dpoint2d(1, -1)); - v.push_back(make::dpoint2d(1, 0)); - v.push_back(make::dpoint2d(1, 1)); + v.push_back(dpoint2d(0, 1)); + v.push_back(dpoint2d(-1, 1)); + v.push_back(dpoint2d(-1, 0)); + v.push_back(dpoint2d(-1, -1)); + v.push_back(dpoint2d(0, -1)); + v.push_back(dpoint2d(1, -1)); + v.push_back(dpoint2d(1, 0)); + v.push_back(dpoint2d(1, 1)); std::vector<dpoint2d>::const_iterator ite = v.begin (); for (; (ite != v.end ()) && (dp != *ite); ++ite, ++begin) @@ -162,10 +162,10 @@ // static clock_neighb2d it; // if (flower) // { -// it.insert(make::dpoint2d(0, 1)); -// it.insert(make::dpoint2d(1,-1)); -// it.insert(make::dpoint2d(1, 0)); -// it.insert(make::dpoint2d(1, 1)); +// it.insert(dpoint2d(0, 1)); +// it.insert(dpoint2d(1,-1)); +// it.insert(dpoint2d(1, 0)); +// it.insert(dpoint2d(1, 1)); // flower = false; // } // return it; @@ -177,7 +177,7 @@ // static clock_neighb2d it; // if (flower) // { -// it.insert(make::dpoint2d(0, 1)); +// it.insert(dpoint2d(0, 1)); // flower = false; // } // return it; @@ -189,7 +189,7 @@ // static clock_neighb2d it; // if (flower) // { -// it.insert(make::dpoint2d(1, 0)); +// it.insert(dpoint2d(1, 0)); // flower = false; // } // return it; Index: mln/linear/gaussian.hh --- mln/linear/gaussian.hh (revision 2267) +++ mln/linear/gaussian.hh (working copy) @@ -262,18 +262,18 @@ // Apply on rows. for (unsigned j = 0; j < geom::ncols(img); ++j) recursivefilter_< mln_value(I) >(img, coef, - make::point2d(-img.border(), j), - make::point2d(geom::nrows(img) - 1 + img.border(), j), + point2d(-img.border(), j), + point2d(geom::nrows(img) - 1 + img.border(), j), geom::nrows(img) + 2 * img.border(), - make::dpoint2d(1, 0)); + dpoint2d(1, 0)); // Apply on columns. for (unsigned i = 0; i < geom::nrows(img); ++i) recursivefilter_< mln_value(I) >(img, coef, - make::point2d(i, -img.border()), - make::point2d(i, geom::ncols(img) - 1 + img.border()), + point2d(i, -img.border()), + point2d(i, geom::ncols(img) - 1 + img.border()), geom::ncols(img) + 2 * img.border(), - make::dpoint2d(0, 1)); + dpoint2d(0, 1)); } Index: mln/make/neighb2d.hh --- mln/make/neighb2d.hh (revision 2267) +++ mln/make/neighb2d.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to create an mln::neighb2d. */ -# include <mln/make/window2d.hh> +# include <mln/core/alias/window2d.hh> namespace mln @@ -75,7 +75,7 @@ { enum { h = mlc_sqrt_int(S) / 2 }; mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); - mln::window2d win = make::window2d(values); + mln::window2d win = convert::to<window2d>(values); mln::neighb2d tmp(win); return tmp; } @@ -87,7 +87,7 @@ { mlc_bool(R % 2 == 1)::check(); mlc_bool(C % 2 == 1)::check(); - mln::window2d win = make::window2d(values); + mln::window2d win = convert::to<window2d>(values); mln::neighb2d tmp(win); return tmp; } Index: mln/make/all.hh --- mln/make/all.hh (revision 2267) +++ mln/make/all.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -46,23 +46,14 @@ # include <mln/make/box2d.hh> # include <mln/make/box2d_h.hh> # include <mln/make/box3d.hh> -# include <mln/make/dpoint1d.hh> -# include <mln/make/dpoint2d.hh> # include <mln/make/dpoint2d_h.hh> -# include <mln/make/dpoint3d.hh> # include <mln/make/mat.hh> # include <mln/make/pixel.hh> # include <mln/make/pix.hh> -# include <mln/make/point1d.hh> -# include <mln/make/point2d.hh> # include <mln/make/point2d_h.hh> -# include <mln/make/point3d.hh> # include <mln/make/vec.hh> # include <mln/make/voronoi.hh> # include <mln/make/win_chamfer.hh> -# include <mln/make/window1d.hh> -# include <mln/make/window2d.hh> -# include <mln/make/window3d.hh> # include <mln/make/w_window1d.hh> # include <mln/make/w_window1d_int.hh> # include <mln/make/w_window2d.hh> Index: mln/make/box1d.hh --- mln/make/box1d.hh (revision 2267) +++ mln/make/box1d.hh (working copy) @@ -34,7 +34,6 @@ */ # include <mln/core/alias/box1d.hh> -# include <mln/make/point1d.hh> namespace mln @@ -74,8 +73,8 @@ mln::box1d box1d(unsigned ninds) { mln_precondition(ninds != 0); - mln::box1d tmp(make::point1d(0), - make::point1d(ninds - 1)); + mln::box1d tmp(point1d(0), + point1d(ninds - 1)); return tmp; } @@ -83,8 +82,8 @@ mln::box1d box1d(def::coord min_ind, def::coord max_ind) { mln_precondition(max_ind >= min_ind); - mln::box1d tmp(make::point1d(min_ind), - make::point1d(max_ind)); + mln::box1d tmp(point1d(min_ind), + point1d(max_ind)); return tmp; } Index: mln/make/box2d.hh --- mln/make/box2d.hh (revision 2267) +++ mln/make/box2d.hh (working copy) @@ -34,7 +34,6 @@ */ # include <mln/core/alias/box2d.hh> -# include <mln/make/point2d.hh> namespace mln @@ -78,8 +77,8 @@ mln::box2d box2d(unsigned nrows, unsigned ncols) { mln_precondition(nrows != 0 && ncols != 0); - mln::box2d tmp(make::point2d(0, 0), - make::point2d(def::coord (nrows - 1), + mln::box2d tmp(point2d(0, 0), + point2d(def::coord(nrows - 1), def::coord (ncols - 1))); return tmp; } @@ -89,8 +88,8 @@ def::coord max_row, def::coord max_col) { mln_precondition(max_row >= min_row && max_col >= min_col); - mln::box2d tmp(make::point2d(min_row, min_col), - make::point2d(max_row, max_col)); + mln::box2d tmp(point2d(min_row, min_col), + point2d(max_row, max_col)); return tmp; } Index: mln/make/box3d.hh --- mln/make/box3d.hh (revision 2267) +++ mln/make/box3d.hh (working copy) @@ -34,7 +34,6 @@ */ # include <mln/core/alias/box3d.hh> -# include <mln/make/point3d.hh> namespace mln @@ -84,8 +83,8 @@ mln::box3d box3d(unsigned nslis, unsigned nrows, unsigned ncols) { mln_precondition(nrows != 0 && ncols != 0 && nslis != 0); - mln::box3d tmp(make::point3d(0, 0, 0), - make::point3d(nslis - 1, nrows - 1, ncols - 1)); + mln::box3d tmp(point3d(0, 0, 0), + point3d(nslis - 1, nrows - 1, ncols - 1)); return tmp; } @@ -95,8 +94,8 @@ def::coord min_col, def::coord max_col) { mln_precondition(max_row >= min_row && max_sli >= min_sli && max_col >= min_col); - mln::box3d tmp(make::point3d(min_sli, min_row, min_col), - make::point3d(max_sli, max_row, max_col)); + mln::box3d tmp(point3d(min_sli, min_row, min_col), + point3d(max_sli, max_row, max_col)); return tmp; } Index: mln/make/w_window1d.hh --- mln/make/w_window1d.hh (revision 2267) +++ mln/make/w_window1d.hh (working copy) @@ -71,7 +71,7 @@ for (int ind = - h; ind <= h; ++ind) { if (weights[i] != 0) - tmp.insert(weights[i], make::dpoint1d(ind)); + tmp.insert(weights[i], dpoint1d(ind)); i++; } return tmp; Index: mln/make/w_window2d.hh --- mln/make/w_window2d.hh (revision 2267) +++ mln/make/w_window2d.hh (working copy) @@ -72,7 +72,7 @@ for (int col = - h; col <= h; ++col) { if (weights[i] != 0) - tmp.insert(weights[i], make::dpoint2d(row, col)); + tmp.insert(weights[i], dpoint2d(row, col)); i++; } return tmp; Index: mln/make/w_window3d.hh --- mln/make/w_window3d.hh (revision 2267) +++ mln/make/w_window3d.hh (working copy) @@ -76,7 +76,7 @@ const W& cur = weights[i]; if (cur != 0) - tmp.insert(cur, make::dpoint3d(sli, row, col)); + tmp.insert(cur, dpoint3d(sli, row, col)); i++; } return tmp; Index: mln/make/box2d_h.hh --- mln/make/box2d_h.hh (revision 2267) +++ mln/make/box2d_h.hh (working copy) @@ -78,8 +78,8 @@ mln::box2d_h box2d_h(unsigned nrows, unsigned ncols) { mln_precondition(nrows != 0 && ncols != 0); - mln::box2d_h tmp(make::point2d_h(0, 0), - make::point2d_h(nrows - 1, ncols - 1)); + mln::box2d_h tmp(point2d_h(0, 0), + point2d_h(nrows - 1, ncols - 1)); return tmp; } @@ -88,8 +88,8 @@ int max_row, int max_col) { mln_precondition(max_row >= min_row && max_col >= min_col); - mln::box2d_h tmp(make::point2d_h(min_row, min_col), - make::point2d_h(max_row, max_col)); + mln::box2d_h tmp(point2d_h(min_row, min_col), + point2d_h(max_row, max_col)); return tmp; } Index: mln/make/voronoi.hh --- mln/make/voronoi.hh (revision 2267) +++ mln/make/voronoi.hh (working copy) @@ -119,7 +119,7 @@ gr.add_vertex(); /// FIXME - v[i] = make::point2d ((unsigned)tab_mean[i].to_result ()[0], + v[i] = point2d ((unsigned)tab_mean[i].to_result ()[0], (unsigned)tab_mean[i].to_result ()[1]); } Index: mln/make/image1d.hh --- mln/make/image1d.hh (revision 2267) +++ mln/make/image1d.hh (working copy) @@ -61,7 +61,7 @@ { mln::image1d<V> tmp(L); for (unsigned ind = 0; ind < L; ++ind) - tmp(make::point1d(ind)) = values[ind]; + tmp(point1d(ind)) = values[ind]; return tmp; } Index: mln/make/image2d.hh --- mln/make/image2d.hh (revision 2267) +++ mln/make/image2d.hh (working copy) @@ -62,7 +62,7 @@ mln::image2d<V> tmp(R, C); for (unsigned row = 0; row < R; ++row) for (unsigned col = 0; col < C; ++col) - tmp(make::point2d(row, col)) = values[row][col]; + tmp(point2d(row, col)) = values[row][col]; return tmp; } Index: mln/convert/to.hh --- mln/convert/to.hh (revision 2267) +++ mln/convert/to.hh (working copy) @@ -68,7 +68,7 @@ trace::entering("convert::to"); T tmp; - impl::from_to_(exact(from), tmp); + impl::from_to_(from, tmp); trace::exiting("convert::to"); return tmp; Index: mln/convert/to_tiles.hh --- mln/convert/to_tiles.hh (revision 2267) +++ mln/convert/to_tiles.hh (working copy) @@ -78,7 +78,7 @@ 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); + dpoint2d dp = dpoint2d(i / size_c * nrows, i % size_c * ncols); /// Convert current image in translate image with its delta point. translate_image tr_ima(v_ima[i], dp); Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 2267) +++ mln/win/cube3d.hh (working copy) @@ -128,7 +128,7 @@ for (int sli = - dind; sli <= dind; ++sli) for (int row = - dind; row <= dind; ++row) for (int col = - dind; col <= dind; ++col) - insert(make::dpoint3d(sli, row, col)); + insert(dpoint3d(sli, row, col)); } inline Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 2267) +++ mln/win/diag2d.hh (working copy) @@ -120,7 +120,7 @@ mln_precondition(length % 2 == 1); const int dcol = length / 2; for (int col = - dcol; col <= dcol; ++col) - insert(make::dpoint2d(-col, col)); + insert(dpoint2d(-col, col)); } inline Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 2267) +++ mln/win/backdiag2d.hh (working copy) @@ -120,7 +120,7 @@ mln_precondition(length % 2 == 1); const int dcol = length / 2; for (int col = - dcol; col <= dcol; ++col) - insert(make::dpoint2d(col, col)); + insert(dpoint2d(col, col)); } inline Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 2267) +++ mln/win/cuboid3d.hh (working copy) @@ -153,7 +153,7 @@ for (int sli = -dsli; sli <= dsli; ++sli) for (int row = -drow; row <= drow; ++row) for (int col = -dcol; col <= dcol; ++col) - insert(make::dpoint3d(sli, row, col)); + insert(dpoint3d(sli, row, col)); } inline Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 2267) +++ mln/win/disk2d.hh (working copy) @@ -114,7 +114,7 @@ for (int a = -r; a <= r; ++a) for (int b = -r; b <= r; ++b) if (a * a + b * b <= r2) - insert(make::dpoint2d(a, b)); + insert(dpoint2d(a, b)); } inline Index: mln/io/pfm/save.hh --- mln/io/pfm/save.hh (revision 2267) +++ mln/io/pfm/save.hh (working copy) @@ -94,7 +94,7 @@ max_row = geom::max_row(ima); //image2d<float>& ima_ = const_cast< image2d<float>& >(ima); - point2d p(make::point2d(0, 0)); + point2d p(point2d(0, 0)); for (p.row() = min_row; p.row() <= max_row; ++p.row()) file.write((const char*)(&(ima(p))), sizeof(float) * ncols); Index: mln/io/pfm/load.hh --- mln/io/pfm/load.hh (revision 2267) +++ mln/io/pfm/load.hh (working copy) @@ -122,7 +122,7 @@ inline void load_raw_2d(std::ifstream& file, I& ima) { - point2d p = make::point2d(0, 0); + point2d p = point2d(0, 0); const mln_coord(I) min_row = geom::min_row(ima), Index: mln/io/fits/load.hh --- mln/io/fits/load.hh (revision 2267) +++ mln/io/fits/load.hh (working copy) @@ -106,7 +106,7 @@ nullval = 0; // don't check null values - point2d p(make::point2d(0, 0)); + point2d p(point2d(0, 0)); for (p.row() = 0; p.row() < nrows; ++p.row()) { Index: mln/io/pnm/load.hh --- mln/io/pnm/load.hh (revision 2267) +++ mln/io/pnm/load.hh (working copy) @@ -121,7 +121,7 @@ inline void load_raw_2d_contiguous(std::ifstream& file, I& ima) { - point2d p = make::point2d(0, ima.domain().pmin().col()); + point2d p = point2d(0, ima.domain().pmin().col()); typedef mln_value(I) V; const mln_coord(I) min_row = geom::min_row(ima), Index: mln/io/pbm/load.hh --- mln/io/pbm/load.hh (revision 2267) +++ mln/io/pbm/load.hh (working copy) @@ -100,7 +100,7 @@ inline void load_raw_2d(std::ifstream& file, I& ima) { - point2d p = make::point2d(0, ima.domain().pmin().col()); + point2d p = point2d(0, ima.domain().pmin().col()); typedef mln_value(I) V; const mln_coord(I) min_row = geom::min_row(ima), Index: sandbox/duhamel/test_border_fill_image1d_3.cc --- sandbox/duhamel/test_border_fill_image1d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image1d_3.cc (working copy) @@ -44,7 +44,7 @@ std::cout << "Test 1d size= box [2 .. 4] with border=6 in int" << std::endl; - box1d b(make::point1d(2), make::point1d(4)); + box1d b(point1d(2), point1d(4)); image1d_b<int> ima(b, 6); border::fill (ima, 9); Index: sandbox/duhamel/test_border_fill_image3d_3.cc --- sandbox/duhamel/test_border_fill_image3d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image3d_3.cc (working copy) @@ -45,7 +45,7 @@ << std::endl << std::endl; - box3d b(make::point3d(2, 6, 1), make::point3d(3, 8, 3)); + box3d b(point3d(2, 6, 1), point3d(3, 8, 3)); image3d_b<value::int_u8> i4(b, 1); border::fill (i4, 2); debug::println_with_border(i4); Index: sandbox/duhamel/main_mesh_image.cc --- sandbox/duhamel/main_mesh_image.cc (revision 2267) +++ sandbox/duhamel/main_mesh_image.cc (working copy) @@ -33,12 +33,12 @@ // g.print_debug (); std::vector<point2d> v; - v.push_back (make::point2d (1,1)); - v.push_back (make::point2d (10,1)); - v.push_back (make::point2d (19,2)); - v.push_back (make::point2d (19,19)); - v.push_back (make::point2d (10,10)); - v.push_back (make::point2d (1,19)); + v.push_back (point2d (1,1)); + v.push_back (point2d (10,1)); + v.push_back (point2d (19,2)); + v.push_back (point2d (19,19)); + v.push_back (point2d (10,10)); + v.push_back (point2d (1,19)); image2d_b<int> ima (20, 20, 1); Index: sandbox/duhamel/graph_labeling.hh --- sandbox/duhamel/graph_labeling.hh (revision 2267) +++ sandbox/duhamel/graph_labeling.hh (working copy) @@ -68,7 +68,7 @@ gr.add_node (); int tmp_x = y[(*ite).first] / c[(*ite).first]; int tmp_y = x[(*ite).first] / c[(*ite).first]; - v[m[(*ite).first]] = (make::point2d(tmp_x, tmp_y)); + v[m[(*ite).first]] = (point2d(tmp_x, tmp_y)); } typename std::vector< std::vector<value::int_u8> >::iterator it = vec.begin (); for (; it != vec.end (); ++it) Index: sandbox/duhamel/labeling_algo.cc --- sandbox/duhamel/labeling_algo.cc (revision 2267) +++ sandbox/duhamel/labeling_algo.cc (working copy) @@ -64,7 +64,7 @@ image2d_b<int> input(in.domain()); level::fill(input, lab); - lab(make::point2d (0,0)) = 0; + lab(point2d (0,0)) = 0; inte = geom::seeds2tiling(lab, c4 ()); border::fill (inte, 0); Index: sandbox/duhamel/test_border_duplicate_image2d_3.cc --- sandbox/duhamel/test_border_duplicate_image2d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image2d_3.cc (working copy) @@ -45,7 +45,7 @@ << "Test 2d size=[(2,6) .. (3,8)] with border=3 in int" << std::endl << std::endl; - box2d b(make::point2d(2, 6), make::point2d(3, 8)); + box2d b(point2d(2, 6), point2d(3, 8)); image2d_b<int> ima(b, 3); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/test_border_duplicate_image1d_5.cc --- sandbox/duhamel/test_border_duplicate_image1d_5.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image1d_5.cc (working copy) @@ -46,7 +46,7 @@ << std::endl << std::endl; - box1d b(make::point1d(2), make::point1d(4)); + box1d b(point1d(2), point1d(4)); image1d_b<int> ima(b, 0); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/test_border_fill_image2d_4.cc --- sandbox/duhamel/test_border_fill_image2d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image2d_4.cc (working copy) @@ -45,7 +45,7 @@ << std::endl << std::endl; - box2d b(make::point2d(-6, -3), make::point2d(-2, -1)); + box2d b(point2d(-6, -3), point2d(-2, -1)); image2d_b<value::int_u8> ima(b, 3); border::fill (ima, 3); Index: sandbox/duhamel/test_border_duplicate_image1d_4.cc --- sandbox/duhamel/test_border_duplicate_image1d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image1d_4.cc (working copy) @@ -46,7 +46,7 @@ << std::endl << std::endl; - box1d b(make::point1d(-6), make::point1d(-3)); + box1d b(point1d(-6), point1d(-3)); image1d_b<value::int_u8> ima(b, 6); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/test_border_duplicate_image3d_4.cc --- sandbox/duhamel/test_border_duplicate_image3d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image3d_4.cc (working copy) @@ -46,7 +46,7 @@ << std::endl << std::endl; - box3d b(make::point3d(-7, -8, -6), make::point3d(-5, -4, -1)); + box3d b(point3d(-7, -8, -6), point3d(-5, -4, -1)); image3d_b<int> ima(b, 1); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/labeling_algo.hh --- sandbox/duhamel/labeling_algo.hh (revision 2267) +++ sandbox/duhamel/labeling_algo.hh (working copy) @@ -92,7 +92,7 @@ for (unsigned i = 0; i < nb; ++i) { gr.add_node (); - v[i] = make::point2d ((unsigned)tab_mean[i].to_result ()[0], + v[i] = point2d ((unsigned)tab_mean[i].to_result ()[0], (unsigned)tab_mean[i].to_result ()[1]); } @@ -153,7 +153,7 @@ for (unsigned i = 0; i < nb; ++i) { gr.add_node (); - v[i] = make::point2d ((unsigned)tab_mean[i].to_result ()[0], + v[i] = point2d ((unsigned)tab_mean[i].to_result ()[0], (unsigned)tab_mean[i].to_result ()[1]); } Index: sandbox/duhamel/test_border_fill_image2d_3.cc --- sandbox/duhamel/test_border_fill_image2d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image2d_3.cc (working copy) @@ -45,7 +45,7 @@ << std::endl << std::endl; - box2d b(make::point2d(2, 6), make::point2d(3, 8)); + box2d b(point2d(2, 6), point2d(3, 8)); image2d_b<int> ima(b, 3); border::fill (ima, 8); Index: sandbox/duhamel/test_border_fill_image1d_5.cc --- sandbox/duhamel/test_border_fill_image1d_5.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image1d_5.cc (working copy) @@ -44,7 +44,7 @@ std::cout << "Test 1d size= box [2 .. 4] with border=0 in int" << std::endl; - box1d b(make::point1d(2), make::point1d(4)); + box1d b(point1d(2), point1d(4)); image1d_b<int> ima(b, 0); border::fill (ima, 9); Index: sandbox/duhamel/test_border_duplicate_image1d_3.cc --- sandbox/duhamel/test_border_duplicate_image1d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image1d_3.cc (working copy) @@ -47,7 +47,7 @@ << std::endl << std::endl; - box1d b(make::point1d(2), make::point1d(4)); + box1d b(point1d(2), point1d(4)); image1d_b<int> ima(b, 6); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/test_border_duplicate_image3d_3.cc --- sandbox/duhamel/test_border_duplicate_image3d_3.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image3d_3.cc (working copy) @@ -47,7 +47,7 @@ << std::endl << std::endl; - box3d b(make::point3d(2, 6, 1), make::point3d(3, 8, 3)); + box3d b(point3d(2, 6, 1), point3d(3, 8, 3)); image3d_b<value::int_u8> ima(b, 1); debug::iota (ima); border::duplicate (ima); Index: sandbox/duhamel/draw_mesh.hh --- sandbox/duhamel/draw_mesh.hh (revision 2267) +++ sandbox/duhamel/draw_mesh.hh (working copy) @@ -33,20 +33,20 @@ if (d[1]) if (d[1] > 0) for (int y = p1[1]; y > p2[1]; --y) - exact(ima)(make::point2d(p1[0],y)) = link_v; + exact(ima)(point2d(p1[0],y)) = link_v; else for (int y = p1[1]; y < p2[1]; ++y) - exact(ima)(make::point2d(p1[0],y)) = link_v; + exact(ima)(point2d(p1[0],y)) = link_v; } else // d[0] != 0 { if (!d[1]) if (d[0] > 0) for (int x = p1[0]; x > p2[0]; --x) - exact(ima)(make::point2d(x, p1[1])) = link_v; + exact(ima)(point2d(x, p1[1])) = link_v; else for (int x = p1[0]; x < p2[0]; ++x) - exact(ima)(make::point2d(x, p1[1])) = link_v; + exact(ima)(point2d(x, p1[1])) = link_v; else // d[0] != 0 && d[1] != 0 { float e = 0; @@ -61,7 +61,7 @@ e -= (float)d[1]; for (int y = p1[1] - 1; y > p2[1]; --y) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[0]; if (e >= 0) { @@ -77,7 +77,7 @@ e -= (float)d[0]; for (int x = p1[0] - 1; x > p2[0]; --x) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[1]; if (e > 0) { @@ -96,7 +96,7 @@ e += (float)d[1]; for (int y = p1[1] + 1; y < p2[1]; ++y) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[0]; if (e >= 0) { @@ -112,7 +112,7 @@ e += (float)d[0]; for (int x = p1[0] - 1; x > p2[0]; --x) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[1]; if (e <= 0) { @@ -134,7 +134,7 @@ e += (float)d[1]; for (int y = p1[1] - 1; y > p2[1]; --y) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[0]; if (e < 0) { @@ -150,7 +150,7 @@ e -= (float)d[0]; for (int x = p1[0] + 1; x < p2[0]; ++x) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e -= (float)d[1]; if (e < 0) { @@ -169,7 +169,7 @@ e -= (float)d[1]; for (int y = p1[1] + 1; y < p2[1]; ++y) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[0]; if (e < 0) { @@ -185,7 +185,7 @@ e -= (float)d[0]; for (int x = p1[0] + 1; x < p2[0]; ++x) { - exact(ima)(make::point2d(x,y)) = link_v; + exact(ima)(point2d(x,y)) = link_v; e += (float)d[1]; if (e <= 0) { Index: sandbox/duhamel/test_border_fill_image1d_4.cc --- sandbox/duhamel/test_border_fill_image1d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image1d_4.cc (working copy) @@ -44,7 +44,7 @@ std::cout << "Test 1d size= box [-6 .. -3] with border=6 in value::int_u8" << std::endl; - box1d b(make::point1d(-6), make::point1d(-3)); + box1d b(point1d(-6), point1d(-3)); image1d_b<value::int_u8> ima(b, 6); // image1d_b<value::int_u8> ima(5); Index: sandbox/duhamel/test_border_fill_image3d_4.cc --- sandbox/duhamel/test_border_fill_image3d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_fill_image3d_4.cc (working copy) @@ -45,7 +45,7 @@ << std::endl << std::endl; - box3d b(make::point3d(-7, -8, -6), make::point3d(-5, -4, -1)); + box3d b(point3d(-7, -8, -6), point3d(-5, -4, -1)); image3d_b<int> i4(b, 1); border::fill (i4, 2); debug::println_with_border(i4); Index: sandbox/duhamel/translate_image.cc --- sandbox/duhamel/translate_image.cc (revision 2267) +++ sandbox/duhamel/translate_image.cc (working copy) @@ -16,7 +16,7 @@ I ima (4, 2, 1); debug::iota (ima); - translate_image tmp (ima, make::point2d (0,2) - make::point2d (0,0)); + translate_image tmp (ima, point2d (0,2) - point2d (0,0)); std::cout << "orginal image domain : " << ima.domain () << std::endl Index: sandbox/duhamel/test_border_duplicate_image2d_4.cc --- sandbox/duhamel/test_border_duplicate_image2d_4.cc (revision 2267) +++ sandbox/duhamel/test_border_duplicate_image2d_4.cc (working copy) @@ -47,7 +47,7 @@ << std::endl << std::endl; - box2d b(make::point2d(-6, -3), make::point2d(-2, -1)); + box2d b(point2d(-6, -3), point2d(-2, -1)); image2d_b<value::int_u8> ima(b, 3); debug::iota (ima); border::duplicate (ima); Index: sandbox/pellegrin/set/test/p_queue_fast.cc --- sandbox/pellegrin/set/test/p_queue_fast.cc (revision 2267) +++ sandbox/pellegrin/set/test/p_queue_fast.cc (working copy) @@ -41,9 +41,9 @@ p_queue_fast<point2d> q; q - .push(make::point2d(6, 9)) - .push(make::point2d(5, 1)) - .push(make::point2d(4, 2)); + .push(point2d(6, 9)) + .push(point2d(5, 1)) + .push(point2d(4, 2)); mln_assertion(q.nsites() == 3); std::cout << q.bbox() << std::endl; @@ -53,5 +53,5 @@ mln_assertion(q.nsites() == 2); point2d p = q.front(); mln_assertion(q.nsites() == 2); - mln_assertion(p == make::point2d(5, 1)); + mln_assertion(p == point2d(5, 1)); } Index: sandbox/pellegrin/set/test/p_bgraph.cc --- sandbox/pellegrin/set/test/p_bgraph.cc (revision 2267) +++ sandbox/pellegrin/set/test/p_bgraph.cc (working copy) @@ -62,11 +62,11 @@ for (int i = 0; i < num_edges; ++i) boost::add_edge(edge_array[i].first, edge_array[i].second, g); - g[0] = make::point2d(0, 0); - g[1] = make::point2d(0, 1); - g[2] = make::point2d(1, 0); - g[3] = make::point2d(1, 1); - g[4] = make::point2d(0, 2); + g[0] = point2d(0, 0); + g[1] = point2d(0, 1); + g[2] = point2d(1, 0); + g[3] = point2d(1, 1); + g[4] = point2d(0, 2); /*-----------. | p_bgraph. | Index: sandbox/pellegrin/set/test/p_queue.cc --- sandbox/pellegrin/set/test/p_queue.cc (revision 2267) +++ sandbox/pellegrin/set/test/p_queue.cc (working copy) @@ -41,9 +41,9 @@ p_queue<point2d> q; q - .push(make::point2d(6, 9)) - .push(make::point2d(5, 1)) - .push(make::point2d(4, 2)); + .push(point2d(6, 9)) + .push(point2d(5, 1)) + .push(point2d(4, 2)); mln_assertion(q.nsites() == 3); std::cout << q.bbox() << std::endl; @@ -53,5 +53,5 @@ mln_assertion(q.nsites() == 2); point2d p = q.front(); mln_assertion(q.nsites() == 2); - mln_assertion(p == make::point2d(5, 1)); + mln_assertion(p == point2d(5, 1)); } Index: sandbox/pellegrin/set/test/p_runs.cc --- sandbox/pellegrin/set/test/p_runs.cc (revision 2267) +++ sandbox/pellegrin/set/test/p_runs.cc (working copy) @@ -52,9 +52,9 @@ using namespace mln; point2d p, q, r; - p = make::point2d(2, 4); - q = make::point2d(18, 42); - r = make::point2d(50, 76); + p = point2d(2, 4); + q = point2d(18, 42); + r = point2d(50, 76); // Pset test p_runs_<point2d> ps; @@ -68,7 +68,7 @@ ps.insert(p_run<point2d>(r, 2)); - ps.insert(p_run<point2d>(make::point2d(17,40), 6)); + ps.insert(p_run<point2d>(point2d(17,40), 6)); // Psite declaration runs_psite<point2d> site(ps, 5, 0); Index: sandbox/pellegrin/set/test/p_set.cc --- sandbox/pellegrin/set/test/p_set.cc (revision 2267) +++ sandbox/pellegrin/set/test/p_set.cc (working copy) @@ -43,10 +43,10 @@ p_set<point2d> ps; ps - .insert(make::point2d(6, 9)) - .insert(make::point2d(4, 2)) - .insert(make::point2d(4, 2)) - .insert(make::point2d(5, 1)); + .insert(point2d(6, 9)) + .insert(point2d(4, 2)) + .insert(point2d(4, 2)) + .insert(point2d(5, 1)); mln_assertion(ps.nsites() == 3); std::cout << ps.bbox() << std::endl; Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2267) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -129,7 +129,7 @@ int e = ddrow - dcol; for (int i = 0; i < dcol; ++i) { - vect_.push_back(make::point2d(row, col)); + vect_.push_back(point2d(row, col)); while (e >= 0) { row += srow; @@ -144,7 +144,7 @@ int e = ddcol - drow; for (int i = 0; i < drow; ++i) { - vect_.push_back(make::point2d(row, col)); + vect_.push_back(point2d(row, col)); while (e >= 0) { col += scol; @@ -154,11 +154,11 @@ e += ddcol; } } - vect_.push_back(make::point2d(row, col)); + vect_.push_back(point2d(row, col)); // bb_ - bb_.pmin() = make::point2d(math::min(beg_.row(), end_.row()), + bb_.pmin() = point2d(math::min(beg_.row(), end_.row()), math::min(beg_.col(), end_.col())); - bb_.pmax() = make::point2d(math::max(beg_.row(), end_.row()), + bb_.pmax() = point2d(math::max(beg_.row(), end_.row()), math::max(beg_.col(), end_.col())); } Index: sandbox/aroumougame/skeleton/mesh-skel_region.cc --- sandbox/aroumougame/skeleton/mesh-skel_region.cc (revision 2267) +++ sandbox/aroumougame/skeleton/mesh-skel_region.cc (working copy) @@ -42,7 +42,7 @@ #include <mln/value/rgb8.hh> #include <mln/core/alias/point3d.hh> -#include <mln/make/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/util/graph.hh> #include <mln/core/image/graph_image.hh> @@ -137,7 +137,7 @@ // Populate the graph with vertices. for (unsigned i = 0; i < mesh.faces.size(); ++i) { - g.add_vertex (mln::make::point3d(i, i, i)); + g.add_vertex (mln::point3d(i, i, i)); } //fill the constraint for (unsigned i = 0; i < curvMax.size(); ++i) Index: sandbox/aroumougame/skeleton/mesh-skel.cc --- sandbox/aroumougame/skeleton/mesh-skel.cc (revision 2267) +++ sandbox/aroumougame/skeleton/mesh-skel.cc (working copy) @@ -42,7 +42,7 @@ #include <mln/value/rgb8.hh> #include <mln/core/alias/point3d.hh> -#include <mln/make/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/util/graph.hh> #include <mln/core/image/graph_image.hh> @@ -128,7 +128,7 @@ mln::util::graph<mln::point3d> g; // Populate the graph with vertices. for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::make::point3d(i, i, i)); + g.add_vertex (mln::point3d(i, i, i)); // Populate the graph with edges. mesh.need_across_edge(); Index: sandbox/aroumougame/skeleton/test_image3d.cc --- sandbox/aroumougame/skeleton/test_image3d.cc (revision 2267) +++ sandbox/aroumougame/skeleton/test_image3d.cc (working copy) @@ -3,7 +3,7 @@ #include <mln/value/rgb8.hh> #include <mln/core/alias/point3d.hh> -#include <mln/make/point3d.hh> +#include <mln/core/alias/point3d.hh> #include <mln/util/graph.hh> #include <mln/core/image/line_graph_image.hh> @@ -24,12 +24,12 @@ { for(int j=0; j<nb; j++) { - X_complement.insert(mln::make::point3d(0, i, j)); - X_complement.insert(mln::make::point3d(i, j, 0)); - X_complement.insert(mln::make::point3d(i, 0, j)); - X_complement.insert(mln::make::point3d(i, nb-1, j)); - X_complement.insert(mln::make::point3d(i, j, nb-1)); - X_complement.insert(mln::make::point3d(nb-1, i, j)); + X_complement.insert(mln::point3d(0, i, j)); + X_complement.insert(mln::point3d(i, j, 0)); + X_complement.insert(mln::point3d(i, 0, j)); + X_complement.insert(mln::point3d(i, nb-1, j)); + X_complement.insert(mln::point3d(i, j, nb-1)); + X_complement.insert(mln::point3d(nb-1, i, j)); } } for(int i=1; i<nb-1; i++) @@ -39,7 +39,7 @@ for(int k=1; k<nb-1; k++) { if((i!=centre) || (j!=centre) || (k!=centre)) - X.insert(mln::make::point3d(i, j, k)); + X.insert(mln::point3d(i, j, k)); } } } @@ -48,12 +48,12 @@ { for(int j=0; j<nb; j++) { - X_complement.insert(mln::make::point3d(0+5, i, j)); - X_complement.insert(mln::make::point3d(i+5, j, 0)); - X_complement.insert(mln::make::point3d(i+5, 0, j)); - X_complement.insert(mln::make::point3d(i+5, nb-1, j)); - X_complement.insert(mln::make::point3d(5+i, j, nb-1)); - X_complement.insert(mln::make::point3d(nb-1+5, i, j)); + X_complement.insert(mln::point3d(0+5, i, j)); + X_complement.insert(mln::point3d(i+5, j, 0)); + X_complement.insert(mln::point3d(i+5, 0, j)); + X_complement.insert(mln::point3d(i+5, nb-1, j)); + X_complement.insert(mln::point3d(5+i, j, nb-1)); + X_complement.insert(mln::point3d(nb-1+5, i, j)); } } for(int i=1; i<nb-1; i++) @@ -63,13 +63,13 @@ for(int k=1; k<nb-1; k++) { if((i!=centre) || (j!=centre) || (k!=centre)) - X.insert(mln::make::point3d(i+5, j, k)); + X.insert(mln::point3d(i+5, j, k)); } } } - X_complement.insert(mln::make::point3d(centre, centre, centre)); - X_complement.insert(mln::make::point3d(centre+5, centre, centre)); + X_complement.insert(mln::point3d(centre, centre, centre)); + X_complement.insert(mln::point3d(centre+5, centre, centre)); std::cout << "X "<< X.nsites() << std::endl; std::cout << "X_complement "<< X_complement.nsites() << std::endl; Index: sandbox/aroumougame/skeleton/thinning.hh --- sandbox/aroumougame/skeleton/thinning.hh (revision 2267) +++ sandbox/aroumougame/skeleton/thinning.hh (working copy) @@ -4,7 +4,7 @@ #include <mln/core/image/graph_elt_neighborhood.hh> #include <mln/math/min.hh> #include <mln/math/sqrt.hh> -#include <mln/make/dpoint2d.hh> +#include <mln/core/alias/dpoint2d.hh> #include "miscellenous.hh" #include "sedt.hh" Index: sandbox/nivault/plugin-gimp/src/gimp-image.hh --- sandbox/nivault/plugin-gimp/src/gimp-image.hh (revision 2267) +++ sandbox/nivault/plugin-gimp/src/gimp-image.hh (working copy) @@ -456,7 +456,7 @@ // const mln_value(gimp_image<t>)& // gimp_image<t>::at(int row, int col) const // { -// mln_precondition(this->has(make::point2d(row, col))); +// mln_precondition(this->has(point2d(row, col))); // return this->data_->array_[row][col]; // } @@ -465,7 +465,7 @@ // mln_value(gimp_image<t>)& // gimp_image<t>::at(int row, int col) // { -// mln_precondition(this->has(make::point2d(row, col))); +// mln_precondition(this->has(point2d(row, col))); // return this->data_->array_[row][col]; // } @@ -503,7 +503,7 @@ // gimp_image<t>::point_at_index(unsigned o) const // { // mln_precondition(o < nelements()); -// point2d p = make::point2d(o / this->data_->b_.len(1) + this->data_->b_.min_row(), +// point2d p = point2d(o / this->data_->b_.len(1) + this->data_->b_.min_row(), // o % this->data_->b_.len(1) + this->data_->b_.min_col()); // mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); // return p; Index: sandbox/jardonnet/test/reduce.cc --- sandbox/jardonnet/test/reduce.cc (revision 2267) +++ sandbox/jardonnet/test/reduce.cc (working copy) @@ -19,7 +19,7 @@ io::pbm::load(img, argv[1]); - image2d<bool> output = subsampling::subsampling(img, make::dpoint2d(2,2), argc); + image2d<bool> output = subsampling::subsampling(img, dpoint2d(2,2), argc); io::pbm::save(output, argv[2]); } Index: sandbox/jardonnet/test/gaussian_subsampling.cc --- sandbox/jardonnet/test/gaussian_subsampling.cc (revision 2267) +++ sandbox/jardonnet/test/gaussian_subsampling.cc (working copy) @@ -15,7 +15,7 @@ io::pgm::load(img, "../../../img/lena.pgm"); - image2d<int_u8> output = subsampling::gaussian_subsampling(img, 0.1, make::dpoint2d(1,1), argc); + image2d<int_u8> output = subsampling::gaussian_subsampling(img, 0.1, dpoint2d(1,1), argc); io::pgm::save(output, "gsub.pgm"); } Index: sandbox/jardonnet/test/subsampling.cc --- sandbox/jardonnet/test/subsampling.cc (revision 2267) +++ sandbox/jardonnet/test/subsampling.cc (working copy) @@ -16,7 +16,7 @@ io::pgm::load(img, "../../../img/lena.pgm"); std::cout << geom::nrows(img) << geom::ncols(img) << std::endl; - image2d<int_u8> output = subsampling::subsampling(img, make::dpoint2d(1,1), argc); + image2d<int_u8> output = subsampling::subsampling(img, dpoint2d(1,1), argc); io::pgm::save(output, "sub.pgm"); } Index: sandbox/jardonnet/registration/save.hh --- sandbox/jardonnet/registration/save.hh (revision 2267) +++ sandbox/jardonnet/registration/save.hh (working copy) @@ -6,7 +6,7 @@ # include <mln/io/pbm/save.hh> # include <mln/draw/all.hh> # include <mln/morpho/erosion.hh> -# include <mln/make/window2d.hh> +# include <mln/core/alias/window2d.hh> # include <string> # include "quat7.hh" @@ -115,7 +115,7 @@ bool vals[] = {1, 1, 1, 1, 1, 1, 1, 1, 1}; - morpho::erosion(out, make::window2d(vals)); + morpho::erosion(out, convert::to<window2d>(vals)); */ //save Index: sandbox/jardonnet/registration/icp_ref.hh --- sandbox/jardonnet/registration/icp_ref.hh (revision 2267) +++ sandbox/jardonnet/registration/icp_ref.hh (working copy) @@ -183,7 +183,7 @@ mln_piter(p_array) p(x); for_all(p) { - point2d qp = make::point2d(p[0], p[1]); + point2d qp = point2d(p[0], p[1]); if (tmp.has(qp)) tmp(qp) = literal::white; } @@ -209,7 +209,7 @@ for_all(p) { algebra::vec<3,float> p_ = P(p), qp_ = qk(p_); - point2d qp = make::point2d(int(qp_[0]), int(qp_[1])); + point2d qp = point2d(int(qp_[0]), int(qp_[1])); if (tmp.has(qp)) tmp(qp) = c; } Index: sandbox/jardonnet/registration/icp.hh --- sandbox/jardonnet/registration/icp.hh (revision 2267) +++ sandbox/jardonnet/registration/icp.hh (working copy) @@ -189,7 +189,7 @@ mln_piter(p_array) p(x); for_all(p) { - point2d qp = make::point2d(p[0], p[1]); + point2d qp = point2d(p[0], p[1]); if (tmp.has(qp)) tmp(qp) = literal::green; } @@ -231,7 +231,7 @@ for_all(p) { algebra::vec<3,float> p_ = point3d(p), qp_ = qk(p_); - point2d qp = make::point2d(int(qp_[0]), int(qp_[1])); + point2d qp = point2d(int(qp_[0]), int(qp_[1])); if (tmp.has(qp)) tmp(qp) = c; } Index: sandbox/geraud/cs2d/kruskal.cc --- sandbox/geraud/cs2d/kruskal.cc (revision 2267) +++ sandbox/geraud/cs2d/kruskal.cc (working copy) @@ -232,8 +232,8 @@ win_p_e2c = nbh_e2c; win_p_e2c - .insert_true(make::dpoint2d(0,0)) - .insert_false(make::dpoint2d(0,0)); + .insert_true(dpoint2d(0,0)) + .insert_false(dpoint2d(0,0)); bool e2e_h[] = { 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, Index: sandbox/geraud/cs2d/tuto_bis.cc --- sandbox/geraud/cs2d/tuto_bis.cc (revision 2267) +++ sandbox/geraud/cs2d/tuto_bis.cc (working copy) @@ -155,8 +155,8 @@ win_p_e2c = nbh_e2c; win_p_e2c - .insert_true(make::dpoint2d(0,0)) - .insert_false(make::dpoint2d(0,0)); + .insert_true(dpoint2d(0,0)) + .insert_false(dpoint2d(0,0)); bool e2e_h[] = { 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, Index: sandbox/garrigues/level_set.hh --- sandbox/garrigues/level_set.hh (revision 2267) +++ sandbox/garrigues/level_set.hh (working copy) @@ -152,7 +152,7 @@ // image2d<bool> d(make::box2d(-1, -1, 1, 1)); // level::fill(d, 0); // mln_fwd_niter(clock_neighb2d) n(nbh , p); -// mln_fwd_niter(clock_neighb2d) dn(nbh , make::point2d(0, 0)); +// mln_fwd_niter(clock_neighb2d) dn(nbh , point2d(0, 0)); // for_all_2(n, dn) // { // d(dn) = Index: sandbox/garrigues/fllt/essai.cc --- sandbox/garrigues/fllt/essai.cc (revision 2267) +++ sandbox/garrigues/fllt/essai.cc (working copy) @@ -22,8 +22,8 @@ // { // bb_.init(); // level::fill(ima_, false); -// bb_.take(make::point2d(2,2)); -// bb_.take(make::point2d(2,3)); +// bb_.take(point2d(2,2)); +// bb_.take(point2d(2,3)); // } // sub_image<image2d<value::int_u8>, box2d> image() Index: sandbox/garrigues/fllt/fllt_simple.svg.3.cc --- sandbox/garrigues/fllt/fllt_simple.svg.3.cc (revision 2267) +++ sandbox/garrigues/fllt/fllt_simple.svg.3.cc (working copy) @@ -312,19 +312,19 @@ // C6 neigboohood. arr_dp_t neighb_c6[2]; - neighb_c6[0].push_back(make::dpoint2d(-1,-1)); - neighb_c6[0].push_back(make::dpoint2d(-1,0)); - neighb_c6[0].push_back(make::dpoint2d(-1,1)); - neighb_c6[0].push_back(make::dpoint2d(0,1)); - neighb_c6[0].push_back(make::dpoint2d(1,0)); - neighb_c6[0].push_back(make::dpoint2d(0,-1)); - - neighb_c6[1].push_back(make::dpoint2d(-1,0)); - neighb_c6[1].push_back(make::dpoint2d(0,1)); - neighb_c6[1].push_back(make::dpoint2d(1,1)); - neighb_c6[1].push_back(make::dpoint2d(1,0)); - neighb_c6[1].push_back(make::dpoint2d(1,-1)); - neighb_c6[1].push_back(make::dpoint2d(0,-1)); + neighb_c6[0].push_back(dpoint2d(-1,-1)); + neighb_c6[0].push_back(dpoint2d(-1,0)); + neighb_c6[0].push_back(dpoint2d(-1,1)); + neighb_c6[0].push_back(dpoint2d(0,1)); + neighb_c6[0].push_back(dpoint2d(1,0)); + neighb_c6[0].push_back(dpoint2d(0,-1)); + + neighb_c6[1].push_back(dpoint2d(-1,0)); + neighb_c6[1].push_back(dpoint2d(0,1)); + neighb_c6[1].push_back(dpoint2d(1,1)); + neighb_c6[1].push_back(dpoint2d(1,0)); + neighb_c6[1].push_back(dpoint2d(1,-1)); + neighb_c6[1].push_back(dpoint2d(0,-1)); // Variables. image2d<map_cell<node_type> > map(input.domain().to_larger(1)); Index: sandbox/garrigues/fllt/fllt_simple.cc --- sandbox/garrigues/fllt/fllt_simple.cc (revision 2267) +++ sandbox/garrigues/fllt/fllt_simple.cc (working copy) @@ -158,19 +158,19 @@ if (!toto) { toto = true; - c6_neighb::nbhs[0].append(make::dpoint2d(-1,-1)); - c6_neighb::nbhs[0].append(make::dpoint2d(-1,0)); - c6_neighb::nbhs[0].append(make::dpoint2d(-1,1)); - c6_neighb::nbhs[0].append(make::dpoint2d(0,1)); - c6_neighb::nbhs[0].append(make::dpoint2d(1,0)); - c6_neighb::nbhs[0].append(make::dpoint2d(0,-1)); - - c6_neighb::nbhs[1].append(make::dpoint2d(-1,0)); - c6_neighb::nbhs[1].append(make::dpoint2d(0,1)); - c6_neighb::nbhs[1].append(make::dpoint2d(1,1)); - c6_neighb::nbhs[1].append(make::dpoint2d(1,0)); - c6_neighb::nbhs[1].append(make::dpoint2d(1,-1)); - c6_neighb::nbhs[1].append(make::dpoint2d(0,-1)); + c6_neighb::nbhs[0].append(dpoint2d(-1,-1)); + c6_neighb::nbhs[0].append(dpoint2d(-1,0)); + c6_neighb::nbhs[0].append(dpoint2d(-1,1)); + c6_neighb::nbhs[0].append(dpoint2d(0,1)); + c6_neighb::nbhs[0].append(dpoint2d(1,0)); + c6_neighb::nbhs[0].append(dpoint2d(0,-1)); + + c6_neighb::nbhs[1].append(dpoint2d(-1,0)); + c6_neighb::nbhs[1].append(dpoint2d(0,1)); + c6_neighb::nbhs[1].append(dpoint2d(1,1)); + c6_neighb::nbhs[1].append(dpoint2d(1,0)); + c6_neighb::nbhs[1].append(dpoint2d(1,-1)); + c6_neighb::nbhs[1].append(dpoint2d(0,-1)); } return nbhs[abs(p[1] % 2)]; Index: sandbox/garrigues/fllt/fllt_simple.svg.2.cc --- sandbox/garrigues/fllt/fllt_simple.svg.2.cc (revision 2267) +++ sandbox/garrigues/fllt/fllt_simple.svg.2.cc (working copy) @@ -151,19 +151,19 @@ // C6 neigboohood. arr_dp_t neighb_c6[2]; - neighb_c6[0].push_back(make::dpoint2d(-1,-1)); - neighb_c6[0].push_back(make::dpoint2d(-1,0)); - neighb_c6[0].push_back(make::dpoint2d(-1,1)); - neighb_c6[0].push_back(make::dpoint2d(0,-1)); - neighb_c6[0].push_back(make::dpoint2d(0,1)); - neighb_c6[0].push_back(make::dpoint2d(1,0)); - - neighb_c6[1].push_back(make::dpoint2d(1,-1)); - neighb_c6[1].push_back(make::dpoint2d(1,0)); - neighb_c6[1].push_back(make::dpoint2d(1,1)); - neighb_c6[1].push_back(make::dpoint2d(0,-1)); - neighb_c6[1].push_back(make::dpoint2d(0,1)); - neighb_c6[1].push_back(make::dpoint2d(-1,0)); + neighb_c6[0].push_back(dpoint2d(-1,-1)); + neighb_c6[0].push_back(dpoint2d(-1,0)); + neighb_c6[0].push_back(dpoint2d(-1,1)); + neighb_c6[0].push_back(dpoint2d(0,-1)); + neighb_c6[0].push_back(dpoint2d(0,1)); + neighb_c6[0].push_back(dpoint2d(1,0)); + + neighb_c6[1].push_back(dpoint2d(1,-1)); + neighb_c6[1].push_back(dpoint2d(1,0)); + neighb_c6[1].push_back(dpoint2d(1,1)); + neighb_c6[1].push_back(dpoint2d(0,-1)); + neighb_c6[1].push_back(dpoint2d(0,1)); + neighb_c6[1].push_back(dpoint2d(-1,0)); // Variables. I u = mln::clone(input);

16 years, 3 months

scool r82: Minor changes

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-15 Maxime van Noppen <yabo(a)lrde.epita.fr> Minor changes * scl-syn/Lexical.sdf: Fix rules being in the wrong place. * scoolt/Expression.meta: New. scl-syn/Lexical.sdf | 40 +++++++++++++++++++++------------------- scoolt/Expression.meta | 1 + 2 files changed, 22 insertions(+), 19 deletions(-) Index: branches/scool-ng/src/scoolt/Expression.meta =================================================================== --- branches/scool-ng/src/scoolt/Expression.meta (revision 0) +++ branches/scool-ng/src/scoolt/Expression.meta (revision 82) @@ -0,0 +1 @@ +Meta([Syntax("concrete-syn")]) Index: branches/scool-ng/src/scl-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Lexical.sdf (revision 81) +++ branches/scool-ng/src/scl-syn/Lexical.sdf (revision 82) @@ -14,24 +14,6 @@ "\"" [A-Za-z0-9]* "\"" -> String {cons("String")} ~[\ ]~[\]\|]*~[\ ] -> RawCxx - "class" -> Identifier {reject} - "concept" -> Identifier {reject} - "var" -> Identifier {reject} - "final" -> Identifier {reject} - "models" -> Identifier {reject} - "type" -> Identifier {reject} - "ref" -> Identifier {reject} - "public" -> Identifier {reject} - "protected" -> Identifier {reject} - "private" -> Identifier {reject} - "where" -> Identifier {reject} - - "char" -> Identifier {reject} - "int" -> Identifier {reject} - "float" -> Identifier {reject} - "string" -> Identifier {reject} - "void" -> Identifier {reject} - "//" ~[\n]* [\n] -> LAYOUT [\ \t\n] -> LAYOUT BlockComment -> LAYOUT @@ -53,10 +35,30 @@ context-free syntax + + "class" -> Identifier {reject} + "concept" -> Identifier {reject} + "var" -> Identifier {reject} + "final" -> Identifier {reject} + "models" -> Identifier {reject} + "type" -> Identifier {reject} + "ref" -> Identifier {reject} + "public" -> Identifier {reject} + "protected" -> Identifier {reject} + "private" -> Identifier {reject} + "where" -> Identifier {reject} + + "char" -> Identifier {reject} + "int" -> Identifier {reject} + "float" -> Identifier {reject} + "string" -> Identifier {reject} + "void" -> Identifier {reject} + + Id -> Identifier {cons("Identifier")} lexical restrictions - Identifier -/- [A-Za-z0-9\_] + Id -/- [A-Za-z0-9\_] Asterisk -/- [\/] Slash -/- [\*] -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

scool r81: Rename tests.

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-15 Maxime van Noppen <yabo(a)lrde.epita.fr> Rename tests. * function/scool_ast/parameters_arguments_001.aterm: New. * function/scool_ast/parameters_arguments_002.aterm: New. * function/scool_ast/parameters_arguments_003.aterm: New. * function/scool_ast/parameters_arguments_005.aterm: New. * function/scool_ast/static_dynamic_parameters_001.aterm: Remove. * function/scool_ast/static_dynamic_parameters_002.aterm: Remove. * function/scool_ast/static_dynamic_parameters_003.aterm: Remove. * function/scool_ast/static_dynamic_parameters_005.aterm: Remove. * function/scool_src/parameters_arguments_001.scl: New. * function/scool_src/parameters_arguments_002.scl: New. * function/scool_src/parameters_arguments_003.scl: New. * function/scool_src/parameters_arguments_005.scl: New. * function/scool_src/static_dynamic_parameters_001.scl: Remove. * function/scool_src/static_dynamic_parameters_002.scl: Remove. * function/scool_src/static_dynamic_parameters_003.scl: Remove. * function/scool_src/static_dynamic_parameters_005.scl: Remove. scool_ast/parameters_arguments_001.aterm | 1 + scool_ast/parameters_arguments_002.aterm | 1 + scool_ast/parameters_arguments_003.aterm | 1 + scool_ast/parameters_arguments_005.aterm | 1 + scool_src/parameters_arguments_001.scl | 1 + scool_src/parameters_arguments_002.scl | 1 + scool_src/parameters_arguments_003.scl | 1 + scool_src/parameters_arguments_005.scl | 1 + 8 files changed, 8 insertions(+) Index: branches/scool-ng/tests/function/scool_ast/static_dynamic_parameters_001.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_ast/static_dynamic_parameters_002.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_ast/static_dynamic_parameters_003.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_ast/static_dynamic_parameters_005.aterm (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_ast/parameters_arguments_001.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/parameters_arguments_001.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/parameters_arguments_001.aterm (revision 81) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("f"),FunctionType(Some(ParametersDeclaration([TypedId(Identifier("T"),"type")])),ArgumentsDeclaration([TypedId(Identifier("a"),SimpleType("T"))]),SimpleType("T")),FunctionBlock(Identifier("a")))]) Index: branches/scool-ng/tests/function/scool_ast/parameters_arguments_002.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/parameters_arguments_002.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/parameters_arguments_002.aterm (revision 81) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("f"),FunctionType(Some(ParametersDeclaration([TypedId(Identifier("T"),"type")])),ArgumentsDeclaration([TypedId(Identifier("a"),SimpleType("T"))]),SimpleType("void")),FunctionBlock([ReturnStatement(Identifier("a"))]))]) Index: branches/scool-ng/tests/function/scool_ast/parameters_arguments_003.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/parameters_arguments_003.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/parameters_arguments_003.aterm (revision 81) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("f"),FunctionType(Some(ParametersDeclaration([TypedId(Identifier("T"),"type")])),ArgumentsDeclaration([TypedId(Identifier("a"),SimpleType("T"))]),SimpleType("void")),FunctionBlock(Identifier("a")))]) Index: branches/scool-ng/tests/function/scool_ast/parameters_arguments_005.aterm =================================================================== --- branches/scool-ng/tests/function/scool_ast/parameters_arguments_005.aterm (revision 0) +++ branches/scool-ng/tests/function/scool_ast/parameters_arguments_005.aterm (revision 81) @@ -0,0 +1 @@ +Program([FunctionDefinition(None,Identifier("f"),FunctionType(Some(ParametersDeclaration([TypedId(Identifier("T"),"type"),TypedId(Identifier("U"),"type")])),ArgumentsDeclaration([TypedId(Identifier("a"),SimpleType("T")),TypedId(Identifier("b"),SimpleType("U"))]),SimpleType("T")),FunctionBlock(Identifier("a")))]) Index: branches/scool-ng/tests/function/scool_src/static_dynamic_parameters_002.scl (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_src/static_dynamic_parameters_003.scl (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_src/static_dynamic_parameters_005.scl (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_src/static_dynamic_parameters_001.scl (deleted) =================================================================== Index: branches/scool-ng/tests/function/scool_src/parameters_arguments_001.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/parameters_arguments_001.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/parameters_arguments_001.scl (revision 81) @@ -0,0 +1 @@ +f : [T : type] (a : T) -> T = a; Index: branches/scool-ng/tests/function/scool_src/parameters_arguments_002.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/parameters_arguments_002.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/parameters_arguments_002.scl (revision 81) @@ -0,0 +1 @@ +f : [T : type] (a : T) -> void = { -> a; } Index: branches/scool-ng/tests/function/scool_src/parameters_arguments_003.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/parameters_arguments_003.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/parameters_arguments_003.scl (revision 81) @@ -0,0 +1 @@ +f : [T : type] (a : T) -> void = a; Index: branches/scool-ng/tests/function/scool_src/parameters_arguments_005.scl =================================================================== --- branches/scool-ng/tests/function/scool_src/parameters_arguments_005.scl (revision 0) +++ branches/scool-ng/tests/function/scool_src/parameters_arguments_005.scl (revision 81) @@ -0,0 +1 @@ +f : [T : type, U : type] (a : T, b : U) -> T = a; -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

cleanup-2008 2267: Updtae fun::x2x::rotation.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Updtae fun::x2x::rotation. * mln/fun/x2x/rotation.hh: Fix h_mat construction. * sandbox/jardonnet/virtual/access.cc: Update in consequencce. mln/fun/x2x/rotation.hh | 51 ++++++++++++------------------------ sandbox/jardonnet/virtual/access.cc | 10 ++++--- 2 files changed, 24 insertions(+), 37 deletions(-) Index: mln/fun/x2x/rotation.hh --- mln/fun/x2x/rotation.hh (revision 2266) +++ mln/fun/x2x/rotation.hh (working copy) @@ -51,17 +51,17 @@ namespace internal { template < unsigned n, typename C > - algebra::h_mat<n+1, C> - get_h_mat(const float alpha_, const algebra::vec<3,C>& axis_ + algebra::h_mat<n, C> + get_rot_h_mat(const float alpha_, const algebra::vec<3,C>& axis_) { assert(!"get_h_mat : n not implemented"); } template <typename C > - algebra::h_mat<4, C> - get_h_mat(const float alpha_, const algebra::vec<3,C>& axis_) + algebra::h_mat<3, C> + get_rot_h_mat(const float alpha_, const algebra::vec<3,C>& axis_) { - algebra::h_mat<4, C> m_; + algebra::h_mat<3, C> m_; const float cos_a = cos(alpha_); const float sin_a = sin(alpha_); @@ -74,17 +74,17 @@ const float uvw2 = u2 + v2 + w2; m_(0,0) = (u2 + (v2 + w2) * cos_a) / uvw2; - m_(0,1) = (u*v * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; - m_(0,2) = (u*w * (1 - cos_a) + v * math::sqrt(uvw2) * sin_a) / uvw2; + m_(0,1) = (u*v * (1 - cos_a) - u * std::sqrt(uvw2) * sin_a) / uvw2; + m_(0,2) = (u*w * (1 - cos_a) + v * std::sqrt(uvw2) * sin_a) / uvw2; m_(0,3) = 0; - m_(1,0) = (u*v * (1 - cos_a) + w * math::sqrt(uvw2) * sin_a) / uvw2; + m_(1,0) = (u*v * (1 - cos_a) + w * std::sqrt(uvw2) * sin_a) / uvw2; m_(1,1) = (v2 + (u2 + w2) * cos_a) / uvw2; - m_(1,2) = (v*w * (1 - cos_a) - u * math::sqrt(uvw2) * sin_a) / uvw2; + m_(1,2) = (v*w * (1 - cos_a) - u * std::sqrt(uvw2) * sin_a) / uvw2; m_(1,3) = 0; - m_(2,0) = (u*w * (1 - cos_a) - v * math::sqrt(uvw2) * sin_a) / uvw2; - m_(2,1) = (v*w * (1 - cos_a) + u * math::sqrt(uvw2) * sin_a) / uvw2; + m_(2,0) = (u*w * (1 - cos_a) - v * std::sqrt(uvw2) * sin_a) / uvw2; + m_(2,1) = (v*w * (1 - cos_a) + u * std::sqrt(uvw2) * sin_a) / uvw2; m_(2,1) = (u2 + (u2 + v2) * cos_a) / uvw2; m_(2,3) = 0; @@ -97,23 +97,10 @@ } template <typename C > - algebra::h_mat<3, C> - get_h_mat(const float alpha_, const algebra::vec<2,C>& axis_ + algebra::h_mat<2, C> + get_rot_h_mat(const float alpha_, const algebra::vec<2,C>& axis_) { - algebra::h_mat<3, C> m_; - const float cos_a = cos(alpha_); - const float sin_a = sin(alpha_); - const algebra::vec<4,float> vec - = make::vec(cos_a, -sin_a, sin_a, cos_a); - unsigned k = 0; - for (unsigned i = 0; i < 3; ++i) - for (unsigned j = 0; j < 3; ++j) - { - if (j != this->dir_ && i != this->dir_) - this->m_(i, j) = vec[k++]; - else - this->m_(i, j) = (i == j); - } + assert(!"not implemented yet"); } } @@ -136,7 +123,7 @@ /// Constructor without argument. rotation(); /// Constructor with grade alpha and a facultative direction (rotation axis). - rotation(float alpha, algebra::vec<n,float>& axis); + rotation(float alpha, const algebra::vec<n,float>& axis); using super_::operator(); /// Perform the rotation of the given vector. @@ -165,11 +152,10 @@ template <unsigned n, typename C> inline - rotation<n,C>::rotation(float alpha, algebra::vec<n,float>& axis) + rotation<n,C>::rotation(float alpha, const algebra::vec<n,float>& axis) :alpha_(alpha), axis_(axis) { - mln_precondition(dir == 2 || n == 3); this->m_ = algebra::h_mat<n,C>::Id; update(); } @@ -216,8 +202,6 @@ void rotation<n,C>::set_dir(unsigned dir) { - mln_precondition(dir == 2 || n == 3); - dir_ = dir; update(); } @@ -228,8 +212,7 @@ void rotation<n,C>::update() { - assert(n == 3); // debug - + this->m_ = internal::get_rot_h_mat(alpha_, axis_); } # endif // ! MLN_INCLUDE_ONLY Index: sandbox/jardonnet/virtual/access.cc --- sandbox/jardonnet/virtual/access.cc (revision 2266) +++ sandbox/jardonnet/virtual/access.cc (working copy) @@ -1,5 +1,5 @@ - #include <iostream> + #include "access.hh" #include <mln/core/image/image2d.hh> #include <mln/fun/x2x/all.hh> @@ -11,8 +11,12 @@ using namespace mln; image2d<int> img(50,50); point2d p(5,5); - algebra::vec<2,float> v = make::vec(3,4); - fun::x2x::translation<2,float> t(v); + + + //transformation + fun::x2x::translation<2,float> t(make::vec(3,4)); + fun::x2x::rotation<2,float> r(90., make::vec(0,1)); + interpolation::nearest_neighbor< image2d<int> > nn(img); debug::iota(img);

16 years, 3 months

← Newer
1
...
19
20
21
22
23
24
25
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2008