- Olena-patches

milena r1189: Put init_ outside of namespace impl
by Matthieu Garrigues 28 Sep '07

28 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-28 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Put init_ outside of namespace impl. * mln/core/image1d_b.hh, * mln/core/image3d_b.hh, * mln/core/image_if.hh, * mln/core/sub_image.hh, * sandbox/garrigues/TODO: Update. --- mln/core/image1d_b.hh | 17 +---------------- mln/core/image3d_b.hh | 13 +------------ mln/core/image_if.hh | 8 +------- mln/core/sub_image.hh | 2 +- sandbox/garrigues/TODO | 19 +++++++++++++++++++ 5 files changed, 23 insertions(+), 36 deletions(-) Index: trunk/milena/mln/core/image_if.hh =================================================================== --- trunk/milena/mln/core/image_if.hh (revision 1188) +++ trunk/milena/mln/core/image_if.hh (revision 1189) @@ -124,10 +124,7 @@ # ifndef MLN_INCLUDE_ONLY - // impl::init_ - - namespace impl - { + // init_ template <typename I, typename F> void init_(tag::function_t, F& f, const image_if<I,F>& model) @@ -149,9 +146,6 @@ // target.init_(ima, pset); } - } // end of namespace mln::impl - - // internal::data_< image_if<I,S> > namespace internal Index: trunk/milena/mln/core/sub_image.hh =================================================================== --- trunk/milena/mln/core/sub_image.hh (revision 1188) +++ trunk/milena/mln/core/sub_image.hh (revision 1189) @@ -98,7 +98,7 @@ # ifndef MLN_INCLUDE_ONLY - // impl::init_ + // init_ template <typename I, typename S, typename J> void init_(tag::image_t, sub_image<I,S>& target, const J& model) Index: trunk/milena/mln/core/image1d_b.hh =================================================================== --- trunk/milena/mln/core/image1d_b.hh (revision 1188) +++ trunk/milena/mln/core/image1d_b.hh (revision 1189) @@ -196,24 +196,12 @@ T* buffer(); }; - - namespace impl - { - template <typename T, typename J> void init_(tag::image_t, mln::image1d_b<T>& target, const J& model); - } // end of namespace mln::impl - - - # ifndef MLN_INCLUDE_ONLY - // impl::init_ - - namespace impl - { - + // init_ template <typename T> void init_(tag::border_t, unsigned& b, const image1d_b<T>& model) { @@ -230,9 +218,6 @@ target.init_(b, bdr); } - } // end of namespace mln::impl - - // internal::data_< image1d_b<T> > namespace internal Index: trunk/milena/mln/core/image3d_b.hh =================================================================== --- trunk/milena/mln/core/image3d_b.hh (revision 1188) +++ trunk/milena/mln/core/image3d_b.hh (revision 1189) @@ -202,23 +202,14 @@ using super_::data_; }; - - namespace impl - { - template <typename T, typename J> void init_(tag::image_t, mln::image3d_b<T>& target, const J& model); - } // end of namespace mln::impl - # ifndef MLN_INCLUDE_ONLY - // impl::init_ - - namespace impl - { + // init_ template <typename T> void init_(tag::border_t, unsigned& b, const image3d_b<T>& model) @@ -236,8 +227,6 @@ target.init_(b, bdr); } - } // end of namespace mln::impl - // internal::data_< image3d_b<T> > Index: trunk/milena/sandbox/garrigues/TODO =================================================================== --- trunk/milena/sandbox/garrigues/TODO (revision 1188) +++ trunk/milena/sandbox/garrigues/TODO (revision 1189) @@ -22,3 +22,22 @@ C R make/window1d.hh C R make/w_window1d.hh C R make/w_window1d_int.hh + +no init ./mln/core/cast_image.hh: typedef cast_image_< tag::value_<T>, tag::image_ > skeleton; +no init ./mln/core/decorated_image.hh: typedef decorated_image< tag::image_, tag::data_<D> > skeleton; +done ./mln/core/image1d_b.hh: typedef image1d_b< tag::value_<T> > skeleton; +done ./mln/core/image2d_b.hh: typedef image2d_b< tag::value_<T> > skeleton; +done ./mln/core/image3d_b.hh: typedef image3d_b< tag::value_<T> > skeleton; +done ./mln/core/image_if.hh: typedef image_if< tag::image_, tag::function_<F> > skeleton; +no init ./mln/core/interpolated.hh: typedef interpolated< tag::image_ > skeleton; +no init ./mln/core/plain.hh: typedef plain< tag::image_ > skeleton; +no init ./mln/core/rle_image.hh: typedef rle_image< tag::psite_, tag::value_<T> > skeleton; +no init ./mln/core/safe.hh: typedef safe_image< tag::image_ > skeleton; +no init ./mln/core/sparse_image.hh: typedef sparse_image< tag::psite_, tag::value_<T> > skeleton; +done ./mln/core/sub_image.hh: typedef sub_image< tag::image_, tag::pset_<S> > skeleton; +no init ./mln/core/t_image.hh: typedef t_image< tag::image_ > skeleton; +no init ./mln/core/tr_image.hh: typedef tr_image< T, tag::image_ > skeleton; +no init ./mln/pw/image.hh: typedef image< tag::function_<F>, tag::pset_<S> > skeleton; +./mln/trait/ch_value.hh: typedef typename I::skeleton skeleton; +./mln/trait/ch_value.hh: typedef typename impl::ch_value_<skeleton, V>::ret ret; +no init ./mln/value/stack.hh: typedef stack_image< n, tag::image_ > skeleton;

1 0

milena r1188: Add test for draw mesh_image and update mesh_image
by Guillaume Duhamel 27 Sep '07

