March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Corrected expected result for test sor1d.pip.
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: 618bf7265df32e845023324fb84a3a7e43d15220 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=618bf7265df3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Mar 18 12:15:15 2010 +0100 Corrected expected result for test sor1d.pip. --- demos/ppl_pips/expected_int16 | 2 +- demos/ppl_pips/expected_int16_a | 2 +- demos/ppl_pips/expected_int32 | 2 +- demos/ppl_pips/expected_int32_a | 2 +- demos/ppl_pips/expected_int64 | 2 +- demos/ppl_pips/expected_int64_a | 2 +- demos/ppl_pips/expected_int8 | 2 +- demos/ppl_pips/expected_int8_a | 2 +- demos/ppl_pips/expected_mpz | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/demos/ppl_pips/expected_int16 b/demos/ppl_pips/expected_int16 index 4b912d7..b971b68 100644 --- a/demos/ppl_pips/expected_int16 +++ b/demos/ppl_pips/expected_int16 @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int16_a b/demos/ppl_pips/expected_int16_a index 4b912d7..b971b68 100644 --- a/demos/ppl_pips/expected_int16_a +++ b/demos/ppl_pips/expected_int16_a @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int32 b/demos/ppl_pips/expected_int32 index 4b912d7..b971b68 100644 --- a/demos/ppl_pips/expected_int32 +++ b/demos/ppl_pips/expected_int32 @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int32_a b/demos/ppl_pips/expected_int32_a index 4b912d7..b971b68 100644 --- a/demos/ppl_pips/expected_int32_a +++ b/demos/ppl_pips/expected_int32_a @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int64 b/demos/ppl_pips/expected_int64 index cb04054..0b0ec24 100644 --- a/demos/ppl_pips/expected_int64 +++ b/demos/ppl_pips/expected_int64 @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int64_a b/demos/ppl_pips/expected_int64_a index cb04054..0b0ec24 100644 --- a/demos/ppl_pips/expected_int64_a +++ b/demos/ppl_pips/expected_int64_a @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int8 b/demos/ppl_pips/expected_int8 index 5bb428f..cf2ecd6 100644 --- a/demos/ppl_pips/expected_int8 +++ b/demos/ppl_pips/expected_int8 @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip d41d8cd98f00b204e9800998ecf8427e - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_int8_a b/demos/ppl_pips/expected_int8_a index 5bb428f..cf2ecd6 100644 --- a/demos/ppl_pips/expected_int8_a +++ b/demos/ppl_pips/expected_int8_a @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip d41d8cd98f00b204e9800998ecf8427e - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/expected_mpz b/demos/ppl_pips/expected_mpz index 70658db..3feb98f 100644 --- a/demos/ppl_pips/expected_mpz +++ b/demos/ppl_pips/expected_mpz @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip d41d8cd98f00b204e9800998ecf8427e - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 -

1 0

[GIT] ppl/ppl(master): Test 08 may does not overflow when using exact Octagonal_Shapes.
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: ca5d011c79c78ba930ff60dd63b472f287646108 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca5d011c79c7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Mar 18 12:06:43 2010 +0100 Test 08 may does not overflow when using exact Octagonal_Shapes. --- tests/Octagonal_Shape/frequency1.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 0a2d2aa..8184a0c 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -301,7 +301,7 @@ BEGIN_MAIN DO_TEST(test05); DO_TEST(test06); DO_TEST(test07); - DO_TEST_F64_MAY_OVERFLOW_IF_INEXACT(test08, TOctagonal_Shape); + DO_TEST_MAY_OVERFLOW_IF_INEXACT(test08, TOctagonal_Shape); DO_TEST(test09); DO_TEST(test10); DO_TEST(test11);

1 0

