September 2008 - Olena-patches

2371: Fix more morphological tests on graph-based images.
by Roland Levillain 23 Sep '08

23 Sep '08

* tests/morpho/Makefile.am (check_PROGRAMS): Re-enable graph_image_morpho, lena_line_graph_image_wst1, line_graph_image_wst and line_graph_image_morpho. * tests/morpho/graph_image_morpho.cc * tests/morpho/line_graph_image_morpho.cc: Add missing code from tests/core/image/graph_image.cc and tests/core/image/line_graph_image.cc to have this test pass again. * tests/morpho/lena_line_graph_image_wst1.cc: Catch up with util::ord usage and domain's has() semantics. --- milena/ChangeLog | 14 ++++++++ milena/tests/core/image/Makefile.am | 3 ++ milena/tests/morpho/Makefile.am | 8 ++-- milena/tests/morpho/graph_image_morpho.cc | 36 +++++++++++++++++++++ milena/tests/morpho/lena_line_graph_image_wst1.cc | 7 +++- milena/tests/morpho/line_graph_image_morpho.cc | 3 ++ 6 files changed, 65 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index abe1c4e..193a46d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix more morphological tests on graph-based images. + + * tests/morpho/Makefile.am (check_PROGRAMS): Re-enable + graph_image_morpho, lena_line_graph_image_wst1, + line_graph_image_wst and line_graph_image_morpho. + * tests/morpho/graph_image_morpho.cc + * tests/morpho/line_graph_image_morpho.cc: + Add missing code from tests/core/image/graph_image.cc and + tests/core/image/line_graph_image.cc to have this test pass again. + * tests/morpho/lena_line_graph_image_wst1.cc: Catch up with + util::ord usage and domain's has() semantics. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have morphological erosion work on non-classical image types. * mln/morpho/erosion.spe.hh diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index bf39e2b..dc247cc 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -36,6 +36,9 @@ cast_image_SOURCES = cast_image.cc complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc +### FIXME: graph_image_wst is almost a clone of graph_image: move it +### into tests/morpho and turn it into a real test on the WST (see +### line_graph_image_wst). ##graph_image_wst_SOURCES = graph_image_wst.cc flat_image_SOURCES = flat_image.cc ##hexa_SOURCES = hexa.cc diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 36f11dd..48e3a82 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -15,13 +15,13 @@ check_PROGRAMS = \ erosion_min_h \ gradient \ gradient_elementary \ -## graph_image_morpho \ + graph_image_morpho \ hit_or_miss \ laplacian \ -## lena_line_graph_image_wst1 \ + lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ -## line_graph_image_wst \ -## line_graph_image_morpho \ + line_graph_image_wst \ + line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ diff --git a/milena/tests/morpho/graph_image_morpho.cc b/milena/tests/morpho/graph_image_morpho.cc index 2acc5a5..0653953 100644 --- a/milena/tests/morpho/graph_image_morpho.cc +++ b/milena/tests/morpho/graph_image_morpho.cc @@ -38,6 +38,7 @@ #include <mln/core/image/graph_window_piter.hh> #include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> #include <mln/draw/graph.hh> #include <mln/debug/iota.hh> @@ -105,10 +106,45 @@ int main() // Initialize values. debug::iota(ima); + /*-------------------------------------. + | Image representation/visualization. | + `-------------------------------------*/ + + // Compute the bounding box of IMA. + /* FIXME: mln::graph_image should automatically feature a bbox when + its parameter P is akin to a point. */ + accu::bbox<point2d> a; + for (std::vector<point2d>::const_iterator i = points.begin(); + i != points.end(); ++i) + a.take(*i); + box2d bbox = a.to_result(); + // Print the image. + /* FIXME: Unfortunately, displaying graph images is not easy right + now (2008-02-05). We could use + + debug::println(ima); + + but there's not specialization working for graph_image; the one + selected by the compiler is based on a 2-D bbox, and expects the + interface of graph_image to work with points (not psites). + Moreover, this implementation only shows *values*, not the graph + itslef. + + An alternative is to use draw::graph (which, again, is misnamed), + but it doesn't show the values, only the vertices and edges of the + graph. + + The current solution is a mix between draw::graph and hand-made + iterations. */ + image2d<int> ima_rep(bbox); + /*--------------------------. | Processing graph images. | `--------------------------*/ + typedef graph_elt_window<point2d> win_t; + win_t win; + graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); draw::graph(ima_rep, ima_dil, 9); debug::println(ima_rep); diff --git a/milena/tests/morpho/lena_line_graph_image_wst1.cc b/milena/tests/morpho/lena_line_graph_image_wst1.cc index 0af7832..d60980f 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst1.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst1.cc @@ -46,8 +46,11 @@ in it, interpolating inter-pixel points; \li print the watershed on lines into that same image, and save it. */ +#include <map> #include <vector> +#include <mln/util/ord.hh> + #include <mln/core/image/image2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/alias/window2d.hh> @@ -112,7 +115,7 @@ int main() exhibits the lack of a service from util::graph (or a another, missing tool) regarding the retrieval of vertex ids from points. */ - std::map<point2d, util::vertex_id> points; + std::map<point2d, util::vertex_id, util::ord<point2d> > points; util::vertex_id id = 0; // Vertices. @@ -136,7 +139,7 @@ int main() mln_fwd_qiter_(window2d) q(next_c4_win, p); for_all (p) for_all (q) - if (work.has(q)) + if (work.domain().has(q)) { g.add_edge(points[p], points[q]); edge_values.push_back(math::max(work(p), work(q))); diff --git a/milena/tests/morpho/line_graph_image_morpho.cc b/milena/tests/morpho/line_graph_image_morpho.cc index a3c74cf..43bf66b 100644 --- a/milena/tests/morpho/line_graph_image_morpho.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -109,6 +109,9 @@ int main() | Processing graph images. | `--------------------------*/ + typedef line_graph_elt_window<point2d> win_t; + win_t win; + line_graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); // Manual iteration over the domain of IMA_DIL. mln_piter_(ima_t) p_dil(ima_dil.domain()); -- 1.6.0.1

