September 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed several indentation mistakes.
by Roberto Bagnara 28 Sep '11

28 Sep '11

Module: ppl/ppl Branch: master Commit: 2d63fb4b83f94a61090bbcbecb4b52d2f47e589b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d63fb4b83f9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Sep 28 14:35:16 2011 +0200 Fixed several indentation mistakes. --- demos/ppl_lpsol/ppl_lpsol.c | 2 +- .../ppl_interface_generator_prolog_cc_code.m4 | 35 +++++++++---------- src/BD_Shape.templates.hh | 4 +- src/Box.templates.hh | 2 +- src/Constraint_System.cc | 4 +- src/Octagonal_Shape.templates.hh | 10 +++--- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 5c1e16a..b0dad47 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -762,7 +762,7 @@ add_constraints(ppl_Linear_Expression_t ppl_le, ppl_delete_Constraint(ppl_c); break; - default: + default: fatal("internal error"); break; } diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 2ef13a6..9253d35 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -31,31 +31,30 @@ m4_define(`ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension_code', `extern "C" Prolog_foreign_return_type ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension(Prolog_term_ref t_nd, Prolog_term_ref t_uoe, - Prolog_term_ref t_ph) -{ - static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; - try { - @TOPOLOGY@@CPP_CLASS@* ph; - Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); - - if (uoe == a_empty) - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - EMPTY); + Prolog_term_ref t_ph) { + static const char* where = "ppl_new_@TOPOLOGY@@CLASS@_from_space_dimension/3"; + try { + @TOPOLOGY@@CPP_CLASS@* ph; + Prolog_atom uoe = term_to_universe_or_empty(t_uoe, where); + + if (uoe == a_empty) + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + EMPTY); else - ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, - where), - UNIVERSE); + ph = new @TOPOLOGY@@CPP_CLASS@(term_to_unsigned<dimension_type>(t_nd, + where), + UNIVERSE); Prolog_term_ref tmp = Prolog_new_term_ref(); Prolog_put_address(tmp, ph); if (Prolog_unify(t_ph, tmp)) { - PPL_REGISTER(ph); - return PROLOG_SUCCESS; - } - else - delete ph; + PPL_REGISTER(ph); + return PROLOG_SUCCESS; } + else + delete ph; + } CATCH_ALL; } diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 7ff321f..53c55a4 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -3005,7 +3005,7 @@ BD_Shape<T>::get_limiting_shape(const Constraint_System& cs, ls_x = d; ls_y = d1; changed = true; - } + } } } } @@ -4311,7 +4311,7 @@ void BD_Shape<T> // Shortest-path closure is preserved, but not reduction. if (marked_shortest_path_reduced()) reset_shortest_path_reduced(); - if (is_w_coeff_one) { + if (is_w_coeff_one) { // Add the new constraints `var - w >= b_lb' // `and var - w <= b_ub'. add_dbm_constraint(w_id, var_id, b_ub); diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 42ca87e..02159ab 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -783,7 +783,7 @@ Box<ITV>::relation_with(const Congruence& cg) const { && Poly_Con_Relation::is_included() && Poly_Con_Relation::is_disjoint(); - if (space_dim == 0) { + if (space_dim == 0) { if (cg.is_inconsistent()) return Poly_Con_Relation::is_disjoint(); else diff --git a/src/Constraint_System.cc b/src/Constraint_System.cc index 058b8f6..1f53bc3 100644 --- a/src/Constraint_System.cc +++ b/src/Constraint_System.cc @@ -116,8 +116,8 @@ adjust_topology_and_space_dimension(const Topology new_topology, // we just decrement the number of columns to be added. Constraint_System& cs = *this; const dimension_type eps_index = old_space_dim + 1; - const dimension_type old_cs_num_rows = cs.num_rows(); - dimension_type cs_num_rows = old_cs_num_rows; + const dimension_type old_cs_num_rows = cs.num_rows(); + dimension_type cs_num_rows = old_cs_num_rows; bool was_sorted = cs.is_sorted(); if (was_sorted) cs.set_sorted(false); diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 7d446ef..72ad5b6 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1168,7 +1168,7 @@ Octagonal_Shape<T>::is_disjoint_from(const Octagonal_Shape& y) const { const Row_Iterator y_begin = y.matrix.row_begin(); PPL_DIRTY_TEMP(N, neg_y_ci_cj); - for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { + for (Row_Iterator i_iter = m_begin; i_iter != m_end; ++i_iter) { using namespace Implementation::Octagonal_Shapes; const dimension_type i = i_iter.index(); const dimension_type ci = coherent_index(i); @@ -3908,12 +3908,12 @@ Octagonal_Shape<T>::CC76_narrowing_assign(const Octagonal_Shape& y) { bool is_oct_changed = false; typename OR_Matrix<N>::const_element_iterator j = y.matrix.element_begin(); for (typename OR_Matrix<N>::element_iterator i = matrix.element_begin(), - matrix_element_end = matrix.element_end(); + matrix_element_end = matrix.element_end(); i != matrix_element_end; ++i, ++j) { - if (!is_plus_infinity(*i) - && !is_plus_infinity(*j) - && *i != *j) { + if (!is_plus_infinity(*i) + && !is_plus_infinity(*j) + && *i != *j) { *i = *j; is_oct_changed = true; }

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 23 Sep '11

