July 2006 - Olena-patches

oln-0.10 10.235: Fix tests using the FFTW
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix tests using the FFTW. * oln/convol/fast_convolution.hh: s/HAVE_LIBfft/HAVE_FFTW/. * tests/convol/tests/fast_convol [HAVE_FFTW]: Invoke convol::fast::convolv and compare its result with convol::slow::convolve only if the FFTW is available. Index: 10.234/olena/oln/convol/fast_convolution.hh --- 10.234/olena/oln/convol/fast_convolution.hh Tue, 13 Jul 2004 11:48:20 +0200 palma_g (oln/r/12_fast_convo 1.4 600) +++ 10.234(w)/olena/oln/convol/fast_convolution.hh Wed, 05 Jul 2006 14:25:27 +0200 levill_r (oln/r/12_fast_convo 1.4 600) @@ -98,7 +98,7 @@ ** using namespace ntg; ** ** int main() { - ** #ifdef HAVE_LIBfft + ** #ifdef HAVE_FFTW ** image2d<int_u8> src(IMG_IN "lena.pgm"); ** float_d sigma = 2.5; ** float_d radius = 3; @@ -126,7 +126,7 @@ convolve(const abstract::image< I >& input, const abstract::image< J >& k) { -# ifdef HAVE_LIBfft +# ifdef HAVE_FFTW mlc::eq<I::dim, J::dim>::ensure(); mlc::eq<I::dim, 2>::ensure(); @@ -191,7 +191,7 @@ return output; # else assert(0); -# endif // !HAVE_LIBfft +# endif // !HAVE_FFTW } /*! Index: 10.234/olena/tests/convol/tests/fast_convol --- 10.234/olena/tests/convol/tests/fast_convol Tue, 15 Jun 2004 20:36:26 +0200 odou_s (oln/r/13_fast_convo 1.2 600) +++ 10.234(w)/olena/tests/convol/tests/fast_convol Wed, 05 Jul 2006 14:27:05 +0200 levill_r (oln/r/13_fast_convo 1.2 600) @@ -19,10 +19,15 @@ for_all(i) f_src[i] = cast::bound<float_d>(src[i]); - image2d<float_d> tmp = convol::fast::convolve<float_d>(f_src, k); - image2d<float_d> tmp2 = convol::slow::convolve<float_d>(f_src, k); + image2d<float_d> tmp = convol::slow::convolve<float_d>(f_src, k); + +// Compare the slow convolution with the fast one if it is available +// (i.e., if the FFTW is available). +#ifdef HAVE_FFTW + image2d<float_d> tmp2 = convol::fast::convolve<float_d>(f_src, k); for_all(i) if (tmp[i] != tmp2[i]) return false; +#endif }

1 0

oln-0.10 10.234: Fix geodesic dilation and erosion
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Catch up with new naming conventions w.r.t. operators in geodesic dilation and erosion. * oln/morpho/geodesic_dilation.hh (oln::morpho::geodesic_dilation) * oln/morpho/geodesic_erosion.hh (oln::morpho::geodesic_erosion): Catch up with the new naming convention w.r.t. operators. Index: 10.233/olena/oln/morpho/geodesic_dilation.hh --- 10.233/olena/oln/morpho/geodesic_dilation.hh Wed, 14 Apr 2004 00:08:50 +0200 thivol_d (oln/37_geodesic_d 1.11.1.13 600) +++ 10.233(w)/olena/oln/morpho/geodesic_dilation.hh Wed, 05 Jul 2006 14:58:21 +0200 levill_r (oln/37_geodesic_d 1.11.1.13 600) @@ -94,9 +94,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(mask, marker)); - return arith::min<oln_concrete_type(I1)>(dilation(marker, - convert::ng_to_cse(Ng)), - mask); + return arith::min_with_ret<oln_concrete_type(I1)> + (dilation(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure { Index: 10.233/olena/oln/morpho/geodesic_erosion.hh --- 10.233/olena/oln/morpho/geodesic_erosion.hh Fri, 30 Jun 2006 17:17:34 +0200 levill_r (oln/36_geodesic_e 1.21 600) +++ 10.233(w)/olena/oln/morpho/geodesic_erosion.hh Wed, 05 Jul 2006 14:58:35 +0200 levill_r (oln/36_geodesic_e 1.21 600) @@ -92,7 +92,9 @@ mlc::eq<I1::dim, N::dim>::ensure(); precondition(marker.size() == mask.size()); precondition(level::is_greater_or_equal(marker, mask)); - return arith::max<oln_concrete_type(I1)>(erosion(marker, convert::ng_to_cse(Ng)), mask); + return arith::max_with_ret<oln_concrete_type(I1)> + (erosion(marker, convert::ng_to_cse(Ng)), + mask); } namespace sure {

1 0

oln-0.10 10.233: Fix color conversions
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix color conversions. * oln/convert/float_cmp.hh: New file. * oln/convert/rgbhsv.hh: Include it. (f_rgb_to_hsv::doit, f_hsv_to_rgb::doit): Use approx_eq and (resp. approx_neq) to compare float values instead of plain == (resp. !=). * oln/convert/rgbhsl.hh (f_rgb_to_hsl::doit, f_hsl_to_rgb::doit): Likewise. * tests/convert/conv.cc: Typo. * oln/makefile.src (OLN_DEP): Add convert/float_cmp.hh. Index: 10.232/olena/tests/convert/conv.cc --- 10.232/olena/tests/convert/conv.cc Thu, 31 Jul 2003 15:42:27 +0200 reda (oln/u/12_conv.cc 1.2 600) +++ 10.232(w)/olena/tests/convert/conv.cc Wed, 05 Jul 2006 17:43:16 +0200 levill_r (oln/u/12_conv.cc 1.2 600) @@ -2,8 +2,7 @@ /* The extra indirection to the _STR and _CONC macros is required so that if the arguments to STR() (or CONC()) are themselves macros, they will - ls - be expanded before being quoted. */ + be expanded before being quoted. */ #ifndef STR # define _STR(arg) #arg # define STR(arg) _STR(arg) Index: 10.232/olena/oln/convert/rgbhsv.hh --- 10.232/olena/oln/convert/rgbhsv.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/35_rgbhsv.hh 1.4 600) +++ 10.232(w)/olena/oln/convert/rgbhsv.hh Tue, 04 Jul 2006 19:25:50 +0200 levill_r (oln/j/35_rgbhsv.hh 1.4 600) @@ -31,6 +31,7 @@ # include <oln/basics.hh> # include <oln/convert/abstract/colorconv.hh> +# include <oln/convert/float_cmp.hh> # include <ntg/basics.hh> # include <ntg/color/rgb.hh> @@ -71,17 +72,17 @@ out[hsv_V] = max_in; - if (max_in != 0) + if (approx_neq(max_in, 0)) out[hsv_S] = delta / max_in; else out[hsv_S] = 0; - if (out[hsv_S] == 0) + if (approx_eq(out[hsv_S], 0)) out[hsv_H] = -1; // undefined else { - if (in[rgb_R] == max_in) + if (approx_eq(in[rgb_R], max_in)) out[hsv_H] = (in[rgb_G] - in[rgb_B]) / delta; - else if (in[rgb_G] == max_in) + else if (approx_eq(in[rgb_G], max_in)) out[hsv_H] = 2 + (in[rgb_B] - in[rgb_R]) / delta; else out[hsv_H] = 4 + (in[rgb_R] - in[rgb_G]) / delta; @@ -129,7 +130,7 @@ vec<3, float> in = v.to_float(); vec<3, float> out; - if(in[hsv_S] == 0) + if(approx_eq(in[hsv_S], 0)) out[rgb_G] = out[rgb_B] = out[rgb_R] = in[hsv_V]; else { Index: 10.232/olena/oln/convert/rgbhsl.hh --- 10.232/olena/oln/convert/rgbhsl.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/j/36_rgbhsl.hh 1.6 600) +++ 10.232(w)/olena/oln/convert/rgbhsl.hh Wed, 05 Jul 2006 17:50:01 +0200 levill_r (oln/j/36_rgbhsl.hh 1.6 600) @@ -31,6 +31,7 @@ # include <oln/basics.hh> # include <oln/convert/abstract/colorconv.hh> +# include <oln/convert/float_cmp.hh> # include <ntg/basics.hh> # include <ntg/color/rgb.hh> @@ -95,10 +96,11 @@ float diff = max_in-min_in; out[hsl_L] = (max_in + min_in) / 2; - if (std::abs(diff) <= FLT_EPSILON){ - out[hsl_S] = 0; - out[hsl_H] = 0; // undefined - } + if (approx_eq (diff, 0)) + { + out[hsl_S] = 0; + out[hsl_H] = 0; // undefined + } else { if (out[hsl_L] <= 0.5) out[hsl_S] = diff / (max_in + min_in); @@ -110,11 +112,11 @@ float g_dist = (max_in - in[rgb_G]) / diff; float b_dist = (max_in - in[rgb_B]) / diff; - if (in[rgb_R] == max_in) + if (approx_eq(in[rgb_R], max_in)) out[hsl_H] = b_dist - g_dist; - else if(in[rgb_G] == max_in) + else if(approx_eq(in[rgb_G], max_in)) out[hsl_H] = 2 + r_dist - b_dist; - else if(in[rgb_B] == max_in) + else if(approx_eq(in[rgb_B], max_in)) out[hsl_H] = 4 + g_dist - r_dist; out[hsl_H] *= 60; @@ -187,7 +189,7 @@ float p1 = 2 * in[hsl_L] - p2; - if(in[hsl_S] == 0) + if(approx_eq (in[hsl_S], 0)) out[rgb_R] = out[rgb_G] = out[rgb_B] = in[hsl_L]; else { Index: 10.232/olena/oln/makefile.src --- 10.232/olena/oln/makefile.src Thu, 09 Sep 2004 11:24:20 +0200 palma_g (oln/rOnly in 10.232(w): olena/oln/convert/float_cmp.hh /4_makefile.s 1.7 600) +++ 10.232(w)/olena/oln/makefile.src Wed, 05 Jul 2006 18:11:16 +0200 levill_r (oln/r/4_makefile.s 1.7 600) @@ -20,6 +20,7 @@ convert/abstract/conversion.hh \ convert/conversion.hh \ convert/conversion_ng_se.hh \ + convert/float_cmp.hh \ convert/force.hh \ convert/nrgbxyz.hh \ convert/rgbyiq.hh \

1 0

oln-0.10 10.232: Fix a color conversion formula
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix a color conversion formula. * ntg/color/color.hh (_from_float:doit): Fix the conversion formula. Index: 10.231/integre/ntg/color/color.hh --- 10.231/integre/ntg/color/color.hh Thu, 15 Sep 2005 17:50:38 +0200 levill_r (oln/t/20_color.hh 1.8 600) +++ 10.231(w)/integre/ntg/color/color.hh Wed, 05 Jul 2006 17:41:26 +0200 levill_r (oln/t/20_color.hh 1.8 600) @@ -94,7 +94,7 @@ * out_range / in_range + float(color_system<n>::lower_bound())); - // process next componant recursively: + // Process next component recursively. _to_float<n + 1, ncomps, qbits, color_system>::doit(in, out); } }; @@ -138,14 +138,14 @@ out[n] = cast::rbound<int_u<qbits> > ((in[n] - float(color_system<n>::lower_bound())) * out_range / in_range - + float(color_system<n>::lower_bound())); + + float(optraits<T>::min())); - // process next componant recursively: + // Process next component recursively. _from_float<n + 1, ncomps, qbits, color_system>::doit(in, out); } }; - // stop recursion when n == ncomps. + // Stop recursion when n == ncomps. template <unsigned ncomps, unsigned qbits, template <unsigned> class color_system>

1 0

oln-0.10 10.231: Fix some tests using ntg::range
by Roland Levillain 05 Jul '06

05 Jul '06

2006-07-05 Roland Levillain <roland(a)lrde.epita.fr> Fix some tests using ntg::range. * tests/types/tests/float_r2, tests/types/tests/range2, * tests/types/tests/range2b: Fix tests. Index: 10.230/integre/tests/types/tests/float_r2 --- 10.230/integre/tests/types/tests/float_r2 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/h/11_float_r2 1.3 600) +++ 10.230(w)/integre/tests/types/tests/float_r2 Tue, 04 Jul 2006 14:13:52 +0200 levill_r (oln/h/11_float_r2 1.3 600) @@ -28,4 +28,8 @@ typedef range<float_s, bounded_s<10, 20>, strict> sr; sr f = 23.0; // ABORT -(void) f; +/* Make as if `f' is actually used. As we can't cast `f' to `void' + here (since it would produce an error in + `ntg::range<T, interval, behavior>::operator U()', we assign `f' to + itself. */ +f = f; Index: 10.230/integre/tests/types/tests/range2b --- 10.230/integre/tests/types/tests/range2b Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/h/36_range2b 1.2 600) +++ 10.230(w)/integre/tests/types/tests/range2b Tue, 04 Jul 2006 14:18:29 +0200 levill_r (oln/h/36_range2b 1.2 600) @@ -27,4 +27,8 @@ // Public License. range<int_u8, bounded_u<10, 13> > u = 14; // ABORT -(void) u; +/* Make as if `u' is actually used. As we can't cast `u' to `void' + here (since it would produce an error in + `ntg::range<T, interval, behavior>::operator U()', we assign `u' to + itself. */ +u = u; Index: 10.230/integre/tests/types/tests/range2 --- 10.230/integre/tests/types/tests/range2 Tue, 20 Apr 2004 15:16:21 +0200 van-vl_n (oln/h/33_range2 1.2 600) +++ 10.230(w)/integre/tests/types/tests/range2 Tue, 04 Jul 2006 14:17:13 +0200 levill_r (oln/h/33_range2 1.2 600) @@ -27,4 +27,8 @@ // Public License. range<int_u8, bounded_u<10, 13>, strict> u = 14; // ABORT -(void) u; +/* Make as if `u' is actually used. As we can't cast `u' to `void' + here (since it would produce an error in + `ntg::range<T, interval, behavior>::operator U()', we assign `u' to + itself. */ +u = u;

1 0

Re: [Olena-patches] oln-0.10 10.229: Improve C++ compliance
by Tsuna 04 Jul '06

04 Jul '06

On 2006-07-04, Roland Levillain <roland(a)lrde.epita.fr> wrote: > 2006-07-04 Roland Levillain <roland(a)lrde.epita.fr> > > Improve C++ compliance. > > * oln/topo/tarjan/tarjan_with_attr.hh (get_compute_impl): Prefix > calls to member functions of base class with `this->'. > > > Index: 10.228/olena/oln/topo/tarjan/tarjan_with_attr.hh > --- 10.228/olena/oln/topo/tarjan/tarjan_with_attr.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/m/46_tarjan_wit 1.4 600) > +++ 10.228(w)/olena/oln/topo/tarjan/tarjan_with_attr.hh Tue, 04 Jul 2006 10:58:25 +0200 levill_r (oln/m/46_tarjan_wit 1.4 600) > @@ -167,7 +167,7 @@ > oln_neighb_type(N) Q_prime(Ng, p_p); > for_all (Q_prime) > if (is_proc(Q_prime)) > - uni(Q_prime.cur(), p_p); > + this->uni(Q_prime.cur(), p_p); > if (to_comp_[p_p] == (ncomps_ + 1)) // new component > ++ncomps_; > else > > Hum... does it really change something?! o_O -- SIGOURE Benoit aka Tsuna _____ /EPITA\ Promo 2008.CSI Rock & tRoll

2 1

Re: [Olena-patches] oln-0.10 10.228: Fix C++ compiler identification
by Tsuna 04 Jul '06

04 Jul '06

On 2006-07-04, Roland Levillain <roland(a)lrde.epita.fr> wrote: > > Fix C++ compiler identification. > > * config/oln.m4 (AC_CXX_FLAGS): Check for the Intel C++ compiler > before the GNU C++ compiler. > > > Index: 10.227/config/oln.m4 > --- 10.227/config/oln.m4 Fri, 30 Jun 2006 16:51:46 +0200 levill_r (oln/j/15_oln.m4 1.38.1.12 600) > +++ 10.227(w)/config/oln.m4 Tue, 04 Jul 2006 11:33:53 +0200 levill_r (oln/j/15_oln.m4 1.38.1.12 600) > @@ -465,15 +465,19 @@ > # specifications. > > # This macro checks for the following compilers : > +# - Intel C++ (icpc) > # - GNU C++ (g++) > # - Sun WorkShop C++ (Sun/CC) > -# - Intel C++ (icc) > # - Comeau C++ (como) > # and sets the following autoconf variables: > # CXXFLAGS_DEBUG > # CXXFLAGS_STRICT > # CXXFLAGS_STRICT_ERRORS > # CXXFLAGS_OPTIMIZE > +# > +# The Intel C++ compiler is checked before the GNU C++ compiler, > +# because our test for the latter recognizes the former as G++ (i.e., > +# icpc defines __GNUC__). Perhaps we should use another test for G++. > First off, I thought about using __GNUG__ but icpc also defines it :( __GNUG__ The GNU C compiler defines this when the compilation language is C++; use `__GNUG__' to distinguish between GNU C and GNU C++. icpc defines the following: #define __GNUG__ 3 #define __GNUC__ 4 #define __GNUC_MINOR__ 0 #define __VERSION__ "Intel(R) C++ gcc 3.0 mode" How about grepping the result of icpc -E? <<<< test.cc <<<< __VERSION__ >>>>>>>>>>>>>>>>> if icpc -E test.cc | grep -i intel >/dev/null; then echo 'ICPC' else echo 'Try something else :)' fi -- SIGOURE Benoit aka Tsuna _____ /EPITA\ Promo 2008.CSI Rock & tRoll

