July 2009 - Olena-patches

[Olena] #132: Use gcov
by Olena 05 Aug '09

05 Aug '09

#132: Use gcov ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- 1. Use `gcov` to check which parts of Olena are actually covered (instantiated and checked) by the test suite. 1. Automate with make. 1. Optionally use the LTP GCOV Extension (`lcov`) : http://ltp.sourceforge.net/coverage/lcov.php -- Ticket URL: <https://trac.lrde.org/olena/ticket/132> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 3

4334: Revamp value::proxy class.
by Thierry Geraud 30 Jul '09

30 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Revamp value::proxy class. * mln/core/image/imorph/labeled_image.hh: Fix missing include. * mln/value/proxy.hh (proxy<const I>): Remove; useless. (proxy): Change inheritance from Value to Proxy. (operator): Remove; they are obsolete thanx to Proxy. (ima_): Change type from & to *; late initialization is allowed. (~proxy): De-activate static checks. * tests/value/proxy.cc: New. * tests/value/Makefile.am: Update. mln/core/image/imorph/labeled_image.hh | 1 mln/value/proxy.hh | 282 +++++++++------------------------ tests/value/Makefile.am | 2 tests/value/proxy.cc | 84 +++++++++ 4 files changed, 168 insertions(+), 201 deletions(-) Index: mln/core/image/imorph/labeled_image.hh --- mln/core/image/imorph/labeled_image.hh (revision 4333) +++ mln/core/image/imorph/labeled_image.hh (working copy) @@ -34,6 +34,7 @@ # include <mln/core/concept/function.hh> # include <mln/core/internal/image_identity.hh> # include <mln/core/site_set/box.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/accu/pair.hh> # include <mln/accu/nil.hh> Index: mln/value/proxy.hh --- mln/value/proxy.hh (revision 4333) +++ mln/value/proxy.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -29,8 +30,17 @@ /// \file /// /// Define a generic proxy class for an image pixel value. +/// +/// \todo Maybe we should overload conversion operator with proxy +/// or... (we have to choose) maybe we should add cpy ctors (with +/// proxy and proxy<J>). +/// +/// \todo Rename value::proxy as value::shell and fix the specific +/// code from Fred (the 2nd parameter, namely F, is useless) +/// +/// \todo Checks in ~proxy eventually should be re-activated. -# include <mln/core/concept/value.hh> +# include <mln/core/concept/proxy.hh> # include <mln/trait/value_.hh> # include <mln/metal/unconst.hh> @@ -38,7 +48,7 @@ namespace mln { - // Fwd decl. + // Forward declaration. namespace value { template <typename I> class proxy; } @@ -67,12 +77,13 @@ namespace value { - /*! \brief Generic proxy class for an image pixel value. - * - * The parameter \c I is an image type. - */ + /// \brief Generic proxy class for an image pixel value. + /// + /// The parameter \c I is an image type. + // template <typename I> - class proxy : public Value< proxy > + class proxy : public Proxy< proxy >, + public mln::internal::proxy_impl< mln_value(I), proxy > { public: @@ -83,120 +94,68 @@ typedef mln_value(I) equiv; /// Constructor. + proxy(); + + /// Constructor. proxy(I& ima, const mln_psite(I)& p); /// Destructor. ~proxy(); - /// Assignment (write access); general version. - template <typename V> - proxy& operator=(const V& v); + // Assignment (write access); "natural" version. + proxy& operator=(const mln_value(I)& v); /// Assignment (write access); replacement for default op. proxy& operator=(const proxy& rhs); /// Assignment (write access); with other proxy. - template <typename II> - proxy& operator=(const proxy<II>& rhs); - - /// Conversion (read access); general version. - template <typename V> - operator V() const; - - /// Conversion (read access); precise version. - operator mln_value(I)() const; - - /// Explicit read access. - mln_value(I) to_value() const; - - protected: - I& ima_; - mln_psite(I) p_; - }; + template <typename J> + proxy& operator=(const proxy<J>& rhs); +// /// Conversion (read access); "natural" version. +// operator mln_value(I)() const; - /*! \brief Generic proxy class for an image pixel value. - * - * The parameter \c I is an image type. - */ - template <typename I> - class proxy< const I > : public Value< proxy<const I> > - { - public: +// /// Conversion (read access); toward a proxy. +// template <typename J> +// operator proxy<J>() const; - /// Encoding associated type. - typedef void enc; // FIXME - /// Equivalent associated type. - typedef mln_value(I) equiv; +// /// Conversion (read access); general version. +// template <typename V> +// operator V() const; - /// Constructor. - proxy(const I& ima, const mln_psite(I)& p); - /// Destructor. - ~proxy(); + /// Explicit read access. + mln_value(I) to_value() const; - /// Conversion (read access); general version. - template <typename V> - operator V() const; - /// Conversion (read access); precise version. - operator mln_value(I)() const; + // As a proxy: - /// Explicit read access. - mln_value(I) to_value() const; + /// Return the proxy subject. + mln_value(I) subj_(); protected: - const I& ima_; + I* ima_; mln_psite(I) p_; }; - template <typename I> - bool operator==(const proxy& lhs, const mln_value(I)& rhs); - - template <typename I> - bool operator==(const mln_value(I)& lhs, const proxy& rhs); - - template <typename I, typename J> - bool operator==(const proxy& lhs, const proxy<J>& rhs); - - - template <typename I> - bool operator<(const proxy& lhs, const mln_value(I)& rhs); - - template <typename I> - bool operator<(const mln_value(I)& lhs, const proxy& rhs); - - template <typename I, typename J> - bool operator<(const proxy& lhs, const proxy<J>& rhs); - - - // FIXME: Ops such as +=, etc. - - - - /*! \brief Print a value proxy \p x into the output stream \p ostr. - * - * \param[in,out] ostr An output stream. - * \param[in] x A value proxy. - * - * \return The modified output stream \p ostr. - */ - template <typename I> - std::ostream& operator<<(std::ostream& ostr, const proxy& x); - # ifndef MLN_INCLUDE_ONLY - // proxy + template <typename I> + inline + proxy::proxy() + : ima_(0) + { + } template <typename I> inline proxy::proxy(I& ima, const mln_psite(I)& p) - : ima_(ima), + : ima_(&ima), p_(p) { } @@ -205,19 +164,19 @@ inline proxy::~proxy() { - mln_rvalue(I) (I::*mr)(const mln_psite(I)&) const = & I::read_; - mr = 0; - void (I::*mw)(const mln_psite(I)&, const mln_value(I)&) = & I::write_; - mw = 0; +// mln_rvalue(I) (I::*mr)(const mln_psite(I)&) const = & I::read_; +// mr = 0; +// void (I::*mw)(const mln_psite(I)&, const mln_value(I)&) = & I::write_; +// mw = 0; } template <typename I> - template <typename V> inline proxy& - proxy::operator=(const V& v) + proxy::operator=(const mln_value(I)& v) { - ima_.write_(p_, v); + mln_precondition(ima_ != 0); + ima_->write_(p_, v); return *this; } @@ -226,138 +185,59 @@ proxy& proxy::operator=(const proxy& rhs) { + mln_precondition(ima_ != 0); + if (&rhs == this) + return *this; // No-op. this->operator=(rhs.to_value()); return *this; } template <typename I> - template <typename II> + template <typename J> inline proxy& - proxy::operator=(const proxy<II>& rhs) + proxy::operator=(const proxy<J>& rhs) { + mln_precondition(ima_ != 0); this->operator=(rhs.to_value()); return *this; } - template <typename I> - template <typename V> - inline - proxy::operator V() const - { - return ima_.read_(p_); - } - - template <typename I> - inline - proxy::operator mln_value(I)() const - { - return ima_.read_(p_); - } +// template <typename I> +// template <typename V> +// inline +// proxy::operator V() const +// { +// mln_precondition(ima_ != 0); +// return ima_->read_(p_); +// } + +// template <typename I> +// inline +// proxy::operator mln_value(I)() const +// { +// mln_precondition(ima_ != 0); +// return ima_->read_(p_); +// } template <typename I> inline mln_value(I) proxy::to_value() const { - return ima_.read_(p_); - } - - // proxy<const I> - - template <typename I> - inline - proxy<const I>::proxy(const I& ima, const mln_psite(I)& p) - : ima_(ima), - p_(p) - { - } - - template <typename I> - inline - proxy<const I>::~proxy() - { - mln_rvalue(I) (I::*mr)(const mln_psite(I)&) const = & I::read_; - mr = 0; - } - - template <typename I> - template <typename V> - inline - proxy<const I>::operator V() const - { - return ima_.read_(p_); - } - - template <typename I> - inline - proxy<const I>::operator mln_value(I)() const - { - return ima_.read_(p_); + mln_precondition(ima_ != 0); + return ima_->read_(p_); } template <typename I> inline mln_value(I) - proxy<const I>::to_value() const - { - return ima_.read_(p_); - } - - // operator << - - template <typename I> - inline - std::ostream& operator<<(std::ostream& ostr, const proxy& x) + proxy::subj_() { - return ostr << x.to_value(); + mln_precondition(ima_ != 0); + return ima_->read_(p_); } - // operator == - - template <typename I> - inline - bool operator==(const proxy& lhs, const mln_value(I)& rhs) - { - return lhs.to_value() == rhs; - } - - template <typename I> - inline - bool operator==(const mln_value(I)& lhs, const proxy& rhs) - { - return lhs == rhs.to_value(); - } - - template <typename I, typename J> - inline - bool operator==(const proxy& lhs, const proxy<J>& rhs) - { - return lhs.to_value() == rhs.to_value(); - } - - // operator < - - template <typename I> - inline - bool operator<(const proxy& lhs, const mln_value(I)& rhs) - { - return lhs.to_value() < rhs; - } - - template <typename I> - inline - bool operator<(const mln_value(I)& lhs, const proxy& rhs) - { - return lhs < rhs.to_value(); - } - - template <typename I, typename J> - inline - bool operator<(const proxy& lhs, const proxy<J>& rhs) - { - return lhs.to_value() < rhs.to_value(); - } # endif // ! MLN_INCLUDE_ONLY Index: tests/value/proxy.cc --- tests/value/proxy.cc (revision 0) +++ tests/value/proxy.cc (revision 0) @@ -0,0 +1,84 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#include <map> +#include <mln/value/proxy.hh> + + +template <typename T> +struct test +{ + // Interface required by mln::value::proxy. + + typedef int psite; + typedef T value; + + void write_(const psite& p, const value& v) + { + // std::cout << "write value " << v << " at " < value " << data_[p] << std::endl; + return data_[p]; + } + + mutable std::map<psite,value> data_; + + // Some extra interface of an Image. + + value operator()(const psite& p) const + { + return read_(p); // Read only! + } + + mln::value::proxy<test> operator()(const psite& p) + { + mln::value::proxy<test> prx(*this, p); + return prx; + } +}; + + + +int main() +{ + using namespace mln; + + test<float> ima; + + int p = 3; + + ima(p) = 8.5; + ima(p) = 6 * ima(p); + mln_assertion(ima(p) == 51); + + test<int> ima_; + ima_(p) = 51; + ima_(p) = ima_(p); + mln_assertion(ima_(p) == 51); +} Index: tests/value/Makefile.am --- tests/value/Makefile.am (revision 4333) +++ tests/value/Makefile.am (working copy) @@ -33,6 +33,7 @@ int_u8 \ interop \ label \ + proxy \ rgb8 \ scalar \ set \ @@ -55,6 +56,7 @@ int_u8_SOURCES = int_u8.cc interop_SOURCES = interop.cc label_SOURCES = label.cc +proxy_SOURCES = proxy.cc rgb8_SOURCES = rgb8.cc scalar_SOURCES = scalar.cc set_SOURCES = set.cc