27 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add test for draw mesh_image and update mesh_image. Draw mesh. * main_mesh_image.cc: New test draw_mesh. Update. * draw_mesh.hh, * mesh_image.hh, * main.cc: Update. --- draw_mesh.hh | 30 ++++++++-------- main.cc | 10 +++-- main_mesh_image.cc | 64 +++++++++++++++++++++++++++++++++++ mesh_image.hh | 96 +++++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 162 insertions(+), 38 deletions(-) Index: trunk/milena/sandbox/duhamel/main_mesh_image.cc =================================================================== --- trunk/milena/sandbox/duhamel/main_mesh_image.cc (revision 0) +++ trunk/milena/sandbox/duhamel/main_mesh_image.cc (revision 1188) @@ -0,0 +1,64 @@ +#include <mln/core/image2d_b.hh> +#include <mln/core/point2d.hh> +#include <mln/debug/println.hh> +#include "graph.hh" +#include "mesh_p.hh" +#include "mesh_psite.hh" +#include "draw_mesh.hh" +#include "mesh_image.hh" +#include <mln/core/interpolated.hh> + +using namespace mln; + +int +main (void) +{ + util::graph<void> g; + + g.add_node (); + g.add_node (); + g.add_node (); + g.add_node (); + g.add_node (); + g.add_node (); + + g.add_edge (0, 1); + g.add_edge (1, 2); + g.add_edge (2, 3); + g.add_edge (1, 3); + g.add_edge (4, 5); + g.add_edge (1, 4); + + g.coherence (); + // 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)); + + + image2d_b<int> ima (20, 20, 1); + + mesh_p<point2d> m(g, v); + + draw::mesh (ima, m, 7, 1); + + std::vector<int> val; + + val.push_back (2); + val.push_back (3); + val.push_back (4); + val.push_back (5); + val.push_back (6); + val.push_back (7); + + mesh_image<point2d, int> im (m, val); + + draw::mesh (ima, im); + + debug::println (ima); +} Index: trunk/milena/sandbox/duhamel/mesh_image.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1187) +++ trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1188) @@ -40,6 +40,7 @@ # include "mesh_p.hh" # include "mesh_psite.hh" # include <vector> +# include <mln/core/box2d.hh> namespace mln { @@ -53,10 +54,11 @@ template <typename P, typename V> struct data_< mesh_image<P, V> > { - data_(mesh_p& ima, std::vector<V>& val_); + data_(mesh_p& mesh, std::vector<V>& val); - mesh_p mesh_; std::vector<V> val_; + mesh_p mesh_; + box2d b_; }; } // end of namespace mln::internal @@ -68,7 +70,7 @@ struct mesh_image : public internal::image_primary_< box2d, mesh_image<P, V> > { - // typedef mln::internal::image_primary_< box2d, mesh_image<P, V> > super_; + typedef mln::internal::image_base_< box2d, mesh_image<P, V> > super_; /// Point_Site associated type. typedef P psite; @@ -77,7 +79,7 @@ typedef V value; /// Return type of read-write access. - typedef V& lvalue; // FIXME: Depends on lvalue presence in I. + typedef V& lvalue; /// Return type of read-only access. typedef V rvalue; @@ -97,29 +99,40 @@ /// Test if this image has been initialized. bool has_data() const; -// /// Test if a pixel value is accessible at \p p -// using super_::owns_; + const box2d& domain() const; + + /// Test if a pixel value is accessible at \p p + using super_::owns_; /// Test if a pixel value is accessible at \p v. bool owns_(const mln::metal::vec<P::dim, float>& v) const; -// /// Read-only access of pixel value at point site \p p. -// /// Mutable access is only OK for reading (not writing). -// using super_::operator(); + /// Read-only access of pixel value at point site \p p. + rvalue operator()(const P& p) const; + + /// Read-write access of pixel value at point site \p p. + lvalue operator()(const P& p); + V& operator()(const mln::metal::vec<P::dim, float>& v) const; -// /// Give the set of values of the image. -// const vset& values() const; + /// Give the set of values of the image. + const vset& values() const; + + const std::vector<V>& data_values () const; + + const mesh_p& data_mesh () const; }; + # ifndef MLN_INCLUDE_ONLY namespace internal { + template <typename P, typename V> data_< mesh_image<P, V> >::data_(mesh_p& mesh, std::vector<V>& val) : val_ (val), @@ -149,6 +162,14 @@ } template <typename P, typename V> + const box2d& + mesh_image<P, V>::domain() const + { + mln_precondition(this->has_data()); + return this->data_->b_; + } + + template <typename P, typename V> bool mesh_image<P, V>::owns_(const mln::metal::vec<P::dim, float>& v) const { for (unsigned i = 0; i < this->data_->val_.size(); ++i) @@ -161,21 +182,56 @@ V& mesh_image<P, V>::operator()(const mln::metal::vec<P::dim, float>& v) const { + // FIXME unsigned i = 0; // for (i = 0; i < this->data_->val_.size(); ++i) // if (this->data_->mesh_.loc_[i] == v) // break; - return this->data_->mesh_.gr.loc_[i]; +// mln_invariant(i == this->data_->val_.size()); + return this->data_->val_[i]; + } + + template <typename P, typename V> + typename mesh_image<P, V>::rvalue + mesh_image<P, V>::operator()(const P& ) const + { + // FIXME + unsigned i = 0; + return this->data_->val_[i]; } -// // FIXME : Should we remove this method? (and inherit it from -// // identity morpher) -// template <typename P, typename V> -// const vset & -// mesh_image<P, V>::values() const -// { -// return vset::the(); -// } + template <typename P, typename V> + typename mesh_image<P, V>::lvalue + mesh_image<P, V>::operator()(const P& ) + { + // FIXME + unsigned i = 0; + return this->data_->val_[i]; + } + + + // FIXME : Should we remove this method? (and inherit it from + // identity morpher) + template <typename P, typename V> + const mln::value::set<V> & + mesh_image<P, V>::values() const + { + return vset::the(); + } + + template <typename P, typename V> + const std::vector<V>& + mesh_image<P, V>::data_values () const + { + return this->data_->val_; + } + + template <typename P, typename V> + const mesh_p& + mesh_image<P, V>::data_mesh () const + { + return this->data_->mesh_; + } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1187) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1188) @@ -220,21 +220,21 @@ exact(ima)(m.loc_[i]) = node_v; } -// template <typename I, typename P, typename V> -// void -// mesh(Image& ima, const mesh_image<P, V>& mesh) -// { -// // level::fill(ima, 0); - -// // for (unsigned i = 0; i < m.gr_.nb_link_; ++i) -// // line (exact(ima), -// // m.loc_[m.gr_.links_[i]->node1], -// // m.loc_[m.gr_.links_[i]->node2], -// // 1); - -// // for (unsigned i = 0; i < m.gr_.nb_node_; ++i) -// // exact(ima)(m.loc_[i]) = mesh.val_[i]; -// } + template <typename I, typename P, typename V> + void + mesh(Image& ima, const mesh_image<P, V>& mesh) + { + level::fill(ima, 0); + + for (unsigned i = 0; i < mesh.data_mesh ().gr_.nb_link_; ++i) + line (exact(ima), + mesh.data_mesh ().loc_[mesh.data_mesh ().gr_.links_[i]->node1], + mesh.data_mesh ().loc_[mesh.data_mesh ().gr_.links_[i]->node2], + 1); + + for (unsigned i = 0; i < mesh.data_mesh ().gr_.nb_node_; ++i) + exact(ima)(mesh.data_mesh ().loc_[i]) = mesh.data_values ()[i]; + } } // end of draw Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1187) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1188) @@ -49,12 +49,16 @@ std::vector<int> val; - val.push_back (8); + val.push_back (2); + val.push_back (3); + val.push_back (4); + val.push_back (5); val.push_back (6); + val.push_back (7); - // mesh_image<point2d, int> im (m, val); + mesh_image<point2d, int> im (m, val); - // draw::mesh (ima, im); + draw::mesh (ima, im); debug::println (ima); }

1 0

milena r1187: Somes fixes
by Simon Nivault 27 Sep '07