23 Sep '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d73822e02b49… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:54:50 2011 +0200 Generator_System: avoid calling Linear_Expression::get_row() and Generator.expression() in some methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b8f47136eb3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:44:52 2011 +0200 Generator: remove the swap() method that takes two dimension_type parameters. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9c740d3d4f2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:41:48 2011 +0200 Constraint, Generator: use Linear_Expression::ascii_{dump,load}() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39ce5f1dcb0a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:41:07 2011 +0200 Linear_Expression: the ascii_dump() and ascii_load() methods now produce the same output, no matter if the representation is dense or sparse (note that sparse representations are still *not* supported, however). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10ba8673ccfc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:29:51 2011 +0200 Constraint: use the {set_,}epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0a1efe6bf9a5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:24:02 2011 +0200 Constraint: add the epsilon_coefficient() and set_epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=705116ceb77c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:21:56 2011 +0200 Generator: use the {set_,}epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3bdf40035542… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:15:33 2011 +0200 Generator: add the epsilon_coefficient() and set_epsilon_coefficient() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=abefaa121d19… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 18:12:10 2011 +0200 Generator: avoid using Linear_Expression::get_row() in several methods (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71247a631699… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:59:17 2011 +0200 Generator: avoid using Linear_Expression::get_row() in several methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1dc8351035f4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:55:31 2011 +0200 Generator: use Linear_Expression::permute_space_dimensions() in permute_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37d313b16516… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:54:52 2011 +0200 Generator: use Linear_Expression::remove_space_dimensions() in remove_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=230e5eab5031… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:53:37 2011 +0200 Generator: avoid calling Linear_Expression::get_row() in point(), closure_point(), ray() and line(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=50a03f9ea4d1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:52:09 2011 +0200 The compare() function for Generator objects now uses the compare() for Linear_Expression, and it is a friend of the Generator class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f1709c737e5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:50:06 2011 +0200 Constraint: avoid calling Linear_Expression::get_row() in sign_normalize(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=311eaed59352… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:48:55 2011 +0200 The compare() function for Constrant objects now uses the compare() for Linear_Expression, and it is a friend of the Constraint class. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cde9d339178e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Sep 20 17:47:18 2011 +0200 Add a compare() function for Linear_Expression objects. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ce285788f5c1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:59:42 2011 +0200 Constraint, Generator, Grid_Generator: remove the linear_combine() method that takes a dimension_type. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=72492f5097c5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:52 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#3). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e37fd996d375… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:47 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7577a99fd785… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 11:10:27 2011 +0200 Linear_System: avoid using the linear_combine() method that takes a dimension_type (#1). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46d836ec7655… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:53:21 2011 +0200 Polyhedron: use Generator::linear_combine_inhomogeneous() instead of the linear_combine() method that takes a dimension_type, in BHRZ03_evolving_points(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9c868e733c7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:51:37 2011 +0200 Grid_Generator: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5c2af1eaec85… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:49:29 2011 +0200 Generator: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ef60b409c10… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:49:07 2011 +0200 Constraint: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=84230b7a7ece… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Sep 19 10:17:15 2011 +0200 Linear_Expression: add a linear_combine() method a a linear_combine_inhomogeneous() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e43e5d8be77… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 19:07:04 2011 +0200 Constraint: remove some calls to Linear_Expression::get_row() (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=069a3d528bb4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 19:06:33 2011 +0200 Replace an assert() with PPL_ASSERT(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d63368fb307… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 18:40:17 2011 +0200 Constraint: remove some calls to Linear_Expression::get_row() (#1). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ab03cc46ddd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Sep 18 18:39:34 2011 +0200 Linear_Expression: add some methods.

