Olena

olena@lrde.epita.fr

325 discussions

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/morpho/tests/attribute: Fix function call problems. * tests/morpho/tests/attr_op_cl: Add attribute opening/closing tests. * oln/morpho/attribute_closing_opening_map.hh: Add slow namespace. Correct type problems. * oln/morpho/attribute_closing_opening_map.hxx: Likewise. * oln/morpho/attributes.hh: Fix bugs. * oln/morpho/attribute_union_find.hh: Add fast namespace. * oln/morpho/attribute_closing_opening.hh: Likewise. Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Tue, 10 Feb 2004 17:32:17 +0100 palma_g (oln/q/49_attribute_ 1.13 640) +++ olena/oln/morpho/attribute_closing_opening.hh Mon, 16 Feb 2004 08:38:59 +0100 palma_g (oln/q/49_attribute_ 1.13 640) @@ -32,8 +32,8 @@ namespace oln { namespace morpho { + namespace fast { namespace tarjan { - namespace internal { // attribute closing @@ -43,7 +43,6 @@ const abstract::neighborhood<N>& Ng, const attr_lambda_type(A) &lambda) { - typedef N toto; typedef tarjan::tarjan_set<oln_concrete_type(I), A > tarjan_set_type; tarjan_set_type attr_closing(input.exact(), attr_env_type(A)()); return attr_closing.template get_comptute<true>(lambda, Ng); @@ -62,7 +61,7 @@ } } // !internal - + } // !tarjan // macro for some attribute opening/closing declarations # define xxx_opening_decl(T) \ template<class I, class N> \ @@ -71,7 +70,7 @@ const abstract::neighborhood<N>& Ng, \ const attr_lambda_type(T##_type<unsigned>) &lambda) \ { \ - return internal::attr_opening_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ + return tarjan::internal::attr_opening_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ } # define xxx_closing_decl(T) \ @@ -81,7 +80,7 @@ const abstract::neighborhood<N>& Ng, \ const attr_lambda_type(T##_type<unsigned>) &lambda) \ { \ - return internal::attr_closing_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ + return tarjan::internal::attr_closing_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ } @@ -93,7 +92,7 @@ const abstract::neighborhood<N>& Ng, \ const attr_lambda_type(T##_type) &lambda) \ { \ - return internal::attr_opening_<I, N, T##_type >(input, Ng, lambda); \ + return tarjan::internal::attr_opening_<I, N, T##_type >(input, Ng, lambda); \ } # define xxx_closing_im_decl(T) \ @@ -103,7 +102,7 @@ const abstract::neighborhood<N>& Ng, \ const attr_lambda_type(T##_type) &lambda) \ { \ - return internal::attr_closing_<I, N, T##_type >(input, Ng, lambda); \ + return tarjan::internal::attr_closing_<I, N, T##_type >(input, Ng, lambda); \ } /*=processing area_closing @@ -124,7 +123,7 @@ * exi: lena256.pgm * exo: out.pgm =*/ - xxx_closing_decl(area) + xxx_closing_decl(area); /*=processing area_opening * ns: morpho @@ -144,27 +143,27 @@ * exi: lena256.pgm * exo: out.pgm =*/ - xxx_opening_decl(area) - - xxx_opening_decl(volume) - xxx_closing_decl(volume) - xxx_opening_decl(height) - xxx_closing_decl(height) - xxx_opening_decl(maxvalue) - xxx_closing_decl(maxvalue) - xxx_opening_decl(minvalue) - xxx_closing_decl(minvalue) - xxx_opening_im_decl(disk) - xxx_closing_im_decl(disk) - xxx_opening_im_decl(dist) - xxx_closing_im_decl(dist) - xxx_closing_im_decl(square) - xxx_opening_im_decl(square) - xxx_closing_im_decl(rectangle) - xxx_opening_im_decl(rectangle) + xxx_opening_decl(area); - } - } -} + xxx_opening_decl(volume); + xxx_closing_decl(volume); + xxx_opening_decl(height); + xxx_closing_decl(height); + xxx_opening_decl(maxvalue); + xxx_closing_decl(maxvalue); + xxx_opening_decl(minvalue); + xxx_closing_decl(minvalue); + xxx_opening_im_decl(disk); + xxx_closing_im_decl(disk); + xxx_opening_im_decl(dist); + xxx_closing_im_decl(dist); + xxx_closing_im_decl(square); + xxx_opening_im_decl(square); + xxx_closing_im_decl(rectangle); + xxx_opening_im_decl(rectangle); + + } // !fast + } // !morpho +} // !oln #endif Index: olena/oln/morpho/attribute_union_find.hh --- olena/oln/morpho/attribute_union_find.hh Tue, 10 Feb 2004 17:32:17 +0100 palma_g (oln/q/50_attribute_ 1.11 640) +++ olena/oln/morpho/attribute_union_find.hh Thu, 12 Feb 2004 14:14:57 +0100 palma_g (oln/q/50_attribute_ 1.11 640) @@ -38,6 +38,7 @@ namespace oln { namespace morpho { + namespace fast { namespace tarjan { template< class T> @@ -231,7 +232,8 @@ const lambda_type *lambda_; const env_type env_; }; - } - } -} + } // !tarjan + } // !fast + } // !morph +} // !oln #endif Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Tue, 10 Feb 2004 15:35:04 +0100 palma_g (oln/j/45_attributes 1.3 644) +++ olena/oln/morpho/attributes.hh Mon, 16 Feb 2004 18:57:01 +0100 palma_g (oln/j/45_attributes 1.3 644) @@ -31,9 +31,9 @@ # include <vector> // attribute dedicated macros -# define attr_lambda_type(T) typename attr_traits<T>::lambda_type -# define attr_env_type(T) typename attr_traits<T>::env_type -# define attr_value_type(T) typename attr_traits<T>::value_type +# define attr_lambda_type(T) typename oln::morpho::attr_traits<T>::lambda_type +# define attr_env_type(T) typename oln::morpho::attr_traits<T>::env_type +# define attr_value_type(T) typename oln::morpho::attr_traits<T>::value_type # define attr_type_decl(slef_type) \ typedef mlc_exact_vt_type(self_type, Exact) exact_type; \ @@ -43,7 +43,6 @@ namespace oln { namespace morpho { - namespace tarjan { namespace tools { // should be moved elsewhere template <class T> @@ -51,8 +50,8 @@ { return v1 > v2 ? v1 - v2 : v2 - v1; } + } // !tools - } // environment herarchy // not used yet template <class Exact> @@ -265,7 +264,10 @@ { }; - height_type(const lambda_type &lambda): value_(lambda) + height_type(const lambda_type &lambda): + value_(lambda), + min_(ntg_zero_val(value_type)), + max_(lambda) { }; @@ -273,25 +275,38 @@ height_type(const abstract::image &input, const oln_point_type(I) &p, const env_type&): - reflevel_(input[p]), - value_(ntg_zero_val(value_type)) + value_(ntg_zero_val(value_type)), + min_(input[p]), + max_(input[p]) { }; - const value_type &getReflevel() const + + const value_type &getMin() const { - mlc_dispatch(getReflevel)(); + mlc_dispatch(getMin)(); }; + const value_type &getMax() const + { + mlc_dispatch(getMax)(); + }; // impl part - const value_type &getReflevel_impl() const + const value_type &getMin_impl() const { - return reflevel_; + return min_; + }; + + const value_type &getMax_impl() const + { + return max_; }; void pe_impl(const height_type &rhs) { - value_ = tools::diffabs(reflevel_, rhs.getReflevel()); + min_ = ntg::min(min_, rhs.getMin()); + max_ = ntg::max(max_, rhs.getMax()); + value_ = max_ - min_; }; bool less_impl(const lambda_type &lambda) const @@ -305,8 +320,9 @@ }; protected: - value_type reflevel_; value_type value_; + value_type min_; + value_type max_; }; @@ -413,7 +429,7 @@ bool less_impl(const lambda_type &lambda) const { - return value_ < lambda; + return value_ > lambda; }; bool ne_impl(const lambda_type &lambda) const @@ -452,17 +468,27 @@ }; disk_type(const im_type&, const point_type &p, const env_type &) : - value_(1), pts_() + value_(ntg_zero_val(value_type)), pts_() + { pts_.push_back(p); }; + const value_type &getValue() const + { + mlc_dispatch(getValue)(); + }; + const pts_type &getPts() const { mlc_dispatch(getPts)(); }; // impl + const value_type &getValue_impl() const + { + return value_; + }; const pts_type &getPts_impl() const { @@ -471,7 +497,10 @@ void pe_impl(const disk_type &rhs) { - std::copy(rhs.getPts().begin(), rhs.getPts().end(), std::back_inserter(pts_)); + value_type last = value_; + std::copy(rhs.getPts().begin(), + rhs.getPts().end(), + std::back_inserter(pts_)); value_ = ntg_zero_val(value_type); for (cst_iter_type p1 = pts_.begin(); p1 != pts_.end(); ++p1) for (cst_iter_type p2 = pts_.begin(); p2 != pts_.end(); ++p2) @@ -484,6 +513,8 @@ value_ = d; } value_ /= 2; + value_ = ntg::max(value_, last); + value_ = ntg::max(value_, rhs.getValue()); }; bool less_impl(const lambda_type &lambda) const @@ -530,6 +561,11 @@ { }; + const value_type &getValue() const + { + mlc_dispatch(getValue)(); + }; + dist_type(const lambda_type lambda): value_(lambda) { }; @@ -545,14 +581,22 @@ return center_; }; + const value_type &getValue_impl() const + { + return value_; + }; + void pe_impl(const dist_type &rhs) { + value_type last = value_; dpoint_type p = center_ - rhs.getCenter(); value_ = ntg_zero_val(value_type); for (int i = 0; i < point_traits<point_type>::dim; ++i) value_ += p.nth(i) * p.nth(i); value_ = sqrt(value_); + value_ = ntg::max(value_, last); + value_ = ntg::max(value_, rhs.getValue()); }; bool less_impl(const lambda_type &lambda) const @@ -841,9 +885,8 @@ typedef ntg::vec<I::dim, value_type, mlc::final> lambda_type; typedef NullEnv env_type; }; - } - } -} + } // !morpho +} //!oln /*-----------* | diamond | Index: olena/oln/morpho/attribute_closing_opening_map.hxx --- olena/oln/morpho/attribute_closing_opening_map.hxx Tue, 10 Feb 2004 19:49:03 +0100 van-vl_n (oln/j/48_attribute_ 1.1 644) +++ olena/oln/morpho/attribute_closing_opening_map.hxx Thu, 12 Feb 2004 14:05:43 +0100 palma_g (oln/j/48_attribute_ 1.1 644) @@ -30,6 +30,8 @@ { namespace morpho { + namespace slow + { template <class I, class D, class Env> template <class N> f_tarjan_map<I, D, Env>::f_tarjan_map(bool is_closing, @@ -189,6 +191,7 @@ } } } + } // end of namespace slow } // end of namespace morpho } // end of namespace oln Index: olena/oln/morpho/attribute_closing_opening_map.hh --- olena/oln/morpho/attribute_closing_opening_map.hh Tue, 10 Feb 2004 19:49:03 +0100 van-vl_n (oln/j/49_attribute_ 1.1 600) +++ olena/oln/morpho/attribute_closing_opening_map.hh Mon, 16 Feb 2004 08:39:58 +0100 palma_g (oln/j/49_attribute_ 1.1 600) @@ -33,6 +33,7 @@ # include <ntg/int.hh> # include <oln/utils/histogram.hh> # include <oln/utils/special_points.hh> +# include <oln/morpho/attributes.hh> # include <iterator> # include <vector> @@ -45,14 +46,15 @@ { namespace morpho { - + namespace slow + { /*! Attribute closing using map. Smaller memory usage, but * slower computation than the attribute_closing_opening * * See "Fast morphological attribute operations using Tarjan's union-find * algorithm" by Michael H. F. Wilkinson and Jos B. T. M. Roerdink */ - template <class I, class D, class Env = morpho::tarjan::NullEnv> + template <class I, class D, class Env = morpho::NullEnv> struct f_tarjan_map { public: @@ -63,7 +65,7 @@ typedef oln_value_type(input_type) value_type; typedef typename mute<input_type, point_type>::ret parent_type; typedef typename mute<input_type, bool>::ret is_proc_type; - typedef typename D::lambda_type lambda_type; + typedef attr_lambda_type(D) lambda_type; // e.g., // when I is image2d<int_u8> and D is area_type, we've got: @@ -82,8 +84,7 @@ const lambda_type& lambda, const Env & env = Env()); - template<typename DestValue> - typename mute<I, DestValue>::ret + oln_concrete_type(I) res() { return output; @@ -128,21 +129,92 @@ * See "Fast morphological attribute operations using Tarjan's union-find * algorithm" by Michael H. F. Wilkinson and Jos B. T. M. Roerdink */ - template <typename DestValue, class I, class D, class Env, class N> - typename mute<I, DestValue>::ret + template <class D, class I, class N> + oln_concrete_type(I) tarjan_map(bool is_closing, const abstract::image& input, const abstract::neighborhood<N>& ng, - const typename D::lambda_type& lambda, - const Env & env = Env()) + const attr_lambda_type(D)& lambda, + const attr_env_type(D)& env/* = Env()*/) { - oln::morpho::f_tarjan_map<I, D, Env > t(is_closing, + oln::morpho::slow::f_tarjan_map<I, D, attr_env_type(D) > t(is_closing, input, ng, lambda, env); - return t. template res<DestValue>(); + return t.res(); + } + + /*! Some macro to declare friendly function for different attributes + * opening/closing + */ +# define xxx_opening_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_opening(const abstract::image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(T##_type<>)& lambda) \ + { \ + return tarjan_map<T##_type<>, I, N>(false, input, ng, lambda, \ + attr_env_type(T##_type<>)()); \ + } + + // same but attribute take care of the image type +# define xxx_opening_im_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_opening(const abstract::image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(T##_type)& lambda) \ + { \ + return tarjan_map<T##_type, I, N>(false, input, ng, lambda, \ + attr_env_type(T##_type)()); \ } + + //return input; + // return tarjan_map<T##_type, I, N>(false, input, ng, lambda, attr_env_type(T##_type<>)()); +# define xxx_closing_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_closing(const abstract::image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(T##_type<>)& lambda) \ + { \ + return tarjan_map<T##_type<>, I, N>(true, input, ng, lambda, attr_env_type(T##_type<>)()); \ + } + + // same but attribute take care of the image type +# define xxx_closing_im_map_decl(T) \ +template <class I, class N> \ +oln_concrete_type(I) \ +T##_closing(const abstract::image& input, \ + const abstract::neighborhood<N>& ng, \ + const attr_lambda_type(T##_type)& lambda) \ + { \ + return tarjan_map<T##_type, I, N>(true, input, ng, lambda, attr_env_type(T##_type)()); \ + } + + xxx_opening_map_decl(area); + xxx_closing_map_decl(area); + xxx_opening_map_decl(volume); + xxx_closing_map_decl(volume); + xxx_opening_map_decl(height); + xxx_closing_map_decl(height); + xxx_opening_map_decl(maxvalue); + xxx_closing_map_decl(maxvalue); + xxx_opening_map_decl(minvalue); + xxx_closing_map_decl(minvalue); + xxx_opening_im_map_decl(disk); + xxx_closing_im_map_decl(disk); + xxx_opening_im_map_decl(dist); + xxx_closing_im_map_decl(dist); + xxx_closing_im_map_decl(square); + xxx_opening_im_map_decl(square); + xxx_closing_im_map_decl(rectangle); + xxx_opening_im_map_decl(rectangle); + + + } // end of namespace slow } // end of namespace morpho } // end of namespace oln Index: olena/tests/morpho/tests/attribute --- olena/tests/morpho/tests/attribute Tue, 10 Feb 2004 19:49:03 +0100 van-vl_n (oln/j/51_attribute 1.1 644) +++ olena/tests/morpho/tests/attribute Mon, 16 Feb 2004 08:40:49 +0100 palma_g (oln/j/51_attribute 1.1 644) @@ -28,10 +28,10 @@ bool fail(false); typedef image2d<int_u8> img_type; - typedef oln::morpho::tarjan::area_type<unsigned> area_type; + typedef oln::morpho::area_type<unsigned> area_type; const area_type::lambda_type area = 100; const neighborhood2d nb = neighb_c8(); - const oln::morpho::tarjan::NullEnv env; + // const oln::morpho::NullEnv env; img_type lena = load(rdata("lena.pgm")); img_type lena_sure_closing = oln::morpho::sure_minima_killer(lena, area, nb); @@ -41,9 +41,10 @@ img_type lena_tst_closing; std::cerr << "testing tarjan_map..." << std::endl; - lena_tst_closing = morpho::tarjan_map<ntg::int_u8,img_type,area_type>(true, lena, nb, area, env); - lena_tst_opening= morpho::tarjan_map<ntg::int_u8,img_type,area_type>(false, lena, nb, area, env); - +// lena_tst_closing = morpho::slow::tarjan_map<area_type,ntg::int_u8,img_type>(true, lena, nb, area, env); +// lena_tst_opening= morpho::slow::tarjan_map<area_type,ntg::int_u8,img_type>(false, lena, nb, area, env); + lena_tst_closing = morpho::slow::area_closing(lena, nb, area); + lena_tst_opening = morpho::slow::area_opening(lena, nb, area); fail = fail || !level::is_equal(lena_sure_closing, lena_tst_closing)|| @@ -59,8 +60,8 @@ std::cerr << "fail:" << fail << std::endl; std::cerr << "testing area_closin and area_opeing..." << std::endl; - lena_tst_closing = morpho::tarjan::area_closing(lena, nb, area); - lena_tst_opening = morpho::tarjan::area_opening(lena, nb, area); + lena_tst_closing = morpho::fast::area_closing(lena, nb, area); + lena_tst_opening = morpho::fast::area_opening(lena, nb, area); fail = fail || !level::is_equal(lena_sure_closing, lena_tst_closing)|| !level::is_equal(lena_sure_opening, lena_tst_opening); @@ -70,12 +71,13 @@ return fail; } - bool check_attribute() { + bool fail = false; + //FIXME attributes should be checked - return false; + return fail; } Index: olena/tests/morpho/tests/attr_op_cl --- olena/tests/morpho/tests/attr_op_cl Mon, 16 Feb 2004 19:05:52 +0100 palma_g () +++ olena/tests/morpho/tests/attr_op_cl Mon, 16 Feb 2004 18:48:30 +0100 palma_g (oln/k/0_attr_op_cl 644) @@ -0,0 +1,77 @@ +// -*- c++ -*- + +#include <oln/basics2d.hh> +#include <oln/morpho/attribute_closing_opening.hh> +#include <oln/morpho/attribute_closing_opening_map.hh> +#include <oln/level/compare.hh> +#include <ntg/all.hh> + +#include "check.hh" +#include "data.hh" + +using namespace oln; +using namespace ntg; + +#define OK_OR_FAIL \ + std::cout << "OK" << std::endl; \ + else \ + { \ + std::cout << "FAIL" << std::endl; \ + fail = true; \ + } + +# define test_op_cl(T, A, im, lambda) \ +{ \ + bool last_fail = fail; \ + fail = false; \ + { \ + image2d<T> im2 = oln::morpho::slow::A##_opening(im, neighb_c4(), lambda); \ + image2d<T> im1 = oln::morpho::fast::A##_opening(im, neighb_c4(), lambda); \ + image2d<T>::iter_type it(lena); \ + std::cout << #A << " opening: "; \ + for_all(it) \ + { \ + if (im1[it] != im2[it]) \ + fail = true; \ + } \ + if (!fail) \ + OK_OR_FAIL \ + } \ + { \ + image2d<T> im2 = oln::morpho::slow::A##_closing(im, neighb_c4(), lambda); \ + image2d<T> im1 = oln::morpho::fast::A##_closing(im, neighb_c4(), lambda); \ + image2d<T>::iter_type it(lena); \ + std::cout << #A <<" closing: "; \ + for_all(it) \ + { \ + if (im1[it] != im2[it]) \ + fail = true; \ + } \ + if (!fail) \ + OK_OR_FAIL \ + } \ + fail = last_fail || fail; \ +} + + +bool +check() +{ + bool fail = false; + + image2d<int_u8> lena(rdata("lena256.pgm")); + std::cout << std::endl; + test_op_cl(int_u8, area, lena, 200) + test_op_cl(int_u8, volume, lena, 200) + test_op_cl(int_u8, height, lena, 4) + test_op_cl(int_u8, maxvalue, lena, 100) + test_op_cl(int_u8, minvalue, lena, 100) + test_op_cl(int_u8, dist, lena, 100) + test_op_cl(int_u8, disk, lena, 100) + test_op_cl(int_u8, square, lena, 50) + + ntg::vec<2, unsigned, mlc::final> lambda; + test_op_cl(int_u8, rectangle, lena, lambda) + + return fail; +} -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 2 months

reunion olena demain jeudi 19/02/2004 a 10h00

by Réda Dehak

* problemes des namespaces. * la doc

21 years, 2 months

page assignements du twiki

by Simon Odou

Oleneux, Oleneux Il faudrait que chacun mette à jour sa section de la page assignement du twiki, de manière à la rendre beaucoup plus précise qu'elle ne l'est actuellement. L'idéal serait qu'y figure notre travail hebdomadaire. http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/OlenaAssignments -- Simon Odou simon(a)lrde.epita.fr

21 years, 2 months

oln 10.62: attributes (2nd part)

by Giovanni Palma

Index: ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * NEWS: Describe color and attributes improvement. Index: integre/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ntg/vect/vec.hh: Add sup() function to vec traits. Index: metalic/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * mlc/type.hh: Add some useful macros. Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/morpho/attributes.hh: Add new attributes. Correct the olders. * oln/morpho/attribute_union_find.hh: Change lambda type from ref to pointer. * oln/morpho/attribute_closing_opening.hh: Fix some argument types. Add new declarations. Index: NEWS --- NEWS Fri, 08 Aug 2003 16:27:13 +0200 david (oln/0_NEWS 1.16 640) +++ NEWS Mon, 09 Feb 2004 18:44:40 +0100 palma_g (oln/0_NEWS 1.16 640) @@ -1,3 +1,13 @@ +Olena 0.10 Not yet + + * Attribute opening/closing enhancement + - Make the algothim more generic. + - Add a lot of attributes. + + * Change the color conversion system + - CIE RGB is the main color system. + - Conversion between 2 color systems should pass by the RGB one. + Olena 0.9 August 8, 2003 * New static hierarchy paradigm Index: metalic/mlc/type.hh --- metalic/mlc/type.hh Fri, 07 Nov 2003 17:19:10 +0100 burrus_n (oln/c/21_type.hh 1.27 640) +++ metalic/mlc/type.hh Mon, 09 Feb 2004 18:14:34 +0100 palma_g (oln/c/21_type.hh 1.27 640) @@ -237,6 +237,13 @@ # define mlc_exact_type(T) typename mlc::exact< T >::ret # define mlc_exact_type_(T) mlc::exact< T >::ret +// Return the exact virtual type of two given types (inheritance determination). + +# define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret +# define mlc_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret +# define mlc_exact_vt_type_(T, Exact) mlc::exact_vt<T, Exact>::ret +# define mlc_2_exact_vt_type_(self, T, Exact) mlc::exact_vt<self<T, Exact>, Exact>::ret + namespace mlc { @@ -299,4 +306,10 @@ # define mlc_init_static_hierarchy(Exact) +/*---------. +| dispatch | +`---------*/ + +# define mlc_dispatch(Fun) return exact().Fun##_impl + #endif // ! METALIC_TYPE_HH Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Fri, 06 Feb 2004 16:02:37 +0100 palma_g (oln/q/49_attribute_ 1.11 640) +++ olena/oln/morpho/attribute_closing_opening.hh Fri, 06 Feb 2004 17:44:37 +0100 palma_g (oln/q/49_attribute_ 1.11 640) @@ -41,7 +41,7 @@ oln_concrete_type(I) attr_closing_(const abstract::non_vectorial_image& input, const abstract::neighborhood<N>& Ng, - const attr_lambda_type(A) lambda) + const attr_lambda_type(A) &lambda) { typedef tarjan::tarjan_set<oln_concrete_type(I), A > tarjan_set_type; tarjan_set_type area_closing(input.exact(), attr_env_type(A)()); @@ -53,7 +53,7 @@ oln_concrete_type(I) attr_opening_(const abstract::non_vectorial_image& input, const abstract::neighborhood<N>& Ng, - const attr_lambda_type(A) lambda) + const attr_lambda_type(A) &lambda) { typedef tarjan::tarjan_set<oln_concrete_type(I), A > tarjan_set_type; tarjan_set_type area_opening(input.exact(), attr_env_type(A)()); @@ -68,7 +68,7 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type<unsigned>) lambda) \ + const attr_lambda_type(T##_type<unsigned>) &lambda) \ { \ return internal::attr_opening_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ } @@ -78,7 +78,7 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type<unsigned>) lambda) \ + const attr_lambda_type(T##_type<unsigned>) &lambda) \ { \ return internal::attr_closing_<I, N, T##_type<unsigned> >(input, Ng, lambda); \ } @@ -90,7 +90,7 @@ oln_concrete_type(I) \ T##_opening(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type) lambda) \ + const attr_lambda_type(T##_type) &lambda) \ { \ return internal::attr_opening_<I, N, T##_type >(input, Ng, lambda); \ } @@ -100,7 +100,7 @@ oln_concrete_type(I) \ T##_closing(const abstract::non_vectorial_image& input, \ const abstract::neighborhood<N>& Ng, \ - const attr_lambda_type(T##_type) lambda) \ + const attr_lambda_type(T##_type) &lambda) \ { \ return internal::attr_closing_<I, N, T##_type >(input, Ng, lambda); \ } @@ -159,6 +159,9 @@ xxx_closing_im_decl(dist) xxx_closing_im_decl(square) xxx_opening_im_decl(square) + xxx_closing_im_decl(rectangle) + xxx_opening_im_decl(rectangle) + } } } Index: olena/oln/morpho/attribute_union_find.hh --- olena/oln/morpho/attribute_union_find.hh Fri, 06 Feb 2004 16:02:37 +0100 palma_g (oln/q/50_attribute_ 1.9 640) +++ olena/oln/morpho/attribute_union_find.hh Fri, 06 Feb 2004 17:55:37 +0100 palma_g (oln/q/50_attribute_ 1.9 640) @@ -150,7 +150,7 @@ { precondition((parent_[x] == ACTIVE()) || (parent_[x] == INACTIVE())); precondition((parent_[y] == ACTIVE()) || (parent_[y] == INACTIVE())); - return ( (input_[x] == input_[y]) || (aux_data_[x] < lambda_)); + return ( (input_[x] == input_[y]) || (aux_data_[x] < *lambda_)); } void @@ -165,7 +165,7 @@ } else { - aux_data_[p] = lambda_; + aux_data_[p] = *lambda_; } } @@ -177,7 +177,7 @@ const abstract::neighborhood<N>& Ng, const bool closing) { - lambda_ = lambda; + lambda_ = λ std::vector<point_type> I(input_.npoints()); @@ -232,7 +232,7 @@ const image_type & input_; typename mute<T, point_type>::ret parent_; typename mute<T, ATTRIBUTE>::ret aux_data_; - lambda_type lambda_; + const lambda_type *lambda_; const env_type env_; }; } Index: integre/ntg/vect/vec.hh --- integre/ntg/vect/vec.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/t/18_vec.hh 1.7.1.1 640) +++ integre/ntg/vect/vec.hh Mon, 09 Feb 2004 18:32:07 +0100 palma_g (oln/t/18_vec.hh 1.7.1.1 640) @@ -105,6 +105,23 @@ typedef self base_type; typedef T storage_type[N]; typedef typename typetraits<T>::cumul_type cumul_type[N]; + + static const self &sup() + { + static self tmp = mkSup(); + + return tmp; + }; + + protected: + static self mkSup() + { + self tmp; + + for (unsigned i = 0; i < N; ++i) + tmp[i] = ntg_sup_val(T); + return tmp; + }; }; } // end of internal. Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Fri, 06 Feb 2004 16:02:37 +0100 palma_g (oln/j/45_attributes 1.1 644) +++ olena/oln/morpho/attributes.hh Mon, 09 Feb 2004 18:37:42 +0100 palma_g (oln/j/45_attributes 1.1 644) @@ -27,12 +27,15 @@ #ifndef ATTRIBUTES_HH # define ATTRIBUTES_HH +# include <mlc/type.hh> +# include <vector> + // some usefull macros // those macros should be moved into mlc -# define oln_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret -# define oln_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret -# define dispatch(Fun) return exact().Fun##_impl +// # define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret +// # define oln_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret +// # define dispatch(Fun) return exact().Fun##_impl // attribute dedicated macros # define attr_lambda_type(T) typename attr_traits<T>::lambda_type @@ -40,38 +43,23 @@ # define attr_value_type(T) typename attr_traits<T>::value_type # define attr_type_decl(slef_type) \ - typedef oln_exact_vt_type(self_type, Exact) exact_type; \ + typedef mlc_exact_vt_type(self_type, Exact) exact_type; \ typedef attr_value_type(exact_type) value_type; \ typedef attr_env_type(exact_type) env_type; \ typedef attr_lambda_type(exact_type) lambda_type - - -// misc -namespace my { - - int diffabs(int v1, int v2) +namespace oln { + namespace morpho { + namespace tarjan { + namespace tools { + // should be moved elsewhere + template <class T> + T diffabs(const T &v1, const T &v2) { return v1 > v2 ? v1 - v2 : v2 - v1; } - template <class T> - T max(T v1, T v2) - { - return v1 > v2 ? v1 : v2; } - - template <class T> - T min(T v1, T v2) - { - return v1 < v2 ? v1 : v2; - } - -} // end of namespace my - -namespace oln { - namespace morpho { - namespace tarjan { // environment herarchy // not used yet template <class Exact> @@ -104,22 +92,28 @@ void operator+=(const exact_type& rhs) { - dispatch(pe)(rhs); + mlc_dispatch(pe)(rhs); }; - void operator=(lambda_type lambda) + bool operator>=(const lambda_type &lambda) const { - dispatch(equal)(lambda); + mlc_dispatch(ge)(lambda); }; bool operator<(const lambda_type& lambda) const { - dispatch(less)(lambda); + mlc_dispatch(less)(lambda); }; bool operator!=(const lambda_type& lambda) const { - dispatch(ne)(lambda); + mlc_dispatch(ne)(lambda); + }; + + // impl + bool ge_impl(const lambda_type &lambda) const + { + return !(*this < lambda); }; protected: @@ -131,9 +125,9 @@ | area | *-----------*/ - template <class T, class Exact = mlc::final> + template <class T = unsigned, class Exact = mlc::final> class area_type: - public attribute<oln_2_exact_vt_type(area_type, T, Exact)> + public attribute<mlc_2_exact_vt_type(area_type, T, Exact)> { public: typedef area_type<T, Exact> self_type; @@ -160,11 +154,6 @@ value_ += rhs.value_; }; - void equal_impl(lambda_type lambda) - { - value_ = lambda; - }; - bool less_impl(const lambda_type& lambda) const { return value_ < lambda; @@ -186,9 +175,9 @@ | volume | *-----------*/ - template <class T, class Exact = mlc::final> + template <class T = unsigned, class Exact = mlc::final> class volume_type: - public attribute<oln_2_exact_vt_type(volume_type, T, Exact)> + public attribute<mlc_2_exact_vt_type(volume_type, T, Exact)> { public: typedef volume_type<T, Exact> self_type; @@ -216,17 +205,17 @@ // interface part const value_type &getValue() const { - dispatch(getValue)(); + mlc_dispatch(getValue)(); }; const value_type &getReflevel() const { - dispatch(getReflevel)(); + mlc_dispatch(getReflevel)(); }; const value_type &getArea() const { - dispatch(getArea)(); + mlc_dispatch(getArea)(); }; // impl part @@ -245,14 +234,9 @@ return area_; }; - void equal_impl(lambda_type lambda) - { - value_ = lambda; - }; - void pe_impl(const volume_type& rhs) { - value_ += rhs.getValue() + area_ * my::diffabs(reflevel_, rhs.getReflevel()); + value_ += rhs.getValue() + area_ * tools::diffabs(reflevel_, rhs.getReflevel()); area_ += rhs.getArea(); }; @@ -276,9 +260,9 @@ | height | *-----------*/ - template <class T, class Exact = mlc::final> + template <class T = unsigned, class Exact = mlc::final> class height_type: - public attribute<oln_2_exact_vt_type(height_type, T, Exact)> + public attribute<mlc_2_exact_vt_type(height_type, T, Exact)> { public: typedef height_type<T, Exact> self_type; @@ -297,13 +281,13 @@ const oln_point_type(I)& p, const env_type&): reflevel_(input[p]), - value_(0) + value_(ntg_zero_val(value_type)) { }; const value_type &getReflevel() const { - dispatch(getReflevel)(); + mlc_dispatch(getReflevel)(); }; // impl part @@ -312,14 +296,9 @@ return reflevel_; }; - void equal_impl(lambda_type lambda) - { - value_ = lambda; - }; - void pe_impl(const height_type& rhs) { - value_ = my::diffabs(reflevel_, rhs.getReflevel()); + value_ = tools::diffabs(reflevel_, rhs.getReflevel()); }; bool less_impl(const lambda_type& lambda) const @@ -342,9 +321,9 @@ | maxvalue | *-----------*/ - template <class T, class Exact = mlc::final> + template <class T = unsigned, class Exact = mlc::final> class maxvalue_type: - public attribute<oln_2_exact_vt_type(maxvalue_type, T, Exact)> + public attribute<mlc_2_exact_vt_type(maxvalue_type, T, Exact)> { public: typedef maxvalue_type<T, Exact> self_type; @@ -368,7 +347,7 @@ const value_type &getValue() const { - dispatch(getValue)(); + mlc_dispatch(getValue)(); }; const value_type &getValue_impl() const @@ -378,7 +357,7 @@ void pe_impl(const maxvalue_type& rhs) { - value_ = my::max(value_, rhs.getValue()); + value_ = ntg::max(value_, rhs.getValue()); }; bool less_impl(const lambda_type& lambda) const @@ -400,9 +379,9 @@ | minvalue | *-----------*/ - template <class T, class Exact = mlc::final> + template <class T = unsigned, class Exact = mlc::final> class minvalue_type: - public attribute<oln_2_exact_vt_type(minvalue_type, T, Exact)> + public attribute<mlc_2_exact_vt_type(minvalue_type, T, Exact)> { public: typedef minvalue_type<T, Exact> self_type; @@ -426,7 +405,7 @@ const value_type &getValue() const { - dispatch(getValue)(); + mlc_dispatch(getValue)(); }; const value_type &getValue_impl() const @@ -436,7 +415,7 @@ void pe_impl(const minvalue_type& rhs) { - value_ = my::min(value_, rhs.getValue()); + value_ = ntg::min(value_, rhs.getValue()); }; bool less_impl(const lambda_type& lambda) const @@ -460,7 +439,7 @@ template <class I, class Exact = mlc::final> class disk_type: - public attribute<oln_2_exact_vt_type(disk_type, I, Exact)> + public attribute<mlc_2_exact_vt_type(disk_type, I, Exact)> { public: typedef disk_type<I, Exact> self_type; @@ -487,7 +466,7 @@ const pts_type &getPts() const { - dispatch(getPts)(); + mlc_dispatch(getPts)(); }; // impl @@ -500,7 +479,7 @@ void pe_impl(const disk_type& rhs) { std::copy(rhs.getPts().begin(), rhs.getPts().end(), std::back_inserter(pts_)); - value_ = 0; + value_ = ntg_zero_val(value_type); for (cst_iter_type p1 = pts_.begin(); p1 != pts_.end(); ++p1) for (cst_iter_type p2 = pts_.begin(); p2 != pts_.end(); ++p2) { @@ -537,7 +516,7 @@ template <class I, class Exact = mlc::final> class dist_type: - public attribute<oln_2_exact_vt_type(dist_type, I, Exact)> + public attribute<mlc_2_exact_vt_type(dist_type, I, Exact)> { public: typedef dist_type<I, Exact> self_type; @@ -546,9 +525,6 @@ typedef oln_point_type(im_type) point_type; typedef oln_dpoint_type(im_type) dpoint_type; -// typedef float value_type; -// typedef value_type lambda_type; - dist_type() { }; @@ -556,7 +532,7 @@ dist_type(const im_type&, const point_type& p, const env_type &) : - value_(0), + value_(ntg_zero_val(value_type)), center_(p) { }; @@ -567,7 +543,7 @@ const point_type &getCenter() const { - dispatch(getCenter)(); + mlc_dispatch(getCenter)(); }; // impl @@ -580,7 +556,7 @@ { dpoint_type p = center_ - rhs.getCenter(); - value_ = 0; + value_ = ntg_zero_val(value_type); for (int i = 0; i < point_traits<point_type>::dim; ++i) value_ += p.nth(i) * p.nth(i); value_ = sqrt(value_); @@ -610,7 +586,7 @@ template <class I, class Exact = mlc::final> class square_type: - public attribute<oln_2_exact_vt_type(square_type, I, Exact)> + public attribute<mlc_2_exact_vt_type(square_type, I, Exact)> { public: typedef square_type<I, Exact> self_type; @@ -619,139 +595,177 @@ typedef oln_point_type(im_type) point_type; typedef oln_dpoint_type(im_type) dpoint_type; -// typedef unsigned value_type; -// typedef value_type lambda_type; + enum {dim = point_traits<point_type>::dim}; square_type() { } - square_type(const lambda_type &lambda) : value_(lambda) + square_type(const lambda_type &lambda): + mins_(dim), + maxs_(dim), + value_(lambda) + { + for (int i = 0; i < point_traits<point_type>::dim; ++i) { + maxs_[i] = lambda; + mins_[i] = ntg_zero_val(coord); + } }; square_type(const im_type&, const point_type& p, const env_type &) : - value_(0) + mins_(dim), maxs_(dim), value_(ntg_zero_val(value_type)) { - min_row_ = max_row_ = p.row(); - min_col_ = max_col_ = p.col(); + for (int i = 0; i < dim; ++i) + mins_[i] = maxs_[i] = p.nth(i); } - int getMinRow() const + int getMin(int i) const { - dispatch(getMinRow)(); + mlc_dispatch(getMin)(i); }; - int getMaxRow() const + int getMax(int i) const { - dispatch(getMaxRow)(); + mlc_dispatch(getMax)(i); }; - int getMaxCol() const + // impl + int getMin_impl(int i) const { - dispatch(getMaxCol)(); + precondition(i < dim); + return mins_[i]; }; - int getMinCol() const + int getMax_impl(int i) const { - dispatch(getMinCol)(); + precondition(i < dim); + return maxs_[i]; }; - // impl - int getMinRow_impl() const + void pe_impl(const square_type &rhs) + { + for (int i = 0; i < dim; ++i) + { + mins_[i] = ntg::min(mins_[i], rhs.getMin(i)); + maxs_[i] = ntg::max(maxs_[i], rhs.getMax(i)); + } + value_ = maxs_[0] - mins_[0]; + for (int i = 1; i < dim; ++i) + if (value_ < value_type(maxs_[i] - mins_[i])) + value_ = maxs_[i] - mins_[i]; + } + + bool less_impl(const lambda_type &lambda) const + { + return value_ < lambda; + } + + bool ne_impl(const lambda_type &lambda) const { - return min_row_; + return value_ != lambda; }; - int getMaxRow_impl() const + protected: + std::vector<coord> mins_; + std::vector<coord> maxs_; + value_type value_; + }; + + + + /*-----------* + | rectangle | + *-----------*/ + template <class I, class Exact = mlc::final> + class rectangle_type: + public attribute<mlc_2_exact_vt_type(rectangle_type, I, Exact)> { - return max_row_; + public: + typedef rectangle_type<I, Exact> self_type; + attr_type_decl(self_type); + typedef abstract::image<mlc_exact_type(I)> im_type; + typedef oln_point_type(im_type) point_type; + typedef oln_dpoint_type(im_type) dpoint_type; + enum {dim = point_traits<point_type>::dim }; + + rectangle_type(const lambda_type &lambda): maxs_(dim), mins_(dim) + { + for (int i = 0; i < dim; ++i) + { + mins_[i] = ntg_zero_val(value_type); + maxs_[i] = lambda[i]; + } }; - int getMaxCol_impl() const + rectangle_type() + { + } + + rectangle_type(const im_type&, const point_type &p, const env_type &): maxs_(dim), mins_(dim) + { + for (int i = 0; i < dim; ++i) + mins_[i] = maxs_[i] = p.nth(i); + } + + value_type getMin(int i) const { - return max_col_; + mlc_dispatch(getMin)(i); }; - int getMinCol_impl() const + value_type getMax(int i) const { - return min_col_; + mlc_dispatch(getMax)(i); }; - void pe_impl(const square_type& rhs) + // impl + value_type getMin_impl(int i) const + { + precondition(i < point_traits<point_type>::dim); + return mins_[i]; + }; + + value_type getMax_impl(int i) const + { + precondition(i < point_traits<point_type>::dim); + return maxs_[i]; + }; + + void pe_impl(const rectangle_type &rhs) + { + for (int i = 0; i < dim; ++i) { - min_row_ = my::min(min_row_, rhs.getMinRow()); - min_col_ = my::min(min_col_, rhs.getMinCol()); - max_row_ = my::max(max_row_, rhs.getMaxRow()); - max_col_ = my::max(max_col_, rhs.getMaxCol()); - value_ = my::max(max_row_ - min_row_, max_col_ - min_col_); + mins_[i] = ntg::min(mins_[i], rhs.getMin(i)); + maxs_[i] = ntg::max(maxs_[i], rhs.getMax(i)); + } } bool less_impl(const lambda_type& lambda) const { - return value_ < lambda; + for (int i = 0; i < dim; ++i) + if ((maxs_[i] - mins_[i]) >= lambda[i]) + return false; + return true; } bool ne_impl(const lambda_type &lambda) const { - return value_ != lambda; + for (int i = 0; i < dim; ++i) + if ((maxs_[i] - mins_[i]) == lambda[i]) + return false; + return true; }; protected: - value_type value_; - int min_row_; - int max_row_; - int min_col_; - int max_col_; + std::vector<value_type> maxs_; + std::vector<value_type> mins_; }; - - -// /*-----------* -// | rectangle | -// *-----------*/ -// template <class I, class Exact = mlc::final> -// struct rectangle_type -// { -// typedef unsigned value_type; -// typedef std::pair<value_type,value_type> lambda_type; - -// value_type drow, dcol; -// int min_row, max_row, min_col, max_col; - -// rectangle_type() -// { -// } - -// template <class T> -// rectangle_type(const image2d<T>&, const point2d& p) : -// drow(0), -// dcol(0) -// { -// min_row = max_row = p.row(); -// min_col = max_col = p.col(); -// } - -// void operator+=(const rectangle_type& rhs) -// { -// min_row = my::min(min_row, rhs.min_row); -// min_col = my::min(min_col, rhs.min_col); -// max_row = my::max(max_row, rhs.max_row); -// max_col = my::max(max_col, rhs.max_col); -// drow = max_row - min_row; -// dcol = max_col - min_col; -// } - -// bool operator>=(const lambda_type& lambda) const -// { -// return drow >= lambda.first || dcol >= lambda.second; -// } -// }; - - -// traits specialisations + /*------------------------- + | traits specialisations | + \------------------------*/ // volume traits @@ -826,16 +840,18 @@ typedef NullEnv env_type; }; -// // rectangle traits -// tempalte <class Exact> -// typedef unsigned value_type; -// typedef std::pair<value_type,value_type> lambda_type; - + // rectangle traits + template <class I, class Exact> + struct attr_traits<rectangle_type<I, Exact> > + { + typedef unsigned value_type; + typedef ntg::vec<I::dim, value_type, mlc::final> lambda_type; + typedef NullEnv env_type; + }; } } } - /*-----------* | diamond | *-----------*/ -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 2 months

oln 10.63: Behavior hierarchy.

by Giovanni Palma

Index: ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * NEWS: Describe behavior hierarchy. Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/core/abstract/behavior.hh: Add behavior hierarchy (abstract part). * oln/core/behavior.hh: Add behavior hierarchy content. * oln/morpho/attributes.hh: Correct 'ifndef' macros. * tests/convol/tests/uniform_gauss: Improve tests. * oln/convol/fast_gaussian.hh: Make the gaussian take care of the behavior hierarchy. * oln/convol/fast_gaussian.hxx: Likewise. Index: NEWS --- NEWS Mon, 09 Feb 2004 18:57:03 +0100 palma_g (oln/0_NEWS 1.17 640) +++ NEWS Tue, 10 Feb 2004 15:25:07 +0100 palma_g (oln/0_NEWS 1.17 640) @@ -1,11 +1,18 @@ Olena 0.10 Not yet + * Border behavior can be controlled with the behavior hierarchy. + If an algorithm support it, you can choose the way the image + border will be seen. Three behaviors are available: mirror, + replicate or user defined value. + * Attribute opening/closing enhancement - - Make the algothim more generic. - - Add a lot of attributes. + - Make the algorithm more generic. + - Add a lot of attributes (area, disk, square, dist, + rectangle, volume, height, maxvalue, minvalue). * Change the color conversion system - - CIE RGB is the main color system. + - CIE RGB is the main color system e.g. it can be converted + directly into any other color system. - Conversion between 2 color systems should pass by the RGB one. Olena 0.9 August 8, 2003 Index: olena/oln/convol/fast_gaussian.hh --- olena/oln/convol/fast_gaussian.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/26_fast_gauss 1.6.1.6.1.3 640) +++ olena/oln/convol/fast_gaussian.hh Tue, 10 Feb 2004 14:56:04 +0100 palma_g (oln/26_fast_gauss 1.6.1.6.1.3 640) @@ -31,7 +31,7 @@ # include <oln/basics.hh> # include <oln/convert/basics.hh> # include <ntg/float.hh> - +# include <oln/core/behavior.hh> // // Gaussian filter implementation from // "Recursively implementing the gaussian and its derivatives" @@ -44,39 +44,66 @@ // FIXME: add tests! - template <class C, class B, class I> + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C, B, oln_value_type(I)>::ret>::ret gaussian(const convert::abstract::conversion<C, B>& input_conv, - const abstract::image& in, ntg::float_s sigma); + const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior); - template <class C, class B, class I> + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C, B, oln_value_type(I)>::ret>::ret gaussian_derivative(const convert::abstract::conversion<C, B>& input_conv, - const abstract::image& in, ntg::float_s sigma); - template <class C, class B, class I> + const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior); + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C, B, oln_value_type(I)>::ret>::ret gaussian_second_derivative(const convert::abstract::conversion<C, B>& input_conv, const abstract::image& in, - ntg::float_s sigma); + ntg::float_s sigma, + const abstract::behavior<BE> &behavior); /* Same functions, with a default conversion. */ + template <class I, class BE> inline + oln_concrete_type(I) + gaussian(const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior) + { return gaussian(convert::force<oln_value_type(I)>(), in, sigma, + behavior); } + + template <class I, class BE> inline + oln_concrete_type(I) + gaussian_derivative(const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior) + { return gaussian_derivative(convert::force<oln_value_type(I)>(), in, sigma, + behavior); } + + template <class I, class BE> inline + oln_concrete_type(I) + gaussian_second_derivative(const abstract::image& in, + ntg::float_s sigma, + const abstract::behavior<BE> &behavior = mirror_behavior<>()) + { return gaussian_second_derivative(convert::force<oln_value_type(I)>(), + in, sigma, behavior); } + + /* Same functions, with a default behavior (mirror_behavior). */ template <class I> inline oln_concrete_type(I) gaussian(const abstract::image& in, ntg::float_s sigma) - { return gaussian(convert::force<oln_value_type(I)>(), in, sigma); } + { return gaussian(convert::force<oln_value_type(I)>(), in, sigma, + mirror_bhv()); } template <class I> inline oln_concrete_type(I) gaussian_derivative(const abstract::image& in, ntg::float_s sigma) - { return gaussian_derivative(convert::force<oln_value_type(I)>(), in, sigma); } + { return gaussian_derivative(convert::force<oln_value_type(I)>(), in, sigma, + mirror_bhv()); } template <class I> inline oln_concrete_type(I) - gaussian_second_derivative(const abstract::image& in, - ntg::float_s sigma) - { return gaussian_second_derivative(convert::force<oln_value_type(I)>(), - in, sigma); } + gaussian_second_derivative(const abstract::image& in, ntg::float_s sigma) + { return gaussian_second_derivative(convert::force<oln_value_type(I)>(), in, sigma, + mirror_bhv()); } } } } Index: olena/oln/convol/fast_gaussian.hxx --- olena/oln/convol/fast_gaussian.hxx Wed, 28 Jan 2004 16:28:44 +0100 palma_g (oln/25_fast_gauss 1.7.1.8.1.5 640) +++ olena/oln/convol/fast_gaussian.hxx Tue, 10 Feb 2004 13:09:29 +0100 palma_g (oln/25_fast_gauss 1.7.1.8.1.5 640) @@ -230,12 +230,13 @@ } }; - template <class C, class B, class I, class F> + template <class C, class B, class I, class F, class BE> typename mute<I, typename convoutput<C,B,oln_value_type(I)>::ret>::ret gaussian_common_(const convert::abstract::conversion<C,B>& c, const abstract::image& in, const F& coef, - ntg::float_s sigma) + ntg::float_s sigma, + const abstract::behavior<BE> &behavior) { typename mute<I, ntg::float_s>::ret work_img(in.size()); @@ -247,7 +248,7 @@ be linear, so when sigma is big enougth, the signal may be parasitized by the non signal values. */ - work_img.border_adapt_mirror(ntg::cast::round<coord>(5 * sigma)); + behavior.adapt_border(work_img, ntg::cast::round<coord>(5 * sigma)); gaussian_<I::dim>::doit(work_img, coef); @@ -265,10 +266,11 @@ } // internal - template <class C, class B, class I> + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C,B,oln_value_type(I)>::ret>::ret gaussian(const convert::abstract::conversion<C,B>& c, - const abstract::image& in, ntg::float_s sigma) + const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior) { internal::recursivefilter_coef_<float> coef(1.68f, 3.735f, @@ -278,13 +280,14 @@ sigma, internal::recursivefilter_coef_<float>::DericheGaussian); - return internal::gaussian_common_(c, in, coef, sigma); + return internal::gaussian_common_(c, in, coef, sigma, behavior); } - template <class C, class B, class I> + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C,B,oln_value_type(I)>::ret>::ret gaussian_derivative(const convert::abstract::conversion<C,B>& c, - const abstract::image& in, ntg::float_s sigma) + const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior) { internal::recursivefilter_coef_<float> coef(-0.6472f, -4.531f, @@ -295,13 +298,14 @@ internal::recursivefilter_coef_<float> ::DericheGaussianFirstDerivative); - return internal::gaussian_common_(c, in, coef, sigma); + return internal::gaussian_common_(c, in, coef, sigma, behavior); } - template <class C, class B, class I> + template <class C, class B, class I, class BE> typename mute<I, typename convoutput<C,B,oln_value_type(I)>::ret>::ret gaussian_second_derivative(const convert::abstract::conversion<C,B>& c, - const abstract::image& in, ntg::float_s sigma) + const abstract::image& in, ntg::float_s sigma, + const abstract::behavior<BE> &behavior) { internal::recursivefilter_coef_<float> coef(-1.331f, 3.661f, @@ -312,7 +316,7 @@ internal::recursivefilter_coef_<float> ::DericheGaussianSecondDerivative); - return internal::gaussian_common_(c, in, coef, sigma); + return internal::gaussian_common_(c, in, coef, sigma, behavior); } } // fast Index: olena/tests/convol/tests/uniform_gauss --- olena/tests/convol/tests/uniform_gauss Fri, 30 Jan 2004 10:25:13 +0100 palma_g (oln/j/41_uniform_ga 1.1 644) +++ olena/tests/convol/tests/uniform_gauss Tue, 10 Feb 2004 15:17:49 +0100 palma_g (oln/j/41_uniform_ga 1.1 644) @@ -23,9 +23,10 @@ for_all(it) img[it] = 42; image2d<int_u8> img2 = convol::fast::gaussian(img, 5); + image2d<int_u8> img3 = convol::fast::gaussian(img, 5, replicate_bhv()); for_all(it) - if (img[it] != img2[it]) + if ((img[it] != img2[it]) || (img[it] != img3[it])) return true; return false; } Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Mon, 09 Feb 2004 18:57:03 +0100 palma_g (oln/j/45_attributes 1.2 644) +++ olena/oln/morpho/attributes.hh Tue, 10 Feb 2004 14:59:24 +0100 palma_g (oln/j/45_attributes 1.2 644) @@ -25,18 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef ATTRIBUTES_HH -# define ATTRIBUTES_HH +#ifndef OLN_MORPHO_ATTRIBUTES_HH +# define OLN_MORPHO_ATTRIBUTES_HH # include <mlc/type.hh> # include <vector> -// some usefull macros - -// those macros should be moved into mlc -// # define mlc_exact_vt_type(T, Exact) typename mlc::exact_vt<T, Exact>::ret -// # define oln_2_exact_vt_type(self, T, Exact) typename mlc::exact_vt<self<T, Exact>, Exact>::ret -// # define dispatch(Fun) return exact().Fun##_impl - // attribute dedicated macros # define attr_lambda_type(T) typename attr_traits<T>::lambda_type # define attr_env_type(T) typename attr_traits<T>::env_type @@ -859,5 +852,5 @@ // FIXME: to be written... -#endif // ndef ATTRIBUTES_HH +#endif // !OLN_MORPHO_ATTRIBUTES Index: olena/oln/core/abstract/behavior.hh --- olena/oln/core/abstract/behavior.hh Tue, 10 Feb 2004 15:33:34 +0100 palma_g () +++ olena/oln/core/abstract/behavior.hh Tue, 10 Feb 2004 14:54:58 +0100 palma_g (oln/j/46_behavior.h 644) @@ -0,0 +1,57 @@ +// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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 OLENA_CORE_ABSTRACT_BEHAVIOR_HH +# define OLENA_CORE_ABSTRACT_BEHAVIOR_HH +# include <mlc/type.hh> +# include <oln/core/abstract/image.hh> +# include <oln/core/coord.hh> + +namespace oln { + namespace abstract { + // behavior hierarchy + //the aim of this one is to describe how an algorithm should work + //on borders + template <class Exact> + class behavior: public mlc_hierarchy::any<Exact> + { + public: + typedef behavior<Exact> self_type; + typedef mlc_exact_vt_type(self_type, Exact) exact_type; + + template <class I> + void adapt_border(oln::abstract::image &im, coord border_size) const + { + mlc_dispatch(adapt_border)(im, border_size); + }; + protected: + behavior() {}; + }; + } // !abstract +} + +#endif // !OLENA_CORE_ABSTRACT_BEHAVIOR_HH Index: olena/oln/core/behavior.hh --- olena/oln/core/behavior.hh Tue, 10 Feb 2004 15:33:34 +0100 palma_g () +++ olena/oln/core/behavior.hh Tue, 10 Feb 2004 15:12:48 +0100 palma_g (oln/j/47_behavior.h 644) @@ -0,0 +1,108 @@ +// Copyright (C) 2004 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, 59 Temple Place - Suite 330, 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 OLENA_CORE_BEHAVIOR_HH +# define OLENA_CORE_BEHAVIOR_HH +# include <oln/core/abstract/behavior.hh> +# include <mlc/type.hh> + +namespace oln { + // mirror the image content into the border + template <class Exact = mlc::final> + class mirror_behavior: + public abstract::behavior<mlc_exact_vt_type(mirror_behavior<Exact>, Exact)> + { + public: + typedef mirror_behavior<Exact> self_type; + typedef mlc_exact_vt_type(self_type, Exact) exact_type; + + template <class I> + void adapt_border_impl(oln::abstract::image &im, coord border_size) const + { + im.border_adapt_mirror(border_size); + }; + }; + + // set the border to a specific value + template <class T, class Exact = mlc::final> + class value_behavior: + public abstract::behavior<mlc_2_exact_vt_type(value_behavior, T, Exact)> + { + public: + typedef value_behavior<T, Exact> self_type; + typedef mlc_exact_vt_type(self_type, Exact) exact_type; + typedef T value_type; + + explicit value_behavior(value_type value): value_(value) + { + }; + + template <class I> + void adapt_border_impl(abstract::image &im, coord border_size) const + { + im.border_adapt_assign(border_size, ntg::cast::force<oln_value_type(I)>(value_)); + }; + + protected: + value_type value_; + }; + + // replicate the border + template <class Exact = mlc::final> + class replicate_behavior: + public abstract::behavior<mlc_exact_vt_type(replicate_behavior<Exact>, Exact)> + { + public: + typedef replicate_behavior<Exact> self_type; + typedef mlc_exact_vt_type(self_type, Exact) exact_type; + + template <class I> + void adapt_border_impl(abstract::image &im, coord border_size) const + { + im.border_adapt_copy(border_size); + }; + }; + + // tools to call ctors with type inference + inline mirror_behavior<> mirror_bhv() + { + return mirror_behavior<>(); + } + + template <class T> + inline value_behavior<T> value_bhv(const T &value) + { + return value_behavior<T>(value); + } + + inline replicate_behavior<> replicate_bhv() + { + return replicate_behavior<>(); + } +} // !oln + +#endif // !OLN_CORE_BEHAVIOR_HH -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 2 months

test Passrelle MN

by Geoffroy Fouquier

. -- Geoffroy Fouquier Geoffroy.Fouquier(a)lrde.epita.fr

21 years, 2 months

test passerelle

by Geoffroy Fouquier

et hop. -- Geoffroy Fouquier Geoffroy.Fouquier(a)lrde.epita.fr

21 years, 2 months

oln 10.70: Autotools.

by Giovanni Palma

Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Mon, 08 Mar 2004 08:12:15 +0100 palma_g (oln/d/51_Makefile.a 1.27.1.10 640) +++ doc/ref/Makefile.am Mon, 08 Mar 2004 08:20:00 +0100 palma_g (oln/d/51_Makefile.a 1.27.1.10 640) @@ -1,6 +1,7 @@ # ### # ### General definitions # ### +EXTRA_DIST = out/exdoc.config.in olnsrc = $(top_srcdir)/olena/oln DOXYGEN = doxygen EXDOC = $(srcdir)/exdoc.pl @@ -11,7 +12,7 @@ doc: html.tar.gz oln-ref.pdf -html: exdoc.config +html: $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img cd $(OUT_DIR) && make -f makefile -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 2 months

oln 10.69: doc.

by Giovanni Palma

Index: ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * NEWS: Correct explanations on how to write some doc. * configure.ac: Work on doc configuration. Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * ref/out/exdoc.config.in: Move exdoc.config.in to out. * ref/Makefile.am: Romove useless comments. Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * tests/morpho/tests/attr_op_cl: Change tests to make them taking care of new attribute names. * oln/morpho/attribute_closing_opening_map.hh: Change some function names. * oln/morpho/attributes.hh: Rename some attributes. Add new ones. * oln/Makefile.am: Add file references. * oln/morpho/attribute_union_find.hh: Remove old attribute class. * oln/morpho/attribute_closing_opening.hh: Add comments. Index: configure.ac --- configure.ac Tue, 24 Feb 2004 16:33:38 +0100 palma_g (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.14 640) +++ configure.ac Thu, 04 Mar 2004 17:48:40 +0100 palma_g (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.14 640) @@ -237,9 +237,7 @@ AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen]) ## if test -z "$DOXYGEN"; then ## AC_MSG_WARN([`doxygen' not found -- `doxygen' must be installed to generate the documentation]) -AC_CONFIG_FILES([doc/ref/doxygen.config - doc/ref/exdoc.config - doc/ref/exdoc.mk]) + ## fi ### The documentation tree is both a component... @@ -260,7 +258,10 @@ [oln_cv_build_ref], [the Olena reference manuals], [OLN_DOC], - [doc/ref/Makefile], + [doc/ref/Makefile + doc/ref/doxygen.config + doc/ref/out/exdoc.config + doc/ref/exdoc.mk], [dnl Configuration for the manuals directory. AC_ARG_VAR([TAR], [the tape archiver program]) @@ -280,6 +281,8 @@ ], [ref])dnl End of OLN_COMPONENT([doc/ref]) + + ### The development manuals directory is a component. OLN_COMPONENT([doc/dev], Index: doc/ref/Makefile.am --- doc/ref/Makefile.am Tue, 24 Feb 2004 16:33:38 +0100 palma_g (oln/d/51_Makefile.a 1.27.1.9 640) +++ doc/ref/Makefile.am Thu, 04 Mar 2004 18:39:41 +0100 palma_g (oln/d/51_Makefile.a 1.27.1.9 640) @@ -1,139 +1,38 @@ # ### # ### General definitions # ### - -# TEXI2PDF = $(TEXI2DVI) --pdf -# TEXI2PDF_FLAGS = --batch -I $(srcdir)/graphics - -# TEXI2DVI_FLAGS = --batch -I $(srcdir)/graphics - olnsrc = $(top_srcdir)/olena/oln - -# include $(srcdir)/filelists.make - -# $(srcdir)/filelists.make: $(srcdir)/gen_filelists.sh -# $(SHELL) $@ $(olnsrc) - -# $(srcdir)/Makefile.in: $(srcdir)/filelists.make - -# ### -# ### Auto-generation of TeX files. -# ### - -# AM_LDFLAGS = $(LDFLAGS) $(ZLIB_LDFLAGS) -# AM_CXXFLAGS = $(CXXFLAGS) $(ZLIB_CXXFLAGS) - -# INCLUDES = -I$(top_srcdir)/olena -I$(top_builddir)/olena -# COMMONGETDEFSFLAGS = --agarg=-DCXXCOMPILE="$(CXX) -I$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS)" \ -# --agarg=-DEPSTOPDF="$(EPSTOPDF)" \ -# --agarg=-DCONVERT="$(IMAGEMAGICK_CONVERT)" \ -# --agarg=--templ-dirs=$(srcdir) \ -# --agarg=-DIMGDIR=$(top_srcdir)/olena/img -# PROCESSINGGETDEFSFLAGS = \ -# --subblock=tpl=type,name,doc \ -# --subblock=arg=type,name,mode,doc \ -# --listattr=exh \ -# --listattr=ns \ -# --template $(srcdir)/processing.tpl \ -# --srcfile - -# ref-morpho.tex: $(morpho_files) $(srcdir)/processing.tpl -# $(GETDEFS) $(COMMONGETDEFSFLAGS) $(PROCESSINGGETDEFSFLAGS) \ -# $(GETDEFSFLAGS) --base-name=ref-morpho $(morpho_files) - -# ref-level.tex: $(level_files) $(srcdir)/processing.tpl -# $(GETDEFS) $(COMMONGETDEFSFLAGS) $(PROCESSINGGETDEFSFLAGS) \ -# $(GETDEFSFLAGS) --base-name=ref-level $(level_files) - -# ### -# ### Rules to build the manuals. -# ### - -# tex_TEX = oln-ref.tex - -# built_oln_ref_TEX = ref-morpho.tex ref-level.tex -# oln_ref_TEX = $(built_oln_ref_TEX) integre-ref.tex - -# oln-ref.dvi: $(tex_TEX) $(oln_ref_TEX) $(graphics_DIA) -# $(TEXI2DVI) $(TEXI2DVI_FLAGS) \ -# `test -f '$(tex_TEX)' || echo '$(srcdir)/'`$(tex_TEX) - DOXYGEN = doxygen EXDOC = $(srcdir)/exdoc.pl OUT_DIR = "out" IMG_CONV = $(srcdir)/img_conv.pl -code: - $(EXDOC) --config=exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) -execute: code + + +doc: html.tar.gz oln-ref.pdf + +html: exdoc.config + $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img cd $(OUT_DIR) && make -f makefile - -images: execute $(IMG_CONV) $(top_srcdir)/olena/img img $(IMG_CONV) img img - -doxygen: images $(DOXYGEN) doxygen.config -html: doxygen - - -doc: html pdf - - -oln-ref.pdf: doxygen - cd latex && make && cp refman.pdf ../$@ - - -# oln-ref.pdf: $(tex_TEX) $(oln_ref_TEX) $(graphics_DIA) -# $(TEXI2PDF) $(TEXI2PDF_FLAGS) \ -# `test -f '$(tex_TEX)' || echo '$(srcdir)/'`$(tex_TEX) - -# # This rule is not activated by default since the generated files cannot -# # be easily distributed (automake barks loudly when the filenames are -# # not known at the time Makefile.in is generated) - -# # FIXME: uncomment when ready -# # cp $(srcdir)/graphics/*-html.png html/ - -# html.tar.gz: $(tex_TEX) $(oln_ref_TEX) $(graphics_DIA) -# $(HEVEA) -fix -o html/oln-ref.html -I $(srcdir) -I $(srcdir)/graphics `test -f '$(tex_TEX)' || echo '$(srcdir)/'`$(tex_TEX) -# cd html && $(HACHA) -tocbis -o index.html oln-ref.html; cd .. -# $(TAR) -czf $@ html - -html.tar.gz: html +html.tar.gz: $(TAR) -czf $@ html -# ### -# ### What gets distributed. -# ### - -dist_noinst_DATA = oln-ref.pdf html.tar.gz - -# EXTRA_DIST = $(tex_TEX) $(oln_ref_TEX) \ -# processing.tpl filelists.make gen_filelists.sh +oln-ref.pdf: html + cd latex && make && cp refman.pdf ../$@ -# bin.tar.gz: oln-ref.pdf oln-ref.dvi -# $(TAR) -czf $@ `test -f bin/lena256.pdf || echo '$(srcdir)/'`bin +dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl -# ### -# ### What gets cleaned. -# ### -# dist-local: -# rm -f bin/*a.out$(EXEEXT) dist-local: rm -f img/* -# MAINTAINERCLEANFILES = $(built_oln_ref_TEX) $(dist_noinst_DATA) \ -# $(srcdir)/html/* $(srcdir)/bin/* \ -# $(srcdir)/filelists.make - MAINTAINERCLEANFILES = $(dist_noinst_DATA) \ ./html/* ./img/* $(OUT_DIR)/* -# CLEANFILES = = *.tmp *.aux *.bbl *blg *.lot *.log *.out *.toc - # ### # ### What gets installed. # ### Index: NEWS --- NEWS Tue, 24 Feb 2004 16:33:38 +0100 palma_g (oln/0_NEWS 1.20 640) +++ NEWS Mon, 08 Mar 2004 07:55:58 +0100 palma_g (oln/0_NEWS 1.20 640) @@ -10,12 +10,11 @@ you can include it in the comments with the \image command, using the same name you used to produce it, but with the png extension. To make sure your image will not overwrite - another existing one, you should name it with taking care of - the name of the file you are writing in: e.g. if you comment the - file oln/core/behavior.hh, an image should be named - oln_core_behavior_hh_whatever_you_want.ppm It can be added that - two macros are provided to make abstraction of input and - output direcectories, they are named IMG_IN and IMG_OUT. + another existing one, you should name it taking care of + the namespace you are using: e.g. if you comment the function + oln::boo::bar::fun, an image should be named oln_foo_bar_fun.ppm + It can be added that two macros are provided to make abstraction + of input and output directories, they are named IMG_IN and IMG_OUT. * Border behavior can be controlled with the behavior hierarchy. If an algorithm support it, you can choose the way the image Index: olena/oln/morpho/attribute_closing_opening.hh --- olena/oln/morpho/attribute_closing_opening.hh Tue, 24 Feb 2004 16:33:38 +0100 palma_g (oln/q/49_attribute_ 1.15 640) +++ olena/oln/morpho/attribute_closing_opening.hh Mon, 08 Mar 2004 07:45:26 +0100 palma_g (oln/q/49_attribute_ 1.15 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -51,37 +51,15 @@ */ namespace internal { - /*! - ** \brief perform an attribute closing - ** - ** FIXME: ONLY A TEST - ** \code - ** #include <oln/basics2d.hh> - ** #include <oln/morpho/attribute_closing_opening.hh> - ** #include <oln/level/compare.hh> - ** #include <ntg/all.hh> - ** #include <iostream> - ** int main() - ** { - ** typedef oln::image2d<ntg::int_u8> im_type; - ** - ** im_type im1(oln::load(IMG_IN "lena256.pgm")); - ** im1 = oln::morpho::fast::area_closing(im1, oln::neighb_c4(), 200); - ** oln::save(im1, IMG_OUT "olena_attribute_closing_opening_hh_attr_clo.ppm"); - ** return 0; - ** } - ** \endcode - ** \image html lena256.png \image latex lena256.png => \image html olena_attribute_closing_opening_hh_attr_clo.png \image latex olena_attribute_closing_opening_hh_attr_clo.png - ** - */ template<class I, class N, class A> oln_concrete_type(I) attr_closing_(const abstract::non_vectorial_image& input, const abstract::neighborhood<N>& Ng, - const attr_lambda_type(A) &lambda) + const attr_lambda_type(A) &lambda, + const attr_env_type(A) &env = attr_env_type(A)()) { typedef tarjan::tarjan_set<oln_concrete_type(I), A > tarjan_set_type; - tarjan_set_type attr_closing(input.exact(), attr_env_type(A)()); + tarjan_set_type attr_closing(input.exact(), env); return attr_closing.template get_comptute<true>(lambda, Ng); } @@ -90,10 +68,11 @@ oln_concrete_type(I) attr_opening_(const abstract::non_vectorial_image& input, const abstract::neighborhood<N>& Ng, - const attr_lambda_type(A) &lambda) + const attr_lambda_type(A) &lambda, + const attr_env_type(A) &env = attr_env_type(A)()) { typedef tarjan::tarjan_set<oln_concrete_type(I), A > tarjan_set_type; - tarjan_set_type attr_opening(input.exact(), attr_env_type(A)()); + tarjan_set_type attr_opening(input.exact(), env); return attr_opening.template get_comptute<false>(lambda, Ng); } @@ -142,62 +121,185 @@ return tarjan::internal::attr_closing_<I, N, T##_type >(input, Ng, lambda); \ } - /*=processing area_closing - * ns: morpho - * what: Area closing - * arg: const abstract::non_vectorial_image&, input, IN, input image - * arg: const abstract::neighborhood<N>&, se, IN, neighborhood to consider - * arg: unsigned int, area, IN, area - * ret:oln_concrete_type(I) - * doc: - * Compute an area closing using union/find algorithm. - * See A. Meijster and M. Wilkinson. A Comparison of Algorithms For Connected - * Set Openings and Closings. PAMI 24(2), p484--494 - * see: morpho::simple_geodesic_dilation - * ex: - * $ image2d<int_u8> im = load("lena256.pgm"); - * $ save(morpho::tarjan::area_closing(im, neighb_c4(),500), "out.pgm"); - * exi: lena256.pgm - * exo: out.pgm - =*/ - xxx_closing_decl(area); - - /*=processing area_opening - * ns: morpho - * what: Area opening - * arg: const abstract::non_vectorial_image&, input, IN, input image - * arg: const abstract::neighborhood<N>&, se, IN, neighborhood to consider - * arg: unsigned int, area, IN, area - * ret:oln_concrete_type(I) - * doc: - * Compute an area opening using union/find algorithm. - * See A. Meijster and M. Wilkinson. A Comparison of Algorithms For Connected - * Set Openings and Closings. PAMI 24(2), p484--494 - * see: morpho::simple_geodesic_dilation - * ex: - * $ image2d<int_u8> im = load("lena256.pgm"); - * $ save(morpho::tarjan::area_opening(im, neighb_c4(),500), "out.pgm"); - * exi: lena256.pgm - * exo: out.pgm - =*/ - xxx_opening_decl(area); + /*! + ** \brief Perform a cardinal closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::card_closing(im1, oln::neighb_c4(), 200); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_card_closing.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html oln_morpho_fast_card_closing.png + ** \image latex oln_morpho_fast_card_closing.png + ** + */ + xxx_closing_decl(card); + + /*! + ** \brief Perform a cardinal opening. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::card_opening(im1, oln::neighb_c4(), 200); + ** oln::save(im1, IMG_OUT "oln_morpho_fast_card_opening.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html oln_morpho_fast_card_opening.png + ** \image latex oln_morpho_fast_card_opening.png + ** + */ + xxx_opening_decl(card); + + /*! + ** \brief Perform an integral closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::integral_closing(im1, oln::neighb_c4(), 200); + ** oln::save(im1, IMG_OUT "olena_attribute_closing_opening_hh_integral_clo.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html olena_attribute_closing_opening_hh_integral_clo.png + ** \image latex olena_attribute_closing_opening_hh_integral_clo.png + ** + */ + xxx_closing_decl(integral); + + /*! + ** \brief Perform an integral opening. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::integral_opening(im1, oln::neighb_c4(), 200); + ** oln::save(im1, IMG_OUT "olena_attribute_closing_opening_hh_integral_op.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html olena_attribute_closing_opening_hh_integral_op.png + ** \image latex olena_attribute_closing_opening_hh_integral_op.png + ** + */ + xxx_opening_decl(integral); - xxx_opening_decl(volume); - xxx_closing_decl(volume); + /*! + ** \brief Perform a height closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::height_opening(im1, oln::neighb_c4(), 5); + ** oln::save(im1, IMG_OUT "olena_attribute_closing_opening_hh_height_op.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html olena_attribute_closing_opening_hh_height_op.png + ** \image latex olena_attribute_closing_opening_hh_height_op.png + ** + */ xxx_opening_decl(height); + + /*! + ** \brief Perform a height closing. + ** + ** \code + ** #include <oln/basics2d.hh> + ** #include <oln/morpho/attribute_closing_opening.hh> + ** #include <oln/level/compare.hh> + ** #include <ntg/all.hh> + ** #include <iostream> + ** int main() + ** { + ** typedef oln::image2d<ntg::int_u8> im_type; + ** + ** im_type im1(oln::load(IMG_IN "lena256.pgm")); + ** im1 = oln::morpho::fast::height_closing(im1, oln::neighb_c4(), 5); + ** oln::save(im1, IMG_OUT "olena_attribute_closing_opening_hh_height_clo.ppm"); + ** return 0; + ** } + ** \endcode + ** \image html lena256.png + ** \image latex lena256.png + ** => + ** \image html olena_attribute_closing_opening_hh_height_clo.png + ** \image latex olena_attribute_closing_opening_hh_height_clo.png + ** + */ xxx_closing_decl(height); xxx_opening_decl(maxvalue); xxx_closing_decl(maxvalue); xxx_opening_decl(minvalue); xxx_closing_decl(minvalue); - xxx_opening_im_decl(disk); - xxx_closing_im_decl(disk); + xxx_opening_im_decl(ball); + xxx_closing_im_decl(ball); xxx_opening_im_decl(dist); xxx_closing_im_decl(dist); - xxx_closing_im_decl(square); - xxx_opening_im_decl(square); - xxx_closing_im_decl(rectangle); - xxx_opening_im_decl(rectangle); + xxx_closing_im_decl(cube); + xxx_opening_im_decl(cube); + xxx_closing_im_decl(box); + xxx_opening_im_decl(box); } // !fast } // !morpho Index: olena/oln/morpho/attribute_union_find.hh --- olena/oln/morpho/attribute_union_find.hh Mon, 16 Feb 2004 19:06:24 +0100 palma_g (oln/q/50_attribute_ 1.12 640) +++ olena/oln/morpho/attribute_union_find.hh Mon, 08 Mar 2004 08:03:26 +0100 palma_g (oln/q/50_attribute_ 1.12 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -41,40 +41,7 @@ namespace fast { namespace tarjan { - template< class T> - struct T_attribute - { - T_attribute():value(1){} - - T_attribute( const T v):value(v){} - - - T_attribute(const T_attribute& rhs){ value = rhs.value;} - - T_attribute - operator+(const T_attribute & rhs) const - { - return T_attribute(value + rhs.value); - } - - T_attribute& - operator=(const T_attribute & rhs) - { - value = rhs.value; - return *this; - } - - const bool - operator<(const T_attribute & rhs) const - { - return value < rhs.value; - } - - T value; - - }; - - template<class T, class ATTRIBUTE, class Env = NullEnv> + template<class T, class ATTRIBUTE, class Env = attr_env_type(ATTRIBUTE)> struct tarjan_set { typedef oln_point_type(T) point_type; Index: olena/oln/Makefile.am --- olena/oln/Makefile.am Mon, 02 Feb 2004 10:57:28 +0100 van-vl_n (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.1 640) +++ olena/oln/Makefile.am Wed, 25 Feb 2004 14:30:17 +0100 palma_g (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.1 640) @@ -39,6 +39,7 @@ convol/fast_gaussian.hxx \ convol/fast_gaussian_coefficient.hh \ core/abstract/binary_image.hh \ + core/abstract/behavior.hh \ core/abstract/dpoint.hh \ core/abstract/image.hh \ core/abstract/image_size.hh \ @@ -59,6 +60,7 @@ core/abstract/window.hh \ core/abstract/window_base.hh \ core/abstract/windownd.hh \ + core/behavior.hh \ core/accum.hh \ core/apply.hh \ core/box.hh \ @@ -145,6 +147,9 @@ level/threshold.hh \ math/macros.hh \ morpho/attribute_closing_opening.hh \ + morpho/attribute_closing_opening_map.hxx \ + morpho/attribute_closing_opening_map.hh \ + morpho/attributes.hh \ morpho/attribute_union_find.hh \ morpho/closing.hh \ morpho/closing.inc \ @@ -202,4 +207,5 @@ utils/copy.hh \ utils/histogram.hh \ utils/stat.hh \ + utils/special_points.hh \ utils/timer.hh Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Mon, 16 Feb 2004 19:06:24 +0100 palma_g (oln/j/45_attributes 1.4 644) +++ olena/oln/morpho/attributes.hh Thu, 04 Mar 2004 19:14:44 +0100 palma_g (oln/j/45_attributes 1.4 644) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -35,7 +35,12 @@ # define attr_env_type(T) typename oln::morpho::attr_traits<T>::env_type # define attr_value_type(T) typename oln::morpho::attr_traits<T>::value_type -# define attr_type_decl(slef_type) \ +# define attr_lambda_type_(T) oln::morpho::attr_traits<T>::lambda_type +# define attr_env_type_(T) oln::morpho::attr_traits<T>::env_type +# define attr_value_type_(T) oln::morpho::attr_traits<T>::value_type + + +# define attr_type_decl(self_type) \ typedef mlc_exact_vt_type(self_type, Exact) exact_type; \ typedef attr_value_type(exact_type) value_type; \ typedef attr_env_type(exact_type) env_type; \ @@ -59,50 +64,119 @@ { }; - // this env is an empty one + /*! + ** \brief Useless environment. + ** + ** This environment is an empty one. + */ struct NullEnv: public env<NullEnv> { }; + /*! + ** \brief Environment containing image. + ** + ** Used for image substitution in other_image attribute. + */ + template <class I> + struct OtherImageEnv: public env<OtherImageEnv > + { + typedef abstract::image im_type; + + OtherImageEnv(const abstract::image &im): im_(im) + {}; + + const im_type &getImage() const + { + return im_; + } + + protected: + const im_type &im_; + }; // the traits fwd declaration template <class T> struct attr_traits; + /*! + ** \brief Change the exact type of an attribute. + ** + ** BE CAREFUL, when you use specialization of this traits, you + ** say change_exact<In, Exact>::ret IS A In. + ** Check this to avoid modeling problems. + */ + template <class In, class Exact> + struct change_exact; + // the attributes hierarchy /*------------* | attribute | *-----------*/ + /*! + ** \brief Attribute abstract class + ** + ** Top of the attribute hierarchy. + */ template <class Exact> class attribute: public mlc_hierarchy::any<Exact> { public: - typedef attribute<Exact> self_type; + typedef attribute<Exact> self_type; /*< Self type of the class.*/ attr_type_decl(self_type); + /*! + ** \brief += operator + ** + ** This is a static dispatcher for the += operator. + ** This method is abstract. + */ void operator+=(const exact_type &rhs) { mlc_dispatch(pe)(rhs); }; + /*! + ** \brief >= operator + ** + ** This is a static dispatcher for the >= operator. + */ bool operator>=(const lambda_type &lambda) const { mlc_dispatch(ge)(lambda); }; + /*! + ** \brief < operator + ** + ** This is a static dispatcher for the < operator. + ** This method is abstract. + */ bool operator<(const lambda_type &lambda) const { mlc_dispatch(less)(lambda); }; + /*! + ** \brief != operator + ** + ** This is a static dispatcher for the != operator. + ** This method is abstract. + */ bool operator!=(const lambda_type &lambda) const { mlc_dispatch(ne)(lambda); }; - // impl + /*! + ** \brief >= operator implementation. + ** + ** This is an implementation of the >= operator. override this + ** method to provide a new implementation of this operator. + ** This method SHOULDN'T be called. + */ bool ge_impl(const lambda_type &lambda) const { return !(*this < lambda); @@ -114,34 +188,34 @@ }; /*-----------* - | area | + | card | *-----------*/ template <class T = unsigned, class Exact = mlc::final> - class area_type: - public attribute<mlc_2_exact_vt_type(area_type, T, Exact)> + class card_type: + public attribute<mlc_2_exact_vt_type(card_type, T, Exact)> { public: - typedef area_type<T, Exact> self_type; + typedef card_type<T, Exact> self_type; attr_type_decl(self_type); - area_type() + card_type() { }; - area_type(const lambda_type &lambda): value_(lambda) + card_type(const lambda_type &lambda): value_(lambda) { }; template <class I> - area_type(const abstract::image&, + card_type(const abstract::image&, const oln_point_type(I)&, const env_type&): value_(1) { }; - void pe_impl(const area_type &rhs) + void pe_impl(const self_type &rhs) { value_ += rhs.value_; }; @@ -164,29 +238,29 @@ /*-----------* - | volume | + | integral | *-----------*/ template <class T = unsigned, class Exact = mlc::final> - class volume_type: - public attribute<mlc_2_exact_vt_type(volume_type, T, Exact)> + class integral_type: + public attribute<mlc_2_exact_vt_type(integral_type, T, Exact)> { public: - typedef volume_type<T, Exact> self_type; + typedef integral_type<T, Exact> self_type; attr_type_decl(self_type); // Ctors - volume_type() + integral_type() { }; - volume_type(const lambda_type &lambda): value_(lambda) + integral_type(const lambda_type &lambda): value_(lambda) { }; template <class I> - volume_type(const abstract::image &input, + integral_type(const abstract::image &input, const oln_point_type(I) &p, const env_type &) : reflevel_(input[p]), @@ -194,6 +268,16 @@ value_(1) { }; + /* + template <class I> + integral_type(const abstract::image &input, + const oln_point_type(I) &p + ): + reflevel_(input[p]), + area_(1), + value_(1) + { + };*/ // interface part const value_type &getValue() const { @@ -226,7 +310,7 @@ return area_; }; - void pe_impl(const volume_type &rhs) + void pe_impl(const self_type &rhs) { value_ += rhs.getValue() + area_ * tools::diffabs(reflevel_, rhs.getReflevel()); area_ += rhs.getArea(); @@ -248,6 +332,61 @@ value_type value_; }; + /*-------------------* + | other image_type | + ------------------*/ + /*! + ** \class other_image + ** + ** \brief Metaclass used to change attribute behavior. + ** + ** This class do the same job the its Dad parameter, but force it + ** to work on other data. + */ + template <class Dad, class I, class Exact = mlc::final> + class other_image: + public change_exact<Dad, typename mlc::exact_vt<other_image<Dad, I, Exact>, Exact>::ret >::ret + { + public: + typedef other_image<Dad, I, Exact> self_type; /*< Self type of the class.*/ + typedef typename abstract::image<mlc_exact_type(I)> im_type; /*< Type of substituted image.*/ + attr_type_decl(self_type); + typedef typename change_exact<Dad, + typename mlc::exact_vt<other_image<Dad, I, Exact>, + Exact>::ret >::ret super_type; /*< Mother class type.*/ + + /*! + ** \brief Constructor. + ** + ** Dispatch to Dad constructor. + */ + other_image(): super_type() + { + }; + + /*! + ** \brief lambda_type Constructor. + ** + ** Dispatch to Dad constructor. + */ + other_image(const lambda_type &lambda): super_type(lambda) + { + }; + + /*! + ** \brief Image Constructor. + ** + ** Dispatch to Dad constructor but substitute image argument with + ** the image contained in the environment. + */ + template <typename IM> + other_image(const abstract::image<IM> &, + const oln_point_type(I) &p, + const env_type & e): super_type(e.getImage(), p, e) + { + }; + }; + /*-----------* | height | *-----------*/ @@ -443,15 +582,15 @@ /*-----------* - | disk | + | ball | *-----------*/ template <class I, class Exact = mlc::final> - class disk_type: - public attribute<mlc_2_exact_vt_type(disk_type, I, Exact)> + class ball_type: + public attribute<mlc_2_exact_vt_type(ball_type, I, Exact)> { public: - typedef disk_type<I, Exact> self_type; + typedef ball_type<I, Exact> self_type; attr_type_decl(self_type); typedef abstract::image<mlc_exact_type(I)> im_type; typedef oln_point_type(im_type) point_type; @@ -459,15 +598,16 @@ typedef std::vector<point_type> pts_type; typedef typename pts_type::const_iterator cst_iter_type; - disk_type() + ball_type() { }; - disk_type(const lambda_type &lambda): value_(lambda), pts_() + ball_type(const lambda_type &lambda): value_(lambda), pts_() { }; - disk_type(const im_type&, const point_type &p, const env_type &) : + + ball_type(const im_type&, const point_type &p, const env_type &) : value_(ntg_zero_val(value_type)), pts_() { @@ -479,6 +619,7 @@ mlc_dispatch(getValue)(); }; + const pts_type &getPts() const { mlc_dispatch(getPts)(); @@ -495,7 +636,7 @@ return pts_; }; - void pe_impl(const disk_type &rhs) + void pe_impl(const ball_type &rhs) { value_type last = value_; std::copy(rhs.getPts().begin(), @@ -618,15 +759,15 @@ /*-----------* - | square | + | cube | *-----------*/ template <class I, class Exact = mlc::final> - class square_type: - public attribute<mlc_2_exact_vt_type(square_type, I, Exact)> + class cube_type: + public attribute<mlc_2_exact_vt_type(cube_type, I, Exact)> { public: - typedef square_type<I, Exact> self_type; + typedef cube_type<I, Exact> self_type; attr_type_decl(self_type); typedef abstract::image<mlc_exact_type(I)> im_type; typedef oln_point_type(im_type) point_type; @@ -634,11 +775,11 @@ enum {dim = point_traits<point_type>::dim}; - square_type() + cube_type() { } - square_type(const lambda_type &lambda): + cube_type(const lambda_type &lambda): mins_(dim), maxs_(dim), value_(lambda) @@ -650,7 +791,7 @@ } }; - square_type(const im_type&, + cube_type(const im_type&, const point_type &p, const env_type &): mins_(dim), maxs_(dim), value_(ntg_zero_val(value_type)) @@ -682,7 +823,7 @@ return maxs_[i]; }; - void pe_impl(const square_type &rhs) + void pe_impl(const cube_type &rhs) { for (int i = 0; i < dim; ++i) { @@ -713,22 +854,22 @@ - /*-----------* - | rectangle | - *-----------*/ + /*------* + | box | + *-----*/ template <class I, class Exact = mlc::final> - class rectangle_type: - public attribute<mlc_2_exact_vt_type(rectangle_type, I, Exact)> + class box_type: + public attribute<mlc_2_exact_vt_type(box_type, I, Exact)> { public: - typedef rectangle_type<I, Exact> self_type; + typedef box_type<I, Exact> self_type; attr_type_decl(self_type); typedef abstract::image<mlc_exact_type(I)> im_type; typedef oln_point_type(im_type) point_type; typedef oln_dpoint_type(im_type) dpoint_type; enum {dim = point_traits<point_type>::dim }; - rectangle_type(const lambda_type &lambda): maxs_(dim), mins_(dim) + box_type(const lambda_type &lambda): maxs_(dim), mins_(dim) { for (int i = 0; i < dim; ++i) { @@ -737,11 +878,11 @@ } }; - rectangle_type() + box_type() { } - rectangle_type(const im_type&, const point_type &p, const env_type &): maxs_(dim), mins_(dim) + box_type(const im_type&, const point_type &p, const env_type &): maxs_(dim), mins_(dim) { for (int i = 0; i < dim; ++i) mins_[i] = maxs_[i] = p.nth(i); @@ -770,7 +911,7 @@ return maxs_[i]; }; - void pe_impl(const rectangle_type &rhs) + void pe_impl(const box_type &rhs) { for (int i = 0; i < dim; ++i) { @@ -805,16 +946,16 @@ \------------------------*/ - // volume traits + // integral traits template <class T, class Exact> - struct attr_traits<volume_type<T, Exact> > + struct attr_traits<integral_type<T, Exact> > { typedef T value_type; typedef value_type lambda_type; typedef NullEnv env_type; }; - // volume traits + // height traits template <class T, class Exact> struct attr_traits<height_type<T, Exact> > { @@ -823,9 +964,9 @@ typedef NullEnv env_type; }; - // area traits + // card traits template <class T, class Exact> - struct attr_traits<area_type<T, Exact> > + struct attr_traits<card_type<T, Exact> > { typedef T value_type; typedef value_type lambda_type; @@ -850,9 +991,9 @@ typedef NullEnv env_type; }; - // disk traits + // ball traits template <class I, class Exact> - struct attr_traits<disk_type<I, Exact> > + struct attr_traits<ball_type<I, Exact> > { typedef unsigned value_type; typedef value_type lambda_type; @@ -868,23 +1009,48 @@ typedef NullEnv env_type; }; - // square traits + // cube traits template <class I, class Exact> - struct attr_traits<square_type<I, Exact> > + struct attr_traits<cube_type<I, Exact> > { typedef unsigned value_type; typedef value_type lambda_type; typedef NullEnv env_type; }; - // rectangle traits + // box traits template <class I, class Exact> - struct attr_traits<rectangle_type<I, Exact> > + struct attr_traits<box_type<I, Exact> > { typedef unsigned value_type; typedef ntg::vec<I::dim, value_type, mlc::final> lambda_type; typedef NullEnv env_type; }; + + // other_image traits + template <class Dad, class I, class Exact> + struct attr_traits<other_image<Dad, I, Exact> > + { + //typedef typename change_exact<Dad, other_image<Dad, I, Exact> >::ret super_type; + typedef typename change_exact<Dad, + typename mlc::exact_vt<other_image<Dad, I, Exact>, + Exact>::ret>::ret super_type; + typedef attr_value_type(super_type) value_type; + typedef attr_lambda_type(super_type) lambda_type; + typedef OtherImageEnv env_type; + }; + // traits for other_image derivation + + /*! + ** \brief Change the exact type of an attribute. + ** + ** Traits to change integral_type exact type. + */ + template <class NewExact, class OldExact, class T> + struct change_exact<integral_type<T, OldExact>, NewExact> + { + typedef integral_type<T, NewExact> ret; + }; } // !morpho } //!oln Index: olena/oln/morpho/attribute_closing_opening_map.hh --- olena/oln/morpho/attribute_closing_opening_map.hh Mon, 16 Feb 2004 19:06:24 +0100 palma_g (oln/j/49_attribute_ 1.2 600) +++ olena/oln/morpho/attribute_closing_opening_map.hh Wed, 03 Mar 2004 11:48:52 +0100 palma_g (oln/j/49_attribute_ 1.2 600) @@ -194,24 +194,24 @@ return tarjan_map<T##_type, I, N>(true, input, ng, lambda, attr_env_type(T##_type)()); \ } - xxx_opening_map_decl(area); - xxx_closing_map_decl(area); - xxx_opening_map_decl(volume); - xxx_closing_map_decl(volume); + xxx_opening_map_decl(card); + xxx_closing_map_decl(card); + xxx_opening_map_decl(integral); + xxx_closing_map_decl(integral); xxx_opening_map_decl(height); xxx_closing_map_decl(height); xxx_opening_map_decl(maxvalue); xxx_closing_map_decl(maxvalue); xxx_opening_map_decl(minvalue); xxx_closing_map_decl(minvalue); - xxx_opening_im_map_decl(disk); - xxx_closing_im_map_decl(disk); + xxx_opening_im_map_decl(ball); + xxx_closing_im_map_decl(ball); xxx_opening_im_map_decl(dist); xxx_closing_im_map_decl(dist); - xxx_closing_im_map_decl(square); - xxx_opening_im_map_decl(square); - xxx_closing_im_map_decl(rectangle); - xxx_opening_im_map_decl(rectangle); + xxx_closing_im_map_decl(cube); + xxx_opening_im_map_decl(cube); + xxx_closing_im_map_decl(box); + xxx_opening_im_map_decl(box); } // end of namespace slow Index: olena/tests/morpho/tests/attr_op_cl --- olena/tests/morpho/tests/attr_op_cl Mon, 16 Feb 2004 19:06:24 +0100 palma_g (oln/k/0_attr_op_cl 1.1 644) +++ olena/tests/morpho/tests/attr_op_cl Wed, 03 Mar 2004 11:49:43 +0100 palma_g (oln/k/0_attr_op_cl 1.1 644) @@ -37,6 +37,8 @@ if (!fail) \ OK_OR_FAIL \ } \ + last_fail = last_fail || fail; \ + fail = false; \ { \ image2d<T> im2 = oln::morpho::slow::A##_closing(im, neighb_c4(), lambda); \ image2d<T> im1 = oln::morpho::fast::A##_closing(im, neighb_c4(), lambda); \ @@ -59,19 +61,19 @@ { bool fail = false; - image2d<int_u8> lena(rdata("lena256.pgm")); + image2d<int_u8> lena(rdata("lena.pgm")); std::cout << std::endl; - test_op_cl(int_u8, area, lena, 200) - test_op_cl(int_u8, volume, lena, 200) - test_op_cl(int_u8, height, lena, 4) - test_op_cl(int_u8, maxvalue, lena, 100) - test_op_cl(int_u8, minvalue, lena, 100) - test_op_cl(int_u8, dist, lena, 100) - test_op_cl(int_u8, disk, lena, 100) - test_op_cl(int_u8, square, lena, 50) + test_op_cl(int_u8, card, lena, 200); + test_op_cl(int_u8, integral, lena, 200); + test_op_cl(int_u8, height, lena, 4); + test_op_cl(int_u8, maxvalue, lena, 100); + test_op_cl(int_u8, minvalue, lena, 100); + test_op_cl(int_u8, dist, lena, 100); + test_op_cl(int_u8, ball, lena, 100); + test_op_cl(int_u8, cube, lena, 50); ntg::vec<2, unsigned, mlc::final> lambda; - test_op_cl(int_u8, rectangle, lena, lambda) + test_op_cl(int_u8, box, lena, lambda); return fail; } Index: doc/ref/out/exdoc.config.in --- doc/ref/out/exdoc.config.in Mon, 08 Mar 2004 08:10:52 +0100 palma_g () +++ doc/ref/out/exdoc.config.in Wed, 25 Feb 2004 14:35:00 +0100 palma_g (oln/k/7_exdoc.conf 644) @@ -0,0 +1,12 @@ +[ENTRY] + COMMAND_PREFIX = \\ # In Doxygen, commands begin with a `\' + TAG_OPEN = code + TAG_CLOSE = endcode + CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) + ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers + OPTIONS = @CXXFLAGS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags + OUT = out # FIXME: should be obsolete + EXT = cc # Extension of generated file + STD_OUT_EXT = std # Extension of generated file standard output + ERR_OUT_EXT = err # Extension of generated file error output + COMMENT_STYLE = \*\* # begining of comment line Index: doc/ref/exdoc.config.in --- doc/ref/exdoc.config.in Tue, 24 Feb 2004 16:33:38 +0100 palma_g (oln/k/5_exdoc.conf 1.1 644) +++ doc/ref/exdoc.config.in Mon, 08 Mar 2004 08:10:52 +0100 palma_g () @@ -1,12 +0,0 @@ -[ENTRY] - COMMAND_PREFIX = \\ # In Doxygen, commands begin with a `\' - TAG_OPEN = code - TAG_CLOSE = endcode - CAPTIONS = cxx # We want to run cxx on the extracted files (see line below) - ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers - OPTIONS = @CXXFLAGS@ -I@top_srcdir@/integre -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags - OUT = out # FIXME: should be obsolete - EXT = cc # Extension of generated file - STD_OUT_EXT = std # Extension of generated file standard output - ERR_OUT_EXT = err # Extension of generated file error output - COMMENT_STYLE = \*\* # begining of comment line -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 2 months

*****SPAM***** Save 70 percent on Viagra 242683

by 242683＠yahoo.com

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: Save 70 percent on Viagra Save 70 percent on Viagra and Increase Sex Drive. Most places charge $19.95, we charge only URI:http://www.medz4cheap.com//via/?mrbig $2.95. URI:http://www.medz4cheap.com//via/?mrbig What is ZENEGRA (Generic Viagra)? ZENEGRA is a male impotence drug. It helps men obtain and maintain an erection. Men that do not have impotence problems report that ZENEGRA increases sexual pleasure and staying power, as well as increasing the size and hardness of erections. ********* 384131654 URI:http://www.medz4cheap.com//via/?mrbig Why should I buy ZENEGRA (Generic Viagra)? We the cheapest source of generic Viagra on the Internet. Viagra has helped over 25,000,000 American men regain their sexual power. 242683 URI:http://www.medz4cheap.com//via/?mrbig Will you ship ZENEGRA (Generic Viagra) to my country? Generic Viagra Online ships worldwide including Canada, Japan, UK and Australia. We ship our product in a discrete brown package that does not mention the contents of the shipment. All orders are shipped from India and usually take 15-30 days to arive. 242683 ** URI:http://www.medz4cheap.com//via/?mrbig How do i pay for ZENEGRA (Generic Viagra)? We accept major creditcards, and checking accounts (US only). All data is transmitted directly to the bank using 134bit encription, and processed instantly. We never keep your information stored on our server. You are totally safe to order online from us. Infact ordering online from us is safer than using your card at a restaurant or store. 1659901274 URI:http://www.medz4cheap.com//via/?mrbig Buy ZENEGRA Generic Viagra and save over 70 percent! We have the worlds lowest prices GUARANTEED. [...] Content analysis details: (31.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.1 FROM_WEBMAIL_END_NUMS6 From webmail service and address ends in numbers 0.3 NO_REAL_NAME From: does not include a real name 0.9 FROM_ENDS_IN_NUMS From: ends in numbers 1.7 INVALID_DATE_TZ_ABSURD Invalid Date: header (timezone does not exist) 1.1 FROM_NUM_AT_WEBMAIL From address is webmail, but starts with a number 2.8 SUBJ_VIAGRA Subject includes "viagra" 0.7 ADDR_NUMS_AT_BIGSITE Uses an address with lots of numbers, at a big ISP 1.6 FROM_STARTS_WITH_NUMS From: starts with nums 4.2 IMPOTENCE BODY: Impotence cure 4.3 GENERIC_VIAGRA BODY: Mentions Generic Viagra 1.9 INCREASE_SEX BODY: Talks about a bigger drive for sex 1.1 VIAGRA_ONLINE BODY: Fast Viagra Delivery 0.5 HTML_40_50 BODY: Message is 40% to 50% HTML 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 HTML_FONT_BIG BODY: HTML has a big font 0.1 HTML_FONTCOLOR_UNSAFE BODY: HTML font color not in safe 6x6x6 palette 0.1 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.4 HTML_FONT_INVISIBLE BODY: HTML font color is same as background 0.1 HTML_FONTCOLOR_RED BODY: HTML font color is red 0.6 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.5 FORGED_YAHOO_RCVD 'From' yahoo.com does not match 'Received' headers 0.5 RCVD_IN_NJABL_DIALUP RBL: NJABL: dialup sender did non-local SMTP [217.226.112.251 listed in dnsbl.njabl.org] 2.5 RCVD_IN_DYNABLOCK RBL: Sent directly from dynamic IP address [217.226.112.251 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [217.226.112.251 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_NJABL RBL: Received via a relay in dnsbl.njabl.org [217.226.112.251 listed in dnsbl.njabl.org] 1.2 FROM_ALL_NUMS From an address that is all numbers (non-phone) 1.6 FORGED_MUA_OUTLOOK Forged mail pretending to be from MS Outlook The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

21 years, 2 months

← Newer
1
...
19
20
21
22
23
24
25
...
33
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

2003

2002

Olena