27 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-27 Simon Nivault <simon.nivault(a)lrde.epita.fr> Somes fixes. * mln/core/tr_image.hh: Add routines has. * mln/fun/x2x/rotation.hh: Fix and factor some code. * mln/metal/mat.hh: Fix operator*. * tests/tr_image.cc: Update, test in 3d. --- mln/core/tr_image.hh | 15 +++++++++++ mln/fun/x2x/rotation.hh | 63 +++++++++++++++++++++++++----------------------- mln/metal/mat.hh | 52 +++++++++++++++++++-------------------- tests/tr_image.cc | 26 ++++++++++--------- 4 files changed, 88 insertions(+), 68 deletions(-) Index: trunk/milena/tests/tr_image.cc =================================================================== --- trunk/milena/tests/tr_image.cc (revision 1186) +++ trunk/milena/tests/tr_image.cc (revision 1187) @@ -32,35 +32,37 @@ #include <iostream> -#include <mln/fun/x2x/translation.hh> -#include <mln/core/image2d_b.hh> +#include <mln/fun/x2x/rotation.hh> +#include <mln/core/image3d_b.hh> #include <mln/value/int_u8.hh> -#include <mln/io/pgm/load.hh> -#include <mln/io/pgm/save.hh> #include <mln/core/tr_image.hh> +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> int main() { using namespace mln; using value::int_u8; - image2d_b<int_u8> lena = io::pgm::load("../img/lena.pgm"); - image2d_b<int_u8> out(lena.domain()); + image3d_b<int_u8> in(3, 3, 3); + image3d_b<int_u8> out(in.domain()); - fun::x2x::translation<2,float> rot1(make::vec(10., 10.)); + debug::iota(in); + debug::println(in); - tr_image<fun::x2x::translation<2,float>, image2d_b<int_u8> > inter(lena, rot1); + fun::x2x::rotation<3,float> rot1(1.67, 0); + tr_image<fun::x2x::rotation<3,float>, image3d_b<int_u8> > inter(in, rot1); - image2d_b<int_u8>::fwd_piter p(out.domain()); + image3d_b<int_u8>::fwd_piter p(out.domain()); for_all(p) { - metal::vec<2,int> vec = (image2d_b<int_u8>::point)p; - if (inter.owns_(vec)) + metal::vec<3,int> vec = (image3d_b<int_u8>::point)p; + if (inter.has(vec)) out(p) = inter(vec); else out(p) = 255; } - io::pgm::save(out, "out.pgm"); + debug::println(out); } Index: trunk/milena/mln/core/tr_image.hh =================================================================== --- trunk/milena/mln/core/tr_image.hh (revision 1186) +++ trunk/milena/mln/core/tr_image.hh (revision 1187) @@ -103,6 +103,11 @@ /// Test if a pixel value is accessible at \p v. bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; + using super_::has; + + /// Test if a pixel value is belonging to image at \p v. + bool has(const mln::metal::vec<I::point::dim, float>& v) const; + /// Read-only access of pixel value at point site \p p. /// Mutable access is only OK for reading (not writing). using super_::operator(); @@ -160,6 +165,16 @@ } template <typename T, typename I> + bool tr_image<T,I>::has(const metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + metal::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v2[i])); + return this->data_->ima_.domain().has(p); + } + + template <typename T, typename I> mln_value(I) tr_image<T,I>::operator()(const metal::vec<I::point::dim, float>& v) const { Index: trunk/milena/mln/fun/x2x/rotation.hh =================================================================== --- trunk/milena/mln/fun/x2x/rotation.hh (revision 1186) +++ trunk/milena/mln/fun/x2x/rotation.hh (revision 1187) @@ -68,6 +68,8 @@ void set_alpha(float alpha); void set_dir(unsigned dir); + void update(); + protected: float alpha_; @@ -89,23 +91,8 @@ :alpha_(alpha), dir_(dir) { - const float cos_a = cos(alpha_); - const float sin_a = sin(alpha_); - const metal::vec<4,float> vec = make::vec(cos_a, -sin_a, sin_a, cos_a); - - m_ = metal::mat<n+1,n+1,C>::Id; - unsigned k = 0; - for (unsigned i = 0; i <= n; ++i) - { - if (i == dir) - continue; - for (unsigned j = 0; j <= n; ++j) - { - if (j == dir) - continue; - m_(i, j) = vec[k++]; - } - } + mln_precondition(dir == 2 || n == 3); + update(); } template <unsigned n, typename C> @@ -139,40 +126,56 @@ void rotation<n,C>::set_alpha(float alpha) { - const float cos_a = cos(alpha); - const float sin_a = sin(alpha); - alpha_ = alpha; - - m_(0,0) = cos_a; - m_(0,1) = -sin_a; - m_(1,0) = sin_a; - m_(1,1) = cos_a; + update(); } template <unsigned n, typename C> void rotation<n,C>::set_dir(unsigned dir) { + mln_precondition(dir == 2 || n == 3); + dir_ = dir; + update(); + } + + template <unsigned n, typename C> + void + rotation<n,C>::update() + { const float cos_a = cos(alpha_); const float sin_a = sin(alpha_); - const metal::vec<4,float> vec(cos_a, -sin_a, sin_a, cos_a); + const metal::vec<4,float> vec = make::vec(cos_a, -sin_a, sin_a, cos_a); m_ = metal::mat<n+1,n+1,C>::Id; unsigned k = 0; - for (unsigned i = 0; i <= n; ++i) + for (unsigned i = 0; i < n; ++i) { - if (i == dir) + if (i == dir_) continue; - for (unsigned j = 0; j <= n; ++j) + for (unsigned j = 0; j < n; ++j) { - if (j == dir) + if (j == dir_) continue; m_(i, j) = vec[k++]; } } } +// template <typename C> FIXME : template parameter should be swapped +// void +// rotation<2,C>::update() +// { +// const float cos_a = cos(alpha_); +// const float sin_a = sin(alpha_); + +// m_ = metal::mat<3,3,C>::Id; +// m_(0, 0) = cos_a; +// m_(0, 1) = -sin_a; +// m_(1, 0) = sin_a; +// m_(1, 1) = cos_a; +// } + # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/metal/mat.hh =================================================================== --- trunk/milena/mln/metal/mat.hh (revision 1186) +++ trunk/milena/mln/metal/mat.hh (revision 1187) @@ -110,14 +110,6 @@ // * - template <unsigned n, unsigned m, typename T, typename U> - mat<n,m,T>& - operator*=(mat<n,m,T>& lhs, const U& scalar); - - template <unsigned n, unsigned m, typename T, typename U> - mat<n,m,typename binary_arith_trait<T,U>::ret> - operator*(mat<n,m,T>& lhs, const U& scalar); - template <unsigned n, unsigned m, unsigned o, typename T, typename U> mat<n,m,T>& operator*=(mat<n,o,T>& lhs, mat<o,m,U>& rhs); @@ -126,6 +118,14 @@ mat<n,m,typename binary_arith_trait<T,U>::ret> operator*(const mat<n,o,T>& lhs, const mat<o,m,U>& rhs); + template <unsigned n, unsigned m, typename T, typename U> + mat<n,m,T>& + operator*=(mat<n,m,T>& lhs, const U& scalar); + + template <unsigned n, unsigned m, typename T, typename U> + mat<n,m,typename binary_arith_trait<T,U>::ret> + operator*(const U& scalar, mat<n,m,T>& lhs); + // / template <unsigned n, unsigned m, typename T, typename U> @@ -294,45 +294,45 @@ // * - template <unsigned n, unsigned m, typename T, typename U> + template <unsigned n, unsigned m, unsigned o, typename T, typename U> mat<n,m,T>& - operator*=(mat<n,m,T>& lhs, const U& scalar) + operator*=(mat<n,o,T>& lhs, mat<o,m,U>& rhs) { - for (unsigned i = 0; i < n; ++i) - for (unsigned j = 0; j < m; ++j) - lhs(i, j) *= scalar; + lhs = lhs * rhs; return lhs; } - template <unsigned n, unsigned m, typename T, typename U> + template <unsigned n, unsigned m, unsigned o, typename T, typename U> mat<n,m,typename binary_arith_trait<T,U>::ret> - operator*(mat<n,m,T>& lhs, const U& scalar) + operator*(const mat<n,o,T>& lhs, const mat<o,m,U>& rhs) { mat<n,m,typename binary_arith_trait<T,U>::ret> tmp; for (unsigned i = 0; i < n; ++i) for (unsigned j = 0; j < m; ++j) - tmp[i][j] = lhs(i, j) * scalar; + { + tmp(i, j) = 0; + for (unsigned k = 0; k < o; ++k) + tmp(i, j) += lhs(i, k) * rhs(k, j); + } return tmp; } - template <unsigned n, unsigned m, unsigned o, typename T, typename U> + template <unsigned n, unsigned m, typename T, typename U> mat<n,m,T>& - operator*=(mat<n,o,T>& lhs, mat<o,m,U>& rhs) + operator*=(mat<n,m,T>& lhs, const U& scalar) { - lhs = lhs * rhs; + for (unsigned i = 0; i < n; ++i) + for (unsigned j = 0; j < m; ++j) + lhs(i, j) *= scalar; return lhs; } - template <unsigned n, unsigned m, unsigned o, typename T, typename U> + template <unsigned n, unsigned m, typename T, typename U> mat<n,m,typename binary_arith_trait<T,U>::ret> - operator*(const mat<n,o,T>& lhs, const mat<o,m,U>& rhs) + operator*(const U& scalar, mat<n,m,T>& lhs) { mat<n,m,typename binary_arith_trait<T,U>::ret> tmp; for (unsigned i = 0; i < n; ++i) for (unsigned j = 0; j < m; ++j) - { - tmp(i, j) = 0; - for (unsigned k = 0; k < o; ++k) - tmp(i, j) += lhs(i, k) * rhs(k, j); - } + tmp(i, j) = scalar * lhs(i, j); return tmp; }

1 0

milena r1186: Fix in plain image
by Matthieu Garrigues 27 Sep '07

