Olena September 2003

olena@lrde.epita.fr

8 participants
23 discussions

by Nicolas Burrus

Fix https://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/SwigVersion . Applique le meme principe pour ruby. Index: ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * config/oln-local.m4: Fix swig detection. * configure.ac: Stop if ruby is not found. Stop if swig is not found. +2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + * configure.ac: Generate makefiles for swilena tests. 2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> Index: configure.ac --- configure.ac Sun, 21 Sep 2003 23:13:48 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.12 640) +++ configure.ac Sun, 21 Sep 2003 23:54:00 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.13 640) @@ -350,6 +350,12 @@ AC_CHECK_SWIG13 dnl definition in oln-local.m4 + # We cannot enable swilena without swig because we need the dynamic + # library (swig{py,rb}). + if test "x$oln_cv_recent_swig" != "xyes"; then + AC_MSG_ERROR([You need swig >= 1.3 to compile swilena. You can disable swilena by specifying --without-swilena to configure.]) + fi + AC_ARG_VAR([DVIPS], [program to make Postscript from TeX DVI files]) AC_CHECK_PROGS([DVIPS], [dvips], [$am_aux_dir/missing dvips]) AC_ARG_VAR([TEXI2DVI], [program to create DVI from Texinfo files]) @@ -387,15 +393,20 @@ [tools/swilena/ruby/Makefile tools/swilena/ruby/tests/Makefile], [ + AC_CHECK_PROGS([RUBY], [ruby], [$am_aux_dir/missing ruby]) + if test "x$RUBY" = "x$am_aux_dir/missing ruby"; then + AC_MSG_ERROR([You need ruby to compile the ruby interface. Specify --without-rblena to disable the ruby interface.]) + fi + AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h]) - AC_ARG_WITH([python-includedir], [Include path for ruby.h], + AC_ARG_WITH([ruby-includedir], [Include path for ruby.h], [RUBY_CPPFLAGS="-I$withval"], [RUBY_CPPFLAGS="-I/usr/lib/ruby/1.6/i386-linux"]) CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" AC_CHECK_HEADERS([ruby.h],, AC_MSG_ERROR( - [You need Ruby development files to compile the Ruby interface. Specify --with-python-includedir to set it manually or --without-rblena to disable it.])) + [You need Ruby development files to compile the Ruby interface. Specify --with-ruby-includedir to set it manually or --without-rblena to disable it.])) CPPFLAGS=$save_CPPFLAGS ], [ruby])dnl End of OLN_COMPONENT([tools/swilena/ruby]) Index: config/oln-local.m4 --- config/oln-local.m4 Mon, 04 Aug 2003 17:34:35 +0200 burrus_n (oln/p/37_oln-local. 1.6 640) +++ config/oln-local.m4 Sun, 21 Sep 2003 23:54:00 +0200 burrus_n (oln/p/37_oln-local. 1.7 640) @@ -60,12 +60,7 @@ AC_DEFUN([AC_CHECK_SWIG13], [dnl AC_ARG_VAR([SWIG], [the SWIG interface generator]) -# FIXME: cleanup this -# We cannot enable the compilation of swilena without swig, since -# the link phase requires libswigpy.so. -# AC_CHECK_PROGS([SWIG], [swig], [$am_aux_dir/missing swig]) - AC_CHECK_PROGS([SWIG], [swig], AC_MSG_ERROR([You need swig >= 1.3 to compile swilena. You can disable swilena by specifying --without-swilena to configure.])) - + AC_CHECK_PROGS([SWIG], [swig], [$am_aux_dir/missing swig]) AC_CACHE_CHECK([for SWIG >= 1.3], [oln_cv_recent_swig], [oln_cv_recent_swig=no @@ -81,4 +76,5 @@ fi fi fi]) + ])

21 years, 9 months

oln 10.19: fix swilena type matching problem.

by Nicolas Burrus

