Module: ppl/ppl Branch: floating_point Commit: 0cbe08ccba51a6dbc6a22aa2c50af0d7729dace5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0cbe08ccba51a...
Author: Fabio Bossi bossi@cs.unipr.it Date: Fri Sep 18 10:31:58 2009 +0200
Added missing multiplications by 2. All tests now pass.
---
src/Octagonal_Shape.templates.hh | 6 ++++-- tests/Floating_Point_Expression/refinelf1.cc | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 6734c48..b21bc3d 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -828,9 +828,11 @@ Octagonal_Shape<T>::refine_with_linear_form_inequality( in the main diagonal of the matrix. They will be moved later. */ linear_form_upper_bound(right_minus_left + var, upper_bound); - assign_r(matrix[n_var+1][n_var+1], upper_bound, ROUND_NOT_NEEDED); + mul_2exp_assign_r(matrix[n_var+1][n_var+1], upper_bound, 1, + ROUND_UP); linear_form_upper_bound(right_minus_left - var, upper_bound); - assign_r(matrix[n_var][n_var], upper_bound, ROUND_NOT_NEEDED); + mul_2exp_assign_r(matrix[n_var][n_var], upper_bound, 1, + ROUND_UP); } }
diff --git a/tests/Floating_Point_Expression/refinelf1.cc b/tests/Floating_Point_Expression/refinelf1.cc index 7998d21..485348d 100644 --- a/tests/Floating_Point_Expression/refinelf1.cc +++ b/tests/Floating_Point_Expression/refinelf1.cc @@ -406,6 +406,6 @@ BEGIN_MAIN DO_TEST(test06); DO_TEST(test07); DO_TEST(test08); - DO_TEST(test09); //FIXME: A <= 1.75 (cut&paste error???) - DO_TEST(test10); //FIXME: A >= -7.5 (cut&paste error???) + DO_TEST(test09); + DO_TEST(test10); END_MAIN