April 2008 - Olena-patches

[Olena] #122: [TRAITS] image_if_base
by Olena 28 May '09

28 May '09

#122: [TRAITS] image_if_base ---------------------+------------------------------------------------------ Reporter: duhamel | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ---------------------+------------------------------------------------------ In source:trunk/milena/mln/core/internal/image_if_base.hh data trait is suspect. For example an image_if from an image1d has always data trait raw ! -- Ticket URL: <https://trac.lrde.org/olena/ticket/122> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 1

[Olena] #131: Implement area closing and attribue closing
by Olena 28 May '09

28 May '09

#131: Implement area closing and attribue closing --------------------------------------------------------+------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Static 1.0 Component: Milena | Version: 1.0 Keywords: completion dual naming routines algorithms | --------------------------------------------------------+------------------- Currently, these files are available: * source:trunk/morpho/mln/opening_area.hh * source:trunk/morpho/mln/opening_attribute.hh but there is no equivalent for closings. Implement them. BTW, these files and their routines are called `opening_area` and `opening_attribute`, which is not elegant. Of course the goal is to put forward the opening term; but IMHO, we should use namespace to do this, not prefixes. Or rename them to `area_opening` and `attribute_opening`, which are much more natural. Anyway, any further discussion on the subject of naming algorithms should be carried on in another ticket. -- Ticket URL: <https://trac.lrde.org/olena/ticket/131> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 2

[Olena] #140: Add points having floating-point coordinates
by Olena 18 May '09

18 May '09

#140: Add points having floating-point coordinates ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Name regular instances `point1df`, `point2df` and `point3df`. (N.B.: Aroune will need them so as to build the 3-d surface graph from a set of triangles.) -- Ticket URL: <https://trac.lrde.org/olena/ticket/140> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 1

[Olena] #130: Don not pass neighborhoods as argument to algorithms
by Olena 14 May '09

14 May '09

#130: Don not pass neighborhoods as argument to algorithms ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Neighborhoods shall be bound to images: they are a property of them. Hence an algorithm (at least a facade) shall not accept an image along with an ''external'' neighborhood. Most of the time, these algorithms are based on windows improperly called neighborhoods. Here is the list of files to revamp, as of revision 1663: * source:trunk/labeling/level.spe.hh * source:trunk/labeling/regional_maxima.hh * source:trunk/labeling/regional_minima.hh * source:trunk/make/voronoi.hh * source:trunk/milena/mln/geom/labeling/blobs.hh * source:trunk/milena/mln/geom/seeds2tiling_roundness.hh * source:trunk/milena/mln/labeling/background.hh * source:trunk/milena/mln/labeling/flat_zones.hh * source:trunk/milena/mln/labeling/foreground.hh * source:trunk/milena/mln/labeling/level.hh * source:trunk/morpho/Rd.hh * source:trunk/morpho/dilation.hh * source:trunk/morpho/opening_area.hh * source:trunk/morpho/opening_attribute.hh -- Ticket URL: <https://trac.lrde.org/olena/ticket/130> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

2 11

[Olena] #127: Generalize the definition of the Sobel gradient
by Olena 17 Jun '08

17 Jun '08

#127: Generalize the definition of the Sobel gradient -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: trivial | Milestone: Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- For the moment (rev. 1656), the Sobel gradient only works on 2-D images. We could generalize its definition to n-D (regular) images. For instance, a 3-D version is mentioned in http://www.aravind.ca/cs788h_Final_Project/gradient_estimators.htm. -- Ticket URL: <https://trac.lrde.org/olena/ticket/127> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

1 1

[Olena] #135: Name Confilts between util::node and util::node.
by Olena 08 Jun '08

08 Jun '08

#135: Name Confilts between util::node and util::node. -----------------------+---------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0ß Component: Milena | Version: 1.0 Keywords: | -----------------------+---------------------------------------------------- We have two util::node : one for the graph implementation and also one for the tree. see source:/trunk/milena/mln/util/tree.hh and source:/trunk/milena/mln/util/internal/graph_base.hh -- Ticket URL: <https://trac.lrde.org/olena/ticket/135> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 4

[Olena] #137: Write more attribute (connected) filters
by Olena 03 Jun '08

03 Jun '08

