Olena

olena@lrde.epita.fr

325 discussions

by Nicolas Burrus

Un peu de cleanup de fait jamais de mal. Index: integre/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * ntg/real/optraits_scalar_defs.hh: Rename as... * ntg/real/optraits_real_defs.hh: ... this. * ntg/real/optraits_scalar.hh: Rename as... * ntg/real/optraits_real.hh: ... this. * ntg/core/behavior.hh: Rename as... * ntg/real/behavior.hh: ... this. * ntg/real/int_s.hh, * ntg/real/int_u.hh, * ntg/real/optraits_builtin_int.hh, * ntg/real/typetraits_builtin_int.hh, * ntg/Makefile.am, * ntg/basics.hh, * ntg/real/builtin_float.hh, * ntg/enum/builtin_bool.hh, * ntg/real/range.hh: Adjust consequently. Index: integre/ntg/real/behavior.hh --- integre/ntg/core/behavior.hh Mon, 01 Sep 2003 19:55:03 +0200 burrus_n (oln/g/31_behaviour. 1.13.1.15 640) +++ integre/ntg/real/behavior.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/31_behaviour. 1.13.1.16 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef NTG_CORE_BEHAVIOUR_HH -# define NTG_CORE_BEHAVIOUR_HH +#ifndef NTG_REAL_BEHAVIOUR_HH +# define NTG_REAL_BEHAVIOUR_HH /* Behaviors for data_types int_u, int_s, etc ... @@ -45,7 +45,7 @@ # include <ntg/core/type_traits.hh> # include <ntg/core/value.hh> # include <ntg/core/internal/macros.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/utils/debug.hh> # include <ntg/utils/cast.hh> @@ -376,4 +376,4 @@ } // end of ntg. -#endif // !NTG_CORE_BEHAVIOUR_HH +#endif // !NTG_REAL_BEHAVIOUR_HH Index: integre/ntg/real/int_s.hh --- integre/ntg/real/int_s.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/g/24_int_s.hh 1.16.1.16 640) +++ integre/ntg/real/int_s.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.17 640) @@ -29,7 +29,7 @@ # define NTG_CORE_INT_S_HH # include <ntg/basics.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/bin.hh> Index: integre/ntg/real/int_u.hh --- integre/ntg/real/int_u.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/g/23_int_u.hh 1.19.1.16 640) +++ integre/ntg/real/int_u.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.17 640) @@ -29,7 +29,7 @@ # define NTG_REAL_INT_U_HH # include <ntg/basics.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/real_value.hh> # include <ntg/bin.hh> Index: integre/ntg/real/optraits_builtin_int.hh --- integre/ntg/real/optraits_builtin_int.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/18_optraits_b 1.6.1.8 640) +++ integre/ntg/real/optraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/18_optraits_b 1.6.1.9 640) @@ -33,7 +33,7 @@ */ # include <ntg/config/system.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/real/typetraits_builtin_int.hh> // FIXME: this should be included by system.hh. Index: integre/ntg/real/optraits_real_defs.hh --- integre/ntg/real/optraits_scalar_defs.hh Mon, 01 Sep 2003 19:55:03 +0200 burrus_n (oln/g/11_optraits_s 1.14 640) +++ integre/ntg/real/optraits_real_defs.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/11_optraits_s 1.15 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef NTG_OPTRAITS_SCALAR_DEFS_HH -# define NTG_OPTRAITS_SCALAR_DEFS_HH +#ifndef NTG_OPTRAITS_REAL_DEFS_HH +# define NTG_OPTRAITS_REAL_DEFS_HH // // macros used in optraits_scalar definition @@ -169,4 +169,4 @@ return result; \ } -#endif // ndef NTG_OPTRAITS_SCALAR_DEFS_HH +#endif // ndef NTG_OPTRAITS_REAL_DEFS_HH Index: integre/ntg/real/optraits_real.hh --- integre/ntg/real/optraits_scalar.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/12_optraits_s 1.11.1.8 640) +++ integre/ntg/real/optraits_real.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.9 640) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef NTG_OPTRAITS_SCALAR_HH_ -# define NTG_OPTRAITS_SCALAR_HH_ +#ifndef NTG_OPTRAITS_REAL_HH_ +# define NTG_OPTRAITS_REAL_HH_ # include <cmath> @@ -43,7 +43,7 @@ # include <ntg/core/macros.hh> // macros definitions -# include <ntg/real/optraits_scalar_defs.hh> +# include <ntg/real/optraits_real_defs.hh> namespace ntg { @@ -146,4 +146,4 @@ } // end of ntg -#endif // ndef NTG_OPTRAITS_SCALAR_HH_ +#endif // ndef NTG_OPTRAITS_REAL_HH_ Index: integre/ntg/real/typetraits_builtin_int.hh --- integre/ntg/real/typetraits_builtin_int.hh Wed, 30 Jul 2003 18:49:16 +0200 burrus_n (oln/g/3_typetraits 1.7.1.11 640) +++ integre/ntg/real/typetraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/3_typetraits 1.7.1.12 640) @@ -28,7 +28,7 @@ #ifndef NTG_REAL_TYPETRAITS_BUILTIN_INT_HH # define NTG_REAL_TYPETRAITS_BUILTIN_INT_HH -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/predecls.hh> # include <ntg/core/type_traits.hh> Index: integre/ntg/Makefile.am --- integre/ntg/Makefile.am Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/q/36_Makefile.a 1.8 640) +++ integre/ntg/Makefile.am Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/q/36_Makefile.a 1.9 640) @@ -18,7 +18,7 @@ config/math.hh \ config/system.hh \ core/abstract_hierarchy.hh \ - core/behavior.hh \ + real/behavior.hh \ core/contract.hh \ core/internal/global_ops.hh \ core/internal/global_ops_defs.hh \ @@ -46,8 +46,8 @@ real/int_s.hh \ real/int_u.hh \ real/optraits_builtin_int.hh \ - real/optraits_scalar.hh \ - real/optraits_scalar_defs.hh \ + real/optraits_real.hh \ + real/optraits_real_defs.hh \ real/range.hh \ real/real_value.hh \ real/typetraits_builtin_int.hh \ Index: integre/ntg/basics.hh --- integre/ntg/basics.hh Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/s/21_basics.hh 1.3 640) +++ integre/ntg/basics.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/21_basics.hh 1.4 640) @@ -38,7 +38,7 @@ # include <ntg/core/predecls.hh> # include <ntg/core/abstract_hierarchy.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/contract.hh> # include <ntg/core/interval.hh> # include <ntg/real/builtin_properties.hh> Index: integre/ntg/real/builtin_float.hh --- integre/ntg/real/builtin_float.hh Mon, 21 Jul 2003 17:51:12 +0200 burrus_n (oln/s/47_builtin_fl 1.2 640) +++ integre/ntg/real/builtin_float.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/47_builtin_fl 1.3 640) @@ -29,11 +29,11 @@ # define NTG_REAL_BUILTIN_FLOAT_HH # include <ntg/config/system.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/internal/global_ops_traits.hh> # include <ntg/core/internal/traits.hh> # include <ntg/real/builtin_properties.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <ntg/core/predecls.hh> # include <mlc/cmp.hh> Index: integre/ntg/enum/builtin_bool.hh --- integre/ntg/enum/builtin_bool.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/s/50_builtin_bo 1.4 640) +++ integre/ntg/enum/builtin_bool.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/50_builtin_bo 1.5 640) @@ -29,7 +29,7 @@ # define NTG_ENUM_BUILTIN_BOOL_HH # include <ntg/core/abstract_hierarchy.hh> -# include <ntg/core/behavior.hh> +# include <ntg/real/behavior.hh> # include <ntg/core/predecls.hh> # include <ntg/core/type_traits.hh> Index: integre/ntg/real/range.hh --- integre/ntg/real/range.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/t/16_range.hh 1.3 640) +++ integre/ntg/real/range.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/t/16_range.hh 1.4 640) @@ -32,7 +32,7 @@ # include <ntg/basics.hh> # include <ntg/core/internal/macros.hh> -# include <ntg/real/optraits_scalar.hh> +# include <ntg/real/optraits_real.hh> # include <string> # include <sstream>

