Olena-patches October 2008

olena-patches@lrde.epita.fr

14 participants
373 discussions

cleanup-2008 2653: Make extension images and cast image work with fill_with_value routine.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Make extension images and cast image work with fill_with_value routine. * tests/level/fill_with_value.cc: Add tests. * mln/core/image/status.txt: Update documentation. * mln/core/image/extension_fun.hh, * mln/core/image/cast_image.hh, * mln/core/image/extension_ima.hh, * mln/core/image/extension_val.hh: Fix properties. * mln/level/fill_with_value.spe.hh: Fix dispatch. * mln/level/fill_with_value.hh: Add a static tests. mln/core/image/cast_image.hh | 26 +++++++++++++++- mln/core/image/extension_fun.hh | 1 mln/core/image/extension_ima.hh | 1 mln/core/image/extension_val.hh | 1 mln/core/image/status.txt | 6 +++ mln/level/fill_with_value.hh | 5 +-- mln/level/fill_with_value.spe.hh | 27 +++++++++++++---- tests/level/fill_with_value.cc | 61 +++++++++++++++++++++++++++++++++++++-- 8 files changed, 114 insertions(+), 14 deletions(-) Index: tests/level/fill_with_value.cc --- tests/level/fill_with_value.cc (revision 2653) +++ tests/level/fill_with_value.cc (working copy) @@ -30,27 +30,55 @@ * \brief Tests on mln::level::fill_with_value */ + #include <mln/level/fill_with_value.hh> +#include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> #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/extension_val.hh> +#include <mln/value/rgb8.hh> #include <mln/fun/p2b/chess.hh> +#include <mln/make/box2d.hh> + int main() { using namespace mln; - const unsigned size = 100; + const unsigned size = 50; { - image2d<unsigned char> ima(size, size); + typedef image1d<unsigned char> I; + I ima(size); level::fill_with_value(ima, 51); - box2d::piter p(ima.domain()); + mln_piter_(I) p(ima.domain()); + for_all(p) + mln_assertion(ima(p) == 51); + } + + + { + typedef image2d<unsigned char> I; + I ima(size, size); + level::fill_with_value(ima, 51); + mln_piter_(I) p(ima.domain()); for_all(p) mln_assertion(ima(p) == 51); } + { + typedef image3d<value::rgb8> I; + I ima(size, size, size); + level::fill_with_value(ima, value::rgb8(255, 0, 255)); + mln_piter_(I) p(ima.domain()); + for_all(p) + mln_assertion(ima(p) == value::rgb8(255, 0, 255)); + } + { flat_image<short, box2d> ima(5, make::box2d(2, 3)); @@ -75,4 +103,31 @@ for_all(p) mln_assertion(ima_if(p) == 42); } + + { + typedef image2d<int> I; + typedef sub_image< image2d<int>, box2d > II; + I ima(size, size); + II sub_ima(ima, make::box2d(4,4, 10,10)); + + level::fill_with_value(sub_ima, 5); + + II::piter p(sub_ima.domain()); + for_all(p) + mln_assertion(sub_ima(p) == 5); + } + + { + typedef image2d<int> I; + typedef extension_val< image2d<int> > II; + I ima(size, size); + II extend_ima(ima, 5); + + level::fill_with_value(extend_ima, 51); + + II::piter p(extend_ima.domain()); + for_all(p) + mln_assertion(extend_ima(p) == 51); + } + } Index: mln/core/image/extension_fun.hh --- mln/core/image/extension_fun.hh (revision 2653) +++ mln/core/image/extension_fun.hh (working copy) @@ -74,6 +74,7 @@ // ...these changes. typedef trait::image::category::identity_morpher category; typedef mln_internal_trait_image_speed_from(I) speed; // Un-fastest. + typedef trait::image::value_access::indirect value_access; // extended domain typedef trait::image::ext_domain::infinite ext_domain; Index: mln/core/image/cast_image.hh --- mln/core/image/cast_image.hh (revision 2653) +++ mln/core/image/cast_image.hh (working copy) @@ -65,10 +65,34 @@ namespace trait { + template <typename T, typename I, typename value_io> + struct cast_image_trait_selector : + default_image_morpher< I, T, cast_image_<T,I> > + { + typedef trait::image::vw_io::none vw_io; + typedef trait::image::vw_set::none vw_set; + }; + + template <typename T, typename I> + struct cast_image_trait_selector<T, I, trait::image::vw_io::read> : + default_image_morpher< I, T, cast_image_<T,I> > + { + typedef trait::image::vw_io::read vw_io; + }; + + template <typename T, typename I> + struct cast_image_trait_selector<T, I, trait::image::vw_io::read_write> : + default_image_morpher< I, T, cast_image_<T,I> > + { + typedef trait::image::vw_io::read vw_io; + }; + template <typename T, typename I> - struct image_< cast_image_<T,I> > : default_image_morpher< I, T, cast_image_<T,I> > + struct image_< cast_image_<T,I> > : + cast_image_trait_selector<T, I, mln_trait_image_vw_io(I)> { typedef trait::image::value_io::read_only value_io; + typedef trait::image::pw_io::read pw_io; }; } // end of namespace mln::trait Index: mln/core/image/status.txt --- mln/core/image/status.txt (revision 2653) +++ mln/core/image/status.txt (working copy) @@ -20,6 +20,8 @@ ok image1d ok image3d +ok flat_image + ** run-based KO mono_obased_rle_image @@ -39,7 +41,7 @@ ** value morpher -OK cast_image +ok cast_image KO value::stack_image ** domain morpher @@ -63,6 +65,8 @@ ok plain ok safe +ok extended + KO decorated_image KO interpolated Index: mln/core/image/extension_ima.hh --- mln/core/image/extension_ima.hh (revision 2653) +++ mln/core/image/extension_ima.hh (working copy) @@ -75,6 +75,7 @@ // ...these changes. typedef trait::image::category::identity_morpher category; typedef mln_internal_trait_image_speed_from(I) speed; // Un-fastest. + typedef trait::image::value_access::indirect value_access; // extended domain typedef trait::image::ext_domain::extendable ext_domain; Index: mln/core/image/extension_val.hh --- mln/core/image/extension_val.hh (revision 2653) +++ mln/core/image/extension_val.hh (working copy) @@ -73,6 +73,7 @@ // ...these changes. typedef trait::image::category::identity_morpher category; typedef mln_internal_trait_image_speed_from(I) speed; // Un-fastest. + typedef trait::image::value_access::indirect value_access; // extended domain typedef trait::image::ext_domain::infinite ext_domain; Index: mln/level/fill_with_value.spe.hh --- mln/level/fill_with_value.spe.hh (revision 2653) +++ mln/level/fill_with_value.spe.hh (working copy) @@ -142,22 +142,37 @@ { template <typename I, typename V> - void fill_with_value_dispatch(trait::image::value_storage::one_block, - trait::image::vw_io::any, + void fill_with_value_dispatch(trait::image::value_access::direct, Image& ima, const V& val) { - if ((mlc_is(mln_trait_image_pw_io(I), + if (mlc_is(mln_trait_image_pw_io(I), trait::image::pw_io::read_write)::value || mlc_is(mln_trait_image_vw_io(I), - trait::image::vw_io::read_write)::value) && - mlc_is(mln_trait_image_value_access(I), - trait::image::value_access::direct)::value) + trait::image::vw_io::read_write)::value) impl::fill_with_value_one_block(ima, val); else impl::generic::fill_with_value(ima, val); } template <typename I, typename V> + void fill_with_value_dispatch(trait::image::value_access::any, + Image& ima, const V& val) + { + impl::generic::fill_with_value(ima, val); + } + + + + template <typename I, typename V> + void fill_with_value_dispatch(trait::image::value_storage::one_block, + trait::image::vw_io::any, + Image& ima, const V& val) + { + fill_with_value_dispatch(mln_trait_image_value_access(I)(), + ima, val); + } + + template <typename I, typename V> void fill_with_value_dispatch(trait::image::value_storage::singleton, trait::image::vw_io::any, Image& ima, const V& val) Index: mln/level/fill_with_value.hh --- mln/level/fill_with_value.hh (revision 2653) +++ mln/level/fill_with_value.hh (working copy) @@ -102,9 +102,8 @@ I& ima = exact(ima_); internal::fill_with_value_tests(ima, val); - // FIXME: activate this test - //mlc_is(mln_trait_image_pw_io(I), - //trait::image::pw_io::read_write)::check(); + mlc_is(mln_trait_image_pw_io(I), + trait::image::pw_io::read_write)::check(); mln_value(I) v = exact(val); mln_piter(I) p(ima.domain());

