Olena-patches May 2009

olena-patches@lrde.epita.fr

11 participants
312 discussions

by Edwin Carlinet

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim project fixes. * edwin/inim/inim.cc: Try to fix bug linked to image noise border. --- inim.cc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/edwin/inim/inim.cc =================================================================== --- trunk/milena/sandbox/edwin/inim/inim.cc (revision 3786) +++ trunk/milena/sandbox/edwin/inim/inim.cc (revision 3787) @@ -25,6 +25,7 @@ #include <mln/transform/distance_front.hh> #include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> +#include <mln/morpho/attribute/volume.hh> #include <mln/make/w_window2d_int.hh> /* io */ @@ -47,6 +48,8 @@ /* Draw debug */ #include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/level/convert.hh> /* std */ #include <string> @@ -154,7 +157,7 @@ if (mydebug) { dsp("Distance geodesic"); - io::pgm::save(input, "distance.pgm"); + } /* Component tree creation */ @@ -166,7 +169,7 @@ /* Compute Attribute On Image */ typedef morpho::attribute::bbox bbox_t; - typedef morpho::attribute::card card_t; + typedef morpho::attribute::volume card_t; typedef mln_ch_value_(I, double) A; mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); @@ -245,14 +248,28 @@ io::ppm::save(output, "label.pgm"); /* Now store output image image */ - O out; + O out, distance; initialize(out, input); + distance = level::convert(value::rgb8 (), input); data::fill(out, literal::black_t()); data::paste(output | pw::value(input_), out); + { + mln_piter_(p_array<mln_psite_(I)>) it(obj_array); + for_all(it) + { + std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << std::endl; + + draw::box(out, attr_image(it), literal::red_t ()); + draw::box(distance, attr_image(it), literal::red_t ()); + } + } + if (mydebug) { dsp("Mask input"); } + io::ppm::save(distance, "distance.pgm"); io::ppm::save(out, "output.pgm"); }

16 years, 1 month

[PATCH 26/31] Inim project fixes.

by Roland Levillain

* edwin/inim/inim.cc: Try to fix bug linked to image noise border. --- milena/sandbox/ChangeLog | 5 +++++ milena/sandbox/edwin/inim/inim.cc | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 1fd08b0..b83f3fc 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,8 @@ +2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Inim project fixes. + * edwin/inim/inim.cc: Try to fix bug linked to image noise border. + 2009-05-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some code to extend the work of Etienne and Fred. diff --git a/milena/sandbox/edwin/inim/inim.cc b/milena/sandbox/edwin/inim/inim.cc index f38130d..748aa10 100644 --- a/milena/sandbox/edwin/inim/inim.cc +++ b/milena/sandbox/edwin/inim/inim.cc @@ -25,6 +25,7 @@ #include <mln/transform/distance_front.hh> #include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> +#include <mln/morpho/attribute/volume.hh> #include <mln/make/w_window2d_int.hh> /* io */ @@ -47,6 +48,8 @@ /* Draw debug */ #include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/level/convert.hh> /* std */ #include <string> @@ -154,7 +157,7 @@ int main(int argc, char* argv[]) if (mydebug) { dsp("Distance geodesic"); - io::pgm::save(input, "distance.pgm"); + } /* Component tree creation */ @@ -166,7 +169,7 @@ int main(int argc, char* argv[]) /* Compute Attribute On Image */ typedef morpho::attribute::bbox bbox_t; - typedef morpho::attribute::card card_t; + typedef morpho::attribute::volume card_t; typedef mln_ch_value_(I, double) A; mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); @@ -245,14 +248,28 @@ int main(int argc, char* argv[]) io::ppm::save(output, "label.pgm"); /* Now store output image image */ - O out; + O out, distance; initialize(out, input); + distance = level::convert(value::rgb8 (), input); data::fill(out, literal::black_t()); data::paste(output | pw::value(input_), out); + { + mln_piter_(p_array<mln_psite_(I)>) it(obj_array); + for_all(it) + { + std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << std::endl; + + draw::box(out, attr_image(it), literal::red_t ()); + draw::box(distance, attr_image(it), literal::red_t ()); + } + } + if (mydebug) { dsp("Mask input"); } + io::ppm::save(distance, "distance.pgm"); io::ppm::save(out, "output.pgm"); } -- 1.6.1.2

16 years, 1 month