1 0

can't find "ppl.cma"
by Tie Cheng 21 Sep '11

21 Sep '11

Hello, I have downloaded ppl package and follow the steps to install it under /usr/local/lib... Here is the result of "find -name "*ppl.*"" under "/usr/": ./lib/libppl.so.7.1.0 ./lib/libppl.so.7 ./lib/libcloog-ppl.so.0 ./local/share/man/man3/libppl.3 ./local/share/aclocal/ppl.m4 ./local/include/ppl.hh ./local/lib/libppl.so ./local/lib/libppl.la ./local/lib/libppl.a ./local/lib/libppl.so.9 ./local/lib/libppl.so.9.0.0 I have done "find -name "ppl.cma"" under "/", it finds nothing. Does it mean the package has not been correctly installed? Where do you often find your "ppl.cma"? Thank you very much Tie

2 3

Error: Unbound value Ppl.manager_alloc_strict
by Tie Cheng 21 Sep '11

21 Sep '11

Hello all, I just installed Ppl, here is the result of `find -name "*ppl.*" under /usr/: ./lib/libppl.so.7.1.0 ./lib/libppl.so.7 ./lib/libcloog-ppl.so.0 ./local/share/man/man3/libppl.3 ./local/share/aclocal/ppl.m4 ./local/include/ppl.hh ./local/lib/libppl.so ./local/lib/libppl.la ./local/lib/libppl.a ./local/lib/libppl.so.9 ./local/lib/libppl.so.9.0.0 But when I run the following code by "ocamlc -I /usr/local/lib/ocaml/3.11.2/apron -I /usr/local/lib/ocaml/3.11.2/gmp/ -I /usr/local/lib/ -c file.ml", I got an error "Unbound value Ppl.manager_alloc_strict". open Apron;; open Mpqf;; open Format;; let print_array = Abstract0.print_array;; let lincons1_array_print fmt x = Lincons1.array_print fmt x ;; let generator1_array_print fmt x = Generator1.array_print fmt x ;; let manpk = Polka.manager_alloc_strict();; let manbox = Box.manager_alloc ();; let manoct = Oct.manager_alloc ();; let manppl = Ppl.manager_alloc_strict();; ... Does anyone know what happened? Thank you very much! Tie CHENG

1 0

[GIT] ppl/ppl(bounded_arithmetic): Renamed the temporary names intervals, and corrected the compute of the
by Alberto Gioia 19 Sep '11

19 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 2e84249cb381ae212e54cf2de994af3e7d818277 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2e84249cb381… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Mon Sep 19 19:35:40 2011 +0200 Renamed the temporary names intervals, and corrected the compute of the boundary upper and lower for the function xor_assign. --- src/Interval.inlines.hh | 151 +++++++++++++++++++++++------------------------ 1 files changed, 73 insertions(+), 78 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2e84249c…

1 0

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

19 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: bb132ec0901f5629cd56113093a9223141241047 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb132ec0901f… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Mon Sep 19 19:34:28 2011 +0200 Minor changes. --- src/Linear_Form.templates.hh | 3 +-- tests/Concrete_Expression/linearize_int_xor.cc | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index b7f8764..b697f96 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -416,9 +416,8 @@ operator^=(Linear_Form<C>& f1, const Linear_Form<C>& f2) { return f1; } else if (check_totaly(f1, f2)) { - for (dimension_type i = f2_size; i-- > 0; ) { + for (dimension_type i = f2_size; i-- > 0; ) f1[i] ^= f2[i]; - } return f1; } else diff --git a/tests/Concrete_Expression/linearize_int_xor.cc b/tests/Concrete_Expression/linearize_int_xor.cc index 3492721..db3c0ef 100644 --- a/tests/Concrete_Expression/linearize_int_xor.cc +++ b/tests/Concrete_Expression/linearize_int_xor.cc @@ -74,7 +74,7 @@ bool test01() { Integer_Int_Interval tmp(2); tmp.join_assign(3); - nout << "B in " << tmp << endl; + nout<< "B in " << tmp << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(1), tmp); @@ -241,6 +241,7 @@ test03() { Integer_Int_Interval tmp1(2); tmp1.join_assign(3); nout << "A in " << tmp << " and B in " << tmp1 << endl; + Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -252,6 +253,10 @@ test03() { Integer_Int_Interval inh_term(-2); inh_term.join_assign(-3); + Integer_Int_Interval a1(-1); + + Integer_Int_Interval b1(-1); + Integer_Int_Interval inh_term1(-1); inh_term1.join_assign(-4); @@ -263,8 +268,8 @@ test03() { Int_Constant<C_Expr> coeff_a(Integer_Type, a); Int_Constant<C_Expr> coeff_b(Integer_Type, b); Int_Constant<C_Expr> coeff_inh_term(Integer_Type, inh_term); - Int_Constant<C_Expr> coeff_a1(Integer_Type, a); - Int_Constant<C_Expr> coeff_b1(Integer_Type, a); + Int_Constant<C_Expr> coeff_a1(Integer_Type, a1); + Int_Constant<C_Expr> coeff_b1(Integer_Type, b1); Int_Constant<C_Expr> coeff_inh_term1(Integer_Type, inh_term1); Binary_Operator<C_Expr> term_a(Integer_Type, Binary_Operator<C_Expr>::MUL, @@ -299,9 +304,9 @@ test03() { known_result += b * Integer_Linear_Form(B); known_result += inh_term; - Integer_Linear_Form lf = Integer_Linear_Form(A); - lf *= a; - lf += a * Integer_Linear_Form(B); + Integer_Linear_Form lf = A; + lf *= a1; + lf += b1 * Integer_Linear_Form(B); lf += inh_term1; linearize_int(bxor, oracle, Integer_Linear_Form_Abstract_Store(), result); @@ -390,7 +395,7 @@ test04() { nout << endl; bool ok = result == known_result ; - ; + return ok; }

1 0

[GIT] ppl/ppl(bounded_arithmetic): Modified and corrected noisy output.
by Alberto Gioia 19 Sep '11

19 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 4329b457a9b6d298b56756f7ac94595a21b4c0c3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4329b457a9b6… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Mon Sep 19 12:40:44 2011 +0200 Modified and corrected noisy output. --- tests/Concrete_Expression/linearize_int_and.cc | 6 ++-- tests/Concrete_Expression/linearize_int_lshift.cc | 4 +- tests/Concrete_Expression/linearize_int_or.cc | 22 ++++++++++---------- tests/Concrete_Expression/linearize_int_rshift.cc | 1 - tests/Concrete_Expression/linearize_int_xor.cc | 20 +++++++++--------- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/tests/Concrete_Expression/linearize_int_and.cc b/tests/Concrete_Expression/linearize_int_and.cc index 1fcb831..886c5c5 100644 --- a/tests/Concrete_Expression/linearize_int_and.cc +++ b/tests/Concrete_Expression/linearize_int_and.cc @@ -554,11 +554,11 @@ test07() { bool failed_and = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " & " << lf << " ***" << endl; if (!linearize_int(band, oracle, Integer_Linear_Form_Abstract_Store(), result)) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_and = true; } diff --git a/tests/Concrete_Expression/linearize_int_lshift.cc b/tests/Concrete_Expression/linearize_int_lshift.cc index 35c927d..1262d0f 100644 --- a/tests/Concrete_Expression/linearize_int_lshift.cc +++ b/tests/Concrete_Expression/linearize_int_lshift.cc @@ -1498,7 +1498,7 @@ test12() { } /* - Tests linearization A + 4*B + 3*C + [3, 9] >> 3*A + B + 2*C + [9, 12] + Tests linearization A + 4*B + 3*C + [3, 9] << 3*A + B + 2*C + [9, 12] where A in [1, 2], B in [3, 5] and C in [0, 2]. */ bool @@ -1598,7 +1598,7 @@ test13() { linearize_int(lshift, oracle, Integer_Linear_Form_Abstract_Store(), result); - nout << "*** " << known_result << " >> " << lf << " ***" << endl + nout << "*** " << known_result << " << " << lf << " ***" << endl << "*** result *** " << endl << result << endl; known_result << tmp; diff --git a/tests/Concrete_Expression/linearize_int_or.cc b/tests/Concrete_Expression/linearize_int_or.cc index 3749f8b..a3b0206 100644 --- a/tests/Concrete_Expression/linearize_int_or.cc +++ b/tests/Concrete_Expression/linearize_int_or.cc @@ -143,7 +143,7 @@ test02() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); @@ -222,7 +222,7 @@ test03() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -308,7 +308,7 @@ test04() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -386,7 +386,7 @@ test05() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -508,7 +508,7 @@ bool test07() { Integer_Int_Interval tmp(1); Integer_Int_Interval tmp1(5); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -538,11 +538,11 @@ test07() { bool failed_or = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " | " << lf << " ***" << endl; if (!linearize_int(bor, oracle, Integer_Linear_Form_Abstract_Store(), result)) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_or = true; } @@ -627,7 +627,7 @@ test09() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -722,7 +722,7 @@ test10() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -816,7 +816,7 @@ test11() { tmp.join_assign(4); Integer_Int_Interval tmp1(5); tmp1.join_assign(9); - nout << "A in " << tmp << "and B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); diff --git a/tests/Concrete_Expression/linearize_int_rshift.cc b/tests/Concrete_Expression/linearize_int_rshift.cc index 6ac8ec9..c3a3958 100644 --- a/tests/Concrete_Expression/linearize_int_rshift.cc +++ b/tests/Concrete_Expression/linearize_int_rshift.cc @@ -306,7 +306,6 @@ test02() { tmp2 *= a1; tmp2 += b1 * tmp3; tmp2 += inh_term1; - std::cout << "tmp2 vale " << tmp2 << std::endl; linearize_int(rshift, oracle1, Integer_Linear_Form_Abstract_Store(), result ); diff --git a/tests/Concrete_Expression/linearize_int_xor.cc b/tests/Concrete_Expression/linearize_int_xor.cc index 86289cb..3492721 100644 --- a/tests/Concrete_Expression/linearize_int_xor.cc +++ b/tests/Concrete_Expression/linearize_int_xor.cc @@ -161,7 +161,7 @@ test02() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); @@ -240,7 +240,7 @@ test03() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -326,7 +326,7 @@ test04() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -404,7 +404,7 @@ test05() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -526,7 +526,7 @@ bool test07() { Integer_Int_Interval tmp(1); Integer_Int_Interval tmp1(5); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -556,11 +556,11 @@ test07() { bool failed_xor = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " ^ " << lf << " ***" << endl; if (!linearize_int(bxor, oracle, Integer_Linear_Form_Abstract_Store(), result )) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_xor = true; } @@ -645,7 +645,7 @@ test09() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -740,7 +740,7 @@ test10() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1);

1 0

[GIT] ppl/ppl(bounded_arithmetic): Changed behavior of the function operator<< and operator<< about second
by Alberto Gioia 19 Sep '11

19 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 23dc642f53f4c94db0a5ac1436d72462944bc3a6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23dc642f53f4… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Mon Sep 19 12:33:02 2011 +0200 Changed behavior of the function operator<< and operator<< about second operand equal to 0 and eliminated case equal to 1. --- src/Linear_Form.templates.hh | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index 15fd3b3..b7f8764 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -431,15 +431,10 @@ 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(); - if (n == zero) { - f = Linear_Form<C>(zero); - return f; - } - else if (n == one) + if (n == zero) return f; else if (f >= zero || f < zero) { for (dimension_type i = f_size; i-- > 0; ) @@ -456,15 +451,10 @@ 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(); - if (n == zero) { - f = Linear_Form<C>(zero); - return f; - } - if (n == one) + if (n == zero) return f; else if (f >= zero || f < zero) { for (dimension_type i = f_size; i-- > 0; )

1 0

[GIT] ppl/ppl(bounded_arithmetic): Added into Makefile. am the new test files for bitwise operators.
by Alberto Gioia 15 Sep '11

15 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: 6be02a383b2ca36767e161fabccf7145fb0fca64 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6be02a383b2c… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Thu Sep 15 21:03:51 2011 +0200 Added into Makefile.am the new test files for bitwise operators. --- tests/Concrete_Expression/Makefile.am | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index 1db0504..7b17383 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -55,7 +55,11 @@ ORIGINAL_TESTS = \ C_Expr \ linearform1 \ linearize \ -linearize_int \ +linearize_int_and \ +linearize_int_or \ +linearize_int_xor \ +linearize_int_lshift \ +linearize_int_rshift \ digitalfilters1 \ bdshape1 \ bdshape2 \ @@ -144,7 +148,15 @@ linearform1_SOURCES = linearform1.cc linearize_SOURCES = linearize.cc -linearize_int_SOURCES = linearize_int.cc +linearize_int_and_SOURCES = linearize_int_and.cc + +linearize_int_or_SOURCES = linearize_int_or.cc + +linearize_int_xor_SOURCES = linearize_int_xor.cc + +linearize_int_lshift_SOURCES = linearize_int_lshift.cc + +linearize_int_rshift_SOURCES = linearize_int_rshift.cc octagonalshape1_SOURCES = octagonalshape1.cc

1 0

[GIT] ppl/ppl(bounded_arithmetic): Splitted function test for operator bitwise.
by Alberto Gioia 15 Sep '11

15 Sep '11

Module: ppl/ppl Branch: bounded_arithmetic Commit: ab98e746c91524e9ebe8b8d8dc220e83a7fb51cf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab98e746c915… Author: Alberto Gioia <alberto.gioia1(a)studenti.unipr.it> Date: Thu Sep 15 21:01:21 2011 +0200 Splitted function test for operator bitwise. --- tests/Concrete_Expression/linearize_int_and.cc | 1055 +++++++++++++ tests/Concrete_Expression/linearize_int_lshift.cc | 1629 ++++++++++++++++++++ tests/Concrete_Expression/linearize_int_or.cc | 1020 +++++++++++++ tests/Concrete_Expression/linearize_int_rshift.cc | 1676 +++++++++++++++++++++ tests/Concrete_Expression/linearize_int_xor.cc | 1037 +++++++++++++ 5 files changed, 6417 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ab98e746…

1 0