1 0

2370: Have morphological erosion work on non-classical image types.
by Roland Levillain 23 Sep '08

23 Sep '08

* mln/morpho/erosion.spe.hh (mln::morpho::internal::erosion_dispatch): (Temporarily) disable delegation to fastest routines. --- milena/ChangeLog | 8 ++++++++ milena/mln/morpho/erosion.spe.hh | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7a5b4cd..abe1c4e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + + Have morphological erosion work on non-classical image types. + + * mln/morpho/erosion.spe.hh + (mln::morpho::internal::erosion_dispatch): (Temporarily) disable + delegation to fastest routines. + 2008-09-22 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add basic conversion + minor fixes. diff --git a/milena/mln/morpho/erosion.spe.hh b/milena/mln/morpho/erosion.spe.hh index 1fff72d..39f2faf 100644 --- a/milena/mln/morpho/erosion.spe.hh +++ b/milena/mln/morpho/erosion.spe.hh @@ -444,16 +444,23 @@ namespace mln { if (mlc_equal(mln_trait_image_kind(I)(), trait::image::kind::logic)::value == true) +/* FIXME: Temporarily disabled, since this dynamic dispatch triggers + errors when class I has no pixter associated type(s). */ +#if 0 if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) return impl::erosion_on_set_fastest(input, win); else +#endif return impl::generic::erosion_on_set(input, win); else +// FIXME: Likewise. +#if 0 if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) return impl::erosion_on_function_fastest(input, win); else +#endif return impl::generic::erosion_on_function(input, win); } -- 1.6.0.1

1 0

Des pointeurs pour les graphes et images de graphes
by Roland Levillain 22 Sep '08

22 Sep '08

Je viens de boucler la migration des dernières classes concernant les graphes et images de graphes ce soir. J'ai mis à jour la page du Trac qui référence les fichiers concernés : https://trac.lrde.org/olena/wiki/Olena/GraphBasedImages Ça peut t'être utile pour retrouver l'information nécessaire à ton travail. La plupart des tests passent, sauf ceux qui utilisent la morpho élémentaire (à cause du nouveau dispatcher dynamique de l'érosion et de la dilatation, mais c'est un autre sujet). Ne pas hésiter à me solliciter en cas de doute. Je vais continuer mon travail sur les complexes, en suivant/poursuivant un chemin parallèle au tient vis-à-vis des graphes : tu peux y jeter un oeil pour t'en inspirer. Bon courage !

1 0

cleanup-2008 2369: Add basic conversion + minor fixes.
by Ugo Jardonnet 22 Sep '08

22 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add basic conversion + minor fixes. * mln/border/adjust.hh: Remove wrong check. * mln/convert/from_to.hh: Add vec to rgb. * mln/fun/x2x/translation.hh: Fix matrix update. border/adjust.hh | 6 ++++-- convert/from_to.hh | 15 +++++++++++++++ fun/x2x/translation.hh | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) Index: mln/border/adjust.hh --- mln/border/adjust.hh (revision 2368) +++ mln/border/adjust.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/border/resize.hh> - +# include <mln/metal/is.hh> namespace mln { @@ -66,7 +66,9 @@ { trace::entering("border::adjust"); - mlc_is(mln_trait_image_border(I), trait::image::border::some)::check(); + //FIXME: fix this check + //mlc_is(mln_trait_image_border(I), + // trait::image::border::some)::check(); const I& ima = exact(ima_); mln_precondition(ima.has_data()); Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2368) +++ mln/convert/from_to.hh (working copy) @@ -40,6 +40,7 @@ # include <mln/core/concept/object.hh> # include <mln/core/concept/gpoint.hh> # include <mln/value/concept/all.hh> +# include <mln/value/rgb.hh> # include <mln/convert/impl/all.hh> @@ -117,6 +118,20 @@ to[i] = static_cast< typename P::coord >(from[i]); } + // algebra::vec -> rgb. + template <typename T, unsigned m> + inline + void + from_to_(const algebra::vec<3,T>& from, value::rgb<m>& to_) + { + value::rgb<m>& to = exact(to_); + algebra::vec<3, unsigned> tmp; + for (unsigned i = 0; i < 3; ++i) + tmp[i] = static_cast<unsigned>(from[i]); + + to = value::rgb<m>(tmp); + } + template <typename F, typename T> inline Index: mln/fun/x2x/translation.hh --- mln/fun/x2x/translation.hh (revision 2368) +++ mln/fun/x2x/translation.hh (working copy) @@ -95,7 +95,6 @@ translation<n,C>::translation(const algebra::vec<n,C>& t) :t_(t) { - this->m_ = algebra::h_mat<n,C>::Id; this->update(); } @@ -131,6 +130,7 @@ void translation<n,C>::update() { + this->m_ = algebra::h_mat<n,C>::Id; for (unsigned i = 0; i < n; ++i) this->m_(i,n) = this->t_[i]; } Index: mln/algebra/mat.hh

1 0

2365: Sandbox fix and check rgb bilinear interpolation.
by Ugo Jardonnet 22 Sep '08