27 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-27 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix in plain image. * mln/core/plain.hh, * tests/plain.cc: Fix. --- mln/core/plain.hh | 25 +++++++++++++++++-------- tests/plain.cc | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) Index: trunk/milena/tests/plain.cc =================================================================== --- trunk/milena/tests/plain.cc (revision 1185) +++ trunk/milena/tests/plain.cc (revision 1186) @@ -34,6 +34,7 @@ #include <mln/core/plain.hh> #include <mln/value/int_u8.hh> +#include <mln/level/compare.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> @@ -47,6 +48,27 @@ plain< image2d_b<int_u8> > lena = io::pgm::load<int_u8>("../img/lena.pgm"); + image2d_b<int_u8> ima; + image2d_b<int_u8> ima2; + + ima = lena; + + ima(make::point2d(0,0)) = 124; + + mln_assertion(ima != lena); + + ima2 = lena; + ima = lena; + + mln_assertion(ima == ima2); + + ima(make::point2d(0,0)) = 124; + mln_assertion(ima != ima2); + + ima = ima2; + + ima(make::point2d(0,0)) = 124; + mln_assertion(ima == ima2); } } Index: trunk/milena/mln/core/plain.hh =================================================================== --- trunk/milena/mln/core/plain.hh (revision 1185) +++ trunk/milena/mln/core/plain.hh (revision 1186) @@ -53,7 +53,7 @@ template <typename I> struct data_< plain > { - data_(I& ima); + data_(const I& ima); I ima_; }; @@ -95,6 +95,9 @@ /// Assignment operator. plain& operator=(const I& rhs); + + /// Convertion into an I image + operator I () const; }; @@ -104,21 +107,20 @@ namespace internal { - // internal::data_< plain<I,S> > + // internal::data_< plain > template <typename I> - data_< plain >::data_(I& ima) - : ima_(ima) + data_< plain >::data_(const I& ima) + : ima_(clone(ima)) { } } // end of namespace mln::internal template <typename I> - plain::plain(const I& ima_) + plain::plain(const I& ima) { - mln_precondition(ima_.has_data()); - I ima = clone(ima_); + mln_precondition(ima.has_data()); this->data_ = new internal::data_< plain >(ima); } @@ -126,11 +128,18 @@ plain& plain::operator=(const I& rhs) { + mln_precondition(rhs.has_data()); this->destroy(); - this->data_ = new internal::data_< plain >(clone(rhs)); + this->data_ = new internal::data_< plain >(rhs); return *this; } + template <typename I> + plain::operator I () const + { + return clone(this->data_->ima_); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

1 0

milena r1185: Update mesh_psite
by Guillaume Duhamel 27 Sep '07

27 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-27 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update mesh_psite. * draw_mesh.hh, * graph.hh, * graph.hxx, * main.cc, * mesh_image.hh, * mesh_p.hh, * mesh_psite.hh: Update. --- draw_mesh.hh | 2 - graph.hh | 8 +++---- graph.hxx | 9 ++++---- main.cc | 6 +++-- mesh_image.hh | 62 +++++++++++++++++++++++++++++----------------------------- mesh_p.hh | 11 ++++------ mesh_psite.hh | 16 +++++++++----- 7 files changed, 60 insertions(+), 54 deletions(-) Index: trunk/milena/sandbox/duhamel/mesh_image.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1184) +++ trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1185) @@ -38,6 +38,7 @@ # include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> # include "mesh_p.hh" +# include "mesh_psite.hh" # include <vector> namespace mln @@ -52,9 +53,9 @@ template <typename P, typename V> struct data_< mesh_image<P, V> > { - data_(Mesh_p& ima, std::vector<V>& val_); + data_(mesh_p& ima, std::vector<V>& val_); - Mesh_p mesh_; + mesh_p mesh_; std::vector<V> val_; }; @@ -67,7 +68,7 @@ struct mesh_image : public internal::image_primary_< box2d, mesh_image<P, V> > { - typedef mln::internal::image_primary_< box2d, mesh_image<P, V> > super_; + // typedef mln::internal::image_primary_< box2d, mesh_image<P, V> > super_; /// Point_Site associated type. typedef P psite; @@ -89,25 +90,24 @@ typedef mesh_image< tag::psite_, tag::value_<V> > skeleton; /// Constructors. - mesh_image(Mesh_p& mesh, std::vector<V>& val); + mesh_image(mesh_p& mesh, std::vector<V>& val); mesh_image(); /// Test if this image has been initialized. bool has_data() const; -// /// Test if a pixel value is accessible at \p p. +// /// Test if a pixel value is accessible at \p p // using super_::owns_; -// /// Test if a pixel value is accessible at \p v. -// bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; + /// Test if a pixel value is accessible at \p v. + bool owns_(const mln::metal::vec<P::dim, float>& v) const; // /// Read-only access of pixel value at point site \p p. // /// Mutable access is only OK for reading (not writing). // using super_::operator(); -// V operator()(const mln::metal::vec<I::point::dim, float>& v) const; - + V& operator()(const mln::metal::vec<P::dim, float>& v) const; // /// Give the set of values of the image. // const vset& values() const; @@ -121,7 +121,7 @@ { template <typename P, typename V> - data_< mesh_image<P, V> >::data_(Mesh_p& mesh, std::vector<V>& val) + data_< mesh_image<P, V> >::data_(mesh_p& mesh, std::vector<V>& val) : val_ (val), mesh_ (mesh) { @@ -130,7 +130,7 @@ } // end of namespace mln::internal template <typename P, typename V> - mesh_image<P, V>::mesh_image(Mesh_p& mesh, std::vector<V>& val) + mesh_image<P, V>::mesh_image(mesh_p& mesh, std::vector<V>& val) { // mln_precondition(ima.has_data()); this->data_ = new internal::data_< mesh_image<P, V> > (mesh, val); @@ -148,31 +148,31 @@ return true; } -// template <typename P, typename V> -// bool mesh_image<P, V>::owns_(const mln::metal::vec<I::point::dim, float>& v) const -// { -// mln_point(I) p; -// for (unsigned i = 0; i < I::point::dim; ++i) -// p[i] = static_cast<int>(round(v[i])); -// return this->data_->ima_.owns_(p); -// } + template <typename P, typename V> + bool mesh_image<P, V>::owns_(const mln::metal::vec<P::dim, float>& v) const + { + for (unsigned i = 0; i < this->data_->val_.size(); ++i) + if (this->data_->mesh_.loc_[i] == v) + return true; + return false; + } -// template <typename P, typename V> -// mln_value(I) -// mesh_image::operator()(const mln::metal::vec<I::point::dim, float>& v) const -// { -// mln_point(I) p; -// for (unsigned i = 0; i < I::point::dim; ++i) -// p[i] = static_cast<int>(round(v[i])); -// mln_assertion(this->data_->ima_.owns_(p)); -// return this->data_->ima_(p); -// } + template <typename P, typename V> + V& + mesh_image<P, V>::operator()(const mln::metal::vec<P::dim, float>& v) const + { + unsigned i = 0; +// for (i = 0; i < this->data_->val_.size(); ++i) +// if (this->data_->mesh_.loc_[i] == v) +// break; + return this->data_->mesh_.gr.loc_[i]; + } // // FIXME : Should we remove this method? (and inherit it from // // identity morpher) // template <typename P, typename V> -// const mln::value::set<mln_value(I) >& -// mesh_image::values() const +// const vset & +// mesh_image<P, V>::values() const // { // return vset::the(); // } Index: trunk/milena/sandbox/duhamel/mesh_psite.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 1184) +++ trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 1185) @@ -6,15 +6,19 @@ namespace mln { template<typename P> - class Mesh_psite + class mesh_psite { public: - Mesh_psite() {} - ~Mesh_psite() {} - P to_point () {return m_ptr->loc_[i];} + mesh_psite () {} + mesh_psite (unsigned i, mesh_p* m_ptr) : + i_ (i), + m_ptr_ (m_ptr) + {} + ~mesh_psite() {} + P to_point () {return m_ptr_->loc_[i_];} private: - unsigned i; - Mesh_p* m_ptr; + unsigned i_; + mesh_p* m_ptr_; }; } // end of mln #endif // MLN_MESH_PSITE_HH Index: trunk/milena/sandbox/duhamel/graph.hh =================================================================== --- trunk/milena/sandbox/duhamel/graph.hh (revision 1184) +++ trunk/milena/sandbox/duhamel/graph.hh (revision 1185) @@ -68,14 +68,14 @@ }; template<typename N, typename E = void> - class Graph + class graph { public: - Graph () : + graph () : nb_node_ (0), nb_link_ (0) {} - Graph (unsigned nb_node, unsigned nb_link) : + graph (unsigned nb_node, unsigned nb_link) : nb_node_ (nb_node), nb_link_ (nb_link) {} - ~Graph () {} + ~graph () {} // void add_node (N& elt); void add_node (void); Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1184) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1185) @@ -204,7 +204,7 @@ template <typename I, typename P> void - mesh(Image& ima, const Mesh_p& m, + mesh(Image& ima, const mesh_p& m, mln_value(I) node_v, mln_value(I) link_v) { Index: trunk/milena/sandbox/duhamel/graph.hxx =================================================================== --- trunk/milena/sandbox/duhamel/graph.hxx (revision 1184) +++ trunk/milena/sandbox/duhamel/graph.hxx (revision 1185) @@ -11,7 +11,7 @@ template<typename N, typename E> inline void - Graph<N, E>::add_node (void) + graph<N, E>::add_node (void) { struct s_node<N>* n = new struct s_node<N>; @@ -23,7 +23,7 @@ template<typename N, typename E> inline void - Graph<N, E>::add_edge (unsigned n1, unsigned n2) + graph<N, E>::add_edge (unsigned n1, unsigned n2) { mln_precondition(n1 < this->nb_node_); mln_precondition(n2 < this->nb_node_); @@ -36,12 +36,13 @@ links_.push_back (edge); ++nb_link_; nodes_[n1]->links.push_back (n2); + nodes_[n2]->links.push_back (n1); } template<typename N, typename E> inline void - Graph<N, E>::coherence () const + graph<N, E>::coherence () const { mln_precondition(nodes_.size () == this->nb_node_); mln_precondition(links_.size () == this->nb_link_); @@ -64,7 +65,7 @@ template<typename N, typename E> inline void - Graph<N, E>::print_debug () const + graph<N, E>::print_debug () const { std::cout << "nodes :" << std::endl; Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1184) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1185) @@ -6,13 +6,14 @@ #include "mesh_psite.hh" #include "draw_mesh.hh" #include "mesh_image.hh" +#include <mln/core/interpolated.hh> using namespace mln; int main (void) { - util::Graph<void> g; + util::graph<void> g; g.add_node (); g.add_node (); @@ -42,7 +43,7 @@ image2d_b<int> ima (20, 20, 1); - Mesh_p<point2d> m(g, v); + mesh_p<point2d> m(g, v); draw::mesh (ima, m, 7, 1); @@ -52,6 +53,7 @@ val.push_back (6); // mesh_image<point2d, int> im (m, val); + // draw::mesh (ima, im); debug::println (ima); Index: trunk/milena/sandbox/duhamel/mesh_p.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_p.hh (revision 1184) +++ trunk/milena/sandbox/duhamel/mesh_p.hh (revision 1185) @@ -7,23 +7,22 @@ { template<typename P> - class Mesh_p + class mesh_p { public: - Mesh_p () {} + mesh_p () {} - Mesh_p (util::Graph<void>& gr, + mesh_p (util::graph<void>& gr, std::vector& loc) : gr_ (gr), loc_ (loc) { } - ~Mesh_p () {} + ~mesh_p () {} - util::Graph<void> gr_; + util::graph<void> gr_; std::vector loc_; - // Mesh_psite psite; }; } // end of mln