16 years, 2 months

r2653: Work on ICCVG04 for INIM

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2653: Work on ICCVG04 for INIM URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-22 Maxime van Noppen <yabo(a)lrde.epita.fr> Work on ICCVG04 for INIM. * Makefile: Make a smarter Makefile. * iccvg04.cc: Enhance the classification routine. --- iccvg04.cc | 109 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 27 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2652) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2653) @@ -19,11 +19,17 @@ #include <mln/io/ppm/load.hh> #include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> #include <mln/estim/min_max.hh> +#include <mln/algebra/vec.hh> +#include <mln/algebra/vec.hh> + +#include <mln/level/stretch.hh> #include <sys/stat.h> #include <sstream> +#include <string.h> using namespace mln; @@ -34,7 +40,7 @@ mln::image3d<unsigned> fill_histo(const I& ima, int f) { - const mln_value(I) v = mln_max(mln_value(I)) / f; + const value::int_u8 v = 255 / f; // FIXME image3d< unsigned > histo(v,v,v); level::fill(histo, 0); unsigned i = 0; @@ -89,62 +95,109 @@ template <typename I, typename J, typename K> -mln_concrete(I) -classify_image(const I& ima, const J& histo, const K& ws, int nbasins) +void +classify_image(const I& ima, const J& histo, const K& ws, int nbasins, int f) { - image2d<value::rgb8> out(ima.domain()); - - typedef mln::accu::mean<mln_value(J)> accu_t; - accu_t acu; + unsigned count[nbasins + 1]; + memset(count, 0, nbasins + 1); + algebra::vec<3, unsigned> sum[nbasins + 1]; - util::array<mln_result(accu_t)> tmp = labeling::compute(acu, histo, ws, nbasins); - - /*mln_piter(I) p(ima.domain()); + for (int i = 1; i < nbasins + 1; ++i) + { + sum[i] = literal::zero; + } + /*mln_piter(K) p(ws.domain()); for_all(p) { + count[ws(p)] += histo(p); + sum[ws(p)] += histo(p) * convert::to<algebra::vec<3, value::int_u8> >(p) * f; }*/ + + mln_piter(I) p(ima.domain()); + for_all(p) + { + point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + + count[ws(p3)] += histo(p3); + sum[ws(p3)] += histo(p3) * convert::to<algebra::vec<3, value::int_u8> >(p3) * f; + + std::cerr << "p3 : " << p3 << " == " << convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; + } + + for (int i = 1; i < nbasins + 1; ++i) + { + sum[i] /= count[i]; + //std::cout << "count[" << i << "] = " << count[i] << std::endl; + std::cout << "sum[" << i << "] = " << sum[i] << std::endl; + } + + + mln_piter(I) pi(ima.domain()); + I out(ima.domain()); + for_all(pi) + { + value::rgb8 coul = ima(pi); + + int w = ws(point3d(coul.red() / f, coul.green() / f, coul.blue() / f)); + + out(pi) = convert::to<value::rgb8>(sum[w]); + + std::cerr << "(" << coul << ") -> (" << out(pi) << "); sum[" << w << "] = " << sum[w] << " -> " << convert::to<value::rgb8>(sum[w]) << std::endl; + } + + // 1- La valeur contenue dans sum n'est pas correctement Ã©crite dans out.ppm. Ã vÃ©rifier ! + // 2- Le cast de sum[w] en rgb8 se passe trÃ¨s bizarrement. Ã vÃ©rifier ! + // 3- Rajoute le std::cout de count change le comportement du programme. Ã vÃ©rifier ! + + io::ppm::save(out, "out.ppm"); } int main(int argc, char **argv) { + const int div_factor = 8; + image2d<value::rgb8> ima; ima = io::ppm::load<value::rgb8>(argv[1]); //make histo - image3d<unsigned> histo = fill_histo(ima,4); + image3d<unsigned> histo = fill_histo(ima,div_factor); { unsigned m, M; estim::min_max(histo, m, M); - std::cout << m << ' ' << M << std::endl; + std::cout << "histo : " << m << ' ' << M << std::endl; } - /* image3d<value::int_u8> nhisto = normalizeu8(histo); +#if 0 + image3d<value::int_u8> nhisto(histo.domain()); + level::stretch(histo, nhisto); + //image3d<value::int_u8> nhisto = normalizeu8(histo); { value::int_u8 m, M; estim::min_max(nhisto, m, M); - std::cout << m << ' ' << M << std::endl; - }*/ + std::cout << "nhisto : " << m << ' ' << M << std::endl; + } +#endif //display(nhisto, "histo"); //revert histo - image3d<value::int_u8> rhisto = arith::revert(histo); + image3d<unsigned> rhisto = arith::revert(histo); { - value::int_u8 m, M; + unsigned m, M; estim::min_max(rhisto, m, M); - std::cout << m << ' ' << M << std::endl; + std::cout << "rhisto : " << m << ' ' << M << std::endl; } //display(rhisto, "rhisto"); //compute closing_area of histo - image3d<value::int_u8> histo_closure(histo.domain()); + image3d<unsigned> histo_closure(histo.domain()); morpho::closing_area(rhisto, c6(), 20, histo_closure); { - value::int_u8 m, M; + unsigned m, M; estim::min_max(histo_closure, m, M); - std::cout << m << ' ' << M << std::endl; + std::cout << "histo_closure : " << m << ' ' << M << std::endl; } @@ -152,14 +205,16 @@ //display_proj_revert(histo_closure, "chisto.ppm"); //watershed over histo_closure - value::int_u8 nbasins; - image3d<value::int_u8> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + unsigned nbasins = 0; + image3d<unsigned> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); - std::cout << nbasins << std::endl; + std::cout << "nbassins : " << nbasins << std::endl; - display(ws, "ws"); - display_proj_revert(ws, "whisto.ppm"); + //display(ws, "ws"); + //display_proj_revert(ws, "whisto.ppm"); //gplot(ws); - //donne_tout(ima, histo_closure, ws, nbasins); + // Classify image ! + //classify_image(const I& ima, const J& histo, const K& ws, int nbasins, int f) + classify_image(ima, histo, ws, nbasins, div_factor); } Index: branches/cleanup-2008/milena/sandbox/classif/Makefile =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2652) +++ branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2653) @@ -2,3 +2,6 @@ all: g++ iccvg04.cc $(CCFLAGS) \ No newline at end of file + +debug: + g++ iccvg04.cc -I../../ -O0 -g3 -ggdb3