[GIT] ppl/ppl(master): Fixed input file sor1d.pip.
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: 9919991474edb445eccffbde32a9bf1ccc105617 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9919991474ed… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Mar 18 11:24:38 2010 +0100 Fixed input file sor1d.pip. A line of blanks is not a valid comment line for the input reading routine. --- demos/ppl_pips/examples/sor1d.pip | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/demos/ppl_pips/examples/sor1d.pip b/demos/ppl_pips/examples/sor1d.pip index 1bef89e..3b3dc61 100644 --- a/demos/ppl_pips/examples/sor1d.pip +++ b/demos/ppl_pips/examples/sor1d.pip @@ -5,7 +5,7 @@ -1 20 8 - + 0 -1 0 0 0 0 0 2 0 0 -1 0 0 0 0 1 0 0 0 -1 0 0 0 2

1 0

[GIT] ppl/ppl(master): Fixed xpected result for sor1d.pip. Minor improvements to ppl_pips.cc.
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: 05ba76777df2d98804a4e75a7c2adfc50d5c2d51 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=05ba76777df2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Mar 18 11:22:30 2010 +0100 Fixed xpected result for sor1d.pip. Minor improvements to ppl_pips.cc. --- demos/ppl_pips/expected_mpz_a | 2 +- demos/ppl_pips/ppl_pips.cc | 99 +++++++++++++++++++++++----------------- 2 files changed, 58 insertions(+), 43 deletions(-) diff --git a/demos/ppl_pips/expected_mpz_a b/demos/ppl_pips/expected_mpz_a index 96b9a87..02d82d0 100644 --- a/demos/ppl_pips/expected_mpz_a +++ b/demos/ppl_pips/expected_mpz_a @@ -16,5 +16,5 @@ esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - fimmel.pip 2dd9b24df50572c15981dd3faf8c74a4 - max.pip e29c651c587cc64ab6a7a8cecd488a0b - -sor1d.pip 8722a9d4eedd28b98c12987c9116564e - +sor1d.pip 80f93132ed5d70b6371d5bf5fa627376 - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 1c35ab6..9487dff 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -226,25 +226,25 @@ public: PPL::dimension_type bignum_column) { pip.add_space_dimensions_and_embed(num_vars, num_params); for (PPL::dimension_type k = 0, i = 0; i < num_constraints; ++i) { - PPL::Linear_Expression e; + PPL::Linear_Expression expr; for (PPL::dimension_type j = 0; j < num_vars + num_params; ++j) - e += constraints[k++] * PPL::Variable(j); - e += constraints[k++]; + add_mul_assign(expr, constraints[k++], PPL::Variable(j)); + expr += constraints[k++]; if (constraint_type[i]) - pip.add_constraint(PPL::Constraint(e >= 0)); + pip.add_constraint(PPL::Constraint(expr >= 0)); else - pip.add_constraint(PPL::Constraint(e == 0)); + pip.add_constraint(PPL::Constraint(expr == 0)); } if (num_params > 0) { for (PPL::dimension_type k = 0, i = 0; i < num_ctx_rows; ++i) { - PPL::Linear_Expression e; + PPL::Linear_Expression expr; for (PPL::dimension_type j = 0; j < num_params; ++j) - e += context[k++] * PPL::Variable(num_vars+j); - e += context[k++]; + add_mul_assign(expr, context[k++], PPL::Variable(num_vars+j)); + expr += context[k++]; if (ctx_type[i]) - pip.add_constraint(PPL::Constraint(e >= 0)); + pip.add_constraint(PPL::Constraint(expr >= 0)); else - pip.add_constraint(PPL::Constraint(e == 0)); + pip.add_constraint(PPL::Constraint(expr == 0)); } } if (bignum_column != PPL::not_a_dimension()) @@ -263,18 +263,18 @@ public: } bool read(std::istream& in) { - PPL::dimension_type num_params; - PPL::dimension_type num_ctx_rows; - PPL::dimension_type num_vars; - PPL::dimension_type num_constraints; - PPL::dimension_type constraint_width; std::string line; + + PPL::dimension_type num_ctx_rows; + PPL::dimension_type num_params; getline_nocomment(in, line); { std::istringstream sin(line); sin >> num_ctx_rows >> num_params; } + PPL_ASSERT(num_params >= 2); num_params -= 2; + PPL::Coefficient context[num_ctx_rows][num_params+1]; int ctx_type[num_ctx_rows]; @@ -286,14 +286,17 @@ public: sin >> context[i][j]; } } - // FIXME: can this variable be given a better name? - int tmp; + + int bignum_column_coding; getline_nocomment(in, line); { std::istringstream sin(line); - sin >> tmp; + sin >> bignum_column_coding; } + PPL::dimension_type num_constraints; + PPL::dimension_type constraint_width; + PPL::dimension_type num_vars; getline_nocomment(in, line); { std::istringstream sin(line); @@ -301,6 +304,7 @@ public: } constraint_width -= 1; num_vars = constraint_width - num_params - 1; + PPL::Coefficient constraints[num_constraints][constraint_width]; int constraint_type[num_constraints]; for (PPL::dimension_type i = 0; i < num_constraints; ++i) { @@ -311,11 +315,16 @@ public: sin >> constraints[i][j]; } } - PPL::dimension_type bignum_column; - bignum_column = (tmp == -1) ? PPL::not_a_dimension() : (tmp+num_vars-1); - bool result = update_pip(num_vars, num_params, num_constraints, - num_ctx_rows, &constraints[0][0], &context[0][0], - constraint_type, ctx_type, bignum_column); + + PPL::dimension_type bignum_column = (bignum_column_coding == -1) + ? PPL::not_a_dimension() + : (bignum_column_coding + num_vars - 1); + + bool result = update_pip(num_vars, num_params, + num_constraints, num_ctx_rows, + &constraints[0][0], &context[0][0], + constraint_type, ctx_type, + bignum_column); return result; } @@ -334,15 +343,6 @@ public: } bool read(std::istream& in) { - PPL::dimension_type num_params; - PPL::dimension_type num_ctx_rows; - PPL::dimension_type num_vars; - PPL::dimension_type num_constraints; - int tmp; - int solve_integer; - PPL::dimension_type bignum_column; - PPL::dimension_type i; - if (!expect(in, '(')) return false; if (!expect(in, '(')) @@ -350,9 +350,22 @@ public: if (!read_comment(in)) return false; - in >> num_vars >> num_params >> num_constraints >> num_ctx_rows >> tmp - >> solve_integer; - bignum_column = (tmp == -1) ? PPL::not_a_dimension() : (tmp-1); + PPL::dimension_type num_vars; + PPL::dimension_type num_params; + in >> num_vars >> num_params; + + PPL::dimension_type num_constraints; + PPL::dimension_type num_ctx_rows; + in >> num_constraints >> num_ctx_rows; + + int bignum_column_coding; + in >> bignum_column_coding; + PPL::dimension_type bignum_column = (bignum_column_coding == -1) + ? PPL::not_a_dimension() + : (bignum_column_coding - 1); + + int solve_integer; + in >> solve_integer; if (solve_integer != 1) { std::cerr << "Can only solve integer problems." << std::endl; return false; @@ -363,23 +376,25 @@ public: PPL::dimension_type constraint_width = num_vars+num_params+1; PPL::Coefficient constraints[num_constraints][constraint_width]; int constraint_type[num_constraints]; - for (i = 0; i < num_constraints; ++i) + for (PPL::dimension_type i = 0; i < num_constraints; ++i) constraint_type[i] = 1; - for (i = 0; i < num_constraints; ++i) + for (PPL::dimension_type i = 0; i < num_constraints; ++i) if (!read_vector(in, constraint_width, num_vars, constraints[i])) return false; PPL::Coefficient context[num_ctx_rows][num_params+1]; int ctx_type[num_ctx_rows]; - for (i = 0; i < num_ctx_rows; ++i) + for (PPL::dimension_type i = 0; i < num_ctx_rows; ++i) ctx_type[i] = 1; - for (i = 0; i < num_ctx_rows; ++i) + for (PPL::dimension_type i = 0; i < num_ctx_rows; ++i) if (!read_vector(in, num_params+1, num_params, context[i])) return false; - bool result = update_pip(num_vars, num_params, num_constraints, - num_ctx_rows, &constraints[0][0], &context[0][0], - constraint_type, ctx_type, bignum_column); + bool result = update_pip(num_vars, num_params, + num_constraints, num_ctx_rows, + &constraints[0][0], &context[0][0], + constraint_type, ctx_type, + bignum_column); return result; }