21 years, 5 months

ecole d'ete sur la couleur 1999

by Thierry Géraud

j'ai posé ici : /mnt/doc/computer_vision/color/ecole_ete_99/ les documents (supports de présentation, articles, etc.) liés à une école d'été sur la couleur qui a eu lieu en 1999. je vous conseille à tous Lambert.pdf sur les pré-traitements et BrunP.pdf sur la segmentation en général. Ensuite, MacaireP.pdf, toujours sur la segmentation, est un bon complément. Les autres documents sont plus éloignés de nos préoccupations.

21 years, 5 months

10.37: add a few benchmarks.

by Nicolas Burrus

Index: olena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * oln/utils/timer.hh: Improve. Can give the elapsed time since the last resume. * tests/utils/tests/timer: Adjust consequently. * tests/morpho/tests/overall_benchs: New test. * tests/core/tests/benchs: New test. +2003-11-07 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + * oln/arith/internal/opdecls.hh: Add missing default functors. * oln/level/cc.hh: Use default arithmetic functor. Index: olena/oln/utils/timer.hh --- olena/oln/utils/timer.hh Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/8_timer.hh 1.7 640) +++ olena/oln/utils/timer.hh Fri, 07 Nov 2003 17:34:52 +0100 burrus_n (oln/8_timer.hh 1.8 640) @@ -50,6 +50,7 @@ { assertion(status_ != e_running); total_time_ = 0; + stop_time_ = 0; status_ = e_running; start_time_ = clock(); } @@ -58,7 +59,7 @@ restart() { assertion(status_ != e_unknown); - float val = value(); + float val = total_time(); start(); return val; } @@ -75,13 +76,25 @@ stop() { assertion(status_ == e_running); - total_time_ += (clock() - start_time_); + stop_time_ = clock(); + total_time_ += (stop_time_ - start_time_); status_ = e_stopped; - return value(); + return total_time(); } + // Time since the last resume() or start() float - value() + last_time() const + { + assertion(status_ != e_unknown); + return + status_ == e_stopped ? + float(stop_time_ - start_time_) / CLOCKS_PER_SEC : + float((clock() - start_time_)) / CLOCKS_PER_SEC; + } + + float + total_time() const { assertion(status_ != e_unknown); return @@ -99,6 +112,7 @@ } status_; clock_t total_time_; clock_t start_time_; + clock_t stop_time_; }; } // end of namespace utils Index: olena/tests/morpho/tests/reconstruction --- olena/tests/morpho/tests/reconstruction Wed, 08 Oct 2003 11:15:11 +0200 burrus_n (oln/e/34_reconstruc 1.11 640) +++ olena/tests/morpho/tests/reconstruction Fri, 07 Nov 2003 17:34:52 +0100 burrus_n (oln/e/34_reconstruc 1.12 640) @@ -24,6 +24,10 @@ fail = true; \ } +// FIXME: reference images are several times computed twice, this +// should be factorized! For example, +// morpho::sure::regional_minima(lena, ...) is computed twice. + bool check() { Index: olena/tests/utils/tests/timer --- olena/tests/utils/tests/timer Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/u/29_timer.cc 1.3 600) +++ olena/tests/utils/tests/timer Fri, 07 Nov 2003 17:34:52 +0100 burrus_n (oln/u/29_timer.cc 1.4 600) @@ -30,14 +30,14 @@ t.stop(); - float b = t.value(); + float b = t.total_time(); t.resume(); for (int i = 0; i < 1000000000; ) ++i; - b = t.value() - b; + b = t.total_time() - b; if (b >= 0) OK_OR_FAIL; Index: olena/tests/morpho/tests/overall_benchs --- olena/tests/morpho/tests/overall_benchs Fri, 07 Nov 2003 17:38:50 +0100 burrus_n () +++ olena/tests/morpho/tests/overall_benchs Fri, 07 Nov 2003 17:34:52 +0100 burrus_n (oln/v/36_overall_be 1.1 640) @@ -0,0 +1,99 @@ +// -*- c++ -*- + +#include <oln/basics2d.hh> +#include <oln/morpho/watershed.hh> +#include <oln/morpho/extrema_killer.hh> +#include <oln/morpho/opening.hh> +#include <oln/morpho/geodesic_dilation.hh> +#include <oln/morpho/geodesic_erosion.hh> +#include <oln/morpho/reconstruction.hh> +#include <oln/morpho/extrema.hh> +#include <oln/utils/timer.hh> + +#include <ntg/all.hh> + +#include "check.hh" +#include "data.hh" + +#include <iostream> + +using namespace oln; +using namespace oln::morpho; +using namespace ntg; + +void bench_extrema() +{ + image2d<int_u8> lena = load(rdata("lena128.pgm")); + + unsigned size = 20; + sure_minima_killer(lena, size, neighb_c4()); + fast_minima_killer(lena, size, neighb_c4()); + sure_maxima_killer(lena, size, neighb_c4()); + fast_maxima_killer(lena, size, neighb_c4()); +} + +void bench_reconstruction() +{ + image2d<int_u8> lena = load(rdata("lena128.pgm")); + image2d<int_u8> lena_open = morpho::opening(lena, win_c4p()); + image2d<ntg::bin> minima_map(lena.size()); + image2d<int_u8> max_map(lena.size()); + + level::fill (minima_map, false); + level::fill (max_map, 255); + minima_map(10,10) = true; + minima_map(100,100) = true; + + morpho::sure::regional_minima(lena, neighb_c4()); + morpho::sequential::regional_minima(lena, neighb_c4()); + morpho::hybrid::regional_minima(lena, neighb_c4()); + + morpho::sure::minima_imposition(lena, minima_map, neighb_c4()); + morpho::geodesic_erosion(lena, lena_open, neighb_c4()); + morpho::sure::geodesic_dilation(lena_open, lena, neighb_c4()); + + morpho::sequential::geodesic_reconstruction_erosion + (max_map, lena_open, neighb_c4()); + morpho::sure::geodesic_reconstruction_dilation + (lena_open, lena, neighb_c4()); +} + +void bench_watershed() +{ + image2d<int_u8> lena = load(rdata("lena128.pgm")); + + for (int i = 0; i < 200; ++i) + watershed_seg<int_u16>(lena, neighb_c4()); +} + +void print_info(const oln::utils::timer& t, std::string name) +{ + std::cout << t.total_time() << "\t\t(" << name << ": " + << t.last_time() << ")" << std::endl; +} + +bool check() +{ + bool fail = false; + + oln::utils::timer t; + + bench_extrema(); + + t.start(); + bench_extrema(); + print_info(t, "extrema killers"); + t.stop(); + + t.resume(); + bench_watershed(); + print_info(t, "wastershed"); + t.stop(); + + t.resume(); + bench_reconstruction(); + print_info(t, "reconstructions"); + t.stop(); + + return fail; +} Index: olena/tests/core/tests/benchs --- olena/tests/core/tests/benchs Fri, 07 Nov 2003 17:38:50 +0100 burrus_n () +++ olena/tests/core/tests/benchs Fri, 07 Nov 2003 17:34:52 +0100 burrus_n (oln/v/37_benchs 1.1 600) @@ -0,0 +1,44 @@ +// -*- c++ -*- + +#include <iostream> + +#include <oln/basics1d.hh> +#include <oln/basics2d.hh> +#include <oln/basics3d.hh> + +#include <oln/utils/timer.hh> + +#include <ntg/all.hh> + +using namespace oln; +using namespace ntg; + +template <class I> +void abstract_fill_image(abstract::image<I>& ima) +{ + oln_iter_type(I) p (ima.exact()); + for_all(p) + ima[p] = p.row() + p.col(); +} + +template <class I> +void concrete_fill_image(I& ima) +{ + oln_iter_type(I) p (ima); + for_all(p) + ima[p] = p.row() + p.col(); +} + +int main() +{ + oln::image2d<int_u32> ima(10000, 10000); + oln::utils::timer t; + t.start(); + abstract_fill_image(ima); + t.stop(); + std::cout << "With abstract: " << t.total_time() << std::endl; + t.restart(); + concrete_fill_image(ima); + t.stop(); + std::cout << "With concrete: " << t.total_time() << std::endl; +}