16 years, 2 months

cleanup-2008 2652: Update of the ICIP'07 max-tree canonization code.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update of the ICIP'07 max-tree canonization code. * scribo/demat.hh (trace): Set on. * geraud/max_tree_nnodes.cc (neighb): Remove useless. (mln_point): Update. geraud/max_tree_nnodes.cc | 4 +--- scribo/demat.hh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) Index: scribo/demat.hh --- scribo/demat.hh (revision 2651) +++ scribo/demat.hh (working copy) @@ -396,7 +396,7 @@ using value::rgb8; border::thickness = 3; - trace::quiet = true; + trace::quiet = false; //Useful debug variables unsigned l = atoi(argv[3]); Index: geraud/max_tree_nnodes.cc --- geraud/max_tree_nnodes.cc (revision 2651) +++ geraud/max_tree_nnodes.cc (working copy) @@ -19,7 +19,7 @@ template <typename I, typename N> struct max_tree_ { - typedef mln_point(I) point; + typedef mln_site(I) point; typedef p_array<point> S; // in: @@ -30,7 +30,6 @@ S s; mln_ch_value(I, bool) deja_vu; mln_ch_value(I, point) parent; - mln_ch_value(I, point) neighb; mln_ch_value(I, point) zpar; max_tree_(const I& f, const N& nbh) @@ -45,7 +44,6 @@ // init { initialize(deja_vu, f); - initialize(neighb, f); mln::level::fill(deja_vu, false); initialize(parent, f); initialize(zpar, f);

16 years, 2 months

milena r2651: Fix convert::to_image

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * mln/convert/to_image.hh: convert a histo::data<T> in an image1d<std::size_t> instead of image1d<T>. --- to_image.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: branches/cleanup-2008/milena/mln/convert/to_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2650) +++ branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2651) @@ -124,9 +124,9 @@ template <typename W> mln_image_from(W, mln_weight(W)) to_image(const Weighted_Window<W>& w_win); - /// Convert an histo \p h into an image1d<T>. + /// Convert an histo \p h into an image1d<std::size_t>. template <typename T> - image1d<T> to_image(const histo::data<T>& h); + image1d<std::size_t> to_image(const histo::data<T>& h); @@ -192,11 +192,11 @@ template <typename T> inline - image1d<T> to_image(const histo::data<T>& h) + image1d<std::size_t> to_image(const histo::data<T>& h) { T v_min = h.vset()[0], v_max = h.vset()[h.vset().nvalues() - 1]; - image1d<T> ima(make::box1d(v_min, v_max)); + image1d<std::size_t> ima(make::box1d(v_min, v_max)); for (unsigned i = 0; i < h.vset().nvalues(); ++i) ima(point1d(i)) = h[i]; return ima;

16 years, 2 months

2650: Fix namespace path to update_tests().

by Guillaume Lazzara

* mln/level/update.hh: specify full namespace path to update_tests(). --- milena/ChangeLog | 6 ++++++ milena/mln/level/update.hh | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 18a1f8d..dd04435 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix namespace path to update_tests(). + + * mln/level/update.hh: specify full namespace path to update_tests(). + 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> Use complex_iterator_base to factor iterators' implementations. diff --git a/milena/mln/level/update.hh b/milena/mln/level/update.hh index 77ea14e..bc52d58 100644 --- a/milena/mln/level/update.hh +++ b/milena/mln/level/update.hh @@ -99,7 +99,7 @@ namespace mln A& a = exact(a_); const I& input = exact(input_); - internal::update_tests(a, input); + level::internal::update_tests(a, input); mln_piter(I) p(input.domain()); for_all(p) @@ -121,7 +121,7 @@ namespace mln A& a = exact(a_); const I& input = exact(input_); - internal::update_tests(a, input); + level::internal::update_tests(a, input); mln_pixter(const I) pxl(input); for_all(pxl) @@ -181,7 +181,7 @@ namespace mln { trace::entering("level::update"); - internal::update_tests(a, input); + level::internal::update_tests(a, input); mln_result(A) r = internal::update_dispatch(a, input); trace::exiting("level::update"); -- 1.5.6.5

16 years, 2 months

2649: Improve debug output.

by Guillaume Lazzara