#137: Write more attribute (connected) filters ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- For instance, * a volume opening/closing; * a filter based on the height of a component; * etc. -- Ticket URL: <https://trac.lrde.org/olena/ticket/137> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

milena r1908: DT in canevas word plus some addons in original psn
by Etienne FOLIO 30 Apr '08

30 Apr '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-04-30 Etienne FOLIO <folio(a)lrde.epita.fr> DT in canevas word plus some addons in original psn. * sandbox/folio/canevas_dt.hh: Canevas for DT algorithm. * sandbox/folio/dt.cc: Main test file. * sandbox/folio/dt.hh: DT using canevas (two algorithms currently identical). * sandbox/folio/dt.spe.hh: DT using canevas spe file. * sandbox/folio/psn.cc: Some addons (max value...). --- canevas_dt.hh | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dt.cc | 59 ++++++++++++++ dt.hh | 101 +++++++++++++++++++++++++ dt.spe.hh | 123 ++++++++++++++++++++++++++++++ psn.cc | 119 ++++++++++++----------------- 5 files changed, 563 insertions(+), 70 deletions(-) Index: trunk/milena/sandbox/folio/psn.cc =================================================================== --- trunk/milena/sandbox/folio/psn.cc (revision 1907) +++ trunk/milena/sandbox/folio/psn.cc (revision 1908) @@ -33,9 +33,12 @@ # include <cmath> # include <mln/core/concept/image.hh> +# include <mln/make/w_window.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/literal/zero.hh> +# include <iostream> + namespace mln { @@ -45,14 +48,15 @@ /*! Propagation using a single neighborhood (PSN). * * \param[in] input_ The input image. - * \param[in] chamfer The chamfer window to use for distance calcul. - * \return A pair <distance map, closest point map>. + * \param[in] nbh The chamfer window to use for distance calcul. + * \param[in] max Max value of the output image. + * \return A distance map. * * \pre \p img has to be initialized. */ template<typename I, typename N> mln_ch_value(I, unsigned) - psn(const Image& input_, const N& nbh); + psn(const Image& input_, const N& nbh, unsigned max); # ifndef MLN_INCLUDE_ONLY @@ -60,31 +64,6 @@ namespace impl { - - template <typename BP> - class compare - { - public: - bool - operator()(const BP& lhs, const BP& rhs) const - { - return lhs.second > rhs.second; - } - }; - - template <typename D> - unsigned - sq(const D& dp) - { - unsigned res = 0; - - for (unsigned i = 0; i < D::dim; ++i) - res += std::abs(dp[i]); // FIXME: dp[i] * dp[i]; - - return res; - } - - } // end of namespace mln::dt::impl @@ -94,72 +73,72 @@ template<typename I, typename N> inline mln_ch_value(I, unsigned) - psn(const Image& input_, const N& nbh) + psn(const Image& input_, const N& nbh, unsigned max) { + // Preconditions. const I& input = exact(input_); mln_precondition(input.has_data()); - mln_ch_value(I, unsigned) D; - initialize(D, input); + // Types. + typedef mln_point(I) point; - static const unsigned M = 666; // FIXME + // Initialization of output. + mln_ch_value(I, unsigned) output; + initialize(output, input); // Initialization. - typedef mln_point(I) point; - typedef mln_dpoint(I) dpoint; - typedef std::pair<point, dpoint> BP; + // { - std::map<unsigned, std::queue<BP> > bucket; + std::map<unsigned, std::queue<point> > bucket; unsigned bucket_size = 0; mln_fwd_piter(I) p(input.domain()); for_all(p) if (input(p)) { - D(p) = literal::zero; - bucket[0].push(BP(p, literal::zero)); + output(p) = literal::zero; + bucket[0].push(p); ++bucket_size; } else - D(p) = M; + output(p) = max; unsigned d = 0; + // } + while (bucket_size != 0) { - std::queue<BP>& bucket_d = bucket[d]; - + std::queue<point> bucket_d = bucket[d]; while (! bucket_d.empty()) { - point p = bucket_d.front().first; - dpoint dp = bucket_d.front().second; - + point p = bucket_d.front(); bucket_d.pop(); --bucket_size; - if (D(p) == d) + if (output(p) == d) { - mln_niter(N) n_(nbh, p); + mln_qiter(N) n(nbh, p); - for_all(n_) - if (D.has(n_)) + for_all(n) + if (output.has(n)) { - dpoint n = n_ - p; - unsigned newD = impl::sq(dp + n); + unsigned newOut = output(p) + n.w(); - if (newD < D(p + n)) // p + n = p + n_ - p = n_ + if (newOut < output(n)) { - D(n_) = newD; - bucket[newD].push(BP(p + n, dp + n)); + output(n) = newOut; + bucket[newOut].push(n); ++bucket_size; } } } } + bucket.erase(d); ++d; } - return D; + return output; } # endif // ! MLN_INCLUDE_ONLY @@ -190,27 +169,27 @@ { using namespace mln; -// image2d<bool> ima(5,5); -// bool vals[] = { 1, 1, 1, 0, 0, -// 0, 0, 1, 0, 0, -// 0, 0, 1, 0, 0, -// 0, 0, 0, 0, 0, -// 0, 0, 0, 0, 0 }; - - image2d<bool> ima(3,3); - bool vals[] = { 1, 0, 0, - 0, 0, 0, - 0, 0, 0}; + image2d<bool> ima(5,5); + bool vals[] = { 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0}; level::fill(ima, vals); - image2d<bool> msk(3,3); - bool rest[] = { 1, 0, 1, - 1, 0, 1, - 1, 1, 1}; + image2d<bool> msk(5,5); + bool rest[] = { 1, 0, 1, 1, 1, + 1, 0, 1, 1, 1, + 1, 1, 0, 0, 0, + 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1}; level::fill(msk, rest); + int ws[] = { 2, 1, 2, + 1, 0, 1, + 2, 1, 2 }; image2d<unsigned> out; - out = dt::psn(ima | pw::value(msk), c4()); + out = dt::psn(ima | pw::value(msk), make::w_window2d(ws), 50); debug::println(ima | pw::value(msk)); debug::println(out); Index: trunk/milena/sandbox/folio/dt.hh =================================================================== --- trunk/milena/sandbox/folio/dt.hh (revision 0) +++ trunk/milena/sandbox/folio/dt.hh (revision 1908) @@ -0,0 +1,101 @@ +/*! + * \file psn.cc + * \author ornthalas <ornthalas(a)gmail.com> + */ + +#ifndef DT_HH +# define DT_HH + +// The 'fastest' specialization is in: +# include "dt.spe.hh" + +namespace mln +{ + + namespace dt + { + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt(const Image& input_, const N& nbh, unsigned max); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + // Generic functor. + + template <typename I_, typename N_, typename L_> + struct dt_functor + { + typedef I_ I; + typedef N_ N; + typedef L_ L; + + const I& input; + const N& nbh; + unsigned max; + + dt_functor(const I_& input, const N_& nbh, const unsigned max) + : input(input), + nbh(nbh), + max(max) + {} + + void init() {} + }; + + + // Generic implementation. + + namespace generic + { + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt_(const Image& input, const N& nbh, unsigned max) + { + trace::entering("dt::impl::generic::dt_"); + + typedef dt_functor<I, N, L> F; + F f(input, nbh, max); + canvas::dt<F> run(f); + + trace::exiting("dt::impl::generic::dt_"); + return run.output; + } + + } // end of namespace mln::dt::impl::generic + + } // end of namespace mln::dt::impl + + + // Facade. + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt(const Image& input, const N& nbh, unsigned max) + { + trace::entering("dt::dt"); + mln_precondition(exact(input).has_data()); + + mln_ch_value(I, L) output = + impl::dt_(mln_trait_image_speed(I)(), + exact(input), nbh, max); + + trace::exiting("dt::dt"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::dt + +} // end of namespace mln + +#endif // !DT_HH Index: trunk/milena/sandbox/folio/canevas_dt.hh =================================================================== --- trunk/milena/sandbox/folio/canevas_dt.hh (revision 0) +++ trunk/milena/sandbox/folio/canevas_dt.hh (revision 1908) @@ -0,0 +1,231 @@ +/*! + * \file canevas_dt.hh + * \author ornthalas <ornthalas(a)gmail.com> + */ + +#ifndef CANEVAS_DT_HH +# define CANEVAS_DT_HH + +# include <queue> +# include <map> +# include <mln/core/concept/image.hh> +# include <mln/make/w_window.hh> +# include <mln/literal/zero.hh> + +# include <mln/core/concept/neighborhood.hh> + +namespace mln +{ + + namespace canvas + { + + // General version. + + template <typename F> + struct dt + { + // Functor. + F& f; + + typedef typename F::I I; + typedef typename F::N N; + typedef typename F::L L; + typedef mln_point(I) point; + + mln_ch_value(I, L) output; + + // Ctor. + dt(F& f); + + void init(); + void run(); + + std::map<unsigned, std::queue<point> > bucket; + unsigned bucket_size; + + unsigned current_distance; + }; + + template <typename F> + struct dt_fastest + { + // Functor. + F& f; + + typedef typename F::I I; + typedef typename F::N N; + typedef typename F::L L; + typedef mln_point(I) point; + + mln_ch_value(I, L) output; + + // Ctor. + dt_fastest(F& f); + + void init(); + void run(); + + std::map<unsigned, std::queue<point> > bucket; + unsigned bucket_size; + + unsigned current_distance; + }; + +# ifndef MLN_INCLUDE_ONLY + + /*-------------. + | canvas::dt. | + `-------------*/ + + template <typename F> + dt<F>::dt(F& f) + : f(f), + bucket_size(0), + current_distance(0) + { + trace::entering("canvas::dt"); + + this->init(); + this->run(); + + trace::exiting("canvas::dt"); + } + + template <typename F> + void + dt<F>::init() + { + this->f.init(); + initialize(this->output, this->f.input); + + mln_fwd_piter(I) p(this->f.input.domain()); + for_all(p) + if (this->f.input(p)) + { + this->output(p) = literal::zero; + this->bucket[0].push(p); + ++this->bucket_size; + } + else + this->output(p) = this->max; + } + + template <typename F> + void + dt<F>::run() + { + while (this->bucket_size != 0) + { + std::queue<point> bucket_d = this->bucket[this->current_distance]; + while (! bucket_d.empty()) + { + point p = bucket_d.front(); + bucket_d.pop(); + --bucket_size; + + if (this->output(p) == this->current_distance) + { + mln_qiter(N) n(this->nbh, p); + + for_all(n) + if (this->output.has(n)) + { + unsigned new_out = this->output(p) + n.w(); + + if (new_out < this->output(n)) + { + this->output(n) = new_out; + this->bucket[new_out].push(n); + ++this->bucket_size; + } + } + } + } + this->bucket.erase(this->current_distance); + ++this->current_distance; + } + } + + /*---------------------. + | canvas::dt_fastest. | + `---------------------*/ + template <typename F> + dt_fastest<F>::dt_fastest(F& f) + : f(f), + bucket_size(0), + current_distance(0) + { + trace::entering("canvas::dt"); + + this->init(); + this->run(); + + trace::exiting("canvas::dt"); + } + + template <typename F> + void + dt_fastest<F>::init() + { + this->f.init(); + initialize(this->output, this->f.input); + + mln_fwd_piter(I) p(this->f.input.domain()); + for_all(p) + if (this->f.input(p)) + { + this->output(p) = literal::zero; + this->bucket[0].push(p); + ++this->bucket_size; + } + else + this->output(p) = this->max; + } + + template <typename F> + void + dt_fastest<F>::run() + { + while (this->bucket_size != 0) + { + std::queue<point> bucket_d = this->bucket[this->current_distance]; + while (! bucket_d.empty()) + { + point p = bucket_d.front(); + bucket_d.pop(); + --bucket_size; + + if (this->output(p) == this->current_distance) + { + mln_qiter(N) n(this->nbh, p); + + for_all(n) + if (this->output.has(n)) + { + unsigned new_out = this->output(p) + n.w(); + + if (new_out < this->output(n)) + { + this->output(n) = new_out; + this->bucket[new_out].push(n); + ++this->bucket_size; + } + } + } + } + this->bucket.erase(this->current_distance); + ++this->current_distance; + } + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::canvas + +} // end of namespace mln + + +#endif // ! MLN_CANVAS_DT_HH Index: trunk/milena/sandbox/folio/dt.cc =================================================================== --- trunk/milena/sandbox/folio/dt.cc (revision 0) +++ trunk/milena/sandbox/folio/dt.cc (revision 1908) @@ -0,0 +1,59 @@ +/*! + * \file dt.cc + * \author ornthalas <ornthalas(a)gmail.com> + */ + +#include <iostream> +#include <mln/core/image2d.hh> +#include <mln/debug/println.hh> +#include <mln/make/win_chamfer.hh> +#include <mln/level/fill.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/level/stretch.hh> +#include <mln/value/int_u8.hh> + +#include <mln/core/sub_image.hh> +#include <mln/core/image_if.hh> +#include <mln/pw/value.hh> + +#include "dt.hh" + +int main() +{ + using namespace mln; + + image2d<bool> ima(5,5); + bool vals[] = { 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0}; + level::fill(ima, vals); + + image2d<bool> msk(5,5); + bool rest[] = { 1, 0, 1, 1, 1, + 1, 0, 1, 1, 1, + 1, 1, 0, 0, 0, + 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1}; + level::fill(msk, rest); + + int ws[] = { 2, 1, 2, + 1, 0, 1, + 2, 1, 2 }; + image2d<unsigned> out; + out = dt::dt(ima | pw::value(msk), make::w_window2d(ws), 50); + + debug::println(ima | pw::value(msk)); + debug::println(out); + +// image2d<bool> ima = io::pbm::load("../../img/c01.pbm"); + +// image2d<value::int_u8> out2(out.domain()); +// level::stretch(out, out2); + +// io::pgm::save(out2, "out.pgm"); +} Index: trunk/milena/sandbox/folio/dt.spe.hh =================================================================== --- trunk/milena/sandbox/folio/dt.spe.hh (revision 0) +++ trunk/milena/sandbox/folio/dt.spe.hh (revision 1908) @@ -0,0 +1,123 @@ +/*! + * \file test_psn.spe.hh + * \author ornthalas <ornthalas(a)gmail.com> + */ + +#ifndef DT_SPE_HH +# define DT_SPE_HH + +# ifndef DT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! DT_HH + +# include "canevas_dt.hh" + +namespace mln +{ + + namespace dt + { + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt(const Image& input_, const N& nbh, unsigned max); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + + // Fwd decl of the Generic version. + + namespace generic + { + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt_(const Image& input_, const N& nbh, unsigned max); + + } // end of namespace mln::dt::impl::generic + + + // Fastest functor. + + template <typename I_, typename N_, typename L_> + struct dt_fasfunctor + { + typedef I_ I; + typedef N_ N; + typedef L_ L; + + const I& input; + const N& nbh; + unsigned max; + + dt_fasfunctor(const I_& input, const N_& nbh, const unsigned max) + : input(input), + nbh(nbh), + max(max) + {} + + void init() {} + }; + + + // Fastest implementation. + + namespace fastest + { + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt_(const I& input, const N& nbh, unsigned max) + { + trace::entering("dt::impl::dt_fas"); + + typedef dt_fasfunctor<I,N,L> F; + F f(input, nbh, max); + canvas::dt_fastest<F> run(f); + + trace::exiting("dt::impl::dt_fas"); + return run.output; + } + + } // end of namespace mln::dt::impl::fastest + + + // Disjunction between "fastest" and "not fastest". + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt_(trait::image::speed::any, + const I& input, const N& nbh, unsigned max) + { + return generic::dt_(input, nbh, max); + } + + template<typename I, typename N, typename L> + inline + mln_ch_value(I, L) + dt_(trait::image::speed::fastest, + const I& input, const N& nbh, unsigned max) + { + return fastest::dt_(input, nbh, max); + } + + + } // end of namespace mln::dt::impl + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::dt + +} // end of namespace mln + + +#endif // !DT_SPE_HH