3786: Add some code to extend the work of Etienne and Fred.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some code to extend the work of Etienne and Fred. * theo/experimental/histo_image.cc: New. histo_image.cc | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 421 insertions(+) Index: theo/experimental/histo_image.cc --- theo/experimental/histo_image.cc (revision 0) +++ theo/experimental/histo_image.cc (revision 0) @@ -0,0 +1,421 @@ +#include <mln/value/int_u8.hh> +#include <mln/value/int_s.hh> +#include <mln/value/rgb8.hh> +#include <mln/trait/value/comp.hh> + +#include <mln/core/alias/box1d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image3d.hh> + +#include <mln/core/concept/function.hh> +#include <mln/metal/ands.hh> + + + +namespace mln +{ + + + // -------------------------------------------------- fun + + + namespace fun + { + + // . . . . . . . . . . . . . . . v2v:: value <-> index + + // This is a revamp of mln/value/internal/convert.hh. It remains + // to be updated with Fred's new function writting. Then we'll be + // able to make it better, i.e., to handle the different cases + // properly. Precisely a case for scalars with low quantization + // (with a special encoding like quantized float, or not), a case + // for vectors with low quant, etc. + + namespace v2v + { + + // value -> index + + template <typename T> + struct index_of_value : Function_v2v< index_of_value<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef unsigned result; + unsigned operator()(const T& v) const + { + return unsigned( int(v) - int(mln_min(T)) ); + } + }; + + template <> + struct index_of_value<bool> : Function_v2v< index_of_value<bool> > + { + typedef unsigned result; + unsigned operator()(bool b) const + { + return b ? 1u : 0u; + } + }; + + template <typename T> + unsigned + meta_index_of_value(const T& v) + { + index_of_value<T> f; + return f(v); + } + + // index -> value + + template <typename T> + struct value_at_index : Function_v2v< value_at_index<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef T result; + T operator()(unsigned i) const + { + return T( int(mln_min(T)) + int(i) ); + } + }; + + template <> + struct value_at_index<bool> : Function_v2v< value_at_index<bool> > + { + typedef bool result; + bool operator()(unsigned i) const + { + mln_precondition(i < 2); + return i == 1u ? true : false; + } + }; + + + // . . . . . . . . . . . . . . . value -> point n-D + + + namespace internal + { + + // FIXME: It can be straightforwardly written using + // fun::ith_component. Yet there is no test file for this + // function. + + template <unsigned dim, typename T> + struct point_from_value; + + template <typename T> + struct point_from_value< 1, T > + { + static point1d run(const T& v) + { + return point1d(meta_index_of_value(v)); + } + }; + + template <typename T> + struct point_from_value< 2, T > + { + static point2d run(const T& v) + { + return point2d(meta_index_of_value(v[0]), + meta_index_of_value(v[1])); + } + }; + + template <typename T> + struct point_from_value< 3, T > + { + static point3d run(const T& v) + { + return point3d(meta_index_of_value(v[0]), + meta_index_of_value(v[1]), + meta_index_of_value(v[2])); + } + }; + + } // mln::fun::v2v::internal + + + template <typename T> + struct point_from_value : Function_v2v< point_from_value<T> > + { + enum { d = mln_dim(T) }; + typedef mln_regular_grid_from_dim(d) G; + typedef mln::point<G, def::coord> result; + + result operator()(const T& v) const + { + return internal::point_from_value<d,T>::run(v); + } + + index_of_value<T> f_; + }; + + template <typename T> + mln_result(point_from_value<T>) + meta_point_from_value(const T& v) + { + point_from_value<T> f; + return f(v); + } + + } // mln::fun::v2v + + + + + // . . . . . . . . . . . . . . . p2p::fold* + + namespace p2p + { + + struct fold1d : Function_p2p< fold1d > + { + typedef point1d result; + result operator()(const point1d& p) const + { + point1d tmp(p[0] % b.len(0)); + return tmp; + } + box1d b; + }; + + template <bool along_0, bool along_1> + struct fold2d : Function_p2p< fold2d<along_0,along_1> > + { + typedef point2d result; + result operator()(const point2d& p) const + { + point2d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1]); + return tmp; + } + box2d b; + }; + + template <bool along_0, bool along_1, bool along_2> + struct fold3d : Function_p2p< fold3d<along_0,along_1,along_2> > + { + typedef point3d result; + result operator()(const point3d& p) const + { + point3d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1], + along_2 ? p[2] % b.len(2) : p[2]); + return tmp; + } + box3d b; + }; + + } // mln::fun::p2p + + + } // mln::fun + + + // -------------------------------------------------- value + + + namespace value + { + + template <unsigned n, int inf, int sup> + struct circular + { + }; + + + namespace internal + { + template <typename T> + struct is_circular_helper : metal::false_ + {}; + + template <unsigned n, int inf, int sup> + struct is_circular_helper< circular<n,inf,sup> > : metal::true_ + {}; + + template <typename T> + struct is_circular : is_circular_helper<T>::eval + { + }; + + } // mln::value::internal + + } // mln::value + + + namespace trait + { + + template <unsigned n, int inf, int sup> + struct value_< mln::value::circular<n, inf, sup> > + { + enum { + dim = 1, + nbits = n, + card = mln_value_card_from_(n) + }; + // ... + }; + + } // end of namespace trait + + + // -------------------------------------------------- histo + + + namespace histo + { + + namespace internal + { + + template <int dim, typename T> + struct image_from_value_helper + { + }; + + // dim = 1 + + template <typename T, bool is_c> + struct image_from_value_helper_1; + + template <typename T> + struct image_from_value_helper_1< T, false > + { + typedef image1d<unsigned> ret; + + static ret get_image() + { + ret tmp(mln_card(T)); + return tmp; + } + }; + + template <typename T> + struct image_from_value_helper_1< T, true > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 1, T > + { + enum { is_c = value::internal::is_circular<T>::value }; + typedef image_from_value_helper_1< T, is_c > helper; + }; + + // dim = 3 + + template <typename C0, bool is_c0, + typename C1, bool is_c1, + typename C2, bool is_c2, + typename T> + struct image_from_value_helper_3; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, false, + C1, false, + C2, false, + T > + { + typedef image3d<unsigned> ret; + static ret get_image() + { + ret tmp(mln_card(C0), mln_card(C1), mln_card(C2)); + return tmp; + } + }; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, true, + C1, false, + C2, false, + T > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 3, T > + { + typedef mln_trait_value_comp(T, 0) C0; + typedef mln_trait_value_comp(T, 1) C1; + typedef mln_trait_value_comp(T, 2) C2; + typedef image_from_value_helper_3< C0, value::internal::is_circular<C0>::value, + C1, value::internal::is_circular<C1>::value, + C2, value::internal::is_circular<C2>::value, + T > helper; + }; + + template <typename T> + struct image_from_value_ // Entry point. + { + typedef typename image_from_value_helper<mln_dim(T), T>::helper helper; + }; + + + } // mln::histo::internal + + template <typename T> + struct image_from_value : internal::image_from_value_<T>::helper + { + }; + + + + // First code: the result of this function shall be replaced by + // an histo::image<T> where T is mln_value(I). As a consequence, + // we will not have to call meta_point_from_value... + + template <typename I> + typename image_from_value<mln_value(I)>::ret + compute_image(const Image& input_) + { + const I& input = exact(input_); + typedef image_from_value<mln_value(I)> helper; + typename helper::ret h = helper::get_image(); + + mln_piter(I) p(input.domain()); + for_all(p) + ++h( fun::v2v::meta_point_from_value(input(p)) ); + + return h; + } + + } // mln::histo + +} // mln + + +int main() +{ + using namespace mln; + + { + typedef bool T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef unsigned char T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::int_s<3> T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::rgb8 T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + // typedef value::circular<8,0,9> T; + } +}

16 years, 1 month

[PATCH 25/31] Add some code to extend the work of Etienne and Fred.

by Roland Levillain

