Module: ppl/ppl Branch: master Commit: a1c80c743c7c0561a584a3f12d4bf3245aab2985 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a1c80c743c7c0... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Mon May 18 10:13:53 2009 +0200 Fixed a bug in wrap_assign_col(). --- src/wrap_assign.hh | 13 ++++++------- tests/Polyhedron/wrap1.cc | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/wrap_assign.hh b/src/wrap_assign.hh index 55f8ac4..74382f2 100644 --- a/src/wrap_assign.hh +++ b/src/wrap_assign.hh @@ -117,8 +117,7 @@ wrap_assign_col(PSET& dest, Coefficient_traits::const_reference min_value, Coefficient_traits::const_reference max_value, const Constraint_System* pcs, - Coefficient& tmp1, - Coefficient& tmp2) { + Coefficient& tmp) { if (first == end) { PSET p(src); if (pcs != 0) @@ -136,19 +135,19 @@ wrap_assign_col(PSET& dest, const Variable& x = wrap_dim_translations.var; const Coefficient& first_quadrant = wrap_dim_translations.first_quadrant; const Coefficient& last_quadrant = wrap_dim_translations.last_quadrant; - Coefficient& quadrant = tmp1; - Coefficient& shift = tmp2; + Coefficient& shift = tmp; + PPL_DIRTY_TEMP_COEFFICIENT(quadrant); for (quadrant = first_quadrant; quadrant <= last_quadrant; ++quadrant) { if (quadrant != 0) { mul_2exp_assign(shift, quadrant, w); PSET p(src); p.affine_image(x, x - shift, 1); wrap_assign_col(dest, p, vars, first+1, end, w, min_value, max_value, - pcs, tmp1, tmp2); + pcs, tmp); } else wrap_assign_col(dest, src, vars, first+1, end, w, min_value, max_value, - pcs, tmp1, tmp2); + pcs, tmp); } } } @@ -372,7 +371,7 @@ wrap_assign(PSET& pointset, PSET hull(space_dim, EMPTY); wrap_assign_col(hull, pointset, dimensions_to_be_translated, translations.begin(), translations.end(), - w, min_value, max_value, pcs, ln, ld); + w, min_value, max_value, pcs, ln); pointset.swap(hull); } } diff --git a/tests/Polyhedron/wrap1.cc b/tests/Polyhedron/wrap1.cc index edec4ba..bc65191 100644 --- a/tests/Polyhedron/wrap1.cc +++ b/tests/Polyhedron/wrap1.cc @@ -621,5 +621,5 @@ BEGIN_MAIN DO_TEST(test17); DO_TEST(test18); DO_TEST_F8(test19); - DO_TEST_F(test20); + DO_TEST(test20); END_MAIN