1 0

1184: Fix init, init_, and clone.
by Thierry Geraud 27 Sep '07

27 Sep '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix init, init_, and clone. * tests/core_clone.cc: Acticate code. * mln/core/image_if.hh (operator): Fix overload. * mln/core/internal/image_base.hh: Typo. * mln/core/internal/image_morpher.hh, * mln/core/image2d_b.hh, * mln/core/sub_image.hh, * mln/core/init.hh (init_): Move out of impl. (init): Move... * mln/core/concept/image.hh: ...here. * tests/core_init.cc: New. mln/core/concept/image.hh | 29 ++++++++++++++ mln/core/image2d_b.hh | 21 ++++------ mln/core/image_if.hh | 2 - mln/core/init.hh | 35 ----------------- mln/core/internal/image_base.hh | 2 - mln/core/internal/image_morpher.hh | 11 ++--- mln/core/sub_image.hh | 10 ----- tests/core_clone.cc | 22 +++++------ tests/core_init.cc | 74 +++++++++++++++++++++++++++++++++++++ 9 files changed, 128 insertions(+), 78 deletions(-) Index: tests/core_clone.cc --- tests/core_clone.cc (revision 1183) +++ tests/core_clone.cc (working copy) @@ -54,17 +54,17 @@ debug::println(clone(ima | b)); } -// { -// image2d_b<int> ima_ = clone(ima); -// std::cout << ima_.border() << std::endl; -// ima_(make::point2d(1,1)) = 51; -// debug::println(ima); -// } + { + image2d_b<int> ima_ = clone(ima); + std::cout << ima_.border() << std::endl; + ima_(make::point2d(1,1)) = 51; + debug::println(ima); + } -// { -// image2d_b<int> ima_( ima ); -// ima_(make::point2d(1,1)) = 51; -// debug::println(ima); -// } + { + image2d_b<int> ima_( ima ); + ima_(make::point2d(1,1)) = 51; + debug::println(ima); + } } Index: tests/core_init.cc --- tests/core_init.cc (revision 0) +++ tests/core_init.cc (revision 0) @@ -0,0 +1,74 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/core_init.cc + * + * \brief Tests on mln::init. + */ + +#include <mln/core/image2d_b.hh> +#include <mln/core/sub_image.hh> +#include <mln/debug/println.hh> + + + +int main() +{ + using namespace mln; + + typedef image2d_b<int> I; + + I ref( make::box2d(3,3) ); + box2d b = make::box2d(2,2); + + { + I ima; + init(ima, ref); + debug::println(ima); + mln_assertion(ima.border() = ref.border()); + } + + { + I ima_; // to init'd + sub_image<I, box2d> ima = ref | b; + init(ima_, ima); + debug::println(ima); + } + + { + sub_image<I, box2d> ima; + init(ima, ref); + debug::println(ima); + } + + { + sub_image<I, box2d> ima; + init(ima, ref | b); + debug::println(ima); + } + +} Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 1183) +++ mln/core/image_if.hh (working copy) @@ -115,7 +115,7 @@ image_if< const I, fun::equal_p2b_expr_< pw::value_, pw::cst_<mln_value(I)> > > - operator | (Image& ima, const mln_value(I)& v); + operator | (const Image& ima, const mln_value(I)& v); // FIXME: Add the notion of "interval of values"... // FIXME: so we can write: ima | from_to(v1, v2) Index: mln/core/internal/image_base.hh --- mln/core/internal/image_base.hh (revision 1183) +++ mln/core/internal/image_base.hh (working copy) @@ -38,11 +38,11 @@ # include <mln/util/tracked_ptr.hh> + namespace mln { - namespace internal { Index: mln/core/internal/image_morpher.hh --- mln/core/internal/image_morpher.hh (revision 1183) +++ mln/core/internal/image_morpher.hh (working copy) @@ -144,32 +144,29 @@ } // end of namespace mln::internal - namespace impl - { + // template <typename Subject, typename T, // typename I, typename S, typename E> // void init_(Subject s, T& target, // const internal::image_morpher_<I,S,E>& model) // { +// std::cout << "deleg... "; // // FIXME: Precondition. // init_(s, target, * model.delegatee_()); // } template <typename Subject, typename T, typename J> - void init_(Subject s, T& target, - const Image<J>& model_) + void init_(Subject s, T& target, const Image<J>& model_) { + std::cout << "deleg... "; // FIXME: Precondition. // FIXME: Properly check that J is an internal::image_morpher_. const J& model = exact(model_); init_(s, target, * model.delegatee_()); } - } // end of namespace mln::impl - - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/init.hh --- mln/core/init.hh (revision 1183) +++ mln/core/init.hh (working copy) @@ -34,8 +34,6 @@ */ # include <mln/tag/init.hh> - -# include <mln/core/concept/image.hh> # include <mln/geom/bbox.hh> # include <mln/border/get.hh> @@ -44,23 +42,9 @@ namespace mln { - /*! Initialize the image \p target with data extracted from image \p model. - * - * \param[in, out] target The image to be initialized. - * \param[in] model The image to provide data for the initialization. - * - * \pre (not target.has_data) and model.has_data - */ - template <typename I, typename J> - void init(Image& target, const Image<J>& model); - - // Fwd decl. - namespace impl - { - template <typename Subject, typename T, typename M> void init_(Subject, T& target, const Object<M>& model); @@ -75,14 +59,10 @@ template <typename I> void init_(tag::domain_t, mln_pset(I)& pset, const Image& ima); - } // end of namespace mln::impl - # ifndef MLN_INCLUDE_ONLY - namespace impl - { template <typename Subject, typename T, typename M> void init_(Subject, T&, const Object<M>&) @@ -110,21 +90,6 @@ pset = exact(ima).domain(); } - } // end of namespace mln::impl - - - // Facade. - - template <typename I, typename J> - void init(Image& target, const Image<J>& model) - { - mln_precondition(! exact(target).has_data()); - mln_precondition(exact(model).has_data()); - - impl::init_(tag::image, exact(target), exact(model)); - - mln_postcondition(exact(target).has_data()); - } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/image2d_b.hh --- mln/core/image2d_b.hh (revision 1183) +++ mln/core/image2d_b.hh (working copy) @@ -198,28 +198,25 @@ }; - namespace impl - { + + // Fwd decl. + + template <typename T> + void init_(tag::border_t, unsigned& bdr, const image2d_b<T>& model); template <typename T, typename J> void init_(tag::image_t, mln::image2d_b<T>& target, const J& model); - } // end of namespace mln::impl - # ifndef MLN_INCLUDE_ONLY - - // impl::init_ - - namespace impl - { + // init_ template <typename T> - void init_(tag::border_t, unsigned& b, const image2d_b<T>& model) + void init_(tag::border_t, unsigned& bdr, const image2d_b<T>& model) { - b = model.border(); + bdr = model.border(); } template <typename T, typename J> @@ -232,8 +229,6 @@ target.init_(b, bdr); } - } // end of namespace mln::impl - // internal::data_< image2d_b<T> > Index: mln/core/sub_image.hh --- mln/core/sub_image.hh (revision 1183) +++ mln/core/sub_image.hh (working copy) @@ -91,23 +91,15 @@ - namespace impl - { - template <typename I, typename S, typename J> void init_(tag::image_t, sub_image<I,S>& target, const J& model); - } // end of namespace mln::impl - # ifndef MLN_INCLUDE_ONLY // impl::init_ - namespace impl - { - template <typename I, typename S, typename J> void init_(tag::image_t, sub_image<I,S>& target, const J& model) { @@ -118,8 +110,6 @@ target.init_(ima, pset); } - } // end of namespace mln::impl - // internal::data_< sub_image<I,S> > Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 1183) +++ mln/core/concept/image.hh (working copy) @@ -39,11 +39,15 @@ # include <mln/trait/concrete.hh> // FIXME: Should be in all.hh! # include <mln/metal/is_a.hh> +# include <mln/tag/init.hh> + namespace mln { + + /*! \brief Base class for implementation of image classes. * * \see mln::doc::Image for a complete documentation of this class @@ -96,6 +100,19 @@ }; + + /*! Initialize the image \p target with data extracted from image \p model. + * + * \param[in, out] target The image to be initialized. + * \param[in] model The image to provide data for the initialization. + * + * \pre (not target.has_data) and model.has_data + */ + template <typename I, typename J> + void init(Image& target, const Image<J>& model); + + + # ifndef MLN_INCLUDE_ONLY template <typename E> @@ -146,6 +163,18 @@ m8 = 0; } + template <typename I, typename J> + void init(Image& target, const Image<J>& model) + { + mln_precondition(! exact(target).has_data()); + mln_precondition(exact(model).has_data()); + + init_(tag::image, exact(target), exact(model)); + + mln_postcondition(exact(target).has_data()); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