21 years, 5 months

10.41: python modules for swilena including everything

by Nicolas Burrus

Voila, j'ai fini de flusher les patchs que j'avais en attente :) Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * python/swilena_all1d.py: New. * python/swilena_all2d.py: New. * python/swilena_all2d.py: New. * python/Makefile.am: New. Index: tools/swilena/python/Makefile.am --- tools/swilena/python/Makefile.am Mon, 10 Nov 2003 14:16:30 +0100 burrus_n () +++ tools/swilena/python/Makefile.am Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/2_Makefile.a 1.1 640) @@ -0,0 +1,10 @@ +## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## +## Makefile.am for swilena/python +## + +SUBDIRS = . tests + +python_PYTHON = swilena_display.py swilena_all1d.py swilena_all2d.py swilena_all3d.py + +include makefile.swig Index: tools/swilena/python/swilena_all1d.py --- tools/swilena/python/swilena_all1d.py Mon, 10 Nov 2003 14:16:30 +0100 burrus_n () +++ tools/swilena/python/swilena_all1d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/3_swilena_al 1.1 640) @@ -0,0 +1,14 @@ +# Utility module which includes everything available in swilena +# FIXME: should be generated + +from swilena_image1d import * +from swilena_imagesize1d import * +from swilena_point1d import * +from swilena_morpho1d import * +from swilena_structelt1d import * +from swilena_w_win1d import * +from swilena_conversions1d import * +from swilena_arith1d import * + +from swilena_ntg import * +from swilena_display import * Index: tools/swilena/python/swilena_all2d.py --- tools/swilena/python/swilena_all2d.py Mon, 10 Nov 2003 14:16:30 +0100 burrus_n () +++ tools/swilena/python/swilena_all2d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/4_swilena_al 1.1 640) @@ -0,0 +1,14 @@ +# Utility module which includes everything available in swilena +# FIXME: should be generated + +from swilena_image2d import * +from swilena_imagesize2d import * +from swilena_point2d import * +from swilena_morpho2d import * +from swilena_structelt2d import * +from swilena_w_win2d import * +from swilena_conversions2d import * +from swilena_arith2d import * + +from swilena_ntg import * +from swilena_display import * Index: tools/swilena/python/swilena_all3d.py --- tools/swilena/python/swilena_all3d.py Mon, 10 Nov 2003 14:16:30 +0100 burrus_n () +++ tools/swilena/python/swilena_all3d.py Mon, 10 Nov 2003 14:12:17 +0100 burrus_n (oln/w/5_swilena_al 1.1 640) @@ -0,0 +1,14 @@ +# Utility module which includes everything available in swilena +# FIXME: should be generated + +from swilena_image3d import * +from swilena_imagesize3d import * +from swilena_point3d import * +from swilena_morpho3d import * +from swilena_structelt3d import * +from swilena_w_win3d import * +from swilena_conversions3d import * +from swilena_arith3d import * + +from swilena_ntg import * +from swilena_display import *

21 years, 6 months

10.40: add conversions and arithmetic operations to swilena

