Olena-patches November 2008

olena-patches@lrde.epita.fr

14 participants
266 discussions

by Guillaume Lazzara

* mln/debug/graph.hh: update in order to support p_vertices. * tests/core/image/graph_image.cc: Add assertions. * tests/core/site_set/p_vertices.cc: use fun::i2v::array. --- milena/ChangeLog | 10 ++++++ milena/mln/debug/graph.hh | 45 +++++++++++++++-------------- milena/tests/core/image/graph_image.cc | 7 ++-- milena/tests/core/site_set/p_vertices.cc | 25 ++++++---------- 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7d6da48..0bdb17c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2008-11-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix graph related files. + + * mln/debug/graph.hh: update in order to support p_vertices. + + * tests/core/image/graph_image.cc: Add assertions. + + * tests/core/site_set/p_vertices.cc: use fun::i2v::array. + +2008-11-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Make all_headers and essential_headers compile. * mln/core/image/all.hh, diff --git a/milena/mln/debug/graph.hh b/milena/mln/debug/graph.hh index ef52e0b..7485d7e 100644 --- a/milena/mln/debug/graph.hh +++ b/milena/mln/debug/graph.hh @@ -34,8 +34,7 @@ # include <mln/pw/image.hh> # include <mln/level/fill.hh> # include <mln/draw/line.hh> -# include <mln/core/site_set/p_graph.hh> -# include <mln/core/image/graph_image.hh> +# include <mln/core/site_set/p_vertices.hh> namespace mln { @@ -48,16 +47,15 @@ namespace mln * the background. * * \param[in,out] ima The image to be drawn. - * \param[in] pg The p_graph which contains vertices and edges - * positions. + * \param[in] pv The p_vertices which contains vertices positions. * \param[in] vertex_v The value to assign to pixels which contains * vertices. * \param[in] edge_v The value to assign to pixels which contains * edges. */ - template <typename I, typename P> + template <typename I, typename G, typename F> void - draw_graph(Image& ima, const p_graph& pg, + draw_graph(Image& ima, const p_vertices<G, F>& pv, mln_value(I) vertex_v, mln_value(I) edge_v); /*! \brief Draw an image \p ima from a mln::graph_image \p gi. @@ -72,37 +70,39 @@ namespace mln */ // FIXME: The type of the last argument cannot always been // constructed from `int'! We should remove this last argument. - template <typename I, typename P, typename V> - void - draw_graph(Image& ima, const graph_image<P, V>& gi, - mln_value(I) edge_v = 1); +// template <typename I, typename P, typename V> +// void +// draw_graph(Image& ima, const graph_image<P, V>& gi, +// mln_value(I) edge_v = 1); # ifndef MLN_INCLUDE_ONLY // FIXME: Add assertions on the size of the image: it must be large // enough to hold the representation of the graph/graph_image. - template <typename I, typename P> + template <typename I, typename G, typename F> inline void - draw_graph(Image& ima, const p_graph& pg, + draw_graph(Image& ima, const p_vertices<G, F>& pv, mln_value(I) vertex_v, mln_value(I) edge_v) { // Debug the background. level::fill(ima, 0); + // Debug the lines (edges). - for (unsigned l = 0; l < pg.nedges(); ++l) - line (exact(ima), - // FIXME: Too low-level. See similar remarks - // in mln/core/image/graph_image.hh - pg.gr_->vertex_data(pg.gr_->edge(l).v1()), - pg.gr_->vertex_data(pg.gr_->edge(l).v2()), - edge_v); + const G& g = pv.graph(); + typedef p_vertices<G, F> pv_t; + mln_edge_iter(G) ei(g); + for_all(ei) + draw::line(exact(ima), pv(ei.v1()), pv(ei.v2()), edge_v); + // Debug the points (vertices). - for (unsigned p = 0; p < pg.nsites(); ++p) - exact(ima)(pg.gr_->vertex_data(p)) = vertex_v; + mln_piter(pv_t) p(pv); + for_all(p) + exact(ima)(p) = vertex_v; } +/* template <typename I, typename P, typename V> inline void @@ -116,8 +116,9 @@ namespace mln line (exact(ima), gi.vertex1(l), gi.vertex2(l), edge_v); // Debug the points (vertices). for (unsigned p = 0; p < gi.domain().nvertices(); ++p) - exact(ima)(gi.domain().point_from_id(p)) = gi.vertex_values()[p]; + exact(ima)(gi.domain().point_from_id(p)) = gi.vertex_values()[p]; } +*/ # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/core/image/graph_image.cc b/milena/tests/core/image/graph_image.cc index 34faf3a..4c3f09a 100644 --- a/milena/tests/core/image/graph_image.cc +++ b/milena/tests/core/image/graph_image.cc @@ -121,7 +121,7 @@ int main() g.add_edge(3, 4); g.add_edge(4, 2); - g.print_debug(std::cout); + //g.print_debug(std::cout); /*----------------------. | Graph image support. | @@ -171,7 +171,7 @@ int main() // We use the value 9 in debug::graph to represent edges to distinguish it // from vertices holding a value of 1. - debug::graph(ima_rep, pv, 1, 9); + debug::draw_graph(ima_rep, pv, 1, 9); debug::println(ima_rep); } @@ -181,8 +181,9 @@ int main() // iteration over the domain of IMA. mln_piter_(ima_t) p(ima.domain()); + unsigned i = 10; for_all (p) - std::cout << "ima (" << p << ") = " << ima(p) << std::endl; + mln_assertion(ima(p) == i++); { // Window - Forward iteration diff --git a/milena/tests/core/site_set/p_vertices.cc b/milena/tests/core/site_set/p_vertices.cc index cdee10b..b2c600d 100644 --- a/milena/tests/core/site_set/p_vertices.cc +++ b/milena/tests/core/site_set/p_vertices.cc @@ -33,20 +33,7 @@ #include <mln/util/graph.hh> #include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_vertices.hh> - -template <typename G> -struct my_fun -{ - typedef mln::point2d result; - - const result& operator()(const mln::util::vertex<G>& v) const - { - static mln::point2d res(0, 0); - res.row() = v.id(); - return res; - } - -}; +#include <mln/fun/i2v/array.hh> int main() { @@ -68,8 +55,14 @@ int main() g.add_edge (5, 3); g.add_edge (2, 1); - typedef p_vertices<util::graph, my_fun<util::graph> > p_vertices; - p_vertices pv(g, my_fun<util::graph>()); + // Map vertices to sites. + typedef fun::i2v::array<point2d> F; + F f(5); + for (unsigned i = 0; i < 5; ++i) + f(i) = point2d(i, 0); + + typedef p_vertices<util::graph, F> p_vertices; + p_vertices pv(g, f); { mln_fwd_piter_(p_vertices) p(pv); -- 1.5.6.5

16 years, 1 month

2803: Make all_headers and essential_headers compile.

by Guillaume Lazzara