Le découpage en petits modules avait abimé la pauvre swilena. Le matching ne se faisait plus entre ntg::int_u8 (un typedef, nommé p__int_u8) et ntg::int_u<8, ntg::strict> (nommé int_u__T_8_...). Solution : n'utiliser que la version template. Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * meta/swilena_ntg_int_u.i: Fix type matching problems between templates and typedefs. * meta/swilena_ntg_int_s.i: Likewise. * meta/swilena_ntg_cplx.i: Likewise. * meta/swilena_ntg.i: Likewise. Tweak for ruby. * meta/swilena_exception.i: Include <exception> in the c++ code. * expand.sh: Adjust consequently. +2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + * meta/swilena_ntg.i: Adjust for ruby. * meta/swilena_describe.i: Tweak for ruby. Index: tools/swilena/meta/swilena_ntg_int_u.i --- tools/swilena/meta/swilena_ntg_int_u.i Tue, 06 May 2003 06:56:14 +0200 raph (oln/s/30_swilena_nt 1.1 640) +++ tools/swilena/meta/swilena_ntg_int_u.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/30_swilena_nt 1.2 640) @@ -7,13 +7,35 @@ #include <ntg/all.hh> %} -%template(int_u8) ntg::int_u<8, ntg::strict>; -%template(int_u8u) ntg::int_u<8, ntg::unsafe>; -%template(int_u8s) ntg::int_u<8, ntg::saturate>; -%template(int_u16) ntg::int_u<16, ntg::strict>; -%template(int_u16u) ntg::int_u<16, ntg::unsafe>; -%template(int_u16s) ntg::int_u<16, ntg::saturate>; -%template(int_u32) ntg::int_u<32, ntg::strict>; -%template(int_u32u) ntg::int_u<32, ntg::unsafe>; -%template(int_u32s) ntg::int_u<32, ntg::saturate>; +%define declare_int_u(Name, nbits, behavior) +%template(Name) ntg::int_u<nbits, behavior>; + +/* + This macro should be used in all modules + Using ntg::int_u8 directly leads to type matching problems: + + - it is a typedef never used in module swilena_ntg_int_u + => no type correspondence is created between ntg::int_u8 + and ntg::int_u<8, ntg::strict>. + + - if another module use ntg::int_u8, operations on it won't be + possible since this module won't recognize the type ntg::int_u8. + + - ntg::int_u<8, ntg::strict> or ntg_int_u8 should be used + everywhere. ntg_int_u8 is just a convenient macro. +*/ + +#define ntg_ ## Name ntg::int_u<nbits, behavior> + +%enddef + +declare_int_u(int_u8, 8, ntg::strict); +declare_int_u(int_u8u, 8, ntg::unsafe); +declare_int_u(int_u8s, 8, ntg::saturate); +declare_int_u(int_u16, 16, ntg::strict); +declare_int_u(int_u16u, 16, ntg::unsafe); +declare_int_u(int_u16s, 16, ntg::saturate); +declare_int_u(int_u32, 32, ntg::strict); +declare_int_u(int_u32u, 32, ntg::unsafe); +declare_int_u(int_u32s, 32, ntg::saturate); Index: tools/swilena/meta/swilena_ntg_int_s.i --- tools/swilena/meta/swilena_ntg_int_s.i Tue, 06 May 2003 06:56:14 +0200 raph (oln/s/31_swilena_nt 1.1 640) +++ tools/swilena/meta/swilena_ntg_int_s.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/31_swilena_nt 1.2 640) @@ -7,14 +7,21 @@ #include <ntg/all.hh> %} -%template(int_s8) ntg::int_s<8, ntg::strict>; -%template(int_s8u) ntg::int_s<8, ntg::unsafe>; -%template(int_s8s) ntg::int_s<8, ntg::saturate>; -%template(int_s16) ntg::int_s<16, ntg::strict>; -%template(int_s16u) ntg::int_s<16, ntg::unsafe>; -%template(int_s16s) ntg::int_s<16, ntg::saturate>; -%template(int_s32) ntg::int_s<32, ntg::strict>; -%template(int_s32u) ntg::int_s<32, ntg::unsafe>; -%template(int_s32s) ntg::int_s<32, ntg::saturate>; +%define declare_int_s(Name, nbits, behavior) +%template(Name) ntg::int_s<nbits, behavior>; +// See comments in swilena_ntg_int_u.i +#define ntg_ ## Name ntg::int_s<nbits, behavior> + +%enddef + +declare_int_s(int_s8, 8, ntg::strict); +declare_int_s(int_s8u, 8, ntg::unsafe); +declare_int_s(int_s8s, 8, ntg::saturate); +declare_int_s(int_s16, 16, ntg::strict); +declare_int_s(int_s16u, 16, ntg::unsafe); +declare_int_s(int_s16s, 16, ntg::saturate); +declare_int_s(int_s32, 32, ntg::strict); +declare_int_s(int_s32u, 32, ntg::unsafe); +declare_int_s(int_s32s, 32, ntg::saturate); Index: tools/swilena/meta/swilena_ntg_cplx.i --- tools/swilena/meta/swilena_ntg_cplx.i Tue, 13 May 2003 22:29:01 +0200 burrus_n (oln/s/32_swilena_nt 1.2 640) +++ tools/swilena/meta/swilena_ntg_cplx.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/32_swilena_nt 1.3 640) @@ -7,7 +7,17 @@ #include <ntg/all.hh> %} -%template(cplx_rf) ntg::cplx<ntg::rect, ntg::float_s>; -%template(cplx_rd) ntg::cplx<ntg::rect, ntg::float_d>; -%template(cplx_pf) ntg::cplx<ntg::polar, ntg::float_s>; -%template(cplx_pd) ntg::cplx<ntg::polar, ntg::float_d>; +%define declare_cplx(Name, repr, T) + +%template(Name) ntg::cplx<repr, T>; + +// See comments in swilena_ntg_int_u.i +#define ntg_ ## Name ntg::cplx<repr, T> + +%enddef + + +declare_cplx(cplx_rf, ntg::rect, ntg_float_s); +declare_cplx(cplx_rd, ntg::rect, ntg_float_d); +declare_cplx(cplx_pf, ntg::polar, ntg_float_s); +declare_cplx(cplx_pd, ntg::polar, ntg_float_d); Index: tools/swilena/meta/swilena_ntg.i --- tools/swilena/meta/swilena_ntg.i Tue, 13 May 2003 22:29:01 +0200 burrus_n (oln/s/33_swilena_nt 1.2 640) +++ tools/swilena/meta/swilena_ntg.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/33_swilena_nt 1.3 640) @@ -17,7 +17,7 @@ void value(ValueType x) { *self = Ns::Name<nbits, behaviour>(x); } -#if defined(SWIGPYTHON) +#if defined(SWIGPYTHON) || defined(SWIGRUBY) Ns::Name<nbits, behaviour> operator+ (const Ns::Name<nbits, behaviour>& other) const { return (*self) + other; } Ns::Name<nbits, behaviour> operator- (const Ns::Name<nbits, behaviour>& other) const { return (*self) - other; } Ns::Name<nbits, behaviour> operator* (const Ns::Name<nbits, behaviour>& other) const { return (*self) * other; } @@ -26,6 +26,18 @@ Ns::Name<nbits, behaviour> operator- (ValueType other) const { return (*self) - other; } Ns::Name<nbits, behaviour> operator* (ValueType other) const { return (*self) * other; } Ns::Name<nbits, behaviour> operator/ (ValueType other) const { return (*self) / other; } +#else + Ns::Name<nbits, behaviour> add (const Ns::Name<nbits, behaviour>& other) const { return (*self) + other; } + Ns::Name<nbits, behaviour> sub (const Ns::Name<nbits, behaviour>& other) const { return (*self) - other; } + Ns::Name<nbits, behaviour> mul (const Ns::Name<nbits, behaviour>& other) const { return (*self) * other; } + Ns::Name<nbits, behaviour> div (const Ns::Name<nbits, behaviour>& other) const { return (*self) / other; } + Ns::Name<nbits, behaviour> add (ValueType other) const { return (*self) + other; } + Ns::Name<nbits, behaviour> sub (ValueType other) const { return (*self) - other; } + Ns::Name<nbits, behaviour> mul (ValueType other) const { return (*self) * other; } + Ns::Name<nbits, behaviour> div (ValueType other) const { return (*self) / other; } +#endif + +#if defined(SWIGPYTHON) Ns::Name<nbits, behaviour>& operator+= (const Ns::Name<nbits, behaviour>& other) { return (*self) += other; } Ns::Name<nbits, behaviour>& operator-= (const Ns::Name<nbits, behaviour>& other) { return (*self) -= other; } Ns::Name<nbits, behaviour>& operator*= (const Ns::Name<nbits, behaviour>& other) { return (*self) *= other; } @@ -34,48 +46,49 @@ Ns::Name<nbits, behaviour>& operator-= (ValueType other) { return (*self) -= other; } Ns::Name<nbits, behaviour>& operator*= (ValueType other) { return (*self) *= other; } Ns::Name<nbits, behaviour>& operator/= (ValueType other) { return (*self) /= other; } +#elseif !defined(SWIGRUBY) // These operators are generated by default in Ruby + Ns::Name<nbits, behaviour>& iadd (const Ns::Name<nbits, behaviour>& other) { return (*self) += other; } + Ns::Name<nbits, behaviour>& isub (const Ns::Name<nbits, behaviour>& other) { return (*self) -= other; } + Ns::Name<nbits, behaviour>& imul (const Ns::Name<nbits, behaviour>& other) { return (*self) *= other; } + Ns::Name<nbits, behaviour>& idiv (const Ns::Name<nbits, behaviour>& other) { return (*self) /= other; } + Ns::Name<nbits, behaviour>& iadd (ValueType other) { return (*self) += other; } + Ns::Name<nbits, behaviour>& isub (ValueType other) { return (*self) -= other; } + Ns::Name<nbits, behaviour>& imul (ValueType other) { return (*self) *= other; } + Ns::Name<nbits, behaviour>& idiv (ValueType other) { return (*self) /= other; } +#endif + +#if defined(SWIGPYTHON) || defined(SWIGRUBY) bool operator< (const Ns::Name<nbits, behaviour>& other) const { return (*self) < other; } bool operator> (const Ns::Name<nbits, behaviour>& other) const { return (*self) > other; } bool operator<= (const Ns::Name<nbits, behaviour>& other) const { return (*self) <= other; } bool operator>= (const Ns::Name<nbits, behaviour>& other) const { return (*self) >= other; } bool operator== (const Ns::Name<nbits, behaviour>& other) const { return (*self) == other; } - bool operator!= (const Ns::Name<nbits, behaviour>& other) const { return (*self) != other; } bool operator< (ValueType other) const { return (*self) < other; } bool operator> (ValueType other) const { return (*self) > other; } bool operator<= (ValueType other) const { return (*self) <= other; } bool operator>= (ValueType other) const { return (*self) >= other; } bool operator== (ValueType other) const { return (*self) == other; } - bool operator!= (ValueType other) const { return (*self) != other; } #else - Ns::Name<nbits, behaviour> add (const Ns::Name<nbits, behaviour>& other) const { return (*self) + other; } - Ns::Name<nbits, behaviour> sub (const Ns::Name<nbits, behaviour>& other) const { return (*self) - other; } - Ns::Name<nbits, behaviour> mul (const Ns::Name<nbits, behaviour>& other) const { return (*self) * other; } - Ns::Name<nbits, behaviour> div (const Ns::Name<nbits, behaviour>& other) const { return (*self) / other; } - Ns::Name<nbits, behaviour> add (ValueType other) const { return (*self) + other; } - Ns::Name<nbits, behaviour> sub (ValueType other) const { return (*self) - other; } - Ns::Name<nbits, behaviour> mul (ValueType other) const { return (*self) * other; } - Ns::Name<nbits, behaviour> div (ValueType other) const { return (*self) / other; } - Ns::Name<nbits, behaviour>& iadd (const Ns::Name<nbits, behaviour>& other) const { return (*self) += other; } - Ns::Name<nbits, behaviour>& isub (const Ns::Name<nbits, behaviour>& other) const { return (*self) -= other; } - Ns::Name<nbits, behaviour>& imul (const Ns::Name<nbits, behaviour>& other) const { return (*self) *= other; } - Ns::Name<nbits, behaviour>& idiv (const Ns::Name<nbits, behaviour>& other) const { return (*self) /= other; } - Ns::Name<nbits, behaviour>& iadd (ValueType other) const { return (*self) += other; } - Ns::Name<nbits, behaviour>& isub (ValueType other) const { return (*self) -= other; } - Ns::Name<nbits, behaviour>& imul (ValueType other) const { return (*self) *= other; } - Ns::Name<nbits, behaviour>& idiv (ValueType other) const { return (*self) /= other; } bool lt (const Ns::Name<nbits, behaviour>& other) const { return (*self) < other; } bool gt (const Ns::Name<nbits, behaviour>& other) const { return (*self) > other; } bool le (const Ns::Name<nbits, behaviour>& other) const { return (*self) <= other; } bool ge (const Ns::Name<nbits, behaviour>& other) const { return (*self) >= other; } bool eq (const Ns::Name<nbits, behaviour>& other) const { return (*self) == other; } - bool ne (const Ns::Name<nbits, behaviour>& other) const { return (*self) != other; } bool lt (ValueType other) const { return (*self) < other; } bool gt (ValueType other) const { return (*self) > other; } bool le (ValueType other) const { return (*self) <= other; } bool ge (ValueType other) const { return (*self) >= other; } bool eq (ValueType other) const { return (*self) == other; } +#endif + +#if defined(SWIGPYTHON) + bool operator!= (const Ns::Name<nbits, behaviour>& other) const { return (*self) != other; } + bool operator!= (ValueType other) const { return (*self) != other; } +#elseif !defined(SWIGRUBY) + bool ne (const Ns::Name<nbits, behaviour>& other) const { return (*self) != other; } bool ne (ValueType other) const { return (*self) != other; } #endif + } EXTEND_DESCRIBE2(Ns::Name<nbits, behaviour>); @@ -192,3 +205,8 @@ %enddef decl_ntg() + +// Compatibility macro, see swilena_ntg_int_u.i +#define ntg_bin ntg::bin +#define ntg_float_s ntg::float_s +#define ntg_float_d ntg::float_d Index: tools/swilena/meta/swilena_image.i --- tools/swilena/meta/swilena_image.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/36_swilena_im 1.3 640) +++ tools/swilena/meta/swilena_image.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/36_swilena_im 1.4 640) @@ -28,7 +28,6 @@ { return (*self)[p]; } T& set(const point ## Dim ## d& p, Val v) { (*self)[p] = v; return *self; } - Val& ref(const point ## Dim ## d& p) { return (*self)[p]; } } Index: tools/swilena/meta/swilena_exception.i --- tools/swilena/meta/swilena_exception.i Tue, 06 May 2003 06:56:14 +0200 raph (oln/s/37_swilena_ex 1.1 640) +++ tools/swilena/meta/swilena_exception.i Sun, 21 Sep 2003 21:59:21 +0200 burrus_n (oln/s/37_swilena_ex 1.2 640) @@ -2,6 +2,10 @@ %include exception.i +%{ +#include <exception> +%} + // Olena uses classes that derive from std::exception. Declare it. namespace std { class exception { public: const char *what() const; }; }