by Nicolas Burrus

Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * meta/swilena_arith.i: New. * generate_arith_instantiations.py: New. * python/tests/arith.py: New test. * meta/swilena_conversions.i: New. * generate_conversions_instantiations.py: New. * python/tests/conversions.py: New test. * generate_morpho_instantiations.py: Update. * python/tests/morpho.py: New test. * expand.sh: Adjust consequently. * meta/Makefile.am: Likewise. * python/tests/Makefile.am: Likewise. Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/s/25_expand.sh 1.11 750) +++ tools/swilena/expand.sh Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/s/25_expand.sh 1.12 750) @@ -9,7 +9,7 @@ mkdir -p "$SWILENA/python" mkdir -p "$SWILENA/ruby" -MODULES="$MODULES ntg morpho" +MODULES="$MODULES ntg" for dim in 1 2 3; do ## {1d,2d,3d} families @@ -30,6 +30,7 @@ ## Image instances cat >>"$SWILENA/src/swilena_image${dim}d.i" <<EOF +%include swilena_ntg_macros.i %import swilena_ntg.i EOF # int_u8 int_u16 int_s8 int_s16 int_s8s int_s16s int_s32s @@ -43,9 +44,18 @@ make_image(image${dim}d_s32, $dim, ntg_int_s32, ntg_int_s32_value) make_image(image${dim}d_float, $dim, ntg_float, ntg_float_value) EOF + ## Morpho algorithms MODULES="$MODULES morpho${dim}d" - cd "$SWILENA/src" && ../generate_morpho_instantiations.py && cd .. + $SWILENA/generate_morpho_instantiations.py $SWILENA/src + + ## Arith + MODULES="$MODULES arith${dim}d" + $SWILENA/generate_arith_instantiations.py $SWILENA/src + + ## Conversions + MODULES="$MODULES conversions${dim}d" + $SWILENA/generate_conversions_instantiations.py $SWILENA/src done # for dim ... #################### Python stuff ####################### Index: tools/swilena/meta/Makefile.am --- tools/swilena/meta/Makefile.am Sat, 27 Sep 2003 19:02:23 +0200 burrus_n (oln/s/26_Makefile.a 1.2 640) +++ tools/swilena/meta/Makefile.am Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/s/26_Makefile.a 1.3 640) @@ -2,6 +2,7 @@ EXTRA_DIST = swilena_core.i swilena_decl.i swilena_describe.i \ swilena_exception.i swilena_image.i swilena_imagesize.i \ - swilena_morpho.i swilena_ntg.i swilena_point.i \ + swilena_morpho.i swilena_arith.i swilena_conversions.i \ + swilena_ntg.i swilena_point.i \ swilena_structelt.i \ swilena_w_win.i Index: tools/swilena/python/tests/Makefile.am --- tools/swilena/python/tests/Makefile.am Sun, 21 Sep 2003 23:13:48 +0200 burrus_n (oln/v/15_Makefile.a 1.1 600) +++ tools/swilena/python/tests/Makefile.am Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/15_Makefile.a 1.2 600) @@ -4,7 +4,7 @@ ## TESTS_ENVIRONMENT = \ - PYTHONPATH="$(PYTHONPATH):.." \ + PYTHONPATH="$(PYTHONPATH):..:$(srcdir)/.." \ IMGDIR="$(top_srcdir)/olena/img" -TESTS = simple1.py +TESTS = arith.py conversions.py simple1.py morpho.py Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Sat, 08 Nov 2003 18:17:07 +0100 burrus_n (oln/v/24_generate_m 1.3 700) +++ tools/swilena/generate_morpho_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/24_generate_m 1.4 700) @@ -123,13 +123,13 @@ instantiate(dim, "top_hat_contrast_op", img_type, img_type, win_type) instantiate(dim, "fast_top_hat_contrast_op", img_type, img_type, win_type) - # FIXME: watershed only works with ntg_int_u8 - if type == "ntg_int_u32": + # FIXME: fix this when available + #if type == "ntg_int_u8": # Watershed - img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() - instantiate(dim, "watershed_seg", img_ret_type, img_type, neighb_type) - instantiate(dim, "watershed_con", img_ret_type, img_type, neighb_type) - instantiate(dim, "watershed_seg_or", img_type, img_type, img_ret_type, neighb_type) + #img_ret_type = "::oln::image%(dim)sd< ntg_int_u32 >" % vars() + #instantiate(dim, "watershed_seg", img_ret_type, img_type, neighb_type) + #instantiate(dim, "watershed_con", img_ret_type, img_type, neighb_type) + #instantiate(dim, "watershed_seg_or", img_type, img_type, img_ret_type, neighb_type) # FIXME: this is broken # instantiate(dim, "laplacian", img_type, img_type, win_type) Index: tools/swilena/python/tests/morpho.py --- tools/swilena/python/tests/morpho.py Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/python/tests/morpho.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/47_morpho.py 1.1 700) @@ -0,0 +1,11 @@ +#!/usr/bin/env python + +import os +import sys +from swilena_all2d import * + +imgdir = os.environ['IMGDIR'] + +lena = image2d_u8(load(imgdir + "/lena.pgm")) +closing(lena, win_c4p()) +#watershed_seg(lena, neighb_c4()) Index: tools/swilena/meta/swilena_arith.i --- tools/swilena/meta/swilena_arith.i Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/meta/swilena_arith.i Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/48_swilena_ar 1.1 640) @@ -0,0 +1,54 @@ +// -*- C++ -*- + +%include swilena_describe.i +%include swilena_core.i + +%define decl_arith(Dim) + +#if Dim == 1 +%{ +#include <oln/basics1d.hh> +%} +#elif Dim == 2 +%{ +#include <oln/basics2d.hh> +%} +#elif Dim == 3 +%{ +#include <oln/basics3d.hh> +%} +#endif + +%{ +#include <oln/arith/ops.hh> +%} + +%inline %{ + + template<class R, class I1, class I2> + static R my_plus(const I1& i1, const I2& i2) + { return ::oln::arith::plus<R>(i1, i2); } + + template<class R, class I1, class I2> + static R my_minus(const I1& i1, const I2& i2) + { return ::oln::arith::minus<R>(i1, i2); } + + template<class R, class I1, class I2> + static R my_times(const I1& i1, const I2& i2) + { return ::oln::arith::times<R>(i1, i2); } + + template<class R, class I1, class I2> + static R my_div(const I1& i1, const I2& i2) + { return ::oln::arith::div<R>(i1, i2); } + + template<class R, class I1, class I2> + static R my_min(const I1& i1, const I2& i2) + { return ::oln::arith::min<R>(i1, i2); } + + template<class R, class I1, class I2> + static R my_max(const I1& i1, const I2& i2) + { return ::oln::arith::max<R>(i1, i2); } + +%} + +%enddef Index: tools/swilena/meta/swilena_conversions.i --- tools/swilena/meta/swilena_conversions.i Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/meta/swilena_conversions.i Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/49_swilena_co 1.1 600) @@ -0,0 +1,28 @@ +// -*- C++ -*- + +%include swilena_describe.i +%include swilena_core.i + +%define decl_conversions(Dim) + +%{ +#include <oln/convert/basics.hh> +%} + +// FIXME: not very elegant, but %{ %} blocks are not preprocessed. + +#if Dim == 1 +%{ +#include <oln/basics1d.hh> +%} +#elif Dim == 2 +%{ +#include <oln/basics2d.hh> +%} +#elif Dim == 3 +%{ +#include <oln/basics3d.hh> +%} +#endif + +%enddef Index: tools/swilena/generate_conversions_instantiations.py --- tools/swilena/generate_conversions_instantiations.py Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/generate_conversions_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/50_generate_c 1.1 700) @@ -0,0 +1,121 @@ +#!/usr/bin/env python + +import sys + +files = [] + +def close_files(): + for file in files: + file.close() + +def open_files(path): + for dim in range(1, 4): + files.append(open(path + "/swilena_conversions%(dim)sd.i" % vars(), 'w')) + +def write_headers(): + for dim in range(1, 4): + file = files[dim - 1] + file.write("""// Note: this file was generated by generate_conversions_instantiations.py. + +%%module swilena_conversions%(dim)sd + +%%include swilena_exception.i + +%%include swilena_ntg_macros.i +%%import swilena_image%(dim)sd.i +%%import swilena_ntg.i + +%%include swilena_conversions.i + +decl_conversions(%(dim)s) +""" % vars()) + +def instantiate(dim, algo, name, img_from, img_to): + file = files[dim - 1] + file.write(""" +// +// %(img_from)s ==> %(img_to)s +// + +%%newobject %(algo)s_to_%(name)s; + +%%inline %%{ +namespace oln { + namespace convert { + + %(img_to)s & + %(algo)s_to_%(name)s(const %(img_from)s& i) + { + typedef %(img_to)s::value_type to_value_type; + return *new %(img_to)s(oln::apply(oln::convert::%(algo)s< to_value_type >(), i)); + } + } +} +%%} +""" % vars()) + +def get_name(type): + # Remove the ntg_ prefix + return type[4:] + +def write_algorithms(): + reduce_relations = [ ("ntg_int_u32", "ntg_int_u8"), + ("ntg_int_s32", "ntg_int_s8") ] + + # FIXME: no conversions from float are available + + # Note: no conversion to bin available, one should use a threshold + # instead. + + integer_types = [ "ntg_int_u8", "ntg_int_u32", + "ntg_int_s8", "ntg_int_s32" ] + + scalar_types = integer_types + [ "ntg_float" ] + + # Algorithms with all types and all dims + for dim in range(1, 4): + # stretch, bound and force + for relation in reduce_relations: + for algo in ["stretch", "bound"]: + from_type = relation[0] + to_type = relation[1] + from_img = "::oln::image%(dim)sd< %(from_type)s >" % vars() + to_img = "::oln::image%(dim)sd< %(to_type)s >" % vars() + instantiate(dim, algo, get_name(to_type), from_img, to_img) + + for from_type in scalar_types: + for to_type in scalar_types: + if from_type != to_type: + from_img = "::oln::image%(dim)sd< %(from_type)s >" % vars() + to_img = "::oln::image%(dim)sd< %(to_type)s >" % vars() + instantiate(dim, "cast", get_name(to_type), + from_img, to_img) + + for to_type in scalar_types: + from_type = "ntg_bin" + from_img = "::oln::image%(dim)sd< %(from_type)s >" % vars() + to_img = "::oln::image%(dim)sd< %(to_type)s >" % vars() + instantiate(dim, "cast", get_name(to_type), + from_img, to_img) + + for from_type in integer_types: + to_type = "ntg_bin" + from_img = "::oln::image%(dim)sd< %(from_type)s >" % vars() + to_img = "::oln::image%(dim)sd< %(to_type)s >" % vars() + instantiate(dim, "cast", get_name(to_type), + from_img, to_img) + + +def main(): + if len(sys.argv) != 2: + sys.stderr.write ("Usage: generate_conversions_instantiations.py path\n") + sys.exit (1) + else: + path = sys.argv[1] + open_files(path) + write_headers() + write_algorithms() + close_files() + +if __name__ == "__main__": + main() Index: tools/swilena/generate_arith_instantiations.py --- tools/swilena/generate_arith_instantiations.py Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/generate_arith_instantiations.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/v/51_generate_a 1.1 700) @@ -0,0 +1,84 @@ +#!/usr/bin/env python + +import sys + +files = [] + +def close_files(): + for file in files: + file.close() + +def open_files(path): + for dim in range(1, 4): + files.append(open(path + "/swilena_arith%(dim)sd.i" % vars(), 'w')) + +def write_headers(): + for dim in range(1, 4): + file = files[dim - 1] + file.write("""// Note: this file was generated by generate_arith.py. + +%%module swilena_arith%(dim)sd + +%%include swilena_exception.i +%%include swilena_ntg_macros.i +%%import swilena_ntg.i + +%%include swilena_arith.i + +%%import swilena_image%(dim)sd.i + +decl_arith(%(dim)s) + +""" % vars()) + +def instantiate(dim, algorithm, *args): + file = files[dim - 1] + swilena_algorithm = algorithm + params = args[0] + for param in args[1:]: + params += ", " + param + file.write( + "%%template(%(algorithm)s) my_%(swilena_algorithm)s< %(params)s >;\n" + % vars()) + +def get_bigger_type(type): + traits = { "ntg_int_u8" : "ntg_int_u32", + "ntg_int_u32" : "ntg_int_u32", + "ntg_int_s8" : "ntg_int_s32", + "ntg_int_s32" : "ntg_int_s32" } + if traits.has_key(type): + return traits[type] + return type + +def write_algorithms(): + # Algorithms with all types and all dims + for dim in range(1, 4): + for type in [ "ntg_bin", + "ntg_int_u8", "ntg_int_u32", + "ntg_int_s8", "ntg_int_s32", + "ntg_float" ]: + img_type = "::oln::image%(dim)sd< %(type)s >" % vars() + bigger_type = get_bigger_type(type) + return_img_type = "::oln::image%(dim)sd< %(bigger_type)s >" % vars() + + # FIXME: these algorithms do not work with bin + if type != "ntg_bin": + for algo in [ "plus", "minus", "times", "div" ]: + instantiate(dim, algo, return_img_type, img_type, img_type) + + instantiate(dim, "min", return_img_type, img_type, img_type) + instantiate(dim, "max", return_img_type, img_type, img_type) + +def main(): + if len(sys.argv) != 2: + sys.stderr.write ("Usage: generate_arith_instantiations.py path\n") + sys.exit (1) + else: + path = sys.argv[1] + open_files(path) + write_headers() + write_algorithms() + close_files() + +if __name__ == "__main__": + main() Index: tools/swilena/python/tests/arith.py --- tools/swilena/python/tests/arith.py Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/python/tests/arith.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/w/0_arith.py 1.1 750) @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +import os +import sys +from swilena_arith2d import * +from swilena_image2d import * + +imgdir = os.environ['IMGDIR'] + +ima1 = image2d_u8(5, 5) +ima2 = image2d_u8(5, 5) + +ima1.set(1, 1, 51) +ima1.set(2, 2, 42) + +ima2.set(0, 0, 12) +ima2.set(2, 2, 9) + +ima = plus(ima1, ima2) + +assert(ima.at(0, 0) == 12) +assert(ima.at(1, 1) == 51) +assert(ima.at(2, 2) == 51) Index: tools/swilena/python/tests/conversions.py --- tools/swilena/python/tests/conversions.py Mon, 10 Nov 2003 14:15:38 +0100 burrus_n () +++ tools/swilena/python/tests/conversions.py Mon, 10 Nov 2003 14:09:27 +0100 burrus_n (oln/w/1_conversion 1.1 750) @@ -0,0 +1,16 @@ +#!/usr/bin/env python + +import os +import sys +from swilena_all2d import * + +imgdir = os.environ['IMGDIR'] + +lena = image2d_u8(load(imgdir + "/lena.pgm")) +lena32 = cast_to_int_u32(lena) + +lena32.set(0, 0, 65536) +assert(lena32.at(0, 0) == 65536) + +lena8 = bound_to_int_u8(lena32) +assert(lena8.at(0, 0) == 255)