1 0

milena r1183: Update mesh_image
by Guillaume Duhamel 26 Sep '07

26 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-26 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update mesh_image. * draw_mesh.hh, * main.cc, * mesh_image.hh, * mesh_p.hh: Update. --- draw_mesh.hh | 17 +++++++ main.cc | 35 +++++++++++---- mesh_image.hh | 129 ++++++++++++++++++++++++++++------------------------------ 3 files changed, 107 insertions(+), 74 deletions(-) Index: trunk/milena/sandbox/duhamel/mesh_image.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1182) +++ trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1183) @@ -38,6 +38,7 @@ # include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> # include "mesh_p.hh" +# include <vector> namespace mln { @@ -51,7 +52,7 @@ template <typename P, typename V> struct data_< mesh_image<P, V> > { - data_(Mesh_p& ima); + data_(Mesh_p& ima, std::vector<V>& val_); Mesh_p mesh_; std::vector<V> val_; @@ -63,54 +64,53 @@ * */ template <typename P, typename V> - struct mesh_image : public mln::internal::image_identity_< I, mln_pset(I), mesh_image > + struct mesh_image : public internal::image_primary_< box2d, mesh_image<P, V> > { -// typedef mln::internal::image_identity_< I, mln_pset(I), mesh_image > super_; + typedef mln::internal::image_primary_< box2d, mesh_image<P, V> > super_; -// /// Point_Site associated type. -// typedef mln_psite(I) psite; + /// Point_Site associated type. + typedef P psite; -// /// Value associated type. -// typedef mln_value(V) value; + /// Value associated type. + typedef V value; -// /// Return type of read-write access. -// typedef mln_lvalue(V) lvalue; // FIXME: Depends on lvalue presence in I. + /// Return type of read-write access. + typedef V& lvalue; // FIXME: Depends on lvalue presence in I. -// /// Return type of read-only access. -// typedef mln_rvalue(I) rvalue; + /// Return type of read-only access. + typedef V rvalue; -// /// Value set associated type. -// typedef mln::value::set<value> vset; + /// Value set associated type. + typedef mln::value::set<value> vset; -// /// Skeleton. -// typedef mesh_image< tag::image_ > skeleton; - + /// Skeleton. + typedef mesh_image< tag::psite_, tag::value_<V> > skeleton; /// Constructors. - mesh_image(mesh_p& mesh, std::vector<V>& val); + mesh_image(Mesh_p& mesh, std::vector<V>& val); mesh_image(); /// Test if this image has been initialized. bool has_data() const; - /// Test if a pixel value is accessible at \p p. - using super_::owns_; +// /// Test if a pixel value is accessible at \p p. +// using super_::owns_; - /// Test if a pixel value is accessible at \p v. - bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; +// /// Test if a pixel value is accessible at \p v. +// bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; - /// Read-only access of pixel value at point site \p p. - /// Mutable access is only OK for reading (not writing). - using super_::operator(); +// /// Read-only access of pixel value at point site \p p. +// /// Mutable access is only OK for reading (not writing). +// using super_::operator(); - mln_value(I) operator()(const mln::metal::vec<I::point::dim, float>& v) const; +// V operator()(const mln::metal::vec<I::point::dim, float>& v) const; - /// Give the set of values of the image. - const vset& values() const; +// /// Give the set of values of the image. +// const vset& values() const; }; @@ -120,63 +120,62 @@ namespace internal { - // internal::data_< mesh_image<I,S> > - template <typename P, typename V> - data_< mesh_image<P, V> >::data_(I& ima) - : ima_(ima) + data_< mesh_image<P, V> >::data_(Mesh_p& mesh, std::vector<V>& val) + : val_ (val), + mesh_ (mesh) { } } // end of namespace mln::internal template <typename P, typename V> - mesh_image::mesh_image(I& ima) + mesh_image<P, V>::mesh_image(Mesh_p& mesh, std::vector<V>& val) { - mln_precondition(ima.has_data()); - this->data_ = new internal::data_< mesh_image >(ima); + // mln_precondition(ima.has_data()); + this->data_ = new internal::data_< mesh_image<P, V> > (mesh, val); } template <typename P, typename V> - mesh_image::mesh_image() + mesh_image<P, V>::mesh_image() { } template <typename P, typename V> - bool mesh_image::has_data() const + bool mesh_image<P, V>::has_data() const { - mln_invariant(this->data_->ima_.has_data()); + mln_invariant(this->data_->val_.size() != 0); return true; } - template <typename P, typename V> - bool mesh_image::owns_(const mln::metal::vec<I::point::dim, float>& v) const - { - mln_point(I) p; - for (unsigned i = 0; i < I::point::dim; ++i) - p[i] = static_cast<int>(round(v[i])); - return this->data_->ima_.owns_(p); - } - - template <typename P, typename V> - mln_value(I) - mesh_image::operator()(const mln::metal::vec<I::point::dim, float>& v) const - { - mln_point(I) p; - for (unsigned i = 0; i < I::point::dim; ++i) - p[i] = static_cast<int>(round(v[i])); - mln_assertion(this->data_->ima_.owns_(p)); - return this->data_->ima_(p); - } - - // FIXME : Should we remove this method? (and inherit it from - // identity morpher) - template <typename P, typename V> - const mln::value::set<mln_value(I) >& - mesh_image::values() const - { - return vset::the(); - } +// template <typename P, typename V> +// bool mesh_image<P, V>::owns_(const mln::metal::vec<I::point::dim, float>& v) const +// { +// mln_point(I) p; +// for (unsigned i = 0; i < I::point::dim; ++i) +// p[i] = static_cast<int>(round(v[i])); +// return this->data_->ima_.owns_(p); +// } + +// template <typename P, typename V> +// mln_value(I) +// mesh_image::operator()(const mln::metal::vec<I::point::dim, float>& v) const +// { +// mln_point(I) p; +// for (unsigned i = 0; i < I::point::dim; ++i) +// p[i] = static_cast<int>(round(v[i])); +// mln_assertion(this->data_->ima_.owns_(p)); +// return this->data_->ima_(p); +// } + +// // FIXME : Should we remove this method? (and inherit it from +// // identity morpher) +// template <typename P, typename V> +// const mln::value::set<mln_value(I) >& +// mesh_image::values() const +// { +// return vset::the(); +// } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1182) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1183) @@ -9,6 +9,7 @@ //# include <mln/metal/is_a.hh> # include <mln/draw/line.hh> # include "mesh_p.hh" +# include "mesh_image.hh" namespace mln { @@ -219,6 +220,22 @@ exact(ima)(m.loc_[i]) = node_v; } +// template <typename I, typename P, typename V> +// void +// mesh(Image& ima, const mesh_image<P, V>& mesh) +// { +// // level::fill(ima, 0); + +// // for (unsigned i = 0; i < m.gr_.nb_link_; ++i) +// // line (exact(ima), +// // m.loc_[m.gr_.links_[i]->node1], +// // m.loc_[m.gr_.links_[i]->node2], +// // 1); + +// // for (unsigned i = 0; i < m.gr_.nb_node_; ++i) +// // exact(ima)(m.loc_[i]) = mesh.val_[i]; +// } + } // end of draw } // end of mln Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1182) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1183) @@ -5,6 +5,7 @@ #include "mesh_p.hh" #include "mesh_psite.hh" #include "draw_mesh.hh" +#include "mesh_image.hh" using namespace mln; @@ -15,27 +16,43 @@ g.add_node (); g.add_node (); -// g.add_node (); -// g.add_node (); + g.add_node (); + g.add_node (); + g.add_node (); + g.add_node (); g.add_edge (0, 1); - // g.add_edge (0, 2); -// g.add_edge (0, 2); -// g.add_edge (2, 3); -// g.add_edge (0, 3); + g.add_edge (1, 2); + g.add_edge (2, 3); + g.add_edge (1, 3); + g.add_edge (4, 5); + g.add_edge (1, 4); g.coherence (); // 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 (19,6)); -// v.push_back (make::point2d (1,15)); -// v.push_back (make::point2d (16,5)); + v.push_back (make::point2d (1,19)); + + image2d_b<int> ima (20, 20, 1); Mesh_p<point2d> m(g, v); draw::mesh (ima, m, 7, 1); + + std::vector<int> val; + + val.push_back (8); + val.push_back (6); + + // mesh_image<point2d, int> im (m, val); + // draw::mesh (ima, im); + debug::println (ima); } Index: trunk/milena/sandbox/duhamel/mesh_p.hh ===================================================================