1 0

4333: Clean up a bit module icdar words.
by Thierry Geraud 30 Jul '09

30 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Clean up a bit module icdar words. * modules/icdar/words.cc (to_larger, to_smaller): Rename as... (enlarge, shrink): ...these; move into fun::p2p. (LOG): Group log code. (transposed_image): Get rid of this ugly call name. words.cc | 140 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 57 deletions(-) Index: modules/icdar/words.cc --- modules/icdar/words.cc (revision 4332) +++ modules/icdar/words.cc (working copy) @@ -60,67 +60,104 @@ namespace mln { + namespace fun + { + + namespace p2p + { // Forward declaration. - template <typename P> struct to_larger; + template <typename P> struct enlarge; template <typename P> - struct to_smaller - : Function_v2v < to_smaller > + struct shrink : Function_v2v < shrink > { typedef P result; - typedef to_larger invert; + typedef enlarge invert; + + shrink(unsigned factor = 2) + { + mln_precondition(factor != 0); + this->factor = factor; + } P operator()(const P& p) const { + mln_precondition(factor != 0); P tmp(p); - for (unsigned i = 0; i < P::dim; ++i) - tmp[i] /= 2; - + tmp[i] /= factor; return tmp; } - invert inv() const { - return to_larger(); + return enlarge(factor); } + + unsigned factor; }; template <typename P> - struct to_larger - : Function_v2v < to_larger > + struct enlarge : Function_v2v < enlarge > { typedef P result; - typedef to_smaller invert; + typedef shrink invert; + + enlarge(unsigned factor = 2) + { + mln_precondition(factor != 0); + this->factor = factor; + } P operator()(const P& p) const { + mln_precondition(factor != 0); P tmp(p); - for (unsigned i = 0; i < P::dim; ++i) - tmp[i] *= 2; - + tmp[i] *= factor; return tmp; } - invert inv() const { - return to_smaller(); + return shrink(factor); } + unsigned factor; }; + } // end of namespace mln::fun::p2p + + } // end of namespace mln::fun + + template <typename S, typename I, typename F> + tr_image<S,I,F> + transform_p2p(const Site_Set<S>& s, const Image& ima, const Function_v2v<F>& t) + { + tr_image<S,I,F> tmp(exact(s), exact(ima), exact(t)); + return tmp; + } + +} // end of namespace mln + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm output.ppm" << std::endl; + std::abort(); } int main(int argc, char *argv[]) { + if (argc != 3) + usage(argv); + using namespace mln; typedef value::int_u8 L; @@ -129,14 +166,14 @@ // Parameters. - // Related to the first structural closing. - const unsigned - height = 5, - width = 11; - - // Related to the distance map computation. - const unsigned - l_area = 500; + // Related to the down-sizing. + const unsigned factor = 2; + + // Related to the structural closing. + const unsigned height = 5, width = 11; + + // Related to the distance map filtering. + const unsigned l_area = 500; // end of Parameters. @@ -148,24 +185,16 @@ /// Reduction and invertion. image2d<L> - small_gl = world::binary_2d::subsample(input, 2); + small_gl = world::binary_2d::subsample(input, factor); I small = data::transform(small_gl, fun::v2b::threshold<L>(191)); logical::not_inplace(small); -#ifdef LOG - io::pbm::save(small, "small.pbm"); -#endif // ! LOG - /// Structural closing. I clo = morpho::closing::structural(small, win::rectangle2d(height, width)); -#ifdef LOG - io::pbm::save(clo, "tmp_clo.pbm"); -#endif // ! LOG - /// Distance map computation. int ww[] = { 00, 11, 0, 11, 0, @@ -182,11 +211,6 @@ dmap_ = morpho::closing::area(dmap, c4(), l_area); -#ifdef LOG - io::pgm::save(labeling::wrap(dmap), "tmp_dmap.pgm"); - io::pgm::save(labeling::wrap(dmap_), "tmp_dmap_.pgm"); -#endif // ! LOG - /// Watershed. L n_words; image2d<L> ws_ = morpho::watershed::flooding(dmap_, @@ -194,31 +218,33 @@ n_words); /// Remove non-significant regional minima. - image2d<L> ws = morpho::elementary::dilation(ws_, - c4()); - -#ifdef LOG - io::pgm::save(labeling::wrap(ws), "tmp_ws.pgm"); - io::pgm::save(labeling::wrap(ws_), "tmp_ws_.pgm"); + image2d<L> ws = morpho::elementary::dilation(ws_, c4()); /// Adjust the domain of the watershed image. - mln_VAR(ws_large_, transposed_image(input.domain(), ws_, - to_larger<point2d>())); - io::ppm::save(morpho::watershed::superpose(input, ws_large_), - "tmp_ws_on_input.ppm"); -#endif // ! LOG - - - /// Adjust the domain of the watershed image. - mln_VAR(ws_large, transposed_image(input.domain(), ws, - to_larger<point2d>())); + mln_VAR(ws_large, transform_p2p(input.domain(), ws, + fun::p2p::enlarge<point2d>(factor))); image2d<L> output(input.domain()); data::fill(output, literal::zero); data::paste(ws_large | (pw::value(input) == pw::cst(false)), output); + io::ppm::save(labeling::colorize(output, n_words), argv[2]); + - io::pgm::save(output, "ws_large.pgm"); - io::ppm::save(labeling::colorize(output, n_words), "ws_large.ppm"); +#ifdef LOG + io::pbm::save(small, "temp_small.pbm"); + io::pbm::save(clo, "temp_clo.pbm"); + io::pgm::save(labeling::wrap(dmap), "temp_dmap.pgm"); + io::pgm::save(labeling::wrap(dmap_), "temp_dmap_.pgm"); + + io::pgm::save(labeling::wrap(ws), "temp_ws.pgm"); + io::pgm::save(labeling::wrap(ws_), "temp_ws_.pgm"); + + /// Adjust the domain of the watershed image. + mln_VAR(ws_large_, transform_p2p(input.domain(), ws_, + fun::p2p::enlarge<point2d>(factor))); + io::ppm::save(morpho::watershed::superpose(input, ws_large_), + "temp_ws_on_input.ppm"); +#endif // ! LOG }

1 0

4331: Add some experimental code.
by Thierry Geraud 27 Jul '09

27 Jul '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some experimental code. * icdar/2009/pscomp: New directory. * icdar/2009/pscomp/iz.cc: New. Compute an IZ image along with distances between objects. * icdar/2009/pscomp/rect_filter.cc: New. Algebraic filtering with a combinaison of bounding box width and height. * theo/experimental/depeche: New directory. * theo/experimental/depeche/homogen.cc: New. * theo/experimental/depeche/col.cc: New. * theo/experimental/depeche/row_mm.cc: New. * theo/experimental/depeche/row.cc: New. icdar/2009/pscomp/iz.cc | 174 +++++++++++++++++++++ icdar/2009/pscomp/rect_filter.cc | 165 ++++++++++++++++++++ theo/experimental/depeche/col.cc | 286 +++++++++++++++++++++++++++++++++++ theo/experimental/depeche/homogen.cc | 43 +++++ theo/experimental/depeche/row.cc | 117 ++++++++++++++ theo/experimental/depeche/row_mm.cc | 96 +++++++++++ 6 files changed, 881 insertions(+) Index: icdar/2009/pscomp/iz.cc --- icdar/2009/pscomp/iz.cc (revision 0) +++ icdar/2009/pscomp/iz.cc (revision 0) @@ -0,0 +1,174 @@ + +// From mln/canvas/distance_geodesic.hh + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/routine/duplicate.hh> +# include <mln/core/site_set/p_queue_fast.hh> +# include <queue> +# include <mln/data/fill.hh> +# include <mln/extension/adjust_fill.hh> + + +// Local. + +#include <map> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/debug/println.hh> +#include <mln/data/saturate.hh> + +#include <mln/labeling/blobs.hh> +#include <mln/labeling/value.hh> + + + + +namespace mln +{ + + + // From mln/canvas/distance_geodesic.hh + // and mln/transform/internal/influence_zone_functor.hh + // and mln/transform/influence_zone_geodesic.hh + + + template <typename I, typename N> + std::map< std::pair<mln_value(I),mln_value(I)>, unsigned > + distances(// in: + const I& input, const N& nbh, + // out: + mln_ch_value(I, unsigned)& dmap, + mln_concrete(I)& iz) + { + trace::entering("canvas::impl::generic::distance_geodesic"); + + typedef mln_value(I) L; + std::map< std::pair<L,L>, unsigned > dist; // NEW + + const unsigned max = mln_max(unsigned); + typedef mln_site(I) P; + p_queue_fast q; + + // Initialization. + { + iz = duplicate(input); // <-- init + + data::fill(dmap, max); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + if (input(p) != 0) // <-- inqueue_p_wrt_input_p + { + ; // <-- init_p + dmap(p) = 0; + for_all(n) + if (input.domain().has(n) && + input(n) == 0) // <-- inqueue_p_wrt_input_n + { + q.push(p); + break; + } + } + } + + // Propagation. + { + P p; + mln_niter(N) n(nbh, p); + while (! q.is_empty()) + { + p = q.pop_front(); + if (dmap(p) == max) + { + // Saturation so stop. + q.clear(); + break; + } + for_all(n) + { + if (! input.domain().has(n)) + continue; + if (dmap(n) == max) + { + dmap(n) = dmap(p) + 1; + iz(n) = iz(p); // <- process + q.push(n); + } + else + { + if (iz(n) != iz(p)) + { + L l1 = iz(n), l2 = iz(p); + if (l1 > l2) + std::swap(l1, l2); + unsigned& d_ = dist[std::make_pair(l1,l2)]; + unsigned d12 = dmap(p) + dmap(n) + 1; + if (d_ == 0 || d12 < d_) + d_ = d12; + } + } + } + } + } + + return dist; + } + + +} // mln + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + + typedef unsigned L; + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + L n_labels; + image2d<L> lab = labeling::value(input, true, c8(), n_labels); + std::cout << "n labels = " << n_labels << std::endl; + + + image2d<unsigned> dmap(input.domain()); + image2d<L> iz(input.domain()); + + typedef std::map< std::pair<L,L>, unsigned > map_t; + map_t d = distances(lab, c8(), dmap, iz); + + io::pgm::save(data::saturate(value::int_u8(), dmap), "dmap.pgm"); + + // debug::println("lab = ", lab); + std::cout << "map size = " << d.size() << std::endl; + + +// { +// // Compute statistics. +// std::map<unsigned, unsigned> h; +// for (map_t::const_iterator i = d.begin(); +// i != d.end(); ++i) +// ++h[i->second]; + +// for (std::map<unsigned, unsigned>::const_iterator i = h.begin(); +// i != h.end(); ++i) +// std::cout << i->first << " " << i->second << std::endl; +// } + + +// { +// // Print: d(label1, label2) = shortest distance +// for (map_t::const_iterator i = d.begin(); +// i != d.end(); ++i) +// std::cout << "d(" << i->first.first << ", " << i->first.second << ") = " +// << i->second << std::endl; +// } + +} Index: icdar/2009/pscomp/rect_filter.cc --- icdar/2009/pscomp/rect_filter.cc (revision 0) +++ icdar/2009/pscomp/rect_filter.cc (revision 0) @@ -0,0 +1,165 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/debug/println.hh> + +#include <mln/transform/distance_geodesic.hh> +#include <mln/accu/shape/bbox.hh> +#include <mln/morpho/closing/algebraic.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/morpho/watershed/superpose.hh> + +#include <mln/core/routine/duplicate.hh> +#include <mln/data/convert.hh> +#include <mln/pw/all.hh> +#include <mln/io/pbm/save.hh> +#include <mln/io/ppm/save.hh> + + + + +namespace mln +{ + + struct pair_and + { + pair_and() + {} + pair_and(unsigned first, unsigned second) + : first(first), + second(second) + {} +// bool operator<(const pair_and& other) const +// { +// return first < other.first && second < other.second; +// } + unsigned first, second; + }; + + + bool operator<(const pair_and& lhs, const pair_and& rhs) + { + return lhs.first < rhs.first || lhs.second < rhs.second; + } + + + struct rectangle_and; + + + namespace trait + { + + template <> + struct accumulator_< rectangle_and > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::no has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_p when_pix; + }; + + } // end of namespace mln::trait + + + struct rectangle_and : public accu::internal::base< pair_and, rectangle_and > + { + typedef point2d argument; + + rectangle_and() + { + } + + void init() + { + bb_.init(); + } + void take_as_init_(const point2d& p) + { + bb_.take_as_init_(p); + } + void take(const point2d& p) + { + bb_.take(p); + } + void take(const rectangle_and& other) + { + bb_.take(other.bb_); + } + + pair_and to_result() const + { + pair_and tmp(bb_.to_result().len(0), + bb_.to_result().len(1)); + return tmp; + } + + bool is_valid() const + { + return true; + } + + protected: + accu::shape::bbox<point2d> bb_; + }; + + +} // mln + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm w h output.ppm" << std::endl; + std::abort(); +} + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 5) + usage(argv); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + typedef value::int_u8 D; + + image2d<D> dmap; + dmap = transform::distance_geodesic(input, + c8(), + mln_max(D)); + io::pgm::save(dmap, "temp_dmap.pgm"); + + int w = std::atoi(argv[2]), h = std::atoi(argv[3]); + + pair_and lambda(w, h); + image2d<D> clo = morpho::closing::algebraic(dmap, + c8(), + rectangle_and(), + lambda); + + io::pgm::save(clo, "temp_clo.pgm"); + + typedef unsigned L; + L n_basins; + image2d<L> ws = morpho::watershed::flooding(clo, c8(), n_basins); + std::cout << "n basins = " << n_basins<< std::endl; + + { + image2d<rgb8> out = data::convert(rgb8(), dmap); + out = morpho::watershed::superpose(out, ws, rgb8(255,0,0)); + io::ppm::save(out, argv[4]); + } + +// { +// image2d<bool> out(input.domain()); +// out = duplicate((pw::value(ws) == pw::cst(0)) | input.domain()); +// io::pbm::save(out, argv[2]); +// } + +} Index: theo/experimental/depeche/homogen.cc --- theo/experimental/depeche/homogen.cc (revision 0) +++ theo/experimental/depeche/homogen.cc (revision 0) @@ -0,0 +1,43 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/morpho/attribute/height.hh> +#include <mln/morpho/closing/leveling.hh> + +#include <mln/arith/minus.hh> + +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm h output.pgm" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + + int i = std::atoi(argv[2]); + int_u8 h = i; + + morpho::attribute::height< image2d<int_u8> > acc; + image2d<int_u8> clo = morpho::closing::leveling(input, c4(), + acc, h); + io::pgm::save(clo, "tmp.pgm"); + arith::minus_inplace(clo, input); + + io::pgm::save(clo, argv[3]); +} Index: theo/experimental/depeche/col.cc --- theo/experimental/depeche/col.cc (revision 0) +++ theo/experimental/depeche/col.cc (revision 0) @@ -0,0 +1,286 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/neighb1d.hh> + +#include <mln/fun/v2v/projection.hh> +#include <mln/core/image/dmorph/unproject_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/pw/value.hh> + +#include <mln/accu/stat/mean.hh> +#include <mln/accu/image/init.hh> +#include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> + +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/plot/save.hh> + +#include <mln/linear/gaussian_1d.hh> +#include <mln/labeling/regional_maxima.hh> +#include <mln/data/convert.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/data/fill.hh> +#include <mln/debug/println.hh> +#include <mln/accu/stat/median_h.hh> + +#include <mln/morpho/closing/volume.hh> + + + +namespace mln +{ + + + float get_approx_gap(const util::array<unsigned>& line, unsigned delta) + { + accu::stat::median_h< value::int_u<12> > med; + const unsigned n = line.nelements() - delta; + for (unsigned i = 0; i < n; ++i) + med.take(line[i + delta] - line[i]); + + std::cout << "delta = " << delta << std::endl; + std::cout << med.histo() << std::endl; + std::cout << "med = " << med.to_result() << std::endl; + + return float(med.to_result()) / delta; + } + + + void refine_gap(const util::array<unsigned>& line, unsigned delta, float& gap) + { + std::cout << "gap = " << gap << std::endl; + unsigned count = 0; + + accu::stat::mean<float> mean; + const unsigned n = line.nelements() - delta; + for (unsigned i = 0; i < n; ++i) + { + float g = line[i + delta] - line[i]; + if (g / delta > gap - .2 && g / delta < gap + .2) + { + mean.take(g); + ++count; + } + } + std::cout << "count = " << count << " total = " << n << std::endl; + + gap = mean.to_result() / delta; + std::cout << "gap = " << gap << std::endl; + } + + + util::array<unsigned> + select_lines(const util::array<unsigned>& line, float gap) + { + std::set<unsigned> s; + const unsigned n = line.nelements() - 1; + for (unsigned i = 0; i < n; ++i) + { + float g = line[i + 1] - line[i]; + if (g > gap - 2 && g < gap + 2) + { + s.insert(line[i]); + s.insert(line[i + 1]); + } + } + + std::vector<unsigned> v(s.begin(), s.end()); + util::array<unsigned> out; + out.hook_std_vector_() = v; + + return out; + } + + + util::array<unsigned> + image_2_line(const image1d<double>& input) + { + image1d<bool> is_max(input.domain()); + unsigned n; + data::fill(is_max, + pw::value(labeling::regional_maxima(input, c2(), n)) | input.domain()); + std::cout << "n = " << n << std::endl; + + util::array<unsigned> line; + { + mln_piter_(box1d) p(input.domain()); + for_all(p) + if (is_max(p)) + line.append(p.ind()); + } + + return line; + } + + + util::array<unsigned> + analyze(const util::array<unsigned>& line, float& gap, bool& ok) + { + // FIXME: The value of delta in 'get_approx_gap' and in + // 'refine_gap' should change w.r.t. to the nature of input data. + gap = get_approx_gap(line, 10); // FIXME: 10 / 3 + float rough_gap = gap; + refine_gap(line, 20, gap); // FIXME: 20 / 4 + float finer_gap = gap; + + ok = std::abs(finer_gap - rough_gap) < 1; + + return select_lines(line, gap); + } + + + void draw(const image2d<value::int_u8>& input, + const util::array<unsigned>& line, + value::rgb8 color, + const std::string& filename) + { + image2d<value::rgb8> output = data::convert(value::rgb8(), input); + const int nrows = input.nrows(); + + for (unsigned i = 0; i < line.nelements(); ++i) + { + int col = line[i]; + for (int row = 0; row < nrows; ++row) + output.at_(row, col) = color; + } + + io::ppm::save(output, filename); +} + + +} // mln + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm lambda h.txt output.ppm" << std::endl; + std::cerr << "hint: lambda = 50; delta = 10 / 20 otherwise 3 / 4" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 5) + usage(argv); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + box2d b = input.domain(); + + + // h computing + + typedef accu::stat::mean<int_u8, unsigned, double> A; + + image1d<A> hmean(b.ncols()); + accu::image::init(hmean); + + fun::v2v::projection<point2d, 0> hproj; + accu::image::take(unproject(hmean, b, hproj).rw(), input); + + image1d<double> h = accu::image::to_result(hmean); + io::plot::save(h, argv[3]); + + + // h cleaning + + h = linear::gaussian_1d(h, 1.0, 255); + io::plot::save(h, "h_g.txt"); + + int lambda = std::atoi(argv[2]); + h = morpho::closing::volume(h, c2(), lambda); + io::plot::save(h, "h_gc.txt"); + + + + // analyzing + + util::array<unsigned> line = image_2_line(h); + draw(input, line, value::rgb8(255,0,0), "temp_h.ppm"); + + float gap; + bool ok; + line = analyze(line, gap, ok); + + draw(input, line, value::rgb8(255,0,0), "temp_h_sel.ppm"); + + if (! ok) + { + std::cerr << "analyze failed: abort!" << std::endl; + std::abort(); + } + + + + // getting a math model + float o; + + { + accu::stat::mean<float> me; + // col = r * gap where r = o + i (with offset o and integer i) + // col = gap * i + orig (orig = o * gap) + for (unsigned l = 0; l < line.nelements(); ++l) + { + float r = float(line[l]) / gap; + int i = int(r + 0.49999); + float o = r - float(i); + me.take(o); + std::cout << line[l] << " = " << (gap * o) << " + " < line_; + for (unsigned l = 0; l < line.nelements(); ++l) + { + int i = int(float(line[l]) / gap - o + 0.49999); + line_.append(int((o + i) * gap + 0.49999)); + } + + std::cout << std::endl; + + // over-display + draw(input, line, value::rgb8(255,0,0), "temp_h_found.ppm"); + + } + + + // drawing matrix + + { + image2d<rgb8> output = data::convert(rgb8(), input); + const int nrows = input.nrows(); + int ncols = input.ncols(); + + int n_max = int(float(ncols) / gap - o + 3); + for (int i = 0; i < n_max; ++i) + { + float col_ = (o + i) * gap; + int col = int(col_ + 0.49999); + if (col < 0) + continue; + if (col > ncols - 1) + break; + for (int row = 0; row < nrows; ++row) + output.at_(row, col) = rgb8(0,255,0); + } + + io::ppm::save(output, argv[4]); + } + + + +} Index: theo/experimental/depeche/row_mm.cc --- theo/experimental/depeche/row_mm.cc (revision 0) +++ theo/experimental/depeche/row_mm.cc (revision 0) @@ -0,0 +1,96 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/neighb1d.hh> + +#include <mln/fun/v2v/projection.hh> +#include <mln/core/image/dmorph/unproject_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/pw/value.hh> + +#include <mln/accu/stat/mean.hh> +#include <mln/accu/image/init.hh> +#include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> + +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/save.hh> +// #include <mln/draw/line.hh> +// #include <mln/literal/colors.hh> + +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/opening/volume.hh> + +#include <mln/labeling/regional_minima.hh> +#include <mln/labeling/regional_maxima.hh> +#include <mln/data/convert.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm lambda output.pgm" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 4) + usage(argv); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + box2d b = input.domain(); + + int lambda = std::atoi(argv[2]); + + typedef accu::stat::mean<int_u8, unsigned, int_u8> A; + + image1d<A> hmean(b.nrows()); + accu::image::init(hmean); + + fun::v2v::projection<point2d, 1> hproj; + accu::image::take(unproject(hmean, b, hproj).rw(), input); + + image1d<int_u8> h = accu::image::to_result(hmean); + io::plot::save(h, "temp_h0.txt"); + + h = morpho::closing::volume(h, c2(), lambda); + io::plot::save(h, "temp_h1.txt"); + + h = morpho::opening::volume(h, c2(), lambda); + io::plot::save(h, "temp_h2.txt"); + + + { + int_u8 n; + image1d<int_u8> + lab_bg = labeling::regional_maxima(h, c2(), n), + lab_fg = labeling::regional_minima(h, c2(), n); + + image2d<rgb8> cool = data::convert(rgb8(), input); + mln_piter_(box2d) p(cool.domain()); + for_all(p) + { + if (lab_bg.at_(p.row()) != 0) + cool(p).red() = 255; + if (lab_fg.at_(p.row()) != 0) + cool(p).green() = 255; + } + io::ppm::save(cool, "temp_cool.ppm"); + } + + // io::pgm::save(output, argv[2]); +} Index: theo/experimental/depeche/row.cc --- theo/experimental/depeche/row.cc (revision 0) +++ theo/experimental/depeche/row.cc (revision 0) @@ -0,0 +1,117 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/neighb1d.hh> + +#include <mln/fun/v2v/projection.hh> +#include <mln/core/image/dmorph/unproject_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/pw/value.hh> + +#include <mln/accu/stat/mean.hh> +#include <mln/accu/image/init.hh> +#include <mln/accu/image/take.hh> +#include <mln/accu/image/to_result.hh> + +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/rgb8.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/linear/gaussian_1d.hh> +#include <mln/data/fill.hh> +#include <mln/data/convert.hh> + +#include <mln/labeling/regional_minima.hh> +#include <mln/draw/line.hh> +#include <mln/literal/colors.hh> + +#include <mln/accu/stat/median_h.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm output.ppm" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::rgb8; + + if (argc != 3) + usage(argv); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + box2d b = input.domain(); + + typedef accu::stat::mean<int_u8, unsigned, double> A; + + image1d<A> hmean(b.nrows()); + accu::image::init(hmean); + + fun::v2v::projection<point2d, 1> hproj; + accu::image::take(unproject(hmean, b, hproj).rw(), input); + + image1d<double> hmean_d = accu::image::to_result(hmean); + io::plot::save(hmean_d, "temp_h.txt"); + + hmean_d = linear::gaussian_1d(hmean_d, 5, 255); + io::plot::save(hmean_d, "temp_hg.txt"); + + io::plot::save(hmean, argv[2]); + + int_u8 n; + image1d<int_u8> lab = labeling::regional_minima(hmean_d, c2(), n); + // io::plot::save(lab, "temp_lab.txt"); + + + { + image2d<rgb8> cool = data::convert(rgb8(), input); + mln_piter_(box1d) p(lab.domain()); + for_all(p) + if (lab(p) != 0) + draw::line(cool, + point2d(p.ind(), 0), + point2d(p.ind(), b.ncols() -1), + literal::red); + io::ppm::save(cool, argv[2]); + } + +// accu::stat::median_h<int_u8> med; +// { +// double min = 255; +// unsigned row_min; +// int last = -1; +// mln_piter_(box1d) p(lab.domain()); +// for_all(p) +// { +// if (lab(p) == 0) +// continue; +// if (hmean_d(p) < min) +// { +// min = hmean_d(p); +// row_min = p.ind(); +// } +// if (last == -1) +// last = p.ind(); +// else +// { +// med.take(p.ind() - last); +// last = p.ind(); +// } +// } +// std::cout << med << ' ' << row_min << std::endl; +// } + +}

1 0

r4329: Fixes about IZ method
by Edwin Carlinet 24 Jul '09

24 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-07-24 Edwin Carlinet <carlinet(a)lrde.epita.fr> Fixes about IZ method. * edwin/exec/zi.cc: Some tries... * edwin/exec/zi.hh: Real distance between components. --- zi.cc | 106 +++++++++++++++++++++++++++++++++++---------- zi.hh | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 236 insertions(+), 23 deletions(-) Index: trunk/milena/sandbox/edwin/exec/zi.hh =================================================================== --- trunk/milena/sandbox/edwin/exec/zi.hh (revision 0) +++ trunk/milena/sandbox/edwin/exec/zi.hh (revision 4329) @@ -0,0 +1,153 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef ZI_HH +# define ZI_HH + + +// From mln/canvas/distance_geodesic.hh + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/routine/duplicate.hh> +# include <mln/core/site_set/p_queue_fast.hh> +# include <queue> +# include <mln/data/fill.hh> +# include <mln/extension/adjust_fill.hh> + + +// Local. + +#include <map> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pbm/load.hh> +#include <mln/labeling/blobs.hh> +#include <mln/debug/println.hh> + + + + +namespace mln +{ + + // Theo's code + + // From mln/canvas/distance_geodesic.hh + // and mln/transform/internal/influence_zone_functor.hh + // and mln/transform/influence_zone_geodesic.hh + + + template <typename I, typename N> + std::map< std::pair<mln_value(I),mln_value(I)>, unsigned > + distances(// in: + const I& input, const N& nbh, + // out: + mln_ch_value(I, unsigned)& dmap, + mln_concrete(I)& iz) + { + trace::entering("canvas::impl::generic::distance_geodesic"); + + typedef mln_value(I) L; + std::map< std::pair<L,L>, unsigned > dist; // NEW + + const unsigned max = mln_max(unsigned); + typedef mln_site(I) P; + p_queue_fast q; + + // Initialization. + { + iz = duplicate(input); // <-- init + + data::fill(dmap, max); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + if (input(p) != 0) // <-- inqueue_p_wrt_input_p + { + ; // <-- init_p + dmap(p) = 0; + for_all(n) + if (input.domain().has(n) && + input(n) == 0) // <-- inqueue_p_wrt_input_n + { + q.push(p); + break; + } + } + } + + // Propagation. + { + P p; + mln_niter(N) n(nbh, p); + while (! q.is_empty()) + { + p = q.pop_front(); + if (dmap(p) == max) + { + // Saturation so stop. + q.clear(); + break; + } + for_all(n) + { + if (! input.domain().has(n)) + continue; + if (dmap(n) == max) + { + dmap(n) = dmap(p) + 1; + iz(n) = iz(p); // <- process + q.push(n); + } + else + { + if (iz(n) != iz(p)) + { + L l1 = iz(n), l2 = iz(p); + if (l1 > l2) + std::swap(l1, l2); + unsigned& d_ = dist[std::make_pair(l1,l2)]; + unsigned d12 = dmap(p) + dmap(n) + 1; + if (d_ == 0 || d12 < d_) + d_ = d12; + } + } + } + } + } + + return dist; + } + +} // mln + +# ifndef MLN_INCLUDE_ONLY + +# endif // ! MLN_INCLUDE_ONLY + +#endif // ! ZI_HH Index: trunk/milena/sandbox/edwin/exec/zi.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/zi.cc (revision 4328) +++ trunk/milena/sandbox/edwin/exec/zi.cc (revision 4329) @@ -33,6 +33,7 @@ #include <mln/value/int_u8.hh> #include <mln/value/label_16.hh> #include <mln/value/label_8.hh> +#include <mln/data/convert.hh> #include <mln/util/graph.hh> #include <mln/io/pbm/load.hh> @@ -50,10 +51,13 @@ #include <mln/make/edge_image.hh> #include <mln/make/vertex_image.hh> +#include <mln/morpho/closing/height.hh> + #include <mln/math/max.hh> #include <mln/norm/l1.hh> #include "color_distance.hh" +#include "zi.hh" #include <iostream> namespace mln @@ -94,6 +98,7 @@ } + // distance entre les centres de masses. template <typename P> inline value::int_u8 @@ -103,6 +108,7 @@ } + // distance entre les boites englobantes. inline value::int_u8 distance_box(const box<point2d>& b1, const box<point2d>& b2) @@ -125,6 +131,35 @@ return math::max(math::max(w_dist, h_dist), 0); } + + // distance geodesic entre les composantes. + template <typename G, typename L> + struct distance_t : Function_v2v< distance_t<G, L> > + { + typedef unsigned result; + typedef util::vertex_id_t V; + typedef util::edge_id_t E; + + distance_t(const std::map< std::pair<L, L>, unsigned >& d_, + const G& graph) + : d(d_), + g(graph) + { + } + + unsigned + operator () (const E& e_id) const + { + typename G::edge_t e = g.edge(e_id); + std::pair<L, L> p((value::label_8)e.v1(), (value::label_8)e.v2()); + return d.find(p)->second; + } + + private: + const std::map< std::pair<L, L>, unsigned >& d; + const G& g; + }; + } @@ -147,12 +182,13 @@ using namespace mln; using value::int_u8; - if (argc < 3) + if (argc < 4) usage(argv); const char* finput = argv[1]; const char* fsource = argv[2]; - const char* foutput = argc > 3 ? argv[3] : "zi.pgm"; + const unsigned lambda = atoi(argv[3]); + const char* foutput = argc > 4 ? argv[4] : "zi.pgm"; // Image loadin' image2d<bool> input; @@ -167,11 +203,17 @@ typedef image2d<L> I; I labels, iz, out; + image2d<unsigned> dmap; L nlabel; + typedef std::map< std::pair<L,L>, unsigned > map_t; labels = labeling::blobs(input, c4(), nlabel); - iz = transform::influence_zone_geodesic(labels, c4()); + initialize(iz, input); + initialize(dmap, input); + + map_t d = distances(labels, c4(), dmap, iz); + io::pgm::save(data::convert(int_u8(), dmap), "dmap.pgm"); io::pgm::save(iz, foutput); // I.Z Graph @@ -179,29 +221,33 @@ // Valuation of color distance - // util::array<value::rgb8> mean_colors; - // convert::from_to(labeling::compute(accu::stat::mean<value::rgb8>(), source, labels, nlabel), - // mean_colors); + /* + util::array<value::rgb8> mean_colors; + convert::from_to(labeling::compute(accu::stat::mean<value::rgb8>(), source, labels, nlabel), + mean_colors); - // typedef vertex_image<void, value::rgb8, util::graph> V; - // V v_ima = make::vertex_image(izg, mean_colors); - - // typedef edge_image<void, value::int_u8, util::graph> E; - // E e_ima = make::edge_image(v_ima, convert::tofun(dist_mean)); + typedef vertex_image<void, value::rgb8, util::graph> V; + V v_ima = make::vertex_image(izg, mean_colors); + typedef edge_image<void, value::int_u8, util::graph> E; + E e_ima = make::edge_image(v_ima, convert::tofun(dist_mean)); + */ // Valuation of geometric distance - // util::array<mln_psite_(I)> mass_centers; -// convert::from_to(labeling::compute(accu::center<mln_psite_(I)>(), labels, nlabel), -// mass_centers); + /* + util::array<mln_psite_(I)> mass_centers; + convert::from_to(labeling::compute(accu::center<mln_psite_(I)>(), labels, nlabel), + mass_centers); -// typedef vertex_image<void, mln_psite_(I), util::graph> V; -// V v_ima = make::vertex_image(izg, mass_centers); + typedef vertex_image<void, mln_psite_(I), util::graph> V; + V v_ima = make::vertex_image(izg, mass_centers); -// typedef edge_image<void, value::int_u8, util::graph> E; -// E e_ima = make::edge_image(v_ima, convert::tofun(distance<mln_psite_(I)>)); + typedef edge_image<void, value::int_u8, util::graph> E; + E e_ima = make::edge_image(v_ima, convert::tofun(distance<mln_psite_(I)>)); + */ // Valuation of distance between bounding boxes + /* util::array< box<mln_psite_(I)> > bboxes; convert::from_to(labeling::compute(accu::shape::bbox<mln_psite_(I)>(), labels, nlabel), bboxes); @@ -211,15 +257,23 @@ typedef edge_image<void, value::int_u8, util::graph> E; E e_ima = make::edge_image(v_ima, convert::tofun(distance_box)); + */ + + // Valuation of components geodesic distance. + typedef edge_image<void, unsigned, util::graph> E; + E e_ima = make::edge_image(izg, distance_t<util::graph, value::label_8>(d, izg)); + // Closing + e_ima = morpho::closing::height(e_ima, E::nbh_t (), lambda); + // WST. - typedef mln_ch_value_(V, L) v_ima_labels_t; - v_ima_labels_t v_ima_labels; - initialize(v_ima_labels, v_ima); + typedef vertex_image<void, L, util::graph> V; + p_vertices<util::graph> pv(izg); + V v_ima_labels(pv); - typedef mln_ch_value_(E, L) e_ima_wst_t; + typedef edge_image<void, L, util::graph> e_ima_wst_t; L nbasins; e_ima_wst_t e_ima_wst = morpho::watershed::flooding(e_ima, E::nbh_t (), nbasins); @@ -240,13 +294,19 @@ // Relabeling util::array<L> tr(nlabel); - mln_piter_(V) v(v_ima.domain()); + mln_piter_(V) v(v_ima_labels.domain()); for_all(v) { std::cout << v.id() << " : " << v_ima_labels(v) << std::endl; tr[v.id()] = v_ima_labels(v); } + //print distance + for (map_t::const_iterator it = d.begin(); it != d.end(); ++it) + std::cout << it->first.first << ", " + << it->first.second << " -> " + << it->second << std::endl; + labeling::relabel_inplace(iz, nlabel, tr); io::pgm::save(iz, "zi_wst.pgm");

1 0

milena r4328: Minor fixes linked to graph
by Edwin Carlinet 24 Jul '09

24 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-07-24 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor fixes linked to graph. * core/site_set/p_vertices.hh: Fix bug in constructor. * make/edge_image.hh: Add overload to compute edge_image from function v2v. * util/internal/graph_base.hh: Make typedef visibility to public. --- core/site_set/p_vertices.hh | 1 - make/edge_image.hh | 31 +++++++++++++++++++++++++++++++ util/internal/graph_base.hh | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) Index: trunk/milena/mln/core/site_set/p_vertices.hh =================================================================== --- trunk/milena/mln/core/site_set/p_vertices.hh (revision 4327) +++ trunk/milena/mln/core/site_set/p_vertices.hh (revision 4328) @@ -218,7 +218,6 @@ template <typename G, typename F> inline p_vertices<G,F>::p_vertices() - : f_(0) { } Index: trunk/milena/mln/make/edge_image.hh =================================================================== --- trunk/milena/mln/make/edge_image.hh (revision 4327) +++ trunk/milena/mln/make/edge_image.hh (revision 4328) @@ -54,6 +54,16 @@ mln::edge_image<void,V,G> edge_image(const Graph<G>& g, const fun::i2v::array<V>& fv); + /// Construct an edge image. + /// + /// \param[in] g A graph + /// \param[in] fv A function mapping edge ids to values. + /// + /// \return an edge image. + // + template <typename FV, typename G> + mln::edge_image<void, mln_result(FV), G> + edge_image(const Graph<G>& g, const Function_v2v<FV>& fv); /// Construct an edge image. @@ -122,6 +132,27 @@ return ima; } + template <typename FV, typename G> + mln::edge_image<void,mln_result(FV),G> + edge_image(const Graph<G>& g_, + const Function_v2v<FV>& fv) + { + trace::entering("make::edge_image"); + const G& g = exact(g_); + const FV& f = exact(fv); + mln_precondition(g.is_valid()); + + p_edges<G> pe(g); + typedef mln::edge_image<void,mln_result(FV),G> ima_t; + ima_t ima(pe); + + mln_piter(ima_t) e(ima.domain()); + for_all(e) + ima(e) = f(e.id()); + + trace::exiting("make::edge_image"); + return ima; + } template <typename FP, typename FV, typename G> Index: trunk/milena/mln/util/internal/graph_base.hh =================================================================== --- trunk/milena/mln/util/internal/graph_base.hh (revision 4327) +++ trunk/milena/mln/util/internal/graph_base.hh (revision 4328) @@ -64,7 +64,7 @@ class graph_base : public Graph<E> { - protected: + public: /// The type of a vertex. typedef util::vertex<E> vertex_t; /// The type of an edge.

1 0

4327: doc/Doxyfile.in: Add new example patterns.
by Guillaume Lazzara 24 Jul '09

24 Jul '09

--- milena/ChangeLog | 4 ++++ milena/doc/Doxyfile.in | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c1148cf..be74dc5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-17 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * doc/Doxyfile.in: Add new example patterns. + +2009-07-17 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * doc/Doxyfile.in: Enable the Seach engine and set the example name patterns. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 00b1886..94c0c9b 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -111,7 +111,8 @@ EXAMPLE_PATH = @top_srcdir@/milena/doc/examples \ @top_srcdir@/milena/doc/outputs \ @top_srcdir@/milena/doc/examples/split \ @top_srcdir@/milena/doc/outputs/split -EXAMPLE_PATTERNS = *.cc +EXAMPLE_PATTERNS = *.cc \ + *.cc.raw EXAMPLE_RECURSIVE = NO IMAGE_PATH = @top_srcdir@/milena/doc/img \ @top_srcdir@/milena/doc/figures \ -- 1.5.6.5

1 0

4326: src/Makefile.am: Handle tesseract dependency.
by Guillaume Lazzara 24 Jul '09

24 Jul '09

--- scribo/ChangeLog | 12 ++++++++---- scribo/src/Makefile.am | 14 ++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ba7f8c1..2e8acb0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-07-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * src/Makefile.am: Handle tesseract dependency. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> * src/preprocessing/Makefile.am: Remove a trailing blank line. @@ -8,7 +12,7 @@ * filter/thick_objects.hh: Fix. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Update Scribo. @@ -21,15 +25,15 @@ * text/recognition.hh: may store the recognized text into a file. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * tests/preprocessing/unskew.cc: fix test. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * preprocessing/unskew.hh: Fix an ambiguity. -2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Update calls to geom::rotate. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 381c567..a7b6289 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -62,11 +62,9 @@ table_rebuild_rank_SOURCES = table_rebuild_rank.cc text_in_photo_SOURCES = text_in_photo.cc thin_bboxes_SOURCES = thin_bboxes.cc -# FIXME: Should be enclosed in an Automake conditional like HAVE_TESSERACT. -#bin_PROGRAMS += recognition - -#recognition_SOURCES = recognition.cc -# FIXME: Do not use $(HOME). -#recognition_CXXFLAGS = -# -I$(HOME)/local/include $(HOME)/local/lib/libtesseract_full.a -#recognition_LDFLAGS = -lpthread +if HAVE_TESSERACT + bin_PROGRAMS += recognition + recognition_SOURCES = recognition.cc + recognition_CPPFLAGS = $(AM_CPPFLAGS) $(TESSERACT_CPPFLAGS) + recognition_LDFLAGS = $(AM_LDFLAGS) $(TESSERACT_LDFLAGS) -lpthread +endif HAVE_TESSERACT -- 1.5.6.5

1 0

4325: configure.ac: Look for tesseract during configure.
by Guillaume Lazzara 24 Jul '09

24 Jul '09

--- ChangeLog | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0b1eba..5ded2bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-24 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: Look for tesseract during configure. + 2009-07-17 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * lrde-upload.sh: Update directory names and paths. diff --git a/configure.ac b/configure.ac index ec6e79c..782ddbd 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,10 @@ OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) +# Tesseract +OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) + + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## -- 1.5.6.5

1 0

r4319: Minor improvments in IZ method
by Edwin Carlinet 23 Jul '09

23 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-07-23 Edwin Carlinet <carlinet(a)lrde.epita.fr> Minor improvments in IZ method. * edwin/exec/zi.cc: Use distance between bbox instead of distance between mass centers. --- zi.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 9 deletions(-) Index: trunk/milena/sandbox/edwin/exec/zi.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/zi.cc (revision 4318) +++ trunk/milena/sandbox/edwin/exec/zi.cc (revision 4319) @@ -97,11 +97,34 @@ template <typename P> inline value::int_u8 - doublelol(const P& p1, const P& p2) + distance(const P& p1, const P& p2) { return convert::to<value::int_u8>(norm::l1_distance(p1.to_vec(), p2.to_vec())); } + + inline + value::int_u8 + distance_box(const box<point2d>& b1, const box<point2d>& b2) + { + const box<point2d> *btop, *bdown, *bleft, *bright; + + btop = b1.pmin().row() < b2.pmin().row() ? &b1 : &b2; + bdown = b1.pmax().row() > b2.pmax().row() ? &b1 : &b2; + bleft = b1.pmin().col() < b2.pmin().col() ? &b1 : &b2; + bright = b1.pmax().col() > b2.pmax().col() ? &b1 : &b2; + + int w_dist = (bright->pmax().col() - bleft->pmin().col()) - + (bright->pmax().col() - bright->pmin().col()) - + (bleft->pmax().col() - bleft->pmin().col()); + + int h_dist = (bdown->pmax().row() - btop->pmin().row()) - + (bdown->pmax().row() - bdown->pmin().row()) - + (btop->pmax().row() - btop->pmin().row()); + + return math::max(math::max(w_dist, h_dist), 0); + } + } @@ -154,7 +177,8 @@ // I.Z Graph util::graph izg = make::influence_zone_adjacency_graph(iz, c4(), nlabel); - // -- Color distance + + // Valuation of color distance // util::array<value::rgb8> mean_colors; // convert::from_to(labeling::compute(accu::stat::mean<value::rgb8>(), source, labels, nlabel), // mean_colors); @@ -164,17 +188,30 @@ // typedef edge_image<void, value::int_u8, util::graph> E; // E e_ima = make::edge_image(v_ima, convert::tofun(dist_mean)); - // -- Color distance - util::array<mln_psite_(I)> mass_centers; - convert::from_to(labeling::compute(accu::center<mln_psite_(I)>(), labels, nlabel), - mass_centers); - typedef vertex_image<void, mln_psite_(I), util::graph> V; - V v_ima = make::vertex_image(izg, mass_centers); + // Valuation of geometric distance + // util::array<mln_psite_(I)> mass_centers; +// convert::from_to(labeling::compute(accu::center<mln_psite_(I)>(), labels, nlabel), +// mass_centers); + +// typedef vertex_image<void, mln_psite_(I), util::graph> V; +// V v_ima = make::vertex_image(izg, mass_centers); + +// typedef edge_image<void, value::int_u8, util::graph> E; +// E e_ima = make::edge_image(v_ima, convert::tofun(distance<mln_psite_(I)>)); + + // Valuation of distance between bounding boxes + util::array< box<mln_psite_(I)> > bboxes; + convert::from_to(labeling::compute(accu::shape::bbox<mln_psite_(I)>(), labels, nlabel), + bboxes); + + typedef vertex_image<void, box<mln_psite_(I)>, util::graph> V; + V v_ima = make::vertex_image(izg, bboxes); typedef edge_image<void, value::int_u8, util::graph> E; - E e_ima = make::edge_image(v_ima, convert::tofun(doublelol<mln_psite_(I)>)); + E e_ima = make::edge_image(v_ima, convert::tofun(distance_box)); + // WST.

1 0