21 years, 6 months

10.39: fix intègre types support in swilena

by Nicolas Burrus

Index: integre/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * ntg/enum/bin.hh: Fix assignment from a real_value. Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)epita.fr> * meta/swilena_ntg_macros.i: New. * meta/swilena_ntg.i: Include it. Index: tools/swilena/meta/swilena_ntg.i --- tools/swilena/meta/swilena_ntg.i Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/s/33_swilena_nt 1.6 640) +++ tools/swilena/meta/swilena_ntg.i Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/s/33_swilena_nt 1.7 640) @@ -1,7 +1,6 @@ %module swilena_ntg %include swilena_exception.i - /***** Generic class declaration for scalars ******/ /* Predecls */ @@ -225,32 +224,17 @@ everywhere. ntg_uint is just a convenient macro. */ -#define ntg_bin ntg::bin -#define ntg_bin_value bool +%include swilena_ntg_macros.i %template(int_u32) ntg::int_u< 32, ntg::strict >; -#define ntg_int_u32 ntg::int_u< 32, ntg::strict > -#define ntg_int_u32_value unsigned long %template(int_s32) ntg::int_s< 32, ntg::strict >; -#define ntg_int_s32 ntg::int_s< 32, ntg::strict > -#define ntg_int_s32_value long %template(int_u8) ntg::int_u< 8, ntg::strict >; -#define ntg_int_u8 ntg::int_u< 8, ntg::strict > -#define ntg_int_u8_value unsigned long %template(int_s8) ntg::int_s< 8, ntg::strict >; -#define ntg_int_s8 ntg::int_s< 8, ntg::strict > -#define ntg_int_s8_value long - -#define ntg_float ntg::float_d -#define ntg_float_value ntg_float %template(cplx_rect) ntg::cplx< ntg::rect, ntg_float >; -#define ntg_cplx_rect ntg::cplx< ntg::rect, ntg_float > -#define ntg_cplx_rect_value ntg_cplx_rect %template(cplx_polar) ntg::cplx< ntg::polar, ntg_float >; -#define ntg_cplx_polar ntg::cplx< ntg::polar, ntg_float > -#define ntg_cplx_polar_value ntg_cplx_polar + Index: integre/ntg/enum/bin.hh --- integre/ntg/enum/bin.hh Thu, 24 Jul 2003 17:46:03 +0200 burrus_n (oln/t/21_bin.hh 1.4 640) +++ integre/ntg/enum/bin.hh Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/t/21_bin.hh 1.5 640) @@ -105,14 +105,14 @@ bin (const real_value<T>& val) { ntg_assert(val < 2); - this->val_ = val; + this->val_ = val.val(); } template <class T> bin& operator=(const real_value<T>& val) { ntg_assert(val < 2); - this->val_ = val; + this->val_ = val.val(); return *this; } Index: tools/swilena/meta/swilena_ntg_macros.i --- tools/swilena/meta/swilena_ntg_macros.i Mon, 10 Nov 2003 14:13:46 +0100 burrus_n () +++ tools/swilena/meta/swilena_ntg_macros.i Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/v/39_swilena_nt 1.1 600) @@ -0,0 +1,57 @@ +// FIXME: avoid code repetitions! + +#define ntg_bin ntg::bin +#define ntg_bin_value bool +%inline %{ +#define ntg_bin ntg::bin +#define ntg_bin_value bool +%} + +#define ntg_int_u32 ntg::int_u< 32, ntg::strict > +#define ntg_int_u32_value unsigned long +%inline %{ +#define ntg_int_u32 ntg::int_u< 32, ntg::strict > +#define ntg_int_u32_value unsigned long +%} + +#define ntg_int_s32 ntg::int_s< 32, ntg::strict > +#define ntg_int_s32_value long +%inline %{ +#define ntg_int_s32 ntg::int_s< 32, ntg::strict > +#define ntg_int_s32_value long +%} + +#define ntg_int_u8 ntg::int_u< 8, ntg::strict > +#define ntg_int_u8_value unsigned long +%inline %{ +#define ntg_int_u8 ntg::int_u< 8, ntg::strict > +#define ntg_int_u8_value unsigned long +%} + +#define ntg_int_s8 ntg::int_s< 8, ntg::strict > +#define ntg_int_s8_value long +%inline %{ +#define ntg_int_s8 ntg::int_s< 8, ntg::strict > +#define ntg_int_s8_value long +%} + +#define ntg_float ntg::float_d +#define ntg_float_value ntg_float +%inline %{ +#define ntg_float ntg::float_d +#define ntg_float_value ntg_float +%} + +#define ntg_cplx_rect ntg::cplx< ntg::rect, ntg_float > +#define ntg_cplx_rect_value ntg_cplx_rect +%inline %{ +#define ntg_cplx_rect ntg::cplx< ntg::rect, ntg_float > +#define ntg_cplx_rect_value ntg_cplx_rect +%} + +#define ntg_cplx_polar ntg::cplx< ntg::polar, ntg_float > +#define ntg_cplx_polar_value ntg_cplx_polar +%inline %{ +#define ntg_cplx_polar ntg::cplx< ntg::polar, ntg_float > +#define ntg_cplx_polar_value ntg_cplx_polar +%}