22 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox fix and check rgb bilinear interpolation. * jardonnet/virtual/access.hh: Fix wrong type. * jardonnet/virtual/bilinear.ppm: bilinear result. * jardonnet/virtual/access.cc: Handle border. * jardonnet/virtual/nn.ppm: NNeighbor result. * jardonnet/virtual/lena.ppm: Add test image. access.cc | 26 +- access.hh | 45 +++-- lena.ppm | 541 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 585 insertions(+), 27 deletions(-) Index: jardonnet/virtual/access.hh --- jardonnet/virtual/access.hh (revision 2364) +++ jardonnet/virtual/access.hh (working copy) @@ -29,7 +29,6 @@ operator()(const algebra::vec<n,T>& x) const { mln_psite(I) p = convert::to<mln_psite(I)>(x); - std::cout << p << std::endl; return ima(p); } @@ -101,28 +100,40 @@ double x = v[0]; double y = v[1]; - double x1 = mln_point(I)::coord(v[0]); - double x2 = mln_point(I)::coord(v[0]+ 1); - double y1 = mln_point(I)::coord(v[1]); - double y2 = mln_point(I)::coord(v[1]+ 1); - - point2d q11 = point2d(x1, y1); - point2d q12 = point2d(x1, y2); - point2d q21 = point2d(x2, y1); - point2d q22 = point2d(x2, y2); + double x1 = mln_psite(I)::coord(v[0]); + double x2 = mln_psite(I)::coord(v[0]+ 1); + double y1 = mln_psite(I)::coord(v[1]); + double y2 = mln_psite(I)::coord(v[1]+ 1); + + vsum q11 = ima(point2d(x1, y1)); + vsum q12 = ima(point2d(x1, y2)); + vsum q21 = ima(point2d(x2, y1)); + vsum q22 = ima(point2d(x2, y2)); + + //if (x2 - x1 == 0) + //std::cout << x2 <<" - " << x1 << std::endl; + double x2_x1 = (x2 - x1) ? x2 - x1 : 0.000001; + double y2_y1 = (y2 - y1) ? y2 - y1 : 0.000001; // linear interpolation #1 - vsum img_r1 = ima(q11) * (x2 - x) / (x2 - x1) + - ima(q21) * (x - x1) / (x2 - x1); + vsum img_r1 = q11 * (x2 - x) / (x2_x1) + + q21 * (x - x1) / (x2_x1); + //std::cout << "l1 : "<< img_r1 << std::endl; // linear interpolation #2 - vsum img_r2 = ima(q12) * (x2 - x) / (x2 - x1) + - ima(q22) * (x - x1) / (x2 - x1); + vsum img_r2 = q12 * (x2 - x) / (x2_x1) + + q22 * (x - x1) / (x2_x1); + //std::cout << "l2 : "<< img_r2 << std::endl; // interpolating in y direction - return convert::to<mln_value(I)> - (img_r1 * (y2 - y) / (y2 -y1) - + img_r2 * (y - y1) /(y2 - y1)); + // FIXME : Sometime try to cast neg value to rgb component + vsum res = (img_r1 * (y2 - y) / (y2_y1) + + img_r2 * (y - y1) /(y2_y1)); + res[0] = (res[0] < 0) ? 0 : res[0]; + res[1] = (res[1] < 0) ? 0 : res[1]; + res[2] = (res[2] < 0) ? 0 : res[2]; + + return convert::to<mln_value(I)>(res); } const I& ima; Index: jardonnet/virtual/bilinear.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/virtual/bilinear.ppm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 2364) +++ jardonnet/virtual/access.cc (working copy) @@ -6,7 +6,10 @@ #include <mln/fun/x2x/all.hh> #include <mln/debug/iota.hh> #include <mln/algebra/vec.hh> -#include <mln/io/pgm/all.hh> +#include <mln/io/ppm/all.hh> +#include <mln/border/adjust.hh> +#include <mln/border/fill.hh> +#include <mln/literal/all.hh> template < template <class> class N, typename I, typename T> @@ -21,7 +24,8 @@ for_all(p) { mln::algebra::vec<2,float> v = mln::point2d(p); - output(p) = interp(t.inv()(v)); + mln::algebra::vec<2,float> tip = t.inv()(v); + output(p) = interp(tip); } } @@ -31,15 +35,17 @@ using namespace mln; //initialization - image2d< value::rgb<8> > input(512,512,100); - mln::io::pgm::load(input, "./lena.pgm"); - image2d< value::rgb<8> > output(512,512); + image2d< value::rgb<8> > input; + io::ppm::load(input, "./lena.ppm"); + image2d< value::rgb<8> > output(input.domain()); + + border::adjust(input, 512); + border::fill(input, literal::black); //transformation - fun::x2x::translation<2,float> t(make::vec(3,4)); - fun::x2x::rotation<2,float> r(1.57, make::vec(0,1)); + fun::x2x::translation<2,float> t(make::vec(20,20)); + fun::x2x::rotation<2,float> r(0.12, make::vec(0,1)); - test1<interpolation::nearest_neighbor>(input, output, t); - mln::io::pgm::save(output,"./out.pgm"); + test1<interpolation::bilinear>(input, output, compose(r,t)); + mln::io::ppm::save(output,"./out.ppm"); } - Index: jardonnet/virtual/nn.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/virtual/nn.ppm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/virtual/lena.ppm --- jardonnet/virtual/lena.ppm (revision 0) +++ jardonnet/virtual/lena.ppm (revision 0) Cannot display.

1 0

2368: * mln/core/site_set/p_graph.hh (operator<=): Typo in comment.
by Roland Levillain 22 Sep '08

