September 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(bounded_arithmetic): Corrected Boundary_Type into into xor_assign function.
by Alberto Gioia 15 Sep '11

15 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: db7b7ce8a5b4f16b11aa707060ab782eee9587bf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=db7b7ce8a5b4… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Thu Sep 15 20:58:52 2011 +0200 Corrected Boundary_Type into into xor_assign function. --- src/Interval.inlines.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Interval.inlines.hh b/src/Interval.inlines.hh index e13c73f..1e9d1b6 100644 --- a/src/Interval.inlines.hh +++ b/src/Interval.inlines.hh @@ -1373,7 +1373,7 @@ Interval<To_Boundary, To_Info>::xor_assign(const From1& x, const From2& y) { Boundary_NS::assign(LOWER, to_lower, to_info, LOWER, f_lower(zero), f_info(zero)); - if (Boundary_NS::is_boundary_infinity(LOWER, f_lower(x1), f_info(x1))) + if (Boundary_NS::is_boundary_infinity(UPPER, f_upper(x1), f_info(x1))) Boundary_NS::assign(UPPER, upper(), info(), UPPER, f_upper(max_value), f_info(max_value)); else {

1 0

[GIT] ppl/ppl(bounded_arithmetic): Corrected comment of the shift function bitwise operators.
by Alberto Gioia 14 Sep '11

14 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 265aed6f41ffc44d9920f681bbf472cbb82fefc0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=265aed6f41ff… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Wed Sep 14 13:13:33 2011 +0200 Corrected comment of the shift function bitwise operators. Moved the control of bounded of second operand. Added functions for the overloading of bitwise operators. --- src/Interval.inlines.hh | 356 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 261 insertions(+), 95 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=265aed6f…

1 0

[GIT] ppl/ppl(bounded_arithmetic): Added into the function of the bitwise operators shift,
by Alberto Gioia 14 Sep '11

14 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: c1d77c82dcad2f0652be3b072e93a9e6e5a90f6d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c1d77c82dcad… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Wed Sep 14 12:53:57 2011 +0200 Added into the function of the bitwise operators shift, another check on the second operand. --- src/Linear_Form.templates.hh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index 928ec11..15fd3b3 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -431,6 +431,7 @@ template <typename C> Linear_Form<C>& operator<<(Linear_Form<C>& f, const C& n) { C zero(0); + C one(1); dimension_type f_size = f.size(); @@ -438,6 +439,8 @@ operator<<(Linear_Form<C>& f, const C& n) { f = Linear_Form<C>(zero); return f; } + else if (n == one) + return f; else if (f >= zero || f < zero) { for (dimension_type i = f_size; i-- > 0; ) f[i] << n; @@ -453,6 +456,7 @@ template <typename C> Linear_Form<C>& operator>>(Linear_Form<C>& f, const C& n) { C zero(0); + C one(1); dimension_type f_size = f.size(); @@ -460,6 +464,8 @@ operator>>(Linear_Form<C>& f, const C& n) { f = Linear_Form<C>(zero); return f; } + if (n == one) + return f; else if (f >= zero || f < zero) { for (dimension_type i = f_size; i-- > 0; ) f[i] >> n;

1 0

[GIT] ppl/ppl(bounded_arithmetic): Changed order of linearization functions for bitwise operators,
by Alberto Gioia 14 Sep '11

14 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: c84524e70682abb2c80936b4d9c5b0283eeeea46 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c84524e70682… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Wed Sep 14 12:38:57 2011 +0200 Changed order of linearization functions for bitwise operators, moved linearization function about bitwise operator AND before the linearization function about bitwise operator OR. --- src/linearize_integer.hh | 308 +++++++++++++++++++++++----------------------- 1 files changed, 154 insertions(+), 154 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c84524e7…

1 0

[GIT] ppl/ppl(bounded_arithmetic): Corrected definition of approximation for the shift bitwise operators.
by Alberto Gioia 14 Sep '11

14 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 0bacc94a40b5d713d68911f506cfeb7bc53f1e12 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0bacc94a40b5… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Wed Sep 14 12:32:40 2011 +0200 Corrected definition of approximation for the shift bitwise operators. --- doc/definitions.dox | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/definitions.dox b/doc/definitions.dox index e48e010..52b0e23 100644 --- a/doc/definitions.dox +++ b/doc/definitions.dox @@ -2867,11 +2867,11 @@ The interval bitwise operators are defined as follow: \bigl[\bigl(a / 2^{\left|a'\right|}\bigr, \bigl(b / 2^{\left|b'\right|}\bigr)\bigr], & \text{if $a \geq 0$ and $b' < 0$}; \\ - \bigl[\bigl(a \times 2^{a'}\bigr), - \bigl(b \times 2^{b'}\bigr)\bigr], + \bigl[\bigl(a \times 2^{b'}\bigr), + \bigl(b \times 2^{a'}\bigr)\bigr], & \text{if $b < 0$ and $a' \geq 0$}; \\ - \bigl[\bigl(a / 2^{\left|a'\right|}\bigr), - \bigl(b / 2^{\left|b'\right|}\bigr)\bigr], + \bigl[\bigl(a / 2^{\left|b'\right|}\bigr), + \bigl(b / 2^{\left|a'\right|}\bigr)\bigr], & \text{if $b < 0$ and $b' < 0$}. \\ \end{cases} \f] @@ -2879,11 +2879,11 @@ The interval bitwise operators are defined as follow: \f[ [a,b] \ogreaterthan ^{\#} [a',b'] \approx \begin{cases} - \bigl[\bigl(a / 2^{a'}\bigr), - \bigl(b / 2^{b'}\bigr)\bigr], + \bigl[\bigl(a / 2^{b'}\bigr), + \bigl(b / 2^{a'}\bigr)\bigr], & \text{if $a \geq 0$ and $a' \geq 0$}; \\ - \bigl[\bigl(a \times 2^{\left|a'\right|}\bigr), - \bigl(b \times 2^{\left|b'\right|}\bigr)\bigr], + \bigl[\bigl(a \times 2^{\left|b'\right|}\bigr), + \bigl(b \times 2^{\left|a'\right|}\bigr)\bigr], & \text{if $a \geq 0$ and $b' < 0$}; \\ \bigl[\bigl(a / 2^{a'}\bigr), \bigl(b / 2^{b'}\bigr)\bigr],

1 0

[GIT] ppl/ppl(bounded_arithmetic): Changed the management of the intervals not bounded, into the functions of bitwise operator.
by Alberto Gioia 06 Sep '11

06 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 15cae680af1340ccceecb9135e53ce1a41931354 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=15cae680af13… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Tue Sep 6 19:56:50 2011 +0200 Changed the management of the intervals not bounded, into the functions of bitwise operator. --- src/Interval.inlines.hh | 246 +++++++++++++++++++++++++---------------------- 1 files changed, 129 insertions(+), 117 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=15cae680…

1 0

[GIT] ppl/ppl(bounded_arithmetic): Minor changes.
by Alberto Gioia 06 Sep '11

06 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 4d23f26eb45bb2f189717092a3fefade56a60b45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d23f26eb45b… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Tue Sep 6 18:59:21 2011 +0200 Minor changes. --- src/linearize_integer.hh | 4 ++-- tests/Concrete_Expression/linearize_int.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/linearize_integer.hh b/src/linearize_integer.hh index 2cf8646..53990dc 100644 --- a/src/linearize_integer.hh +++ b/src/linearize_integer.hh @@ -1885,7 +1885,7 @@ linearize_int typedef std::map<dimension_type, Linear_Form> Linear_Form_Abstract_Store; PPL_ASSERT(expr.type().is_bounded_integer()); - switch(expr.kind()){ + switch(expr.kind()) { case Int_Constant<Target>::KIND: { const Int_Constant<Target>* intc_expr = expr.template as<Int_Constant>(); @@ -1896,7 +1896,7 @@ linearize_int return true; } - case Binary_Operator<Target>::KIND:{ + case Binary_Operator<Target>::KIND: { const Binary_Operator<Target>* bop_expr = expr.template as<Binary_Operator>(); switch (bop_expr->binary_operator()) { diff --git a/tests/Concrete_Expression/linearize_int.cc b/tests/Concrete_Expression/linearize_int.cc index 2b0c1ad..c3e52f7 100644 --- a/tests/Concrete_Expression/linearize_int.cc +++ b/tests/Concrete_Expression/linearize_int.cc @@ -1200,7 +1200,7 @@ test09(){ if (!linearize_int(lshift, oracle, Integer_Linear_Form_Abstract_Store(), result_lshift)) { nout << "*** Linearization failed, intervalize second linear form " - << "contain infinity *** " << endl << endl; + << "is not bounded *** " << endl << endl; failed_lshift = true; } @@ -1208,7 +1208,7 @@ test09(){ if (!linearize_int(rshift, oracle, Integer_Linear_Form_Abstract_Store(), result_rshift)) { nout << "*** Linearization failed, intervalize second linear form " - << "contain infinity *** " << endl << endl; + << "is not bounded *** " << endl << endl; failed_rshift = true; } @@ -1353,7 +1353,7 @@ test10(){ if (!linearize_int(lshift, oracle, Integer_Linear_Form_Abstract_Store(), result_lshift)) { nout << "*** Linearization failed, intervalize second linear form " - << "contain infinity *** " << endl << endl; + << "is not bounded *** " << endl << endl; failed_lshift = true; } @@ -1361,7 +1361,7 @@ test10(){ if (!linearize_int(rshift, oracle, Integer_Linear_Form_Abstract_Store(), result_rshift)) { nout << "*** Linearization failed, intervalize second linear form " - << "contain infinity *** " << endl << endl; + << "is not bounded *** " << endl << endl; failed_rshift = true; }

1 0