21 years, 6 months

10.38: add opening and closing to swilena morpho

by Nicolas Burrus

Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * generate_morpho_instantiations.py: Minor update. Add opening and closing algorithms. Index: tools/swilena/generate_morpho_instantiations.py --- tools/swilena/generate_morpho_instantiations.py Thu, 09 Oct 2003 16:21:55 +0200 burrus_n (oln/v/24_generate_m 1.2 700) +++ tools/swilena/generate_morpho_instantiations.py Sat, 08 Nov 2003 18:17:07 +0100 burrus_n (oln/v/24_generate_m 1.3 700) @@ -1,14 +1,16 @@ #!/usr/bin/env python +import sys + files = [] def close_files(): for file in files: file.close() -def open_files(): +def open_files(path): for dim in range(1, 4): - files.append(open("swilena_morpho%(dim)sd.i" % vars(), 'w')) + files.append(open(path + "/swilena_morpho%(dim)sd.i" % vars(), 'w')) def write_headers(): for dim in range(1, 4): @@ -18,10 +20,13 @@ %%module swilena_morpho%(dim)sd %%include swilena_exception.i + +%%include swilena_ntg_macros.i +%%import swilena_ntg.i + %%include swilena_morpho.i %%import swilena_image%(dim)sd.i -%%import swilena_ntg.i """ % vars()) @@ -54,6 +59,12 @@ instantiate(dim, "dilation", img_type, img_type, win_type) instantiate(dim, "fast_dilation", img_type, img_type, win_type) + instantiate(dim, "opening", img_type, img_type, win_type) + instantiate(dim, "fast_opening", img_type, img_type, win_type) + + instantiate(dim, "closing", img_type, img_type, win_type) + instantiate(dim, "fast_closing", img_type, img_type, win_type) + instantiate(dim, "thickening", img_type, img_type, win_type, win_type) instantiate(dim, "fast_thickening", img_type, img_type, win_type, win_type) @@ -143,7 +154,12 @@ # instantiate(dim, "fast_minima_killer", img_type, neighb_type) def main(): - open_files() + if len(sys.argv) != 2: + sys.stderr.write ("Usage: generate_morpho_instanciations.py path\n") + sys.exit (1) + else: + path = sys.argv[1] + open_files(path) write_headers() write_algorithms() close_files()