* theo/experimental/histo_image.cc: New. --- milena/sandbox/ChangeLog | 6 + milena/sandbox/theo/experimental/histo_image.cc | 421 +++++++++++++++++++++++ 2 files changed, 427 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/theo/experimental/histo_image.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 0c91510..1fd08b0 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,9 @@ +2009-05-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add some code to extend the work of Etienne and Fred. + + * theo/experimental/histo_image.cc: New. + 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim project review. diff --git a/milena/sandbox/theo/experimental/histo_image.cc b/milena/sandbox/theo/experimental/histo_image.cc new file mode 100644 index 0000000..480fd70 --- /dev/null +++ b/milena/sandbox/theo/experimental/histo_image.cc @@ -0,0 +1,421 @@ +#include <mln/value/int_u8.hh> +#include <mln/value/int_s.hh> +#include <mln/value/rgb8.hh> +#include <mln/trait/value/comp.hh> + +#include <mln/core/alias/box1d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image3d.hh> + +#include <mln/core/concept/function.hh> +#include <mln/metal/ands.hh> + + + +namespace mln +{ + + + // -------------------------------------------------- fun + + + namespace fun + { + + // . . . . . . . . . . . . . . . v2v:: value <-> index + + // This is a revamp of mln/value/internal/convert.hh. It remains + // to be updated with Fred's new function writting. Then we'll be + // able to make it better, i.e., to handle the different cases + // properly. Precisely a case for scalars with low quantization + // (with a special encoding like quantized float, or not), a case + // for vectors with low quant, etc. + + namespace v2v + { + + // value -> index + + template <typename T> + struct index_of_value : Function_v2v< index_of_value<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef unsigned result; + unsigned operator()(const T& v) const + { + return unsigned( int(v) - int(mln_min(T)) ); + } + }; + + template <> + struct index_of_value<bool> : Function_v2v< index_of_value<bool> > + { + typedef unsigned result; + unsigned operator()(bool b) const + { + return b ? 1u : 0u; + } + }; + + template <typename T> + unsigned + meta_index_of_value(const T& v) + { + index_of_value<T> f; + return f(v); + } + + // index -> value + + template <typename T> + struct value_at_index : Function_v2v< value_at_index<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef T result; + T operator()(unsigned i) const + { + return T( int(mln_min(T)) + int(i) ); + } + }; + + template <> + struct value_at_index<bool> : Function_v2v< value_at_index<bool> > + { + typedef bool result; + bool operator()(unsigned i) const + { + mln_precondition(i < 2); + return i == 1u ? true : false; + } + }; + + + // . . . . . . . . . . . . . . . value -> point n-D + + + namespace internal + { + + // FIXME: It can be straightforwardly written using + // fun::ith_component. Yet there is no test file for this + // function. + + template <unsigned dim, typename T> + struct point_from_value; + + template <typename T> + struct point_from_value< 1, T > + { + static point1d run(const T& v) + { + return point1d(meta_index_of_value(v)); + } + }; + + template <typename T> + struct point_from_value< 2, T > + { + static point2d run(const T& v) + { + return point2d(meta_index_of_value(v[0]), + meta_index_of_value(v[1])); + } + }; + + template <typename T> + struct point_from_value< 3, T > + { + static point3d run(const T& v) + { + return point3d(meta_index_of_value(v[0]), + meta_index_of_value(v[1]), + meta_index_of_value(v[2])); + } + }; + + } // mln::fun::v2v::internal + + + template <typename T> + struct point_from_value : Function_v2v< point_from_value<T> > + { + enum { d = mln_dim(T) }; + typedef mln_regular_grid_from_dim(d) G; + typedef mln::point<G, def::coord> result; + + result operator()(const T& v) const + { + return internal::point_from_value<d,T>::run(v); + } + + index_of_value<T> f_; + }; + + template <typename T> + mln_result(point_from_value<T>) + meta_point_from_value(const T& v) + { + point_from_value<T> f; + return f(v); + } + + } // mln::fun::v2v + + + + + // . . . . . . . . . . . . . . . p2p::fold* + + namespace p2p + { + + struct fold1d : Function_p2p< fold1d > + { + typedef point1d result; + result operator()(const point1d& p) const + { + point1d tmp(p[0] % b.len(0)); + return tmp; + } + box1d b; + }; + + template <bool along_0, bool along_1> + struct fold2d : Function_p2p< fold2d<along_0,along_1> > + { + typedef point2d result; + result operator()(const point2d& p) const + { + point2d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1]); + return tmp; + } + box2d b; + }; + + template <bool along_0, bool along_1, bool along_2> + struct fold3d : Function_p2p< fold3d<along_0,along_1,along_2> > + { + typedef point3d result; + result operator()(const point3d& p) const + { + point3d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1], + along_2 ? p[2] % b.len(2) : p[2]); + return tmp; + } + box3d b; + }; + + } // mln::fun::p2p + + + } // mln::fun + + + // -------------------------------------------------- value + + + namespace value + { + + template <unsigned n, int inf, int sup> + struct circular + { + }; + + + namespace internal + { + template <typename T> + struct is_circular_helper : metal::false_ + {}; + + template <unsigned n, int inf, int sup> + struct is_circular_helper< circular<n,inf,sup> > : metal::true_ + {}; + + template <typename T> + struct is_circular : is_circular_helper<T>::eval + { + }; + + } // mln::value::internal + + } // mln::value + + + namespace trait + { + + template <unsigned n, int inf, int sup> + struct value_< mln::value::circular<n, inf, sup> > + { + enum { + dim = 1, + nbits = n, + card = mln_value_card_from_(n) + }; + // ... + }; + + } // end of namespace trait + + + // -------------------------------------------------- histo + + + namespace histo + { + + namespace internal + { + + template <int dim, typename T> + struct image_from_value_helper + { + }; + + // dim = 1 + + template <typename T, bool is_c> + struct image_from_value_helper_1; + + template <typename T> + struct image_from_value_helper_1< T, false > + { + typedef image1d<unsigned> ret; + + static ret get_image() + { + ret tmp(mln_card(T)); + return tmp; + } + }; + + template <typename T> + struct image_from_value_helper_1< T, true > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 1, T > + { + enum { is_c = value::internal::is_circular<T>::value }; + typedef image_from_value_helper_1< T, is_c > helper; + }; + + // dim = 3 + + template <typename C0, bool is_c0, + typename C1, bool is_c1, + typename C2, bool is_c2, + typename T> + struct image_from_value_helper_3; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, false, + C1, false, + C2, false, + T > + { + typedef image3d<unsigned> ret; + static ret get_image() + { + ret tmp(mln_card(C0), mln_card(C1), mln_card(C2)); + return tmp; + } + }; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, true, + C1, false, + C2, false, + T > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 3, T > + { + typedef mln_trait_value_comp(T, 0) C0; + typedef mln_trait_value_comp(T, 1) C1; + typedef mln_trait_value_comp(T, 2) C2; + typedef image_from_value_helper_3< C0, value::internal::is_circular<C0>::value, + C1, value::internal::is_circular<C1>::value, + C2, value::internal::is_circular<C2>::value, + T > helper; + }; + + template <typename T> + struct image_from_value_ // Entry point. + { + typedef typename image_from_value_helper<mln_dim(T), T>::helper helper; + }; + + + } // mln::histo::internal + + template <typename T> + struct image_from_value : internal::image_from_value_<T>::helper + { + }; + + + + // First code: the result of this function shall be replaced by + // an histo::image<T> where T is mln_value(I). As a consequence, + // we will not have to call meta_point_from_value... + + template <typename I> + typename image_from_value<mln_value(I)>::ret + compute_image(const Image& input_) + { + const I& input = exact(input_); + typedef image_from_value<mln_value(I)> helper; + typename helper::ret h = helper::get_image(); + + mln_piter(I) p(input.domain()); + for_all(p) + ++h( fun::v2v::meta_point_from_value(input(p)) ); + + return h; + } + + } // mln::histo + +} // mln + + +int main() +{ + using namespace mln; + + { + typedef bool T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef unsigned char T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::int_s<3> T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::rgb8 T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + // typedef value::circular<8,0,9> T; + } +} -- 1.6.1.2

16 years, 1 month

[Olena] #187: Minima imposition in WST by flooding

by Olena Trac

#187: Minima imposition in WST by flooding -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: trivial | Milestone: Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Provide a version of morpho::watershed::flooding taking an additional image of labels as input to impose (a subset of) minima (initial basins). -- Ticket URL: <https://trac.lrde.org/olena/ticket/187> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

16 years, 1 month

scool r152: mini-std: Multiple improvements in design (compiling)

