March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(termination): Corrected a couple of typos in the documentation.
by Enea Zaffanella 06 Mar '10

06 Mar '10

Module: ppl/ppl Branch: termination Commit: 22d7dc4353fca2fd99db605f498beddb3a649e01 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=22d7dc4353fc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 6 09:23:32 2010 +0100 Corrected a couple of typos in the documentation. --- src/Octagonal_Shape.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index f5b6ad1..b558f31 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -523,7 +523,7 @@ public: The built OS is the most precise OS that includes the box. \param box - The box representing the BDS to be built. + The box representing the OS to be built. \param complexity This argument is ignored as the algorithm used has @@ -1114,8 +1114,8 @@ public: \c T is bound to an integer datatype. \note - The integer upper bound of two rational BDS is the smallest - rational BDS containing all the integral points in the two arguments. + The integer upper bound of two rational OS is the smallest + rational OS containing all the integral points in the two arguments. In general, the result is \e not an upper bound for the two input arguments, as it may cut away non-integral portions of the two rational shapes.

1 0

[GIT] ppl/ppl(master): Corrected a couple of typos in the documentation.
by Enea Zaffanella 06 Mar '10

06 Mar '10

Module: ppl/ppl Branch: master Commit: 22d7dc4353fca2fd99db605f498beddb3a649e01 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=22d7dc4353fc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 6 09:23:32 2010 +0100 Corrected a couple of typos in the documentation. --- src/Octagonal_Shape.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index f5b6ad1..b558f31 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -523,7 +523,7 @@ public: The built OS is the most precise OS that includes the box. \param box - The box representing the BDS to be built. + The box representing the OS to be built. \param complexity This argument is ignored as the algorithm used has @@ -1114,8 +1114,8 @@ public: \c T is bound to an integer datatype. \note - The integer upper bound of two rational BDS is the smallest - rational BDS containing all the integral points in the two arguments. + The integer upper bound of two rational OS is the smallest + rational OS containing all the integral points in the two arguments. In general, the result is \e not an upper bound for the two input arguments, as it may cut away non-integral portions of the two rational shapes.

1 0

[GIT] ppl/ppl(master): Test 4 in digitalfilers1. cc overflows with 64-bits if assertions are on.
by Enea Zaffanella 06 Mar '10

06 Mar '10

Module: ppl/ppl Branch: master Commit: 6ed63be5fa24eb25acb75df25511c79ec20a79e5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6ed63be5fa24… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 6 08:31:33 2010 +0100 Test 4 in digitalfilers1.cc overflows with 64-bits if assertions are on. --- tests/Floating_Point_Expression/digitalfilters1.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Floating_Point_Expression/digitalfilters1.cc b/tests/Floating_Point_Expression/digitalfilters1.cc index b5886ce..41c6229 100644 --- a/tests/Floating_Point_Expression/digitalfilters1.cc +++ b/tests/Floating_Point_Expression/digitalfilters1.cc @@ -983,7 +983,7 @@ BEGIN_MAIN DO_TEST_F8(test01); DO_TEST_F8(test02); DO_TEST_F8(test03); - DO_TEST_F32(test04); + DO_TEST_F64A(test04); #define COND_float PPL_CPP_EQ(PPL_CPP_FP_FORMAT(ANALYZER_FP_FORMAT), 1) #define COND_double PPL_CPP_EQ(PPL_CPP_FP_FORMAT(ANALYZER_FP_FORMAT), 2)

1 0

[GIT] ppl/ppl(master): Tests 20, 21 and 22 overflow on 8-bit coefficients ( derived from test02).
by Enea Zaffanella 05 Mar '10

05 Mar '10