21 years, 6 months

10.36: fix cc.hh

by Nicolas Burrus

Index: integre/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * ntg/utils/cast.hh: Fix comparison casts. Index: olena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * oln/arith/internal/opdecls.hh: Add missing default functors. * oln/level/cc.hh: Use default arithmetic functor. * oln/convert/cast.hh: New. * oln/convert/basics.hh: Include it. Index: olena/oln/arith/internal/opdecls.hh --- olena/oln/arith/internal/opdecls.hh Wed, 08 Oct 2003 23:36:51 +0200 burrus_n (oln/b/22_opdecls.hh 1.14 640) +++ olena/oln/arith/internal/opdecls.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/b/22_opdecls.hh 1.15 640) @@ -63,7 +63,12 @@ { \ return OPCODE; \ } \ - } /* no ; */ + }; \ + \ + template <class T1, class T2 = T1> \ + struct default_f_##OPNAME \ + : public f_##OPNAME< T1, T2, ntg_return_type(OPNAME, T1, T2) > \ + {} /* no ; */ // Functor used by operations between an image and a constant Index: olena/oln/convert/basics.hh --- olena/oln/convert/basics.hh Thu, 31 Jul 2003 15:42:27 +0200 reda (oln/23_basics.hh 1.5 640) +++ olena/oln/convert/basics.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/23_basics.hh 1.6 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003 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 @@ -30,6 +30,7 @@ # include <oln/convert/abstract/conversion.hh> # include <oln/convert/conversion.hh> +# include <oln/convert/cast.hh> # include <oln/convert/force.hh> # include <oln/convert/bound.hh> # include <oln/convert/stretch.hh> Index: olena/oln/convert/force.hh --- olena/oln/convert/force.hh Thu, 07 Aug 2003 02:08:21 +0200 david (oln/20_force.hh 1.11 640) +++ olena/oln/convert/force.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/20_force.hh 1.12 640) @@ -35,8 +35,6 @@ namespace oln { namespace convert { - // FIXME: is this really useful with new types ? - /* Like cast::force, but as a conversion functor. */ template<class Output, class Exact = mlc::final> struct force : public abstract::conversion_to_type< Output, typename mlc::exact_vt<force<Output, Exact>, Exact>::ret > Index: olena/oln/level/cc.hh --- olena/oln/level/cc.hh Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/e/20_cc.hh 1.11.1.8 640) +++ olena/oln/level/cc.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/e/20_cc.hh 1.11.1.9 640) @@ -163,7 +163,7 @@ template <class I> oln_value_type(I) get_n_cc(const abstract::image<I>& input) { - return fold(arith::f_max<oln_value_type(I)>(), input); + return fold(arith::default_f_max<oln_value_type(I)>(), input); } } // end of namespace level Index: integre/ntg/utils/cast.hh --- integre/ntg/utils/cast.hh Tue, 05 Aug 2003 21:39:33 +0200 burrus_n (oln/i/26_cast.hh 1.3.1.9 640) +++ integre/ntg/utils/cast.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/i/26_cast.hh 1.3.1.10 640) @@ -88,10 +88,10 @@ bound(const Tsrc& val) { if (ntg_max_val(Tsrc) > ntg_max_val(Tdest)) - if (val > Tsrc(ntg_max_val(Tdest))) + if (val > Tsrc(Tdest(ntg_max_val(Tdest)))) return ntg_max_val(Tdest); if (ntg_min_val(Tsrc) < ntg_min_val(Tdest)) - if (val < Tsrc(ntg_min_val(Tdest))) + if (val < Tsrc(Tdest(ntg_min_val(Tdest)))) return ntg_min_val(Tdest); return val; } @@ -220,9 +220,9 @@ template<class Tdest, class Tsrc> inline const Tdest rbound(const Tsrc& val) { - if (val > ntg_cast(ntg_max_val(Tdest))) + if (val > Tsrc(Tdest(ntg_max_val(Tdest)))) return ntg_max_val(Tdest); - if (val < ntg_cast(ntg_min_val(Tdest))) + if (val < Tsrc(Tdest(ntg_min_val(Tdest)))) return ntg_min_val(Tdest); return cast::round<Tdest>(val); } Index: olena/oln/convert/cast.hh --- olena/oln/convert/cast.hh Fri, 07 Nov 2003 17:38:17 +0100 burrus_n () +++ olena/oln/convert/cast.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/v/35_cast.hh 1.1 600) @@ -0,0 +1,61 @@ +// Copyright (C) 2001, 2002, 2003 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_CONVERT_CAST_HH +# define OLENA_CONVERT_CAST_HH + +# include <oln/convert/abstract/conversion.hh> +# include <ntg/utils/cast.hh> + +namespace oln { + namespace convert { + + template<class Output, class Exact = mlc::final> + struct cast : public abstract::conversion_to_type< Output, typename mlc::exact_vt<cast<Output, Exact>, Exact>::ret > + { + template< class Input > + Output + doit(const Input& v) const + { + return v; + } + + static std::string + name() + { + // FIXME: ntg_name(Exact) will not work for mlc::final ! + return std::string("cast<") + + ntg_name(Output) + ", " + + "FIXME: ntg_name(Exact)" + ">"; + } + + }; + + } // convert +} // oln + +#endif // OLENA_CONVERT_CAST_HH