1 0

1906: Run image encoded by values: fix some mistakes.
by Nicolas Ballas 30 Apr '08

30 Apr '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Run image encoded by values: fix some mistakes. * tests/core/value_enc_image.cc: Update. * mln/core/value_enc_image.hh: Fix mistakes. mln/core/value_enc_image.hh | 7 +++---- tests/core/value_enc_image.cc | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 1906) +++ tests/core/value_enc_image.cc (working copy) @@ -32,16 +32,46 @@ #include <mln/core/image2d.hh> #include <mln/core/value_enc_image.hh> +#include <iostream> int main() { using namespace mln; - /// Basic tests + /// Basic test { typedef value_enc_image<point2d, int> ima_type; + typedef p_runs_<point2d> runs; - ima_type ima(); + p_runs_<point2d> pruns0; + p_runs_<point2d> pruns1; + p_runs_<point2d> pruns2; + + pruns0.insert(p_run<point2d>(make::point2d(0, 0), 2)); + pruns1.insert(p_run<point2d>(make::point2d(2, 4), 7)); + pruns1.insert(p_run<point2d>(make::point2d(18, 42), 5)); + pruns1.insert(p_run<point2d>(make::point2d(50, 76), 2)); + pruns1.insert(p_run<point2d>(make::point2d(17,40), 6)); + pruns2.insert(p_run<point2d>(make::point2d(10,10), 5)); + + ima_type ima; + ima.insert(pruns0, 0); + ima.insert(pruns2, 2); + ima.insert(pruns1, 1); + + mln_piter_(ima_type) piter (ima.domain()); + int i = 0; + int nb = 0; + for_all(piter) + { + assert(ima(piter) == i); + + ++nb; + if (nb == 2) + i = 2; + if (nb == 7) + i = 1; + } } } Index: mln/core/value_enc_image.hh --- mln/core/value_enc_image.hh (revision 1906) +++ mln/core/value_enc_image.hh (working copy) @@ -72,7 +72,7 @@ template <typename P, typename T> struct image_< value_enc_image<P,T> > : - default_image_< T, rle_image<P,T> > + default_image_< T, value_enc_image<P,T> > { typedef trait::image::category::primary category; @@ -98,7 +98,7 @@ */ template <typename P, typename T> class value_enc_image : - public internal::image_primary_< pset_array_psite< runs_psite >, + public internal::image_primary_< pset_array< p_runs_ >, value_enc_image<P, T> > { public: @@ -116,7 +116,6 @@ /// Skeleton. typedef value_enc_image< tag::psite_, tag::value_<T> > skeleton; - value_enc_image(); /// Add a new range to the image. @@ -202,7 +201,7 @@ bool value_enc_image<P, T>::has(const typename value_enc_image<P, T>::psite& site) const { - return this->data_.domain_.has(site); + return this->data_->domain_.has(site); } template <typename P, typename T>