by Warren Seine

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-05-12 Warren Seine <soow(a)lrde.epita.fr> mini-std: Multiple improvements in design (compiling). * mini-std.hh: Update. Removed old properties. Added iterator properties. Added iterator_base code sharing class. Added check in constructors (instanciating concepts is evil!). Removed get_stdcontainer function (not in the STL reference). Fixed "wrong template number" errors. Implemented empty constructors. * scoop.hh: New. Moved stc definition to scoop.hh. --- mini-std.hh | 234 ++++++++++++++++++++++++------------------------------------ scoop.hh | 62 +++++++++++++++ 2 files changed, 156 insertions(+), 140 deletions(-) Index: branches/scool-ng/examples/mini-std/c++/scoop.hh =================================================================== --- branches/scool-ng/examples/mini-std/c++/scoop.hh (revision 0) +++ branches/scool-ng/examples/mini-std/c++/scoop.hh (revision 152) @@ -0,0 +1,62 @@ +// Copyright (C) 2009 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. + +/* \file examples/mini-std/c++/scoop.hh + \brief SCOOP 1.5 definitions. */ + +#ifndef SCOOP_HH +# define SCOOP_HH + +namespace stc +{ + // Fwd decl. + template <typename E> struct Object; + + // Object category flag type. + template <> + struct Object<void> + { + }; + + /*! \brief Base class for almost every class. + * + * The parameter \a E is the exact type. + */ + template <typename E> + struct Object + { + typedef E exact_t; + typedef Object<void> category; // Default. + protected: + Object() {} + }; + + typedef char true_; + typedef struct { char _[2]; } false_; +} + +#endif Index: branches/scool-ng/examples/mini-std/c++/mini-std.hh =================================================================== --- branches/scool-ng/examples/mini-std/c++/mini-std.hh (revision 151) +++ branches/scool-ng/examples/mini-std/c++/mini-std.hh (revision 152) @@ -31,43 +31,13 @@ #include <list> #include <iostream> +#include "scoop.hh" namespace mstd { - // Fwd decl. - template <typename E> struct Object; + using namespace stc; - // Object category flag type. - template <> - struct Object<void> - { - // typedef Unknown<void> super; // LOL !? - }; - - - /*! \brief Base class for almost every class defined in Milena. - * - * The parameter \a E is the exact type. - */ - template <typename E> - struct Object - { - typedef E exact_t; - typedef Object<void> category; // Default. - protected: - Object() {} - }; -} // End of namespace mstd - - -namespace mstd -{ - namespace internal - { - typedef char yes_; - struct no_ { char dummy[2]; }; - - } // End of namespace internal + namespace internal {} } // End of namespace mstd @@ -87,7 +57,7 @@ typedef Object<void> super; }; - // Container category flag type. + // Iterator category flag type. template <> struct Iterator<void> { @@ -107,6 +77,18 @@ // Undefined property tag struct undef { std::string name() const { return "undef"; } }; + namespace iterator + { + struct access + { + struct any + { protected: any() {} }; + + struct bidirectional : any + { std::string name() const { return "access::bidirectional"; } }; + }; + } + namespace container { struct category @@ -161,15 +143,9 @@ template <typename T> struct undefined_container_ // See: mln/trait/images.hh:134 { - // misc typedef undef category; typedef undef speed; typedef undef size; - - // data (I::value) - // typedef undef kind; - // typedef undef nature; - // typedef undef quant; }; @@ -180,10 +156,8 @@ template <typename T> - struct default_container_ : undefined_container_<T> + struct default_container_ : container_<T> { - public: - typedef trait::container::speed::fast speed; }; @@ -200,7 +174,7 @@ template <typename T> - struct default_iterator_ : undefined_iterator_<T> + struct default_iterator_ : iterator_<T> { }; } @@ -223,15 +197,22 @@ struct Iterator : public Object<E> { + typedef Iterator<void> category; + /* + // provided by internal::container_base: + bool is_valid() const; void invalidate(); void start(); void next_(); */ + protected: Iterator() { + // See: mln/core/concept/image.hh:199 + bool (E::*m1)() const = & E::is_valid; m1 = 0; void (E::*m2)() = & E::invalidate; @@ -255,21 +236,7 @@ return *this; } - // value_t operator*() - // { - // return *(exact(this)); - // } - - // bool operator==(const Exact& it) - // { - // return exact(this) == it; - // } - - // bool operator!=(const Exact& it) - // { - // return exact(this) == it; - // } - + public: /*! \brief Go to the next element. * * \warning This is a final method; iterator classes should not @@ -283,10 +250,19 @@ assert(exact(this)->is_valid()); exact(this)->next_(); } + }; + namespace internal + { + template <typename T, typename E> + struct iterator_base : + public Iterator<E> + { + typedef T value_t; protected: - Iterator(); + iterator_base(); }; + } // ----------- // @@ -321,11 +297,8 @@ typedef stdcontainer_t; size_t size() const; - bool empty() const; - void clear(); - stdcontainer_t& get_stdcontainer(); @@ -339,12 +312,12 @@ { // See: mln/core/concept/image.hh:199 - // FIXME: Add new checks like above - - // size_t (E::*m1)() const = & E::size; - // m1 = 0; - - // provided by internal::container_base: + size_t (E::*m1)() const = & E::size; + m1 = 0; + bool (E::*m2)() const = & E::empty; + m2 = 0; + void (E::*m3)() = & E::clear; + m3 = 0; typedef typename E::value_t value_t; } @@ -358,8 +331,8 @@ struct container_base : public Container<E> { + typedef T value_t; typedef std::size_t size_t; - typedef typename mstd::trait::container_<E>::stdcontainer_t stdcontainer_t; size_t size() const { @@ -376,15 +349,10 @@ exact(this)->clear(); } - stdcontainer_t& get_stdcontainer() - { - return exact(this)->get_stdcontainer(); - } - protected: /// Constructor without argument. - container_base(); + container_base() {} }; @@ -415,19 +383,34 @@ // ForwardContainer. // // ------------------ // - template <typename E> - struct ForwardContainer : public Container<E> + namespace internal { - typedef Container<E> super; + template <typename T, typename E> + struct bidirectional_iterator_base : + public iterator_base<T, E> + { + protected: + bidirectional_iterator_base(); + }; + } - typedef typename mstd::trait::container_<E>::iter_t iter_t; + namespace internal + { + template <typename T, typename E> + struct forward_container_base : + public container_base<T, E> + { + typedef typename E::iter_t iter_t; iter_t begin() { return exact(this)->begin(); } - }; + protected: + forward_container_base(); + }; + } // ---------------- // // BiDirContainer. // @@ -459,80 +442,63 @@ namespace mstd { // ------------------ // - // Forward_Iterator. // + // List iterator. // // ------------------ // // Forward declarations. - template <typename T, typename E> - struct Forward_Iterator; + template <typename T> + struct list_iterator; namespace trait { - template <typename E> - struct iterator_< Forward_Iterator<E> > : - public default_iterator_< Forward_Iterator<E> > + template <typename T> + struct iterator_< list_iterator<T> > : + public default_iterator_< list_iterator<T> > { - typedef T container_t; - - typedef typename container_t::value_t value_t; + typedef iterator::access::bidirectional access; }; } - template <typename T, typename E> - struct Forward_Iterator : - public Iterator< Forward_Iterator<T> > - { - typedef mstd::trait::iterator_<E>::container_t container_t; - - Forward_Iterator(container_t& c) : - c_ (c), - iter_ (c.get_stdcontainer().begin()) + template <typename T> + struct list_iterator : + // FIXME: Add internal::bidirectional_iterator_primary + public internal::bidirectional_iterator_base< T, list_iterator<T> > { - } + typedef T value_t; + typedef list_iterator<T> self_t; value_t& operator*() { return *iter_; } - Forward_Iterator<T, E>& operator++() + self_t& operator++() { iter_++; return *exact(this); } - Forward_Iterator<T, E> operator++(int) + self_t operator++(int) { - current ret = *exact(this); + self_t ret = *exact(this); ++iter_; return ret; } - void to_begin() - { - iter_ = c_.get_stdcontainer().begin(); - } - - void to_end() - { - iter_ = c_.get_stdcontainer().end(); - } - - bool operator==(const Forward_Iterator<T, E>& it) + bool operator==(const self_t& it) { return this->iter_ == it.iter_; } - bool operator!=(const Forward_Iterator<T, E>& it) + bool operator!=(const self_t& it) { return this->iter_ != it.iter_; } protected: - container_t& c_; - iter_t iter_; + typename std::list<T>::iterator iter_; }; @@ -549,21 +515,13 @@ { template <typename T> struct container_< list<T> > : - public default_container_< T, list<T> > + public default_container_< list<T> > { - // misc typedef trait::container::category::primary category; - // typedef mlc::true_ is_isfrontinsertion; - // typedef mlc::true_ is_isbackinsertion; - - // typedef mlc::true_ is_mutable; - - typedef T value_t; - - typedef bi_dir_iterator< list<T> > iter_t; - - typedef std::list<T> stdcontainer_t; + typedef stc::true_ is_reversible_container; + typedef stc::true_ is_front_insertion_sequence; + typedef stc::true_ is_back_insertion_sequence; }; } @@ -574,9 +532,12 @@ { public: typedef T value_t; + typedef list_iterator<T> iter_t; /// Constructor without argument. - list(); + list() + { + } size_t size() const { @@ -593,11 +554,6 @@ list_.clear(); } - stdcontainer_t& get_stdcontainer() - { - return list_; - } - void push_front(value_t& v) { list_.push_front(v); @@ -620,14 +576,12 @@ iter_t begin() { - return iter_t(*this); + return list_.begin(); } iter_t end() { - iter_t it(*this); - it.to_end(); - return it; + return list_.end(); } value_t& front() @@ -641,7 +595,7 @@ } protected: - stdcontainer_t list_; + std::list<T> list_; }; // ---------- // -- :: Warren Seine // SooW :: :: warren.seine @ gmail.com :: :: EPITA CSI 2010 ::