* scribo/demat.hh: Use color images for debug output. Improve the way the small components are erased. * scribo/main.cc: Improve usage output. --- milena/sandbox/ChangeLog | 10 ++ milena/sandbox/scribo/demat.hh | 181 +++++++++++++++++++++++++-------------- milena/sandbox/scribo/main.cc | 27 ++++++- 3 files changed, 152 insertions(+), 66 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index fd84117..8a50d7d 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,13 @@ +2008-10-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve debug output. + + * scribo/demat.hh: + Use color images for debug output. + Improve the way the small components are erased. + + * scribo/main.cc: Improve usage output. + 2008-10-22 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif++. diff --git a/milena/sandbox/scribo/demat.hh b/milena/sandbox/scribo/demat.hh index a824d11..570b93b 100644 --- a/milena/sandbox/scribo/demat.hh +++ b/milena/sandbox/scribo/demat.hh @@ -42,6 +42,7 @@ # include <mln/core/site_set/p_set.hh> # include <mln/accu/bbox.hh> +# include <mln/accu/count.hh> # include <mln/binarization/threshold.hh> @@ -59,17 +60,20 @@ # include <mln/fun/i2v/array.hh> # include <mln/io/pbm/load.hh> -# include <mln/io/pgm/load.hh> # include <mln/io/pbm/save.hh> +# include <mln/io/ppm/save.hh> # include <mln/io/pgm/save.hh> # include <mln/labeling/blobs.hh> # include <mln/labeling/compute.hh> +# include <mln/level/compute.hh> # include <mln/level/fill.hh> # include <mln/level/paste.hh> # include <mln/level/apply.hh> +# include <mln/literal/all.hh> + # include <mln/morpho/hit_or_miss.hh> # include <mln/morpho/opening.hh> @@ -82,6 +86,9 @@ # include <mln/value/int_u16.hh> # include <mln/value/rgb8.hh> +# include <mln/win/hline2d.hh> +# include <mln/win/vline2d.hh> + namespace scribo { @@ -90,6 +97,35 @@ namespace scribo using namespace mln; using value::int_u16; + using value::rgb8; + + + template <typename V> + void save_lbl_image(const image2d<V>& lbl, unsigned nlabels, + const char *filename) + { + image2d<rgb8> output(lbl.domain()); + + fun::i2v::array<rgb8> f(nlabels + 1); + f(0) = literal::black; + for (unsigned i = 1; i <= nlabels; ++i) + f(i) = rgb8(255 / ((i % 10) + 1), (100 + i) % 255, (255 + i)%255); + level::transform(lbl, f, output); + io::ppm::save(output, filename); + } + + image2d<rgb8> + to_color(const image2d<bool>& input) + { + image2d<rgb8> output; + + fun::i2v::array<rgb8> fconvert(2); + fconvert(0) = literal::black; + fconvert(1) = literal::white; + + return level::transform(input, fconvert); + } + /// Functions related to the table removal /// \{ @@ -108,14 +144,24 @@ namespace scribo /// Remove table bboxes from an image. - void erase_table_boxes(image2d<bool>& ima, + void erase_table_boxes(image2d<rgb8>& output, + const util::array<box2d>& boxes, + unsigned bbox_larger) + { + for (unsigned i = 1; i < boxes.nelements(); ++i) + level::paste((pw::cst(literal::black) + | (boxes[i].to_larger(bbox_larger) | (pw::value(output) != pw::cst(literal::black)))), output); + + } + + /// Remove table bboxes from an image. + void erase_table_boxes(image2d<bool>& output, const util::array<box2d>& boxes, unsigned bbox_larger) { - std::cout << "erase table boxes " << std::endl; for (unsigned i = 1; i < boxes.nelements(); ++i) level::paste((pw::cst(false) - | (boxes[i].to_larger(bbox_larger) | (pw::value(ima) == pw::cst(true)))), ima); + | (boxes[i].to_larger(bbox_larger) | (pw::value(output) == pw::cst(true)))), output); } @@ -123,34 +169,47 @@ namespace scribo /// Find table bboxes and remove them from the image. std::pair<util::array<box2d>, util::array<box2d> > - extract_tables(image2d<bool>& in, unsigned h, unsigned w, unsigned n) + extract_tables(image2d<bool>& in, + image2d<rgb8>& output, + unsigned l, + unsigned n) { typedef image2d<int_u16> I; typedef accu::bbox<mln_psite_(I)> A; typedef util::array<mln_result_(A)> boxes_t; + // Lignes verticales std::cout << "Removing vertical lines" << std::endl; - win::rectangle2d vwin(h, w); - image2d<bool> vfilter = morpho::opening(in, vwin); + win::vline2d vline(l); + image2d<bool> vfilter = morpho::opening(in, vline); + #ifndef NOUT io::pbm::save(vfilter, "./table-vfilter.pbm"); #endif + boxes_t vboxes = component_boxes(vfilter); erase_table_boxes(in, vboxes, n); + // Lignes horizontales std::cout << "Removing horizontal lines" << std::endl; - win::rectangle2d hwin(w, h); - image2d<bool> hfilter = morpho::opening(in, hwin); + win::hline2d hline(l); + image2d<bool> hfilter = morpho::opening(in, hline); + #ifndef NOUT io::pbm::save(hfilter, "./table-hfilter.pbm"); #endif + boxes_t hboxes = component_boxes(hfilter); erase_table_boxes(in, hboxes, n); + #ifndef NOUT - io::pbm::save(in, "./table-filtered.pbm"); + image2d<rgb8> tmp = clone(output); + erase_table_boxes(tmp, vboxes, n); + erase_table_boxes(tmp, hboxes, n); + io::ppm::save(tmp, "./table-filtered.ppm"); #endif return std::make_pair(vboxes, hboxes); @@ -171,39 +230,39 @@ namespace scribo return i; } + template <typename V> void - remove_small_comps_i2v(image2d<int_u16>& lbl, - util::array<box2d>& cboxes, int_u16& ncomps, + remove_small_comps_i2v(image2d<V>& lbl, + V& nlabels, unsigned min_comp_size) { - ncomps = cboxes.nelements() - 1; - unsigned current = 1; - fun::i2v::array<int_u16> comps; - comps.resize(cboxes.nelements()); - comps(0) = 0; - - // Construct the transform function. - for (int i = 1; i <= ncomps;) + std::cout << "Removing small components smaller than " + << min_comp_size << " sites among " << nlabels + << " components" << std::endl; + + typedef accu::count<mln_psite(image2d<V>)> accu_count_t; + + util::array<mln_result(accu_count_t)> nsitecomp + = labeling::compute(accu_count_t(), lbl, nlabels); + + V ncomp = 0; + fun::i2v::array<V> f(nsitecomp.nelements()); + f(0) = 0; + for (unsigned i = 1; i <= nlabels; ++i) { - // On aimerait avoir une routine qui nous le fait toute seule et qui - // soit optimisee. - if (estim::nsites(cboxes[i]) < min_comp_size) - { - comps(current) = 0; - cboxes[i] = cboxes[ncomps]; - comps(ncomps) = i; - current = ncomps--; - } + if (nsitecomp[i] < min_comp_size) + f(i) = 0; else - { - comps(current) = i; - current = ++i; - } + f(i) = ++ncomp; } - //Relabel - level::apply(lbl, comps); - cboxes.resize(ncomps + 1); + level::apply(lbl, f); + nlabels = ncomp; + +#ifndef NOUT + std::cout << "nlabels = " << nlabels << std::endl; + save_lbl_image(lbl, nlabels, "./lbl-small-comps-removed.pgm"); +#endif } @@ -222,9 +281,13 @@ namespace scribo tboxes[left_link(i)].take(cboxes[i]); } - //Update labels - FIXME: Do we need to do that? + //Update labels level::apply(lbl, left_link); +#ifndef NOUT + save_lbl_image(lbl, ncomp, "./lbl-grouped-boxes.pgm"); +#endif + util::array<box2d> result; for (unsigned i = 1; i <= ncomp; ++i) result.append(tboxes[i].to_result()); @@ -291,6 +354,7 @@ namespace scribo util::array<box2d> extract_text(image2d<bool>& in, + image2d<rgb8>& output, unsigned bbox_distance, unsigned min_comp_size) { @@ -303,37 +367,18 @@ namespace scribo // Find character bboxes. V nlabels; image2d<V> lbl = labeling::blobs(in, c4(), nlabels); - boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); - -# ifndef NOUT - std::cout << "nlabels = " << nlabels << std::endl; - I ima(in.domain()); - level::paste(pw::cst(100) - | (in.domain() | (pw::value(in) == pw::cst(true))), ima); -#endif //Remove small components. - int_u16 ncomp; - remove_small_comps_i2v(lbl, cboxes, ncomp, min_comp_size); + remove_small_comps_i2v(lbl, nlabels, min_comp_size); -#ifndef NOUT - io::pgm::save(ima, "./text-wo-small.pgm"); -#endif + boxes_t cboxes = labeling::compute(accu::meta::bbox(), lbl, nlabels); //Link character bboxes to their left neighboor if possible. fun::i2v::array<int_u16> left = - link_character_bboxes(lbl, cboxes, ncomp, bbox_distance); + link_character_bboxes(lbl, cboxes, nlabels, bbox_distance); //Merge character bboxes according to their left neighbor. - util::array<box2d> tboxes = group_bboxes(left, lbl, cboxes, ncomp); - -#ifndef NOUT - for (unsigned i = 1; i <= ncomp; ++i) - if (tboxes[i].is_valid()) - draw::box(ima, tboxes[i], 254u); - - io::pgm::save(ima, "./bbtext.pgm"); -#endif + util::array<box2d> tboxes = group_bboxes(left, lbl, cboxes, nlabels); return tboxes; } @@ -344,17 +389,17 @@ namespace scribo } // end of namespace scribo::internal - // Facade void demat(char *argv[]) { using namespace mln; + using value::rgb8; + border::thickness = 3; trace::quiet = true; //Useful debug variables - unsigned h = atoi(argv[2]); - unsigned w = atoi(argv[3]); + unsigned l = atoi(argv[3]); unsigned bbox_larger = atoi(argv[4]); unsigned bbox_distance = atoi(argv[5]); unsigned min_comp_size = atoi(argv[6]); @@ -362,11 +407,17 @@ namespace scribo //Load image image2d<bool> in; io::pbm::load(in, argv[1]); + image2d<rgb8> output = internal::to_color(in); - internal::extract_tables(in, h, w, bbox_larger); + internal::extract_tables(in, output, l, bbox_larger); util::array<box2d> tboxes = - internal::extract_text(in, bbox_distance, min_comp_size); + internal::extract_text(in, output, bbox_distance, min_comp_size); + + for (unsigned i = 1; i < tboxes.nelements(); ++i) + if (tboxes[i].is_valid()) + draw::box(output, tboxes[i], literal::red); + io::ppm::save(output, argv[2]); /// Use txt bboxes here with Tesseract /// => in | tboxes[i] diff --git a/milena/sandbox/scribo/main.cc b/milena/sandbox/scribo/main.cc index 52aad5a..f2f9d15 100644 --- a/milena/sandbox/scribo/main.cc +++ b/milena/sandbox/scribo/main.cc @@ -35,7 +35,32 @@ int main(int argc, char*argv[]) if (argc < 2) { - std::cout << argv[0] << " <image.pgm> <h> <w> <bbox_larger> <bbox_distance> <min_comp_size>" << std::endl; + std::cout << argv[0] << " <in.pbm> <out.pgm> <l> <bbox_larger> <bbox_distance> <min_comp_nsites>" << std::endl + << std::endl << std::endl + << std::endl + << "==========" + << std::endl << std::endl + << "<in.pbm> B/W inverted input image." + << std::endl << std::endl + << "<out.pgm> RGB8 output image." + << std::endl << std::endl + << "<l> Line length" + << std::endl << std::endl + << "<bbox_larger> Extension size of the bounding boxes vertical/horizontal" + << std::endl + << " lines considered as table borders which will be removed" + << std::endl << std::endl + << "<bbox_distance> Maximum distance between character bounding boxes. Used for bbox grouping." + << std::endl << std::endl + << "<min_comp_nsites> Minimum site count of a character/text component." + << std::endl + << " If a component have a site count lesser than this value, it is erased." + << std::endl << std::endl + << std::endl + << "==========" + << std::endl << std::endl + << "HINT: compile with -DNOUT to avoid debug images." + << std::endl << std::endl; return 1; } -- 1.5.6.5