1 0

1906: Add run image type encoded by image type.
by Nicolas Ballas 29 Apr '08

29 Apr '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Add run image type encoded by image type. * tests/core/value_enc_image.cc: tests. * mln/core/pset_array.hh: Fix a mistake. * mln/core/value_enc_image.hh: New image type. mln/core/pset_array.hh | 4 mln/core/value_enc_image.hh | 243 ++++++++++++++++++++++++++++++++++++++++++ tests/core/value_enc_image.cc | 47 ++++++++ 3 files changed, 292 insertions(+), 2 deletions(-) Index: tests/core/value_enc_image.cc --- tests/core/value_enc_image.cc (revision 0) +++ tests/core/value_enc_image.cc (revision 0) @@ -0,0 +1,47 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/core/rle_image.cc + * + * \brief Test on mln::core::value_enc_image.hh. + */ + +#include <mln/core/image2d.hh> +#include <mln/core/value_enc_image.hh> + + +int main() +{ + using namespace mln; + + /// Basic tests + { + typedef value_enc_image<point2d, int> ima_type; + + ima_type ima(); + } +} Index: mln/core/pset_array.hh --- mln/core/pset_array.hh (revision 1905) +++ mln/core/pset_array.hh (working copy) @@ -129,8 +129,8 @@ bool pset_array<Pset>::has(const typename pset_array<Pset>::psite& ps) const { - mln_precondition(ps.to_index() < con_.size()); - return con_[ps.to_index()].has(ps.to_psite()); + return ps.to_index() < con_.size() && + con_[ps.to_index()].has(ps.to_psite()); } template <typename Pset> Index: mln/core/value_enc_image.hh --- mln/core/value_enc_image.hh (revision 0) +++ mln/core/value_enc_image.hh (revision 0) @@ -0,0 +1,243 @@ +// 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_VALUE_ENC_IMAGE_CC_ +# define MLN_CORE_VALUE_ENC_IMAGE_CC_ + +/*! \file mln/core/value_enc_image.hh + * + * \brief FIXME + */ + +# include <mln/core/internal/image_primary.hh> + +# include <mln/core/pset_array.hh> +# include <mln/core/pset_array_psite.hh> +# include <mln/core/p_runs.hh> + +# include <vector> + +namespace mln +{ + + // Fwd decl. + template <typename P, typename T> struct value_enc_image; + + + namespace internal + { + + /// \internal Data structure for \c mln::rle_image<P,T>. + template <typename P, typename T> + struct data_< value_enc_image<P, T> > + { + data_(); + + /// Image values. + std::vector<T> values_; + + /// domain of the image + pset_array< p_runs_ > domain_; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename P, typename T> + struct image_< value_enc_image<P,T> > : + default_image_< T, rle_image<P,T> > + { + typedef trait::image::category::primary category; + + typedef trait::image::access::browsing access; + + // FIXME: Put the right dimension. + typedef trait::image::space::two_d space; + + typedef trait::image::size::regular size; + typedef trait::image::support::aligned support; + + typedef trait::image::border::none border; + typedef trait::image::data::linear data; + typedef trait::image::io::read_only io; + typedef trait::image::speed::slow speed; + }; + + } // end of namespace mln::trait + + + /*! \brief Value encoded image. + * FIXME + */ + template <typename P, typename T> + class value_enc_image : + public internal::image_primary_< pset_array_psite< runs_psite >, + value_enc_image<P, T> > + { + public: + + /// Value related typedefs + typedef T value; + typedef T& lvalue; + typedef const T rvalue; + typedef mln::value::set<T> vset; + + /// Domain related typedefs + typedef pset_array_psite< runs_psite > psite; + typedef pset_array< p_runs_ > pset; + + /// Skeleton. + typedef value_enc_image< tag::psite_, tag::value_<T> > skeleton; + + + value_enc_image(); + + /// Add a new range to the image. + void insert(const p_runs_& pr, T value); + + /*! \brief Tell if the image has the given point site. + * + * \return True if the image has the point site, else false. + */ + bool has(const psite& ps) const; + + /// Read-only access to the image value located at the site \site. + rvalue operator() (const psite& site) const; + + /// Read-write access to the image value located at the site \site. + lvalue operator() (const psite& site); + + /// Test if this image has been initialized. + bool has_data() const; + + /// Give the set of values of the image. + const vset& values() const; + + /// Give the definition domain. + const pset& domain() const; + + }; + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< value_enc_image<P, T> > + + template <typename P, typename T> + inline + data_< value_enc_image<P,T> >::data_() + { + } + + } // end of namespace mln::internal + + + template <typename P, typename T> + inline + value_enc_image<P, T>::value_enc_image() + { + this->data_ = new internal::data_< value_enc_image<P,T> >(); + } + + template <typename P, typename T> + inline + bool + value_enc_image<P, T>::has_data() const + { + return this->data_->values_.size() != 0; + } + + template <typename P, typename T> + inline + const typename value_enc_image<P, T>::vset& + value_enc_image<P, T>::values() const + { + return vset::the(); + } + + template <typename P, typename T> + inline + void + value_enc_image<P, T>::insert(const p_runs_& pr, T value) + { + if (!this->has_data()) + this->data_ = new internal::data_< value_enc_image<P,T> >(); + + this->data_->domain_.insert(pr); + this->data_->values_.push_back(value); + } + + template <typename P, typename T> + inline + bool + value_enc_image<P, T>::has(const typename value_enc_image<P, T>::psite& site) const + { + return this->data_.domain_.has(site); + } + + template <typename P, typename T> + inline + typename value_enc_image<P, T>::rvalue + value_enc_image<P, T>::operator() (const typename value_enc_image<P, T>::psite& site) + const + { + mln_precondition(this->has(site)); + + return this->data_->values_[site.to_index()]; + } + + template <typename P, typename T> + inline + typename value_enc_image<P, T>::lvalue + value_enc_image<P, T>::operator() (const typename value_enc_image<P, T>::psite& site) + { + mln_precondition(this->has(site)); + + return this->data_->values_[site.to_index()]; + } + + template <typename P, typename T> + inline + const typename value_enc_image<P, T>::pset& + value_enc_image<P, T>::domain() const + { + return this->data_->domain_; + } + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln + + +#endif // ! MLN_CORE_VALUE_ENC_IMAGE_CC_

1 0