16 years, 1 month

r3785: Inim project review

by Edwin Carlinet

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim project review. * edwin/inim/inim.cc: Fix include. * edwin/tests/sharp.cc: New. * edwin/tree/sharp.cc: Remove. --- inim/Makefile | 4 inim/inim.cc | 6 tests/sharp.cc | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 358 insertions(+), 6 deletions(-) Index: trunk/milena/sandbox/edwin/tree/sharp.cc (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/tests/sharp.cc =================================================================== --- trunk/milena/sandbox/edwin/tests/sharp.cc (revision 0) +++ trunk/milena/sandbox/edwin/tests/sharp.cc (revision 3785) @@ -0,0 +1,354 @@ +/* mln core */ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/var.hh> + +/* Site set */ +#include <mln/core/site_set/p_array.hh> +#include <mln/level/sort_psites.hh> + +/* Component trees */ +#include <mln/morpho/tree/data.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/filter.hh> +#include <mln/morpho/tree/propagate.hh> + +/* Attributes */ +#include <mln/morpho/attribute/sharpness.hh> + +/* io */ +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +/* data & pw */ +#include <mln/core/concept/function.hh> +#include <mln/fun/p2v/ternary.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/pw/all.hh> + +/* level */ +//#include <mln/level/stretch.hh> + +/* label */ +#include <mln/labeling/blobs.hh> +#include <mln/value/label_16.hh> + +/* trace */ +#include <mln/trace/quiet.hh> +#include <mln/util/timer.hh> + +/* std */ +#include <string> +#include <iostream> + +using namespace mln; +bool mydebug = false; + + +void usage(char** argv) +{ + std::cerr << "usage: " << argv[0] << " input [--debug] [-n nbr_components | -s sharpness] [-c card]" << std::endl; + abort(); +} + +void dsp(const std::string& str, mln::util::timer& timer) +{ + std::cout << "in " << timer.read() << std::endl; + std::cout << std::endl + << "*********************" << std::endl + << "** " << str << std::endl + << "*********************" << std::endl; + timer.restart(); +} + +namespace mln +{ + // Distance, stored on pixels, of neighboring colors. + + value::int_u8 dist_mean(const value::rgb8& c1, const value::rgb8& c2) + { + unsigned d = 0; + d += (math::diff_abs(c1.red(), c2.red()) + 2) / 3; + d += (math::diff_abs(c1.green(), c2.green()) + 2) / 3; + d += (math::diff_abs(c1.blue(), c2.blue()) + 2) / 3; + if (d > 255) + d = 255; + return d; + } + + template <typename N> + image2d<value::int_u8> + dist_on_pixels(const image2d<value::rgb8>& input, const N& nbh) + { + using value::int_u8; + image2d<int_u8> output(input.domain()); + + mln_piter(box2d) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + int_u8 d = 0u; + for_all(n) if (input.domain().has(n)) + { + int_u8 d_ = dist_mean(input(p), input(n)); + if (d_ > d) + d = d_; + } + output(p) = 255 - d; + } + return output; + } + + template <typename P2V> + struct height_wrapper_ : Function_p2v< height_wrapper_<P2V> > + { + typedef unsigned result; + + height_wrapper_(const Function_p2v<P2V>& f) : + f_ (exact(f)) + { + mlc_is_a(mln_result(P2V), Accumulator)::check(); + } + + template <typename P> + unsigned operator() (const P& p) const + { + return f_(p).height(); + } + + private: + const P2V& f_; + }; + + template <typename P2V> + inline + height_wrapper_<P2V> + height_wrapper(const Function_p2v<P2V>& f) + { + return height_wrapper_<P2V>(f); + } + + template <typename P2V> + struct card_wrapper_ : Function_p2v< card_wrapper_<P2V> > + { + typedef unsigned result; + + card_wrapper_(const Function_p2v<P2V>& f) : + f_ (exact(f)) + { + mlc_is_a(mln_result(P2V), Accumulator)::check(); + } + + template <typename P> + unsigned operator() (const P& p) const + { + return f_(p).area(); + } + + private: + const P2V& f_; + }; + + template <typename P2V> + inline + card_wrapper_<P2V> + card_wrapper(const Function_p2v<P2V>& f) + { + return card_wrapper_<P2V>(f); + } + +} + + + + + + + +int main(int argc, char* argv[]) +{ + using value::int_u8; + using value::rgb8; + std::string arg; + unsigned nb_components = 0; + unsigned card = 0; + unsigned height = 0; + double sharpness = 0; + util::timer timer; + + if (argc < 2) + usage(argv); + + for (int i = 2; i < argc; i++) + { + arg = std::string(argv[i]); + if (arg == "--debug") + mydebug = true; + else if (arg == "-n" && i != argc) + nb_components = atoi(argv[++i]); + else if (arg == "-s" && i != argc) + sharpness = atof(argv[++i]); + else if (arg == "-c" && i != argc) + card = atoi(argv[++i]); + else if (arg == "--trace") + trace::quiet = false; + else if (arg == "-h") + height = atoi(argv[++i]); + else + usage (argv); + } + /********************/ + /* Load & Pre-treat */ + /********************/ + if (mydebug) + dsp("Load & Pre-treat", timer); + + typedef image2d<int_u8> I; + I input; + io::pgm::load(input, argv[1]); + + /***************************/ + /* Component tree creation */ + /***************************/ + + if (mydebug) + dsp("Component tree creation", timer); + + typedef p_array< mln_site_(I) > S; + typedef morpho::tree::data<I,S> tree_t; + + S sorted_sites = level::sort_psites_decreasing(input); + tree_t tree(input, sorted_sites, c4()); + + + /******************************/ + /* Compute Attribute On Image */ + /******************************/ + if (mydebug) + dsp("Image sharp attribute", timer); + + // TODO: l'attribut devrait favoriser les composantes plus larges + // dans son calcul. Ainsi au lieu de faire un sharpness, on aurait + // un ratio sharpness / hauteur de composante (reprendre l'idee du + // log utilise pour INIM). + + typedef morpho::attribute::sharpness sharp_t; + typedef mln_ch_value_(I, double) A; + typedef mln_ch_value_(I, sharp_t) B; + + B a_img; + A a = morpho::tree::compute_attribute_image(sharp_t (), tree, &a_img); + // Note: then we work on nodes (component representant so we don't + // need to propagate the representant value to the component sites. + + + /***********************************/ + /* Components Filtering */ + /***********************************/ + + // So we compute card attribute and we filter big components + // FIXME: some attributes are compositions of attributes, here + // sharpness can give area so, it would be fine if we could give an + // optional extra argument to compute_attribute where the + // accumulators image will be stored. + + if (card) + { + if (mydebug) + dsp("Image card attribute", timer); + + a = duplicate((fun::p2v::ternary(card_wrapper(pw::value(a_img)) > pw::cst(card), + pw::value(a), + pw::cst(0.0))) | a.domain()); + } + + if (height) + { + if (mydebug) + dsp("Image height attribute", timer); + a = duplicate((fun::p2v::ternary(height_wrapper(pw::value(a_img)) > pw::cst(height), + pw::value(a), + pw::cst(0.0))) | a.domain()); + } + + /************************************************/ + /* Retrieve Components (Maximising the criteria) */ + /************************************************/ + + p_array< mln_psite_(A) > obj_array; // Array of object components. + + if (mydebug) { + std::stringstream s("Run max accumulator, look for ", std::stringstream::out|std::stringstream::in| + std::stringstream::ate); + if (nb_components) + s << nb_components << " components."; + else if (sharpness) + s << "components whose treshold > " << sharpness; + else + s << "components util leaves are glutted"; + dsp(s.str(), timer); + } + + if (nb_components) { + obj_array = morpho::tree::get_components(tree, a, nb_components); + } else if (sharpness > 0) { + mln_VAR(predicate, pw::value(a) > pw::cst(sharpness)); + obj_array = morpho::tree::get_components(tree, a, predicate); + } else { + obj_array = morpho::tree::get_components(tree, a); + } + + + /* Print them */ +// if (mydebug) { +// mln_fwd_piter_(p_array< mln_psite_(I) >) c(obj_array); +// for_all(c) +// std::cout << c; +// } + + /***********************************/ + /* Use components in output image */ + /***********************************/ + if (mydebug) { + dsp("Propagate components and stretch", timer); + } + + // Note: now we must propagate the representant value to the other components sites. + + //a = morpho::tree::propagate_components(a, tree, obj_array, 0); + //I output = level::stretch(int_u8(), a); //adapt to 0-255 + //io::pgm::save(output, "components.pgm"); + + + /* EXTRA */ + + // labeling + typedef mln_ch_value_(I, bool) M; + + M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); + + //typedef mln_ch_value_(I, value::label<16>) L; + //value::label<16> nlabel; + //L label = labeling::blobs(mask, c4(), nlabel); + //io::pgm::save(label, "label.pgm"); + + + if (mydebug) { + dsp("Finish", timer); + } + + + +// /* Now store output image */ + I out; + initialize(out, input); + data::fill(out, 0); + data::paste(input | pw::value(mask), out); + io::pgm::save(out, "output.pgm"); + + +} Property changes on: trunk/milena/sandbox/edwin/tests/sharp.cc ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/inim/inim.cc =================================================================== --- trunk/milena/sandbox/edwin/inim/inim.cc (revision 3784) +++ trunk/milena/sandbox/edwin/inim/inim.cc (revision 3785) @@ -18,12 +18,12 @@ /* Component trees */ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include "../tree/propagate.hh" -#include "../tree/components.hh" +#include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/components.hh> /* Attributes */ #include <mln/transform/distance_front.hh> -#include "../attributes/bbox.hh" +#include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> #include <mln/make/w_window2d_int.hh> Index: trunk/milena/sandbox/edwin/inim/Makefile =================================================================== --- trunk/milena/sandbox/edwin/inim/Makefile (revision 3784) +++ trunk/milena/sandbox/edwin/inim/Makefile (revision 3785) @@ -7,7 +7,7 @@ OLENADIR=$(MLN_DIR)/.. MILENADIR=$(OLENADIR)/milena -CXXFLAGS=-I$(MILENADIR) -I./ -W -Wall +CXXFLAGS=-I$(MILENADIR) -I$(MILENADIR)/sandbox/edwin -W -Wall CXXFLAGS += $(if $(DEBUG), -g -ggdb, -DNDEBUG\ @@ -26,8 +26,6 @@ %.o: %.cc $(CXX) $(CXXFLAGS) -c $< -%.o: %.hh - $(CXX) $(CXXFLAGS) -c $< depend: makedepend -- $(CXXFLAGS) -- -v $($(TARGET)_SRC)

16 years, 1 month

[PATCH 24/31] Inim project review.

by Roland Levillain

* edwin/inim/inim.cc: Fix include. * edwin/tests/sharp.cc: New. * edwin/tree/sharp.cc: Remove. --- milena/sandbox/ChangeLog | 7 +++++++ milena/sandbox/edwin/inim/Makefile | 4 +--- milena/sandbox/edwin/inim/inim.cc | 6 +++--- milena/sandbox/edwin/{tree => tests}/sharp.cc | 24 +++++++++++++----------- 4 files changed, 24 insertions(+), 17 deletions(-) rename milena/sandbox/edwin/{tree => tests}/sharp.cc (94%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 880ff36..0c91510 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Inim project review. + * edwin/inim/inim.cc: Fix include. + * edwin/tests/sharp.cc: New. + * edwin/tree/sharp.cc: Remove. + 2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Plot labels in fixed watershed. diff --git a/milena/sandbox/edwin/inim/Makefile b/milena/sandbox/edwin/inim/Makefile index 3e4f0dc..2a24166 100644 --- a/milena/sandbox/edwin/inim/Makefile +++ b/milena/sandbox/edwin/inim/Makefile @@ -7,7 +7,7 @@ inim_OBJS=${inim_SRC:.cc=.o} OLENADIR=$(MLN_DIR)/.. MILENADIR=$(OLENADIR)/milena -CXXFLAGS=-I$(MILENADIR) -I./ -W -Wall +CXXFLAGS=-I$(MILENADIR) -I$(MILENADIR)/sandbox/edwin -W -Wall CXXFLAGS += $(if $(DEBUG), -g -ggdb, -DNDEBUG\ @@ -26,8 +26,6 @@ $(TARGET): $($(TARGET)_OBJS) $($(TARGET)_SRC) %.o: %.cc $(CXX) $(CXXFLAGS) -c $< -%.o: %.hh - $(CXX) $(CXXFLAGS) -c $< depend: makedepend -- $(CXXFLAGS) -- -v $($(TARGET)_SRC) diff --git a/milena/sandbox/edwin/inim/inim.cc b/milena/sandbox/edwin/inim/inim.cc index 5dca4bd..f38130d 100644 --- a/milena/sandbox/edwin/inim/inim.cc +++ b/milena/sandbox/edwin/inim/inim.cc @@ -18,12 +18,12 @@ /* Component trees */ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include "../tree/propagate.hh" -#include "../tree/components.hh" +#include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/components.hh> /* Attributes */ #include <mln/transform/distance_front.hh> -#include "../attributes/bbox.hh" +#include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> #include <mln/make/w_window2d_int.hh> diff --git a/milena/sandbox/edwin/tree/sharp.cc b/milena/sandbox/edwin/tests/sharp.cc similarity index 94% rename from milena/sandbox/edwin/tree/sharp.cc rename to milena/sandbox/edwin/tests/sharp.cc index 58933b5..6b97f94 100644 --- a/milena/sandbox/edwin/tree/sharp.cc +++ b/milena/sandbox/edwin/tests/sharp.cc @@ -12,8 +12,9 @@ /* Component trees */ #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> -#include "components.hh" -#include "propagate.hh" +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/filter.hh> +#include <mln/morpho/tree/propagate.hh> /* Attributes */ #include <mln/morpho/attribute/sharpness.hh> @@ -327,12 +328,13 @@ int main(int argc, char* argv[]) // labeling typedef mln_ch_value_(I, bool) M; - typedef mln_ch_value_(I, value::label<16>) L; M mask = morpho::tree::set_value_to_components(tree, obj_array, true, false); - value::label<16> nlabel; - L label = labeling::blobs(mask, c4(), nlabel); - io::pgm::save(label, "label.pgm"); + + //typedef mln_ch_value_(I, value::label<16>) L; + //value::label<16> nlabel; + //L label = labeling::blobs(mask, c4(), nlabel); + //io::pgm::save(label, "label.pgm"); if (mydebug) { @@ -342,11 +344,11 @@ int main(int argc, char* argv[]) // /* Now store output image */ -// I out; -// initialize(out, input); -// data::fill(out, 0); -// data::paste(input | pw::value(mask), out); -// io::pgm::save(out, "output.pgm"); + I out; + initialize(out, input); + data::fill(out, 0); + data::paste(input | pw::value(mask), out); + io::pgm::save(out, "output.pgm"); } -- 1.6.1.2

16 years, 1 month

milena r3784: Fix full2image() domain for cropped images

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix full2image() domain for cropped images. * mln/core/concept/gpoint.hh: Add operator /. * mln/world/inter_pixel/all.hh: Add ful2image.hh inclusion. * mln/world/inter_pixel/full2image.hh: Fix domain. --- core/concept/gpoint.hh | 20 ++++++++++++++++---- world/inter_pixel/all.hh | 1 + world/inter_pixel/full2image.hh | 37 +++++++++++++++++++------------------ 3 files changed, 36 insertions(+), 22 deletions(-) Index: trunk/milena/mln/world/inter_pixel/full2image.hh =================================================================== --- trunk/milena/mln/world/inter_pixel/full2image.hh (revision 3783) +++ trunk/milena/mln/world/inter_pixel/full2image.hh (revision 3784) @@ -31,14 +31,11 @@ /// \file mln/world/inter_pixel/full2image.hh /// /// Convert an inter-pixel image to a classical image. -/// -/// FIXME: will NOT work if the image has an origin different from (0,0). -# include <mln/core/image/image2d.hh> -# include <mln/geom/max_col.hh> -# include <mln/geom/max_row.hh> -# include <mln/geom/min_col.hh> -# include <mln/geom/min_row.hh> +# include <mln/core/concept/image.hh> +# include <mln/data/paste_without_localization.hh> +# include <mln/geom/nsites.hh> +# include <mln/world/inter_pixel/is_pixel.hh> namespace mln @@ -56,27 +53,31 @@ /// /// \return A classical image without inter-pixel data. // - template <typename T> - image2d<T> - full2image(const image2d<T>& input); + template <typename I> + I + full2image(const Image& input); # ifndef MLN_INCLUDE_ONLY - template <typename T> - image2d<T> - full2image(const image2d<T>& input) + template <typename I> + I + full2image(const Image& input_) { trace::entering("world::inter_pixel::full2image"); + + mlc_is_a(mln_domain(I), Box)::check(); + + const I& input = exact(input_); mln_precondition(input.is_valid()); - image2d<T> output((input.nrows() + 1) / 2, (input.ncols() + 1) / 2); + mln_domain(I) b(input.domain().pmin() / 2, + input.domain().pmax() / 2); + mln_concrete(I) output(b); + mln_assertion(geom::nsites(output) == geom::nsites(input | is_pixel())); - for (int row = geom::min_row(input); row <= geom::max_row(input); row += 2) - for (int col = geom::min_col(input); col <= geom::max_col(input); col += 2) - opt::at(output, row / 2, col / 2) = - opt::at(input, row, col); + data::paste_without_localization(input | is_pixel(), output); trace::exiting("world::inter_pixel::full2image"); return output; Index: trunk/milena/mln/world/inter_pixel/all.hh =================================================================== --- trunk/milena/mln/world/inter_pixel/all.hh (revision 3783) +++ trunk/milena/mln/world/inter_pixel/all.hh (revision 3784) @@ -38,6 +38,7 @@ # include <mln/world/inter_pixel/compute.hh> +# include <mln/world/inter_pixel/full2image.hh> # include <mln/world/inter_pixel/immerse.hh> # include <mln/world/inter_pixel/is_separator.hh> # include <mln/world/inter_pixel/is_pixel.hh> Index: trunk/milena/mln/core/concept/gpoint.hh =================================================================== --- trunk/milena/mln/core/concept/gpoint.hh (revision 3783) +++ trunk/milena/mln/core/concept/gpoint.hh (revision 3784) @@ -82,6 +82,13 @@ typedef L ret; }; + template < typename L, typename R > + struct set_binary_< op::div, + mln::Gpoint, L, + mln::Object, mln::value::scalar_<R> > + { + typedef L ret; + }; template <typename P> struct set_unary_< op::ord, mln::Gpoint, P > @@ -279,7 +286,7 @@ * \relates mln::Gpoint */ template <typename P, typename D> - P operator/(Gpoint& p, const value::Scalar<D>& dp); + P operator/(const Gpoint& p, const value::scalar_<D>& dp); // FIXME : add operators and traits? @@ -400,7 +407,7 @@ P operator*(const Gpoint& p, const value::scalar_<S>& s) { - int s_ = s.to_equiv(); + S s_ = s.to_equiv(); const unsigned n = P::dim; P tmp = exact(p); for (unsigned i = 0; i < n; ++i) @@ -439,9 +446,14 @@ template <typename P, typename S> inline P - operator/(Gpoint& p, const value::Scalar<S>& s_) + operator/(const Gpoint& p, const value::scalar_<S>& s_) { - return p.to_vec() / s_; + S s = s_.to_equiv(); + const unsigned n = P::dim; + P tmp = exact(p); + for (unsigned i = 0; i < n; ++i) + tmp[i] /= s; + return tmp; } # endif // ! MLN_INCLUDE_ONLY

16 years, 1 month

[PATCH 23/31] Fix full2image() domain for cropped images.

by Roland Levillain

* mln/core/concept/gpoint.hh: Add operator /. * mln/world/inter_pixel/all.hh: Add ful2image.hh inclusion. * mln/world/inter_pixel/full2image.hh: Fix domain. --- milena/ChangeLog | 7 +++++ milena/mln/core/concept/gpoint.hh | 20 ++++++++++++--- milena/mln/world/inter_pixel/all.hh | 1 + milena/mln/world/inter_pixel/full2image.hh | 37 ++++++++++++++------------- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e0e1cee..44d34d3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> + + Fix full2image() domain for cropped images. + * mln/core/concept/gpoint.hh: Add operator /. + * mln/world/inter_pixel/all.hh: Add ful2image.hh inclusion. + * mln/world/inter_pixel/full2image.hh: Fix domain. + 2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Small fixes. diff --git a/milena/mln/core/concept/gpoint.hh b/milena/mln/core/concept/gpoint.hh index 504e2ac..601d5d2 100644 --- a/milena/mln/core/concept/gpoint.hh +++ b/milena/mln/core/concept/gpoint.hh @@ -82,6 +82,13 @@ namespace mln typedef L ret; }; + template < typename L, typename R > + struct set_binary_< op::div, + mln::Gpoint, L, + mln::Object, mln::value::scalar_<R> > + { + typedef L ret; + }; template <typename P> struct set_unary_< op::ord, mln::Gpoint, P > @@ -279,7 +286,7 @@ namespace mln * \relates mln::Gpoint */ template <typename P, typename D> - P operator/(Gpoint& p, const value::Scalar<D>& dp); + P operator/(const Gpoint& p, const value::scalar_<D>& dp); // FIXME : add operators and traits? @@ -400,7 +407,7 @@ namespace mln P operator*(const Gpoint& p, const value::scalar_<S>& s) { - int s_ = s.to_equiv(); + S s_ = s.to_equiv(); const unsigned n = P::dim; P tmp = exact(p); for (unsigned i = 0; i < n; ++i) @@ -439,9 +446,14 @@ namespace mln template <typename P, typename S> inline P - operator/(Gpoint& p, const value::Scalar<S>& s_) + operator/(const Gpoint& p, const value::scalar_<S>& s_) { - return p.to_vec() / s_; + S s = s_.to_equiv(); + const unsigned n = P::dim; + P tmp = exact(p); + for (unsigned i = 0; i < n; ++i) + tmp[i] /= s; + return tmp; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/world/inter_pixel/all.hh b/milena/mln/world/inter_pixel/all.hh index da3b105..37536b2 100644 --- a/milena/mln/world/inter_pixel/all.hh +++ b/milena/mln/world/inter_pixel/all.hh @@ -38,6 +38,7 @@ # include <mln/world/inter_pixel/compute.hh> +# include <mln/world/inter_pixel/full2image.hh> # include <mln/world/inter_pixel/immerse.hh> # include <mln/world/inter_pixel/is_separator.hh> # include <mln/world/inter_pixel/is_pixel.hh> diff --git a/milena/mln/world/inter_pixel/full2image.hh b/milena/mln/world/inter_pixel/full2image.hh index 50f6b28..15ebcd5 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/milena/mln/world/inter_pixel/full2image.hh @@ -31,14 +31,11 @@ /// \file mln/world/inter_pixel/full2image.hh /// /// Convert an inter-pixel image to a classical image. -/// -/// FIXME: will NOT work if the image has an origin different from (0,0). -# include <mln/core/image/image2d.hh> -# include <mln/geom/max_col.hh> -# include <mln/geom/max_row.hh> -# include <mln/geom/min_col.hh> -# include <mln/geom/min_row.hh> +# include <mln/core/concept/image.hh> +# include <mln/data/paste_without_localization.hh> +# include <mln/geom/nsites.hh> +# include <mln/world/inter_pixel/is_pixel.hh> namespace mln @@ -56,27 +53,31 @@ namespace mln /// /// \return A classical image without inter-pixel data. // - template <typename T> - image2d<T> - full2image(const image2d<T>& input); + template <typename I> + I + full2image(const Image& input); # ifndef MLN_INCLUDE_ONLY - template <typename T> - image2d<T> - full2image(const image2d<T>& input) + template <typename I> + I + full2image(const Image& input_) { trace::entering("world::inter_pixel::full2image"); + + mlc_is_a(mln_domain(I), Box)::check(); + + const I& input = exact(input_); mln_precondition(input.is_valid()); - image2d<T> output((input.nrows() + 1) / 2, (input.ncols() + 1) / 2); + mln_domain(I) b(input.domain().pmin() / 2, + input.domain().pmax() / 2); + mln_concrete(I) output(b); + mln_assertion(geom::nsites(output) == geom::nsites(input | is_pixel())); - for (int row = geom::min_row(input); row <= geom::max_row(input); row += 2) - for (int col = geom::min_col(input); col <= geom::max_col(input); col += 2) - opt::at(output, row / 2, col / 2) = - opt::at(input, row, col); + data::paste_without_localization(input | is_pixel(), output); trace::exiting("world::inter_pixel::full2image"); return output; -- 1.6.1.2

16 years, 1 month

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches May 2009