16 years, 2 months

2648: Use complex_iterator_base to factor iterators' implementations.

by Roland Levillain

* mln/topo/internal/complex_set_iterator_base.hh, * mln/topo/internal/complex_relative_iterator_base.hh (complex_set_iterator_base<F, E>) (complex_relative_iterator_base<F, E>): Inherit from mln::topo::internal::complex_iterator_base<F, E>. (complex_set_iterator_base<F, E>::face) (complex_relative_iterator_base<F, E>::face) (complex_set_iterator_base<F, E>::operator const face_type&) (complex_relative_iterator_base<F, E>::operator const face_type&) (complex_set_iterator_base<F, E>::f_) (complex_relative_iterator_base<F, E>::f_) (operator<<(ostream&, const complex_set_iterator_base<F,E>&)) (operator<<(ostream&, const complex_relative_iterator_base<F,E>&)): Remove. Adjust other methods. * mln/geom/complex_geometry.hh (mln::geom::internal::complex_geometry_data::zero_faces): Rename attribute as... (mln::geom::internal::complex_geometry_data::zero_faces_geom): ...this. Use a more meaningful (though equivalent) type. (mln::geom::complex_geometry<D, P>::add_location): Adjust. (mln::geom::complex_geometry<D, P>::operator()): Likewise. Catch up with mln::topo::internal::complex_iterator_base<F, E>'s interface. --- milena/ChangeLog | 30 +++++++++ milena/mln/geom/complex_geometry.hh | 12 ++-- .../internal/complex_relative_iterator_base.hh | 61 +---------------- .../mln/topo/internal/complex_set_iterator_base.hh | 69 ++----------------- 4 files changed, 47 insertions(+), 125 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d10e7be..18a1f8d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Use complex_iterator_base to factor iterators' implementations. + + * mln/topo/internal/complex_set_iterator_base.hh, + * mln/topo/internal/complex_relative_iterator_base.hh + (complex_set_iterator_base<F, E>) + (complex_relative_iterator_base<F, E>): + Inherit from mln::topo::internal::complex_iterator_base<F, E>. + (complex_set_iterator_base<F, E>::face) + (complex_relative_iterator_base<F, E>::face) + (complex_set_iterator_base<F, E>::operator const face_type&) + (complex_relative_iterator_base<F, E>::operator const face_type&) + (complex_set_iterator_base<F, E>::f_) + (complex_relative_iterator_base<F, E>::f_) + (operator<<(ostream&, const complex_set_iterator_base<F,E>&)) + (operator<<(ostream&, const complex_relative_iterator_base<F,E>&)): + Remove. + Adjust other methods. + * mln/geom/complex_geometry.hh + (mln::geom::internal::complex_geometry_data::zero_faces): + Rename attribute as... + (mln::geom::internal::complex_geometry_data::zero_faces_geom): + ...this. + Use a more meaningful (though equivalent) type. + (mln::geom::complex_geometry<D, P>::add_location): Adjust. + (mln::geom::complex_geometry<D, P>::operator()): Likewise. + Catch up with mln::topo::internal::complex_iterator_base<F, E>'s + interface. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add a top-level class factoring iterators on complexes. * mln/topo/internal/complex_iterator_base.hh: New. diff --git a/milena/mln/geom/complex_geometry.hh b/milena/mln/geom/complex_geometry.hh index 1634a65..18ed6da 100644 --- a/milena/mln/geom/complex_geometry.hh +++ b/milena/mln/geom/complex_geometry.hh @@ -121,7 +121,7 @@ namespace mln template <typename P> struct complex_geometry_data { - util::multi_site zero_faces; + std::vector zero_faces_geom; }; } @@ -143,8 +143,8 @@ namespace mln { mln_precondition(data_); // FIXME: These two lines are not thread safe. - data_->zero_faces.push_back(p); - return data_->zero_faces.size(); + data_->zero_faces_geom.push_back(p); + return data_->zero_faces_geom.size(); } template <unsigned D, typename P> @@ -158,8 +158,8 @@ namespace mln if (f.n() == 0) { // F is a 0-face. - mln_assertion(f.face_id() < data_->zero_faces.size()); - s.push_back(data_->zero_faces[f.face_id()]); + mln_assertion(f.face_id() < data_->zero_faces_geom.size()); + s.push_back(data_->zero_faces_geom[f.face_id()]); } else { @@ -167,7 +167,7 @@ namespace mln Compute the set of 0-faces transitively adjacent to F. */ topo::adj_m_face_fwd_iter<D> g(f, 0); for_all(g) - s.push_back(data_->zero_faces[g.face().face_id()]); + s.push_back(data_->zero_faces_geom[g.subject().face_id()]); } return s; } diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 16b913b..630f0f0 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -45,20 +45,12 @@ | backward_complex_relative_iterator_base<F, E> - \endverbatim + \endverbatim */ -# include <iosfwd> - # include <vector> -# include <mln/metal/equal.hh> - -# include <mln/core/concept/iterator.hh> -# include <mln/topo/complex.hh> - -/* FIXME: Introduce a common factoring class for this class and for - complex_set_iterator_base? */ +# include <mln/topo/internal/complex_iterator_base.hh> /* FIXME: By moving iterator `i_' into internal::complex_relative_iterator_base, we'll be able to factor @@ -85,7 +77,7 @@ namespace mln /// \arg \p F The type of the face handle. /// \arg \p E The type exact type of the iterator. template <typename F, typename E> - class complex_relative_iterator_base : public Iterator<E> + class complex_relative_iterator_base : public complex_iterator_base<F, E> { typedef complex_relative_iterator_base<F, E> self_; @@ -111,16 +103,6 @@ namespace mln void next_(); /// \} - /// \brief Conversion. - /// - /// Return a reference to the corresponding face handle. - /// \{ - /// Explicit conversion (accessor). - const face_type& face() const; - /// Implicit conversion (conversion operator). - operator const face_type&() const; - /// \} - protected: /// A pointer to the center face around which this iterator /// moves. @@ -130,22 +112,9 @@ namespace mln typedef std::vector<face_type> adj_faces_t; /// The set of faces adjacent to the reference face. adj_faces_t adj_faces_; - - /// The face handle this iterator is pointing to. - face_type f_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ - template <typename F, typename E> - inline - std::ostream& - operator<<(std::ostream& ostr, - const complex_relative_iterator_base<F, E>& p); - /*---------------------------------------------------------------. | topo::internal::forward_complex_relative_iterator_base<F, E>. | @@ -307,30 +276,6 @@ namespace mln exact(this)->update_f_(); } - template <typename F, typename E> - inline - const F& - complex_relative_iterator_base<F, E>::face() const - { - return f_; - } - - template <typename F, typename E> - inline - complex_relative_iterator_base<F, E>::operator const face_type&() const - { - return f_; - } - - - template <typename F, typename E> - inline - std::ostream& - operator<<(std::ostream& ostr, - const complex_relative_iterator_base<F, E>& p) - { - return ostr << F(p); - } /*---------------------------------------------------------------. diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index 6a7588d..c04f5cd 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -30,17 +30,9 @@ /// \file mln/topo/internal/complex_set_iterator_base.hh /// \brief Definition of an implementation (factoring) class for -/// iterators on faces of a complex. +/// (set) iterators on faces of a complex. -# include <iosfwd> - -# include <mln/metal/equal.hh> - -# include <mln/core/concept/iterator.hh> -# include <mln/topo/complex.hh> - -/* FIXME: Introduce a common factoring class for this class and for - complex_relative_iterator_base? */ +# include <mln/topo/internal/complex_iterator_base.hh> namespace mln @@ -51,12 +43,12 @@ namespace mln namespace internal { - /// \brief Factoring class for iterators on mln::complex. + /// \brief Factoring class for (set) iterators on mln::complex. /// /// \arg \p F The type of the face handle. /// \arg \p E The type exact type of the iterator. template <typename F, typename E> - class complex_set_iterator_base : public Iterator<E> + class complex_set_iterator_base : public complex_iterator_base<F, E> { typedef complex_set_iterator_base<F, E> self_; @@ -86,30 +78,9 @@ namespace mln /// Invalidate the iterator. void invalidate(); /// \} - - /// \brief Conversion. - /// - /// Return a reference to the corresponding face handle. - /// \{ - /// Explicit conversion (accessor). - const face_type& face() const; - /// Implicit conversion (conversion operator). - operator const face_type&() const; - /// \} - - protected: - /// The face handle this iterator is pointing to. - face_type f_; }; - /// Print an mln::topo::internal::complex_set_iterator_base. - template <typename F, typename E> - inline - std::ostream& - operator<<(std::ostream& ostr, const complex_set_iterator_base<F, E>& p); - - # ifndef MLN_INCLUDE_ONLY @@ -124,7 +95,7 @@ namespace mln inline complex_set_iterator_base<F, E>::complex_set_iterator_base(complex_type& c) { - f_.set_cplx(c); + this->f_.set_cplx(c); // Invalidate f_. invalidate(); } @@ -134,7 +105,7 @@ namespace mln void complex_set_iterator_base<F, E>::set_cplx(complex_type& c) { - f_.set_cplx(c); + this->f_.set_cplx(c); // Invalidate f_. invalidate(); } @@ -144,7 +115,7 @@ namespace mln bool complex_set_iterator_base<F, E>::is_valid() const { - return f_.is_valid(); + return this->f_.is_valid(); } template <typename F, typename E> @@ -152,31 +123,7 @@ namespace mln void complex_set_iterator_base<F, E>::invalidate() { - f_.invalidate(); - } - - template <typename F, typename E> - inline - const F& - complex_set_iterator_base<F, E>::face() const - { - return f_; - } - - template <typename F, typename E> - inline - complex_set_iterator_base<F, E>::operator const face_type&() const - { - return f_; - } - - - template <typename F, typename E> - inline - std::ostream& - operator<<(std::ostream& ostr, const complex_set_iterator_base<F, E>& p) - { - return ostr << F(p); + this->f_.invalidate(); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