21 years, 9 months

oln 10.18: add ruby support for swilena.

by Nicolas Burrus

Je ne sais pas si c'est une bonne idée de maintenir des bindings ruby, mais comme ca ne coute pas grand chose et que je l'ai fait, autant l'ajouter, on pourra toujours l'enlever (en 10 minutes) si ca nous disperse trop ... Index: ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * configure.ac: Add ruby support. Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * meta/swilena_ntg.i: Adjust for ruby. * meta/swilena_describe.i: Tweak for ruby. * expand.sh: Generate ruby source files. +2003-09-21 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + + * meta/swilena_describe.i: Add __str__ function for python. + 2003-09-15 Nicolas Burrus <burrus_n(a)lrde.epita.fr> * meta/swilena_image.i: Copy constructor parameter is not const. Index: configure.ac --- configure.ac Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.10 640) +++ configure.ac Sun, 21 Sep 2003 20:25:01 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.11 640) @@ -373,11 +373,31 @@ CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AC_CHECK_HEADERS([Python.h],, AC_MSG_ERROR( - [You need Python development files to compile the Python interface. Specify --with-python-includedir to set it manually or --without-swilena to disable it.])) + [You need Python development files to compile the Python interface. Specify --with-python-includedir to set it manually or --without-pylena to disable it.])) CPPFLAGS=$save_CPPFLAGS ], [python])dnl End of OLN_COMPONENT([tools/swilena/python]) + OLN_COMPONENT([tools/swilena/ruby], + [rblena], + [oln_cv_build_rblena], + [the Ruby interface to Olena], + [OLN_SWILENA], + [tools/swilena/ruby/Makefile], + [ + AC_ARG_VAR([RUBY_CPPFLAGS], [Path to ruby.h]) + AC_ARG_WITH([python-includedir], [Include path for ruby.h], + [RUBY_CPPFLAGS="-I$withval"], + [RUBY_CPPFLAGS="-I/usr/lib/ruby/1.6/i386-linux"]) + + CPPFLAGS="$CPPFLAGS $RUBY_CPPFLAGS" + AC_CHECK_HEADERS([ruby.h],, + AC_MSG_ERROR( + [You need Ruby development files to compile the Ruby interface. Specify --with-python-includedir to set it manually or --without-rblena to disable it.])) + + CPPFLAGS=$save_CPPFLAGS + ], [ruby])dnl End of OLN_COMPONENT([tools/swilena/ruby]) + ])dnl End of OLN_COLLECTION([OLN_SWILENA]) ], [swilena])dnl End of OLN_COMPONENT([tools/swilena]) Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Mon, 15 Sep 2003 17:50:05 +0200 burrus_n (oln/s/25_expand.sh 1.6 750) +++ tools/swilena/expand.sh Sun, 21 Sep 2003 20:25:01 +0200 burrus_n (oln/s/25_expand.sh 1.7 750) @@ -7,6 +7,7 @@ mkdir -p "$SWILENA/src" mkdir -p "$SWILENA/python" +mkdir -p "$SWILENA/ruby" MODULES="$MODULES ntg ntg_cplx ntg_int_u ntg_int_s" for dim in 1 2 3; do @@ -40,7 +41,7 @@ float_s float_d # rgb_8 rgb_16 rgb_32 do short=`echo $t | sed -e 's,int_,,g;s,_,,g'` - echo "make_image(image${dim}d_$short, $dim, ntg::$t)" >> "$SWILENA/src/swilena_image${dim}d.i" + echo "make_image(image${dim}d_$short, $dim, ntg_$t)" >> "$SWILENA/src/swilena_image${dim}d.i" done done @@ -105,6 +106,66 @@ done } +#################### Ruby stuff ####################### + +header_ruby() +{ +cat <<EOF +## Process this file through Automake to produce Makefile.in -*- Makefile -*- +## +## Makefile.am for swilena/python +## NOTE: this file was generated automatically by expand.sh +## + +INCLUDES = \$(RUBY_CPPFLAGS) -I\$(srcdir)/../src +AM_CPPFLAGS = -DOLN_EXCEPTIONS +AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) +AM_LDFLAGS = -shared -lswigrb \$(ZLIB_LDFLAGS) + +rubydir = \$(libdir)/ruby + +EOF +} + +dump_ruby() +{ + echo -n "ruby_PROGRAMS =" + ilist=0 + for mod in $MODULES; do + if [ `expr $ilist % 4` = 0 ]; then + echo " \\"; echo -ne "\t" + fi + echo -n " swilena_$mod.so" + ilist=`expr $ilist + 1` + done + echo; echo + echo -n "ruby_DATA =" + ilist=0 + for mod in $MODULES; do + if [ `expr $ilist % 4` = 0 ]; then + echo " \\"; echo -ne "\t" + fi + echo -n " swilena_$mod.rb" + ilist=`expr $ilist + 1` + done + echo; echo + for mod in $MODULES; do + echo "swilena_${mod}_so_SOURCES = swilena_${mod}_wrap.cxx" + done + echo + ilist=0 + for mod in $MODULES; do + if [ -r "$SWILENA/src/swilena_${mod}.i" ]; then + sdir=src + else + sdir=meta + fi + echo "swilena_${mod}_wrap.cxx swilena_${mod}.rb: \$(srcdir)/../$sdir/swilena_${mod}.i" + echo -e "\t\$(SWIG) -c -c++ -ruby -I\$(srcdir)/../src -I\$(srcdir)/../meta \$(CPPFLAGS) -o swilena_${mod}_wrap.cxx \$(srcdir)/../$sdir/swilena_${mod}.i" + echo + done +} + ############ Generic stuff ########### header_src() { @@ -140,3 +201,5 @@ dump_src >>"$SWILENA/src/Makefile.am" header_python >"$SWILENA/python/Makefile.am" dump_python >>"$SWILENA/python/Makefile.am" +header_ruby >"$SWILENA/ruby/Makefile.am" +dump_ruby >>"$SWILENA/ruby/Makefile.am" Index: tools/swilena/meta/swilena_describe.i --- tools/swilena/meta/swilena_describe.i Tue, 06 May 2003 06:56:14 +0200 raph (oln/s/38_swilena_de 1.1 640) +++ tools/swilena/meta/swilena_describe.i Sun, 21 Sep 2003 20:25:01 +0200 burrus_n (oln/s/38_swilena_de 1.2 640) @@ -12,6 +12,22 @@ os << # T1 "," # T2 "@" << self << " = " << (*self); return os.str(); } + +#if defined(SWIGPYTHON) + const char *__str__() { + std::ostringstream os; + os << (*self); + return os.str().c_str(); + } +#endif + +#if defined(SWIGRUBY) + std::string to_s() { + std::ostringstream os; + os << (*self); + return os.str(); + } +#endif } %enddef %define EXTEND_DESCRIBE(T) @@ -23,6 +39,21 @@ os << # T "@" << self << " = " << (*self); return os.str(); } + +#if defined(SWIGPYTHON) + const char *__str__() { + std::ostringstream os; + os << (*self); + return os.str().c_str(); } -%enddef +#endif +#if defined(SWIGRUBY) + std::string to_s() { + std::ostringstream os; + os << (*self); + return os.str(); + } +#endif +} +%enddef