22 Sep '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/site_set/p_graph.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5c3f153..453bd0f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/site_set/p_graph.hh (operator<=): Typo in comment. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update mln::draw::line w.r.t to mln::p_line2d. * mln/draw/line.hh (mln::draw::line): s/line2d/p_line2d/. diff --git a/milena/mln/core/site_set/p_graph.hh b/milena/mln/core/site_set/p_graph.hh index 073b91f..b714d0b 100644 --- a/milena/mln/core/site_set/p_graph.hh +++ b/milena/mln/core/site_set/p_graph.hh @@ -185,7 +185,7 @@ namespace mln /// \brief Inclusion of a mln::p_graph in another one. /// /// This inclusion relation is very strict for the moment, since our - /// infrastrure for graphs is simple: a mln::p_graph is included + /// infrastructure for graphs is simple: a mln::p_graph is included /// in another one if their are equal. /// /// \todo Refine this later, when we are able to express subgraph -- 1.5.6.5

1 0

2367: Update mln::draw::line w.r.t to mln::p_line2d.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/draw/line.hh (mln::draw::line): s/line2d/p_line2d/. --- milena/ChangeLog | 6 ++++++ milena/mln/draw/line.hh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a6c3302..5c3f153 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update mln::draw::line w.r.t to mln::p_line2d. + + * mln/draw/line.hh (mln::draw::line): s/line2d/p_line2d/. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Misc. fixes on line graph images. * mln/core/image/line_graph_image.hh: Fix identation. diff --git a/milena/mln/draw/line.hh b/milena/mln/draw/line.hh index aa23202..c6e441e 100644 --- a/milena/mln/draw/line.hh +++ b/milena/mln/draw/line.hh @@ -75,7 +75,7 @@ namespace mln { mln_precondition(exact(ima).has_data()); mln_precondition(exact(ima).has(beg) && exact(ima).has(end)); - level::paste(pw::cst(v) | line2d(beg, end), + level::paste(pw::cst(v) | p_line2d(beg, end), ima); } -- 1.5.6.5

1 0

2366: Misc. fixes on line graph images.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/line_graph_image.hh: Fix identation. * mln/core/site_set/p_line_graph.hh: Fix documentation and indentation. (mln::::p_line_graph::gr): Fix implementations. * mln/core/image/line_graph_psite.hh: Fix documentation. (mln::line_graph_psite::line_graph_psite): Don't invalidate the iterator as the site set is not defined, and invalidation would trigger an error. * mln/core/site_set/p_line_graph_piter.hh: Fix documentation. (mln::p_line_graph_fwd_piter_::p_line_graph_fwd_piter_) (mln::p_line_graph_bkd_piter_::p_line_graph_bkd_piter_): Fix postconditions (mln::p_line_graph_bkd_piter_::invalidate_) (mln::p_line_graph_bkd_piter_::start_): Catch up with the current interface of mln::line_graph_psite. * mln/core/image/line_graph_elt_neighborhood.hh (mln::line_graph_elt_neighborhood::niter): Fix documentation. * mln/core/internal/line_graph_vicinity_piter.hh: Typo in comment. (mln::internal::line_graph_vicinity_piter_<P, S, E>::self_): Remove typedef. * tests/core/image/line_graph_image.cc: Remove superfluous inclusion of mln/morpho/dilation.hh. * tests/morpho/line_graph_image_morpho.cc: Fix Doxygen header. * tests/morpho/Makefile.am (check_PROGRAMS): Disable line_graph_image_morpho. --- milena/ChangeLog | 30 ++++++++++++++++++++ .../mln/core/image/line_graph_elt_neighborhood.hh | 2 +- milena/mln/core/image/line_graph_image.hh | 2 +- milena/mln/core/image/line_graph_psite.hh | 7 ++-- .../mln/core/internal/line_graph_vicinity_piter.hh | 16 +++++----- milena/mln/core/site_set/p_line_graph.hh | 29 ++++++++---------- milena/mln/core/site_set/p_line_graph_piter.hh | 21 ++++++++----- milena/tests/core/image/line_graph_image.cc | 2 - milena/tests/morpho/Makefile.am | 3 +- milena/tests/morpho/line_graph_image_morpho.cc | 4 +- 10 files changed, 73 insertions(+), 43 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d0e326d..a6c3302 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Misc. fixes on line graph images. + + * mln/core/image/line_graph_image.hh: Fix identation. + * mln/core/site_set/p_line_graph.hh: Fix documentation and + indentation. + (mln::::p_line_graph::gr): Fix implementations. + * mln/core/image/line_graph_psite.hh: Fix documentation. + (mln::line_graph_psite::line_graph_psite): Don't invalidate the + iterator as the site set is not defined, and invalidation would + trigger an error. + * mln/core/site_set/p_line_graph_piter.hh: Fix documentation. + (mln::p_line_graph_fwd_piter_::p_line_graph_fwd_piter_) + (mln::p_line_graph_bkd_piter_::p_line_graph_bkd_piter_): + Fix postconditions + (mln::p_line_graph_bkd_piter_::invalidate_) + (mln::p_line_graph_bkd_piter_::start_): + Catch up with the current interface of mln::line_graph_psite. + * mln/core/image/line_graph_elt_neighborhood.hh + (mln::line_graph_elt_neighborhood::niter): Fix documentation. + * mln/core/internal/line_graph_vicinity_piter.hh: Typo in comment. + (mln::internal::line_graph_vicinity_piter_<P, S, E>::self_): + Remove typedef. + * tests/core/image/line_graph_image.cc: Remove superfluous + inclusion of mln/morpho/dilation.hh. + * tests/morpho/line_graph_image_morpho.cc: Fix Doxygen header. + * tests/morpho/Makefile.am (check_PROGRAMS): Disable + line_graph_image_morpho. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update tests exercising graph image. * tests/core/image/graph_image.cc: Update. diff --git a/milena/mln/core/image/line_graph_elt_neighborhood.hh b/milena/mln/core/image/line_graph_elt_neighborhood.hh index 38b7d8f..ee212fb 100644 --- a/milena/mln/core/image/line_graph_elt_neighborhood.hh +++ b/milena/mln/core/image/line_graph_elt_neighborhood.hh @@ -88,7 +88,7 @@ namespace mln /// neighborhood w.r.t. the reverse ordering of edges. typedef line_graph_neighborhood_bkd_piter<P, self_> bkd_niter; - /// The default qiter type. + /// The default niter type. typedef fwd_niter niter; /// \} diff --git a/milena/mln/core/image/line_graph_image.hh b/milena/mln/core/image/line_graph_image.hh index 6b9b7ba..3ae371b 100644 --- a/milena/mln/core/image/line_graph_image.hh +++ b/milena/mln/core/image/line_graph_image.hh @@ -181,7 +181,7 @@ namespace mln /// Return the point of the second vertex adjacent to the edge with /// id \a e. const P& vertex2(const util::edge_id& e) const; -}; + }; // Fwd decl. template <typename P, typename V, typename W> diff --git a/milena/mln/core/image/line_graph_psite.hh b/milena/mln/core/image/line_graph_psite.hh index 869a5cf..383f1ac 100644 --- a/milena/mln/core/image/line_graph_psite.hh +++ b/milena/mln/core/image/line_graph_psite.hh @@ -29,7 +29,7 @@ # define MLN_CORE_IMAGE_LINE_GRAPH_PSITE_HH /// \file mln/core/image/line_graph_psite.hh -/// \brief Definition of a line graph-based point site. +/// \brief Definition of a line graph-based psite. # include <mln/core/internal/pseudo_site_base.hh> @@ -46,10 +46,11 @@ namespace mln { - // Fwd decl. + // Forward declaration. template <typename P> class p_line_graph; template <typename P> class line_graph_psite; + /// \brief Point site associated to a mln::line_graph_image. /// /// \arg \p P The type of the site. @@ -191,7 +192,6 @@ namespace mln line_graph_psite::line_graph_psite() : plg_(0) { - invalidate(); } template <typename P> @@ -340,7 +340,6 @@ namespace mln return plg_->gr_->edge(id_).v2(); } - template <typename P> inline void diff --git a/milena/mln/core/internal/line_graph_vicinity_piter.hh b/milena/mln/core/internal/line_graph_vicinity_piter.hh index ffb7616..e8d0811 100644 --- a/milena/mln/core/internal/line_graph_vicinity_piter.hh +++ b/milena/mln/core/internal/line_graph_vicinity_piter.hh @@ -32,17 +32,18 @@ /// \brief Factored implementation for point iterators on a line graph windows /// and line graph neighborhoods, called "vicinities". -/* FIXME: Factor those classes: - - - mln::internal::graph_vicinity_piter.hh - - mln::internal::line_graph_vicinity_piter.hh */ - # include <set> # include <mln/core/internal/site_relative_iterator_base.hh> # include <mln/core/site_set/p_line_graph.hh> # include <mln/core/image/line_graph_psite.hh> +/* FIXME: Factor those classes: + + - mln::internal::graph_vicinity_piter.hh + - mln::internal::line_graph_vicinity_piter.hh */ + + namespace mln { // Fwd decls. @@ -52,6 +53,7 @@ namespace mln // FIXME: Consider renaming line_graph_vicinity_piter_ as // line_graph_relative_piter_. + namespace internal { @@ -60,8 +62,6 @@ namespace mln class line_graph_vicinity_piter_ : public internal::site_relative_iterator_base< S, E > { - typedef line_graph_vicinity_piter_<P, S, E> self_; - public: enum { dim = P::dim }; @@ -91,7 +91,7 @@ namespace mln }; - /// Print a mln::line_graph_vicinity_piter_<P, S, E>. + /// Print an mln::line_graph_vicinity_piter_<P, S, E>. template <typename P, typename S, typename E> inline std::ostream& diff --git a/milena/mln/core/site_set/p_line_graph.hh b/milena/mln/core/site_set/p_line_graph.hh index 96b2c93..ec3ce39 100644 --- a/milena/mln/core/site_set/p_line_graph.hh +++ b/milena/mln/core/site_set/p_line_graph.hh @@ -29,22 +29,21 @@ # define MLN_CORE_SITE_SET_P_LINE_GRAPH_HH /// \file mln/core/site_set/p_line_graph.hh -/// \brief Definition of a point set based on line graph. +/// \brief Definition of a point set based on a line graph. -# include <mln/core/concept/point_site.hh> # include <mln/core/internal/site_set_base.hh> # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> # include <mln/util/site_pair.hh> + # include <mln/core/image/line_graph_psite.hh> # include <mln/core/site_set/p_line_graph_piter.hh> /* FIXME: This class shares a lot with p_graph. Factor as much as possible. */ -/* FIXME: We should move the `adjacent_or_equal method' from iterators - into this class. */ - +/* FIXME: We should move the `adjacent'/`adjacent_or_equal' methods + out of this class (into iterators on *graph*). */ namespace mln { @@ -82,7 +81,7 @@ namespace mln /// /// \a gr is \em copied internally, so that the line graph psite /// set is still valid after the initial graph has been removed. - p_line_graph (const graph& gr); + p_line_graph(const graph& gr); /// Associated types. /// \{ @@ -128,11 +127,9 @@ namespace mln /// Accessors. /// \{ - /// Return the graph associated to the p_graph domain (const - /// version) + /// Return the graph associated to this site set (const version) const graph& gr() const; - /// Return the graph associated to the p_graph domain (mutable - /// version). + /// Return the graph associated to this site set (mutable version). graph& gr(); /// \} @@ -176,8 +173,8 @@ namespace mln /// \brief Inclusion of a mln::p_line_graph in another one. /// /// This inclusion relation is very strict for the moment, since our - /// infrastrure for graphs i simple: a mln::p_line_graph is included - /// in another one if their are equal. + /// infrastructure for graphs is simple: a mln::p_line_graph is + /// included in another one if their are equal. /// /// \todo Refine this later, when we are able to express subgraph /// relations. @@ -193,7 +190,7 @@ namespace mln inline p_line_graph::p_line_graph(const util::graph& gr) // Create a deep, managed copy of GR. - : gr_ (new util::graph(gr)) + : gr_(new util::graph(gr)) { } @@ -227,7 +224,7 @@ namespace mln p_line_graph::is_valid() const { // FIXME: Might be too low-level, again. - return (gr_.ptr_); + return gr_.ptr_; } template <typename P> @@ -255,7 +252,7 @@ namespace mln template <typename P> const util::graph& - p_graph::gr() const + p_line_graph::gr() const { mln_precondition(is_valid()); return *gr_.ptr_; @@ -263,7 +260,7 @@ namespace mln template <typename P> util::graph& - p_graph::gr() + p_line_graph::gr() { mln_precondition(is_valid()); return *gr_.ptr_; diff --git a/milena/mln/core/site_set/p_line_graph_piter.hh b/milena/mln/core/site_set/p_line_graph_piter.hh index 90b8e3c..f74660d 100644 --- a/milena/mln/core/site_set/p_line_graph_piter.hh +++ b/milena/mln/core/site_set/p_line_graph_piter.hh @@ -31,10 +31,13 @@ /// \file mln/core/site_set/p_line_graph_piter.hh /// \brief Definition of point iterators on line graph-based site set. -# include <mln/core/internal/site_iterator_base.hh> +# include <mln/core/internal/site_set_iterator_base.hh> # include <mln/core/site_set/p_line_graph.hh> # include <mln/core/image/line_graph_psite.hh> +/* FIXME: Iterators on p_graph and p_line_graph share common code. + Factor as much as possible. */ + namespace mln { @@ -78,11 +81,12 @@ namespace mln /// \} protected: + /// The psite corresponding to this iterator. using super_::p_; }; - /// Print a mln::p_line_graph_fwd_piter_. + /// Print an mln::p_line_graph_fwd_piter_. template <typename P> inline std::ostream& @@ -135,6 +139,7 @@ namespace mln operator<<(std::ostream& ostr, const p_line_graph_bkd_piter_& p); + # ifndef MLN_INCLUDE_ONLY /*-----------------------------. @@ -145,7 +150,7 @@ namespace mln inline p_line_graph_fwd_piter_::p_line_graph_fwd_piter_() { - mln_postcondition(!is_valid()); + mln_postcondition(!this->is_valid()); } template <typename P> @@ -153,7 +158,7 @@ namespace mln p_line_graph_fwd_piter_::p_line_graph_fwd_piter_(const p_line_graph& plg) { this->change_target(plg); - mln_postcondition(!is_valid()); + mln_postcondition(!this->is_valid()); } template <typename P> @@ -206,7 +211,7 @@ namespace mln inline p_line_graph_bkd_piter_::p_line_graph_bkd_piter_() { - mln_postcondition(!is_valid()); + mln_postcondition(!this->is_valid()); } template <typename P> @@ -214,7 +219,7 @@ namespace mln p_line_graph_bkd_piter_::p_line_graph_bkd_piter_(const p_line_graph& plg) { this->change_target(plg); - mln_postcondition(!is_valid()); + mln_postcondition(!this->is_valid()); } template <typename P> @@ -230,7 +235,7 @@ namespace mln void p_line_graph_bkd_piter_::invalidate_() { - p_.set_id(this->site_set().nedges()); + p_.change_edge_id(this->site_set().nedges()); } template <typename P> @@ -238,7 +243,7 @@ namespace mln void p_line_graph_bkd_piter_::start_() { - p_.set_id(this->site_set().nedges() - 1); + p_.change_edge_id(this->site_set().nedges() - 1); } template <typename P> diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/core/image/line_graph_image.cc index 2e7fbe4..74d374b 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/core/image/line_graph_image.cc @@ -35,8 +35,6 @@ #include <mln/core/image/line_graph_elt_window.hh> #include <mln/core/image/line_graph_window_piter.hh> -#include <mln/morpho/dilation.hh> - int main() { diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 2bce281..36f11dd 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -21,7 +21,7 @@ check_PROGRAMS = \ ## lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ ## line_graph_image_wst \ - line_graph_image_morpho \ +## line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ @@ -54,6 +54,7 @@ laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc graph_image_morpho_SOURCES = graph_image_morpho.cc + line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/morpho/line_graph_image_morpho.cc b/milena/tests/morpho/line_graph_image_morpho.cc index 2306513..a3c74cf 100644 --- a/milena/tests/morpho/line_graph_image_morpho.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/image/graph_image.cc -/// \brief Tests on mln::graph_image. +/// \file tests/morpho/line_graph_image_morpho.cc +/// \brief Tests on mln::line_graph_image with morphological filters. #include <vector> -- 1.5.6.5

1 0

2364: Update tests exercising graph image.
by Roland Levillain 22 Sep '08

22 Sep '08

* tests/core/image/graph_image.cc: Update. Move the morpho-related part... * tests/morpho/graph_image_morpho.cc: ...here (new test). * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable graph_image. (graph_image_SOURCES): Re-enable. * tests/morpho/Makefile.am (check_PROGRAMS): Add graph_image_morpho (as a disabled test). (graph_image_morpho_SOURCES): New. --- milena/ChangeLog | 14 ++++ milena/tests/core/image/Makefile.am | 4 +- milena/tests/core/image/graph_image.cc | 26 ++++----- milena/tests/morpho/Makefile.am | 2 + .../graph_image_morpho.cc} | 64 ++------------------ 5 files changed, 35 insertions(+), 75 deletions(-) copy milena/tests/{core/image/graph_image.cc => morpho/graph_image_morpho.cc} (63%) diff --git a/milena/ChangeLog b/milena/ChangeLog index a648fe5..d0e326d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update tests exercising graph image. + + * tests/core/image/graph_image.cc: Update. + Move the morpho-related part... + * tests/morpho/graph_image_morpho.cc: ...here (new test). + * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable + graph_image. + (graph_image_SOURCES): Re-enable. + * tests/morpho/Makefile.am (check_PROGRAMS): Add + graph_image_morpho (as a disabled test). + (graph_image_morpho_SOURCES): New. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph image. * mln/core/image/graph_image.hh diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 583cbba..bf39e2b 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = \ decorated_image \ flat_image \ ## hexa \ -## graph_image \ + graph_image \ ## graph_image_wst \ image1d \ image2d \ @@ -35,7 +35,7 @@ check_PROGRAMS = \ cast_image_SOURCES = cast_image.cc complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc -##graph_image_SOURCES = graph_image.cc +graph_image_SOURCES = graph_image.cc ##graph_image_wst_SOURCES = graph_image_wst.cc flat_image_SOURCES = flat_image.cc ##hexa_SOURCES = hexa.cc diff --git a/milena/tests/core/image/graph_image.cc b/milena/tests/core/image/graph_image.cc index bc08b22..7913589 100644 --- a/milena/tests/core/image/graph_image.cc +++ b/milena/tests/core/image/graph_image.cc @@ -30,13 +30,13 @@ #include <vector> +#include <mln/accu/bbox.hh> +#include <mln/core/alias/box2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> #include <mln/core/image/graph_window_piter.hh> -#include <mln/morpho/dilation.hh> - #include <mln/draw/graph.hh> #include <mln/debug/iota.hh> #include <mln/debug/println.hh> @@ -109,6 +109,14 @@ int main() ima_t ima(pg, values); // Initialize values. debug::iota(ima); + // Compute the bounding box of IMA. + /* FIXME: mln::graph_image should automatically feature a bbox when + its parameter P is akin to a point. */ + accu::bbox<point2d> a; + for (std::vector<point2d>::const_iterator i = points.begin(); + i != points.end(); ++i) + a.take(*i); + box2d bbox = a.to_result(); // Print the image. /* FIXME: Unfortunately, displaying graph images is not easy right now (2008-02-05). We could use @@ -127,7 +135,7 @@ int main() The current solution is a mix between draw::graph and hand-made iterations. */ - image2d<int> ima_rep(ima.bbox()); + image2d<int> ima_rep(bbox); // We use the value 9 in draw::graph instead of the default (which is // 1) to represent edges to distinguish it from vertices holding a // value of 1. @@ -156,16 +164,4 @@ int main() std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; } std::cout << std::endl; - - /*--------------------------. - | Processing graph images. | - `--------------------------*/ - - graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - draw::graph(ima_rep, ima_dil, 9); - debug::println(ima_rep); - - graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - draw::graph(ima_rep, ima_ero, 9); - debug::println(ima_rep); } diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 8955692..2bce281 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -15,6 +15,7 @@ check_PROGRAMS = \ erosion_min_h \ gradient \ gradient_elementary \ +## graph_image_morpho \ hit_or_miss \ laplacian \ ## lena_line_graph_image_wst1 \ @@ -52,6 +53,7 @@ hit_or_miss_SOURCES = hit_or_miss.cc laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc +graph_image_morpho_SOURCES = graph_image_morpho.cc line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/core/image/graph_image.cc b/milena/tests/morpho/graph_image_morpho.cc similarity index 63% copy from milena/tests/core/image/graph_image.cc copy to milena/tests/morpho/graph_image_morpho.cc index bc08b22..2acc5a5 100644 --- a/milena/tests/core/image/graph_image.cc +++ b/milena/tests/morpho/graph_image_morpho.cc @@ -25,11 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/image/graph_image.cc -/// \brief Tests on mln::graph_image. +/// \file tests/morpho/graph_image_morpho.cc +/// \brief Tests on mln::graph_image with morphological filters. #include <vector> +#include <mln/accu/bbox.hh> +#include <mln/core/alias/box2d.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_window.hh> @@ -91,16 +93,9 @@ int main() p_graph<point2d> pg(g); - // Check adjacencies of vertex 1. - mln_assertion( pg.adjacent(1, 0)); - mln_assertion(!pg.adjacent(1, 1)); - mln_assertion( pg.adjacent(1, 2)); - mln_assertion( pg.adjacent(1, 3)); - mln_assertion(!pg.adjacent(1, 4)); - - /*-------------. + /*--------------. | Graph image. | - `-------------*/ + `--------------*/ // Values ("empty" vector). std::vector<int> values(5); @@ -109,53 +104,6 @@ int main() ima_t ima(pg, values); // Initialize values. debug::iota(ima); - // Print the image. - /* FIXME: Unfortunately, displaying graph images is not easy right - now (2008-02-05). We could use - - debug::println(ima); - - but there's not specialization working for graph_image; the one - selected by the compiler is based on a 2-D bbox, and expects the - interface of graph_image to work with points (not psites). - Moreover, this implementation only shows *values*, not the graph - itslef. - - An alternative is to use draw::graph (which, again, is misnamed), - but it doesn't show the values, only the vertices and edges of the - graph. - - The current solution is a mix between draw::graph and hand-made - iterations. */ - image2d<int> ima_rep(ima.bbox()); - // We use the value 9 in draw::graph instead of the default (which is - // 1) to represent edges to distinguish it from vertices holding a - // value of 1. - draw::graph (ima_rep, ima, 9); - debug::println (ima_rep); - - - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" < win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "neighbors of " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; - } - std::cout << std::endl; /*--------------------------. | Processing graph images. | -- 1.5.6.5