Module: ppl/ppl Branch: master Commit: 2fa2669e96e9664f5de6abd64e723c7657fac52e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fa2669e96e9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Mar 5 18:09:15 2010 +0100 Tests 20, 21 and 22 overflow on 8-bit coefficients (derived from test02). --- tests/PIP_Problem/pipproblem1.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index f8c0821..4c7568b 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -688,7 +688,7 @@ BEGIN_MAIN DO_TEST(test17); DO_TEST(test18); DO_TEST_F8(test19); - DO_TEST(test20); - DO_TEST(test21); - DO_TEST(test22); + DO_TEST_F8(test20); + DO_TEST_F8(test21); + DO_TEST_F8(test22); END_MAIN

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row_Std_List_Backend: fix splice() methods, now really.
by Marco Poletti 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: b51d58f85807e989747590684657bfccc87c7853 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b51d58f85807… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Mar 4 21:51:55 2010 +0100 Unlimited_Sparse_Row_Std_List_Backend: fix splice() methods, now really. --- ...nlimited_Sparse_Row_Std_List_Backend.inlines.hh | 46 +++++++++++++------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh b/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh index adb0681..674bc78 100644 --- a/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh +++ b/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh @@ -45,13 +45,14 @@ Unlimited_Sparse_Row_Std_List_Backend::dangerous_iterator::next(iterator i) { inline Unlimited_Sparse_Row_Std_List_Backend::iterator Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x) { - bool inserting_at_beginning = (position == begin()); + PPL_ASSERT(this != &x); + if (position == begin()) { + Base::splice(position,x); + return begin(); + } iterator previous = position; - if (!inserting_at_beginning) - --previous; + --previous; Base::splice(position,x); - if (inserting_at_beginning) - return begin(); ++previous; return previous; } @@ -59,27 +60,40 @@ Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x) { inline Unlimited_Sparse_Row_Std_List_Backend::iterator Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x, iterator i) { - bool inserting_at_beginning = (position == begin()); + if (position == begin()) { + Base::splice(position,x,i); + return begin(); + } iterator previous = position; - if (!inserting_at_beginning) + --previous; + if (previous == i) { + Base::splice(position,x,i); + // previous is no longer valid because it was equal to i. + previous = position; --previous; - Base::splice(position,x,i); - if (inserting_at_beginning) - return begin(); - ++previous; + } else { + Base::splice(position,x,i); + ++previous; + } return previous; } inline Unlimited_Sparse_Row_Std_List_Backend::iterator Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x, iterator first,iterator last) { - bool inserting_at_beginning = (position == begin()); + if (position == begin()) { + Base::splice(position,x,first,last); + return begin(); + } + if (first == last) + return position; + if (last == position) + return first; iterator previous = position; - if (!inserting_at_beginning) - --previous; + --previous; + // previous is not in [first,last) because position is not in [first,last) + // and position!=last. Base::splice(position,x,first,last); - if (inserting_at_beginning) - return begin(); ++previous; return previous; }

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row: fixed swap().
by Marco Poletti 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: ce05ab69d64f01235b43782219f9d15d2687f955 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ce05ab69d64f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Mar 4 21:51:13 2010 +0100 Unlimited_Sparse_Row: fixed swap(). --- src/Unlimited_Sparse_Row.inlines.hh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Unlimited_Sparse_Row.inlines.hh b/src/Unlimited_Sparse_Row.inlines.hh index 0ee45dc..268ef17 100644 --- a/src/Unlimited_Sparse_Row.inlines.hh +++ b/src/Unlimited_Sparse_Row.inlines.hh @@ -58,10 +58,10 @@ Unlimited_Sparse_Row::swap(dimension_type i, dimension_type j) { } else { if (i_itr != j_itr) { // i is in the list, j isn't - j_itr = data.splice(j_itr,data,i_itr); - // i_itr is no longer valid. - // j_itr now points to the moved element. - j_itr->first = j; + i_itr = data.splice(j_itr,data,i_itr); + // i_itr was invalidated. + // Now i_itr points to the moved element. + i_itr->first = j; } else { j_itr->first=j; } @@ -70,10 +70,10 @@ Unlimited_Sparse_Row::swap(dimension_type i, dimension_type j) { if (j_itr != itr_end && j_itr->first == j) { if (i_itr != j_itr) { // j is in the list, i isn't - i_itr = data.splice(i_itr,data,j_itr); - // j_itr is no longer valid. - // i_itr now points to the moved element. - i_itr->first = i; + j_itr = data.splice(i_itr,data,j_itr); + // j_itr was invalidated. + // Now j_itr points to the moved element. + j_itr->first = i; } else { i_itr->first = j; }

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row_Std_List_Backend: fix splice().
by Marco Poletti 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 4ae605829ec665d7162c92673212873792af93d7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4ae605829ec6… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Mar 4 19:51:41 2010 +0100 Unlimited_Sparse_Row_Std_List_Backend: fix splice(). --- ...nlimited_Sparse_Row_Std_List_Backend.inlines.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh b/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh index f2a3d0a..adb0681 100644 --- a/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh +++ b/src/Unlimited_Sparse_Row_Std_List_Backend.inlines.hh @@ -47,7 +47,7 @@ inline Unlimited_Sparse_Row_Std_List_Backend::iterator Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x) { bool inserting_at_beginning = (position == begin()); iterator previous = position; - if (inserting_at_beginning) + if (!inserting_at_beginning) --previous; Base::splice(position,x); if (inserting_at_beginning) @@ -61,7 +61,7 @@ Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x, iterator i) { bool inserting_at_beginning = (position == begin()); iterator previous = position; - if (inserting_at_beginning) + if (!inserting_at_beginning) --previous; Base::splice(position,x,i); if (inserting_at_beginning) @@ -75,7 +75,7 @@ Unlimited_Sparse_Row_Std_List_Backend::splice(iterator& position,This& x, iterator first,iterator last) { bool inserting_at_beginning = (position == begin()); iterator previous = position; - if (inserting_at_beginning) + if (!inserting_at_beginning) --previous; Base::splice(position,x,first,last); if (inserting_at_beginning)

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row_Custom_Slist_Backend: add std::swap() specialization.
by Marco Poletti 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 74681f593e4b426b5e5d5a02516ac2c92c3d756c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=74681f593e4b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Mar 4 19:51:11 2010 +0100 Unlimited_Sparse_Row_Custom_Slist_Backend: add std::swap() specialization. --- ...limited_Sparse_Row_Custom_Slist_Backend.defs.hh | 14 ++++++++++++++ ...ited_Sparse_Row_Custom_Slist_Backend.inlines.hh | 10 ++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/src/Unlimited_Sparse_Row_Custom_Slist_Backend.defs.hh b/src/Unlimited_Sparse_Row_Custom_Slist_Backend.defs.hh index d4acc24..2ffa86d 100644 --- a/src/Unlimited_Sparse_Row_Custom_Slist_Backend.defs.hh +++ b/src/Unlimited_Sparse_Row_Custom_Slist_Backend.defs.hh @@ -251,6 +251,20 @@ private: } +namespace std { + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +//! Specializes <CODE>std::swap</CODE>. +/*! \relates Parma_Polyhedra_Library::Unlimited_Sparse_Row_Custom_Slist_Backend +*/ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +void swap( + Parma_Polyhedra_Library::Unlimited_Sparse_Row_Custom_Slist_Backend& x, + Parma_Polyhedra_Library::Unlimited_Sparse_Row_Custom_Slist_Backend& y); + +} // namespace std + + #include "Unlimited_Sparse_Row_Custom_Slist_Backend.inlines.hh" #endif // !defined(PPL_Unlimited_Sparse_Row_Custom_Slist_Backend_defs_hh) diff --git a/src/Unlimited_Sparse_Row_Custom_Slist_Backend.inlines.hh b/src/Unlimited_Sparse_Row_Custom_Slist_Backend.inlines.hh index 480fc7a..730a5d6 100644 --- a/src/Unlimited_Sparse_Row_Custom_Slist_Backend.inlines.hh +++ b/src/Unlimited_Sparse_Row_Custom_Slist_Backend.inlines.hh @@ -477,4 +477,14 @@ Unlimited_Sparse_Row_Custom_Slist_Backend::const_iterator:: } // namespace Parma_Polyhedra_Library +namespace std { + +inline void +swap(Parma_Polyhedra_Library::Unlimited_Sparse_Row_Custom_Slist_Backend& x, + Parma_Polyhedra_Library::Unlimited_Sparse_Row_Custom_Slist_Backend& y) { + x.swap(y); +} + +} // namespace std + #endif // !defined(PPL_Unlimited_Sparse_Row_Custom_Slist_Backend_inlines_hh)

1 0

[GIT] ppl/ppl(master): Encoded custom overflow conditions for digitalfilters1.cc tests 5 and 6.
by Enea Zaffanella 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: master Commit: be7b34ac18794498bbe6316fd831942a369c9cc4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be7b34ac1879… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Mar 4 17:57:23 2010 +0100 Encoded custom overflow conditions for digitalfilters1.cc tests 5 and 6. --- tests/Floating_Point_Expression/digitalfilters1.cc | 18 +++++++++++++++--- tests/ppl_test.hh | 10 ++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/Floating_Point_Expression/digitalfilters1.cc b/tests/Floating_Point_Expression/digitalfilters1.cc index aca0002..b5886ce 100644 --- a/tests/Floating_Point_Expression/digitalfilters1.cc +++ b/tests/Floating_Point_Expression/digitalfilters1.cc @@ -983,8 +983,20 @@ BEGIN_MAIN DO_TEST_F8(test01); DO_TEST_F8(test02); DO_TEST_F8(test03); - DO_TEST_F32A(test04); - DO_TEST_F64(test05); - DO_TEST_F64(test06); + DO_TEST_F32(test04); + +#define COND_float PPL_CPP_EQ(PPL_CPP_FP_FORMAT(ANALYZER_FP_FORMAT), 1) +#define COND_double PPL_CPP_EQ(PPL_CPP_FP_FORMAT(ANALYZER_FP_FORMAT), 2) +#define COND_float_or_double PPL_CPP_OR(COND_float, COND_double) +#define PPL_CUSTOM_COND_32 \ + PPL_CPP_AND(PPL_CPP_EQ(PPL_CPP_LOGBITS, 5), COND_float) +#define PPL_CUSTOM_COND_64 \ + PPL_CPP_AND(PPL_CPP_EQ(PPL_CPP_LOGBITS, 6), COND_float_or_double) +#define PPL_CUSTOM_COND \ + PPL_CPP_OR(COND_F64, PPL_CPP_OR(PPL_CUSTOM_COND_32, PPL_CUSTOM_COND_64)) + + COND_DO_TEST(PPL_CUSTOM_COND, test05); + COND_DO_TEST(PPL_CUSTOM_COND, test06); + DO_TEST_F64(test07); END_MAIN diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index 0bdcf87..525488d 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -314,6 +314,16 @@ catch (const std::exception& e) { \ #define DO_TEST_F8A_MAY_OVERFLOW_IF_INEXACT(test, shape) \ COND_DO_TEST_MAY_OVERFLOW_IF_INEXACT(COND_F8A, test, shape) +// Encoding floating point formats. +#define PPL_CPP_FP_FORMAT_float 1 +#define PPL_CPP_FP_FORMAT_double 2 +#define PPL_CPP_FP_FORMAT_long_double 3 +#define PPL_CPP_FP_FORMAT_float_ieee754_single 4 +#define PPL_CPP_FP_FORMAT_float_ieee754_double 5 +#define PPL_CPP_FP_FORMAT_float_ieee754_quad 6 +#define PPL_CPP_FP_FORMAT_(format) PPL_CPP_FP_FORMAT_ ## format +#define PPL_CPP_FP_FORMAT(format) PPL_CPP_FP_FORMAT_(format) + // Turn s into a string: PPL_TEST_STR(x + y) => "x + y". #define PPL_TEST_STR(s) #s

1 0

[GIT] ppl/ppl(master): Added a test for problem feasibility when incrementally adding parameter constraints .
by François Galea 04 Mar '10

04 Mar '10

Module: ppl/ppl Branch: master Commit: c4b4cb73d97dc1e901f486c7693c342acff62484 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c4b4cb73d97d… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Mar 4 14:14:05 2010 +0100 Added a test for problem feasibility when incrementally adding parameter constraints. --- tests/PIP_Problem/pipproblem1.cc | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index 64deaa0..f8c0821 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -634,6 +634,38 @@ test21() { return ok; } +bool +test22() { + // Same problem as test02, but incrementally adding two parameter constraints + // making the problem infeasible. + Variable i(0); + Variable j(1); + Variable n(2); + Variable m(3); + Variables_Set params(n, m); + + Constraint_System cs; + cs.insert(3*j >= -2*i+8); + cs.insert(j <= 4*i - 4); + cs.insert(j <= m); + cs.insert(i <= n); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + + pip.add_constraint(7*m < 12); + pip.add_constraint(2*n + 3*m < 8); + ok &= (pip.solve() == UNFEASIBLE_PIP_PROBLEM); + + return ok; +} + } // namespace BEGIN_MAIN @@ -658,4 +690,5 @@ BEGIN_MAIN DO_TEST_F8(test19); DO_TEST(test20); DO_TEST(test21); + DO_TEST(test22); END_MAIN

1 0