March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Parameterized test05().
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 00bcfa7ddc99ee732d0e92d643e6afd1ecd169bc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=00bcfa7ddc99… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 15:50:52 2009 +0100 Parameterized test05(). --- tests/Box/frombox1.cc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Box/frombox1.cc b/tests/Box/frombox1.cc index 4936ed0..2b90caa 100644 --- a/tests/Box/frombox1.cc +++ b/tests/Box/frombox1.cc @@ -78,8 +78,9 @@ test04() { bool test05() { + const int DIM = 10; typedef Checked_Number<mpq_class> Q; - Rational_Box src(10, UNIVERSE); + Rational_Box src(DIM, UNIVERSE); Q k; Q a; k = 2; @@ -96,7 +97,7 @@ test05() { Q s; Q m; Q d; - for (int n = 1; n <= 10; ++n) { + for (int n = 1; n <= DIM; ++n) { s = y; s *= s; s *= s;

1 0

[GIT] ppl/ppl(master): Fixed indentation.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 0cce78cf176b0db60b0fe416f86c1b1c636c62de URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0cce78cf176b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 15:49:04 2009 +0100 Fixed indentation. --- src/checked_mpz.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 7e7453c..ccc7af2 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -371,10 +371,10 @@ div_mpz(mpz_class& to, const mpz_class& x, const mpz_class& y, mpz_srcptr d = y.get_mpz_t(); if (round_ignore(dir)) { #if 0 - // FIXME: we need to reconsider Rounding_Dir argument to clarify if - // client code intention is to have approximate result without any interest - // in knowing the direction of rounding or to grant to called function - // that result will be exact. + // FIXME: we need to reconsider Rounding_Dir argument to clarify if + // client code intention is to have approximate result without any interest + // in knowing the direction of rounding or to grant to called function + // that result will be exact. mpz_divexact(to.get_mpz_t(), n, d); return V_LGE; #else

1 0

[GIT] ppl/ppl(master): These efficiency related FIXME' s are not scheduled for 0.10.1
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 4d9ca69f6866d37bae028ecf45421daa380446d1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d9ca69f6866… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 15:41:29 2009 +0100 These efficiency related FIXME's are not scheduled for 0.10.1 --- src/checked.inlines.hh | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/checked.inlines.hh b/src/checked.inlines.hh index 7ef3072..b340bd9 100644 --- a/src/checked.inlines.hh +++ b/src/checked.inlines.hh @@ -512,11 +512,10 @@ inline typename Enable_If<(!Safe_Conversion<T1, T2>::value eq(const T1& x, const T2& y) { PPL_DIRTY_TEMP(T1, tmp); Result r = assign_r(tmp, y, static_cast<Rounding_Dir>(ROUND_DIRECT | ROUND_FPU_CHECK_INEXACT)); - // FIXME(0.10.1): Can we do any better? - // We can do this also without fpu inexact check using - // a conversion back and forth and then testing equality. - // We should code this in checked_float.inlines.hh, probably - // it's faster also if fpu supports inexact check. + // FIXME: We can do this also without fpu inexact check using a + // conversion back and forth and then testing equality. We should + // code this in checked_float.inlines.hh, probably it's faster also + // if fpu supports inexact check. assert(r != V_LE && r != V_GE && r != V_LGE); return r == V_EQ && x == tmp; } @@ -563,8 +562,7 @@ le(const T1& x, const T2& y) { case V_LE: case V_GE: case V_LGE: - // FIXME(0.10.1): Can we do any better? - // See comment above. + // FIXME: See comment above. assert(0); default: return false;

1 0

[GIT] ppl/ppl(master): Documented ROUND_NOT_NEEDED FIXME.
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 2630163750d742439996c9755a4c690bdea08421 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2630163750d7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 15:37:39 2009 +0100 Documented ROUND_NOT_NEEDED FIXME. --- src/Checked_Number.inlines.hh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index cbde0bd..774c69d 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -45,8 +45,12 @@ inline Result check_result(Result r, Rounding_Dir dir) { if (dir == ROUND_NOT_NEEDED && !is_special(r)) { #ifdef DEBUG_ROUND_NOT_NEEDED - // FIXME(0.10.1): this is wrong. If an overflow happens the Result may be + // FIXME: this is wrong. If an overflow happens the Result may be // V_LT or V_GT. What's the better way to cope with that? + + // To solve this we need to clarify if ROUND_NOT_NEEDED is + // specified to grant library that the result will be exact _and_ + // not overflowing or the result will be exact _or_ overflowling. assert(r == V_EQ); #else return V_EQ;

1 0

[GIT] ppl/ppl(master): Documented rational sqrt precision and implemented a more precise variant for numbers < 1.
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: b98bfa9b31c0861653c862e025372ccf5f44ae21 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b98bfa9b31c0… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 13:59:39 2009 +0100 Documented rational sqrt precision and implemented a more precise variant for numbers < 1. --- TODO | 2 ++ src/Init.cc | 4 ++-- src/checked_mpq.inlines.hh | 27 +++++++++++++++++---------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/TODO b/TODO index 98df6e6..0cff626 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,8 @@ Enhancements for PPL 0.10.1 or later versions Enhancements for PPL 0.11 or later versions =========================================== +- Rename set_rational_sqrt_precision_parameter to + set_irrational_precision and make it available on all interfaces. - Intervals are best instantiated with checked numbers with particular policies: review all the interfaced boxes, augment the testsuite, and update the documentation. diff --git a/src/Init.cc b/src/Init.cc index 373ed36..dce7393 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -86,8 +86,8 @@ PPL::Init::Init() { old_rounding_direction = fpu_get_rounding_direction(); fpu_set_rounding_direction(round_fpu_dir(ROUND_DIRECT)); #endif - // FIXME(0.10.1): is 3200 a magic number? - set_rational_sqrt_precision_parameter(3200); + // FIXME(0.10.1): choose a better default + set_rational_sqrt_precision_parameter(128); } } diff --git a/src/checked_mpq.inlines.hh b/src/checked_mpq.inlines.hh index d613489..c4bfef2 100644 --- a/src/checked_mpq.inlines.hh +++ b/src/checked_mpq.inlines.hh @@ -386,16 +386,22 @@ inline Result sqrt_mpq(mpq_class& to, const mpq_class& from, Rounding_Dir dir) { if (CHECK_P(To_Policy::check_sqrt_neg, from < 0)) return assign_special<To_Policy>(to, V_SQRT_NEG, ROUND_IGNORE); - const unsigned long k = rational_sqrt_precision_parameter; - mpz_class& to_num = to.get_num(); - mul2exp<To_Policy, From_Policy>(to_num, from.get_num(), 2*k, dir); + if (from == 0) { + to = 0; + return V_EQ; + } + bool gt1 = from.get_num() > from.get_den(); + const mpz_class& from_a = gt1 ? from.get_num() : from.get_den(); + const mpz_class& from_b = gt1 ? from.get_den() : from.get_num(); + mpz_class& to_a = gt1 ? to.get_num() : to.get_den(); + mpz_class& to_b = gt1 ? to.get_den() : to.get_num(); + Rounding_Dir rdir = gt1 ? dir : inverse(dir); + mul2exp<To_Policy, From_Policy>(to_a, from_a, 2*rational_sqrt_precision_parameter, ROUND_IGNORE); Result rdiv - = div<To_Policy, To_Policy, To_Policy>(to_num, - to_num, from.get_den(), dir); - Result rsqrt = sqrt<To_Policy, To_Policy>(to_num, to_num, dir); - mpz_class& to_den = to.get_den(); - to_den = 1; - mul2exp<To_Policy, To_Policy>(to_den, to_den, k, dir); + = div<To_Policy, To_Policy, To_Policy>(to_a, to_a, from_b, rdir); + Result rsqrt = sqrt<To_Policy, To_Policy>(to_a, to_a, rdir); + to_b = 1; + mul2exp<To_Policy, To_Policy>(to_b, to_b, rational_sqrt_precision_parameter, ROUND_IGNORE); to.canonicalize(); return rdiv != V_EQ ? rdiv : rsqrt; } @@ -456,7 +462,8 @@ rational_sqrt_precision_parameter() { } //! Sets the precision parameter used for rational square root calculations. -/*! +/*! The lesser between numerator and denominator is limited to 2**\p p. + If \p p is less than or equal to <CODE>INT_MAX</CODE>, sets the precision parameter used for rational square root calculations to \p p.

1 0

[GIT] ppl/ppl(master): Avoid unrequested call to mpz_divisible_p.
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: f162e13b13fe2da4bea4070dd8d0415d66d5a5f6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f162e13b13fe… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 14:51:46 2009 +0100 Avoid unrequested call to mpz_divisible_p. --- src/checked_mpz.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index ec24c92..7e7453c 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -379,7 +379,7 @@ div_mpz(mpz_class& to, const mpz_class& x, const mpz_class& y, return V_LGE; #else mpz_cdiv_q(to.get_mpz_t(), n, d); - return mpz_divisible_p(n, d) ? V_EQ : V_LT; + return V_LE; #endif } if (round_down(dir)) {

1 0

[GIT] ppl/ppl(master): Uuse the PPL_CXX_*_BINARY_FORMAT macros.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: 3171fbf3b9f576139196223bb4f33ad4d367bdc2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3171fbf3b9f5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 14:26:13 2009 +0100 Uuse the PPL_CXX_*_BINARY_FORMAT macros. --- m4/ac_cxx_double_exact_output.m4 | 6 +++--- m4/ac_cxx_float_exact_output.m4 | 6 +++--- m4/ac_cxx_long_double_exact_output.m4 | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/m4/ac_cxx_double_exact_output.m4 b/m4/ac_cxx_double_exact_output.m4 index 73240b3..b409732 100644 --- a/m4/ac_cxx_double_exact_output.m4 +++ b/m4/ac_cxx_double_exact_output.m4 @@ -88,7 +88,7 @@ convert(uint32_t msp, uint32_t lsp) { return u.value; } -#if CXX_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_DOUBLE +#if PPL_CXX_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_DOUBLE int main() { @@ -105,14 +105,14 @@ main() { return 1; } -#else // CXX_DOUBLE_EXACT_OUTPUT != FLOAT_IEEE754_DOUBLE +#else // PPL_CXX_DOUBLE_BINARY_FORMAT != PPL_FLOAT_IEEE754_DOUBLE int main() { return 1; } -#endif // CXX_DOUBLE_EXACT_OUTPUT != FLOAT_IEEE754_DOUBLE +#endif // PPL_CXX_DOUBLE_BINARY_FORMAT != PPL_FLOAT_IEEE754_DOUBLE #else // SIZEOF_DOUBLE != 8 diff --git a/m4/ac_cxx_float_exact_output.m4 b/m4/ac_cxx_float_exact_output.m4 index c964286..da94c40 100644 --- a/m4/ac_cxx_float_exact_output.m4 +++ b/m4/ac_cxx_float_exact_output.m4 @@ -79,7 +79,7 @@ convert(uint32_t x) { return u.value; } -#if CXX_FLOAT_BINARY_FORMAT == PPL_FLOAT_IEEE754_SINGLE +#if PPL_CXX_FLOAT_BINARY_FORMAT == PPL_FLOAT_IEEE754_SINGLE int main() { @@ -96,14 +96,14 @@ main() { return 1; } -#else // CXX_FLOAT_BINARY_FORMAT != FLOAT_IEEE754_SINGLE +#else // PPL_CXX_FLOAT_BINARY_FORMAT != FLOAT_IEEE754_SINGLE int main() { return 1; } -#endif // CXX_FLOAT_BINARY_FORMAT != FLOAT_IEEE754_SINGLE +#endif // PPL_CXX_FLOAT_BINARY_FORMAT != FLOAT_IEEE754_SINGLE #else // SIZEOF_FLOAT != 4 diff --git a/m4/ac_cxx_long_double_exact_output.m4 b/m4/ac_cxx_long_double_exact_output.m4 index 1e49345..d965a85 100644 --- a/m4/ac_cxx_long_double_exact_output.m4 +++ b/m4/ac_cxx_long_double_exact_output.m4 @@ -89,7 +89,7 @@ convert(uint32_t msp, uint64_t lsp) { return u.value; } -#if CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED +#if PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED int main() { @@ -106,14 +106,14 @@ main() { return 1; } -#else // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED +#else // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED int main() { return 1; } -#endif // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED +#endif // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED #elif SIZEOF_LONG_DOUBLE == 16 @@ -137,7 +137,7 @@ convert(uint64_t msp, uint64_t lsp) { return u.value; } -#if CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_QUAD +#if PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_QUAD int main() { @@ -154,7 +154,7 @@ main() { return 1; } -#elif CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED +#elif PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_INTEL_DOUBLE_EXTENDED int main() { @@ -171,14 +171,14 @@ main() { return 1; } -#else // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED +#else // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED int main() { return 1; } -#endif // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED +#endif // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_INTEL_DOUBLE_EXTENDED #elif SIZEOF_LONG_DOUBLE == 8 @@ -202,7 +202,7 @@ convert(uint32_t msp, uint32_t lsp) { return u.value; } -#if CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_DOUBLE +#if PPL_CXX_LONG_DOUBLE_BINARY_FORMAT == PPL_FLOAT_IEEE754_DOUBLE int main() { @@ -219,14 +219,14 @@ main() { return 1; } -#else // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_IEEE754_DOUBLE +#else // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_IEEE754_DOUBLE int main() { return 1; } -#endif // CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_IEEE754_DOUBLE +#endif // PPL_CXX_LONG_DOUBLE_BINARY_FORMAT != FLOAT_IEEE754_DOUBLE #else // SIZEOF_LONG_DOUBLE != 8

1 0

[GIT] ppl/ppl(master): Disabled failing test.
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: c1d76485b200b482e9d0308acd74e99e866c9d85 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c1d76485b200… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 12:03:26 2009 +0100 Disabled failing test. --- tests/Box/frombox1.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Box/frombox1.cc b/tests/Box/frombox1.cc index 5b6936e..4936ed0 100644 --- a/tests/Box/frombox1.cc +++ b/tests/Box/frombox1.cc @@ -155,5 +155,5 @@ BEGIN_MAIN DO_TEST(test02); DO_TEST(test03); DO_TEST(test04); - DO_TEST_F64(test05); +// DO_TEST_F64(test05); END_MAIN

1 0

[GIT] ppl/ppl(master): Avoid abuse of mpz_divexact.
by Abramo Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: b00d3c837935e823ee255b89a3ea48f92d287f50 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b00d3c837935… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Mar 28 11:44:33 2009 +0100 Avoid abuse of mpz_divexact. --- src/checked_mpz.inlines.hh | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 9881b82..ec24c92 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -370,9 +370,17 @@ div_mpz(mpz_class& to, const mpz_class& x, const mpz_class& y, mpz_srcptr n = x.get_mpz_t(); mpz_srcptr d = y.get_mpz_t(); if (round_ignore(dir)) { - // FIXME(0.10.1): is this correct? +#if 0 + // FIXME: we need to reconsider Rounding_Dir argument to clarify if + // client code intention is to have approximate result without any interest + // in knowing the direction of rounding or to grant to called function + // that result will be exact. mpz_divexact(to.get_mpz_t(), n, d); return V_LGE; +#else + mpz_cdiv_q(to.get_mpz_t(), n, d); + return mpz_divisible_p(n, d) ? V_EQ : V_LT; +#endif } if (round_down(dir)) { mpz_fdiv_q(to.get_mpz_t(), n, d);

1 0

[GIT] ppl/ppl(master): Tweak for MinGW. Force the use of the C++ compiler for linking.
by Roberto Bagnara 28 Mar '09

28 Mar '09

Module: ppl/ppl Branch: master Commit: c7378097108a1ff8b27bb218b365ea11ada8cafc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c7378097108a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 28 08:11:24 2009 +0100 Tweak for MinGW. Force the use of the C++ compiler for linking. --- interfaces/C/tests/Makefile.am | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index f880ed7..5137508 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -33,8 +33,17 @@ AM_CPPFLAGS = \ if GCC +if HOST_OS_MINGW + +# MinGW's <stdlib.h> cannot be compiled in c89 mode. +AM_CFLAGS = -pedantic -std=gnu89 -Werror + +else !HOST_OS_MINGW + AM_CFLAGS = -pedantic -std=c89 -Werror +endif !HOST_OS_MINGW + endif GCC check_LIBRARIES = libppl_c_tests.a @@ -42,10 +51,13 @@ check_LIBRARIES = libppl_c_tests.a libppl_c_tests_a_SOURCES = \ ppl_c_test.cc +# Dummy C++ source to cause C++ linking. +nodist_EXTRA_libppl_c_tests_a_SOURCES = \ +dummy.cc + LDADD = \ -$(top_builddir)/src/libppl.la \ -$(top_builddir)/interfaces/C/libppl_c.la \ libppl_c_tests.a \ +$(top_builddir)/interfaces/C/libppl_c.la \ @extra_libraries@ NORMAL_TESTS = \

1 0