1 0

2363: Update graph image.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_image.hh (mln::trait::image_< graph_image<P, V> >): Update properties. (mln::graph_image<P, V>): Fix access to members. (mln::graph_image<P, V>::operator()(const graph_psite&)): Catch up with the new interface of mln::graph_psite. --- milena/ChangeLog | 10 +++++ milena/mln/core/image/graph_image.hh | 61 ++++++++++++++++++++------------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f7932d2..a648fe5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph image. + + * mln/core/image/graph_image.hh + (mln::trait::image_< graph_image<P, V> >): Update properties. + (mln::graph_image<P, V>): Fix access to members. + (mln::graph_image<P, V>::operator()(const graph_psite&)): + Catch up with the new interface of mln::graph_psite. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update elementary neighborhood on graph image. * mln/core/image/graph_elt_neighborhood.hh diff --git a/milena/mln/core/image/graph_image.hh b/milena/mln/core/image/graph_image.hh index 626b0b6..29335ca 100644 --- a/milena/mln/core/image/graph_image.hh +++ b/milena/mln/core/image/graph_image.hh @@ -31,6 +31,8 @@ /// \file mln/core/image/graph_image.hh /// \brief Definition of a graph-based image. +# include <vector> + # include <mln/trait/images.hh> # include <mln/core/internal/image_primary.hh> @@ -38,7 +40,10 @@ # include <mln/core/site_set/p_graph.hh> # include <mln/core/image/graph_psite.hh> # include <mln/value/set.hh> -# include <vector> + +/* FIXME: This class shares a lot with line_graph_image. Factor as + much as possible. */ + namespace mln { @@ -68,35 +73,42 @@ namespace mln template <typename P, typename V> struct image_< graph_image<P, V> > : default_image_< V, graph_image<P, V> > { + // Misc. typedef trait::image::category::primary category; - // FIXME: Is that right? - typedef trait::image::access::random access; - typedef typename trait::image::space_from_point::ret space; - typedef trait::image::size::regular size; - typedef trait::image::support::irregular support; - - typedef trait::image::border::none border; - typedef trait::image::data::stored data; - typedef trait::image::io::read_write io; + typedef trait::image::speed::fast speed; + typedef trait::image::size::regular size; + + // Value. + typedef trait::image::value_access::direct value_access; // FIXME: Is that right? - typedef trait::image::speed::fast speed; + typedef trait::image::value_storage::one_block value_storage; + typedef trait::image::value_browsing::site_wise_only value_browsing; + typedef trait::image::value_io::read_write value_io; + + // Site / domain. + // FIXME: Depends on P. + typedef trait::image::localization::basic_grid localization; + // FIXME: Likewise. + typedef typename trait::image::space_from_point::ret dimension; + + // Extended domain + typedef trait::image::ext_domain::none ext_domain; + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; }; } // end of namespace mln::trait - /// \brief Image based on a line graph. + /// \brief Image based on a graph. /// /// Values are stored on the edges of the graph, not on its vertices. template <typename P, typename V> - struct graph_image : + class graph_image : public internal::image_primary< V, p_graph, graph_image<P, V> > { - /// Super type. - typedef mln::internal::image_base<V, p_graph, - graph_image<P, V> > super_; - + public: /// Value associated type. typedef V value; @@ -114,6 +126,7 @@ namespace mln /// Skeleton. typedef graph_image< tag::psite_, tag::value_<V> > skeleton; + public: /// Constructors. /// \{ graph_image(); @@ -148,7 +161,7 @@ namespace mln /// Return the point of the second vertex adjacent to the edge with /// id \a e. const P& vertex2(const util::edge_id& e) const; -}; + }; // Fwd decl. template <typename P, typename V, typename W> @@ -232,9 +245,9 @@ namespace mln typename graph_image<P, V>::rvalue graph_image<P, V>::operator()(const graph_psite& p) const { - mln_precondition(p.pg() == this->data_->pg_); - mln_precondition(p.id() < this->data_->val_.size()); - return this->data_->val_[p.id()]; + mln_precondition(p.is_valid()); + mln_precondition(p.site_set() == this->data_->pg_); + return this->data_->val_[p.vertex_id()]; } template <typename P, typename V> @@ -242,9 +255,9 @@ namespace mln typename graph_image<P, V>::lvalue graph_image<P, V>::operator()(const graph_psite& p) { - mln_precondition(p.pg() == this->data_->pg_); - mln_precondition(p.id() < this->data_->val_.size()); - return this->data_->val_[p.id()]; + mln_precondition(p.is_valid()); + mln_precondition(p.site_set() == this->data_->pg_); + return this->data_->val_[p.vertex_id()]; } template <typename P, typename V> -- 1.5.6.5

1 0