* mln/core/image/all.hh, * mln/debug/all.hh, * mln/io/all.hh, * mln/io/fits/all.hh, * mln/make/all.hh, * mln/util/all.hh: comment headers causing compilation errors. * tests/all_headers.cc: fix copyright. * tests/essential_headers.cc, * tests/Makefile.am: add essential_headers test. --- milena/ChangeLog | 16 +++++++++++ milena/mln/core/image/all.hh | 28 ++++++++++---------- milena/mln/debug/all.hh | 2 +- milena/mln/io/all.hh | 4 +- milena/mln/io/fits/all.hh | 2 +- milena/mln/make/all.hh | 3 +- milena/mln/util/all.hh | 4 +- milena/tests/Makefile.am | 4 ++- milena/tests/all_headers.cc | 2 +- .../io/fits/all.hh => tests/essential_headers.cc} | 24 +++++------------ 10 files changed, 48 insertions(+), 41 deletions(-) copy milena/{mln/io/fits/all.hh => tests/essential_headers.cc} (77%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f69b232..7d6da48 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2008-11-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Make all_headers and essential_headers compile. + + * mln/core/image/all.hh, + * mln/debug/all.hh, + * mln/io/all.hh, + * mln/io/fits/all.hh, + * mln/make/all.hh, + * mln/util/all.hh: comment headers causing compilation errors. + + * tests/all_headers.cc: fix copyright. + + * tests/essential_headers.cc, + * tests/Makefile.am: add essential_headers test. + +2008-11-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. * milena/mln/accu/line.hh: avoid compilation warnings. diff --git a/milena/mln/core/image/all.hh b/milena/mln/core/image/all.hh index 2f2d819..ded49a3 100644 --- a/milena/mln/core/image/all.hh +++ b/milena/mln/core/image/all.hh @@ -48,7 +48,7 @@ # include <mln/core/image/flat_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/image/fi_adaptor.hh> +//# include <mln/core/image/fi_adaptor.hh> # include <mln/core/image/image1d.hh> # include <mln/core/image/decorated_image.hh> # include <mln/core/image/extended.hh> @@ -61,11 +61,11 @@ //# include <mln/core/image/graph_image.hh> # include <mln/core/image/graph_neighborhood_piter.hh> # include <mln/core/image/graph_window_piter.hh> -# include <mln/core/image/hexa.hh> -# include <mln/core/image/hexa_piter.hh> +//# include <mln/core/image/hexa.hh> +//# include <mln/core/image/hexa_piter.hh> # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image2d_h.hh> +//# include <mln/core/image/image2d_h.hh> # include <mln/core/image/image3d.hh> # include <mln/core/image/image_if.hh> # include <mln/core/image/interpolated.hh> @@ -76,15 +76,15 @@ //# include <mln/core/image/line_graph_neighborhood_piter.hh> //# include <mln/core/image/line_graph_psite.hh> //# include <mln/core/image/line_graph_window_piter.hh> -# include <mln/core/image/mono_obased_rle_encode.hh> -# include <mln/core/image/mono_obased_rle_image.hh> -# include <mln/core/image/mono_rle_encode.hh> -# include <mln/core/image/mono_rle_image.hh> -# include <mln/core/image/obased_rle_encode.hh> -# include <mln/core/image/obased_rle_image.hh> +//# include <mln/core/image/mono_obased_rle_encode.hh> +//# include <mln/core/image/mono_obased_rle_image.hh> +//# include <mln/core/image/mono_rle_encode.hh> +//# include <mln/core/image/mono_rle_image.hh> +//# include <mln/core/image/obased_rle_encode.hh> +//# include <mln/core/image/obased_rle_image.hh> # include <mln/core/image/plain.hh> -# include <mln/core/image/rle_encode.hh> -# include <mln/core/image/rle_image.hh> +//# include <mln/core/image/rle_encode.hh> +//# include <mln/core/image/rle_image.hh> # include <mln/core/image/safe.hh> # include <mln/core/image/sparse_encode.hh> # include <mln/core/image/sparse_image.hh> @@ -94,8 +94,8 @@ # include <mln/core/image/translate_image.hh> # include <mln/core/image/tr_image.hh> # include <mln/core/image/tr_mesh.hh> -# include <mln/core/image/value_enc_image.hh> -# include <mln/core/image/value_encode.hh> +//# include <mln/core/image/value_enc_image.hh> +//# include <mln/core/image/value_encode.hh> #endif // ! MLN_CORE_IMAGE_ALL_HH diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index e2db2f4..a17fb37 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -48,7 +48,7 @@ namespace mln # include <mln/debug/colorize.hh> # include <mln/debug/format.hh> -# include <mln/debug/graph.hh> +//# include <mln/debug/graph.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> # include <mln/debug/println_with_border.hh> diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 51ddbb2..bb6f7d3 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -46,8 +46,8 @@ namespace mln } -# include <mln/io/fits/all.hh> -# include <mln/io/off/all.hh> +//# include <mln/io/fits/all.hh> +//# include <mln/io/off/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> diff --git a/milena/mln/io/fits/all.hh b/milena/mln/io/fits/all.hh index 44821f3..42c3739 100644 --- a/milena/mln/io/fits/all.hh +++ b/milena/mln/io/fits/all.hh @@ -45,6 +45,6 @@ namespace mln } -# include <mln/io/fits/load.hh> +//# include <mln/io/fits/load.hh> #endif // ! MLN_IO_FITS_ALL_HH diff --git a/milena/mln/make/all.hh b/milena/mln/make/all.hh index a36d8c3..5d11136 100644 --- a/milena/mln/make/all.hh +++ b/milena/mln/make/all.hh @@ -55,7 +55,7 @@ namespace mln # include <mln/make/pixel.hh> # include <mln/make/point2d_h.hh> # include <mln/make/vec.hh> -# include <mln/make/voronoi.hh> +//# include <mln/make/voronoi.hh> # include <mln/make/w_window.hh> # include <mln/make/w_window1d.hh> # include <mln/make/w_window1d_int.hh> @@ -66,5 +66,4 @@ namespace mln # include <mln/make/w_window_directional.hh> # include <mln/make/win_chamfer.hh> - #endif // ! MLN_MAKE_ALL_HH diff --git a/milena/mln/util/all.hh b/milena/mln/util/all.hh index 7e6b5ef..169284f 100644 --- a/milena/mln/util/all.hh +++ b/milena/mln/util/all.hh @@ -66,13 +66,13 @@ namespace mln # include <mln/util/pix.hh> # include <mln/util/set.hh> # include <mln/util/site_pair.hh> -# include <mln/util/timer.hh> +//# include <mln/util/timer.hh> # include <mln/util/tracked_ptr.hh> # include <mln/util/tree.hh> # include <mln/util/tree_fast.hh> # include <mln/util/tree_fast_to_image.hh> # include <mln/util/tree_to_fast.hh> -# include <mln/util/tree_to_image.hh> +//# include <mln/util/tree_to_image.hh> # include <mln/util/yes.hh> #endif // ! MLN_UTIL_ALL_HH diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 665344e..bec1d60 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -44,8 +44,10 @@ SUBDIRS = \ win check_PROGRAMS = \ - all_headers + all_headers \ + essential_headers all_headers_SOURCES = all_headers.cc +essential_headers_SOURCES = essential_headers.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/all_headers.cc b/milena/tests/all_headers.cc index 611f282..b84a0b8 100644 --- a/milena/tests/all_headers.cc +++ b/milena/tests/all_headers.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/mln/io/fits/all.hh b/milena/tests/essential_headers.cc similarity index 77% copy from milena/mln/io/fits/all.hh copy to milena/tests/essential_headers.cc index 44821f3..fab5533 100644 --- a/milena/mln/io/fits/all.hh +++ b/milena/tests/essential_headers.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,26 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_FITS_ALL_HH -# define MLN_IO_FITS_ALL_HH - -/*! \file mln/io/fits/all.hh +/*! \file tests/essential_headers.cc * - * \brief File that includes all fits io materials. + * \brief Tests with essential headers. (check norris tests 2) */ +#include <mln/essential/1d.hh> +#include <mln/essential/2d.hh> +#include <mln/essential/3d.hh> -namespace mln +int main () { - namespace io - { - /// Namespace of fits input/output handling. - namespace fits {} - } - } - -# include <mln/io/fits/load.hh> - -#endif // ! MLN_IO_FITS_ALL_HH -- 1.5.6.5

16 years, 1 month

2802: Various small fixes.

by Guillaume Lazzara

* milena/mln/accu/line.hh: avoid compilation warnings. * milena/mln/accu/volume.hh: Fix missing include. * milena/mln/core/dpsites_piter.hh: use to_vec() instead of std_vector(). * milena/mln/core/image/tr_image.hh: call to_vec(); * milena/mln/debug/println_with_border.spe.hh: use point_at_index() instead of operator[]. * milena/mln/trait/value_.hh: change max card value for low quantification. * milena/mln/util/internal/graph_psite_base.hh: Add missing operators. * milena/tests/core/image/tr_image.cc: fix include. * milena/tests/core/other/box_runstart_piter.cc: remove make:: prefix. * milena/tests/core/other/point_set_compatibility.cc: update test according last changes in p_vertices. --- milena/ChangeLog | 29 ++++++ milena/mln/accu/line.hh | 4 +- milena/mln/accu/volume.hh | 1 + milena/mln/core/dpsites_piter.hh | 10 +- milena/mln/core/image/tr_image.hh | 4 +- milena/mln/debug/println_with_border.spe.hh | 2 +- milena/mln/trait/value_.hh | 2 +- milena/mln/util/internal/graph_psite_base.hh | 96 ++++++++++++++++++-- milena/tests/core/image/tr_image.cc | 8 +- milena/tests/core/other/box_runstart_piter.cc | 8 +- milena/tests/core/other/point_set_compatibility.cc | 36 ++++---- 11 files changed, 153 insertions(+), 47 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index afed71f..f69b232 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,32 @@ +2008-11-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Various small fixes. + + * milena/mln/accu/line.hh: avoid compilation warnings. + + * milena/mln/accu/volume.hh: Fix missing include. + + * milena/mln/core/dpsites_piter.hh: use to_vec() instead of + std_vector(). + + * milena/mln/core/image/tr_image.hh: call to_vec(); + + * milena/mln/debug/println_with_border.spe.hh: use point_at_index() + instead of operator[]. + + * milena/mln/trait/value_.hh: change max card value for low + quantification. + + * milena/mln/util/internal/graph_psite_base.hh: Add missing operators. + + * milena/tests/core/image/tr_image.cc: fix include. + + * milena/tests/core/other/box_runstart_piter.cc: remove make:: + prefix. + + * milena/tests/core/other/point_set_compatibility.cc: update test + according last changes in p_vertices. + 2008-11-04 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update level stretch so that output is returned. diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh index 8766085..cb484d7 100644 --- a/milena/mln/accu/line.hh +++ b/milena/mln/accu/line.hh @@ -78,8 +78,8 @@ namespace mln typename I, typename O> void line_tests(const Image& input_, - const mln_site(I)& p_start, unsigned len, - unsigned half_length, + const mln_site(I)&, unsigned, + unsigned, Image<O>& output_) { mlc_is_a(Meta_Accu, Meta_Accumulator)::check(); diff --git a/milena/mln/accu/volume.hh b/milena/mln/accu/volume.hh index 8be5ac8..705434b 100644 --- a/milena/mln/accu/volume.hh +++ b/milena/mln/accu/volume.hh @@ -42,6 +42,7 @@ # include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> +# include <mln/math/abs.hh> # include <mln/util/pix.hh> # include <mln/literal/zero.hh> diff --git a/milena/mln/core/dpsites_piter.hh b/milena/mln/core/dpsites_piter.hh index 99d95f5..07a9cc2 100644 --- a/milena/mln/core/dpsites_piter.hh +++ b/milena/mln/core/dpsites_piter.hh @@ -155,7 +155,7 @@ namespace mln bool dpsites_fwd_piter<V>::is_valid_() const { - return i_ != this->s_->std_vector().size(); + return i_ != this->s_->to_vec().size(); } template <typename V> @@ -163,7 +163,7 @@ namespace mln void dpsites_fwd_piter<V>::invalidate_() { - i_ = this->s_->std_vector().size(); + i_ = this->s_->to_vec().size(); } template <typename V> @@ -187,7 +187,7 @@ namespace mln mln_psite(V) dpsites_fwd_piter<V>::compute_p_() const { - return *this->c_ + this->s_->std_vector()[i_]; + return *this->c_ + this->s_->to_vec()[i_]; } @@ -229,7 +229,7 @@ namespace mln void dpsites_bkd_piter<V>::do_start_() { - i_ = this->s_->std_vector().size() - 1; + i_ = this->s_->to_vec().size() - 1; } template <typename V> @@ -245,7 +245,7 @@ namespace mln mln_psite(V) dpsites_bkd_piter<V>::compute_p_() const { - return *this->c_ + this->s_->std_vector()[i_]; + return *this->c_ + this->s_->to_vec()[i_]; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/image/tr_image.hh b/milena/mln/core/image/tr_image.hh index 1b5d055..6459750 100644 --- a/milena/mln/core/image/tr_image.hh +++ b/milena/mln/core/image/tr_image.hh @@ -202,7 +202,7 @@ namespace mln mln_value(I) tr_image<S,I,T>::operator()(const psite& p) const { - algebra::vec<I::psite::dim, float> v = p; + algebra::vec<I::psite::dim, float> v = p.to_vec(); return this->data_->ima_(this->data_->tr_.inv()(v)); } @@ -211,7 +211,7 @@ namespace mln mln_value(I) tr_image<S,I,T>::operator()(const psite& p) { - algebra::vec<I::psite::dim, float> v = p; + algebra::vec<I::psite::dim, float> v = p.to_vec(); return this->data_->ima_(this->data_->tr_.inv()(v)); } diff --git a/milena/mln/debug/println_with_border.spe.hh b/milena/mln/debug/println_with_border.spe.hh index c57f7c1..b03e675 100644 --- a/milena/mln/debug/println_with_border.spe.hh +++ b/milena/mln/debug/println_with_border.spe.hh @@ -95,7 +95,7 @@ namespace mln for (unsigned j = 0; j < real_len_r; ++j) { for (unsigned i = 0; i < real_len_c; ++i) - std::cout << format(input[k * (real_len_r * real_len_c) + j * real_len_c + i]) + std::cout << format(input.point_at_index(k * (real_len_r * real_len_c) + j * real_len_c + i)) << ' '; std::cout << std::endl; } diff --git a/milena/mln/trait/value_.hh b/milena/mln/trait/value_.hh index 749654f..8e2e6b3 100644 --- a/milena/mln/trait/value_.hh +++ b/milena/mln/trait/value_.hh @@ -73,7 +73,7 @@ mln::trait::value::quant::low) # define mln_value_card_from_(N) \ - (N <= 16 \ + (N <= 12 \ ? mlc_pow_int((N <= 16 ? 2 : 1), \ (N <= 16 ? N : 1)) \ : 0) diff --git a/milena/mln/util/internal/graph_psite_base.hh b/milena/mln/util/internal/graph_psite_base.hh index 8e5a515..c0d5a0c 100644 --- a/milena/mln/util/internal/graph_psite_base.hh +++ b/milena/mln/util/internal/graph_psite_base.hh @@ -69,6 +69,8 @@ namespace mln void update_id(unsigned v_id); /// \} + /// Getters. + /// \{ /// Return the target (the site set). const target* target_() const; // Hook to the target. @@ -78,6 +80,11 @@ namespace mln /// Return the graph associated to the target of this psite. const graph_t& graph() const; + /// Return the graph associated to the target of this psite. + unsigned id() const; + + /// \} + /// Check whether it is valid. bool is_valid() const; /// Invalidate this psite. @@ -110,11 +117,43 @@ namespace mln V v_; }; - } // end of namespace internal - template <typename V, typename P, typename S, typename E> std::ostream& - operator<<(std::ostream& ostr, internal::graph_psite_base<V, P, S, E>& p); + operator<<(std::ostream& ostr, graph_psite_base<V, P, S, E>& p); + + /// Comparison of two mln::graph_psite_base<V, P, S, E> instances. + /// \{ + /* FIXME: Shouldn't those comparisons be part of a much general + mechanism? */ + + /// \brief Is \a lhs equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::p_vertices. + template <typename V, typename P, typename S, typename E> + bool + operator==(const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs); + + /// \brief Is \a lhs not equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::p_vertices. + template <typename V, typename P, typename S, typename E> + bool + operator!=(const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs); + + /// \brief Is \a lhs ``less'' than \a rhs? + /// + /// This comparison is required by algorithms sorting psites. + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::p_vertices. + template <typename V, typename P, typename S, typename E> + bool + operator< (const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs); + /// \} + + } // end of namespace internal } // end of namespace mln @@ -192,6 +231,14 @@ namespace mln return t_->graph(); } + template <typename v, typename p, typename s, typename e> + inline + unsigned + graph_psite_base<v, p, s, e>::id() const + { + return v_.id(); + } + template <typename V, typename P, typename S, typename E> inline bool @@ -225,14 +272,43 @@ namespace mln return t_->function()(v_.id()); } - } // end of namespace internal - template <typename V, typename P, typename S, typename E> - std::ostream& - operator<<(std::ostream& ostr, internal::graph_psite_base<V, P, S, E>& p) - { - return ostr << p.subj_(); - } + template <typename V, typename P, typename S, typename E> + std::ostream& + operator<<(std::ostream& ostr, graph_psite_base<V, P, S, E>& p) + { + return ostr << p.unproxy_(); + } + + /*--------------. + | Comparisons. | + `--------------*/ + + template <typename V, typename P, typename S, typename E> + bool + operator==(const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs) + { + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.id() == rhs.id(); + } + + template <typename V, typename P, typename S, typename E> + bool + operator!=(const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs) + { + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.id() != rhs.id(); + } + + template <typename V, typename P, typename S, typename E> + bool + operator< (const graph_psite_base<V, P, S, E>& lhs, const graph_psite_base<V, P, S, E>& rhs) + { + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.id() < rhs.id(); + } + + } // end of namespace internal } // end of namespace mln diff --git a/milena/tests/core/image/tr_image.cc b/milena/tests/core/image/tr_image.cc index 83b62b5..90b2b9f 100644 --- a/milena/tests/core/image/tr_image.cc +++ b/milena/tests/core/image/tr_image.cc @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/fun/x2x/geom/rotation.hh> +#include <mln/fun/x2x/rotation.hh> #include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> #include <mln/core/image/tr_image.hh> @@ -50,18 +50,18 @@ int main() debug::iota(in); debug::println(in); - fun::x2x::geom::rotation<3,float> rot1(1.67, literal::zero); + fun::x2x::rotation<3, float> rot1(1.67, literal::zero); tr_image<mln_pset_(image3d<int_u8>), image3d<int_u8>, - fun::x2x::geom::rotation<3,float> > + fun::x2x::rotation<3, float> > inter(out.domain(), in, rot1); image3d<int_u8>::fwd_piter p(out.domain()); for_all(p) { - algebra::vec<3,int> vec = p.to_site().to_vec(); + algebra::vec<3, int> vec = p.to_site().to_vec(); if (inter.has(p)) out(p) = inter(vec); else diff --git a/milena/tests/core/other/box_runstart_piter.cc b/milena/tests/core/other/box_runstart_piter.cc index 7730ac3..7aaab59 100644 --- a/milena/tests/core/other/box_runstart_piter.cc +++ b/milena/tests/core/other/box_runstart_piter.cc @@ -38,11 +38,9 @@ int main() { using namespace mln; - const unsigned border = 2; - /// Test with box1d { - box1d b1(make::point1d(40), make::point1d(42)); + box1d b1(point1d(40), point1d(42)); box_runstart_piter<point1d> p1(b1); for_all(p1) { @@ -56,7 +54,7 @@ int main() /// Test with box2d { - box2d b2(make::point2d(1,2), make::point2d(5,8)); + box2d b2(point2d(1,2), point2d(5,8)); box_runstart_piter<point2d> p2(b2); int i = 1; for_all(p2) @@ -70,7 +68,7 @@ int main() // Test with image 3d { - box3d b3(make::point3d(1,2,3), make::point3d(5,8,7)); + box3d b3(point3d(1,2,3), point3d(5,8,7)); box_runstart_piter<point3d> p3(b3); int i = 1; int j = 2; diff --git a/milena/tests/core/other/point_set_compatibility.cc b/milena/tests/core/other/point_set_compatibility.cc index e309187..0efec07 100644 --- a/milena/tests/core/other/point_set_compatibility.cc +++ b/milena/tests/core/other/point_set_compatibility.cc @@ -33,8 +33,8 @@ #include <mln/core/site_set/p_array.hh> #include <mln/core/site_set/p_set.hh> -#include <mln/core/image/graph_psite.hh> -#include <mln/core/site_set/p_graph_piter.hh> +#include <mln/core/site_set/p_vertices.hh> +#include <mln/util/graph.hh> int main() @@ -46,21 +46,22 @@ int main() | mln::p_array_piter. | `--------------------------------------------------------*/ - // Graph. + // Graph - // Points associated to vertices. - std::vector<point2d> points; - points.push_back(point2d(0,0)); // Point associated to vertex 0. - points.push_back(point2d(2,2)); // Point associated to vertex 1. - points.push_back(point2d(0,4)); // Point associated to vertex 2. - points.push_back(point2d(4,3)); // Point associated to vertex 3. - points.push_back(point2d(4,4)); // Point associated to vertex 4. + //Vertices + typedef fun::i2v::array<point2d> fpoint_t; + fpoint_t points(5); + points(0) = point2d(0,0); // Point associated to vertex 0. + points(1) = point2d(2,2); // Point associated to vertex 1. + points(2) = point2d(0,4); // Point associated to vertex 2. + points(3) = point2d(4,3); // Point associated to vertex 3. + points(4) = point2d(4,4); // Point associated to vertex 4. // Edges. - util::graph<point2d> g; + util::graph g; // Populate the graph with vertices. for (unsigned i = 0; i < points.size(); ++i) - g.add_vertex (points[i]); + g.add_vertex(); // Populate the graph with edges. g.add_edge(0, 1); g.add_edge(1, 2); @@ -69,10 +70,11 @@ int main() g.add_edge(4, 2); + // Graph point set. - typedef p_graph<point2d> pg_t; - p_graph<point2d> pg(g); - typedef graph_psite<point2d> gpsite_t; + typedef p_vertices<util::graph, fpoint_t> pv_t; + typedef mln_psite_(pv_t) gpsite_t; + pv_t pv(g, points); { // Array of graph point sites. @@ -80,7 +82,7 @@ int main() pa_t pa; // Tests: copying all psites from PG to PA. - mln_piter_(pg_t) p(pg); + mln_piter_(pv_t) p(pv); for_all (p) pa.append(p); @@ -97,7 +99,7 @@ int main() ps_t ps; // Tests: copying all psites from PG to PS. - mln_piter_(pg_t) p(pg); + mln_piter_(pv_t) p(pv); for_all (p) ps.insert(p); -- 1.5.6.5

16 years, 1 month

cleanup-2008 2800: Update level stretch so that output is returned.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update level stretch so that output is returned. * mln/level/stretch.hh: Change sig to return output. * tests/level/stretch.cc: Update. * tests/level/stretch_full.cc: Update. * tests/linear/lap.cc: Update. * tests/linear/log.cc: Update. mln/level/stretch.hh | 72 ++++++++++++++++++++++++++++---------------- tests/level/stretch.cc | 19 ++++------- tests/level/stretch_full.cc | 27 +++++----------- tests/linear/lap.cc | 14 ++++---- tests/linear/log.cc | 9 ++--- 5 files changed, 74 insertions(+), 67 deletions(-) Index: tests/level/stretch_full.cc --- tests/level/stretch_full.cc (revision 2799) +++ tests/level/stretch_full.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,25 +26,22 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level/stretch_full.cc - * - * \brief Tests on mln::level::stretch. - */ - +/// \file tests/level/stretch_full.cc +/// +/// Tests on mln::level::stretch. +/// +/// \todo Make it pass. #include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> #include <mln/core/image/image3d.hh> #include <mln/value/int_u8.hh> -#include <mln/value/int_u16.hh> - #include <mln/value/int_s8.hh> +#include <mln/value/int_u16.hh> #include <mln/value/int_s16.hh> - #include <mln/debug/iota.hh> - #include <mln/level/saturate.hh> #include <mln/level/stretch.hh> @@ -55,16 +53,9 @@ void chck(Image& input_, Image<J>& output_) { - typedef mln_value(I) T; - typedef mln_value(J) V; - unsigned max_i = mln_max (T); - unsigned max_j = mln_max (V); I& input = exact(input_); J& output = exact(output_); - - level::stretch(input, output); - - // FIXME: How to test that? + output = level::stretch(mln_value(J)(), input); } template <typename I, typename J> Index: tests/level/stretch.cc --- tests/level/stretch.cc (revision 2799) +++ tests/level/stretch.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,11 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level/stretch.cc - * - * \brief Tests on mln::level::stretch. - */ - +/// \file tests/level/stretch.cc +/// +/// Tests on mln::level::stretch. #include <mln/core/image/image2d.hh> #include <mln/level/stretch.hh> @@ -47,18 +46,16 @@ { 1000, 2000, 3000 }, { 1000, 2000, 3000 } }; - image2d<int> ima(make::image(vs)); - - image2d<int_u8> out(3, 3); + image2d<int> ima = make::image(vs); + image2d<int_u8> out = level::stretch(int_u8(), ima); int_u8 ws[3][3] = { { 0, 127, 255 }, { 0, 127, 255 }, { 0, 127, 255 } }; + image2d<int_u8> ref = make::image(ws); - image2d<int_u8> ref(make::image(ws)); - level::stretch(ima, out); box_fwd_piter_<point2d> p(out.domain()); for_all(p) mln_assertion(out(p) == ref(p)); Index: tests/linear/lap.cc --- tests/linear/lap.cc (revision 2799) +++ tests/linear/lap.cc (working copy) @@ -26,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/linear/lap.cc - * - * \brief Tests on mln::linear::lap_4. - */ +/// \file tests/linear/lap.cc +/// +/// Tests on mln::linear::lap_4. #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> @@ -50,8 +49,9 @@ border::thickness = 1; - image2d<int_u8> lena, out; + image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - level::stretch(linear::lap_4(lena), out); - io::pgm::save(out, "out.pgm"); + + io::pgm::save(level::stretch(int_u8(), linear::lap_4(lena)), + "out.pgm"); } Index: tests/linear/log.cc --- tests/linear/log.cc (revision 2799) +++ tests/linear/log.cc (working copy) @@ -26,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/linear/log.cc - * - * \brief Tests on mln::linear. - */ +/// \file tests/linear/log.cc +/// +/// Tests on mln::linear. #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> @@ -63,7 +62,7 @@ mln_assertion(min == -929 && max == 1260); } - level::stretch(tmp, out); + out = level::stretch(int_u8(), tmp); io::pgm::save(out, "out.pgm"); { int_u8 min, max; Index: mln/level/stretch.hh --- mln/level/stretch.hh (revision 2799) +++ mln/level/stretch.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,11 +29,14 @@ #ifndef MLN_LEVEL_STRETCH_HH # define MLN_LEVEL_STRETCH_HH -/*! \file mln/level/stretch.hh - * - * \brief Transform with fun::stretch the contents of an image into - * another one. - */ +/// \file mln/level/stretch.hh +/// +/// Transform linearly the contents of an image into another one in a +/// stretching way. +/// +/// \todo Make it work with other types than scalars (e.g., vectors). +/// +/// \todo Think about adding a stretch_inplace(?) # include <mln/estim/min_max.hh> # include <mln/value/int_u.hh> @@ -46,15 +50,18 @@ namespace level { - /*! Stretch the values of \p input so that they can be stored in \p output. + /*! Stretch the values of \p input so that they can be stored in + * \p output. * + * \param[in] v A value to set the output value type. * \param[in] input The input image. * \param[out] output The result image. * - * \pre \p output.domain == \p input.domain + * \pre input.has_data */ - template <typename I, typename O> - void stretch(const Image& input, Image<O>& output); + template <typename V, typename I> + mln_ch_value(I, V) + stretch(V v, const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -62,45 +69,58 @@ namespace impl { - // FIXME: The first argument seems to have no effect. - template <unsigned n, typename I, typename O> + template <typename V, typename I> inline - void stretch(value::int_u<n>, - const Image& input, Image<O>& output) + mln_ch_value(I, V) + stretch(V, const Image& input) { trace::entering("level::impl::stretch"); + mlc_converts_to(float, V)::check(); + + mln_ch_value(I, V) output; + mln_value(I) min_, max_; estim::min_max(input, min_, max_); if (max_ != min_) { - float min = float(min_), max = float(max_); - const float epsilon = mln_epsilon(float); - float m = 0.0f - 0.5f + epsilon; - float M = mln_max(value::int_u<n>) + 0.5f - epsilon; - float a = (M - m) / (max - min); - float b = (m * max - M * min) / (max - min); - fun::v2v::linear<float, float, int> f(a, b); + float + min = float(min_), + max = float(max_), + epsilon = mln_epsilon(float), + m = 0.0f - 0.5f + epsilon, + M = mln_max(V) + 0.5f - epsilon, + a = (M - m) / (max - min), + b = (m * max - M * min) / (max - min); + fun::v2v::linear<float, float, V> f(a, b); output = level::transform(input, f); } + else + { + initialize(output, input); + // trace::warning("output has no significative data!"); + } + trace::exiting("level::impl::stretch"); + return output; } } // end of namespace mln::level::impl - template <typename I, typename O> + template <typename V, typename I> inline - void stretch(const Image& input, Image<O>& output) + mln_ch_value(I, V) + stretch(V, const Image& input) { trace::entering("level::stretch"); - initialize(output, input); + mln_precondition(exact(input).has_data()); - mln_precondition(exact(output).domain() == exact(input).domain()); - impl::stretch(mln_value(O)(), input, output); + mln_ch_value(I, V) output = impl::stretch(V(), input); trace::exiting("level::stretch"); + return output; } # endif // ! MLN_INCLUDE_ONLY

16 years, 1 month

Re: [Olena-patches] [Olena] #87: Add unit (sanity) tests to Milena

by Olena

#87: Add unit (sanity) tests to Milena -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: jardonnet Type: task | Status: assigned Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: -----------------------+---------------------------------------------------- Changes (by jardonnet): * status: new => assigned * owner: Olena Team => jardonnet -- Ticket URL: <https://trac.lrde.org/olena/ticket/87#comment:4> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years, 1 month

cleanup-2008 2799: Revamp directional convolution (was convolve_line).

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Revamp directional convolution (was convolve_line). * mln/core/concept/gdpoint.hh: Handle "Gdpoint * Scalar". (set_binary_): New specialization. (operator*): New overload. (todo): Remove. * mln/linear/log.hh: Update. * mln/linear/sobel.hh: Update doc style. * mln/linear/convolve.hh (pre): Fix. * mln/linear/line_convolve.hh: Rename as... * mln/linear/convolve_directional.hh: ...this and update. * mln/linear/all.hh: Update. * tests/linear/log.cc: Update. * tests/linear/line_convolve.cc: Rename as... * tests/linear/convolve_directional.cc: ...this. * tests/linear/Makefile.am: Update. * mln/make/w_window_line.hh: Rename as... * mln/make/w_window_directional.hh: ...this and update. * mln/make/all.hh: Update. * tests/make/w_window_directional.cc: New. * tests/make/Makefile.am: Update. mln/core/concept/gdpoint.hh | 31 ++++++++++--- mln/linear/all.hh | 19 +++----- mln/linear/convolve.hh | 2 mln/linear/convolve_directional.hh | 57 +++++++++++++----------- mln/linear/log.hh | 83 +++++++++++++++++++++-------------- mln/linear/sobel.hh | 15 ++---- mln/make/all.hh | 10 ++-- mln/make/w_window_directional.hh | 56 ++++++++++++----------- tests/linear/Makefile.am | 4 - tests/linear/convolve_directional.cc | 17 +++---- tests/linear/log.cc | 11 ++-- tests/make/Makefile.am | 4 + tests/make/w_window_directional.cc | 47 +++++++++++++++++++ 13 files changed, 226 insertions(+), 130 deletions(-) Index: tests/linear/log.cc --- tests/linear/log.cc (revision 2798) +++ tests/linear/log.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -52,18 +53,16 @@ border::thickness = 2; - image2d<int_u8> lena; + image2d<int_u8> lena, out; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - image2d<int> tmp(lena.domain()); - linear::LoG_5x5(lena, tmp); + image2d<float> tmp = linear::LoG_5x5(lena); { - int min, max; + float min, max; estim::min_max(tmp, min, max); mln_assertion(min == -929 && max == 1260); } - image2d<int_u8> out(lena.domain()); level::stretch(tmp, out); io::pgm::save(out, "out.pgm"); { Index: tests/linear/Makefile.am --- tests/linear/Makefile.am (revision 2798) +++ tests/linear/Makefile.am (working copy) @@ -6,16 +6,16 @@ check_PROGRAMS = \ convolve \ + convolve_directional \ gaussian \ lap \ - line_convolve \ log \ sobel convolve_SOURCES = convolve.cc gaussian_SOURCES = gaussian.cc lap_SOURCES = lap.cc -line_convolve_SOURCES = line_convolve.cc +convolve_directional_SOURCES = convolve_directional.cc log_SOURCES = log.cc sobel_SOURCES = sobel.cc Index: tests/linear/convolve_directional.cc --- tests/linear/convolve_directional.cc (revision 2780) +++ tests/linear/convolve_directional.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,9 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/linear/line_convolve.cc +/*! \file tests/linear/convolve_directional.cc * - * \brief Tests on mln::linear::line_convolve. + * \brief Tests on mln::linear::convolve_directional. */ #include <mln/core/image/image2d.hh> @@ -40,7 +41,7 @@ #include <mln/core/alias/w_window2d_float.hh> #include <mln/border/thickness.hh> -#include <mln/linear/line_convolve.hh> +#include <mln/linear/convolve_directional.hh> #include "tests/data.hh" @@ -54,12 +55,10 @@ image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - image2d<int_u8> out(lena.domain()); - image2d<float> tmp(lena.domain()); float ws[] = { .11, .11, .11, .11, .11, .11, .11, .11, .11 }; - linear::line_convolve(lena, ws, tmp); + image2d<float> tmp = linear::convolve_directional(lena, 1, ws); - level::transform(tmp, math::round<int_u8>(), out); - io::pgm::save(out, "out.pgm"); + io::pgm::save(level::transform(tmp, math::round<int_u8>()), + "out.pgm"); } Property changes on: tests/linear/convolve_directional.cc ___________________________________________________________________ Added: svn:mergeinfo Index: tests/make/Makefile.am --- tests/make/Makefile.am (revision 2798) +++ tests/make/Makefile.am (working copy) @@ -6,11 +6,13 @@ dual_neighb \ image2d \ mat \ - w_window + w_window \ + w_window_directional dual_neighb_SOURCES = dual_neighb.cc image2d_SOURCES = image2d.cc mat_SOURCES = mat.cc w_window_SOURCES = w_window.cc +w_window_directional_SOURCES = w_window_directional.cc TESTS = $(check_PROGRAMS) Index: tests/make/w_window_directional.cc --- tests/make/w_window_directional.cc (revision 0) +++ tests/make/w_window_directional.cc (revision 0) @@ -0,0 +1,47 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/make/w_window_directional.cc +/// +/// Tests on mln::make::w_window_directional. + +#include <mln/core/alias/w_window2d_int.hh> +#include <mln/make/w_window_directional.hh> + + +int main() +{ + using namespace mln; + + int vals[] = { -1, 0, 1 }; + w_window2d_int w_win = make::w_window_directional(right, vals); + + int sum = 0; + for (unsigned i = 0; i < w_win.size(); ++i) + sum += w_win.w(i); + mln_assertion(sum == 0); +} Index: mln/core/concept/gdpoint.hh --- mln/core/concept/gdpoint.hh (revision 2798) +++ mln/core/concept/gdpoint.hh (working copy) @@ -29,12 +29,9 @@ #ifndef MLN_CORE_CONCEPT_GDPOINT_HH # define MLN_CORE_CONCEPT_GDPOINT_HH -/*! \file mln/core/concept/delta_point_site.hh - * - * \brief Definition of the concept of mln::Gdpoint. - * - * \todo Add support for (s * dp)... - */ +/// \file mln/core/concept/delta_point_site.hh +/// +/// Definition of the concept of mln::Gdpoint. # include <mln/core/concept/object.hh> # include <mln/core/grids.hh> @@ -52,6 +49,8 @@ namespace trait { + // FIXME: Add promotion. + template < typename L, typename R > struct set_binary_< op::plus, mln::Gdpoint, L, mln::Gdpoint, R > @@ -66,6 +65,14 @@ typedef L ret; }; + template < typename D, typename S > + struct set_binary_< op::times, + mln::Gdpoint, D, + mln::value::Scalar, S > + { + typedef D ret; + }; + template <typename D> struct set_unary_< op::ord, mln::Gdpoint, D > { @@ -123,6 +130,10 @@ L // FIXME: promote! operator-(const Gdpoint<L>& lhs, const Gdpoint<R>& rhs); + template <typename D, typename S> + D // FIXME: promote! + operator*(const Gdpoint<D>& lhs, const value::Scalar<S>& rhs); + namespace convert @@ -192,6 +203,14 @@ return tmp; } + template <typename D, typename S> + D // FIXME: promote! + operator*(const Gdpoint<D>& lhs, const value::Scalar<S>& rhs) + { + D tmp = exact(lhs).to_vec() * exact(rhs); + return tmp; + } + namespace convert { Index: mln/linear/log.hh --- mln/linear/log.hh (revision 2798) +++ mln/linear/log.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_LINEAR_LOG_HH # define MLN_LINEAR_LOG_HH -/*! \file mln/linear/log.hh - * - * \brief Laplacian of Gaussian. - */ +/// \file mln/linear/log.hh +/// +/// Laplacian of Gaussian. # include <mln/linear/convolve.hh> # include <mln/make/w_window2d.hh> @@ -44,17 +44,21 @@ namespace linear { - template <typename I, typename O> - void LoG_5x5(const Image& input, Image<O>& output); - - template <typename I, typename O> - void LoG_7x7(const Image& input, Image<O>& output); - - template <typename I, typename O> - void LoG_13x13(const Image& input, Image<O>& output); - - template <typename I, typename O> - void LoG_17x17(const Image& input, Image<O>& output); + template <typename I> + mln_ch_convolve(I, int) + LoG_5x5(const Image& input); + + template <typename I> + mln_ch_convolve(I, int) + LoG_7x7(const Image& input); + + template <typename I> + mln_ch_convolve(I, int) + LoG_13x13(const Image& input); + + template <typename I> + mln_ch_convolve(I, int) + LoG_17x17(const Image& input); # ifndef MLN_INCLUDE_ONLY @@ -62,26 +66,32 @@ // LoG_5x5 (Cf. Sonka et al., pages 85-86) // This is also a "mexican hat". - template <typename I, typename O> + template <typename I> inline - void LoG_5x5(const Image& input, Image<O>& output) + mln_ch_convolve(I, int) + LoG_5x5(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); + trace::entering("linear::LoG_5x5"); + mln_precondition(exact(input).has_data()); int ws[] = { +0, 0, -1, 0, 0, +0, -1, -2, -1, 0, -1, -2, 16, -2, -1, +0, -1, -2, -1, 0, +0, 0, -1, 0, 0 }; - convolve(input, make::w_window2d(ws), output); + mln_ch_convolve(I, int) output = convolve(input, make::w_window2d(ws)); + trace::exiting("linear::LoG_5x5"); + return output; } // LoG 7x7 (Cf. Russ, p. 250) - template <typename I, typename O> + template <typename I> inline - void LoG_7x7(const Image& input, Image<O>& output) + mln_ch_convolve(I, int) + LoG_7x7(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); + trace::entering("linear::LoG_7x7"); + mln_precondition(exact(input).has_data()); int ws[] = { +0, 0, -1, -1, -1, 0, 0, +0, -1, -3, -3, -3, -1, 0, -1, -3, 0, 7, 0, -3, -1, @@ -89,16 +99,20 @@ -1, -3, 0, 7, 0, -3, -1, +0, -1, -3, -3, -3, -1, 0, +0, 0, -1, -1, -1, 0, 0 }; - convolve(input, make::w_window2d(ws), output); + mln_ch_convolve(I, int) output = convolve(input, make::w_window2d(ws)); + trace::exiting("linear::LoG_7x7"); + return output; } // LoG 13x13 (Cf. Russ, p. 250) - template <typename I, typename O> + template <typename I> inline - void LoG_13x13(const Image& input, Image<O>& output) + mln_ch_convolve(I, int) + LoG_13x13(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); + trace::entering("linear::LoG_13x13"); + mln_precondition(exact(input).has_data()); int ws[] = { +0, 0, 0, 0, 0, -1, -1, -1, 0, 0, 0, 0, 0, +0, 0, 0, -1, -1, -2, -2, -2, -1, -1, 0, 0, 0, +0, 0, -2, -2, -3, -3, -4, -3, -3, -2, -2, 0, 0, @@ -112,17 +126,20 @@ +0, 0, -2, -2, -3, -3, -4, -3, -3, -2, -2, 0, 0, +0, 0, 0, -1, -1, -2, -2, -2, -1, -1, 0, 0, 0, +0, 0, 0, 0, 0, -1, -1, -1, 0, 0, 0, 0, 0 }; - convolve(input, make::w_window2d(ws), output); + mln_ch_convolve(I, int) output = convolve(input, make::w_window2d(ws)); + return output; } // LoG 17x17 (Cf. Sonka et al., pages 85-86) - template <typename I, typename O> + template <typename I> inline - void LoG_17x17(const Image& input, Image<O>& output) + mln_ch_convolve(I, int) + LoG_17x17(const Image& input) { - mln_precondition(exact(output).domain() == exact(input).domain()); + trace::entering("linear::LoG_17x17"); + mln_precondition(exact(input).has_data()); int ws[] = { +0, 0, 0, 0, 0, 0,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, +0, 0, 0, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, +0, 0,-1,-1,-1,-2,-3,-3,-3,-3,-3,-2,-1,-1,-1, 0, 0, @@ -140,7 +157,9 @@ +0, 0,-1,-1,-1,-2,-3,-3,-3,-3,-3,-2,-1,-1,-1, 0, 0, +0, 0, 0, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, +0, 0, 0, 0, 0, 0,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0 }; - convolve(input, make::w_window2d(ws), output); + mln_ch_convolve(I, int) output = convolve(input, make::w_window2d(ws)); + trace::exiting("linear::LoG_17x17"); + return output; } # endif // ! MLN_INCLUDE_ONLY Index: mln/linear/sobel.hh --- mln/linear/sobel.hh (revision 2798) +++ mln/linear/sobel.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,13 +29,11 @@ #ifndef MLN_LINEAR_SOBEL_HH # define MLN_LINEAR_SOBEL_HH -/*! \file mln/linear/sobel.hh - * - * \brief Sobel filter. - * - * \todo Extends to the case of other dimensions (only the 2-d case - * is handled here). - */ +/// \file mln/linear/sobel.hh +/// +/// Sobel filter. +/// \todo Extends to the case of other dimensions (only the 2-d case +/// is handled here). # include <mln/trait/ch_value.hh> # include <mln/trait/value/nature.hh> Index: mln/linear/all.hh --- mln/linear/all.hh (revision 2798) +++ mln/linear/all.hh (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_LINEAR_ALL_HH # define MLN_LINEAR_ALL_HH -/*! \file mln/linear/all.hh - * - * \brief File that includes all linear image processing routines. - */ +/// \file mln/linear/all.hh +/// +/// File that includes all linear image processing routines. namespace mln @@ -43,8 +43,7 @@ /// Namespace of linear image processing routines implementation details. namespace impl - { - } + {} /// Specializations of local linear routines. namespace local @@ -52,21 +51,21 @@ /// Namespace of local linear routines implementation details. namespace impl - { - } + {} } } - } + # include <mln/linear/convolve.hh> +# include <mln/linear/convolve_directional.hh> # include <mln/linear/gaussian.hh> # include <mln/linear/lap.hh> -# include <mln/linear/line_convolve.hh> # include <mln/linear/line_x2_convolve.hh> # include <mln/linear/log.hh> //# include <mln/linear/sobel.hh> //# include <mln/linear/local/convolve.hh> + #endif // ! MLN_LINEAR_ALL_HH Index: mln/linear/convolve_directional.hh --- mln/linear/convolve_directional.hh (revision 2780) +++ mln/linear/convolve_directional.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,16 +26,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_LINEAR_LINE_CONVOLVE_HH -# define MLN_LINEAR_LINE_CONVOLVE_HH +#ifndef MLN_LINEAR_CONVOLVE_DIRECTIONAL_HH +# define MLN_LINEAR_CONVOLVE_DIRECTIONAL_HH -/*! \file mln/linear/line_convolve.hh - * - * \brief Convolution by a line-shaped kernel. - */ +/// mln/linear/convolve_directional.hh +/// +/// Convolution by a line-shaped (directional) kernel. # include <mln/linear/convolve.hh> -# include <mln/make/w_window_line.hh> +# include <mln/make/w_window_directional.hh> +# include <mln/literal/zero.hh> @@ -44,8 +45,9 @@ namespace linear { - /*! Convolution of an image \p input by a line-shaped weighted - * window defined by the array of \p weights. + /*! Convolution of an image \p input by a line-shaped + * (directional) weighted window defined by the array of \p + * weights. * * \warning Computation of \p output(p) is performed with the * value type of \p output. @@ -53,26 +55,33 @@ * \warning The weighted window is used as-is, considering that * its symmetrization is handled by the client. * - * \pre output.domain = input.domain - * - * \todo Optimize. + * \pre input.has_data */ - template <typename I, typename W, unsigned N, typename O> - void line_convolve(const Image& input, W (&weights)[N], - Image<O>& output); + template <typename I, typename W, unsigned S> + mln_ch_convolve(I, W) + convolve_directional(const Image& input, unsigned dir, W (&weights)[S]); # ifndef MLN_INCLUDE_ONLY - template <typename I, typename W, unsigned N, typename O> + template <typename I, typename W, unsigned S> inline - void line_convolve(const Image& input, W (&weights)[N], - Image<O>& output) + mln_ch_convolve(I, W) + convolve_directional(const Image& input, unsigned dir, W (&weights)[S]) { - mln_precondition(exact(output).domain() == exact(input).domain()); - linear::convolve(input, - make::w_window_line<mln_dpsite(I)>(weights), - output); + trace::entering("linear::convolve_directional"); + mln_precondition(exact(input).has_data()); + typedef mln_site(I) P; + mln_precondition(dir < P::dim); + + typedef mln_delta(P) D; + D dp = literal::zero; + ++dp[dir]; + w_window<D,W> w_win = make::w_window_directional(dp, weights); + mln_ch_convolve(I, W) output = convolve(input, w_win); + + trace::exiting("linear::convolve_directional"); + return output; } # endif // ! MLN_INCLUDE_ONLY @@ -82,4 +91,4 @@ } // end of namespace mln -#endif // ! MLN_LINEAR_LINE_CONVOLVE_HH +#endif // ! MLN_LINEAR_CONVOLVE_DIRECTIONAL_HH Property changes on: mln/linear/convolve_directional.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/linear/convolve.hh --- mln/linear/convolve.hh (revision 2798) +++ mln/linear/convolve.hh (working copy) @@ -54,7 +54,7 @@ * \warning The weighted window is used as-is, considering that * its symmetrization is handled by the client. * - * \pre output.domain = input.domain + * \pre input.has_data */ template <typename I, typename W> mln_ch_convolve(I, W) Index: mln/make/all.hh --- mln/make/all.hh (revision 2798) +++ mln/make/all.hh (working copy) @@ -29,10 +29,9 @@ #ifndef MLN_MAKE_ALL_HH # define MLN_MAKE_ALL_HH -/*! \file mln/make/all.hh - * - * \brief File that includes all make routines. - */ +/// \file mln/make/all.hh +/// +/// File that includes all make routines. namespace mln @@ -64,7 +63,8 @@ # include <mln/make/w_window2d_int.hh> # include <mln/make/w_window3d.hh> # include <mln/make/w_window3d_int.hh> -# include <mln/make/w_window_line.hh> +# include <mln/make/w_window_directional.hh> # include <mln/make/win_chamfer.hh> + #endif // ! MLN_MAKE_ALL_HH Index: mln/make/w_window_directional.hh --- mln/make/w_window_directional.hh (revision 2780) +++ mln/make/w_window_directional.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,15 +26,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MAKE_W_WINDOW_LINE_HH -# define MLN_MAKE_W_WINDOW_LINE_HH +#ifndef MLN_MAKE_W_WINDOW_DIRECTIONAL_HH +# define MLN_MAKE_W_WINDOW_DIRECTIONAL_HH -/*! \file mln/make/w_window_line.hh - * - * \brief Routine to create an horizontal mln::w_window. - */ +/// \file mln/make/w_window_directional.hh +/// +/// Routine to create a directional mln::w_window. # include <mln/core/w_window.hh> +# include <mln/core/concept/gdpoint.hh> # include <mln/literal/zero.hh> @@ -43,33 +44,36 @@ namespace make { - /*! \brief Create an horizontal centered and symmetrical - * mln::w_window. - * - * The free parameter \c D is a type of delta-point. - * - * \pre The window length \c L has to be odd. - * - * \return A window. - */ + /// Create a directional centered weighted window. + /// + /// \param[in] dp A delta-point to set the orientation. + /// \param[in] weights An array of weights. + /// \return A weighted window. + /// + /// The window length \c L has to be odd. template <typename D, typename W, unsigned L> - mln::w_window<D,W> w_window_line(W (&w)[L]); + mln::w_window<D,W> + w_window_directional(const Gdpoint<D>& dp, W (&weights)[L]); # ifndef MLN_INCLUDE_ONLY template <typename D, typename W, unsigned L> inline - mln::w_window<D,W> w_window_line(W (&w)[L]) + mln::w_window<D,W> + w_window_directional(const Gdpoint<D>& dp_, W (&weights)[L]) { - mln_precondition(L % 2 == 1); + mlc_bool(L % 2 == 1)::check(); + int half = L / 2; + + const D& dp = exact(dp_); + D zero = literal::zero; + mln_precondition(dp != zero); + mln::w_window<D,W> w_win; - D dp = literal::zero; - for (unsigned i = 0; i < L; ++i) - { - dp[D::dim - 1] = i - L / 2; - w_win.insert(w[i], dp); - } + for (int i = - half; i <= half; ++i) + if (weights[half + i] != 0) + w_win.insert(weights[half + i], zero + dp * i); return w_win; } @@ -80,4 +84,4 @@ } // end of namespace mln -#endif // ! MLN_MAKE_W_WINDOW_LINE_HH +#endif // ! MLN_MAKE_W_WINDOW_DIRECTIONAL_HH Property changes on: mln/make/w_window_directional.hh ___________________________________________________________________ Added: svn:mergeinfo

16 years, 1 month

milena r2798: Fix include problem in dilation with a fwd decl

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix include problem in dilation with a fwd decl. * mln/morpho/dilation.hh: FIXME: this is not a nice fix. Fix it. --- dilation.hh | 4 ++++ 1 file changed, 4 insertions(+) Index: branches/cleanup-2008/milena/mln/morpho/dilation.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/dilation.hh (revision 2797) +++ branches/cleanup-2008/milena/mln/morpho/dilation.hh (revision 2798) @@ -44,6 +44,10 @@ namespace morpho { + // FIXME: fwd decl to fix problem with includes.hh. + template <typename I, typename W> + mln_concrete(I) + erosion(const Image& input, const Window<W>& win); /// Morphological dilation using windows. ///

16 years, 1 month

r2797: Cleanup OCR preprocessing

by Jimmy Ma

From: Jimmy Ma <jimmy.ma(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2797: Cleanup OCR preprocessing URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-04 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Cleanup OCR preprocessing. * garrigues/ocr/ocr_with_preprocess.cc: Cleanup. * garrigues/ocr/skeleton.hh, garrigues/ocr/tesseract_wrap.hh: Fix typos. --- ocr_with_preprocess.cc | 92 +++++++++++++++++++++---------------------------- skeleton.hh | 4 +- tesseract_wrap.hh | 2 - 3 files changed, 44 insertions(+), 54 deletions(-) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2796) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2797) @@ -87,7 +87,7 @@ mln_niter_(neighb2d) n(nbh, p); for_all(p) { - if (!input(p) || dist_map(p) < 20) + if (!input(p) || dist_map(p) < 10) continue; unsigned nb_eq = 0; @@ -120,7 +120,7 @@ int vals[] = { 0, 9, 0, 9, 0, 9, 6, 4, 6, 9, - 0, 4, 0, 4, 0, // Values of distaces. + 0, 4, 0, 4, 0, // Values of distances. 9, 6, 4, 6, 9, 0, 9, 0, 9, 0 }; Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh (revision 2796) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh (revision 2797) @@ -74,7 +74,7 @@ template <typename T> char* tesseract(const char* lang, const mln::image2d<T>& input, float* score) { - assert(!score); + assert(score); TessWrap::InitWithLanguage(NULL, NULL, lang, NULL, false, 0, NULL); char* s = TessWrap::TesseractRect( (unsigned char*) input.buffer(), Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2796) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2797) @@ -58,12 +58,13 @@ #include <mln/logical/not.hh> #include "tesseract_wrap.hh" +#include <mln/subsampling/subsampling.hh> // _COMPILATION_ // g++ -DNDEBUG -O3 -I../../.. ocr.cc -L/usr/lib -ltesseract_full -lpthread -#if 0 -# define TEST(Var) \ +#if 1 +# define OCR_TEST(Var) \ { \ image2d<int_u8> tmp = clone(cast_image<int_u8>(Var)); \ float score = 0.f; \ @@ -72,7 +73,7 @@ delete[] s; \ } #else -# define TEST(Var) +# define OCR_TEST(Var) #endif @@ -92,80 +93,69 @@ mln::border::thickness = 0; io::pbm::load(input, argv[1]); - TEST(input); + OCR_TEST(input); // Resize - //std::cerr << "Enlarge the image" << std::endl; image2d<int_u8> enlarged = enlarge(logical::not_(input), 2); - //image2d<bool> enlarged = geom::resize(logical::not_(input), 4); - io::pgm::save(enlarged, "1_enlarge.pgm"); - TEST(enlarged); + io::pgm::save(enlarged, std::string(argv[2]) + "_1_enlarge.pgm"); + OCR_TEST(enlarged); // Blur. - //std::cerr << "Blur the enlarged image" << std::endl; -// image2d<int_u8> blur = linear::gaussian(fun::p2v::ternary(pw::value(enlarged), pw::cst(int_u8(255)), pw::cst(int_u8(0))) | enlarged.domain(), -// 4); - image2d<int_u8> blur = linear::gaussian(clone(enlarged), 1); - - io::pgm::save(blur, "2_gaussian.pgm"); - TEST(blur); - - // Crest. -// image2d<bool> c = crest(enlarged, blur, c4()); -// io::pbm::save(c, "3_crest.pbm"); - + image2d<int_u8> blur = linear::gaussian(enlarged, 2); + io::pgm::save(blur, std::string(argv[2]) + "_2_gaussian.pgm"); + OCR_TEST(blur); // Threshold image2d<bool> binary; { - //std::cerr << "Threshold the blur image" << std::endl; - -// // Compute the histogram. -// histo::data<int_u8> h = histo::compute(blur); -// image1d<std::size_t> h_ima = convert::to_image(h); - -// // Blur the histogram. -// h_ima = linear::gaussian(h_ima, 4); - -// // Get the maxima. -// unsigned n; -// image1d<std::size_t> maxs = regional_maxima(h_ima, c2(), n); -// mln_piter() - - initialize(binary, blur); mln_piter_(image2d<int_u8>) p(blur.domain()); for_all(p) binary(p) = blur(p) > 100; - io::pbm::save(binary, "3_threshold.pbm"); - TEST(binary); + io::pbm::save(binary, std::string(argv[2]) + "_3_threshold.pbm"); + OCR_TEST(binary); } // Skeleton - //std::cerr << "Compute the skeleton" << std::endl; image2d<bool> skel = skeleton(binary, 4); - io::pbm::save(skel, "4_skeleton.pbm"); - TEST(skel); + io::pbm::save(skel, std::string(argv[2]) + "_4_skeleton.pbm"); + OCR_TEST(skel); // Dilation - //std::cerr << "Dilate the skeleton" << std::endl; - win::octagon2d oct(7); - for (unsigned i = 0; i < 1; i++) - skel = morpho::dilation(skel, oct); + image2d<bool> dilate; + win::octagon2d oct(5); + { // FIXME? +#if 1 + image2d<int_u8> tmp; + initialize(tmp, skel); + initialize(dilate, skel); + mln_piter_(image2d<int_u8>) p(tmp.domain()); + for_all(p) + tmp(p) = skel(p); + tmp = morpho::dilation(tmp, oct); + for_all(p) + dilate(p) = tmp(p); +#else + // Should be using this but it doesn't work :( + dilate = morpho::dilation(skel, oct); +#endif + } + + io::pbm::save(dilate, std::string(argv[2]) + "_5_dilation.pbm"); + OCR_TEST(dilate); - io::pbm::save(skel, "5_dilation.pbm"); - TEST(skel); + // Subsampling + image2d<bool> subsampled = subsampling::subsampling(dilate, dpoint2d(1,1), 2); + io::pbm::save(subsampled, std::string(argv[2]) + "_6_subsampling.pbm"); + OCR_TEST(subsampled); - io::pbm::save(skel, argv[2]); + io::pbm::save(subsampled, argv[2]); - //std::cerr << "Text recognition" << std::endl; - //char* s = tesseract("fra", clone(logical::not_(skel))); { - image2d<int_u8> tmp = clone(cast_image<int_u8>(skel)); float score = 0; - char* s = tesseract("fra", tmp, &score); + char* s = tesseract("fra", subsampled, &score); std::cerr << "Tesseract result: (score " << score << ")" << std::endl; std::cout << s; delete[] s;

16 years, 1 month

milena r2796: Fix gaussian algorithm

by Jimmy Ma

From: Jimmy Ma <jimmy.ma(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: milena r2796: Fix gaussian algorithm URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-04 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Fix gaussian algorithm. * mln/linear/gaussian.hh: Add missing initializations. --- gaussian.hh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: branches/cleanup-2008/milena/mln/linear/gaussian.hh =================================================================== --- branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2795) +++ branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2796) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2004 EPITA Research and Development +// Copyright (C) 2001, 2002, 2003, 2004, 2008 EPITA Research and Development // Laboratory // // This file is part of the Olena Library. This library is free @@ -432,6 +432,7 @@ mln_precondition(exact(input).has_data()); mln_concrete(I) output; + initialize(output, input); impl::recursivefilter_coef_ coef(1.68f, 3.735f, @@ -453,6 +454,7 @@ mln_precondition(exact(input).has_data()); mln_concrete(I) output; + initialize(output, input); impl::recursivefilter_coef_ coef(-0.6472f, -4.531f, @@ -473,6 +475,7 @@ mln_precondition(exact(input).has_data()); mln_concrete(I) output; + initialize(output, input); impl::recursivefilter_coef_ coef(-1.331f, 3.661f,

16 years, 1 month

milena r2795: Fix subsampling algorithm

by Jimmy Ma

From: Jimmy Ma <jimmy.ma(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: milena r2795: Fix subsampling algorithm URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-04 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Fix subsampling algorithm. * mln/subsampling/subsampling.hh: Use mln_deduce instead of mln_dpsite. --- subsampling.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: branches/cleanup-2008/milena/mln/subsampling/subsampling.hh =================================================================== --- branches/cleanup-2008/milena/mln/subsampling/subsampling.hh (revision 2794) +++ branches/cleanup-2008/milena/mln/subsampling/subsampling.hh (revision 2795) @@ -51,7 +51,7 @@ inline mln_concrete(I) subsampling(const Image& input, - const mln_dpsite(I)& first_p, + const mln_deduce(I, site, delta)& first_p, const mln_coord(I)& gap); # ifndef MLN_INCLUDE_ONLY @@ -65,7 +65,7 @@ inline mln_concrete(image2d<T>) subsampling_(const image2d<T>& input, - const mln_dpoint(image2d<T>)& first_p, + const mln_deduce(image2d<T>, site, delta)& first_p, const mln_coord(image2d<T>)& gap) { trace::entering("subsampling::impl::subsampling_"); @@ -92,7 +92,7 @@ inline mln_concrete(I) subsampling(const Image& input, - const mln_dpsite(I)& first_p, + const mln_deduce(I, site, delta)& first_p, const mln_coord(I)& gap) { trace::entering("subsampling::subsampling");

16 years, 1 month

← Newer
1
...
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches November 2008