16 years, 2 months

2647: Add a top-level class factoring iterators on complexes.

by Roland Levillain

* mln/topo/internal/complex_iterator_base.hh: New. --- milena/ChangeLog | 6 + milena/mln/topo/internal/complex_iterator_base.hh | 143 +++++++++++++++++++++ 2 files changed, 149 insertions(+), 0 deletions(-) create mode 100644 milena/mln/topo/internal/complex_iterator_base.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fb2cab6..d10e7be 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add a top-level class factoring iterators on complexes. + + * mln/topo/internal/complex_iterator_base.hh: New. + 2008-10-22 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update make mat. diff --git a/milena/mln/topo/internal/complex_iterator_base.hh b/milena/mln/topo/internal/complex_iterator_base.hh new file mode 100644 index 0000000..015ad7d --- /dev/null +++ b/milena/mln/topo/internal/complex_iterator_base.hh @@ -0,0 +1,143 @@ +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TOPO_INTERNAL_COMPLEX_ITERATOR_BASE_HH +# define MLN_TOPO_INTERNAL_COMPLEX_ITERATOR_BASE_HH + +/** \file mln/topo/internal/complex_iterator_base.hh + \brief Definition of an implementation (factoring) class for + iterators on complexes. + + Concrete iterators should inherit either from + mln::topo::internal::complex_set_iterator_base or from + mln::topo::internal::complex_relative_iterator_base (but not from + mln::topo::internal::complex_iterator_base directly). + + \see mln/topo/internal/complex_set_iterator_base.hh + \see mln/topo/internal/complex_relative_iterator_base.hh + + + The hierarchy of (top) implementation classes is as follow. + + \verbatim + + complex_iterator_base<F, E> + ^ + | + ,--------------+--------------. + | | + complex_set_iterator_base<F, E> complex_relative_iterator_base<F, E> + + \endverbatim +*/ + +# include <iosfwd> + +# include <mln/core/concept/iterator.hh> +# include <mln/topo/complex.hh> + + +namespace mln +{ + + namespace topo + { + + namespace internal + { + /// \brief Factoring class for iterators on mln::complex. + /// + /// \arg \p F The type of the face handle. + /// \arg \p E The type exact type of the iterator. + template <typename F, typename E> + class complex_iterator_base : public Iterator<E> + { + typedef complex_iterator_base<F, E> self_; + + public: + /// The type of the iterated faces. + typedef F face; + + /// \brief Conversion. + /// + /// Return a reference to the corresponding face handle. + /// \{ + /// Explicit conversion (accessor). + const face& subject() const; + /// Implicit conversion (conversion operator). + operator const face&() const; + /// \} + + protected: + /// The face handle this iterator is pointing to. + face f_; + }; + + + /// Print an mln::topo::internal::complex_iterator_base. + template <typename F, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_iterator_base<F, E>& p); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename F, typename E> + inline + const F& + complex_iterator_base<F, E>::subject() const + { + return f_; + } + + template <typename F, typename E> + inline + complex_iterator_base<F, E>::operator const face&() const + { + return f_; + } + + + template <typename F, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, const complex_iterator_base<F, E>& p) + { + return ostr << F(p); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo::internal + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_INTERNAL_COMPLEX_ITERATOR_BASE_HH -- 1.5.6.5