21 years, 9 months

operator<< et namespace

by astrid

Soit la méthode "print" d'une classe située dans le namespace oln. Soit p un point2d. Je souhaite afficher mon point2d, et j'écris : os << p << std::endl; Malheureusement, le compilateur ne voit pas operator<<(ostream&, const point2d&) pourtant défini en dehors de tout namespace dans point2d.hh. Pour afficher mon point, je dois alors écrire : ::operator<<(os, p); C'est pas très joli. C'est moi qui fume, ou bien ? -- astrid

21 years, 9 months

Nouvelle branche "doc"

by astrid

Dans cette nouvelle branche sera mis en place le nouveau système de documentation à base de Doxygen. D'après de premières estimations, il ressort que le système créé par Pollux ne sera pas maintenu (= abandonné), car il est assez compliqué et fait double-emploi avec les nouvelles fonctionnalités de Doxygen. Responsables : Giovanni, Sylvain, Nes (?) et moi-même. -- astrid

21 years, 9 months

oln 10.16: fix swilena

by Nicolas Burrus

Index: ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * configure.ac: Improve python headers lookup. Index: tools/swilena/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * meta/swilena_image.i: Copy constructor parameter is not const. +2003-09-15 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + + * expand.sh (AM_LDFLAGS): Add ZLIB_LDFLAGS. + (INCLUDES): Use PYTHON_CPPFLAGS. + 2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr> * expand.sh: Fix data types prefix. Index: configure.ac --- configure.ac Mon, 25 Aug 2003 13:50:56 +0200 raph (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.9 640) +++ configure.ac Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.10 640) @@ -364,15 +364,20 @@ [ AM_PATH_PYTHON([2.1]) save_CPPFLAGS=$CPPFLAGS - # FIXME: find python path automatically! - CPPFLAGS="$CPPFLAGS -I/usr/include/python2.2" + + AC_ARG_VAR([PYTHON_CPPFLAGS], [Path to Python.h]) + AC_ARG_WITH([python-includedir], [Include path for Python.h], + [PYTHON_CPPFLAGS="-I $withval"], + [PYTHON_CPPFLAGS="-I/usr/include/python$PYTHON_VERSION"]) + + CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AC_CHECK_HEADERS([Python.h],, AC_MSG_ERROR( - [You need Python development files to compile the Python interface. Specify --without-swilena to configure to disable it.])) + [You need Python development files to compile the Python interface. Specify --with-python-includedir to set it manually or --without-swilena to disable it.])) + CPPFLAGS=$save_CPPFLAGS ], [python])dnl End of OLN_COMPONENT([tools/swilena/python]) - ])dnl End of OLN_COLLECTION([OLN_SWILENA]) ], [swilena])dnl End of OLN_COMPONENT([tools/swilena]) @@ -383,7 +388,6 @@ ])dnl End of OLN_COLLECTION([OLN_TOP]) - AC_OUTPUT if test "x$oln_cxxflags_clean" = xno; then Index: tools/swilena/Makefile.am --- tools/swilena/Makefile.am Tue, 06 May 2003 06:56:14 +0200 raph (oln/o/25_Makefile.a 1.4 640) +++ tools/swilena/Makefile.am Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/o/25_Makefile.a 1.5 640) @@ -1,4 +1,3 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- SUBDIRS = meta src doc $(OLN_SWILENA_SUBDIRS) - Index: tools/swilena/expand.sh --- tools/swilena/expand.sh Wed, 30 Jul 2003 16:42:01 +0200 burrus_n (oln/s/25_expand.sh 1.4 750) +++ tools/swilena/expand.sh Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/25_expand.sh 1.5 750) @@ -58,10 +58,10 @@ ## NOTE: this file was generated automatically by expand.sh ## -INCLUDES = -I/usr/include/python2.2 -I\$(srcdir)/../src +INCLUDES = \$(PYTHON_PATH) -I\$(srcdir)/../src AM_CPPFLAGS = -DOLN_EXCEPTIONS -# AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) -AM_LDFLAGS = -shared -lswigpy +AM_CXXFLAGS = \$(CXXFLAGS_OPTIMIZE) +AM_LDFLAGS = -shared -lswigpy \$(ZLIB_LDFLAGS) EOF } Index: tools/swilena/meta/swilena_point.i --- tools/swilena/meta/swilena_point.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/29_swilena_po 1.2 640) +++ tools/swilena/meta/swilena_point.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/29_swilena_po 1.3 640) @@ -125,7 +125,3 @@ } %enddef - - - - Index: tools/swilena/meta/swilena_image.i --- tools/swilena/meta/swilena_image.i Tue, 29 Jul 2003 18:21:22 +0200 david (oln/s/36_swilena_im 1.2 640) +++ tools/swilena/meta/swilena_image.i Mon, 15 Sep 2003 17:23:46 +0200 burrus_n (oln/s/36_swilena_im 1.3 640) @@ -10,7 +10,7 @@ // default constructor T(); T(const image ## Dim ## d_size&); - T(const T& other); + T(T& other); // operators T clone() const; @@ -149,4 +149,3 @@ %define make_image(name, Dim, T) %template(name) oln::image ## Dim ## d<T >; %enddef -

21 years, 9 months

oln 10.15: oups

by Giovanni Palma

Le changelog modifie precedemment n'etait pas le bon, ceci est rectifie. -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 10 months

oln 10.14: fix the threshold constructor

by Giovanni Palma

Index: ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * threshold.hh: correct the threshold construtor. Index: olena/oln/level/threshold.hh --- olena/oln/level/threshold.hh Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/f/15_threshold. 1.11 640) +++ olena/oln/level/threshold.hh Tue, 09 Sep 2003 13:45:59 +0200 palma_g (oln/f/15_threshold. 1.11 640) @@ -42,7 +42,7 @@ public: threshold(const Input& threshold, const Output& min = ntg_min_val(Output), - const Output& max = ntg_min_val(Output)) : + const Output& max = ntg_max_val(Output)) : m_threshold(threshold), m_min(min), m_max(max) {} -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 10 months