1 0

oln-0.10 10.229: Improve C++ compliance
by Roland Levillain 04 Jul '06

04 Jul '06

2006-07-04 Roland Levillain <roland(a)lrde.epita.fr> Improve C++ compliance. * oln/topo/tarjan/tarjan_with_attr.hh (get_compute_impl): Prefix calls to member functions of base class with `this->'. Index: 10.228/olena/oln/topo/tarjan/tarjan_with_attr.hh --- 10.228/olena/oln/topo/tarjan/tarjan_with_attr.hh Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/m/46_tarjan_wit 1.4 600) +++ 10.228(w)/olena/oln/topo/tarjan/tarjan_with_attr.hh Tue, 04 Jul 2006 10:58:25 +0200 levill_r (oln/m/46_tarjan_wit 1.4 600) @@ -167,7 +167,7 @@ oln_neighb_type(N) Q_prime(Ng, p_p); for_all (Q_prime) if (is_proc(Q_prime)) - uni(Q_prime.cur(), p_p); + this->uni(Q_prime.cur(), p_p); if (to_comp_[p_p] == (ncomps_ + 1)) // new component ++ncomps_; else

1 0

oln-0.10 10.228: Fix C++ compiler identification
by Roland Levillain 04 Jul '06

04 Jul '06

2006-07-04 Roland Levillain <roland(a)lrde.epita.fr> Fix C++ compiler identification. * config/oln.m4 (AC_CXX_FLAGS): Check for the Intel C++ compiler before the GNU C++ compiler. Index: 10.227/config/oln.m4 --- 10.227/config/oln.m4 Fri, 30 Jun 2006 16:51:46 +0200 levill_r (oln/j/15_oln.m4 1.38.1.12 600) +++ 10.227(w)/config/oln.m4 Tue, 04 Jul 2006 11:33:53 +0200 levill_r (oln/j/15_oln.m4 1.38.1.12 600) @@ -465,15 +465,19 @@ # specifications. # This macro checks for the following compilers : +# - Intel C++ (icpc) # - GNU C++ (g++) # - Sun WorkShop C++ (Sun/CC) -# - Intel C++ (icc) # - Comeau C++ (como) # and sets the following autoconf variables: # CXXFLAGS_DEBUG # CXXFLAGS_STRICT # CXXFLAGS_STRICT_ERRORS # CXXFLAGS_OPTIMIZE +# +# The Intel C++ compiler is checked before the GNU C++ compiler, +# because our test for the latter recognizes the former as G++ (i.e., +# icpc defines __GNUC__). Perhaps we should use another test for G++. AC_DEFUN([AC_CXX_FLAGS], [dnl @@ -482,7 +486,10 @@ AC_CACHE_CHECK([for C++ compiler-specific extra flags], [ac_cv_cxx_style], [ac_cv_cxx_style=unknown - if test "x$ac_compiler_gnu" != xno; then + if $CXX -V 2>&1 | grep -i "Intel(R) C++">/dev/null 2>&1; + then + ac_cv_cxx_style=Intel + elif test "x$ac_compiler_gnu" != xno; then [case `$CXX --version` in *3.[2-9]* | \ *[4-9].* ) @@ -492,9 +499,6 @@ esac] elif $CXX -V 2>&1 | grep -i "WorkShop">/dev/null 2>&1; then ac_cv_cxx_style=Sun - elif $CXX -V 2>&1 | grep -i "Intel(R) C++">/dev/null 2>&1; - then - ac_cv_cxx_style=Intel else echo "int main() {}" >conftest.cc if $CXX --version conftest.cc 2>&1 \

1 0