16 years, 2 months

cleanup-2008 2646: INIM: Classif++.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif++. * classif/iccvg04.cc: iccvg04.cc. * classif/Makefile: Makefile. Makefile | 3 + iccvg04.cc | 99 ++++++------------------------------------------------------- 2 files changed, 12 insertions(+), 90 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2645) +++ classif/iccvg04.cc (working copy) @@ -32,16 +32,17 @@ template <typename I> mln::image3d<unsigned> -fill_histo(const I& ima) +fill_histo(const I& ima, int f) { - image3d< unsigned > histo(128,128,128); + const mln_value(I) v = mln_max(mln_value(I)) / f; + image3d< unsigned > histo(v,v,v); level::fill(histo, 0); unsigned i = 0; mln_piter(I) p(ima.domain()); for_all(p) { - point3d p3(ima(p).red()/2,ima(p).green()/2, ima(p).blue()/2); + point3d p3(ima(p).red()/f,ima(p).green()/f, ima(p).blue()/f); histo(p3)++; } return histo; @@ -86,90 +87,10 @@ chdir(".."); } -template <typename I> -void display_proj_revert(const I& histo, const char * s) -{ - image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); - level::fill(proj_histo, 0); - - mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); - double max = 0; - for_all(p) - { - for (unsigned i = 0; i < geom::nslis(histo); i++) -// if (histo(point3d(p[0], p[1], i)) < 255) - proj_histo(p) += histo(point3d(p[0], p[1], i)); - - if (proj_histo(p) > max) - max = proj_histo(p); - } - - image2d< value::int_u8 > out(proj_histo.domain()); - for_all(p) - { - out(p) = (proj_histo(p) / max) * 255; - - if (out(p) < 255) - out(p) -= (255 - out(p)) * 10; - } - - io::pgm::save(out,s); -} - -template <typename I> -void display_proj_min(const I& histo, const char * s) -{ - image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); - level::fill(proj_histo, 0); - - mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); - double max = 0; - for_all(p) - { - unsigned min = 9999999; - for (unsigned i = 0; i < geom::nslis(histo); i++) - if (histo(point3d(p[0], p[1], i)) < min) - min = histo(point3d(p[0], p[1], i)); - proj_histo(p) = min; - - if (proj_histo(p) > max) - max = proj_histo(p); - } - - image2d< value::int_u8 > out(proj_histo.domain()); - for_all(p) - { - out(p) = (proj_histo(p) / max) * 255; - } - - io::pgm::save(out, s); -} - - -template <typename I> -mln_ch_value(I, value::int_u8) normalizeu8(const I& ima) -{ - mln_ch_value(I, value::int_u8) res(ima.domain()); - level::fill(res, literal::zero); - - mln_piter(I) p(ima.domain()); - mln_value(I) max = 0; - for_all(p) - { - if (ima(p) > max) - max = ima(p); - } - - for_all(p) - { - res(p) = (ima(p) / (double) max) * 255; - } - - return res; -} template <typename I, typename J, typename K> -mln_ch_value(I, value::int_u8) donne_tout(const I& ima, const J& histo, const K& ws, int nbasins) +mln_concrete(I) +classify_image(const I& ima, const J& histo, const K& ws, int nbasins) { image2d<value::rgb8> out(ima.domain()); @@ -192,24 +113,24 @@ ima = io::ppm::load<value::rgb8>(argv[1]); //make histo - image3d<unsigned> histo = fill_histo(ima); + image3d<unsigned> histo = fill_histo(ima,4); { unsigned m, M; estim::min_max(histo, m, M); std::cout << m << ' ' << M << std::endl; } - image3d<value::int_u8> nhisto = normalizeu8(histo); + /* image3d<value::int_u8> nhisto = normalizeu8(histo); { value::int_u8 m, M; estim::min_max(nhisto, m, M); std::cout << m << ' ' << M << std::endl; - } + }*/ //display(nhisto, "histo"); //revert histo - image3d<value::int_u8> rhisto = arith::revert(nhisto); + image3d<value::int_u8> rhisto = arith::revert(histo); { value::int_u8 m, M; estim::min_max(rhisto, m, M); Index: classif/Makefile --- classif/Makefile (revision 2645) +++ classif/Makefile (working copy) @@ -1,2 +1,4 @@ +CCFLAGS=-I../.. -O1 -DNDEBUG + all: - g++ *.cc -I../../ -O1 -DNDEBUG \ No newline at end of file + g++ iccvg04.cc $(CCFLAGS) \ No newline at end of file

16 years, 2 months

cleanup-2008 2645: Update make mat.

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 make mat. * tests/make/mat.cc: New. * tests/make/Makefile.am: Update. * mln/make/mat.hh: Overload. mln/make/mat.hh | 68 +++++++++++++++++++++++++++++++++++++++++-------- tests/make/Makefile.am | 4 ++ tests/make/mat.cc | 42 ++++++++++++------------------ 3 files changed, 79 insertions(+), 35 deletions(-) Index: tests/make/mat.cc --- tests/make/mat.cc (revision 2637) +++ tests/make/mat.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,16 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/algebra/mat.cc +/*! \file tests/make/mat.cc * - * \brief Tests on mln::algebra::mat. + * \brief Tests on mln::make::mat. */ - -#include <iostream> -#include <mln/fun/i2v/all_to.hh> #include <mln/algebra/mat.hh> -#include <mln/algebra/h_mat.hh> @@ -42,26 +38,24 @@ { using namespace mln; - algebra::mat<1,3,float> m1(all_to(4.)); - algebra::mat<2,2,float> m2 = algebra::mat<2,2,float>::Id; + { + int vals[] = { 1, 0, + 0, 1 }; + algebra::mat<2,2,int> m = make::mat(vals); + } - algebra::h_mat<1,float> hm1(m2); - algebra::h_mat<2,float> hm2; - algebra::h_mat<3,float> hm3(all_to(1.5)); - - algebra::mat<4,4,float> m4 = hm3; - - std::cout << "m1 = " << m1 << ";" << std::endl; - std::cout << "m2 = " << m2 << ";" << std::endl; - std::cout << "m4 = " << m4 << ";" << std::endl; - std::cout << "hm1 = " << hm1 << ";" << std::endl; - std::cout << "hm2 = " << hm2 << ";" << std::endl; - std::cout << "hm3 = " << hm3 << ";" << std::endl; + { + int vals[] = { 1, 2, 3, + 4, 5, 6 }; + algebra::mat<2,3,int> m = make::mat<2,3>(vals); + std::cout << m << std::endl; + } { - algebra::h_mat<2,float> m, m2; - m = m2; - // FIXME: Test *many* => runs ok... + int vals[][3] = { { 1, 2, 3 }, + { 4, 5, 6 } }; + algebra::mat<2,3,int> m = make::mat(vals); + std::cout << m << std::endl; } } Index: tests/make/Makefile.am --- tests/make/Makefile.am (revision 2644) +++ tests/make/Makefile.am (working copy) @@ -3,8 +3,10 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - dual_neighb + dual_neighb \ + mat dual_neighb_SOURCES = dual_neighb.cc +mat_SOURCES = mat.cc TESTS = $(check_PROGRAMS) Index: mln/make/mat.hh --- mln/make/mat.hh (revision 2644) +++ mln/make/mat.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory +// Copyright (C) 2006, 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 @@ -34,38 +34,86 @@ */ # include <mln/algebra/mat.hh> +# include <mln/metal/math/sqrt.hh> + namespace mln { namespace make { + /*! \brief Create an mln::algebra::mat<n,m,T>. * - * \param[in] tab Tab of value. + * \param[in] tab Array of values. * - * \pre The dimension table N is such as N = n * m - * with n and m, the dimensions oh the matrix. + * \pre The array dimension has to be n * m. */ - template <unsigned n, unsigned m, unsigned N, typename T> - algebra::mat<n,m,T> mat(const T tab[N]); + template <unsigned n, unsigned m, typename T> + algebra::mat<n,m,T> mat(const T (&tab)[n*m]); + + + /*! \brief Create an mln::algebra::mat<n,m,T>. + * + * \param[in] tab Array of values. + * + * \pre The array dimension has to be n * m. + */ + template <typename T, unsigned n, unsigned m> + algebra::mat<n,m,T> mat(const T (&tab)[n][m]); + + + /*! \brief Create an mln::algebra::mat<n,n,T>. + * + * \param[in] tab C-array of values. + * + * \pre The array dimension N has to be square (N = n * n). + */ + template <typename T, unsigned N> + algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> + mat(const T (&tab)[N]); + template <unsigned n, unsigned m, typename T> algebra::mat<n,m,T> mat(algebra::vec<n,T> v); + + # ifndef MLN_INCLUDE_ONLY - template <unsigned n, unsigned m, unsigned N, typename T> + template <unsigned n, unsigned m, typename T> inline - algebra::mat<n,m,T> mat(const T tab[N]) + algebra::mat<n,m,T> mat(const T (&tab)[n*m]) { - mln_precondition(n * m == N); algebra::mat<n,m,T> tmp; - for (unsigned i = 0; i < N; ++i) + for (unsigned i = 0; i < n*m; ++i) tmp(i / m, i % m) = tab[i]; return tmp; } + template <typename T, unsigned n, unsigned m> + algebra::mat<n,m,T> mat(const T (&tab)[n][m]) + { + algebra::mat<n,m,T> tmp; + for (unsigned i = 0; i < n; ++i) + for (unsigned j = 0; j < m; ++j) + tmp(i, j) = tab[i][j]; + return tmp; + } + + template <typename T, unsigned N> + inline + algebra::mat<mlc_sqrt_int(N), mlc_sqrt_int(N), T> + mat(const T (&tab)[N]) + { + enum { n = mlc_sqrt_int(N) }; + mlc_bool(N == n * n)::check(); + algebra::mat<n,n,T> tmp; + for (unsigned i = 0; i < N; ++i) + tmp(i / n, i % n) = tab[i]; + return tmp; + } + template <unsigned n, typename T> algebra::mat<n,1,T> mat(algebra::vec<n,T> v) {

16 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
38
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 October 2008