threshold

by Giovanni Palma

J'ai un probleme avec le threshold dans olena. J'utilise la version .9 du wiki. Le probleme est le suivant : le make check dans level me donne un petit vecteur a la place d'une image 2d. (sur la version 0.10, l'image a la bonne taille) ce que j'ai : P4 # Creator: OLENA / Epita-LRDE 512 1 <---- au lieu de 256 par 256 .... De plus il y a un deuxieme probleme : le suillage se termine (sur .9 et .10) par une image noire (tout le monde est a zero). Enfin je crois que le probleme viens des io car l'algo de seuillage est assez simple, et de temps a autre, le pgm de sortie est invalide. pour info l'image invalide que j'obtient est : P5 # Creator: OLENA / Epita-LRDE 620 874 0 <---- je pense pas que ce soit normal .... -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

21 years, 10 months

URGERNT ASSISTANCE

by ERIC JONES

Attn: Sir/Madam, My name is Mr. Eric Jones chairman of contract award and monitoring committee of the ministry of industry and international trade development ,my duty as empowered by the Mauritius government is to provide the basic amenities, social recreational activities in urban and rural areas. This program includes assistance to deprived local communities and to co-ordinate projects and development at the national level, furthermore, from this projects we have been able to secured some Reasonable amount of u.s.$21.8(twenty one million eight hundred thousand US. dollars only) as commission from various contractors resulting from over invoicing ,hence all the necessary approvals has been completed. These approved fund was packaged and dispatched through a security company for onward delivery to its Destination in Europe. These fund was first deposited into a security vault before we arrange for its movement to Europe through diplomatic channel using decoy purporting that the fund belongs to an expatriate/company. As we are government officials, we are not allowed to operate foreign bank account, hence we need you to stand as the beneficiary and claim the fund on our behalf from the security company. Presently I am now in Europe to search for a reliable person/company of high integrity /dignity and one with conscience who will claim this fund on our behalf as the beneficiary ,and we have agreed to give you 25%of the total sum as commission for your Assistance/effort and 5% will be used to settle every expenses incurred we will use 70%to invest under your recommendation and guide and go into joint venture business with you. I would greatly appreciate your assistance . I look forward to your response as soon as possible. Best regards Eric Jones 0031630324551

21 years, 10 months

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 September 2003