1 0

milena r1182: Add plain image
by Matthieu Garrigues 26 Sep '07

26 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add plain image. FIXME : doesn't compile because of a error in init (called by clone). * mln/core/plain.hh: New. * tests/plain.cc: New. --- mln/core/plain.hh | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/plain.cc | 52 ++++++++++++++++++++ 2 files changed, 191 insertions(+) Index: trunk/milena/tests/plain.cc =================================================================== --- trunk/milena/tests/plain.cc (revision 0) +++ trunk/milena/tests/plain.cc (revision 1182) @@ -0,0 +1,52 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/plain.cc + * + * \brief Test on mln::plain. + */ + +#include <mln/core/image2d_b.hh> +#include <mln/core/plain.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + { + plain< image2d_b<int_u8> > + lena = io::pgm::load<int_u8>("../img/lena.pgm"); + + + } +} Index: trunk/milena/mln/core/plain.hh =================================================================== --- trunk/milena/mln/core/plain.hh (revision 0) +++ trunk/milena/mln/core/plain.hh (revision 1182) @@ -0,0 +1,139 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_PLAIN_HH +# define MLN_CORE_PLAIN_HH + +/*! \file mln/core/plain.hh + * + * \brief Definition of an image class FIXME + */ + +# include <cmath> + +# include <mln/core/internal/image_identity.hh> +# include <mln/core/clone.hh> + +# include <mln/metal/vec.hh> + + +namespace mln +{ + + // Fwd decl. + template <typename I> struct plain; + + namespace internal + { + + template <typename I> + struct data_< plain > + { + data_(I& ima); + + I ima_; + }; + + } // end of namespace mln::internal + + /*! \brief FIXME + * + */ + template <typename I> + struct plain : public mln::internal::image_identity_< I, mln_pset(I), plain > + { + + typedef mln::internal::image_identity_< I, mln_pset(I), plain > super_; + + /// Point_Site associated type. + typedef mln_psite(I) psite; + + /// Value associated type. + typedef mln_value(I) value; + + /// Return type of read-write access. + typedef mln_lvalue(I) lvalue; // FIXME: Depends on lvalue presence in I. + + /// Return type of read-only access. + typedef mln_rvalue(I) rvalue; + + /// Skeleton. + typedef plain< tag::image_ > skeleton; + + + /// Constructors. + plain(const I& ima); + + /// Read-only access of pixel value at point site \p p. + /// Mutable access is only OK for reading (not writing). + //using super_::operator(); + + /// Assignment operator. + plain& operator=(const I& rhs); + + }; + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< plain<I,S> > + + template <typename I> + data_< plain >::data_(I& ima) + : ima_(ima) + { + } + + } // end of namespace mln::internal + + template <typename I> + plain::plain(const I& ima_) + { + mln_precondition(ima_.has_data()); + I ima = clone(ima_); + this->data_ = new internal::data_< plain >(ima); + } + + template <typename I> + plain& + plain::operator=(const I& rhs) + { + this->destroy(); + this->data_ = new internal::data_< plain >(clone(rhs)); + return *this; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_PLAIN_HH

1 0

milena r1181: Add mesh_image
by Guillaume Duhamel 26 Sep '07