21 years, 6 months

10.35: use static offset.

by Nicolas Burrus

Ca marche plutôt bien, on l'enlèvera si ca pose pb ... Index: metalic/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * mlc/type.hh (any_with_diamond): Use the static offset technique. Index: metalic/mlc/type.hh --- metalic/mlc/type.hh Mon, 01 Sep 2003 20:12:38 +0200 burrus_n (oln/c/21_type.hh 1.26 640) +++ metalic/mlc/type.hh Fri, 07 Nov 2003 17:19:10 +0100 burrus_n (oln/c/21_type.hh 1.27 640) @@ -34,6 +34,8 @@ # include <string> # include <cassert> +// FIXME: make a hierarchy of any with the different implementations + // any and any_with_diamond types are not defined in namespace mlc to // avoid namespace clashes. Indeed, a type inheriting from another in // a namespace foo will have implicit access to the foo namespace. @@ -53,12 +55,10 @@ E& exact() { - assert(offset_assigned); return *(E*)((char*)this - exact_offset); } const E& exact() const { - assert(offset_assigned); return *(const E*)((const char*)this - exact_offset); } @@ -67,25 +67,30 @@ return std::string("any_with_diamond<") + E::name() + ">"; } - public: + private: // This stores the actual value of the offset between the this - // pointer and the this pointer of the exact type. This enables - // diamond hierarchies, as static_cast cannot perform it and - // reinterpret_cast or (Exact*)(void*) cast are unsafe and - // compiler dependent. These members should be initialized by - // every concrete classes, using the mlc_init_static_hierarchy - // macro. - static int exact_offset; - // This Boolean determines if the exact_offset value has already - // been affected. - static bool offset_assigned; + // pointer and the address of the exact type. This enables diamond + // shaped hierarchies (static_cast can't and reinterpret_cast or + // (Exact*)(void*) cast are unsafe and compiler dependent). + static const int exact_offset; + + // Utility members used to determine the exact_offset + static const E exact_obj; + static const any_with_diamond<E>& ref_exact_obj; }; template <class E> - int any_with_diamond<E>::exact_offset = 0; + const E any_with_diamond<E>::exact_obj = E(); + + template <class E> + const any_with_diamond<E>& + any_with_diamond<E>::ref_exact_obj = any_with_diamond<E>::exact_obj; template <class E> - bool any_with_diamond<E>::offset_assigned = false; + const int any_with_diamond<E>::exact_offset = + (const char*)(void*)(&any_with_diamond<E>::ref_exact_obj) + - (const char*)(void*)(&any_with_diamond<E>::exact_obj); + // Warning, this class does not allow diamond hierarchies, consider // any_with_diamond if you really need it. @@ -284,7 +289,14 @@ | mlc_init_static_hierarchy | `--------------------------*/ -# define mlc_init_static_hierarchy(Exact) \ -mlc::assign_exact_offset<Exact, mlc::final>::doit(this) +// # define mlc_init_static_hierarchy(Exact) +// mlc::assign_exact_offset<Exact, mlc::final>::doit(this) + +// FIXME: this is for backward compatibility purposes only. This +// macro is called in every constructor of the classes, so we let them +// in place for the moment until we are sure that the static offset +// method works fine. + +# define mlc_init_static_hierarchy(Exact) #endif // ! METALIC_TYPE_HH

21 years, 6 months

10.34: Fix pgm headers

by Nicolas Burrus

Le patch de mandor est appliqué. Index: olena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * oln/io/pnm_write_2d.hh: Store in the header the maximal value of the encoding, not of the actual image values. * tests/io/tests/headers: New test. * tests/io/Makefile.am: Remove headers.pgm. Index: olena/tests/io/Makefile.am --- olena/tests/io/Makefile.am Tue, 05 Aug 2003 21:39:33 +0200 burrus_n (oln/e/49_Makefile.a 1.23 640) +++ olena/tests/io/Makefile.am Mon, 03 Nov 2003 21:49:33 +0100 burrus_n (oln/e/49_Makefile.a 1.23 640) @@ -6,6 +6,7 @@ CLEANFILES += \ black-test.pbm white-test.pbm \ + headers.pgm \ lena \ lena.ppm lena.pgm lena.pbm \ lena.pppm lena.ppgm lena.ppbm \ Index: olena/oln/io/pnm_write_2d.hh --- olena/oln/io/pnm_write_2d.hh Sat, 27 Sep 2003 18:30:39 +0200 burrus_n (oln/u/44_pnm_write_ 1.4 600) +++ olena/oln/io/pnm_write_2d.hh Mon, 03 Nov 2003 21:55:41 +0100 burrus_n (oln/u/44_pnm_write_ 1.4 600) @@ -129,9 +129,7 @@ pnm2d_info info; info.cols = im.ncols(); info.rows = im.nrows(); - oln::utils::f_minmax<oln_value_type(I)> f; - traverse(f, im); - info.max_val = f.max(); + info.max_val = ntg_max_val(oln_value_type(I)); if (info.max_val > ntg::to_ntg(65535U)) return false; Index: olena/tests/io/tests/headers --- olena/tests/io/tests/headers Mon, 03 Nov 2003 21:56:54 +0100 burrus_n () +++ olena/tests/io/tests/headers Mon, 03 Nov 2003 21:49:33 +0100 burrus_n (oln/v/32_headers 644) @@ -0,0 +1,38 @@ +// -*- c++ -*- + +#include "loadsave.hh" + +#include <fstream> +#include <sstream> + +template <class T> +bool check_type() +{ + image2d<T> ima (5, 5); + io::save(ima, "headers.pgm"); + + // Read the actual maximal value in the header of the written file + std::fstream f ("headers.pgm"); + assert(f); + std::string line; + for (unsigned i = 0; i < 4; ++i) + std::getline(f, line); + f.close(); + + // It should be the same value as ntg_max_val(T) + std::istringstream s (line); + unsigned value; + s >> value; + return value != ntg_max_val(T); +} + +bool +check(void) +{ + bool fail = false; + + fail |= check_type<int_u8>(); + fail |= check_type<int_u16>(); + + return fail; +}

21 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
...
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