1 0

[GIT] ppl/ppl(termination): Delete objects before exiting code.
by Patricia Hill 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: termination Commit: 609a4b2ead0b88688499ef007f79476b5cadea4c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=609a4b2ead0b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Mar 18 08:32:46 2010 +0000 Delete objects before exiting code. --- interfaces/Prolog/tests/pl_check.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 5abfb02..2498da4 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -1995,6 +1995,7 @@ compute_timeout_hypercube(Hsecs, T, Dim_in, Dim_out, CS_out) :- ppl_reset_timeout, (Catch_Exception == ok -> Dim_out = Dim_in, + ppl_delete_Polyhedron(P), CS_out = CS ; Dim1 is Dim_in+1,

1 0

[GIT] ppl/ppl(termination): New commits
by Roberto Bagnara 18 Mar '10

18 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d99284d19450… Merge: 7ededcd1147e0df879bdfaf92e9fa49c5482653d 2df786e330fbe20f7c268860bd791cc627d4c22a Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Mar 18 11:32:34 2010 +0400 Merge branch 'master' into termination URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ededcd1147e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Mar 18 11:31:30 2010 +0400 Completed test07(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2df786e330fb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 17 17:14:35 2010 +0100 Fixed a few memory allocation problems in ppl_pips. Enabled the used of valgrind when running ppl_pips tests. Corrected the expected result for test fimmel.pip (unsatisfiable problem). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71aa196a1784… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 17 17:12:07 2010 +0100 Fixed a couple of resource allocation problems (reported by Marco Poletti). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d0a50e95c3b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 17 11:30:48 2010 +0000 Fixed some typos for code related to the wrap_assign java interface. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fca7306fd2f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 19:25:00 2010 +0000 Added implementation code for Java interface for wrap_assign. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=445fe36196dd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 13:11:21 2010 +0000 Allow for the various numeric types in frequency1.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=80c44d73a29d… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 12:46:29 2010 +0000 Java interface for wrap asign added. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c3f8ae55af3… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c68101c16e7f… Merge: 8760df47483200e17daf43df3c7ca4ec7aad9185 6060bda39a0fb7b5d8d114d436b81a5a5b1eb74e Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 15 15:53:22 2010 +0400 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8760df474832… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 11:18:15 2010 +0000 Conflicts resolved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6060bda39a0f… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Mar 11 19:58:03 2010 +0100 Documentation fixes. Added a paragraph about optimizing a linear cost function. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ed91bdf10a46… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 10 18:29:05 2010 +0100 Improved checks in PIP_Decision_Node::OK() method. There is no reason to have Artificial_Parameter::OK() inlined. Added a couple of comments on code that should be normally unreachable. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61b4c1817137… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 10 18:27:08 2010 +0100 Fixed documentation reference. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=374f46632936… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 10 17:14:26 2010 +0100 Fixed the value of INPUT doxygen configuration variable. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ad2fe744dc6… Merge: bbb1ff43e555dabda36b8d5838092ebade985c54 65156364caa2da7235862998930736ca27c83236 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 10 13:18:29 2010 +0400 Merge branch 'master' into products Conflicts: src/Partially_Reduced_Product.templates.hh tests/Partially_Reduced_Product/directproduct2.cc tests/Partially_Reduced_Product/directproduct3.cc tests/Partially_Reduced_Product/directproduct4.cc tests/Partially_Reduced_Product/directproduct5.cc tests/Partially_Reduced_Product/directproduct6.cc tests/Partially_Reduced_Product/partiallyreducedproduct1.cc tests/Partially_Reduced_Product/partiallyreducedproduct2.cc tests/Partially_Reduced_Product/partiallyreducedproduct3.cc tests/Partially_Reduced_Product/partiallyreducedproduct4.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=65156364caa2… Author: François Galea <francois.galea(a)uvsq.fr> Date: Tue Mar 9 20:28:29 2010 +0100 Added two paragraphs about uses of the big parameter in the documentation. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d43c54ada25… Author: François Galea <francois.galea(a)uvsq.fr> Date: Mon Mar 8 07:56:00 2010 +0100 Documentation fixes. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bbb1ff43e555… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Jul 9 14:30:29 2009 +0100 Corrected test as already corrected in the master branch. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a648638a1c5f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:44:02 2009 +0100 Further improvements to frequency() code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c5965cbb6eed… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:14:06 2009 +0100 Code for frequency() improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b01615895b5c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 07:11:57 2009 +0100 A new product called Shape_Preserving_Product added. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68dd5db1d102… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:56:45 2009 +0100 The method frequency() added to the Affine_Space domain. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ef46ef0cbc6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:55:47 2009 +0100 Bug in frequency() for Octagonal shapes fixed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46be509da515… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 15:32:07 2009 +0100 Added the method frequency() to the Box domain. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f21ee4e62c55… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 11:01:10 2009 +0100 Added the method frequency() to the Octagonal shape domain. Improved the code for the same method for BD shapes. Corrected some typos in comments in these files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e13382fd6d7a… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 21 09:32:39 2009 +0100 Added method frequency() to the Polyhedron and BD Shape domains. This corresponds to the method frequency() already added to the Grid domain. For these domains it checks if the expression has a constant value and if so, returns true and gives the value (with frequency 0). Otherwise it returns false. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97e641dd651b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:36:26 2009 +0100 Revert "Added a warning about non-integrality for wrap_assign()." This reverts commit 6b9f28ad503f1d43da7a876c4bee7eae9eba185a. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6b9f28ad503f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:28:58 2009 +0100 Added a warning about non-integrality for wrap_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=047b85ccd0dd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:25:26 2009 +0100 Some tests are expected to fail with 8-bit integers. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=49daa080642e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue May 19 17:15:53 2009 +0100 Removed redundant test files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b981fa2a283c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue May 19 17:07:14 2009 +0100 Revised the tests so as to follow the organization for other domains. Apart from the operation tests, there are specific tests for each reduction operator. Selected tests (in the Makefile) can be checked with the given component order and with the component domains reversed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=49a4bf80ee99… Merge: 7d94d1213ad812f7d2a1cec93763247bdab22d34 badd595a0c22e91f4f1653ff8c7d53a3bf15ec50 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 18 13:47:31 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d94d1213ad8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 17 09:04:08 2009 +0100 After the affine (pre)image operations, unset the reduced flag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d519208391e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 21:20:06 2009 +0100 Added two tests based on the examples 5(a), 5(b) in SenS07. Added print_constraints(const Affine_Space&) to ppl_test. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4f5a7d280e52… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 07:41:22 2009 +0100 Added new method frequency() for Grids. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c7f4b16d84c8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 07:41:22 2009 +0100 Added new method frequency() for Grids. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=60d5f1fce4d1… Merge: da0ca32ee95f30d2bcd9111eea74d9b820ad1a14 c8cbb00f29ac4c0d48daf14a9a9d3b93e559e207 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed May 13 11:06:06 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=da0ca32ee95f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 3 17:22:18 2009 +0100 Renamed reduction Shrink_Using_Congruences_Reduction to Congruences_Reduction. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d1cde86de062… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 2 11:00:24 2009 +0100 Reduction methods (Constraints and Shrink_Using_Congruences) improved. Tests specific to the Constraints_Reduction added. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5feeaabb6a4e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 1 10:16:38 2009 +0100 Unwanted changes to test01() undone. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d9d2424b6b4… Merge: 71893349245baa11c7fa1dd9b0a793606b4bce4c 827e54079b1ec6528dd5d185c8d8d0694c891587 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 29 14:44:49 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71893349245b… Author: Patricia M. Hill <hill(a)comp.leeds.ac.uk> Date: Mon Jan 5 13:54:39 2009 +0000 Added a reduction method Shrink_Using_Congruences_Reduction<> and the product Shrink_Using_Congruences_Product<> that assumes this reduction. Several "FIXME"s dealt with. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=00d817596a9b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Dec 13 10:28:13 2008 +0000 This commit was generated by cvs to git conversion to create branch 'products'.

1 0

[GIT] ppl/ppl(termination): Fixed one_affine_ranking_function_PR().
by Roberto Bagnara 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: termination Commit: 357f7bebfaf45554b0c33805e27faada00d74660 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=357f7bebfaf4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Mar 18 11:13:02 2010 +0400 Fixed one_affine_ranking_function_PR(). --- src/termination.cc | 18 ++++++++++-------- tests/Polyhedron/termination1.cc | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/termination.cc b/src/termination.cc index 2a8f96e..2fc0c58 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -564,29 +564,31 @@ one_affine_ranking_function_PR(const Constraint_System& cs_before, // function computed in the feasible point is positive. finish: { - // We can impose that the linear expression is >= 1 because - // every positive multiple of the linear expression is - // acceptable. + // We can impose that the le_ineq is >= 1 because every positive + // multiple of the linear expression is acceptable. mip.add_constraint(le_ineq >= 1); Generator fp = mip.feasible_point(); PPL_ASSERT(fp.is_point()); - // u3 corresponds to space dimensions 0, ..., s - 1. - //const dimension_type s = distance(cs_after.begin(), cs_after.end()); + + // u_3 corresponds to space dimensions 0, ..., s - 1. const dimension_type n = cs_before.space_dimension(); Linear_Expression le; - // mu0 is zero: do this first to avoid reallocations. + // mu_0 is zero: do this first to avoid reallocations. le += 0*Variable(n); - // Multiply u3 by E'_C. + // Multiply u_3 by E'_C to obtain mu_1, ..., mu_n. dimension_type row_index = 0; + PPL_DIRTY_TEMP_COEFFICIENT(k); for (Constraint_System::const_iterator i = cs_after.begin(), cs_after_end = cs_after.end(); i != cs_after_end; ++i, ++row_index) { Variable vi(row_index); + Coefficient_traits::const_reference fp_i = fp.coefficient(vi); const Constraint& c_i = *i; for (dimension_type j = n; j-- > 0; ) { Variable vj(j); - le += vj*(fp.coefficient(vi)*c_i.coefficient(vi)) ; + k = fp_i*c_i.coefficient(vj); + le += k*vj; } } // Note that we can neglect the divisor of `fp' since it is positive. diff --git a/tests/Polyhedron/termination1.cc b/tests/Polyhedron/termination1.cc index 92a902b..a24b067 100644 --- a/tests/Polyhedron/termination1.cc +++ b/tests/Polyhedron/termination1.cc @@ -155,7 +155,7 @@ test05() { Variable mu1(0); Variable mu2(1); Variable mu0(2); - Generator known_result(point(0*mu0 + 1*mu1 + 0*mu2)); + Generator known_result(point(0*mu0 + 2*mu1 + 0*mu2)); print_generator(known_result, "*** known_result ***");

1 0

[GIT] ppl/ppl(master): Fixed a few memory allocation problems in ppl_pips.
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: 2df786e330fbe20f7c268860bd791cc627d4c22a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2df786e330fb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 17 17:14:35 2010 +0100 Fixed a few memory allocation problems in ppl_pips. Enabled the used of valgrind when running ppl_pips tests. Corrected the expected result for test fimmel.pip (unsatisfiable problem). --- demos/ppl_pips/Makefile.am | 21 +++++++++++++++++---- demos/ppl_pips/expected_mpz_a | 2 +- demos/ppl_pips/ppl_pips.cc | 11 ++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/demos/ppl_pips/Makefile.am b/demos/ppl_pips/Makefile.am index 6d7f5d8..cfb9d17 100644 --- a/demos/ppl_pips/Makefile.am +++ b/demos/ppl_pips/Makefile.am @@ -22,6 +22,19 @@ SUBDIRS = examples +if VALGRIND_TESTS_ENABLED + +CHECKER = \ +$(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ +--num-callers=100 --leak-resolution=high \ +--suppressions=$(top_srcdir)/tests/valgrind_suppressions + +else !VALGRIND_TESTS_ENABLED + +CHECKER = + +endif !VALGRIND_TESTS_ENABLED + AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_builddir)/src \ @@ -85,8 +98,8 @@ check-local: ppl_pips$(EXEEXT) $(FGREP) $$file tough_examples >/dev/null 2>&1 && continue; \ echo $(ECHO_N) $$file " $(ECHO_C)" >>obtained; \ echo ppl_pips$(EXEEXT) -p $$path; \ - ./ppl_pips$(EXEEXT) -p $$path | tr -d '\015' | $(TEXT_MD5SUM) \ - >>obtained; \ + $(CHECKER) ./ppl_pips$(EXEEXT) -p $$path \ + | tr -d '\015' | $(TEXT_MD5SUM) >>obtained; \ done for path in $(srcdir)/examples/*.pip; \ do \ @@ -94,8 +107,8 @@ check-local: ppl_pips$(EXEEXT) $(FGREP) $$file tough_examples >/dev/null 2>&1 && continue; \ echo $(ECHO_N) $$file " $(ECHO_C)" >>obtained; \ echo ppl_pips$(EXEEXT) -P $$path; \ - ./ppl_pips$(EXEEXT) -P $$path | tr -d '\015' | $(TEXT_MD5SUM) \ - >>obtained; \ + $(CHECKER) ./ppl_pips$(EXEEXT) -P $$path \ + | tr -d '\015' | $(TEXT_MD5SUM) >>obtained; \ done diff obtained $(srcdir)/$(EXPECTED) diff --git a/demos/ppl_pips/expected_mpz_a b/demos/ppl_pips/expected_mpz_a index 70658db..96b9a87 100644 --- a/demos/ppl_pips/expected_mpz_a +++ b/demos/ppl_pips/expected_mpz_a @@ -14,7 +14,7 @@ brisebarre.pip 3051dbe7ea7bf04e8890ddd41013a9dc - cg1.pip 2571d40371dd1f1661348b08945e8a98 - esced.pip 7f4b69aed82cc0f498e7931ac1dbf92f - ex2.pip 89eb267478eb8675de9602be9bb92f9e - -fimmel.pip d41d8cd98f00b204e9800998ecf8427e - +fimmel.pip 2dd9b24df50572c15981dd3faf8c74a4 - max.pip e29c651c587cc64ab6a7a8cecd488a0b - sor1d.pip 8722a9d4eedd28b98c12987c9116564e - square.pip 65a57d1e7ccb8196f81fa6e701164b69 - diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 223a458..1c35ab6 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -68,6 +68,7 @@ ppl_set_GMP_memory_allocation_functions(void) { #include <fstream> #include <sstream> #include <stdexcept> +#include <memory> #ifdef PPL_HAVE_GETOPT_H #include <getopt.h> @@ -770,11 +771,11 @@ main(int argc, char* argv[]) try { // POLYHEDRON_TYPE ph; // Representation rep = read_polyhedron(input(), ph); - PIP_Parser* parser; + std::auto_ptr<PIP_Parser> parser; if (piplib_format) - parser = new PIP_PipLib_Parser(); + parser.reset(new PIP_PipLib_Parser); else - parser = new PIP_PolyLib_Parser(); + parser.reset(new PIP_PolyLib_Parser); if (!parser->read(*input_stream_p)) return 1; @@ -789,11 +790,11 @@ main(int argc, char* argv[]) try { parser->output_solution_tree(*output_stream_p); } else { + std::auto_ptr<PPL::PIP_Problem> pipp; // Perform a time benchmark loop executing the resolution several times. for (int i = 0; i < loop_iterations; ++i) { - PPL::PIP_Problem* pipp = new PPL::PIP_Problem(pip); + pipp.reset(new PPL::PIP_Problem(pip)); pipp->solve(); - delete pipp; } }

1 0

[GIT] ppl/ppl(master): Fixed a couple of resource allocation problems ( reported by Marco Poletti).
by Enea Zaffanella 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: master Commit: 71aa196a1784744ace2efba7d98b39f9ce44dd35 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71aa196a1784… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 17 17:12:07 2010 +0100 Fixed a couple of resource allocation problems (reported by Marco Poletti). --- src/PIP_Tree.cc | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index f2a06dc..2dd7c79 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2109,6 +2109,11 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, // Recusively solve true node wrt updated context. t_node = t_node->solve(pip, check_feasible_context, context, all_params, space_dim); + // Resolution may have changed t_node: in case, rewrap it. + if (t_node != wrapped_node.get()) { + wrapped_node.release(); + wrapped_node.reset(t_node); + } // Modify *this in place to become the "false" version of current node. PIP_Tree_Node* f_node = this; @@ -2159,10 +2164,10 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, // create a new decision node. PIP_Tree_Node* parent = new PIP_Decision_Node(f_node->get_owner(), f_node, t_node); - // Protect 'parent' from exception safety issues - // (previously wrapped t_node is now safe). + // Previously wrapped 't_node' is now safe: release it + // and protect new 'parent' node from exception safety issues. wrapped_node.release(); - wrapped_node = std::auto_ptr<PIP_Tree_Node>(parent); + wrapped_node.reset(parent); // Add t_test to the constraints of the new decision node. parent->add_constraint(t_test, all_params); @@ -2170,14 +2175,17 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, if (!cs.empty()) { // If node to be solved had tautologies, // store them in a new decision node. - // NOTE: this is exception safe. parent = new PIP_Decision_Node(parent->get_owner(), 0, parent); + // Previously wrapped 'parent' node is now safe: release it + // and protect new 'parent' node from exception safety issues. + wrapped_node.release(); + wrapped_node.reset(parent); parent->constraints_.swap(cs); } parent->artificial_parameters.swap(aps); - // It is now safe to release previously wrapped decision node. - wrapped_node.release(); - return parent; + // It is now safe to release previously wrapped decision node + // and return it to the caller. + return wrapped_node.release(); } // if (first_mixed != not_a_dim)

1 0

[GIT] ppl/ppl(termination): Several corrections.
by Roberto Bagnara 18 Mar '10

18 Mar '10

Module: ppl/ppl Branch: termination Commit: 3cffedb3d03ed65cc04d4216100f8f5f881d957d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3cffedb3d03e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Mar 18 09:11:16 2010 +0400 Several corrections. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 8f6e963..53841ad 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -1189,7 +1189,8 @@ m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_co ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@ (ppl_const_@CLASS@_t pset, ppl_Generator_t point) try { - const @CPP_CLASS@& ppset = *to_const(pset); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset)); Generator& ppoint = *to_nonconst(point); bool ok = one_affine_ranking_function_@TERMINATION_ID@(ppset, ppoint); return ok ? 1 : 0; @@ -1204,8 +1205,10 @@ ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2 (ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after, ppl_Generator_t point) try { - const @CPP_CLASS@& ppset_before = *to_const(pset_before); - const @CPP_CLASS@& ppset_after = *to_const(pset_after); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_before)); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_after)); Generator& ppoint = *to_nonconst(point); bool ok = one_affine_ranking_function_@TERMINATION_ID@_2(ppset_before, ppset_after, @@ -1221,7 +1224,8 @@ m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_c ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@ (ppl_const_@CLASS@_t pset, ppl_Polyhedron_t ph) try { - const @CPP_CLASS@& ppset = *to_const(pset); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset)); all_affine_ranking_functions_@TERMINATION_ID@(ppset, *static_cast<C_Polyhedron*> (to_nonconst(ph))); @@ -1237,8 +1241,10 @@ ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2 (ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after, ppl_Polyhedron_t ph) try { - const @CPP_CLASS@& ppset_before = *to_const(pset_before); - const @CPP_CLASS@& ppset_after = *to_const(pset_after); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_before)); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_after)); all_affine_ranking_functions_@TERMINATION_ID@_2(ppset_before, ppset_after, *static_cast<C_Polyhedron*>

1 0