26 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-26 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add mesh_image. * draw_mesh.hh: Update. * mesh_image.hh: New. --- draw_mesh.hh | 3 mesh_image.hh | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 1 deletion(-) Index: trunk/milena/sandbox/duhamel/mesh_image.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_image.hh (revision 0) +++ trunk/milena/sandbox/duhamel/mesh_image.hh (revision 1181) @@ -0,0 +1,186 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_MESH_IMAGE_HH +# define MLN_CORE_MESH_IMAGE_HH + +/*! \file mln/core/mesh_image.hh + * + * \brief Definition of an image class FIXME + */ + +# include <cmath> + +# include <mln/core/internal/image_identity.hh> +# include <mln/metal/vec.hh> +# include "mesh_p.hh" + +namespace mln +{ + + // Fwd decl. + template <typename P, typename V> struct mesh_image; + + namespace internal + { + + template <typename P, typename V> + struct data_< mesh_image<P, V> > + { + data_(Mesh_p& ima); + + Mesh_p mesh_; + std::vector<V> val_; + }; + + } // end of namespace mln::internal + + /*! \brief FIXME + * + */ + template <typename P, typename V> + struct mesh_image : public mln::internal::image_identity_< I, mln_pset(I), mesh_image > + { + +// typedef mln::internal::image_identity_< I, mln_pset(I), mesh_image > super_; + +// /// Point_Site associated type. +// typedef mln_psite(I) psite; + +// /// Value associated type. +// typedef mln_value(V) value; + +// /// Return type of read-write access. +// typedef mln_lvalue(V) lvalue; // FIXME: Depends on lvalue presence in I. + +// /// Return type of read-only access. +// typedef mln_rvalue(I) rvalue; + +// /// Value set associated type. +// typedef mln::value::set<value> vset; + + +// /// Skeleton. +// typedef mesh_image< tag::image_ > skeleton; + + + /// Constructors. + mesh_image(mesh_p& mesh, std::vector<V>& val); + mesh_image(); + + + /// Test if this image has been initialized. + bool has_data() const; + + /// Test if a pixel value is accessible at \p p. + using super_::owns_; + + /// Test if a pixel value is accessible at \p v. + bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; + + /// Read-only access of pixel value at point site \p p. + /// Mutable access is only OK for reading (not writing). + using super_::operator(); + + mln_value(I) operator()(const mln::metal::vec<I::point::dim, float>& v) const; + + + /// Give the set of values of the image. + const vset& values() const; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< mesh_image<I,S> > + + template <typename P, typename V> + data_< mesh_image<P, V> >::data_(I& ima) + : ima_(ima) + { + } + + } // end of namespace mln::internal + + template <typename P, typename V> + mesh_image::mesh_image(I& ima) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data_< mesh_image >(ima); + } + + template <typename P, typename V> + mesh_image::mesh_image() + { + } + + template <typename P, typename V> + bool mesh_image::has_data() const + { + mln_invariant(this->data_->ima_.has_data()); + return true; + } + + template <typename P, typename V> + bool mesh_image::owns_(const mln::metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v[i])); + return this->data_->ima_.owns_(p); + } + + template <typename P, typename V> + mln_value(I) + mesh_image::operator()(const mln::metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v[i])); + mln_assertion(this->data_->ima_.owns_(p)); + return this->data_->ima_(p); + } + + // FIXME : Should we remove this method? (and inherit it from + // identity morpher) + template <typename P, typename V> + const mln::value::set<mln_value(I) >& + mesh_image::values() const + { + return vset::the(); + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_MESH_IMAGE_HH Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1180) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1181) @@ -7,6 +7,7 @@ //# include <mln/pw/cst.hh> # include <mln/level/fill.hh> //# include <mln/metal/is_a.hh> +# include <mln/draw/line.hh> # include "mesh_p.hh" namespace mln @@ -209,7 +210,7 @@ level::fill(ima, 0); for (unsigned i = 0; i < m.gr_.nb_link_; ++i) - bresenham (exact(ima), + line (exact(ima), m.loc_[m.gr_.links_[i]->node1], m.loc_[m.gr_.links_[i]->node2], link_v);

1 0

milena r1180: Update draw bresenham
by Guillaume Duhamel 26 Sep '07

26 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-26 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update draw bresenham. * draw_mesh.hh: Update. * main.cc: Update. --- draw_mesh.hh | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- main.cc | 14 ++-- 2 files changed, 176 insertions(+), 17 deletions(-) Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1179) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1180) @@ -21,22 +21,181 @@ mln_value(I) link_v) { mln_dpoint(I) d = p1 - p2; - float e = 0.5; + std::cout << "dx = " + << d[0] + << std::endl + << "dy = " + << d[1] + << std::endl; if (!d[0]) - return; - float e1 = (float)d[1] / (float)d[0]; - std::cout << " " << d[1] << " " << d[0] << " "<< e1 << std::endl; - float e2 = -1.0; - int y = p1[1]; + { + 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; + else + for (int y = p1[1]; y < p2[1]; ++y) + exact(ima)(make::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; + else for (int x = p1[0]; x < p2[0]; ++x) + exact(ima)(make::point2d(x, p1[1])) = link_v; + else // d[0] != 0 && d[1] != 0 + { + float e = 0; + if (d[0] > 0) + { + if (d[1] > 0) + { + if (d[0] < d[1]) + { + // 7eme octant + int x = p1[0] - 1; + e -= (float)d[1]; + for (int y = p1[1] - 1; y > p2[1]; --y) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[0]; + if (e >= 0) + { + x--; + e -= (float)d[1]; + } + } + } + else + { + // 8eme octant + int y = p1[1] - 1; + e -= (float)d[0]; + for (int x = p1[0] - 1; x > p2[0]; --x) { exact(ima)(make::point2d(x,y)) = link_v; - e += e1; - if (e >= 0.5) + e += (float)d[1]; + if (e > 0) { - ++y; - e += e2; + y--; + e -= (float)d[0]; + } + } + } + } + else // d[0] > 0 && d[1] < 0 + { + if (d[0] < -d[1]) + { + // 2eme octant + int x = p1[0]; + e += (float)d[1]; + for (int y = p1[1] + 1; y < p2[1]; ++y) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[0]; + if (e >= 0) + { + x--; + e += (float)d[1]; + } + } + } + else + { + // 1er octant + int y = p1[1] + 1; + e += (float)d[0]; + for (int x = p1[0] - 1; x > p2[0]; --x) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[1]; + if (e <= 0) + { + y++; + e += (float)d[0]; + } + } + } + } + } + else // d[0] < 0 + { + if (d[1] > 0) + { + if (-d[0] < d[1]) + { + // 6eme octant + int x = p1[0] + 1; + e += (float)d[1]; + for (int y = p1[1] - 1; y > p2[1]; --y) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[0]; + if (e < 0) + { + x++; + e += (float)d[1]; + } + } + } + else + { + // 5eme octant + int y = p1[1] - 1; + e -= (float)d[0]; + for (int x = p1[0] + 1; x < p2[0]; ++x) + { + exact(ima)(make::point2d(x,y)) = link_v; + e -= (float)d[1]; + if (e < 0) + { + y--; + e -= (float)d[0]; + } + } + } + } + else // d[0] < 0 && d[1] < 0 + { + if (-d[0] < -d[1]) + { + // 3eme octant + int x = p1[0] + 1; + e -= (float)d[1]; + for (int y = p1[1] + 1; y < p2[1]; ++y) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[0]; + if (e < 0) + { + x++; + e -= (float)d[1]; + } + } + } + else + { + // 4eme octant + int y = p1[1] + 1; + e -= (float)d[0]; + for (int x = p1[0] + 1; x < p2[0]; ++x) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += (float)d[1]; + if (e <= 0) + { + y++; + e -= (float)d[0]; + } + } + } + } + } } } } Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1179) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1180) @@ -15,11 +15,11 @@ g.add_node (); g.add_node (); - g.add_node (); - g.add_node (); +// g.add_node (); +// g.add_node (); g.add_edge (0, 1); - g.add_edge (0, 2); + // g.add_edge (0, 2); // g.add_edge (0, 2); // g.add_edge (2, 3); // g.add_edge (0, 3); @@ -28,10 +28,10 @@ // g.print_debug (); std::vector<point2d> v; - v.push_back (make::point2d (1,2)); - v.push_back (make::point2d (5,6)); - v.push_back (make::point2d (1,15)); - v.push_back (make::point2d (16,5)); + v.push_back (make::point2d (10,10)); + v.push_back (make::point2d (19,6)); +// v.push_back (make::point2d (1,15)); +// v.push_back (make::point2d (16,5)); image2d_b<int> ima (20, 20, 1); Mesh_p<point2d> m(g, v);

1 0